diff options
author | Mathieu Arnold <mat@FreeBSD.org> | 2014-11-27 09:57:39 +0000 |
---|---|---|
committer | Mathieu Arnold <mat@FreeBSD.org> | 2014-11-27 09:57:39 +0000 |
commit | 8e245f6ddc4e875870a1ab6cf5e417ae80023242 (patch) | |
tree | 5d9150aaab378a0243fa71cb4879faa8e55e725d /lang/perl5.14 | |
parent | Fix build on >= 10.0 by including required headers (diff) |
- 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
Notes
Notes:
svn path=/head/; revision=373476
Diffstat (limited to 'lang/perl5.14')
-rw-r--r-- | lang/perl5.14/Makefile | 10 | ||||
-rw-r--r-- | lang/perl5.14/files/patch-Makefile.SH | 11 | ||||
-rw-r--r-- | lang/perl5.14/pkg-plist | 3 |
3 files changed, 20 insertions, 4 deletions
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 |