aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Mk/Uses/perl5.mk22
-rw-r--r--UPDATING8
-rw-r--r--lang/perl5.14/Makefile10
-rw-r--r--lang/perl5.14/files/patch-Makefile.SH11
-rw-r--r--lang/perl5.14/pkg-plist3
-rw-r--r--lang/perl5.16/Makefile8
-rw-r--r--lang/perl5.16/files/patch-Makefile.SH11
-rw-r--r--lang/perl5.16/pkg-plist3
-rw-r--r--lang/perl5.18/Makefile10
-rw-r--r--lang/perl5.18/files/patch-Makefile.SH11
-rw-r--r--lang/perl5.18/pkg-plist3
-rw-r--r--lang/perl5.20/Makefile15
-rw-r--r--lang/perl5.20/files/patch-Makefile.SH11
-rw-r--r--lang/perl5.20/pkg-plist3
14 files changed, 102 insertions, 27 deletions
diff --git a/Mk/Uses/perl5.mk b/Mk/Uses/perl5.mk
index 2534e9d3f3b3..c6ce927ec3bc 100644
--- a/Mk/Uses/perl5.mk
+++ b/Mk/Uses/perl5.mk
@@ -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) || :
diff --git a/UPDATING b/UPDATING
index d833cc03f90b..a70acd6d81ae 100644
--- a/UPDATING
+++ b/UPDATING
@@ -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
diff --git a/lang/perl5.14/Makefile b/lang/perl5.14/Makefile
index 6982a8b6d209..4eacc8e7744a 100644
--- a/lang/perl5.14/Makefile
+++ b/lang/perl5.14/Makefile
@@ -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
diff --git a/lang/perl5.14/files/patch-Makefile.SH b/lang/perl5.14/files/patch-Makefile.SH
new file mode 100644
index 000000000000..d510cacd475c
--- /dev/null
+++ b/lang/perl5.14/files/patch-Makefile.SH
@@ -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)
diff --git a/lang/perl5.14/pkg-plist b/lang/perl5.14/pkg-plist
index 7a0457717878..54f6799f6f52 100644
--- a/lang/perl5.14/pkg-plist
+++ b/lang/perl5.14/pkg-plist
@@ -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%%/CORE/iperlsys.h
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
diff --git a/lang/perl5.16/Makefile b/lang/perl5.16/Makefile
index 52e2e5700298..1f4552c9abad 100644
--- a/lang/perl5.16/Makefile
+++ b/lang/perl5.16/Makefile
@@ -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
diff --git a/lang/perl5.16/files/patch-Makefile.SH b/lang/perl5.16/files/patch-Makefile.SH
new file mode 100644
index 000000000000..ac3caed87c42
--- /dev/null
+++ b/lang/perl5.16/files/patch-Makefile.SH
@@ -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)
diff --git a/lang/perl5.16/pkg-plist b/lang/perl5.16/pkg-plist
index f5ec466da3e9..2c093f5af032 100644
--- a/lang/perl5.16/pkg-plist
+++ b/lang/perl5.16/pkg-plist
@@ -723,6 +723,7 @@ lib/perl5/%%PERL_VER%%/inc/latest/private.pm
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%%/CORE/iperlsys.h
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
diff --git a/lang/perl5.18/Makefile b/lang/perl5.18/Makefile
index 6139d0b96efb..9e70aa002f6f 100644
--- a/lang/perl5.18/Makefile
+++ b/lang/perl5.18/Makefile
@@ -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
diff --git a/lang/perl5.18/files/patch-Makefile.SH b/lang/perl5.18/files/patch-Makefile.SH
new file mode 100644
index 000000000000..b9bf3992de47
--- /dev/null
+++ b/lang/perl5.18/files/patch-Makefile.SH
@@ -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)
diff --git a/lang/perl5.18/pkg-plist b/lang/perl5.18/pkg-plist
index e3bf3f0e3d6a..120721878591 100644
--- a/lang/perl5.18/pkg-plist
+++ b/lang/perl5.18/pkg-plist
@@ -727,6 +727,7 @@ lib/perl5/%%PERL_VER%%/inc/latest/private.pm
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%%/CORE/iperlsys.h
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
diff --git a/lang/perl5.20/Makefile b/lang/perl5.20/Makefile
index 388351e07485..017f91b9f7f2 100644
--- a/lang/perl5.20/Makefile
+++ b/lang/perl5.20/Makefile
@@ -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
diff --git a/lang/perl5.20/files/patch-Makefile.SH b/lang/perl5.20/files/patch-Makefile.SH
new file mode 100644
index 000000000000..2bb3ab77ad3a
--- /dev/null
+++ b/lang/perl5.20/files/patch-Makefile.SH
@@ -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)
diff --git a/lang/perl5.20/pkg-plist b/lang/perl5.20/pkg-plist
index 8c3675154d66..c464d0fb7760 100644
--- a/lang/perl5.20/pkg-plist
+++ b/lang/perl5.20/pkg-plist
@@ -664,6 +664,7 @@ lib/perl5/%%PERL_VER%%/inc/latest/private.pm
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%%/CORE/iperlsys.h
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 20:01:36 +0000