[119340] trunk/dports/lang/perl5.14
mojca at macports.org
mojca at macports.org
Tue Apr 22 18:06:09 PDT 2014
Revision: 119340
https://trac.macports.org/changeset/119340
Author: mojca at macports.org
Date: 2014-04-22 18:06:09 -0700 (Tue, 22 Apr 2014)
Log Message:
-----------
perl5.14: cosmetic clean-up
Modified Paths:
--------------
trunk/dports/lang/perl5.14/Portfile
trunk/dports/lang/perl5.14/files/patch-Configure.diff
trunk/dports/lang/perl5.14/files/patch-Makefile.SH.diff
trunk/dports/lang/perl5.14/files/patch-t_comp_require.t.diff
Removed Paths:
-------------
trunk/dports/lang/perl5.14/files/patch-darwin.sh.diff
trunk/dports/lang/perl5.14/files/patch-perl.c.diff
trunk/dports/lang/perl5.14/files/patch-toke.c.diff
Modified: trunk/dports/lang/perl5.14/Portfile
===================================================================
--- trunk/dports/lang/perl5.14/Portfile 2014-04-23 00:51:38 UTC (rev 119339)
+++ trunk/dports/lang/perl5.14/Portfile 2014-04-23 01:06:09 UTC (rev 119340)
@@ -32,8 +32,6 @@
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
@@ -51,14 +49,15 @@
configure.env LC_ALL=C
configure.cmd sh Configure
configure.pre_args
-configure.universal_args-delete --disable-dependency-tracking
-configure.post_args -des \
- -Dprefix='${prefix}' \
+configure.universal_args-delete \
+ --disable-dependency-tracking
+configure.post_args -des \
+ -Dprefix='${prefix}' \
-Dscriptdir='${prefix}/bin' \
-Dcppflags="\${CPPFLAGS}" \
-Dccflags="\${CFLAGS}" \
-Dldflags="\${LDFLAGS}" \
- -Dvendorprefix='${prefix}' \
+ -Dvendorprefix='${prefix}' \
-Dusemultiplicity=y \
-Dusethreads \
-Duseshrplib \
@@ -124,9 +123,9 @@
}
}
-## livecheck.type regex
-## livecheck.url http://www.cpan.org/src
-## livecheck.regex latest_[join [lrange [split ${version} .] 0 1] .]_is_(\\d+(?:\\.\\d+)*)
+## livecheck.type regex
+## livecheck.url http://www.cpan.org/src
+## livecheck.regex latest_[join [lrange [split ${version} .] 0 1] .]_is_(\\d+(?:\\.\\d+)*)
livecheck.type regex
livecheck.url http://www.cpan.org/src
Modified: trunk/dports/lang/perl5.14/files/patch-Configure.diff
===================================================================
--- trunk/dports/lang/perl5.14/files/patch-Configure.diff 2014-04-23 00:51:38 UTC (rev 119339)
+++ trunk/dports/lang/perl5.14/files/patch-Configure.diff 2014-04-23 01:06:09 UTC (rev 119340)
@@ -1,5 +1,5 @@
---- Configure.orig 2011-05-07 20:10:08.000000000 -0700
-+++ Configure 2011-06-13 12:50:01.000000000 -0700
+--- Configure.orig
++++ Configure
@@ -106,7 +106,7 @@
fi
Modified: trunk/dports/lang/perl5.14/files/patch-Makefile.SH.diff
===================================================================
--- trunk/dports/lang/perl5.14/files/patch-Makefile.SH.diff 2014-04-23 00:51:38 UTC (rev 119339)
+++ trunk/dports/lang/perl5.14/files/patch-Makefile.SH.diff 2014-04-23 01:06:09 UTC (rev 119340)
@@ -1,5 +1,5 @@
---- Makefile.SH.orig 2011-09-26 05:44:34.000000000 -0400
-+++ Makefile.SH 2013-05-12 13:05:36.000000000 -0400
+--- Makefile.SH.orig
++++ Makefile.SH
@@ -830,7 +830,8 @@
$spitshell >>$Makefile <<'!NO!SUBS!'
$(MINIPERL_EXE): $& miniperlmain$(OBJ_EXT) $(mini_obj) opmini$(OBJ_EXT) perlmini$(OBJ_EXT)
Deleted: trunk/dports/lang/perl5.14/files/patch-darwin.sh.diff
===================================================================
--- trunk/dports/lang/perl5.14/files/patch-darwin.sh.diff 2014-04-23 00:51:38 UTC (rev 119339)
+++ trunk/dports/lang/perl5.14/files/patch-darwin.sh.diff 2014-04-23 01:06:09 UTC (rev 119340)
@@ -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.14/files/patch-perl.c.diff
===================================================================
--- trunk/dports/lang/perl5.14/files/patch-perl.c.diff 2014-04-23 00:51:38 UTC (rev 119339)
+++ trunk/dports/lang/perl5.14/files/patch-perl.c.diff 2014-04-23 01:06:09 UTC (rev 119340)
@@ -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.14/files/patch-t_comp_require.t.diff
===================================================================
--- trunk/dports/lang/perl5.14/files/patch-t_comp_require.t.diff 2014-04-23 00:51:38 UTC (rev 119339)
+++ trunk/dports/lang/perl5.14/files/patch-t_comp_require.t.diff 2014-04-23 01:06:09 UTC (rev 119340)
@@ -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.14/files/patch-toke.c.diff
===================================================================
--- trunk/dports/lang/perl5.14/files/patch-toke.c.diff 2014-04-23 00:51:38 UTC (rev 119339)
+++ trunk/dports/lang/perl5.14/files/patch-toke.c.diff 2014-04-23 01:06:09 UTC (rev 119340)
@@ -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/f7e01756/attachment.html>
More information about the macports-changes
mailing list