[Midnightbsd-cvs] mports: archivers/p5-IO-Compress-Zlib: always install in arch dir.

[ctriv at midnightbsd.org]

Log Message:
-----------
always install in arch dir.

Modified Files:
--------------
    mports/archivers/p5-IO-Compress-Zlib:
        Makefile (r1.8 -> r1.9)
        pkg-plist (r1.3 -> r1.4)

Added Files:
-----------
    mports/archivers/p5-IO-Compress-Zlib/files:
        patch-Makefile.PL (r1.1)

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/archivers/p5-IO-Compress-Zlib/pkg-plist,v
retrieving revision 1.3
retrieving revision 1.4
diff -L archivers/p5-IO-Compress-Zlib/pkg-plist -L archivers/p5-IO-Compress-Zlib/pkg-plist -u -r1.3 -r1.4
--- archivers/p5-IO-Compress-Zlib/pkg-plist
+++ archivers/p5-IO-Compress-Zlib/pkg-plist
@@ -1,42 +1,25 @@
-%%PERL58%%%%SITE_PERL%%/IO/Compress/Zlib/Constants.pm
-%%PERL58%%%%SITE_PERL%%/IO/Compress/Zip/Constants.pm
-%%PERL58%%%%SITE_PERL%%/IO/Compress/Deflate.pm
-%%PERL58%%%%SITE_PERL%%/IO/Compress/Zip.pm
-%%PERL58%%%%SITE_PERL%%/IO/Compress/RawDeflate.pm
-%%PERL58%%%%SITE_PERL%%/IO/Compress/Gzip.pm
-%%PERL58%%%%SITE_PERL%%/IO/Compress/Adapter/Deflate.pm
-%%PERL58%%%%SITE_PERL%%/IO/Compress/Adapter/Identity.pm
-%%PERL58%%%%SITE_PERL%%/IO/Compress/Gzip/Constants.pm
-%%PERL58%%%%SITE_PERL%%/IO/Compress/Zlib/Extra.pm
-%%PERL58%%%%SITE_PERL%%/IO/Uncompress/RawInflate.pm
-%%PERL58%%%%SITE_PERL%%/IO/Uncompress/Inflate.pm
-%%PERL58%%%%SITE_PERL%%/IO/Uncompress/Unzip.pm
-%%PERL58%%%%SITE_PERL%%/IO/Uncompress/Gunzip.pm
-%%PERL58%%%%SITE_PERL%%/IO/Uncompress/AnyInflate.pm
-%%PERL58%%%%SITE_PERL%%/IO/Uncompress/Adapter/Identity.pm
-%%PERL58%%%%SITE_PERL%%/IO/Uncompress/Adapter/Inflate.pm
-%%PERL510%%%%SITE_PERL%%/%%PERL_ARCH%%/IO/Compress/Zlib/Constants.pm
-%%PERL510%%%%SITE_PERL%%/%%PERL_ARCH%%/IO/Compress/Zip/Constants.pm
-%%PERL510%%%%SITE_PERL%%/%%PERL_ARCH%%/IO/Compress/Deflate.pm
-%%PERL510%%%%SITE_PERL%%/%%PERL_ARCH%%/IO/Compress/Zip.pm
-%%PERL510%%%%SITE_PERL%%/%%PERL_ARCH%%/IO/Compress/RawDeflate.pm
-%%PERL510%%%%SITE_PERL%%/%%PERL_ARCH%%/IO/Compress/Gzip.pm
-%%PERL510%%%%SITE_PERL%%/%%PERL_ARCH%%/IO/Compress/Adapter/Deflate.pm
-%%PERL510%%%%SITE_PERL%%/%%PERL_ARCH%%/IO/Compress/Adapter/Identity.pm
-%%PERL510%%%%SITE_PERL%%/%%PERL_ARCH%%/IO/Compress/Gzip/Constants.pm
-%%PERL510%%%%SITE_PERL%%/%%PERL_ARCH%%/IO/Compress/Zlib/Extra.pm
-%%PERL510%%%%SITE_PERL%%/%%PERL_ARCH%%/IO/Uncompress/RawInflate.pm
-%%PERL510%%%%SITE_PERL%%/%%PERL_ARCH%%/IO/Uncompress/Inflate.pm
-%%PERL510%%%%SITE_PERL%%/%%PERL_ARCH%%/IO/Uncompress/Unzip.pm
-%%PERL510%%%%SITE_PERL%%/%%PERL_ARCH%%/IO/Uncompress/Gunzip.pm
-%%PERL510%%%%SITE_PERL%%/%%PERL_ARCH%%/IO/Uncompress/AnyInflate.pm
-%%PERL510%%%%SITE_PERL%%/%%PERL_ARCH%%/IO/Uncompress/Adapter/Identity.pm
-%%PERL510%%%%SITE_PERL%%/%%PERL_ARCH%%/IO/Uncompress/Adapter/Inflate.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/IO/Compress/Zlib/Constants.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/IO/Compress/Zip/Constants.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/IO/Compress/Deflate.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/IO/Compress/Zip.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/IO/Compress/RawDeflate.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/IO/Compress/Gzip.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/IO/Compress/Adapter/Deflate.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/IO/Compress/Adapter/Identity.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/IO/Compress/Gzip/Constants.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/IO/Compress/Zlib/Extra.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/IO/Uncompress/RawInflate.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/IO/Uncompress/Inflate.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/IO/Uncompress/Unzip.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/IO/Uncompress/Gunzip.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/IO/Uncompress/AnyInflate.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/IO/Uncompress/Adapter/Identity.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/IO/Uncompress/Adapter/Inflate.pm
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Compress/Zlib
- at dirrm %%SITE_PERL%%/IO/Uncompress/Adapter
- at dirrmtry %%SITE_PERL%%/IO/Uncompress
- at dirrm %%SITE_PERL%%/IO/Compress/Adapter
- at dirrm %%SITE_PERL%%/IO/Compress/Gzip
- at dirrm %%SITE_PERL%%/IO/Compress/Zip
- at dirrm %%SITE_PERL%%/IO/Compress/Zlib
- at dirrmtry %%SITE_PERL%%/IO/Compress
+ at dirrm %%SITE_PERL%%/%%PERL_ARCH%%/IO/Uncompress/Adapter
+ at dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/IO/Uncompress
+ at dirrm %%SITE_PERL%%/%%PERL_ARCH%%/IO/Compress/Adapter
+ at dirrm %%SITE_PERL%%/%%PERL_ARCH%%/IO/Compress/Gzip
+ at dirrm %%SITE_PERL%%/%%PERL_ARCH%%/IO/Compress/Zip
+ at dirrm %%SITE_PERL%%/%%PERL_ARCH%%/IO/Compress/Zlib
+ at dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/IO/Compress
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/archivers/p5-IO-Compress-Zlib/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -L archivers/p5-IO-Compress-Zlib/Makefile -L archivers/p5-IO-Compress-Zlib/Makefile -u -r1.8 -r1.9
--- archivers/p5-IO-Compress-Zlib/Makefile
+++ archivers/p5-IO-Compress-Zlib/Makefile
@@ -16,6 +16,9 @@
 COMMENT=	Perl5 interface for reading and writing of (g)zip files
 LICENSE=	perl
 
+BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Compress/Raw/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Raw-Zlib \
+		${SITE_PERL}/${PERL_ARCH}/IO/Compress/Base.pm:${PORTSDIR}/archivers/p5-IO-Compress-Base
+
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	YES
@@ -26,16 +29,5 @@
 		IO::Compress::RawDeflate.3 IO::Uncompress::AnyInflate.3 \
 		IO::Compress::Gzip.3
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_BRANCH} == "5.10"
-PLIST_SUB+=	PERL510="" PERL58="@comment "
-BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Compress/Raw/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Raw-Zlib \
-		${SITE_PERL}/${PERL_ARCH}/IO/Compress/Base.pm:${PORTSDIR}/archivers/p5-IO-Compress-Base
-.else
-PLIST_SUB+=	PERL510="@comment " PERL58=""
-BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Compress/Raw/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Raw-Zlib \
-		${SITE_PERL}/IO/Compress/Base.pm:${PORTSDIR}/archivers/p5-IO-Compress-Base
-.endif
+.include <bsd.port.mk>
 
-.include <bsd.port.post.mk>
--- /dev/null
+++ archivers/p5-IO-Compress-Zlib/files/patch-Makefile.PL
@@ -0,0 +1,17 @@
+--- ./Makefile.PL.orig	Fri Oct 10 14:01:19 2008
++++ ./Makefile.PL	Fri Oct 10 14:02:29 2008
+@@ -50,13 +50,7 @@
+     ),
+ 
+     INSTALLDIRS => ($] >= 5.009 ? 'perl' : 'site'),
+-
+-    (
+-    $] >= 5.009 && ! $ENV{PERL_CORE}
+-        ? (INST_LIB    => 'blib/arch')
+-        : ()
+-    ),
+-
++    INST_LIB => 'blib/arch',
+ 
+     ((ExtUtils::MakeMaker->VERSION() gt '6.30') ?
+         ('LICENSE'  => 'perl')         : ()),