head 1.12; access; symbols pkgsrc-2013Q2:1.12.0.24 pkgsrc-2013Q2-base:1.12 pkgsrc-2012Q4:1.12.0.22 pkgsrc-2012Q4-base:1.12 pkgsrc-2011Q4:1.12.0.20 pkgsrc-2011Q4-base:1.12 pkgsrc-2011Q2:1.12.0.18 pkgsrc-2011Q2-base:1.12 pkgsrc-2009Q4:1.12.0.16 pkgsrc-2009Q4-base:1.12 pkgsrc-2008Q4:1.12.0.14 pkgsrc-2008Q4-base:1.12 pkgsrc-2008Q3:1.12.0.12 pkgsrc-2008Q3-base:1.12 cube-native-xorg:1.12.0.10 cube-native-xorg-base:1.12 pkgsrc-2008Q2:1.12.0.8 pkgsrc-2008Q2-base:1.12 pkgsrc-2008Q1:1.12.0.6 pkgsrc-2008Q1-base:1.12 pkgsrc-2007Q4:1.12.0.4 pkgsrc-2007Q4-base:1.12 pkgsrc-2007Q3:1.12.0.2 pkgsrc-2007Q3-base:1.12 pkgsrc-2007Q2:1.11.0.2 pkgsrc-2007Q2-base:1.11 pkgsrc-2007Q1:1.10.0.2 pkgsrc-2007Q1-base:1.10 pkgsrc-2006Q4:1.9.0.8 pkgsrc-2006Q4-base:1.9 pkgsrc-2006Q3:1.9.0.6 pkgsrc-2006Q3-base:1.9 pkgsrc-2006Q2:1.9.0.4 pkgsrc-2006Q2-base:1.9 pkgsrc-2006Q1:1.9.0.2 pkgsrc-2006Q1-base:1.9 pkgsrc-2005Q4:1.8.0.6 pkgsrc-2005Q4-base:1.8 pkgsrc-2005Q3:1.8.0.4 pkgsrc-2005Q3-base:1.8 pkgsrc-2005Q2:1.8.0.2 pkgsrc-2005Q2-base:1.8 pkgsrc-2005Q1:1.7.0.8 pkgsrc-2005Q1-base:1.7 pkgsrc-2004Q4:1.7.0.6 pkgsrc-2004Q4-base:1.7 pkgsrc-2004Q3:1.7.0.4 pkgsrc-2004Q3-base:1.7 pkgsrc-2004Q2:1.7.0.2 pkgsrc-2004Q2-base:1.7 pkgsrc-2004Q1:1.5.0.2 pkgsrc-2004Q1-base:1.5 pkgsrc-2003Q4:1.3.0.4 pkgsrc-2003Q4-base:1.3 netbsd-1-6-1:1.3.0.2 buildlink2-base:1.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.12 date 2007.08.02.13.22.21; author joerg; state dead; branches; next 1.11; 1.11 date 2007.05.15.19.39.12; author heinz; state Exp; branches; next 1.10; 1.10 date 2007.01.13.13.50.11; author schwarz; state Exp; branches; next 1.9; 1.9 date 2005.12.27.17.27.58; author reed; state Exp; branches; next 1.8; 1.8 date 2005.04.10.17.43.27; author schwarz; state Exp; branches; next 1.7; 1.7 date 2004.05.26.03.20.38; author jschauma; state Exp; branches; next 1.6; 1.6 date 2004.05.08.01.06.26; author tv; state Exp; branches; next 1.5; 1.5 date 2004.03.12.03.00.24; author tv; state Exp; branches; next 1.4; 1.4 date 2004.01.12.21.19.50; author adam; state Exp; branches; next 1.3; 1.3 date 2003.03.05.13.05.45; author salo; state Exp; branches 1.3.2.1; next 1.2; 1.2 date 99.09.20.23.23.59; author kim; state dead; branches; next 1.1; 1.1 date 99.09.19.21.53.29; author kim; state Exp; branches 1.1.1.1; next ; 1.3.2.1 date 2003.03.05.13.05.45; author grant; state dead; branches; next 1.3.2.2; 1.3.2.2 date 2003.06.19.00.50.50; author grant; state Exp; branches; next ; 1.1.1.1 date 99.09.19.21.53.29; author kim; state Exp; branches; next ; desc @@ 1.12 log @Use in-tree versions. The replacement Makefile can be used for direct builds in bootstrap tools as well. @ text @$NetBSD: patch-aa,v 1.11 2007/05/15 19:39:12 heinz Exp $ --- Makefile.in.orig 2005-07-18 04:25:21.000000000 +0200 +++ Makefile.in @@@@ -16,7 +16,6 @@@@ # To install in $HOME instead of /usr/local, use: # make install prefix=$HOME -CC=cc CFLAGS=-O #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7 @@@@ -54,10 +53,9 @@@@ OBJA = TEST_OBJS = example.o minigzip.o -all: example$(EXE) minigzip$(EXE) check: test -test: all +test: all example minigzip @@LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \ echo hello world | ./minigzip | ./minigzip -d || \ echo ' *** minigzip test FAILED ***' ; \ @@@@ -77,19 +75,24 @@@@ match.o: match.S mv _match.o match.o rm -f _match.s -$(SHAREDLIBV): $(OBJS) - $(LDSHARED) -o $@@ $(OBJS) - rm -f $(SHAREDLIB) $(SHAREDLIBM) - ln -s $@@ $(SHAREDLIB) - ln -s $@@ $(SHAREDLIBM) +all: $(OBJS) + ${LIBTOOL} --mode=link ${CC} ${CPPFLAGS} ${CFLAGS} ${PKGSRC_LDFLAGS} -o libz.la ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -version-info 1:2 + +.c.o: + ${LIBTOOL} --mode=compile ${CC} ${CPPFLAGS} ${CFLAGS} -c $< example$(EXE): example.o $(LIBS) - $(CC) $(CFLAGS) -o $@@ example.o $(LDFLAGS) + ${LIBTOOL} --mode=link ${CC} ${CPPFLAGS} ${CFLAGS} ${PKGSRC_LDFLAGS} -o $@@ $> minigzip$(EXE): minigzip.o $(LIBS) - $(CC) $(CFLAGS) -o $@@ minigzip.o $(LDFLAGS) + ${LIBTOOL} --mode=link ${CC} ${CPPFLAGS} ${CFLAGS} ${PKGSRC_LDFLAGS} -o $@@ $> install: $(LIBS) + ${BSD_INSTALL_DATA} zconf.h zlib.h ${DESTDIR}${PREFIX}/include + ${BSD_INSTALL_DATA} zlib.3 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3 + ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libz.la ${DESTDIR}${PREFIX}/lib + +installold: $(LIBS) -@@if [ ! -d $(exec_prefix) ]; then mkdir -p $(exec_prefix); fi -@@if [ ! -d $(includedir) ]; then mkdir -p $(includedir); fi -@@if [ ! -d $(libdir) ]; then mkdir -p $(libdir); fi @ 1.11 log @- Added support for installation to DESTDIR. - Reenabled test targets in Makefile.in (previously broken by pkgsrc patches) and in the pkgsrc Makefile. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.10 2007/01/13 13:50:11 schwarz Exp $ @ 1.10 log @make sure that pkgsrc's LDFLAGS is used when linking @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.9 2005/12/27 17:27:58 reed Exp $ d3 2 a4 2 --- Makefile.in.orig 2004-09-15 16:27:20.000000000 +0200 +++ Makefile.in 2005-04-10 12:48:19.000000000 +0200 d13 1 a13 1 @@@@ -54,7 +53,6 @@@@ d20 6 a25 2 test: all @@@@ -77,11 +75,11 @@@@ d41 6 a46 3 $(CC) $(CFLAGS) -o $@@ example.o $(LDFLAGS) @@@@ -90,6 +88,11 @@@@ $(CC) $(CFLAGS) -o $@@ minigzip.o $(LDFLAGS) d49 3 a51 3 + ${BSD_INSTALL_DATA} zconf.h zlib.h ${PREFIX}/include + ${BSD_INSTALL_DATA} zlib.3 ${PREFIX}/${PKGMANDIR}/man3 + ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libz.la ${PREFIX}/lib @ 1.9 log @Honor PKGMANDIR. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.8 2005/04/10 17:43:27 schwarz Exp $ d31 1 a31 1 + ${LIBTOOL} --mode=link ${CC} ${CFLAGS} -o libz.la ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -version-info 1:2 @ 1.8 log @ prevent patch-aa from elimiating CFLAGS= from Makefile.in. This enables configure to pass the CFLAGS it has determined which would otherwise get ignored. Pkgsrc CFLAGS are taken into account by configure already. Change approved by recht. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.7 2004/05/26 03:20:38 jschauma Exp $ d43 1 a43 1 + ${BSD_INSTALL_DATA} zlib.3 ${PREFIX}/man/man3 @ 1.7 log @Use CFLAGS when creating the archive. This fixes building under IRIX64 using gcc, as we need the ABI specific flags. @ text @d1 1 a1 1 $NetBSD: $ d3 3 a5 3 --- Makefile.in.orig 2003-11-08 21:29:23.000000000 -0500 +++ Makefile.in 2004-05-25 23:07:04.000000000 -0400 @@@@ -16,9 +16,7 @@@@ d11 1 a11 1 -CFLAGS=-O d13 1 a13 3 #CFLAGS=-g -DDEBUG #CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ @@@@ -54,7 +52,6 @@@@ d21 1 a21 1 @@@@ -77,11 +74,11 @@@@ d38 1 a38 1 @@@@ -90,6 +87,11 @@@@ @ 1.6 log @nb1: install shlib as executable. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.5 2004/03/12 03:00:24 tv Exp $ d3 2 a4 2 --- Makefile.in.orig 2003-11-09 02:29:23.000000000 +0000 +++ Makefile.in d15 1 a15 1 @@@@ -54,7 +52,6 @@@@ OBJA = d23 1 a23 1 @@@@ -77,11 +74,11 @@@@ match.o: match.S d33 1 a33 1 + ${LIBTOOL} --mode=link ${CC} -o libz.la ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -version-info 1:2 d40 1 a40 1 @@@@ -90,6 +87,11 @@@@ minigzip$(EXE): minigzip.o $(LIBS) @ 1.5 log @Obey CPPFLAGS. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.4 2004/01/12 21:19:50 adam Exp $ d46 1 a46 1 + ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} libz.la ${PREFIX}/lib @ 1.4 log @Changes 1.2.1: * inflate is about 20% faster and minimizes memory allocation * crc32 is about 50% faster * new functions and functionality * more supported architectures @ text @d1 1 a1 1 $NetBSD$ d36 1 a36 1 + ${LIBTOOL} --mode=compile ${CC} ${CFLAGS} -c $< @ 1.3 log @Added fix for CAN-2003-0107 - Buffer overflow in the gzprintf function in zlib 1.1.4, when zlib is compiled without vsnprintf or when long inputs are truncated using vsnprintf, allows attackers to cause a denial of service or possibly execute arbitrary code. From OpenBSD. Restore configure target and add check for [v]snprintf. Bump PKGREVISION. @ text @d3 49 a51 19 --- lt.mk.orig 2003-03-05 04:17:05.000000000 +0100 +++ lt.mk 2003-03-05 04:18:44.000000000 +0100 @@@@ -10,6 +10,7 @@@@ zutil.c CPPFLAGS+= -I${.CURDIR} +CFLAGS= CLEANFILES+= minigzip @@@@ -34,7 +35,7 @@@@ .SUFFIXES: .lo .c .c.lo: - ${LIBTOOL} ${CC} -c $*.c + ${LIBTOOL} ${CC} ${CFLAGS} -c $*.c lib${LIB}.la: ${SRCS:.c=.lo} ${LIBTOOL} ${CC} -o lib${LIB}.la ${SRCS:.c=.lo} \ -rpath ${LIBDIR} \ @ 1.3.2.1 log @file patch-aa was added on branch netbsd-1-6-1 on 2003-06-19 00:50:50 +0000 @ text @d1 21 @ 1.3.2.2 log @Create new file from rev 1.3 (requested by salo in ticket #1291): Darwin has no static libz, mark it incompatible. mark Linux zlib as incompatible to avoid using base zlib which can cause problems with pkgsrc libtool, eg. libtool: link: AGE `4' is greater than the current interface number `1' libtool: link: `1:1:4' is not valid version information libtool: install: `libz.la' is not a valid libtool archive Added fix for CAN-2003-0107 - Buffer overflow in the gzprintf function in zlib 1.1.4, when zlib is compiled without vsnprintf or when long inputs are truncated using vsnprintf, allows attackers to cause a denial of service or possibly execute arbitrary code. From OpenBSD. Restore configure target and add check for [v]snprintf. Bump PKGREVISION. @ text @a0 21 $NetBSD: patch-aa,v 1.3.2.1 2003/06/19 00:50:50 grant Exp $ --- lt.mk.orig 2003-03-05 04:17:05.000000000 +0100 +++ lt.mk 2003-03-05 04:18:44.000000000 +0100 @@@@ -10,6 +10,7 @@@@ zutil.c CPPFLAGS+= -I${.CURDIR} +CFLAGS= CLEANFILES+= minigzip @@@@ -34,7 +35,7 @@@@ .SUFFIXES: .lo .c .c.lo: - ${LIBTOOL} ${CC} -c $*.c + ${LIBTOOL} ${CC} ${CFLAGS} -c $*.c lib${LIB}.la: ${SRCS:.c=.lo} ${LIBTOOL} ${CC} -o lib${LIB}.la ${SRCS:.c=.lo} \ -rpath ${LIBDIR} \ @ 1.2 log @Well, today this procedure works better... @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1 1999/09/19 21:53:29 kim Exp $ d3 19 a21 10 --- configure.orig Wed Jul 8 14:19:35 1998 +++ configure Sun Sep 19 17:45:48 1999 @@@@ -73,6 +73,7 @@@@ CFLAGS="$cflags" case `(uname -s || echo unknown) 2>/dev/null` in Linux | linux) LDSHARED=${LDSHARED-"gcc -shared -Wl,-soname,libz.so.1"};; + SunOS\ 5*) LDSHARED=${LDSHARED-"gcc -G -Wl,-soname,libz.so.1"};; *) LDSHARED=${LDSHARED-"gcc -shared"};; esac else @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ @ 1.1.1.1 log @A general purpose data compression library (for Solaris use). @ text @@