[119339] trunk/dports/lang/perl5.12
mojca at macports.org
mojca at macports.org
Tue Apr 22 17:51:38 PDT 2014
Revision: 119339
https://trac.macports.org/changeset/119339
Author: mojca at macports.org
Date: 2014-04-22 17:51:38 -0700 (Tue, 22 Apr 2014)
Log Message:
-----------
perl5.12: upgrade to 5.12.5 (see #43174)
Modified Paths:
--------------
trunk/dports/lang/perl5.12/Portfile
trunk/dports/lang/perl5.12/files/patch-Configure.diff
trunk/dports/lang/perl5.12/files/patch-Makefile.SH.diff
trunk/dports/lang/perl5.12/files/patch-hints_darwin.sh.diff
trunk/dports/lang/perl5.12/files/patch-t_comp_require.t.diff
Removed Paths:
-------------
trunk/dports/lang/perl5.12/files/patch-darwin.sh.diff
trunk/dports/lang/perl5.12/files/patch-hints_darwin.sh-usenm.diff
trunk/dports/lang/perl5.12/files/patch-perl.c.diff
trunk/dports/lang/perl5.12/files/patch-toke.c.diff
Modified: trunk/dports/lang/perl5.12/Portfile
===================================================================
--- trunk/dports/lang/perl5.12/Portfile 2014-04-23 00:11:15 UTC (rev 119338)
+++ trunk/dports/lang/perl5.12/Portfile 2014-04-23 00:51:38 UTC (rev 119339)
@@ -4,8 +4,7 @@
PortSystem 1.0
name perl5.12
-version 5.12.4
-revision 3
+version 5.12.5
set branch [join [lrange [split ${version} .] 0 1] .]
categories lang
license {Artistic-1 GPL}
@@ -26,16 +25,13 @@
depends_lib-append port:gdbm
-checksums md5 c499a9c04d08b1424fc808104850a0cf \
- sha1 68ff2f4a0901d1e4ea263f452001db0563d2edb3 \
- sha256 c920fa01a34b7752e8cbbc99c6921b908df60611d84a29c4377e4a798604767e
+checksums rmd160 5a88d99650edc6697418ac81d4bd392250cf0e0e \
+ sha256 10749417fd3010aae320a34181ad4cd6a4855c1fc63403b87fa4d630b18e966c
patchfiles patch-Configure.diff patch-handy.h.stdbool.diff
platform darwin {
patchfiles-append patch-hints_darwin.sh.diff
-## patchfiles-append patch-hints_darwin.diff \
-## patch-perl.c.diff
# Prevent miniperl build from finding libstdcxx (#36438).
patchfiles-append patch-Makefile.SH.diff
@@ -82,19 +78,12 @@
-D perlpath="${prefix}/bin/perl${branch}" \
-D startperl="#!${prefix}/bin/perl${branch}"
-platform darwin {
- if {${os.major} >= 11} {
- # bypass stupid check that assumes fprintf must be in libc.dylib
- patchfiles-append patch-hints_darwin.sh-usenm.diff
- }
-}
-
# Allow perl to find p5-* ports installed by previous (minor) versions
set platsuffix ""
if {${os.platform} eq "darwin"} {
set platsuffix "-2level"
}
-configure.args-append "-D inc_version_list=\"5.12.3/${os.platform}-thread-multi${platsuffix} 5.12.3 5.12.2/${os.platform}-thread-multi${platsuffix} 5.12.2 5.12.1/${os.platform}-thread-multi${platsuffix} 5.12.1 5.12.0/${os.platform}-thread-multi${platsuffix} 5.12.0\""
+configure.args-append "-D inc_version_list=\"5.12.4/${os.platform}-thread-multi${platsuffix} 5.12.4 5.12.3/${os.platform}-thread-multi${platsuffix} 5.12.3 5.12.2/${os.platform}-thread-multi${platsuffix} 5.12.2 5.12.1/${os.platform}-thread-multi${platsuffix} 5.12.1 5.12.0/${os.platform}-thread-multi${platsuffix} 5.12.0\""
if {[variant_isset universal]} {
post-configure {
Modified: trunk/dports/lang/perl5.12/files/patch-Configure.diff
===================================================================
--- trunk/dports/lang/perl5.12/files/patch-Configure.diff 2014-04-23 00:11:15 UTC (rev 119338)
+++ trunk/dports/lang/perl5.12/files/patch-Configure.diff 2014-04-23 00:51:38 UTC (rev 119339)
@@ -1,6 +1,6 @@
---- Configure.orig 2009-08-18 12:03:53.000000000 -0700
-+++ Configure 2009-11-10 21:13:09.000000000 -0800
-@@ -103,7 +103,7 @@
+--- Configure.orig
++++ Configure
+@@ -108,7 +108,7 @@
fi
: Proper PATH setting
@@ -9,7 +9,7 @@
paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin"
paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin"
paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin"
-@@ -1303,12 +1303,12 @@
+@@ -1312,12 +1312,12 @@
: change the next line if compiling for Xenix/286 on Xenix/386
xlibpth='/usr/lib/386 /lib/386'
: Possible local library directories to search.
@@ -24,7 +24,7 @@
test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth"
test -f /shlib/libc.so && glibpth="/shlib $glibpth"
test -d /usr/lib64 && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64"
-@@ -1329,7 +1329,7 @@
+@@ -1338,7 +1338,7 @@
: Possible local include directories to search.
: Set locincpth to "" in a hint file to defeat local include searches.
Modified: trunk/dports/lang/perl5.12/files/patch-Makefile.SH.diff
===================================================================
--- trunk/dports/lang/perl5.12/files/patch-Makefile.SH.diff 2014-04-23 00:11:15 UTC (rev 119338)
+++ trunk/dports/lang/perl5.12/files/patch-Makefile.SH.diff 2014-04-23 00:51:38 UTC (rev 119339)
@@ -1,5 +1,5 @@
---- Makefile.SH.orig 2011-06-10 16:30:02.000000000 -0400
-+++ Makefile.SH 2013-05-12 02:06:21.000000000 -0400
+--- Makefile.SH.orig
++++ Makefile.SH
@@ -822,7 +822,8 @@
$spitshell >>$Makefile <<'!NO!SUBS!'
$(MINIPERL_EXE): $& miniperlmain$(OBJ_EXT) $(mini_obj) opmini$(OBJ_EXT) perlmini$(OBJ_EXT)
Deleted: trunk/dports/lang/perl5.12/files/patch-darwin.sh.diff
===================================================================
--- trunk/dports/lang/perl5.12/files/patch-darwin.sh.diff 2014-04-23 00:11:15 UTC (rev 119338)
+++ trunk/dports/lang/perl5.12/files/patch-darwin.sh.diff 2014-04-23 00:51:38 UTC (rev 119339)
@@ -1,10 +0,0 @@
---- hints/darwin.sh.orig 2009-04-14 11:38:15.000000000 -0700
-+++ hints/darwin.sh 2010-03-19 16:23:44.000000000 -0700
-@@ -134,7 +134,6 @@
-
- # Shared library extension is .dylib.
- # Bundle extension is .bundle.
--ld='cc';
- so='dylib';
- dlext='bundle';
- usedl='define';
Deleted: trunk/dports/lang/perl5.12/files/patch-hints_darwin.sh-usenm.diff
===================================================================
--- trunk/dports/lang/perl5.12/files/patch-hints_darwin.sh-usenm.diff 2014-04-23 00:11:15 UTC (rev 119338)
+++ trunk/dports/lang/perl5.12/files/patch-hints_darwin.sh-usenm.diff 2014-04-23 00:51:38 UTC (rev 119339)
@@ -1,11 +0,0 @@
---- hints/darwin.sh.orig 2011-03-10 14:42:17.000000000 +1100
-+++ hints/darwin.sh 2011-03-10 14:43:11.000000000 +1100
-@@ -69,7 +69,7 @@
- archname='darwin';
-
- # nm works.
--usenm='true';
-+usenm='false';
-
- case "$optimize" in
- '')
Modified: trunk/dports/lang/perl5.12/files/patch-hints_darwin.sh.diff
===================================================================
--- trunk/dports/lang/perl5.12/files/patch-hints_darwin.sh.diff 2014-04-23 00:11:15 UTC (rev 119338)
+++ trunk/dports/lang/perl5.12/files/patch-hints_darwin.sh.diff 2014-04-23 00:51:38 UTC (rev 119339)
@@ -1,6 +1,6 @@
---- hints/darwin.sh.orig 2011-01-09 12:20:55.000000000 -0800
-+++ hints/darwin.sh 2011-03-09 01:06:05.000000000 -0800
-@@ -134,7 +134,6 @@ esac
+--- hints/darwin.sh.orig
++++ hints/darwin.sh
+@@ -136,7 +136,6 @@ esac
# Shared library extension is .dylib.
# Bundle extension is .bundle.
@@ -8,7 +8,7 @@
so='dylib';
dlext='bundle';
usedl='define';
-@@ -172,6 +171,34 @@ case "$osvers" in
+@@ -174,6 +173,34 @@ case "$osvers" in
ldflags="${ldflags} -flat_namespace"
lddlflags="${ldflags} -bundle -undefined suppress"
;;
@@ -43,7 +43,7 @@
*)
lddlflags="${ldflags} -bundle -undefined dynamic_lookup"
case "$ld" in
-@@ -253,6 +266,10 @@ esac
+@@ -255,6 +268,10 @@ esac
;;
esac
@@ -54,7 +54,7 @@
##
# System libraries
##
-@@ -317,3 +334,5 @@ ranlib='ranlib'
+@@ -319,3 +336,5 @@ ranlib='ranlib'
# makefile in the same place. Since Darwin uses GNU make, this dodges
# the problem.
firstmakefile=GNUmakefile;
Deleted: trunk/dports/lang/perl5.12/files/patch-perl.c.diff
===================================================================
--- trunk/dports/lang/perl5.12/files/patch-perl.c.diff 2014-04-23 00:11:15 UTC (rev 119338)
+++ trunk/dports/lang/perl5.12/files/patch-perl.c.diff 2014-04-23 00:51:38 UTC (rev 119339)
@@ -1,102 +0,0 @@
---- perl.c 2009-04-22 11:07:41.000000000 -0700
-+++ perl.c 2009-08-24 10:55:26.000000000 -0700
-@@ -4873,45 +4873,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 */
-@@ -4933,7 +4902,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 */
-@@ -4953,6 +4924,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);
Modified: trunk/dports/lang/perl5.12/files/patch-t_comp_require.t.diff
===================================================================
--- trunk/dports/lang/perl5.12/files/patch-t_comp_require.t.diff 2014-04-23 00:11:15 UTC (rev 119338)
+++ trunk/dports/lang/perl5.12/files/patch-t_comp_require.t.diff 2014-04-23 00:51:38 UTC (rev 119339)
@@ -1,5 +1,5 @@
---- t/comp/require.t.orig 2007-12-18 02:47:08.000000000 -0800
-+++ t/comp/require.t 2009-05-13 21:20:43.000000000 -0700
+--- t/comp/require.t.orig
++++ t/comp/require.t
@@ -15,7 +15,7 @@
my $Is_EBCDIC = (ord('A') == 193) ? 1 : 0;
Deleted: trunk/dports/lang/perl5.12/files/patch-toke.c.diff
===================================================================
--- trunk/dports/lang/perl5.12/files/patch-toke.c.diff 2014-04-23 00:11:15 UTC (rev 119338)
+++ trunk/dports/lang/perl5.12/files/patch-toke.c.diff 2014-04-23 00:51:38 UTC (rev 119339)
@@ -1,10 +0,0 @@
---- toke.c.orig 2007-12-18 02:47:08.000000000 -0800
-+++ toke.c 2009-05-13 21:21:32.000000000 -0700
-@@ -692,6 +692,7 @@
- #else
- parser->nexttoke = 0;
- #endif
-+ parser->error_count = oparser ? oparser->error_count : 0;
- parser->copline = NOLINE;
- parser->lex_state = LEX_NORMAL;
- parser->expect = XSTATE;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140422/20db047a/attachment-0001.html>
More information about the macports-changes
mailing list