aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormat <mat@FreeBSD.org>2017-01-09 19:26:58 +0800
committermat <mat@FreeBSD.org>2017-01-09 19:26:58 +0800
commite19fe9626feec205cf1fa2b18c6d3924b4e4a32c (patch)
treeb021e535ac48e7a6d645a739940cc1d8bc5d753d
parenta0d23dc88366993ce4a66611e3edd5e4be2b2b10 (diff)
downloadfreebsd-ports-gnome-e19fe9626feec205cf1fa2b18c6d3924b4e4a32c.tar.gz
freebsd-ports-gnome-e19fe9626feec205cf1fa2b18c6d3924b4e4a32c.tar.zst
freebsd-ports-gnome-e19fe9626feec205cf1fa2b18c6d3924b4e4a32c.zip
Update to v5.25.8-184-g8f7edc6.
Changes: https://github.com/Perl/perl5/compare/v5.25.8-128-g74ef8fd...v5.25.8-184-g8f7edc6 Sponsored by: Absolight
-rw-r--r--lang/perl5-devel/Makefile4
-rw-r--r--lang/perl5-devel/distinfo6
-rw-r--r--lang/perl5-devel/files/patch-Configure8
-rw-r--r--lang/perl5-devel/files/patch-dtrace266
4 files changed, 9 insertions, 275 deletions
diff --git a/lang/perl5-devel/Makefile b/lang/perl5-devel/Makefile
index 3b5e3947de66..e37cdf5a4ff6 100644
--- a/lang/perl5-devel/Makefile
+++ b/lang/perl5-devel/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= perl
-PORTREVISION= 1
+PORTREVISION= 0
# XXX Remove second line, uncomment first
#DISTVERSION= ${PERL_VERSION}
DISTVERSION= ${GH_TAGNAME:C/^v//:C/-g[0-9a-f]*$//}
@@ -30,7 +30,7 @@ TEST_ENV= ${MAKE_ENV} TEST_JOBS=${MAKE_JOBS_NUMBER} \
USE_GITHUB= yes
GH_ACCOUNT= Perl
GH_PROJECT= perl5
-GH_TAGNAME= v5.25.8-128-g74ef8fd
+GH_TAGNAME= v5.25.8-184-g8f7edc6
MAKE_JOBS_UNSAFE= yes
diff --git a/lang/perl5-devel/distinfo b/lang/perl5-devel/distinfo
index a316d1555c1a..e43634b7beb7 100644
--- a/lang/perl5-devel/distinfo
+++ b/lang/perl5-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1483348828
-SHA256 (perl/perl-5.25.8-128_GH0.tar.gz) = d98c6bf39c880f8ccc2de19a96b3f443d39de15140a908f05acc463718f884ce
-SIZE (perl/perl-5.25.8-128_GH0.tar.gz) = 18428381
+TIMESTAMP = 1483958026
+SHA256 (perl/perl-5.25.8-184_GH0.tar.gz) = 88f660f7a94b8fdfe528be978ab65004ae9065076cc1553d0fb3df3d9ec37bab
+SIZE (perl/perl-5.25.8-184_GH0.tar.gz) = 18429683
diff --git a/lang/perl5-devel/files/patch-Configure b/lang/perl5-devel/files/patch-Configure
index b52dbccc03ec..31dcd5a8fb50 100644
--- a/lang/perl5-devel/files/patch-Configure
+++ b/lang/perl5-devel/files/patch-Configure
@@ -1,6 +1,6 @@
---- Configure.orig 2016-11-14 00:17:42 UTC
+--- Configure.orig 2017-01-09 00:09:50 UTC
+++ Configure
-@@ -3879,7 +3879,10 @@ esac
+@@ -3880,7 +3880,10 @@ esac
. ./posthint.sh
: who configured the system
@@ -12,7 +12,7 @@
case "$cf_by" in
"")
cf_by=`(logname) 2>/dev/null`
-@@ -5060,7 +5063,7 @@ esac
+@@ -5061,7 +5064,7 @@ esac
: Now check and see which directories actually exist, avoiding duplicates
for xxx in $dlist
do
@@ -21,7 +21,7 @@
case " $libpth " in
*" $xxx "*) ;;
*) libpth="$libpth $xxx";;
-@@ -9655,8 +9658,7 @@ prefixvar=siteman3dir
+@@ -9656,8 +9659,7 @@ prefixvar=siteman3dir
: determine where add-on public executable scripts go
case "$sitescript" in
diff --git a/lang/perl5-devel/files/patch-dtrace b/lang/perl5-devel/files/patch-dtrace
deleted file mode 100644
index b709a7de45e0..000000000000
--- a/lang/perl5-devel/files/patch-dtrace
+++ /dev/null
@@ -1,266 +0,0 @@
---- Configure.orig 2016-12-26 12:49:24 UTC
-+++ Configure
-@@ -949,6 +949,7 @@ lddlflags=''
- usedl=''
- doublesize=''
- dtraceobject=''
-+dtracexnolibs=''
- ebcdic=''
- fflushNULL=''
- fflushall=''
-@@ -8202,10 +8203,19 @@ while $test 1 ; do
-
- if $test -f $dtrace
- then
-- if $dtrace -h -s ../perldtrace.d \
-+ if $dtrace -h -xnolibs -s ../perldtrace.d \
- -o perldtrace.tmp >/dev/null 2>&1 \
- && rm -f perldtrace.tmp
- then
-+ default_xnolibs=$define
-+ echo " "
-+ echo "Good: your $dtrace knows about the -h flag"
-+ echo "and apparently the -xnolibs flag."
-+ elif $dtrace -h -s ../perldtrace.d \
-+ -o perldtrace.tmp >/dev/null 2>&1 \
-+ && rm -f perldtrace.tmp
-+ then
-+ default_xnolibs=$undef
- echo " "
- echo "Good: your $dtrace knows about the -h flag."
- else
-@@ -8219,6 +8229,17 @@ while $test 1 ; do
- EOM
- exit 1
- fi
-+ case "$dtracexnolibs" in
-+ $define|true|[yY]*)
-+ dtracxnolibs=$define
-+ ;;
-+ ''|' ')
-+ dtracexnolibs=$default_xnolibs
-+ ;;
-+ *)
-+ dtracexnolibs=$undef
-+ ;;
-+ esac
- break;
- fi
-
-@@ -20971,7 +20992,11 @@ $define)
- dtraceobject=$define
- ;;
- ' '|'')
-- $dtrace -h -s ../perldtrace.d -o perldtrace.h
-+ case "$dtracexnolibs" in
-+ $define) xnolibs_option=-xnolibs ;;
-+ *) xnolibs_option= ;;
-+ esac
-+ $dtrace -h $xnolibs_option -s ../perldtrace.d -o perldtrace.h
- $cat >try.c <<EOM
- #include "perldtrace.h"
- int main(void) {
-@@ -20981,14 +21006,14 @@ int main(void) {
- EOM
- dtraceobject=$undef
- if $cc -c -o try.o $optimize $ccflags try.c \
-- && $dtrace -G -s ../perldtrace.d try.o >/dev/null 2>&1; then
-+ && $dtrace -G $xnolibs_option -s ../perldtrace.d try.o >/dev/null 2>&1; then
- dtraceobject=$define
- echo "Your dtrace builds an object file"
- fi
-- $rm -f try.c try.o perldtrace.o
- ;;
- *) dtraceobject=$undef ;;
- esac
-+ $rm -f try.c try.o perldtrace.o perldtrace.h
- esac
-
- : Determine if this is an EBCDIC system
-@@ -24954,6 +24979,7 @@ drand01='$drand01'
- drand48_r_proto='$drand48_r_proto'
- dtrace='$dtrace'
- dtraceobject='$dtraceobject'
-+dtracexnolibs='$dtracexnolibs'
- dynamic_ext='$dynamic_ext'
- eagain='$eagain'
- ebcdic='$ebcdic'
---- Makefile.SH.orig 2016-12-26 12:49:24 UTC
-+++ Makefile.SH
-@@ -390,8 +390,13 @@ VG_TEST ?= ./perl -e 1 2>/dev/null
- ;;
- esac
-
-+case "$dtracexnolibs" in
-+define) xnolibs=-xnolibs ;;
-+*) xnolibs= ;;
-+esac
-+
- $spitshell >>$Makefile <<!GROK!THIS!
--DTRACE = $dtrace
-+DTRACE = $dtrace $xnolibs
- DTRACE_H = $dtrace_h
-
- DTRACE_PERLLIB_O = $dtrace_perllib_o # "dtrace -G" output for perllib_objs
-@@ -518,10 +523,53 @@ main_only_objs = op$(OBJ_EXT) perl$(
- miniperl_objs_nodt = $(mini_only_objs) $(common_objs) miniperlmain$(OBJ_EXT)
- perllib_objs_nodt = $(main_only_objs) $(common_objs)
-
-+!NO!SUBS!
-+
-+# dtrace with -G modifies the source object files, which can cause
-+# dependency issues, and can cause the dtrace -G to fail on FreeBSD
-+# so separate the objects generated by $(CC) from those used to link
-+# the executable when dtrace -G is involved.
-+#
-+# $(FOO:op%os=np%ns) isn't generally portable but is portable to
-+# the makes on darwin, Solaris, FreeBSD and Linux, which is where we
-+# use dtrace
-+
-+case "$usedtrace:$dtraceobject" in
-+define:define)
-+ $spitshell >>$Makefile <<'!NO!SUBS!'
-+
-+miniperl_dtrace_objs = $(miniperl_objs_nodt:%=mpdtrace/%)
-+perllib_dtrace_objs = $(perllib_objs_nodt:%=libpdtrace/%)
-+perlmain_dtrace_objs = maindtrace/perlmain$(OBJ_EXT)
-+
-+miniperl_objs = $(miniperl_dtrace_objs) $(DTRACE_MINI_O)
-+perllib_objs = $(perllib_dtrace_objs) $(DTRACE_PERLLIB_O)
-+perlmain_objs = $(perlmain_dtrace_objs) $(DTRACE_MAIN_O)
-+
-+miniperl_dep = $(DTRACE_MINI_O)
-+perllib_dep = $(DTRACE_PERLLIB_O)
-+perlmain_dep = $(DTRACE_MAIN_O)
-+
-+!NO!SUBS!
-+ ;;
-+ *)
-+
-+ $spitshell >>$Makefile <<'!NO!SUBS!'
-+
- miniperl_objs = $(miniperl_objs_nodt) $(DTRACE_MINI_O)
- perllib_objs = $(perllib_objs_nodt) $(DTRACE_PERLLIB_O)
- perlmain_objs = perlmain$(OBJ_EXT) $(DTRACE_MAIN_O)
-
-+miniperl_dep = $(miniperl_objs)
-+perllib_dep = $(perllib_objs)
-+perlmain_dep = $(perlmain_objs)
-+
-+!NO!SUBS!
-+ ;;
-+esac
-+
-+$spitshell >>$Makefile <<'!NO!SUBS!'
-+
- perltoc_pod_prereqs = extra.pods pod/perl5259delta.pod pod/perlapi.pod pod/perlintern.pod pod/perlmodlib.pod pod/perluniprops.pod
- generated_pods = pod/perltoc.pod $(perltoc_pod_prereqs)
- generated_headers = uudmap.h bitcount.h mg_data.h
-@@ -834,19 +882,32 @@ mydtrace.h: $(DTRACE_H)
- define)
- $spitshell >>$Makefile <<'!NO!SUBS!'
- $(DTRACE_MINI_O): perldtrace.d $(miniperl_objs_nodt)
-- $(DTRACE) -G -s perldtrace.d -o $(DTRACE_MINI_O) $(miniperl_objs_nodt)
-+ -rm -rf mpdtrace
-+ mkdir mpdtrace
-+ cp $(miniperl_objs_nodt) mpdtrace/
-+ $(DTRACE) -G -s perldtrace.d -o $(DTRACE_MINI_O) $(miniperl_dtrace_objs)
-
- $(DTRACE_PERLLIB_O): perldtrace.d $(perllib_objs_nodt)
-- $(DTRACE) -G -s perldtrace.d -o $(DTRACE_PERLLIB_O) $(perllib_objs_nodt)
-+ -rm -rf libpdtrace
-+ mkdir libpdtrace
-+ cp $(perllib_objs_nodt) libpdtrace/
-+ $(DTRACE) -G -s perldtrace.d -o $(DTRACE_PERLLIB_O) $(perllib_dtrace_objs)
-
- $(DTRACE_MAIN_O): perldtrace.d perlmain$(OBJ_EXT)
-- $(DTRACE) -G -s perldtrace.d -o $(DTRACE_MAIN_O) perlmain$(OBJ_EXT)
-+ -rm -rf maindtrace
-+ mkdir maindtrace
-+ cp perlmain$(OBJ_EXT) maindtrace/
-+ $(DTRACE) -G -s perldtrace.d -o $(DTRACE_MAIN_O) $(perlmain_dtrace_objs) || \
-+ ( $(ECHO) "No probes in perlmain$(OBJ_EXT), generating a dummy $(DTRACE_MAIN_O)" && \
-+ $(ECHO) >dtrace_main.c && \
-+ `$(CCCMD)` $(PLDLFLAGS) dtrace_main.c && \
-+ rm -f dtrace_main.c )
-
- !NO!SUBS!
- ;;
- esac
- $spitshell >>$Makefile <<'!NO!SUBS!'
--$(LIBPERL): $& $(perllib_objs) $(DYNALOADER) $(LIBPERLEXPORT)
-+$(LIBPERL): $& $(perllib_dep) $(DYNALOADER) $(LIBPERLEXPORT)
- !NO!SUBS!
- case "$useshrplib" in
- true)
-@@ -947,7 +1008,7 @@ lib/buildcustomize.pl: $& $(miniperl_obj
- *)
- if test "X$hostperl" != X; then
- $spitshell >>$Makefile <<!GROK!THIS!
--lib/buildcustomize.pl: \$& \$(miniperl_objs) write_buildcustomize.pl
-+lib/buildcustomize.pl: \$& \$(miniperl_dep) write_buildcustomize.pl
- -@rm -f miniperl.xok
- -@rm \$(MINIPERL_EXE)
- \$(LNS) \$(HOST_PERL) \$(MINIPERL_EXE)
-@@ -956,7 +1017,7 @@ lib/buildcustomize.pl: \$& \$(miniperl_o
- !GROK!THIS!
- else
- $spitshell >>$Makefile <<'!NO!SUBS!'
--lib/buildcustomize.pl: $& $(miniperl_objs) write_buildcustomize.pl
-+lib/buildcustomize.pl: $& $(miniperl_dep) write_buildcustomize.pl
- -@rm -f miniperl.xok
- $(CC) $(CLDFLAGS) -o $(MINIPERL_EXE) \
- $(miniperl_objs) $(libs)
-@@ -969,7 +1030,7 @@ lib/buildcustomize.pl: $& $(miniperl_obj
-
- $spitshell >>$Makefile <<'!NO!SUBS!'
-
--$(PERL_EXE): $& $(perlmain_objs) $(LIBPERL) $(static_ext) ext.libs $(PERLEXPORT) write_buildcustomize.pl
-+$(PERL_EXE): $& $(perlmain_dep) $(LIBPERL) $(static_ext) ext.libs $(PERLEXPORT) write_buildcustomize.pl
- -@rm -f miniperl.xok
- !NO!SUBS!
-
---- Porting/Glossary.orig 2016-12-26 12:49:24 UTC
-+++ Porting/Glossary
-@@ -3031,6 +3031,11 @@ dtrace (usedtrace.U):
- dtraceobject (dtraceobject.U):
- Whether we need to build an object file with the dtrace tool.
-
-+dtracexnolibs (dtraceobject.U):
-+ Whether dtrace accepts -xnolibs. If available we call dtrace -h
-+ and dtrace -G with -xnolibs to allow dtrace to run in a jail on
-+ FreeBSD.
-+
- dynamic_ext (Extensions.U):
- This variable holds a list of XS extension files we want to
- link dynamically into the package. It is used by Makefile.
---- ext/XS-APItest/Makefile.PL.orig 2016-12-26 12:49:24 UTC
-+++ ext/XS-APItest/Makefile.PL
-@@ -59,7 +59,8 @@ sub MY::postamble
- DTRACE_D = ../../perldtrace.d
-
- dtrace\$(OBJ_EXT): \$(DTRACE_D) core\$(OBJ_EXT)
-- $Config{dtrace} -G -s \$(DTRACE_D) -o dtrace\$(OBJ_EXT) core\$(OBJ_EXT)
-+ $Config{dtrace} -G -s \$(DTRACE_D) -o dtrace\$(OBJ_EXT) core\$(OBJ_EXT) || \\
-+ ( \$(ECHO) >dtrace.c && \$(CCCMD) \$(CCCDLFLAGS) dtrace.c && rm -f dtrace.c )
- POSTAMBLE
-
- return $post;
---- hints/freebsd.sh.orig 2016-12-26 12:49:24 UTC
-+++ hints/freebsd.sh
-@@ -105,6 +105,15 @@ case "$osvers" in
- ;;
- esac
-
-+case "$osvers" in
-+10.*)
-+ # dtrace on 10.x needs libelf symbols, but we don't know if the
-+ # user is going to request usedtrace and there's no .cbu for usedtrace
-+ libswanted="$libswanted elf"
-+ echo "libswanted $libswanted" >&4
-+ ;;
-+esac
-+
- # Dynamic Loading flags have not changed much, so they are separated
- # out here to avoid duplicating them everywhere.
- case "$osvers" in