[Midnightbsd-cvs] mports: archivers/p5-IO-Compress-Base: Change our approach to fixing

ctriv at midnightbsd.org ctriv at midnightbsd.org
Fri Oct 10 13:59:30 EDT 2008


Log Message:
-----------
Change our approach to fixing this port.  We always install in
$SITE_PERL/$PERL_ARCH, regardless of perl version.

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

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

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/archivers/p5-IO-Compress-Base/pkg-plist,v
retrieving revision 1.3
retrieving revision 1.4
diff -L archivers/p5-IO-Compress-Base/pkg-plist -L archivers/p5-IO-Compress-Base/pkg-plist -u -r1.3 -r1.4
--- archivers/p5-IO-Compress-Base/pkg-plist
+++ archivers/p5-IO-Compress-Base/pkg-plist
@@ -1,18 +1,13 @@
-%%PERL58%%%%SITE_PERL%%/File/GlobMapper.pm
-%%PERL58%%%%SITE_PERL%%/IO/Compress/Base.pm
-%%PERL58%%%%SITE_PERL%%/IO/Compress/Base/Common.pm
-%%PERL58%%%%SITE_PERL%%/IO/Uncompress/AnyUncompress.pm
-%%PERL58%%%%SITE_PERL%%/IO/Uncompress/Base.pm
-%%PERL510%%%%SITE_PERL%%/%%PERL_ARCH%%/File/GlobMapper.pm
-%%PERL510%%%%SITE_PERL%%/%%PERL_ARCH%%/IO/Compress/Base.pm
-%%PERL510%%%%SITE_PERL%%/%%PERL_ARCH%%/IO/Compress/Base/Common.pm
-%%PERL510%%%%SITE_PERL%%/%%PERL_ARCH%%/IO/Uncompress/AnyUncompress.pm
-%%PERL510%%%%SITE_PERL%%/%%PERL_ARCH%%/IO/Uncompress/Base.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/File/GlobMapper.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/IO/Compress/Base.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/IO/Compress/Base/Common.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/IO/Uncompress/AnyUncompress.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/IO/Uncompress/Base.pm
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Compress/Base
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Compress
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO
- at dirrmtry %%SITE_PERL%%/IO/Uncompress
- at dirrmtry %%SITE_PERL%%/IO/Compress/Base
- at dirrmtry %%SITE_PERL%%/IO/Compress
- at dirrmtry %%SITE_PERL%%/IO
- at dirrmtry %%SITE_PERL%%/File
+ at dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/IO/Uncompress
+ at dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/IO/Compress/Base
+ at dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/IO/Compress
+ at dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/IO
+ at dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/File
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/archivers/p5-IO-Compress-Base/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -L archivers/p5-IO-Compress-Base/Makefile -L archivers/p5-IO-Compress-Base/Makefile -u -r1.7 -r1.8
--- archivers/p5-IO-Compress-Base/Makefile
+++ archivers/p5-IO-Compress-Base/Makefile
@@ -22,12 +22,5 @@
 MAN3=		IO::Uncompress::AnyUncompress.3 IO::Uncompress::Base.3 \
 		File::GlobMapper.3 IO::Compress::Base.3
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.mk>
 
-.if ${PERL_BRANCH} == "5.10"
-PLIST_SUB+=	PERL510="" PERL58="@comment "
-.else
-PLIST_SUB+=	PERL510="@comment " PERL58=""
-.endif
-
-.include <bsd.port.post.mk>
--- /dev/null
+++ archivers/p5-IO-Compress-Base/files/patch-Makefile.PL
@@ -0,0 +1,16 @@
+--- ./Makefile.PL.orig	Wed Sep  3 09:13:04 2008
++++ ./Makefile.PL	Fri Oct 10 13:55:57 2008
+@@ -36,12 +36,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')         : ()),


More information about the Midnightbsd-cvs mailing list