Standardise on one p5-Compress-Zlib package, and one version (1.14).

Use buildlink functionality, provided by jlam.
Unknown changes since previous version (1.11).

6 files changed, 49 insertions, 11 deletions

diff --git a/devel/p5-Compress-Zlib/Makefile b/devel/p5-Compress-Zlib/Makefile
index 4fd983859f9..8a903db5966 100644
--- a/devel/p5-Compress-Zlib/Makefile
+++ b/devel/p5-Compress-Zlib/Makefile
@@ -1,17 +1,18 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/03/05 20:21:26 jtb Exp $
+# $NetBSD: Makefile,v 1.2 2001/10/01 10:33:53 agc Exp $
 
-DISTNAME=		Compress-Zlib-1.11
+DISTNAME=		Compress-Zlib-1.14
 PKGNAME=		p5-${DISTNAME}
 CATEGORIES=		devel perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Compress/}
 
 MAINTAINER=		damon@brodiefamily.org
-COMMENT=		Compress::Zlib - Perl interface to info-zip zlib compression library
+COMMENT=		perl5 module interface to the zlib compression library
 
-USE_PERL5=		# defined
+USE_PERL5=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Compress/Zlib/.packlist
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
+.include "../../devel/zlib/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Compress-Zlib/distinfo b/devel/p5-Compress-Zlib/distinfo
index d31d8f2d863..bdcf949f23a 100644
--- a/devel/p5-Compress-Zlib/distinfo
+++ b/devel/p5-Compress-Zlib/distinfo
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 00:44:34 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/10/01 10:33:54 agc Exp $
 
-SHA1 (Compress-Zlib-1.11.tar.gz) = cf4fc88471fafcdf1016f9a49a426091b2a6f531
-Size (Compress-Zlib-1.11.tar.gz) = 24838 bytes
+SHA1 (Compress-Zlib-1.14.tar.gz) = cce69e0004d4594e46e02fa16404fd19bd3f5280
+Size (Compress-Zlib-1.14.tar.gz) = 25022 bytes
+SHA1 (patch-aa) = 40c171f6f1b46b5a20165b836b9f2f6b59fbb828
+SHA1 (patch-ab) = 7953c1cd8b20265bf0f9f2da8f35ab3b35ee8239
diff --git a/devel/p5-Compress-Zlib/patches/patch-aa b/devel/p5-Compress-Zlib/patches/patch-aa
new file mode 100644
index 00000000000..99ef328022b
--- /dev/null
+++ b/devel/p5-Compress-Zlib/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2001/10/01 10:33:54 agc Exp $
+
+--- Makefile.PL.orig	Thu May 31 18:24:58 2001
++++ Makefile.PL
+@@ -27,7 +27,7 @@
+ 			    },
+ 	($BUILD_ZLIB
+ 	  ? (MYEXTLIB	=> "$ZLIB_LIB/libz\$(LIB_EXT)")
+-	  : (LIBS	=> [ "-L$ZLIB_LIB -lz " ])
++	  : (LIBS	=> [ "-L$ZLIB_LIB -R$ZLIB_LIB -lz " ])
+ 	),  
+ 	($] >= 5.005
+ 	    ? (ABSTRACT_FROM	=> 'Zlib.pm',
diff --git a/devel/p5-Compress-Zlib/patches/patch-ab b/devel/p5-Compress-Zlib/patches/patch-ab
new file mode 100644
index 00000000000..d96bf6883fc
--- /dev/null
+++ b/devel/p5-Compress-Zlib/patches/patch-ab
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.1 2001/10/01 10:33:54 agc Exp $
+
+--- config.in.orig	Thu May 31 18:16:04 2001
++++ config.in
+@@ -25,7 +25,7 @@
+ #    If you have set BUILD_ZLIB above to True, the path should point to the
+ #    zlib source directory. A relative path is sufficient.
+ 
+-INCLUDE 	= /usr/local/include
++INCLUDE 	= ${LOCALBASE}/include
+ #INCLUDE 	= ./zlib-1.1.3
+ 
+ # 3. Where is libz?
+@@ -35,7 +35,7 @@
+ #    If you have set BUILD_ZLIB above to True, the path should point to the
+ #    zlib source directory. A relative path is sufficient.
+ 
+-LIB	= /usr/local/lib
++LIB	= ${LOCALBASE}/lib
+ #LIB	= ./zlib-1.1.3
+ 
+ # end of file config.in
diff --git a/devel/p5-Compress-Zlib/pkg/DESCR b/devel/p5-Compress-Zlib/pkg/DESCR
index fa925d8d1f2..a0aed90c2fd 100644
--- a/devel/p5-Compress-Zlib/pkg/DESCR
+++ b/devel/p5-Compress-Zlib/pkg/DESCR
@@ -1,3 +1,3 @@
-This module provides a Perl interface to part of the info-zip zlib
-compression library.  For more details see the pod documentation
-embedded in the file Zlib.pm.
+The Compress::Zlib module provides a Perl interface to the zlib compression
+library. Most of the functionality provided by zlib is available in
+Compress::Zlib.
diff --git a/devel/p5-Compress-Zlib/pkg/PLIST b/devel/p5-Compress-Zlib/pkg/PLIST
index 7187fb95ddf..e07a580cc2a 100644
--- a/devel/p5-Compress-Zlib/pkg/PLIST
+++ b/devel/p5-Compress-Zlib/pkg/PLIST
@@ -1 +1 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/03/05 20:21:26 jtb Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/10/01 10:33:54 agc Exp $