Index: head/lang/perl5-devel/Makefile =================================================================== --- head/lang/perl5-devel/Makefile (revision 392564) +++ head/lang/perl5-devel/Makefile (revision 392565) @@ -1,268 +1,268 @@ # Created by: mat # $FreeBSD$ PORTNAME= perl #PORTVERSION= ${PERL_VERSION} # XXX DISTVERSION= ${GH_TAGNAME:C/^v//:C/-g[0-9a-f]*$//} CATEGORIES= lang devel perl5 # XXX MASTER_SITES= LOCAL/mat/perl GH CPAN/../../src/5.0 # XXX Use this naming so that portscout works a bit DISTNAME= ${PORTNAME}-${DISTVERSION} DIST_SUBDIR= perl # XXX 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 CONFLICTS_INSTALL= perl5.*-* # XXX USE_GITHUB= yes GH_ACCOUNT= Perl GH_PROJECT= perl5 -GH_TAGNAME= v5.23.0-121-g0d610ac +GH_TAGNAME= v5.23.0-132-g1c9e1c2 OPTIONS_DEFINE= DEBUG GDBM PERL_64BITINT PTHREAD \ MULTIPLICITY SITECUSTOMIZE # it seems perl malloc has problems with threaded perl on FreeBSD OPTIONS_RADIO= EXCLUSIVE OPTIONS_RADIO_EXCLUSIVE= THREADS PERL_MALLOC OPTIONS_DEFAULT= PERL_64BITINT THREADS PTHREAD MULTIPLICITY 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 PTHREAD_DESC= Build with -lpthread 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}" GDBM_CONFIGURE_ON= -Di_gdbm GDBM_CONFIGURE_OFF= -Ui_gdbm GDBM_LIB_DEPENDS= libgdbm.so:${PORTSDIR}/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 # For the "release" Perl ports, this should be: #PORTSCOUT= limit:^${PERL_VER}. # Remember to update Mk/Uses/perl5.mk too. PERL_VERSION= 5.23.1 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_MAN3_PREFIX= ${SITE_PERL_REL} SITE_MAN3_REL?= ${SITE_MAN3_PREFIX}/man/man3 SITE_MAN3?= ${PREFIX}/${SITE_MAN3_REL} _PRIV_LIB= lib/perl5/${PERL_VER} _ARCH_LIB= ${_PRIV_LIB}/${PERL_ARCH} # XXX releases use tar:bzip2 tar:xz USES= cpe HAS_CONFIGURE= yes CONFIGURE_SCRIPT=Configure CONFIGURE_ARGS= -sde -Dprefix=${PREFIX} \ -Dlibperl=libperl.so.${PERL_VERSION} \ -Darchlib=${PREFIX}/${_ARCH_LIB} \ -Dprivlib=${PREFIX}/${_PRIV_LIB} \ -Dman3dir=${PREFIX}/${MAN3PREFIX_REL}/man/man3 \ -Dman1dir=${PREFIX}/man/man1 \ -Dsitearch=${SITE_ARCH} \ -Dsitelib=${SITE_PERL} -Dscriptdir=${PREFIX}/bin \ -Dsiteman3dir=${SITE_MAN3} \ -Dsiteman1dir=${PREFIX}/man/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. CONFIGURE_ARGS+= \ -Alddlflags='-L${WRKSRC} -L${PREFIX}/${_ARCH_LIB}/CORE -Wl,-rpath=${PREFIX}/${_ARCH_LIB}/CORE -lperl' \ -Dshrpldflags='$$(LDDLFLAGS:N-L${WRKSRC}:N-L${PREFIX}/${_ARCH_LIB}/CORE:N-Wl,-rpath=${PREFIX}/${_ARCH_LIB}/CORE:N-lperl) -Wl,-soname,$$(LIBPERL:R)' # XXX 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} \ MAN3PREFIX=${MAN3PREFIX_REL} \ SITEMAN3PREFIX=${SITE_MAN3_PREFIX} \ PERL_ARCH=${PERL_ARCH} SUB_FILES= perl5_version 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 MAN3PREFIX_REL= ${_PRIV_LIB}/perl MAN3PREFIX= ${PREFIX}/${MAN3PREFIX_REL} MANDIRS+= ${MAN3PREFIX}/man PLIST_SUB+= PERL_VERSION=${PERL_VERSION} \ PERL_VER=${PERL_VER} \ PERL_ARCH=${PERL_ARCH} \ MAN3=${MAN3PREFIX_REL}/man/man3 \ MAN3PREFIX=${MAN3PREFIX_REL} \ SITEMAN3PREFIX=${SITE_MAN3_PREFIX} \ SITE_PERL=${SITE_PERL_REL} \ SITE_ARCH=${SITE_ARCH_REL} \ PRIV_LIB=${_PRIV_LIB} \ ARCH_LIB=${_ARCH_LIB} .include .include "${PORTSDIR}/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 PKGNAMESUFFIX= 5 .else # make PKGNAME unique among other lang/perl5.x .if defined(GH_TAGNAME) # XXX PKGNAMESUFFIX= 5-devel .else PKGNAMESUFFIX= ${PERL_VER} .endif # always add default perl5 pkgname to conflicts CONFLICTS_INSTALL+= perl5-* .endif .if ${OSVERSION} >= 900022 SUB_FILES+= perl-man.conf PLIST_SUB+= MANCONF="" .else # FIXME when 8.4 goes out, remove this SUB_FILES+= use.perl PLIST_SUB+= MANCONF="@comment " PKGINSTALL= ${WRKDIR}/use.perl PKGDEINSTALL= ${WRKDIR}/use.perl .endif .if ${PORT_OPTIONS:MDEBUG} STRIP= STRIP_CMD= ${TRUE} .endif # XXX # No need to spam logs, or make me wait .if !defined(PACKAGE_BUILDING) && !defined(PERL_DEV_SHUT_UP) 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} "########################################" @sleep 30 .endif # Put a symlink to the future libperl.so.x.yy so that -lperl works. post-extract: ${LN} -s libperl.so.${PERL_VERSION} ${WRKSRC}/libperl.so ${LN} -s libperl.so.${PERL_VERSION} ${WRKSRC}/libperl.so.${PERL_VER} .if !defined(MAKING_PATCHES) # make clean patch makepatch MAKING_PATCHES= post-patch: ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/Configure ${WRKSRC}/hints/freebsd.sh .if ${PORT_OPTIONS:MPTHREAD} ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|-lpthread|g;' \ ${WRKSRC}/hints/freebsd.sh .else ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%||g;' \ ${WRKSRC}/hints/freebsd.sh .endif .endif # MAKING_PATCHES post-install: ${MKDIR} ${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.${PERL_VERSION} ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/CORE/libperl.so ${LN} -sf libperl.so.${PERL_VERSION} ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/CORE/libperl.so.${PERL_VER} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} # XXX Force PERL_PORT in case the devel has the same version as the # latest release ${ECHO_CMD} "PERL_PORT= perl5-devel" >> ${WRKDIR}/perl5_version ${INSTALL_DATA} ${WRKDIR}/perl5_version ${STAGEDIR}${PREFIX}/etc ${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 \ -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 .if ${OSVERSION} >= 900022 ${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${STAGEDIR}${PREFIX}/etc/man.d/perl${PERL_VER}.conf .endif test: build (cd ${WRKSRC}; TEST_JOBS=${MAKE_JOBS_NUMBER} make test_harness) regression-test: test .include Index: head/lang/perl5-devel/distinfo =================================================================== --- head/lang/perl5-devel/distinfo (revision 392564) +++ head/lang/perl5-devel/distinfo (revision 392565) @@ -1,2 +1,2 @@ -SHA256 (perl/perl-5.23.0-121_GH0.tar.gz) = 6e893de3737fdbd6237d8b16aa134562076f62ee31a842f3f3b6bca93639c521 -SIZE (perl/perl-5.23.0-121_GH0.tar.gz) = 17487608 +SHA256 (perl/perl-5.23.0-132_GH0.tar.gz) = 17bad68307d8de908b57922320808244057885bc0f8cbebf36a63dd01f4b4ac9 +SIZE (perl/perl-5.23.0-132_GH0.tar.gz) = 17495716 Index: head/lang/perl5-devel/files/patch-Configure =================================================================== --- head/lang/perl5-devel/files/patch-Configure (revision 392564) +++ head/lang/perl5-devel/files/patch-Configure (revision 392565) @@ -1,33 +1,33 @@ ---- Configure.orig 2015-06-22 12:55:33 UTC +--- Configure.orig 2015-07-20 07:22:18 UTC +++ Configure -@@ -3840,7 +3840,10 @@ esac +@@ -3845,7 +3845,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` -@@ -5021,7 +5024,7 @@ esac +@@ -5026,7 +5029,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";; -@@ -9522,8 +9525,7 @@ prefixvar=siteman3dir +@@ -9527,8 +9530,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~+