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 /Mk/Uses/perl5.mk | |
| 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 'Mk/Uses/perl5.mk')
| -rw-r--r-- | Mk/Uses/perl5.mk | 22 |
1 files changed, 11 insertions, 11 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) || : |