- Added support for installation to DESTDIR.

- Reenabled test targets in Makefile.in (previously broken by pkgsrc
  patches) and in the pkgsrc Makefile.

3 files changed, 25 insertions, 15 deletions

diff --git a/devel/zlib/Makefile b/devel/zlib/Makefile
index 4cf21381c88..9bb659e24ff 100644
--- a/devel/zlib/Makefile
+++ b/devel/zlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2007/01/24 17:28:22 reed Exp $
+# $NetBSD: Makefile,v 1.36 2007/05/15 19:39:12 heinz Exp $
 
 DISTNAME=	zlib-1.2.3
 CATEGORIES=	devel
@@ -11,6 +11,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.zlib.net/
 COMMENT=	General purpose data compression library
 
+PKG_DESTDIR_SUPPORT=	user-destdir
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_LIBTOOL=		yes
@@ -19,4 +20,6 @@ INSTALLATION_DIRS=	include lib ${PKGMANDIR}/man3
 
 MAKE_ENV+=	PKGSRC_LDFLAGS=${LDFLAGS:Q}
 
+TEST_TARGET=	check
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/zlib/distinfo b/devel/zlib/distinfo
index a7c0071788c..380a6714014 100644
--- a/devel/zlib/distinfo
+++ b/devel/zlib/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.16 2007/01/13 13:50:11 schwarz Exp $
+$NetBSD: distinfo,v 1.17 2007/05/15 19:39:12 heinz Exp $
 
 SHA1 (zlib-1.2.3.tar.gz) = 60faeaaf250642db5c0ea36cd6dcc9f99c8f3902
 RMD160 (zlib-1.2.3.tar.gz) = 89a57e336c24f7f6eebda3a1724e14b71187e117
 Size (zlib-1.2.3.tar.gz) = 496597 bytes
-SHA1 (patch-aa) = 92cafd578d8f97c5e67c48b62c0d8b56b795e6ab
+SHA1 (patch-aa) = 91b8f8205186201917a94bed8d0392dc52e991bf
diff --git a/devel/zlib/patches/patch-aa b/devel/zlib/patches/patch-aa
index c592419e0b0..b360955c121 100644
--- a/devel/zlib/patches/patch-aa
+++ b/devel/zlib/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.10 2007/01/13 13:50:11 schwarz Exp $
+$NetBSD: patch-aa,v 1.11 2007/05/15 19:39:12 heinz Exp $
 
---- Makefile.in.orig	2004-09-15 16:27:20.000000000 +0200
-+++ Makefile.in	2005-04-10 12:48:19.000000000 +0200
+--- 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
@@ -10,15 +10,19 @@ $NetBSD: patch-aa,v 1.10 2007/01/13 13:50:11 schwarz Exp $
  
  CFLAGS=-O
  #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
-@@ -54,7 +53,6 @@
+@@ -54,10 +53,9 @@ OBJA =
  
  TEST_OBJS = example.o minigzip.o
  
 -all: example$(EXE) minigzip$(EXE)
  
  check: test
- test: all
-@@ -77,11 +75,11 @@
+-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
  
@@ -34,14 +38,17 @@ $NetBSD: patch-aa,v 1.10 2007/01/13 13:50:11 schwarz Exp $
 +	${LIBTOOL} --mode=compile ${CC} ${CPPFLAGS} ${CFLAGS} -c $<
  
  example$(EXE): example.o $(LIBS)
- 	$(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS)
-@@ -90,6 +88,11 @@
- 	$(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)
+-	$(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 ${PREFIX}/include
-+	${BSD_INSTALL_DATA} zlib.3 ${PREFIX}/${PKGMANDIR}/man3
-+	${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libz.la ${PREFIX}/lib
++	${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