diff options
| author | seb <seb> | 2002-09-24 23:05:05 +0000 |
|---|---|---|
| committer | seb <seb> | 2002-09-24 23:05:05 +0000 |
| commit | d57f137e1b02596820ace79231c382bd2d157398 (patch) | |
| tree | 62f4a417628968c42f99979a9418eaffa2002e0d | |
| parent | 6ba5df95711f7ecf30c5478a63cce0cf187058c8 (diff) | |
| download | pkgsrc-d57f137e1b02596820ace79231c382bd2d157398.tar.gz | |
buildlink1 -> buildlink2
Use perl5/module.mk
Get ride of a patch by passing zlib's files locations in MAKE_ENV
| -rw-r--r-- | devel/p5-Compress-Zlib/Makefile | 13 | ||||
| -rw-r--r-- | devel/p5-Compress-Zlib/distinfo | 3 | ||||
| -rw-r--r-- | devel/p5-Compress-Zlib/patches/patch-ab | 22 |
3 files changed, 7 insertions, 31 deletions
diff --git a/devel/p5-Compress-Zlib/Makefile b/devel/p5-Compress-Zlib/Makefile index 63268118d02..f69b03e9a98 100644 --- a/devel/p5-Compress-Zlib/Makefile +++ b/devel/p5-Compress-Zlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2002/01/19 03:04:47 mjl Exp $ +# $NetBSD: Makefile,v 1.6 2002/09/24 23:05:05 seb Exp $ DISTNAME= Compress-Zlib-1.16 PKGNAME= p5-${DISTNAME} @@ -9,12 +9,11 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Compress/} MAINTAINER= damon@brodiefamily.org COMMENT= perl5 module interface to the zlib compression library -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Compress/Zlib/.packlist +MAKE_ENV+= ZLIB_LIB=${BUILDLINK_PREFIX.zlib}/lib +MAKE_ENV+= ZLIB_INCLUDE=${BUILDLINK_PREFIX.zlib}/include -do-configure: - @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL - -.include "../../devel/zlib/buildlink.mk" -.include "../../lang/perl5/buildlink.mk" +.include "../../devel/zlib/buildlink2.mk" +.include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/p5-Compress-Zlib/distinfo b/devel/p5-Compress-Zlib/distinfo index 6ecc83d65f8..501e5700037 100644 --- a/devel/p5-Compress-Zlib/distinfo +++ b/devel/p5-Compress-Zlib/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.4 2002/01/19 03:04:47 mjl Exp $ +$NetBSD: distinfo,v 1.5 2002/09/24 23:05:05 seb Exp $ SHA1 (Compress-Zlib-1.16.tar.gz) = 55895bf7312b918fe203041205097b164b793b66 Size (Compress-Zlib-1.16.tar.gz) = 28448 bytes SHA1 (patch-aa) = 40c171f6f1b46b5a20165b836b9f2f6b59fbb828 -SHA1 (patch-ab) = 7953c1cd8b20265bf0f9f2da8f35ab3b35ee8239 diff --git a/devel/p5-Compress-Zlib/patches/patch-ab b/devel/p5-Compress-Zlib/patches/patch-ab deleted file mode 100644 index d96bf6883fc..00000000000 --- a/devel/p5-Compress-Zlib/patches/patch-ab +++ /dev/null @@ -1,22 +0,0 @@ -$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 |