head 1.8; access; symbols pkgsrc-2026Q1:1.8.0.14 pkgsrc-2026Q1-base:1.8 pkgsrc-2025Q4:1.8.0.12 pkgsrc-2025Q4-base:1.8 pkgsrc-2025Q3:1.8.0.10 pkgsrc-2025Q3-base:1.8 pkgsrc-2025Q2:1.8.0.8 pkgsrc-2025Q2-base:1.8 pkgsrc-2025Q1:1.8.0.6 pkgsrc-2025Q1-base:1.8 pkgsrc-2024Q4:1.8.0.4 pkgsrc-2024Q4-base:1.8 pkgsrc-2024Q3:1.8.0.2 pkgsrc-2024Q3-base:1.8 pkgsrc-2024Q2:1.7.0.72 pkgsrc-2024Q2-base:1.7 pkgsrc-2024Q1:1.7.0.70 pkgsrc-2024Q1-base:1.7 pkgsrc-2023Q4:1.7.0.68 pkgsrc-2023Q4-base:1.7 pkgsrc-2023Q3:1.7.0.66 pkgsrc-2023Q3-base:1.7 pkgsrc-2023Q2:1.7.0.64 pkgsrc-2023Q2-base:1.7 pkgsrc-2023Q1:1.7.0.62 pkgsrc-2023Q1-base:1.7 pkgsrc-2022Q4:1.7.0.60 pkgsrc-2022Q4-base:1.7 pkgsrc-2022Q3:1.7.0.58 pkgsrc-2022Q3-base:1.7 pkgsrc-2022Q2:1.7.0.56 pkgsrc-2022Q2-base:1.7 pkgsrc-2022Q1:1.7.0.54 pkgsrc-2022Q1-base:1.7 pkgsrc-2021Q4:1.7.0.52 pkgsrc-2021Q4-base:1.7 pkgsrc-2021Q3:1.7.0.50 pkgsrc-2021Q3-base:1.7 pkgsrc-2021Q2:1.7.0.48 pkgsrc-2021Q2-base:1.7 pkgsrc-2021Q1:1.7.0.46 pkgsrc-2021Q1-base:1.7 pkgsrc-2020Q4:1.7.0.44 pkgsrc-2020Q4-base:1.7 pkgsrc-2020Q3:1.7.0.42 pkgsrc-2020Q3-base:1.7 pkgsrc-2020Q2:1.7.0.38 pkgsrc-2020Q2-base:1.7 pkgsrc-2020Q1:1.7.0.18 pkgsrc-2020Q1-base:1.7 pkgsrc-2019Q4:1.7.0.40 pkgsrc-2019Q4-base:1.7 pkgsrc-2019Q3:1.7.0.36 pkgsrc-2019Q3-base:1.7 pkgsrc-2019Q2:1.7.0.34 pkgsrc-2019Q2-base:1.7 pkgsrc-2019Q1:1.7.0.32 pkgsrc-2019Q1-base:1.7 pkgsrc-2018Q4:1.7.0.30 pkgsrc-2018Q4-base:1.7 pkgsrc-2018Q3:1.7.0.28 pkgsrc-2018Q3-base:1.7 pkgsrc-2018Q2:1.7.0.26 pkgsrc-2018Q2-base:1.7 pkgsrc-2018Q1:1.7.0.24 pkgsrc-2018Q1-base:1.7 pkgsrc-2017Q4:1.7.0.22 pkgsrc-2017Q4-base:1.7 pkgsrc-2017Q3:1.7.0.20 pkgsrc-2017Q3-base:1.7 pkgsrc-2017Q2:1.7.0.16 pkgsrc-2017Q2-base:1.7 pkgsrc-2017Q1:1.7.0.14 pkgsrc-2017Q1-base:1.7 pkgsrc-2016Q4:1.7.0.12 pkgsrc-2016Q4-base:1.7 pkgsrc-2016Q3:1.7.0.10 pkgsrc-2016Q3-base:1.7 pkgsrc-2016Q2:1.7.0.8 pkgsrc-2016Q2-base:1.7 pkgsrc-2016Q1:1.7.0.6 pkgsrc-2016Q1-base:1.7 pkgsrc-2015Q4:1.7.0.4 pkgsrc-2015Q4-base:1.7 pkgsrc-2015Q3:1.7.0.2 pkgsrc-2015Q3-base:1.7 pkgsrc-2015Q2:1.6.0.18 pkgsrc-2015Q2-base:1.6 pkgsrc-2015Q1:1.6.0.16 pkgsrc-2015Q1-base:1.6 pkgsrc-2014Q4:1.6.0.14 pkgsrc-2014Q4-base:1.6 pkgsrc-2014Q3:1.6.0.12 pkgsrc-2014Q3-base:1.6 pkgsrc-2014Q2:1.6.0.10 pkgsrc-2014Q2-base:1.6 pkgsrc-2014Q1:1.6.0.8 pkgsrc-2014Q1-base:1.6 pkgsrc-2013Q4:1.6.0.6 pkgsrc-2013Q4-base:1.6 pkgsrc-2013Q3:1.6.0.4 pkgsrc-2013Q3-base:1.6 pkgsrc-2013Q2:1.6.0.2 pkgsrc-2013Q2-base:1.6 pkgsrc-2013Q1:1.5.0.6 pkgsrc-2013Q1-base:1.5 pkgsrc-2012Q4:1.5.0.4 pkgsrc-2012Q4-base:1.5 pkgsrc-2012Q3:1.5.0.2 pkgsrc-2012Q3-base:1.5 pkgsrc-2012Q2:1.4.0.24 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.4.0.22 pkgsrc-2012Q1-base:1.4 pkgsrc-2011Q4:1.4.0.20 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q3:1.4.0.18 pkgsrc-2011Q3-base:1.4 pkgsrc-2011Q2:1.4.0.16 pkgsrc-2011Q2-base:1.4 pkgsrc-2011Q1:1.4.0.14 pkgsrc-2011Q1-base:1.4 pkgsrc-2010Q4:1.4.0.12 pkgsrc-2010Q4-base:1.4 pkgsrc-2010Q3:1.4.0.10 pkgsrc-2010Q3-base:1.4 pkgsrc-2010Q2:1.4.0.8 pkgsrc-2010Q2-base:1.4 pkgsrc-2010Q1:1.4.0.6 pkgsrc-2010Q1-base:1.4 pkgsrc-2009Q4:1.4.0.4 pkgsrc-2009Q4-base:1.4 pkgsrc-2009Q3:1.4.0.2 pkgsrc-2009Q3-base:1.4 pkgsrc-2008Q4:1.3.0.30 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.28 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.26 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.24 pkgsrc-2008Q2-base:1.3 pkgsrc-2008Q1:1.3.0.22 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.20 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.18 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.16 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.14 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.12 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.10 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.8 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.6 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.4 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.2 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.2.0.6 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.4 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.2 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.1.0.16 pkgsrc-2004Q3-base:1.1 pkgsrc-2004Q2:1.1.0.14 pkgsrc-2004Q2-base:1.1 pkgsrc-2004Q1:1.1.0.12 pkgsrc-2004Q1-base:1.1 pkgsrc-2003Q4:1.1.0.10 pkgsrc-2003Q4-base:1.1 netbsd-1-6-1:1.1.0.6 netbsd-1-6-1-base:1.1 netbsd-1-6:1.1.0.8 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.0.4 pkgviews-base:1.1 buildlink2:1.1.0.2 buildlink2-base:1.1; locks; strict; comment @# @; 1.8 date 2024.08.05.09.23.37; author tnn; state Exp; branches; next 1.7; commitid fcdx5wHScH9GaCkF; 1.7 date 2015.08.28.08.17.38; author richard; state Exp; branches; next 1.6; commitid 8s0trbZetHmxK0zy; 1.6 date 2013.04.16.10.49.31; author adam; state Exp; branches; next 1.5; 1.5 date 2012.09.07.12.57.14; author adam; state Exp; branches; next 1.4; 1.4 date 2009.09.18.14.01.32; author sketch; state Exp; branches; next 1.3; 1.3 date 2005.08.03.18.54.31; author wiz; state dead; branches; next 1.2; 1.2 date 2004.12.17.22.41.15; author wiz; state Exp; branches; next 1.1; 1.1 date 2002.04.18.16.42.31; author yyamano; state Exp; branches; next ; desc @@ 1.8 log @zip: remove broken configure tests We don't need to test for existence of memset(3) et al in 2024. (If you want to test for it, at least include the correct headers!) @ text @$NetBSD: patch-ab,v 1.7 2015/08/28 08:17:38 richard Exp $ Use CPPFLAGS during configuration. Don't force compiler optimization flags. Introduce DISABLE_ASM Remove broken configure tests. Assume we have standard libc functions such as memset(3). --- unix/configure.orig 2008-06-20 03:32:20.000000000 +0000 +++ unix/configure @@@@ -16,7 +16,7 @@@@ trap "rm -f conftest* core a.out; exit 1" 1 2 3 15 -CC=${1-cc} +CC="${1-cc} $CPPFLAGS" CFLAGS=${2-"-I. -DUNIX"} LFLAGS1='' LFLAGS2='' @@@@ -118,10 +118,6 @@@@ _EOF_ fi # optimization flags -if test -n "${CFLAGS_OPT}"; then - CFLAGS="${CFLAGS} ${CFLAGS_OPT}" - CFLAGS_BZ="${CFLAGS_BZ} ${CFLAGS_OPT}" -fi # bzip2 @@@@ -221,12 +217,12 @@@@ echo Check for the C preprocessor # on SVR4, cc -E does not produce correct assembler files. Need /lib/cpp. CPP="${CC} -E" # solaris as(1) needs -P, maybe others as well ? -[ -f /usr/ccs/lib/cpp ] && CPP="/usr/ccs/lib/cpp -P" -[ -f /usr/lib/cpp ] && CPP=/usr/lib/cpp -[ -f /lib/cpp ] && CPP=/lib/cpp -[ -f /usr/bin/cpp ] && CPP=/usr/bin/cpp -[ -f /xenix ] && CPP="${CC} -E" -[ -f /lynx.os ] && CPP="${CC} -E" +#[ -f /usr/ccs/lib/cpp ] && CPP="/usr/ccs/lib/cpp -P" +#[ -f /usr/lib/cpp ] && CPP=/usr/lib/cpp +#[ -f /lib/cpp ] && CPP=/lib/cpp +#[ -f /usr/bin/cpp ] && CPP=/usr/bin/cpp +#[ -f /xenix ] && CPP="${CC} -E" +#[ -f /lynx.os ] && CPP="${CC} -E" echo "#include " > conftest.c $CPP conftest.c >/dev/null 2>/dev/null || CPP="${CC} -E" @@@@ -235,6 +231,7 @@@@ $CPP conftest.c >/dev/null 2>/dev/null | echo Check if we can use asm code OBJA="" OCRCU8="" +if [ -z "$DISABLE_ASM" ]; then if eval "$CPP match.S > _match.s 2>/dev/null"; then if test ! -s _match.s || grep error < _match.s > /dev/null; then : @@@@ -257,6 +254,7 @@@@ if eval "$CPP match.S > _match.s 2>/dev/ fi fi rm -f _match.s _match.o _crc_i386.s _crc_i386.o +fi # ANSI options for compilers that don't have __STDC__ defined by default @@@@ -505,87 +503,6 @@@@ _EOF_ $CC $CFLAGS -c conftest.c >/dev/null 2>/dev/null [ $? -eq 0 ] && BFLAG="-fno-builtin" - -# Check for missing functions -# add NO_'function_name' to flags if missing - -for func in rmdir strchr strrchr rename mktemp mktime mkstemp -do - echo Check for $func - echo "int main(){ $func(); return 0; }" > conftest.c - $CC $BFLAG -o conftest conftest.c >/dev/null 2>/dev/null - [ $? -ne 0 ] && CFLAGS="${CFLAGS} -DNO_`echo $func | tr '[a-z]' '[A-Z]'`" -done - - -echo Check for memset -echo "int main(){ char k; memset(&k,0,0); return 0; }" > conftest.c -$CC -o conftest conftest.c >/dev/null 2>/dev/null -[ $? -ne 0 ] && CFLAGS="${CFLAGS} -DZMEM" - - -echo Check for memmove -cat > conftest.c << _EOF_ -#include -int main() { int a; int b = 0; memmove( &a, &b, sizeof( a)); return a; } -_EOF_ -$CC -o conftest conftest.c >/dev/null 2>/dev/null -[ $? -ne 0 ] && CFLAGS="${CFLAGS} -DNEED_MEMMOVE" - - -echo Check for strerror -cat > conftest.c << _EOF_ -#include -int main() { strerror( 0); return 0; } -_EOF_ -$CC -o conftest conftest.c >/dev/null 2>/dev/null -[ $? -ne 0 ] && CFLAGS="${CFLAGS} -DNEED_STRERROR" - -echo Check for errno declaration -cat > conftest.c << _EOF_ -#include -main() -{ - errno = 0; - return 0; -} -_EOF_ -$CC $CFLAGS -c conftest.c >/dev/null 2>/dev/null -[ $? -ne 0 ] && CFLAGS="${CFLAGS} -DNO_ERRNO" - - -echo Check for directory libraries -cat > conftest.c << _EOF_ -int main() { return closedir(opendir(".")); } -_EOF_ - -$CC -o conftest conftest.c >/dev/null 2>/dev/null -if [ $? -ne 0 ]; then - OPT="" - for lib in ndir dir ucb bsd BSD PW x dirent - do - $CC -o conftest conftest.c -l$lib >/dev/null 2>/dev/null - [ $? -eq 0 ] && OPT=-l$lib && break - done - if [ ${OPT} ]; then - LFLAGS2="${LFLAGS2} ${OPT}" - else - CFLAGS="${CFLAGS} -DNO_DIR" - fi -fi - - -# Dynix/ptx 1.3 needed this - -echo Check for readlink -echo "int main(){ return readlink(); }" > conftest.c -$CC -o conftest conftest.c >/dev/null 2>/dev/null -if [ $? -ne 0 ]; then - $CC -o conftest conftest.c -lseq >/dev/null 2>/dev/null - [ $? -eq 0 ] && LFLAGS2="${LFLAGS2} -lseq" -fi - - echo Check for directory include file OPT="" for inc in dirent.h sys/ndir.h ndir.h sys/dir.h @ 1.7 log @patch to let SunOS, other than sunpro compilers, use assembler. The problem is more the ilk of the cpp installed.. bump PKGREVISION @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.6 2013/04/16 10:49:31 adam Exp $ d6 2 d66 88 @ 1.6 log @Use CPPFLAGS in configure script: needed on Mac OS X to make use of -isysroot @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.5 2012/09/07 12:57:14 adam Exp $ d29 19 @ 1.5 log @Fix compiler option and disable optimizations from configure @ text @d1 1 a1 1 $NetBSD$ d3 1 d9 9 d29 1 a29 1 @@@@ -235,6 +233,7 @@@@ $CPP conftest.c >/dev/null 2>/dev/null | d37 1 a37 1 @@@@ -257,6 +256,7 @@@@ if eval "$CPP match.S > _match.s 2>/dev/ @ 1.4 log @Allow assembler to be disabled completely and do so with sunpro. @ text @d3 17 a19 3 --- unix/configure.orig Fri Sep 18 14:57:23 2009 +++ unix/configure Fri Sep 18 14:58:24 2009 @@@@ -235,6 +235,7 @@@@ d27 1 a27 1 @@@@ -257,6 +258,7 @@@@ @ 1.3 log @Update to 2.31: New things in Zip 2.31 - Crypt now part of source distribution (see Readme.cr) - Bug fixes: - Debian patch 001 - Converted quoted strings - Debian patch 002 - Makefile changes - Debian patch 003 - Build changes - Debian patch 004 - Changes to unix/configure - Debian patch 005 - Fix for FNMAX path bug - Split VMS -V into -V and -VV (see Manual) - New VC6 project files thanks to Cosmin - AtheOS port (thanks to Ruslan Nickolaev) - Add api.c kluge for zip32.dll to support Visual Basic - Binary detection changed from 20% binary to new algorithm that should better detect word processing files as binary and should accept UTF-8 files as text. This flags the file in the archive as TEXT or BINARY for use by UnZip for line end conversion (see proginfo/txtvsbin.txt) - License update - DJGPP fixes - Many Makefile updates - Fixes to ZipSplit, ZipNotes, and ZipCloak @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.2 2004/12/17 22:41:15 wiz Exp $ d3 15 a17 10 --- unix/unix.c.orig 1999-11-07 15:08:21.000000000 +0100 +++ unix/unix.c @@@@ -319,8 +319,8 @@@@ iztimes *t; /* return value: a file size of -1 */ { struct stat s; /* results of stat() */ - char name[FNMAX]; - int len = strlen(f); + char *name; + size_t len = strlen(f); d19 2 a20 26 if (f == label) { if (a != NULL) @@@@ -331,6 +331,11 @@@@ iztimes *t; /* return value: t->atime = t->mtime = t->ctime = label_utim; return label_time; } + + name = malloc(len+1); + if (!name) + return 0; + strcpy(name, f); if (name[len - 1] == '/') name[len - 1] = '\0'; @@@@ -698,7 +703,11 @@@@ void version_local() #ifdef __QNXNTO__ " (QNX Neutrino)", #else +#ifdef __APPLE__ + " (Mac OS X)", +#else "", +#endif /* Mac OS X */ #endif /* QNX Neutrino */ #endif /* QNX 4 */ #endif /* Convex */ @ 1.2 log @Update to 2.3nb3: Add patch from Mandrake against CAN-2004-1010. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.1 2002/04/18 16:42:31 yyamano Exp $ @ 1.1 log @Fix build on Darwin. All changes are taken from the latest betas of zip. - Add MacOS X to version_local() - unix/configure: Init LFLAGS1 to "", MacOS X doesn't like -s - rename errors array to ziperrors to avoid MacOS X library clash @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- unix/unix.c.orig Sat Mar 2 20:12:55 2002 d5 24 a28 1 @@@@ -698,7 +698,11 @@@@ @