Index: CHANGES =================================================================== --- CHANGES +++ CHANGES @@ -10,6 +10,35 @@ All ports committers are allowed to commit to this file. +2014XXXX: +AUTHOR: mat@FreeBSD.org + + The way Perl modules are installed has changed. Before, we had + + site_perl : lib/perl5/site_perl/5.18 + site_perl/perl_arch : lib/perl5/site_perl/5.18/mach + perl_man3 : lib/perl5/5.18/man/man3 + + Now we have : + + site_perl : lib/perl5/site_perl + site_arch : lib/perl5/site_perl/mach/5.18 + perl_man3 : lib/perl5/site_perl/man/man3 + + Modules without any .so will be installed at the same place regardless of the + Perl version, minimizing the upgrade when the major Perl version is changed. + It uses a version dependent directory for modules with compiled bits. + + As PERL_ARCH is no longer needed in plists, it has been removed from + PLIST_SUB. + + The USE_PERL5=fixpacklist keyword is removed, the .packlist file is now + always removed, as is perllocal.pod. + + The old site_perl and site_perl/arch directories have been kept in the + default Perl @INC for all Perl ports, and will be phased out as these old + Perl versions expire. + 20141122: AUTHOR: crees@FreeBSD.org Index: Mk/Uses/perl5.mk =================================================================== --- Mk/Uses/perl5.mk +++ Mk/Uses/perl5.mk @@ -1,4 +1,5 @@ # $FreeBSD$ +# ex:ts=4 # # Provide support to use perl5 # @@ -8,7 +9,7 @@ # installed from a port, but without the version number. # Use this if you need to replace "#!" lines in scripts. # PERL_VERSION - Full version of perl5 (see below for current value). -# +# # PERL_VER - Short version of perl5 (major.minor without patchlevel) # # PERL_LEVEL - Perl version as an integer of the form MNNNPP, where @@ -26,9 +27,7 @@ # SITE_ARCH - Directory name where arch site specific perl packages go. # This value is added to PLIST_SUB. # USE_PERL5 - If set, this port uses perl5 in one or more of the extract, -# patch, build, install or run phases. The fixpacklist is -# needed in some cases, when a .packlist is created, it may -# reference ${STAGEDIR} +# patch, build, install or run phases. # It can also have configure, modbuild and modbuildtiny when # the port needs to run Makefile.PL, Build.PL and a # Module::Build::Tiny flavor of Build.PL. @@ -96,10 +95,12 @@ PERL_PORT?= perl5.14 .endif -SITE_PERL_REL?= lib/perl5/site_perl/${PERL_VER} +SITE_PERL_REL?= lib/perl5/site_perl SITE_PERL?= ${LOCALBASE}/${SITE_PERL_REL} -SITE_ARCH_REL?= ${SITE_PERL_REL}/${PERL_ARCH} +SITE_ARCH_REL?= ${SITE_PERL_REL}/${PERL_ARCH}/${PERL_VER} SITE_ARCH?= ${LOCALBASE}/${SITE_ARCH_REL} +SITE_MAN3_REL?= ${SITE_PERL_REL}/man/man3 +SITE_MAN3?= ${PREFIX}/${SITE_MAN3_REL} PERL5= ${LOCALBASE}/bin/perl${PERL_VERSION} PERL= ${LOCALBASE}/bin/perl @@ -158,10 +159,9 @@ PLIST_SUB+= PERL_VERSION=${PERL_VERSION} \ PERL_VER=${PERL_VER} \ - PERL_ARCH=${PERL_ARCH} \ - PERL5_MAN3=lib/perl5/${PERL_VER}/man/man3 \ - SITE_ARCH=${SITE_ARCH_REL} \ - SITE_PERL=${SITE_PERL_REL} + PERL5_MAN3=${SITE_MAN3_REL} \ + SITE_PERL=${SITE_PERL_REL} \ + SITE_ARCH=${SITE_ARCH_REL} # handle perl5 specific manpages .for sect in 3 @@ -169,13 +169,13 @@ _MANPAGES+= ${P5MAN${sect}:S%^%${PREFIX}/lib/perl5/${PERL_VER}/man/man${sect}/%} .endif .endfor -MANDIRS+= ${PREFIX}/lib/perl5/${PERL_VER} +MANDIRS+= ${SITE_PERL}/man .if ${_USE_PERL5:Mmodbuild} || ${_USE_PERL5:Mmodbuildtiny} _USE_PERL5+= configure ALL_TARGET?= # empty -CONFIGURE_ARGS+=--install_path lib="${PREFIX}/${SITE_PERL_REL}" \ - --install_path arch="${PREFIX}/${SITE_ARCH_REL}" \ +CONFIGURE_ARGS+=--install_path lib="${SITE_PERL}" \ + --install_path arch="${SITE_ARCH}" \ --install_path script="${PREFIX}/bin" \ --install_path bin="${PREFIX}/bin" \ --install_path libdoc="${MAN3PREFIX}/man/man3" \ @@ -194,10 +194,12 @@ .if ${PORTNAME} != Module-Build-Tiny BUILD_DEPENDS+= p5-Module-Build-Tiny>=0.038:${PORTSDIR}/devel/p5-Module-Build-Tiny .endif -CONFIGURE_ARGS+=--create_packlist 1 +CONFIGURE_ARGS+=--create_packlist 0 .endif .elif ${_USE_PERL5:Mconfigure} -CONFIGURE_ARGS+=INSTALLDIRS="site" +# 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 .endif # modbuild .if ${_USE_PERL5:Mconfigure} @@ -231,14 +233,14 @@ CONFIGURE_ARGS+= CC="${CC}" CCFLAGS="${CFLAGS}" PREFIX="${PREFIX}" \ INSTALLPRIVLIB="${PREFIX}/lib" INSTALLARCHLIB="${PREFIX}/lib" CONFIGURE_SCRIPT?= Makefile.PL -MAN3PREFIX?= ${PREFIX}/lib/perl5/${PERL_VER} +MAN3PREFIX?= ${SITE_PERL} .undef HAS_CONFIGURE .if !target(do-configure) do-configure: @if [ -f ${SCRIPTDIR}/configure ]; then \ cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} \ - ${SCRIPTDIR}/configure; \ + ${SCRIPTDIR}/configure; \ fi @cd ${CONFIGURE_WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} \ @@ -264,16 +266,30 @@ .endif # ! USES=gmake .endif # modbuild -.if ${USE_PERL5:Mconfigure} || ${USE_PERL5:Mmodbuildtiny} || ${USE_PERL5:Mfixpacklist} -fix-packlist:: - @if [ -d ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/auto ] ; then ${FIND} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/auto -name .packlist -exec ${SED} -i '' 's|^${STAGEDIR}||' '{}' \; ; fi -.endif +# 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 || : ; \ + done \ + fi) || : # Starting with perl 5.20, the empty bootstrap files are not installed any more # by ExtUtils::MakeMaker. As we don't need them anyway, remove them. # Module::Build continues to install them, so remove the files unconditionally. -fix-perl-bs: - -@${FIND} ${STAGEDIR} -name '*.bs' -size 0 -delete + @${FIND} ${STAGEDIR} -name '*.bs' -size 0 -delete || : + +# Some ports use their own way of building perl modules and generate +# perllocal.pod, remove it here so that those ports don't include it +# by mistake in their plists. It is sometime compressed, so use a +# shell glob for the removal. Also, remove the directories that +# contain it to not leave orphans directories around. + @${RM} -f ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/perllocal.pod* || : + @${RMDIR} -p ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH} 2>/dev/null || : .if !target(regression-test) TEST_ARGS+= ${MAKE_ARGS} Index: Mk/bsd.default-versions.mk =================================================================== --- Mk/bsd.default-versions.mk +++ Mk/bsd.default-versions.mk @@ -23,7 +23,7 @@ GCC_DEFAULT?= 4.8 LUA_DEFAULT?= 5.2 MYSQL_DEFAULT?= 5.5 -PERL5_DEFAULT?= 5.16 +PERL5_DEFAULT?= 5.18 PGSQL_DEFAULT?= 9.2 PHP_DEFAULT?= 5.4 PYTHON_DEFAULT?= 2.7 Index: Mk/bsd.port.mk =================================================================== --- Mk/bsd.port.mk +++ Mk/bsd.port.mk @@ -5959,25 +5959,25 @@ pre-su-install .if defined(NEED_ROOT) _STAGE_SUSEQ= create-users-groups do-install \ - kmod-post-install \ + kmod-post-install fix-perl-things \ webplugin-post-install post-install post-install-script \ move-uniquefiles patch-lafiles post-stage compress-man \ install-rc-script install-ldconfig-file install-license \ install-desktop-entries add-plist-info add-plist-docs \ add-plist-examples add-plist-data add-plist-post \ - move-uniquefiles-plist fix-packlist fix-perl-bs + move-uniquefiles-plist .if defined(DEVELOPER) _STAGE_SUSEQ+= stage-qa .endif .else _STAGE_SEQ+= create-users-groups do-install \ - kmod-post-install \ + kmod-post-install fix-perl-things \ webplugin-post-install post-install post-install-script \ move-uniquefiles patch-lafiles post-stage compress-man \ install-rc-script install-ldconfig-file install-license \ install-desktop-entries add-plist-info add-plist-docs \ add-plist-examples add-plist-data add-plist-post \ - move-uniquefiles-plist fix-packlist fix-perl-bs + move-uniquefiles-plist fix-perl-things .if defined(DEVELOPER) _STAGE_SEQ+= stage-qa .endif Index: UPDATING =================================================================== --- UPDATING +++ UPDATING @@ -5,6 +5,47 @@ You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +2014XXXX: + AFFECTS: users of lang/perl5.* + AUTHOR: mat@FreeBSD.org + + The directories where Perl modules are installed has changed. All + affected ports' PORTREVISION have been bumped, so upgrading should + be as painless as possible. The old directories have been kept in + the default Perl @INC to make it even more painless. + + The default Perl has been switched to lang/perl5.18. These examples + are for switching from lang/perl5.16, if you are running a different + version, replace lang/perl5.16 with the origin of the Perl you have + installed. + + Binary package users: + + # pkg upgrade -f + + Portupgrade users: + 0) Fix pkgdb.db (for safety): + pkgdb -Ff + + 1) Reinstall new version of Perl (5.18): + portupgrade -o lang/perl5.18 -f lang/perl5.16 + + 2) Reinstall everything that depends on Perl: + portupgrade -fr lang/perl5.18 + + Portmaster users: + portmaster -o lang/perl5.18 lang/perl5.16 + + Conservative: + portmaster p5- + + Comprehensive (but perhaps overkill): + portmaster -r perl5- + + Note: If the "perl5-" glob matches more than one port you will need to specify + the name of the installed Perl package explicitly. You can get its name + by running: pkg info perl5 + 20141123: AFFECTS: users of security/heimdal AUTHOR: hrs@FreeBSD.org Index: lang/clang-cheri/Makefile =================================================================== --- lang/clang-cheri/Makefile +++ lang/clang-cheri/Makefile @@ -127,7 +127,6 @@ build-plist: ${RM} -f ${PLIST} ${MAKE} makeplist | \ - ${GREP} -v /you/have/to/check/what/makeplist/gives/you | \ - ${SED} -e 's/%%PERL_ARCH%%/${PERL_ARCH}/' >> ${PLIST} + ${GREP} -v /you/have/to/check/what/makeplist/gives/you >> ${PLIST} .include Index: lang/p5-Data-JavaScript/pkg-plist =================================================================== --- lang/p5-Data-JavaScript/pkg-plist +++ lang/p5-Data-JavaScript/pkg-plist @@ -1,4 +1,3 @@ %%SITE_PERL%%/Data/JavaScript.pm %%SITE_PERL%%/Data/example.pl -%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/JavaScript/.packlist %%PERL5_MAN3%%/Data::JavaScript.3.gz Index: lang/p5-Error/pkg-plist =================================================================== --- lang/p5-Error/pkg-plist +++ lang/p5-Error/pkg-plist @@ -2,4 +2,3 @@ %%PERL5_MAN3%%/Error::Simple.3.gz %%SITE_PERL%%/Error.pm %%SITE_PERL%%/Error/Simple.pm -%%SITE_PERL%%/%%PERL_ARCH%%/auto/Error/.packlist Index: lang/p5-Expect/pkg-plist =================================================================== --- lang/p5-Expect/pkg-plist +++ lang/p5-Expect/pkg-plist @@ -1,3 +1,2 @@ %%PERL5_MAN3%%/Expect.3.gz %%SITE_PERL%%/Expect.pm -%%SITE_PERL%%/%%PERL_ARCH%%/auto/Expect/.packlist Index: lang/p5-ExtUtils-F77/pkg-plist =================================================================== --- lang/p5-ExtUtils-F77/pkg-plist +++ lang/p5-ExtUtils-F77/pkg-plist @@ -1,3 +1,2 @@ %%PERL5_MAN3%%/ExtUtils::F77.3.gz %%SITE_PERL%%/ExtUtils/F77.pm -%%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/F77/.packlist Index: lang/p5-Interpolation/pkg-plist =================================================================== --- lang/p5-Interpolation/pkg-plist +++ lang/p5-Interpolation/pkg-plist @@ -1,3 +1,2 @@ %%PERL5_MAN3%%/Interpolation.3.gz %%SITE_PERL%%/Interpolation.pm -%%SITE_PERL%%/%%PERL_ARCH%%/auto/Interpolation/.packlist Index: lang/p5-JSAN/pkg-plist =================================================================== --- lang/p5-JSAN/pkg-plist +++ lang/p5-JSAN/pkg-plist @@ -7,4 +7,3 @@ %%SITE_PERL%%/JSAN/Indexer.pm %%SITE_PERL%%/JSAN/Indexer/Creator.pm %%SITE_PERL%%/JSAN/Shell.pm -%%SITE_PERL%%/%%PERL_ARCH%%/auto/JSAN/.packlist Index: lang/p5-JavaScript-SpiderMonkey/pkg-plist =================================================================== --- lang/p5-JavaScript-SpiderMonkey/pkg-plist +++ lang/p5-JavaScript-SpiderMonkey/pkg-plist @@ -1,4 +1,3 @@ -%%SITE_PERL%%/%%PERL_ARCH%%/JavaScript/SpiderMonkey.pm -%%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript/SpiderMonkey/.packlist -%%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript/SpiderMonkey/SpiderMonkey.so +%%SITE_ARCH%%/JavaScript/SpiderMonkey.pm +%%SITE_ARCH%%/auto/JavaScript/SpiderMonkey/SpiderMonkey.so %%PERL5_MAN3%%/JavaScript::SpiderMonkey.3.gz Index: lang/p5-JavaScript-Squish/pkg-plist =================================================================== --- lang/p5-JavaScript-Squish/pkg-plist +++ lang/p5-JavaScript-Squish/pkg-plist @@ -1,5 +1,4 @@ bin/js_compactor %%PERL5_MAN3%%/JavaScript::Squish.3.gz %%SITE_PERL%%/JavaScript/Squish.pm -%%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript/Squish/.packlist man/man1/js_compactor.1.gz Index: lang/p5-JavaScript-Value-Escape/pkg-plist =================================================================== --- lang/p5-JavaScript-Value-Escape/pkg-plist +++ lang/p5-JavaScript-Value-Escape/pkg-plist @@ -1,3 +1,2 @@ -%%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript/Value/Escape/.packlist %%SITE_PERL%%/JavaScript/Value/Escape.pm %%PERL5_MAN3%%/JavaScript::Value::Escape.3.gz Index: lang/p5-List-MoreUtils/pkg-plist =================================================================== --- lang/p5-List-MoreUtils/pkg-plist +++ lang/p5-List-MoreUtils/pkg-plist @@ -1,4 +1,3 @@ -%%SITE_PERL%%/%%PERL_ARCH%%/List/MoreUtils.pm -%%SITE_PERL%%/%%PERL_ARCH%%/auto/List/MoreUtils/.packlist -%%SITE_PERL%%/%%PERL_ARCH%%/auto/List/MoreUtils/MoreUtils.so +%%SITE_ARCH%%/List/MoreUtils.pm +%%SITE_ARCH%%/auto/List/MoreUtils/MoreUtils.so %%PERL5_MAN3%%/List::MoreUtils.3.gz Index: lang/p5-Marpa-XS/pkg-plist =================================================================== --- lang/p5-Marpa-XS/pkg-plist +++ lang/p5-Marpa-XS/pkg-plist @@ -1,26 +1,25 @@ -%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS.pm -%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS.pod -%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Advanced/Bibliography.pod -%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Advanced/Models.pod -%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Debug.pod -%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Grammar.pm -%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Grammar.pod -%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Installed.pm -%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Internal.pm -%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Recognizer.pm -%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Recognizer.pod -%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Rewrite.pod -%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Semantics.pod -%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Semantics/Infinite.pod -%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Semantics/Null.pod -%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Semantics/Order.pod -%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Support.pod -%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Tracing.pod -%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Value.pm -%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Version.pm -%%SITE_PERL%%/%%PERL_ARCH%%/Marpa/XS/Vocabulary.pod -%%SITE_PERL%%/%%PERL_ARCH%%/auto/Marpa/XS/.packlist -%%SITE_PERL%%/%%PERL_ARCH%%/auto/Marpa/XS/XS.so +%%SITE_ARCH%%/Marpa/XS.pm +%%SITE_ARCH%%/Marpa/XS.pod +%%SITE_ARCH%%/Marpa/XS/Advanced/Bibliography.pod +%%SITE_ARCH%%/Marpa/XS/Advanced/Models.pod +%%SITE_ARCH%%/Marpa/XS/Debug.pod +%%SITE_ARCH%%/Marpa/XS/Grammar.pm +%%SITE_ARCH%%/Marpa/XS/Grammar.pod +%%SITE_ARCH%%/Marpa/XS/Installed.pm +%%SITE_ARCH%%/Marpa/XS/Internal.pm +%%SITE_ARCH%%/Marpa/XS/Recognizer.pm +%%SITE_ARCH%%/Marpa/XS/Recognizer.pod +%%SITE_ARCH%%/Marpa/XS/Rewrite.pod +%%SITE_ARCH%%/Marpa/XS/Semantics.pod +%%SITE_ARCH%%/Marpa/XS/Semantics/Infinite.pod +%%SITE_ARCH%%/Marpa/XS/Semantics/Null.pod +%%SITE_ARCH%%/Marpa/XS/Semantics/Order.pod +%%SITE_ARCH%%/Marpa/XS/Support.pod +%%SITE_ARCH%%/Marpa/XS/Tracing.pod +%%SITE_ARCH%%/Marpa/XS/Value.pm +%%SITE_ARCH%%/Marpa/XS/Version.pm +%%SITE_ARCH%%/Marpa/XS/Vocabulary.pod +%%SITE_ARCH%%/auto/Marpa/XS/XS.so %%PERL5_MAN3%%/Marpa::XS.3.gz %%PERL5_MAN3%%/Marpa::XS::Advanced::Bibliography.3.gz %%PERL5_MAN3%%/Marpa::XS::Advanced::Models.3.gz Index: lang/p5-Marpa/pkg-plist =================================================================== --- lang/p5-Marpa/pkg-plist +++ lang/p5-Marpa/pkg-plist @@ -32,7 +32,6 @@ %%SITE_PERL%%/Marpa/Test.pm %%SITE_PERL%%/Marpa/Test/Util.pm %%SITE_PERL%%/Marpa/Tracing.pod -%%SITE_PERL%%/%%PERL_ARCH%%/auto/Marpa/.packlist %%PERL5_MAN3%%/Marpa::Advanced::Algorithm.3.gz %%PERL5_MAN3%%/Marpa::Advanced::Bibliography.3.gz %%PERL5_MAN3%%/Marpa::Advanced::Implementation.3.gz Index: lang/p5-Parse-Perl/pkg-plist =================================================================== --- lang/p5-Parse-Perl/pkg-plist +++ lang/p5-Parse-Perl/pkg-plist @@ -1,8 +1,7 @@ %%PERL5_MAN3%%/Parse::Perl.3.gz %%PERL5_MAN3%%/Parse::Perl::CopHintsHash.3.gz %%PERL5_MAN3%%/Parse::Perl::Environment.3.gz -%%SITE_PERL%%/%%PERL_ARCH%%/Parse/Perl.pm -%%SITE_PERL%%/%%PERL_ARCH%%/Parse/Perl/CopHintsHash.pod -%%SITE_PERL%%/%%PERL_ARCH%%/Parse/Perl/Environment.pod -%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/Perl/.packlist -%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/Perl/Perl.so +%%SITE_ARCH%%/Parse/Perl.pm +%%SITE_ARCH%%/Parse/Perl/CopHintsHash.pod +%%SITE_ARCH%%/Parse/Perl/Environment.pod +%%SITE_ARCH%%/auto/Parse/Perl/Perl.so Index: lang/p5-Perl6-Subs/pkg-plist =================================================================== --- lang/p5-Perl6-Subs/pkg-plist +++ lang/p5-Perl6-Subs/pkg-plist @@ -1,3 +1,2 @@ %%SITE_PERL%%/Perl6/Subs.pm -%%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6/Subs/.packlist %%PERL5_MAN3%%/Perl6::Subs.3.gz Index: lang/p5-Pugs-Compiler-Rule/pkg-plist =================================================================== --- lang/p5-Pugs-Compiler-Rule/pkg-plist +++ lang/p5-Pugs-Compiler-Rule/pkg-plist @@ -36,5 +36,4 @@ %%SITE_PERL%%/Pugs/Runtime/Rule.pm %%SITE_PERL%%/Pugs/Runtime/StrPos.pm %%SITE_PERL%%/Pugs/Runtime/Tracer.pm -%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pugs/Compiler/Rule/.packlist man/man1/compile_p6grammar.pl.1.gz Index: lang/p5-Quantum-Superpositions/pkg-plist =================================================================== --- lang/p5-Quantum-Superpositions/pkg-plist +++ lang/p5-Quantum-Superpositions/pkg-plist @@ -1,3 +1,2 @@ %%PERL5_MAN3%%/Quantum::Superpositions.3.gz %%SITE_PERL%%/Quantum/Superpositions.pm -%%SITE_PERL%%/%%PERL_ARCH%%/auto/Quantum/Superpositions/.packlist Index: lang/p5-Scalar-List-Utils/pkg-plist =================================================================== --- lang/p5-Scalar-List-Utils/pkg-plist +++ lang/p5-Scalar-List-Utils/pkg-plist @@ -1,8 +1,7 @@ -%%SITE_PERL%%/%%PERL_ARCH%%/auto/List/Util/Util.so -%%SITE_PERL%%/%%PERL_ARCH%%/auto/List/Util/.packlist -%%SITE_PERL%%/%%PERL_ARCH%%/Scalar/Util.pm -%%SITE_PERL%%/%%PERL_ARCH%%/List/Util.pm -%%SITE_PERL%%/%%PERL_ARCH%%/List/Util/XS.pm +%%SITE_ARCH%%/auto/List/Util/Util.so +%%SITE_ARCH%%/Scalar/Util.pm +%%SITE_ARCH%%/List/Util.pm +%%SITE_ARCH%%/List/Util/XS.pm %%PERL5_MAN3%%/List::Util.3.gz %%PERL5_MAN3%%/List::Util::XS.3.gz %%PERL5_MAN3%%/Scalar::Util.3.gz Index: lang/p5-Switch/pkg-plist =================================================================== --- lang/p5-Switch/pkg-plist +++ lang/p5-Switch/pkg-plist @@ -1,3 +1,2 @@ -%%SITE_PERL%%/%%PERL_ARCH%%/auto/Switch/.packlist %%SITE_PERL%%/Switch.pm %%PERL5_MAN3%%/Switch.3.gz Index: lang/p5-Tcl/pkg-plist =================================================================== --- lang/p5-Tcl/pkg-plist +++ lang/p5-Tcl/pkg-plist @@ -1,4 +1,3 @@ %%PERL5_MAN3%%/Tcl.3.gz -%%SITE_PERL%%/%%PERL_ARCH%%/Tcl.pm -%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tcl/.packlist -%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tcl/Tcl.so +%%SITE_ARCH%%/Tcl.pm +%%SITE_ARCH%%/auto/Tcl/Tcl.so Index: lang/p5-Try-Tiny-Retry/pkg-plist =================================================================== --- lang/p5-Try-Tiny-Retry/pkg-plist +++ lang/p5-Try-Tiny-Retry/pkg-plist @@ -1,3 +1,2 @@ %%PERL5_MAN3%%/Try::Tiny::Retry.3.gz %%SITE_PERL%%/Try/Tiny/Retry.pm -%%SITE_PERL%%/%%PERL_ARCH%%/auto/Try/Tiny/Retry/.packlist Index: lang/p5-Try-Tiny/pkg-plist =================================================================== --- lang/p5-Try-Tiny/pkg-plist +++ lang/p5-Try-Tiny/pkg-plist @@ -1,3 +1,2 @@ %%SITE_PERL%%/Try/Tiny.pm -%%SITE_PERL%%/%%PERL_ARCH%%/auto/Try/Tiny/.packlist %%PERL5_MAN3%%/Try::Tiny.3.gz Index: lang/p5-TryCatch/pkg-plist =================================================================== --- lang/p5-TryCatch/pkg-plist +++ lang/p5-TryCatch/pkg-plist @@ -1,4 +1,3 @@ -%%SITE_PERL%%/%%PERL_ARCH%%/TryCatch.pm -%%SITE_PERL%%/%%PERL_ARCH%%/auto/TryCatch/.packlist -%%SITE_PERL%%/%%PERL_ARCH%%/auto/TryCatch/TryCatch.so +%%SITE_ARCH%%/TryCatch.pm +%%SITE_ARCH%%/auto/TryCatch/TryCatch.so %%PERL5_MAN3%%/TryCatch.3.gz Index: lang/p5-ePerl/pkg-plist =================================================================== --- lang/p5-ePerl/pkg-plist +++ lang/p5-ePerl/pkg-plist @@ -1,7 +1,6 @@ -%%SITE_PERL%%/%%PERL_ARCH%%/Apache/ePerl.pm -%%SITE_PERL%%/%%PERL_ARCH%%/Parse/ePerl.pm -%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/ePerl/autosplit.ix -%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/ePerl/ePerl.so -%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/ePerl/.packlist +%%SITE_ARCH%%/Apache/ePerl.pm +%%SITE_ARCH%%/Parse/ePerl.pm +%%SITE_ARCH%%/auto/Parse/ePerl/autosplit.ix +%%SITE_ARCH%%/auto/Parse/ePerl/ePerl.so %%PERL5_MAN3%%/Parse::ePerl.3.gz %%PERL5_MAN3%%/Apache::ePerl.3.gz Index: lang/p5-signatures/pkg-plist =================================================================== --- lang/p5-signatures/pkg-plist +++ lang/p5-signatures/pkg-plist @@ -1,4 +1,3 @@ -%%SITE_PERL%%/%%PERL_ARCH%%/auto/signatures/.packlist -%%SITE_PERL%%/%%PERL_ARCH%%/auto/signatures/signatures.so -%%SITE_PERL%%/%%PERL_ARCH%%/signatures.pm +%%SITE_ARCH%%/auto/signatures/signatures.so +%%SITE_ARCH%%/signatures.pm %%PERL5_MAN3%%/signatures.3.gz Index: lang/p5-v6/pkg-plist =================================================================== --- lang/p5-v6/pkg-plist +++ lang/p5-v6/pkg-plist @@ -27,6 +27,5 @@ %%SITE_PERL%%/Pugs/Runtime/Perl6AST.pmc %%SITE_PERL%%/Pugs/Runtime/Perl6Prelude.pm %%SITE_PERL%%/Pugs/Runtime/Perl6Prelude.pmc -%%SITE_PERL%%/%%PERL_ARCH%%/auto/v6/alpha/.packlist %%SITE_PERL%%/v6.pm %%SITE_PERL%%/v6/hello_world.pl Index: lang/perl5.14/Makefile =================================================================== --- lang/perl5.14/Makefile +++ lang/perl5.14/Makefile @@ -43,8 +43,12 @@ PERL_VERSION= 5.14.4 PERL_VER= ${PERL_VERSION:C/\.[0-9]+$//} PERL_ARCH= mach -SITE_PERL_REL?= lib/perl5/site_perl/${PERL_VER} +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_REL?= ${SITE_PERL_REL}/man/man3 +SITE_MAN3?= ${PREFIX}/${SITE_MAN3_REL} USES= tar:bzip2 cpe HAS_CONFIGURE= yes @@ -52,12 +56,13 @@ CONFIGURE_ARGS= -sde -Dprefix=${PREFIX} \ -Darchlib=${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH} \ -Dprivlib=${PREFIX}/lib/perl5/${PERL_VER} \ - -Dman3dir=${PREFIX}/lib/perl5/${PERL_VER}/perl/man/man3 \ + -Dman3dir=${PREFIX}/${MAN3PREFIX_REL}/man/man3 \ -Dman1dir=${PREFIX}/man/man1 \ - -Dsitearch=${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH} \ - -Dsitelib=${PREFIX}/${SITE_PERL_REL} -Dscriptdir=${PREFIX}/bin \ - -Dsiteman3dir=${PREFIX}/lib/perl5/${PERL_VER}/man/man3 \ + -Dsitearch=${SITE_ARCH} \ + -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}\" @@ -75,6 +80,7 @@ PKGINSTALL= ${WRKDIR}/use.perl PKGDEINSTALL= ${WRKDIR}/use.perl +INSTALL_TARGET= install-strip .include .include "${PORTSDIR}/Mk/bsd.default-versions.mk" @@ -107,14 +113,16 @@ -Accflags=-DPERLIOBUF_DEFAULT_BUFSIZ=${PERLIOBUF_DEFAULT_BUFSIZ} .endif -MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VER}/perl -MANDIRS+= ${MAN3PREFIX} +MAN3PREFIX_REL= lib/perl5/${PERL_VER} +MAN3PREFIX= ${PREFIX}/${MAN3PREFIX_REL} +MANDIRS+= ${MAN3PREFIX}/man PLIST_SUB+= PERL_VERSION=${PERL_VERSION} \ PERL_VER=${PERL_VER} \ PERL_ARCH=${PERL_ARCH} \ - MAN3=${MAN3PREFIX:S|^${PREFIX}/||}/man/man3 \ - SITE_PERL=${SITE_PERL:S|^${PREFIX}/||} + MAN3=${MAN3PREFIX_REL}/man/man3 \ + SITE_PERL=${SITE_PERL_REL} \ + SITE_ARCH=${SITE_ARCH_REL} .if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= -Doptimize="-g" -DDEBUGGING @@ -200,15 +208,22 @@ .endif post-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/man/man3 - ${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto - ${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/machine - ${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/sys + ${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 ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} ${INSTALL_DATA} ${WRKDIR}/perl5_version ${STAGEDIR}${PREFIX}/etc ${FIND} ${STAGEDIR} -name '*.bs' -size 0 -delete + ${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 && ${ENV} 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} .if ${OSVERSION} >= 900022 ${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${STAGEDIR}${PREFIX}/etc/man.d/perl${PERL_VER}.conf .endif Index: lang/perl5.14/pkg-plist =================================================================== --- lang/perl5.14/pkg-plist +++ lang/perl5.14/pkg-plist @@ -678,7 +678,6 @@ 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 @@ -2999,14 +2998,10 @@ man/man1/shasum.1.gz man/man1/splain.1.gz man/man1/xsubpp.1.gz -@dir lib/perl5/%%PERL_VER%%/man/man3 +@dir %%SITE_PERL%%/man/man3 @dir %%SITE_PERL%%/auto -@dir %%SITE_PERL%%/%%PERL_ARCH%%/auto -@dir %%SITE_PERL%%/%%PERL_ARCH%%/machine -@dir %%SITE_PERL%%/%%PERL_ARCH%%/sys -@exec cd /usr/include && %D/bin/h2ph -d %D/%%SITE_PERL%%/%%PERL_ARCH%% *.h machine/*.h sys/*.h >/dev/null +@dir %%SITE_ARCH%%/auto +@exec makewhatis %D/%%SITE_PERL%%/man @exec makewhatis %D/lib/perl5/%%PERL_VER%%/man -@exec makewhatis %D/lib/perl5/%%PERL_VER%%/perl/man @rmtry lib/perl5/%%PERL_VER%%/man/whatis -@rmtry lib/perl5/%%PERL_VER%%/perl/man/whatis -@unexec find %D/%%SITE_PERL%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true +@rmtry %%SITE_PERL%%/man/whatis Index: lang/perl5.16/Makefile =================================================================== --- lang/perl5.16/Makefile +++ lang/perl5.16/Makefile @@ -43,8 +43,12 @@ PERL_VERSION= 5.16.3 PERL_VER= ${PERL_VERSION:C/\.[0-9]+$//} PERL_ARCH= mach -SITE_PERL_REL?= lib/perl5/site_perl/${PERL_VER} +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_REL?= ${SITE_PERL_REL}/man/man3 +SITE_MAN3?= ${PREFIX}/${SITE_MAN3_REL} USES= tar:bzip2 cpe HAS_CONFIGURE= yes @@ -52,12 +56,13 @@ CONFIGURE_ARGS= -sde -Dprefix=${PREFIX} \ -Darchlib=${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH} \ -Dprivlib=${PREFIX}/lib/perl5/${PERL_VER} \ - -Dman3dir=${PREFIX}/lib/perl5/${PERL_VER}/perl/man/man3 \ + -Dman3dir=${PREFIX}/${MAN3PREFIX_REL}/man/man3 \ -Dman1dir=${PREFIX}/man/man1 \ - -Dsitearch=${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH} \ - -Dsitelib=${PREFIX}/${SITE_PERL_REL} -Dscriptdir=${PREFIX}/bin \ - -Dsiteman3dir=${PREFIX}/lib/perl5/${PERL_VER}/man/man3 \ + -Dsitearch=${SITE_ARCH} \ + -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}\" @@ -75,6 +80,7 @@ PKGINSTALL= ${WRKDIR}/use.perl PKGDEINSTALL= ${WRKDIR}/use.perl +INSTALL_TARGET= install-strip .include .include "${PORTSDIR}/Mk/bsd.default-versions.mk" @@ -107,14 +113,16 @@ -Accflags=-DPERLIOBUF_DEFAULT_BUFSIZ=${PERLIOBUF_DEFAULT_BUFSIZ} .endif -MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VER}/perl -MANDIRS+= ${MAN3PREFIX} +MAN3PREFIX_REL= lib/perl5/${PERL_VER} +MAN3PREFIX= ${PREFIX}/${MAN3PREFIX_REL} +MANDIRS+= ${MAN3PREFIX}/man PLIST_SUB+= PERL_VERSION=${PERL_VERSION} \ PERL_VER=${PERL_VER} \ PERL_ARCH=${PERL_ARCH} \ - MAN3=${MAN3PREFIX:S|^${PREFIX}/||}/man/man3 \ - SITE_PERL=${SITE_PERL:S|^${PREFIX}/||} + MAN3=${MAN3PREFIX_REL}/man/man3 \ + SITE_PERL=${SITE_PERL_REL} \ + SITE_ARCH=${SITE_ARCH_REL} .if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= -Doptimize="-g" -DDEBUGGING @@ -200,15 +208,22 @@ .endif post-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/man/man3 - ${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto - ${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/machine - ${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/sys + ${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 ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} ${INSTALL_DATA} ${WRKDIR}/perl5_version ${STAGEDIR}${PREFIX}/etc ${FIND} ${STAGEDIR} -name '*.bs' -size 0 -delete + ${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 && ${ENV} 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} .if ${OSVERSION} >= 900022 ${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${STAGEDIR}${PREFIX}/etc/man.d/perl${PERL_VER}.conf .endif Index: lang/perl5.16/pkg-plist =================================================================== --- lang/perl5.16/pkg-plist +++ lang/perl5.16/pkg-plist @@ -723,7 +723,6 @@ 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 @@ -2854,14 +2853,10 @@ man/man1/splain.1.gz man/man1/xsubpp.1.gz man/man1/zipdetails.1.gz -@dir lib/perl5/%%PERL_VER%%/man/man3 +@dir %%SITE_PERL%%/man/man3 @dir %%SITE_PERL%%/auto -@dir %%SITE_PERL%%/%%PERL_ARCH%%/auto -@dir %%SITE_PERL%%/%%PERL_ARCH%%/machine -@dir %%SITE_PERL%%/%%PERL_ARCH%%/sys -@exec cd /usr/include && %D/bin/h2ph -d %D/%%SITE_PERL%%/%%PERL_ARCH%% *.h machine/*.h sys/*.h >/dev/null +@dir %%SITE_ARCH%%/auto +@exec makewhatis %D/%%SITE_PERL%%/man @exec makewhatis %D/lib/perl5/%%PERL_VER%%/man -@exec makewhatis %D/lib/perl5/%%PERL_VER%%/perl/man @rmtry lib/perl5/%%PERL_VER%%/man/whatis -@rmtry lib/perl5/%%PERL_VER%%/perl/man/whatis -@unexec find %D/%%SITE_PERL%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true +@rmtry %%SITE_PERL%%/man/whatis Index: lang/perl5.18/Makefile =================================================================== --- lang/perl5.18/Makefile +++ lang/perl5.18/Makefile @@ -62,8 +62,12 @@ PERL_VERSION= 5.18.4 PERL_VER= ${PERL_VERSION:C/\.[0-9]+$//} PERL_ARCH= mach -SITE_PERL_REL?= lib/perl5/site_perl/${PERL_VER} +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_REL?= ${SITE_PERL_REL}/man/man3 +SITE_MAN3?= ${PREFIX}/${SITE_MAN3_REL} USES= tar:bzip2 cpe HAS_CONFIGURE= yes @@ -71,12 +75,13 @@ CONFIGURE_ARGS= -sde -Dprefix=${PREFIX} \ -Darchlib=${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH} \ -Dprivlib=${PREFIX}/lib/perl5/${PERL_VER} \ - -Dman3dir=${PREFIX}/lib/perl5/${PERL_VER}/perl/man/man3 \ + -Dman3dir=${PREFIX}/${MAN3PREFIX_REL}/man/man3 \ -Dman1dir=${PREFIX}/man/man1 \ - -Dsitearch=${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH} \ - -Dsitelib=${PREFIX}/${SITE_PERL_REL} -Dscriptdir=${PREFIX}/bin \ - -Dsiteman3dir=${PREFIX}/lib/perl5/${PERL_VER}/man/man3 \ + -Dsitearch=${SITE_ARCH} \ + -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}\" @@ -94,6 +99,7 @@ PKGINSTALL= ${WRKDIR}/use.perl PKGDEINSTALL= ${WRKDIR}/use.perl +INSTALL_TARGET= install-strip .include .include "${PORTSDIR}/Mk/bsd.default-versions.mk" @@ -126,14 +132,16 @@ -Accflags=-DPERLIOBUF_DEFAULT_BUFSIZ=${PERLIOBUF_DEFAULT_BUFSIZ} .endif -MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VER}/perl -MANDIRS+= ${MAN3PREFIX} +MAN3PREFIX_REL= lib/perl5/${PERL_VER} +MAN3PREFIX= ${PREFIX}/${MAN3PREFIX_REL} +MANDIRS+= ${MAN3PREFIX}/man PLIST_SUB+= PERL_VERSION=${PERL_VERSION} \ PERL_VER=${PERL_VER} \ PERL_ARCH=${PERL_ARCH} \ - MAN3=${MAN3PREFIX:S|^${PREFIX}/||}/man/man3 \ - SITE_PERL=${SITE_PERL:S|^${PREFIX}/||} + MAN3=${MAN3PREFIX_REL}/man/man3 \ + SITE_PERL=${SITE_PERL_REL} \ + SITE_ARCH=${SITE_ARCH_REL} .if ${PORT_OPTIONS:MDEBUG} STRIP= @@ -182,15 +190,22 @@ .endif post-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/man/man3 - ${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto - ${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/machine - ${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/sys + ${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 ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} ${INSTALL_DATA} ${WRKDIR}/perl5_version ${STAGEDIR}${PREFIX}/etc ${FIND} ${STAGEDIR} -name '*.bs' -size 0 -delete + ${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 && ${ENV} 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} .if ${OSVERSION} >= 900022 ${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${STAGEDIR}${PREFIX}/etc/man.d/perl${PERL_VER}.conf .endif Index: lang/perl5.18/pkg-plist =================================================================== --- lang/perl5.18/pkg-plist +++ lang/perl5.18/pkg-plist @@ -727,7 +727,6 @@ 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 @@ -2882,14 +2881,10 @@ man/man1/splain.1.gz man/man1/xsubpp.1.gz man/man1/zipdetails.1.gz -@dir lib/perl5/%%PERL_VER%%/man/man3 +@dir %%SITE_PERL%%/man/man3 @dir %%SITE_PERL%%/auto -@dir %%SITE_PERL%%/%%PERL_ARCH%%/auto -@dir %%SITE_PERL%%/%%PERL_ARCH%%/machine -@dir %%SITE_PERL%%/%%PERL_ARCH%%/sys -@exec cd /usr/include && %D/bin/h2ph -d %D/%%SITE_PERL%%/%%PERL_ARCH%% *.h machine/*.h sys/*.h >/dev/null +@dir %%SITE_ARCH%%/auto +@exec makewhatis %D/%%SITE_PERL%%/man @exec makewhatis %D/lib/perl5/%%PERL_VER%%/man -@exec makewhatis %D/lib/perl5/%%PERL_VER%%/perl/man @rmtry lib/perl5/%%PERL_VER%%/man/whatis -@rmtry lib/perl5/%%PERL_VER%%/perl/man/whatis -@unexec find %D/%%SITE_PERL%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true +@rmtry %%SITE_PERL%%/man/whatis Index: lang/perl5.20/Makefile =================================================================== --- lang/perl5.20/Makefile +++ lang/perl5.20/Makefile @@ -63,8 +63,12 @@ PERL_VERSION= 5.20.1 PERL_VER= ${PERL_VERSION:C/\.[0-9]+$//} PERL_ARCH= mach -SITE_PERL_REL?= lib/perl5/site_perl/${PERL_VER} +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_REL?= ${SITE_PERL_REL}/man/man3 +SITE_MAN3?= ${PREFIX}/${SITE_MAN3_REL} USES= tar:bzip2 cpe HAS_CONFIGURE= yes @@ -72,12 +76,13 @@ CONFIGURE_ARGS= -sde -Dprefix=${PREFIX} \ -Darchlib=${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH} \ -Dprivlib=${PREFIX}/lib/perl5/${PERL_VER} \ - -Dman3dir=${PREFIX}/lib/perl5/${PERL_VER}/perl/man/man3 \ + -Dman3dir=${PREFIX}/${MAN3PREFIX_REL}/man/man3 \ -Dman1dir=${PREFIX}/man/man1 \ - -Dsitearch=${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH} \ - -Dsitelib=${PREFIX}/${SITE_PERL_REL} -Dscriptdir=${PREFIX}/bin \ - -Dsiteman3dir=${PREFIX}/lib/perl5/${PERL_VER}/man/man3 \ + -Dsitearch=${SITE_ARCH} \ + -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}\" @@ -95,6 +100,7 @@ PKGINSTALL= ${WRKDIR}/use.perl PKGDEINSTALL= ${WRKDIR}/use.perl +INSTALL_TARGET= install-strip .include .include "${PORTSDIR}/Mk/bsd.default-versions.mk" @@ -127,14 +133,16 @@ -Accflags=-DPERLIOBUF_DEFAULT_BUFSIZ=${PERLIOBUF_DEFAULT_BUFSIZ} .endif -MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VER}/perl -MANDIRS+= ${MAN3PREFIX} +MAN3PREFIX_REL= lib/perl5/${PERL_VER} +MAN3PREFIX= ${PREFIX}/${MAN3PREFIX_REL} +MANDIRS+= ${MAN3PREFIX}/man PLIST_SUB+= PERL_VERSION=${PERL_VERSION} \ PERL_VER=${PERL_VER} \ PERL_ARCH=${PERL_ARCH} \ - MAN3=${MAN3PREFIX:S|^${PREFIX}/||}/man/man3 \ - SITE_PERL=${SITE_PERL:S|^${PREFIX}/||} + MAN3=${MAN3PREFIX_REL}/man/man3 \ + SITE_PERL=${SITE_PERL_REL} \ + SITE_ARCH=${SITE_ARCH_REL} .if ${PORT_OPTIONS:MDEBUG} STRIP= @@ -176,14 +184,21 @@ .endif post-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/man/man3 - ${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto - ${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/machine - ${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/sys + ${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 ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/perl${PERL_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 && ${ENV} 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} .if ${OSVERSION} >= 900022 ${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${STAGEDIR}${PREFIX}/etc/man.d/perl${PERL_VER}.conf .endif Index: lang/perl5.20/pkg-plist =================================================================== --- lang/perl5.20/pkg-plist +++ lang/perl5.20/pkg-plist @@ -664,7 +664,6 @@ 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 @@ -2251,14 +2250,10 @@ man/man1/splain.1.gz man/man1/xsubpp.1.gz man/man1/zipdetails.1.gz -@dir lib/perl5/%%PERL_VER%%/man/man3 +@dir %%SITE_PERL%%/man/man3 @dir %%SITE_PERL%%/auto -@dir %%SITE_PERL%%/%%PERL_ARCH%%/auto -@dir %%SITE_PERL%%/%%PERL_ARCH%%/machine -@dir %%SITE_PERL%%/%%PERL_ARCH%%/sys -@exec cd /usr/include && %D/bin/h2ph -d %D/%%SITE_PERL%%/%%PERL_ARCH%% *.h machine/*.h sys/*.h >/dev/null +@dir %%SITE_ARCH%%/auto +@exec makewhatis %D/%%SITE_PERL%%/man @exec makewhatis %D/lib/perl5/%%PERL_VER%%/man -@exec makewhatis %D/lib/perl5/%%PERL_VER%%/perl/man @rmtry lib/perl5/%%PERL_VER%%/man/whatis -@rmtry lib/perl5/%%PERL_VER%%/perl/man/whatis -@unexec find %D/%%SITE_PERL%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true +@rmtry %%SITE_PERL%%/man/whatis