[48955] trunk/dports/lang/perl5.8

[ricci at macports.org]

Revision: 48955
          http://trac.macports.org/changeset/48955
Author:   ricci at macports.org
Date:     2009-03-31 14:58:05 -0700 (Tue, 31 Mar 2009)
Log Message:
-----------
alter the @INC array to be site_perl, vendor_perl, then base
change man page locations and extensions to avoid conflicts with port-installed modules
bump revision

Modified Paths:
--------------
    trunk/dports/lang/perl5.8/Portfile

Added Paths:
-----------
    trunk/dports/lang/perl5.8/files/
    trunk/dports/lang/perl5.8/files/patch-perl.c.diff

Modified: trunk/dports/lang/perl5.8/Portfile
===================================================================
--- trunk/dports/lang/perl5.8/Portfile	2009-03-31 21:54:06 UTC (rev 48954)
+++ trunk/dports/lang/perl5.8/Portfile	2009-03-31 21:58:05 UTC (rev 48955)
@@ -5,7 +5,7 @@
 
 name            perl5.8
 version         5.8.9
-revision        2
+revision        3
 categories      lang
 platforms       darwin freebsd linux
 maintainers     ricci openmaintainer
@@ -27,6 +27,8 @@
     sha1    19843b5a7585cf35d96c07dbcd419bbdd5813617 \
     rmd160  680004238d626ec985075e1b4519b7f0b34f57e5
 
+patchfiles  patch-perl.c.diff
+
 post-patch {
     reinplace "s|/opt/local|${prefix}|g" ${worksrcpath}/Configure
     # Ensure that the ld value set in configure.args is used
@@ -44,9 +46,16 @@
     -D cppflags="\${CPPFLAGS}" \
     -D ldflags="\${LDFLAGS}" \
     -D vendorprefix='${prefix}' \
+    -D man1ext='1pm' \
     -D man3ext='3pm' \
     -D cc=\${CC} \
-    -D ld=\${CC}
+    -D ld=\${CC} \
+    -D man1dir='${prefix}/share/man/man1p' \
+    -D man3dir='${prefix}/share/man/man3p' \
+    -D siteman1dir='${prefix}/share/man/man1' \
+    -D siteman3dir='${prefix}/share/man/man3' \
+    -D vendorman1dir='${prefix}/share/man/man1' \
+    -D vendorman3dir='${prefix}/share/man/man3' 
 
 # Allow perl to find p5-* port installed by the last version
 if { [variant_isset threads] } {

Added: trunk/dports/lang/perl5.8/files/patch-perl.c.diff
===================================================================
--- trunk/dports/lang/perl5.8/files/patch-perl.c.diff	                        (rev 0)
+++ trunk/dports/lang/perl5.8/files/patch-perl.c.diff	2009-03-31 21:58:05 UTC (rev 48955)
@@ -0,0 +1,102 @@
+--- perl.c.b	2008-11-21 10:17:33.000000000 -0800
++++ perl.c	2009-03-09 17:58:13.000000000 -0700
+@@ -4876,45 +4876,14 @@
+     }
+ 
+ /* Use the ~-expanded versions of APPLLIB (undocumented),
+-    ARCHLIB PRIVLIB SITEARCH SITELIB VENDORARCH and VENDORLIB
++    original order: ARCHLIB PRIVLIB SITEARCH SITELIB VENDORARCH and VENDORLIB
++    macports order: SITEARCH SITELIB VENDORARCH VENDORLIB ARCHLIB and PRIVLIB 
+ */
+ #ifdef APPLLIB_EXP
+     incpush(APPLLIB_EXP, TRUE, TRUE, TRUE, TRUE);
+ #endif
+ 
+-#ifdef ARCHLIB_EXP
+-    incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE, TRUE);
+-#endif
+-#ifdef MACOS_TRADITIONAL
+-    {
+-	Stat_t tmpstatbuf;
+-    	SV * privdir = newSV(0);
+-	char * macperl = PerlEnv_getenv("MACPERL");
+-	
+-	if (!macperl)
+-	    macperl = "";
+-	
+-	Perl_sv_setpvf(aTHX_ privdir, "%slib:", macperl);
+-	if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
+-	    incpush(SvPVX(privdir), TRUE, FALSE, TRUE, FALSE);
+-	Perl_sv_setpvf(aTHX_ privdir, "%ssite_perl:", macperl);
+-	if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
+-	    incpush(SvPVX(privdir), TRUE, FALSE, TRUE, FALSE);
+-	
+-   	SvREFCNT_dec(privdir);
+-    }
+-    if (!PL_tainting)
+-	incpush(":", FALSE, FALSE, TRUE, FALSE);
+-#else
+-#ifndef PRIVLIB_EXP
+-#  define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl"
+-#endif
+-#if defined(WIN32)
+-    incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE, TRUE);
+-#else
+-    incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE, TRUE);
+-#endif
+-
++/* start site* locations */
+ #ifdef SITEARCH_EXP
+     /* sitearch is always relative to sitelib on Windows for
+      * DLL-based path intuition to work correctly */
+@@ -4936,7 +4905,9 @@
+     /* Search for version-specific dirs below here */
+     incpush(SITELIB_STEM, FALSE, TRUE, TRUE, TRUE);
+ #endif
++/* end site* locations */
+ 
++/* start vendor* locations */
+ #ifdef PERL_VENDORARCH_EXP
+     /* vendorarch is always relative to vendorlib on Windows for
+      * DLL-based path intuition to work correctly */
+@@ -4956,6 +4927,40 @@
+ #ifdef PERL_VENDORLIB_STEM /* Search for version-specific dirs below here */
+     incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE, TRUE);
+ #endif
++/* end vendor* locations */
++
++#ifdef ARCHLIB_EXP
++    incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE, TRUE);
++#endif
++#ifdef MACOS_TRADITIONAL
++    {
++	Stat_t tmpstatbuf;
++    	SV * privdir = newSV(0);
++	char * macperl = PerlEnv_getenv("MACPERL");
++	
++	if (!macperl)
++	    macperl = "";
++	
++	Perl_sv_setpvf(aTHX_ privdir, "%slib:", macperl);
++	if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
++	    incpush(SvPVX(privdir), TRUE, FALSE, TRUE, FALSE);
++	Perl_sv_setpvf(aTHX_ privdir, "%ssite_perl:", macperl);
++	if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
++	    incpush(SvPVX(privdir), TRUE, FALSE, TRUE, FALSE);
++	
++   	SvREFCNT_dec(privdir);
++    }
++    if (!PL_tainting)
++	incpush(":", FALSE, FALSE, TRUE, FALSE);
++#else
++#ifndef PRIVLIB_EXP
++#  define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl"
++#endif
++#if defined(WIN32)
++    incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE, TRUE);
++#else
++    incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE, TRUE);
++#endif
+ 
+ #ifdef PERL_OTHERLIBDIRS
+     incpush(PERL_OTHERLIBDIRS, TRUE, TRUE, TRUE, TRUE);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090331/1d3cc6d4/attachment-0001.html>