From owner-svn-ports-head@FreeBSD.ORG Thu Nov 27 09:57:43 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7F6C1531; Thu, 27 Nov 2014 09:57:43 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 69126952; Thu, 27 Nov 2014 09:57:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAR9vh0E033423; Thu, 27 Nov 2014 09:57:43 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAR9vd4R033402; Thu, 27 Nov 2014 09:57:39 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201411270957.sAR9vd4R033402@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Thu, 27 Nov 2014 09:57:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r373476 - in head: . Mk/Uses lang/perl5.14 lang/perl5.14/files lang/perl5.16 lang/perl5.16/files lang/perl5.18 lang/perl5.18/files lang/perl5.20 lang/perl5.20/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Nov 2014 09:57:43 -0000 Author: mat Date: Thu Nov 27 09:57:39 2014 New Revision: 373476 URL: https://svnweb.freebsd.org/changeset/ports/373476 QAT: https://qat.redports.org/buildarchive/r373476/ Log: - Bring back the .packlist files, many people need them, they will automatically added to the plists. - Add soname to libperl.so and rename it to libperl.so.PERL_VER, for instance libperl.so.5.18. To keep software linked with it working, provide a libperl.so symlink. - Rollback Perl's man page location change, it creates conflicts for the few modules that ship with Perl and are in the ports tree. Sponsored by: Absolight Added: head/lang/perl5.14/files/patch-Makefile.SH (contents, props changed) head/lang/perl5.16/files/patch-Makefile.SH (contents, props changed) head/lang/perl5.18/files/patch-Makefile.SH (contents, props changed) head/lang/perl5.20/files/patch-Makefile.SH (contents, props changed) Modified: head/Mk/Uses/perl5.mk head/UPDATING head/lang/perl5.14/Makefile head/lang/perl5.14/pkg-plist head/lang/perl5.16/Makefile head/lang/perl5.16/pkg-plist head/lang/perl5.18/Makefile head/lang/perl5.18/pkg-plist head/lang/perl5.20/Makefile head/lang/perl5.20/pkg-plist Modified: head/Mk/Uses/perl5.mk ============================================================================== --- head/Mk/Uses/perl5.mk Thu Nov 27 09:47:05 2014 (r373475) +++ head/Mk/Uses/perl5.mk Thu Nov 27 09:57:39 2014 (r373476) @@ -188,18 +188,16 @@ DESTDIRNAME= --destdir .if ${PORTNAME} != Module-Build BUILD_DEPENDS+= p5-Module-Build>=0.4206:${PORTSDIR}/devel/p5-Module-Build .endif -CONFIGURE_ARGS+=--create_packlist 0 +CONFIGURE_ARGS+=--create_packlist 1 .endif .if ${_USE_PERL5:Mmodbuildtiny} .if ${PORTNAME} != Module-Build-Tiny BUILD_DEPENDS+= p5-Module-Build-Tiny>=0.039:${PORTSDIR}/devel/p5-Module-Build-Tiny .endif -CONFIGURE_ARGS+=--create_packlist 0 +CONFIGURE_ARGS+=--create_packlist 1 .endif .elif ${_USE_PERL5:Mconfigure} -# NO_PACKLIST doesn't do anything before 5.20, but starting at -# 5.20, it doesn't generate it, so we don't have to remove it. -CONFIGURE_ARGS+=INSTALLDIRS="site" NO_PACKLIST=1 +CONFIGURE_ARGS+=INSTALLDIRS="site" .endif # modbuild .if ${_USE_PERL5:Mconfigure} @@ -266,15 +264,17 @@ do-install: .endif # ! USES=gmake .endif # modbuild +PACKLIST_DIR?= ${PREFIX}/${SITE_ARCH_REL}/auto + # In all those, don't use - before the command so that the user does # not wonder what has been ignored by this message "*** Error code 1 (ignored)" fix-perl-things: -# Remove .packlist that can have been generated during installation, -# and cleanup the directories they're in. - @(if [ -d ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto ] ; then \ - find ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto -name .packlist | while read f ; do \ - ${RM} $${f} ; \ - ${RMDIR} -p $${f%/*} 2>/dev/null || : ; \ +# Remove STAGEDIR from .packlist and add the file to the plist. + @(set -x; if [ -d ${STAGEDIR}${PACKLIST_DIR} ] ; then \ + cd ${STAGEDIR} ; \ + find .${PACKLIST_DIR} -name .packlist | while read f ; do \ + ${SED} -i '' 's|^${STAGEDIR}||' "$$f"; \ + ${ECHO} $$f >> ${PLIST}; \ done \ fi) || : Modified: head/UPDATING ============================================================================== --- head/UPDATING Thu Nov 27 09:47:05 2014 (r373475) +++ head/UPDATING Thu Nov 27 09:57:39 2014 (r373476) @@ -5,6 +5,14 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20141127: + AFFECTS: users of lang/perl5.* + AUTHOR: mat@FreeBSD.org + + The .packlist files are back, if you upgraded all your p5- ports yesterday + and need them, you will need to reinstall them again, see yesterday's update + for instructions. + 20141126: AFFECTS: users of multimedia/x264 AUTHOR: xmj@FreeBSD.org Modified: head/lang/perl5.14/Makefile ============================================================================== --- head/lang/perl5.14/Makefile Thu Nov 27 09:47:05 2014 (r373475) +++ head/lang/perl5.14/Makefile Thu Nov 27 09:57:39 2014 (r373476) @@ -3,7 +3,7 @@ PORTNAME= perl PORTVERSION= ${PERL_VERSION} -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= lang devel perl5 MASTER_SITES= CPAN \ ${MASTER_SITE_LOCAL:S/$/:local/} \ @@ -57,6 +57,7 @@ USES= tar:bzip2 cpe HAS_CONFIGURE= yes CONFIGURE_SCRIPT=Configure CONFIGURE_ARGS= -sde -Dprefix=${PREFIX} \ + -Dlibperl=libperl.so.${PERL_VER} \ -Darchlib=${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH} \ -Dprivlib=${PREFIX}/lib/perl5/${PERL_VER} \ -Dman3dir=${PREFIX}/${MAN3PREFIX_REL}/man/man3 \ @@ -89,7 +90,7 @@ INSTALL_TARGET= install-strip .include "${PORTSDIR}/Mk/bsd.default-versions.mk" # if this port is default due PERL5_DEFAULT -# change PKGNAME to reflect this +# change PKGNAME to reflect this .if ${PERL_VER} == ${PERL5_DEFAULT} PKGNAMESUFFIX= ${PERL_VERSION:C/\.[0-9]+\.[0-9]+$//} .else @@ -116,7 +117,7 @@ CONFIGURE_ARGS+= \ -Accflags=-DPERLIOBUF_DEFAULT_BUFSIZ=${PERLIOBUF_DEFAULT_BUFSIZ} .endif -MAN3PREFIX_REL= lib/perl5/${PERL_VER} +MAN3PREFIX_REL= lib/perl5/${PERL_VER}/perl MAN3PREFIX= ${PREFIX}/${MAN3PREFIX_REL} MANDIRS+= ${MAN3PREFIX}/man @@ -214,8 +215,9 @@ post-install: ${MKDIR} ${STAGEDIR}${SITE_MAN3} ${MKDIR} ${STAGEDIR}${SITE_ARCH}/auto ${MKDIR} ${STAGEDIR}${SITE_PERL}/auto - ${RM} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/.packlist ${LN} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} ${STAGEDIR}${PREFIX}/bin/perl5 + ${LN} -s libperl.so.${PERL_VER} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/CORE/libperl.so + ${LN} -s libperl.so.${PERL_VER} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/CORE/libperl.so.${PERL_VERSION} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} ${INSTALL_DATA} ${WRKDIR}/perl5_version ${STAGEDIR}${PREFIX}/etc ${FIND} ${STAGEDIR} -name '*.bs' -size 0 -delete Added: head/lang/perl5.14/files/patch-Makefile.SH ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/perl5.14/files/patch-Makefile.SH Thu Nov 27 09:57:39 2014 (r373476) @@ -0,0 +1,11 @@ +--- Makefile.SH.orig 2012-12-19 12:25:23 UTC ++++ Makefile.SH +@@ -762,7 +762,7 @@ $(LIBPERL): $& $(obj) $(DYNALOADER) $(LI + true) + $spitshell >>$Makefile <<'!NO!SUBS!' + rm -f $@ +- $(LD) -o $@ $(SHRPLDFLAGS) $(obj) $(DYNALOADER) $(libs) ++ $(LD) -o $@ $(SHRPLDFLAGS) -Wl,-soname,$(LIBPERL) $(obj) $(DYNALOADER) $(libs) + !NO!SUBS! + case "$osname" in + aix) Modified: head/lang/perl5.14/pkg-plist ============================================================================== --- head/lang/perl5.14/pkg-plist Thu Nov 27 09:47:05 2014 (r373475) +++ head/lang/perl5.14/pkg-plist Thu Nov 27 09:57:39 2014 (r373476) @@ -678,6 +678,7 @@ lib/perl5/%%PERL_VER%%/integer.pm lib/perl5/%%PERL_VER%%/less.pm lib/perl5/%%PERL_VER%%/locale.pm lib/perl5/%%PERL_VER%%/look.pl +lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/.packlist lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B.pm lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B/Concise.pm lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B/Showlex.pm @@ -706,6 +707,8 @@ lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/COR lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/keywords.h lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/l1_char_class_tab.h lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/libperl.so +lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/libperl.so.%%PERL_VER%% +lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/libperl.so.%%PERL_VERSION%% lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/malloc_ctl.h lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/metaconfig.h lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/mg.h Modified: head/lang/perl5.16/Makefile ============================================================================== --- head/lang/perl5.16/Makefile Thu Nov 27 09:47:05 2014 (r373475) +++ head/lang/perl5.16/Makefile Thu Nov 27 09:57:39 2014 (r373476) @@ -3,7 +3,7 @@ PORTNAME= perl PORTVERSION= ${PERL_VERSION} -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= lang devel perl5 MASTER_SITES= CPAN \ ${MASTER_SITE_LOCAL:S/$/:local/} \ @@ -57,6 +57,7 @@ USES= tar:bzip2 cpe HAS_CONFIGURE= yes CONFIGURE_SCRIPT=Configure CONFIGURE_ARGS= -sde -Dprefix=${PREFIX} \ + -Dlibperl=libperl.so.${PERL_VER} \ -Darchlib=${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH} \ -Dprivlib=${PREFIX}/lib/perl5/${PERL_VER} \ -Dman3dir=${PREFIX}/${MAN3PREFIX_REL}/man/man3 \ @@ -116,7 +117,7 @@ CONFIGURE_ARGS+= \ -Accflags=-DPERLIOBUF_DEFAULT_BUFSIZ=${PERLIOBUF_DEFAULT_BUFSIZ} .endif -MAN3PREFIX_REL= lib/perl5/${PERL_VER} +MAN3PREFIX_REL= lib/perl5/${PERL_VER}/perl MAN3PREFIX= ${PREFIX}/${MAN3PREFIX_REL} MANDIRS+= ${MAN3PREFIX}/man @@ -214,8 +215,9 @@ post-install: ${MKDIR} ${STAGEDIR}${SITE_MAN3} ${MKDIR} ${STAGEDIR}${SITE_ARCH}/auto ${MKDIR} ${STAGEDIR}${SITE_PERL}/auto - ${RM} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/.packlist ${LN} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} ${STAGEDIR}${PREFIX}/bin/perl5 + ${LN} -s libperl.so.${PERL_VER} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/CORE/libperl.so + ${LN} -s libperl.so.${PERL_VER} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/CORE/libperl.so.${PERL_VERSION} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} ${INSTALL_DATA} ${WRKDIR}/perl5_version ${STAGEDIR}${PREFIX}/etc ${FIND} ${STAGEDIR} -name '*.bs' -size 0 -delete Added: head/lang/perl5.16/files/patch-Makefile.SH ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/perl5.16/files/patch-Makefile.SH Thu Nov 27 09:57:39 2014 (r373476) @@ -0,0 +1,11 @@ +--- Makefile.SH.orig 2013-03-04 15:16:21 UTC ++++ Makefile.SH +@@ -795,7 +795,7 @@ $(LIBPERL): $& $(obj) $(DYNALOADER) $(LI + true) + $spitshell >>$Makefile <<'!NO!SUBS!' + rm -f $@ +- $(LD) -o $@ $(SHRPLDFLAGS) $(obj) $(DYNALOADER) $(libs) ++ $(LD) -o $@ $(SHRPLDFLAGS) -Wl,-soname,$(LIBPERL) $(obj) $(DYNALOADER) $(libs) + !NO!SUBS! + case "$osname" in + aix) Modified: head/lang/perl5.16/pkg-plist ============================================================================== --- head/lang/perl5.16/pkg-plist Thu Nov 27 09:47:05 2014 (r373475) +++ head/lang/perl5.16/pkg-plist Thu Nov 27 09:57:39 2014 (r373476) @@ -723,6 +723,7 @@ lib/perl5/%%PERL_VER%%/inc/latest/privat lib/perl5/%%PERL_VER%%/integer.pm lib/perl5/%%PERL_VER%%/less.pm lib/perl5/%%PERL_VER%%/locale.pm +lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/.packlist lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B.pm lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B/Concise.pm lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B/Showlex.pm @@ -753,6 +754,8 @@ lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/COR lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/keywords.h lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/l1_char_class_tab.h lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/libperl.so +lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/libperl.so.%%PERL_VER%% +lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/libperl.so.%%PERL_VERSION%% lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/malloc_ctl.h lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/metaconfig.h lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/mg.h Modified: head/lang/perl5.18/Makefile ============================================================================== --- head/lang/perl5.18/Makefile Thu Nov 27 09:47:05 2014 (r373475) +++ head/lang/perl5.18/Makefile Thu Nov 27 09:57:39 2014 (r373476) @@ -3,7 +3,7 @@ PORTNAME= perl PORTVERSION= ${PERL_VERSION} -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= lang devel perl5 MASTER_SITES= CPAN \ ${MASTER_SITE_LOCAL:S/$/:local/} \ @@ -73,6 +73,7 @@ USES= tar:bzip2 cpe HAS_CONFIGURE= yes CONFIGURE_SCRIPT=Configure CONFIGURE_ARGS= -sde -Dprefix=${PREFIX} \ + -Dlibperl=libperl.so.${PERL_VER} \ -Darchlib=${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH} \ -Dprivlib=${PREFIX}/lib/perl5/${PERL_VER} \ -Dman3dir=${PREFIX}/${MAN3PREFIX_REL}/man/man3 \ @@ -105,7 +106,7 @@ INSTALL_TARGET= install-strip .include "${PORTSDIR}/Mk/bsd.default-versions.mk" # if this port is default due PERL5_DEFAULT -# change PKGNAME to reflect this +# change PKGNAME to reflect this .if ${PERL_VER} == ${PERL5_DEFAULT} PKGNAMESUFFIX= ${PERL_VERSION:C/\.[0-9]+\.[0-9]+$//} .else @@ -132,7 +133,7 @@ CONFIGURE_ARGS+= \ -Accflags=-DPERLIOBUF_DEFAULT_BUFSIZ=${PERLIOBUF_DEFAULT_BUFSIZ} .endif -MAN3PREFIX_REL= lib/perl5/${PERL_VER} +MAN3PREFIX_REL= lib/perl5/${PERL_VER}/perl MAN3PREFIX= ${PREFIX}/${MAN3PREFIX_REL} MANDIRS+= ${MAN3PREFIX}/man @@ -193,8 +194,9 @@ post-install: ${MKDIR} ${STAGEDIR}${SITE_MAN3} ${MKDIR} ${STAGEDIR}${SITE_ARCH}/auto ${MKDIR} ${STAGEDIR}${SITE_PERL}/auto - ${RM} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/.packlist ${LN} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} ${STAGEDIR}${PREFIX}/bin/perl5 + ${LN} -s libperl.so.${PERL_VER} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/CORE/libperl.so + ${LN} -s libperl.so.${PERL_VER} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/CORE/libperl.so.${PERL_VERSION} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} ${INSTALL_DATA} ${WRKDIR}/perl5_version ${STAGEDIR}${PREFIX}/etc ${FIND} ${STAGEDIR} -name '*.bs' -size 0 -delete Added: head/lang/perl5.18/files/patch-Makefile.SH ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/perl5.18/files/patch-Makefile.SH Thu Nov 27 09:57:39 2014 (r373476) @@ -0,0 +1,11 @@ +--- Makefile.SH.orig 2014-10-01 15:23:34 UTC ++++ Makefile.SH +@@ -805,7 +808,7 @@ $(LIBPERL): $& $(obj) $(DYNALOADER) $(LI + true) + $spitshell >>$Makefile <<'!NO!SUBS!' + rm -f $@ +- $(LD) -o $@ $(SHRPLDFLAGS) $(obj) $(DYNALOADER) $(libs) ++ $(LD) -o $@ $(SHRPLDFLAGS) -Wl,-soname,$(LIBPERL) $(obj) $(DYNALOADER) $(libs) + !NO!SUBS! + case "$osname" in + aix) Modified: head/lang/perl5.18/pkg-plist ============================================================================== --- head/lang/perl5.18/pkg-plist Thu Nov 27 09:47:05 2014 (r373475) +++ head/lang/perl5.18/pkg-plist Thu Nov 27 09:57:39 2014 (r373476) @@ -727,6 +727,7 @@ lib/perl5/%%PERL_VER%%/inc/latest/privat lib/perl5/%%PERL_VER%%/integer.pm lib/perl5/%%PERL_VER%%/less.pm lib/perl5/%%PERL_VER%%/locale.pm +lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/.packlist lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B.pm lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B/Concise.pm lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B/Showlex.pm @@ -759,6 +760,8 @@ lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/COR lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/keywords.h lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/l1_char_class_tab.h lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/libperl.so +lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/libperl.so.%%PERL_VER%% +lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/libperl.so.%%PERL_VERSION%% lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/malloc_ctl.h lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/metaconfig.h lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/mg.h Modified: head/lang/perl5.20/Makefile ============================================================================== --- head/lang/perl5.20/Makefile Thu Nov 27 09:47:05 2014 (r373475) +++ head/lang/perl5.20/Makefile Thu Nov 27 09:57:39 2014 (r373476) @@ -3,7 +3,7 @@ PORTNAME= perl PORTVERSION= ${PERL_VERSION} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= lang devel perl5 MASTER_SITES= CPAN \ ${MASTER_SITE_LOCAL:S/$/:local/} \ @@ -74,6 +74,7 @@ USES= tar:bzip2 cpe HAS_CONFIGURE= yes CONFIGURE_SCRIPT=Configure CONFIGURE_ARGS= -sde -Dprefix=${PREFIX} \ + -Dlibperl=libperl.so.${PERL_VER} \ -Darchlib=${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH} \ -Dprivlib=${PREFIX}/lib/perl5/${PERL_VER} \ -Dman3dir=${PREFIX}/${MAN3PREFIX_REL}/man/man3 \ @@ -82,10 +83,13 @@ CONFIGURE_ARGS= -sde -Dprefix=${PREFIX} -Dsitelib=${SITE_PERL} -Dscriptdir=${PREFIX}/bin \ -Dsiteman3dir=${SITE_MAN3} \ -Dsiteman1dir=${PREFIX}/man/man1 \ - -Dotherlibdirs=${PREFIX}/lib/perl5/site_perl/${PERL_VER}:${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH} \ -Ui_malloc -Ui_iconv -Uinstallusrbinperl \ -Dcc="${CC}" -Duseshrplib -Dinc_version_list=none \ -Dccflags=-DAPPLLIB_EXP=\"${BSDPAN_DEST}\" +# When upgrading to 5.22+ remove this. +CONFIGURE_ARGS+= \ + -Dotherlibdirs=${PREFIX}/lib/perl5/site_perl/${PERL_VER}:${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH} + LOCALE_CLEANUP= LANG="" LC_ALL="" LC_COLLATE="" LC_CTYPE="" \ LC_MESSAGES="" LC_MONETARY="" LC_NUMERIC="" \ LC_TIME="" @@ -106,7 +110,7 @@ INSTALL_TARGET= install-strip .include "${PORTSDIR}/Mk/bsd.default-versions.mk" # if this port is default due PERL5_DEFAULT -# change PKGNAME to reflect this +# change PKGNAME to reflect this .if ${PERL_VER} == ${PERL5_DEFAULT} PKGNAMESUFFIX= ${PERL_VERSION:C/\.[0-9]+\.[0-9]+$//} .else @@ -133,7 +137,7 @@ CONFIGURE_ARGS+= \ -Accflags=-DPERLIOBUF_DEFAULT_BUFSIZ=${PERLIOBUF_DEFAULT_BUFSIZ} .endif -MAN3PREFIX_REL= lib/perl5/${PERL_VER} +MAN3PREFIX_REL= lib/perl5/${PERL_VER}/perl MAN3PREFIX= ${PREFIX}/${MAN3PREFIX_REL} MANDIRS+= ${MAN3PREFIX}/man @@ -187,8 +191,9 @@ post-install: ${MKDIR} ${STAGEDIR}${SITE_MAN3} ${MKDIR} ${STAGEDIR}${SITE_ARCH}/auto ${MKDIR} ${STAGEDIR}${SITE_PERL}/auto - ${RM} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/.packlist ${LN} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} ${STAGEDIR}${PREFIX}/bin/perl5 + ${LN} -s libperl.so.${PERL_VER} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/CORE/libperl.so + ${LN} -s libperl.so.${PERL_VER} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/CORE/libperl.so.${PERL_VERSION} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} ${INSTALL_DATA} ${WRKDIR}/perl5_version ${STAGEDIR}${PREFIX}/etc ${MKDIR} ${STAGEDIR}${SITE_ARCH}/machine Added: head/lang/perl5.20/files/patch-Makefile.SH ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/perl5.20/files/patch-Makefile.SH Thu Nov 27 09:57:39 2014 (r373476) @@ -0,0 +1,11 @@ +--- Makefile.SH.orig 2014-09-14 11:30:59 UTC ++++ Makefile.SH +@@ -838,7 +838,7 @@ $(LIBPERL): $& $(obj) $(DYNALOADER) $(LI + true) + $spitshell >>$Makefile <<'!NO!SUBS!' + rm -f $@ +- $(LD) -o $@ $(SHRPLDFLAGS) $(obj) $(DYNALOADER) $(libs) ++ $(LD) -o $@ $(SHRPLDFLAGS) -Wl,-soname,$(LIBPERL) $(obj) $(DYNALOADER) $(libs) + !NO!SUBS! + case "$osname" in + aix) Modified: head/lang/perl5.20/pkg-plist ============================================================================== --- head/lang/perl5.20/pkg-plist Thu Nov 27 09:47:05 2014 (r373475) +++ head/lang/perl5.20/pkg-plist Thu Nov 27 09:57:39 2014 (r373476) @@ -664,6 +664,7 @@ lib/perl5/%%PERL_VER%%/inc/latest/privat lib/perl5/%%PERL_VER%%/integer.pm lib/perl5/%%PERL_VER%%/less.pm lib/perl5/%%PERL_VER%%/locale.pm +lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/.packlist lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B.pm lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B/Concise.pm lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B/Showlex.pm @@ -695,6 +696,8 @@ lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/COR lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/keywords.h lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/l1_char_class_tab.h lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/libperl.so +lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/libperl.so.%%PERL_VER%% +lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/libperl.so.%%PERL_VERSION%% lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/malloc_ctl.h lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/metaconfig.h lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/mg.h