[48971] trunk/dports/lang/perl5.10
ricci at macports.org
ricci at macports.org
Tue Mar 31 23:02:39 PDT 2009
Revision: 48971
http://trac.macports.org/changeset/48971
Author: ricci at macports.org
Date: 2009-03-31 23:02:37 -0700 (Tue, 31 Mar 2009)
Log Message:
-----------
alter perl5.10 @INC as perl5.8 was altered (in r48955)
don't alter manpage naming/installation as perl5.8, perl5.10 has other conflict-avoiding
mechanisms in place - but do include (commented out) the configure.args for it.
Modified Paths:
--------------
trunk/dports/lang/perl5.10/Portfile
Added Paths:
-----------
trunk/dports/lang/perl5.10/files/patch-perl.c.diff
Modified: trunk/dports/lang/perl5.10/Portfile
===================================================================
--- trunk/dports/lang/perl5.10/Portfile 2009-04-01 05:21:25 UTC (rev 48970)
+++ trunk/dports/lang/perl5.10/Portfile 2009-04-01 06:02:37 UTC (rev 48971)
@@ -4,7 +4,7 @@
name perl5.10
version 5.10.0
-revision 2
+revision 3
categories lang
platforms darwin freebsd linux
maintainers ricci openmaintainer
@@ -26,7 +26,8 @@
rmd160 c6614fc99a162790a703f91085b24a60af903ba2
platform darwin {
- patchfiles-append patch-hints_darwin.diff
+ patchfiles-append patch-hints_darwin.diff \
+ patch-perl.c.diff
pre-configure {
reinplace "s|ld=\"MACOSX_DEPLOYMENT_TARGET=10.3|ld=\"env MACOSX_DEPLOYMENT_TARGET=10.3|g" "${worksrcpath}/hints/darwin.sh"
@@ -40,10 +41,25 @@
configure.env LC_ALL=C
configure.cmd sh Configure
configure.pre_args
-configure.post_args -des -Dprefix='${prefix}' -Dccflags="-I'${prefix}/include'"\
+configure.post_args \
+ -des \
+ -Dprefix='${prefix}' \
+ -Dccflags="-I'${prefix}/include'" \
-Dldflags=-L'${prefix}/lib' \
- -Dvendorprefix='${prefix}'
+ -Dvendorprefix='${prefix}' \
+ -D cc=\${CC} \
+ -D ld=\${CC} \
+## -D man1ext='1pm' \
+## -D man3ext='3pm' \
+## -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'
+
+
universal_variant no
test.run yes
Added: trunk/dports/lang/perl5.10/files/patch-perl.c.diff
===================================================================
--- trunk/dports/lang/perl5.10/files/patch-perl.c.diff (rev 0)
+++ trunk/dports/lang/perl5.10/files/patch-perl.c.diff 2009-04-01 06:02:37 UTC (rev 48971)
@@ -0,0 +1,102 @@
+--- perl.c.orig 2007-12-18 02:47:08.000000000 -0800
++++ perl.c 2009-03-31 22:21:17.000000000 -0700
+@@ -4747,45 +4747,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 */
+@@ -4807,7 +4776,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 */
+@@ -4827,6 +4798,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/7e2e3ff2/attachment.html>
More information about the macports-changes
mailing list