Index: head/lang/perl5-devel/Makefile =================================================================== --- head/lang/perl5-devel/Makefile (revision 430941) +++ head/lang/perl5-devel/Makefile (revision 430942) @@ -1,325 +1,325 @@ # Created by: mat # $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]*$//} CATEGORIES= lang devel perl5 # XXX Leave only CPAN. MASTER_SITES= LOCAL/mat/perl GH CPAN/../../src/5.0 # XXX Remove DISTNAME DISTNAME= ${PORTNAME}-${DISTVERSION} DIST_SUBDIR= perl # XXX -> perl@ MAINTAINER= mat@FreeBSD.org COMMENT= Practical Extraction and Report Language LICENSE= ART10 GPLv1 LICENSE_COMB= dual LICENSE_FILE_ART10= ${WRKSRC}/Artistic LICENSE_FILE_GPLv1= ${WRKSRC}/Copying TEST_TARGET= test_harness TEST_ENV= ${MAKE_ENV} TEST_JOBS=${MAKE_JOBS_NUMBER} \ LD_LIBRARY_PATH=${WRKSRC} # XXX Remove github things. 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 OPTIONS_DEFINE= DEBUG GDBM PERL_64BITINT MULTIPLICITY SITECUSTOMIZE \ THREADS PERL_MALLOC DTRACE OPTIONS_DEFAULT= PERL_64BITINT THREADS MULTIPLICITY DTRACE OPTIONS_EXCLUDE_FreeBSD_10= DTRACE .if !exists(/usr/sbin/dtrace) OPTIONS_EXCLUDE+= DTRACE .endif .for a in aarch64 arm armeb armv6 mips mips64 mips64el mipsel mipsn32 powerpc \ powerpc64 sparc64 OPTIONS_EXCLUDE_${a}= DTRACE .endfor EXCLUSIVE_DESC= Exclusive OPTIONS GDBM_DESC= GDBM_File extension PERL_MALLOC_DESC= Use Perl malloc PERL_64BITINT_DESC= Use 64 bit integers (on i386) THREADS_DESC= Build threaded perl MULTIPLICITY_DESC= Use multiplicity SITECUSTOMIZE_DESC= Run-time customization of @INC OPTIONS_SUB= yes DEBUG_CONFIGURE_ON= -Doptimize="-g" -DDEBUGGING DEBUG_CONFIGURE_OFF= -Doptimize="${CFLAGS}" DTRACE_CONFIGURE_ON= -Dusedtrace DTRACE_CONFIGURE_OFF= -Uusedtrace GDBM_CONFIGURE_ON= -Di_gdbm GDBM_CONFIGURE_OFF= -Ui_gdbm GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm PERL_64BITINT_CONFIGURE_ON= -Duse64bitint MULTIPLICITY_CONFIGURE_ON= -Dusemultiplicity=y MULTIPLICITY_CONFIGURE_OFF= -Dusemultiplicity=n SITECUSTOMIZE_CONFIGURE_ON= -Dusesitecustomize THREADS_CONFIGURE_ON= -Dusethreads=y THREADS_CONFIGURE_OFF= -Dusethreads=n PERL_MALLOC_CONFIGURE_ON= -Dusemymalloc=y PERL_MALLOC_CONFIGURE_OFF= -Dusemymalloc=n # XXX uncomment PORTSCOUT line #PORTSCOUT= limit:^${PERL_VER}. .include "version.mk" PERL_VER= ${PERL_VERSION:C/\.[0-9]+$//} PERL_ARCH= mach SITE_PERL_REL?= lib/perl5/site_perl SITE_PERL?= ${PREFIX}/${SITE_PERL_REL} SITE_ARCH_REL?= ${SITE_PERL_REL}/${PERL_ARCH}/${PERL_VER} SITE_ARCH?= ${PREFIX}/${SITE_ARCH_REL} SITE_MAN_PREFIX= ${SITE_PERL_REL} SITE_MAN3_REL?= ${SITE_MAN_PREFIX}/man/man3 SITE_MAN3?= ${PREFIX}/${SITE_MAN3_REL} SITE_MAN1_REL?= ${SITE_MAN_PREFIX}/man/man1 SITE_MAN1?= ${PREFIX}/${SITE_MAN1_REL} _PRIV_LIB= lib/perl5/${PERL_VER} _ARCH_LIB= ${_PRIV_LIB}/${PERL_ARCH} # XXX releases are .tar.xz, add: tar:xz USES= cpe # XXX replace all LIBPERL_VER occurences with PERL_VERSION LIBPERL_VER= ${PORTVERSION:C/[^0-9.]//} HAS_CONFIGURE= yes CONFIGURE_SCRIPT=Configure CONFIGURE_ARGS= -sde -Dprefix=${PREFIX} \ -Dlibperl=libperl.so.${LIBPERL_VER} \ -Darchlib=${PREFIX}/${_ARCH_LIB} \ -Dprivlib=${PREFIX}/${_PRIV_LIB} \ -Dman3dir=${PREFIX}/${PERLMANPREFIX_REL}/man/man3 \ -Dman1dir=${PREFIX}/${PERLMANPREFIX_REL}/man/man1 \ -Dsitearch=${SITE_ARCH} \ -Dsitelib=${SITE_PERL} -Dscriptdir=${PREFIX}/bin \ -Dsiteman3dir=${SITE_MAN3} \ -Dsiteman1dir=${SITE_MAN1} \ -Ui_malloc -Ui_iconv -Uinstallusrbinperl -Dusenm=n \ -Dcc="${CC}" -Duseshrplib -Dinc_version_list=none \ -Dcf_by=${MAINTAINER:C,@.*,,} -Dcf_email=${MAINTAINER} \ -Dcf_time="`env LANG=C ${STAT} -t \"%a %b %d %T %Z %Y\" -f %Sm ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}`" # Keep the following two in sync. # lddlflags is used for all .so linking # shrpldflags is used for libperl.so, so remove all the extra bits inherited from lddlflags. # XXX change the soname to $$(LIBPERL:R) CONFIGURE_ARGS+= \ -Alddlflags='-L${WRKSRC} -L${PREFIX}/${_ARCH_LIB}/CORE -lperl' \ -Dshrpldflags='$$(LDDLFLAGS:N-L${WRKSRC}:N-L${PREFIX}/${_ARCH_LIB}/CORE:N-lperl) -Wl,-soname,$$(LIBPERL)' # Give a hint of where libperl.so can be found. USE_LDCONFIG= ${PREFIX}/${_ARCH_LIB}/CORE # XXX Remove CONFIGURE_ARGS+= -Dusedevel -Uversiononly LOCALE_CLEANUP= LANG="" LC_ALL="" LC_COLLATE="" LC_CTYPE="" \ LC_MESSAGES="" LC_MONETARY="" LC_NUMERIC="" \ LC_TIME="" CONFIGURE_ENV+= ${LOCALE_CLEANUP} UNAME_v="$$(uname -v | sed 'y/=/ /')" MAKE_ENV+= ${LOCALE_CLEANUP} SUB_LIST+= PERL_VERSION=${PERL_VERSION} \ PERL_VER=${PERL_VER} \ SITE_PERL=${SITE_PERL_REL} \ PRIV_LIB=${_PRIV_LIB} \ PERLMANPREFIX=${PERLMANPREFIX_REL} \ SITEMANPREFIX=${SITE_MAN_PREFIX} \ PERL_ARCH=${PERL_ARCH} SUB_FILES= perl-man.conf INSTALL_TARGET= install-strip .if defined(PERL_VENDOR_PREFIX) CONFIGURE_ARGS+= \ -Dvendorprefix=${PERL_VENDOR_PREFIX} \ -Dvendorarch=${PERL_VENDOR_PREFIX}/${_ARCH_LIB} \ -Dvendorbin=${PERL_VENDOR_PREFIX}/bin \ -Dvendorlib=${PERL_VENDOR_PREFIX}/${_PRIV_LIB} \ -Dvendorman3dir=${PERL_VENDOR_PREFIX}/${_PRIV_LIB}/man/man3 \ -Dvendorman1dir=${PERL_VENDOR_PREFIX}/man/man1 .endif # http://perl5.git.perl.org/perl.git/commit/b83080de5c4254 # PERLIOBUF_DEFAULT_BUFSIZ size in bytes (default: 8192 bytes) .if defined(PERLIOBUF_DEFAULT_BUFSIZ) CONFIGURE_ARGS+= \ -Accflags=-DPERLIOBUF_DEFAULT_BUFSIZ=${PERLIOBUF_DEFAULT_BUFSIZ} .endif PERLMANPREFIX_REL= ${_PRIV_LIB}/perl PERLMANPREFIX= ${PREFIX}/${PERLMANPREFIX_REL} MANDIRS+= ${PERLMANPREFIX}/man PLIST_SUB+= PERL_VERSION=${PERL_VERSION} \ PERL_VER=${PERL_VER} \ PERL_ARCH=${PERL_ARCH} \ PERL_ARCH_regex=\b${PERL_ARCH}\b \ MAN1=${PERLMANPREFIX_REL}/man/man1 \ MAN3=${PERLMANPREFIX_REL}/man/man3 \ PERLMANPREFIX=${PERLMANPREFIX_REL} \ PERLMANPREFIX_regex=${PERLMANPREFIX_REL}\b \ SITEMANPREFIX=${SITE_MAN_PREFIX} \ SITE_PERL=${SITE_PERL_REL} \ SITE_ARCH=${SITE_ARCH_REL} \ PRIV_LIB=${_PRIV_LIB} \ PKGNAMESUFFIX=${PKGNAMESUFFIX} \ ARCH_LIB=${_ARCH_LIB} # XXX Remove and change to PERL_VERSION in the plist. PLIST_SUB+= LIBPERL_VER=${LIBPERL_VER} _PERL5_DEFAULT_FILE= /tmp/PERL5_DEFAULT # bsd.default-versions.mk needs to know LOCALBASE for Perl, so # bsd.port.options.mk is needed before including it. .include .sinclude "${_PERL5_DEFAULT_FILE}" .include "${.CURDIR}/../../Mk/bsd.default-versions.mk" # if this port is default due PERL5_DEFAULT # change PKGNAME to reflect this .if ${PERL_VER} == ${PERL5_DEFAULT} || ${PERL5_DEFAULT} == devel # XXX Remove devel case PKGNAMESUFFIX= 5 IAMDEFAULTPERL= yes .else # make PKGNAME unique among other lang/perl5.x .if defined(GH_TAGNAME) # XXX remove if, leave only the else. PKGNAMESUFFIX= 5-devel .else PKGNAMESUFFIX= ${PERL_VER} .endif .endif # Am I building the default Perl ? .if defined(IAMDEFAULTPERL) PLIST_SUB+= DEFAULT="" BINSUFFIX="" .else BINSUFFIX= ${PERL_VERSION} PLIST_SUB+= DEFAULT="@comment " BINSUFFIX=${PERL_VERSION} CONFIGURE_ARGS+=-Dversiononly .endif .if !defined(IAMDEFAULTPERL) pre-everything:: @${ECHO_MSG} "##################################################" @${ECHO_MSG} "" @${ECHO_MSG} " This is *NOT* the DEFAULT perl version" @${ECHO_MSG} "" @${ECHO_MSG} "It will *NOT* install ${PREFIX}/bin/perl" @${ECHO_MSG} "" @${ECHO_MSG} "It will *ONLY* install ${PREFIX}/bin/perl${PERL_VERSION}" @${ECHO_MSG} "" @${ECHO_MSG} "The default Perl version currently is ${PERL5_DEFAULT}." @${ECHO_MSG} "" @${ECHO_MSG} "If you want to use this version as the default," @${ECHO_MSG} "stop the build now, add this line to your" @${ECHO_MSG} "/etc/make.conf, and then restart the build." @${ECHO_MSG} "" @${ECHO_MSG} "DEFAULT_VERSIONS+=perl5=${PERL_VER}" @${ECHO_MSG} "" @${ECHO_MSG} "##################################################" . if !(defined(PACKAGE_BUILDING) || defined(BATCH)) @sleep 30 . endif .endif # XXX Remove this pre-everything:: @${ECHO_MSG} "########################################" @${ECHO_MSG} "" @${ECHO_MSG} "This is a DEVELOPER only version of Perl" @${ECHO_MSG} "" @${ECHO_MSG} " DO NOT USE IT" @${ECHO_MSG} "" @${ECHO_MSG} "" @${ECHO_MSG} " Things ARE going to be broken with it" @${ECHO_MSG} " and it WILL eat your data" @${ECHO_MSG} "" @${ECHO_MSG} " You have been warned !" @${ECHO_MSG} "" @${ECHO_MSG} "########################################" # No need to make me, or the package builders, wait .if !(defined(PACKAGE_BUILDING) || defined(PERL_DEV_SHUT_UP) || defined(BATCH)) @sleep 30 .endif # Put a symlink to the future libperl.so.x.yy so that -lperl works. # Also, save PERL5_DEFAULT in case someone is not using the default Perl # version whilst not having set DEFAULT_VERSIONS=perl5=blah. While upgrading, # portmaster/portupgrade will remove the installed Perl version, and it will # remove any way to guess what the default Perl version is needed. post-extract: ${LN} -s libperl.so.${LIBPERL_VER} ${WRKSRC}/libperl.so ${LN} -s libperl.so.${LIBPERL_VER} ${WRKSRC}/libperl.so.${PERL_VER} .if !defined(PACKAGE_BUILDING) @${ECHO_CMD} "PERL5_DEFAULT=${PERL5_DEFAULT}" > ${_PERL5_DEFAULT_FILE} .endif .if !defined(PACKAGE_BUILDING) post-clean: @${RM} ${_PERL5_DEFAULT_FILE} .endif post-patch: ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/Configure ${WRKSRC}/hints/freebsd.sh .if !defined(IAMDEFAULTPERL) ${REINPLACE_CMD} -e '/do_installprivlib = 0 if .versiononly/d; \ /^if.*nopods.*versiononly || /s/.*/if (1) {/' \ ${WRKSRC}/installperl .endif post-install: @${REINPLACE_CMD} -e '/^lddlflags/s|-L${WRKSRC} ||' \ ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/Config_heavy.pl @${TOUCH} -r ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/Config_heavy.pl.bak ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/Config_heavy.pl @${RM} ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/Config_heavy.pl.bak .if ${CC} == /nxb-bin/usr/bin/cc @${REINPLACE_CMD} -e 's=/nxb-bin==' \ ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/Config.pm ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/Config_heavy.pl # Restore Config.pm's timestamp so that Perl's build system does not think it # needs to rebuild everything. @${TOUCH} -r ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/Config.pm.bak ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/Config.pm @${TOUCH} -r ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/Config_heavy.pl.bak ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/Config_heavy.pl @${RM} ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/Config.pm.bak ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/Config_heavy.pl.bak .endif ${MKDIR} ${STAGEDIR}${SITE_MAN1} ${STAGEDIR}${SITE_MAN3} ${MKDIR} ${STAGEDIR}${SITE_ARCH}/auto ${MKDIR} ${STAGEDIR}${SITE_PERL}/auto ${LN} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} ${STAGEDIR}${PREFIX}/bin/perl5 ${LN} -sf libperl.so.${LIBPERL_VER} ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/CORE/libperl.so ${LN} -sf libperl.so.${LIBPERL_VER} ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/CORE/libperl.so.${PERL_VER} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} ${MKDIR} ${STAGEDIR}${SITE_ARCH}/machine ${MKDIR} ${STAGEDIR}${SITE_ARCH}/sys # h2ph needs perl, but perl is not installed, it's only # staged, so, use the one in WRKDIR (cd /usr/include && ${SETENV} LD_LIBRARY_PATH=${WRKSRC} \ ${WRKSRC}/perl -I ${WRKSRC}/lib ${STAGEDIR}${PREFIX}/bin/h2ph${BINSUFFIX} \ -d ${STAGEDIR}${SITE_ARCH} *.h machine/*.h sys/*.h >/dev/null) @${FIND} ${STAGEDIR}${SITE_ARCH} -name '*.ph' | sed -e 's|${STAGEDIR}||' >> ${TMPPLIST} ${FIND} ${STAGEDIR} -name '*.so*' -type f | while read f; \ do \ ${CHMOD} 644 $$f; \ ${STRIP_CMD} $$f; \ ${CHMOD} 444 $$f; \ done ${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${STAGEDIR}${PREFIX}/etc/man.d/perl${PKGNAMESUFFIX}.conf .include Index: head/lang/perl5-devel/distinfo =================================================================== --- head/lang/perl5-devel/distinfo (revision 430941) +++ head/lang/perl5-devel/distinfo (revision 430942) @@ -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 Index: head/lang/perl5-devel/files/patch-dtrace =================================================================== --- head/lang/perl5-devel/files/patch-dtrace (revision 430941) +++ head/lang/perl5-devel/files/patch-dtrace (nonexistent) @@ -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 </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 <>$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 <>$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 Property changes on: head/lang/perl5-devel/files/patch-dtrace ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/lang/perl5-devel/files/patch-Configure =================================================================== --- head/lang/perl5-devel/files/patch-Configure (revision 430941) +++ head/lang/perl5-devel/files/patch-Configure (revision 430942) @@ -1,33 +1,33 @@ ---- 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 -cf_time=`LC_ALL=C; LANGUAGE=C; export LC_ALL; export LANGUAGE; $date 2>&1` +case "$cf_time" in +"") + cf_time=`LC_ALL=C; LANGUAGE=C; export LC_ALL; export LANGUAGE; $date 2>&1` ;; +esac 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 - if $test -d $xxx; then + if $test -d $xxx || [ $xxx = $prefix/lib ]; then 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 -'') dflt=$siteprefix/script - $test -d $dflt || dflt=$sitebin ;; +'') dflt=$sitebin ;; *) dflt="$sitescript" ;; esac fn=d~+