diff options
| author | Sergey Skvortsov <skv@FreeBSD.org> | 2009-11-02 16:50:41 +0000 |
|---|---|---|
| committer | Sergey Skvortsov <skv@FreeBSD.org> | 2009-11-02 16:50:41 +0000 |
| commit | 4d12d4ea700067ee5024837a45966338df8afbde (patch) | |
| tree | 73a95f70d28af9a9ecf26b76af316c10678130f8 /lang/perl5.16 | |
| parent | Update to 2.010803 (diff) | |
- Fix behaviour of USE_PERL option when it is "off"
- Add PORTSCOUT variable
Notes
Notes:
svn path=/head/; revision=243662
Diffstat (limited to 'lang/perl5.16')
| -rw-r--r-- | lang/perl5.16/Makefile | 11 | ||||
| -rw-r--r-- | lang/perl5.16/files/use.perl | 6 |
2 files changed, 12 insertions, 5 deletions
diff --git a/lang/perl5.16/Makefile b/lang/perl5.16/Makefile index e19a12ad8d7e..b252b8e53272 100644 --- a/lang/perl5.16/Makefile +++ b/lang/perl5.16/Makefile @@ -32,6 +32,8 @@ OPTIONS= DEBUGGING "Build with debugging support" off \ SITECUSTOMIZE "Run-time customization of @INC" off \ USE_PERL "Rewrite links in /usr/bin" on +PORTSCOUT= limitw:1,even + PERL_VERSION= 5.10.1 PERL_ARCH= mach SITE_PERL_REL?= lib/perl5/site_perl/${PERL_VERSION} @@ -138,6 +140,12 @@ CONFIGURE_ARGS+= -Dusemultiplicity=y CONFIGURE_ARGS+= -Dusesitecustomize .endif +.if defined(WITH_USE_PERL) +LINK_USRBIN= yes +.else +LINK_USRBIN= no +.endif + NO_LATEST_LINK= yes .if defined(WITH_GDBM) @@ -161,6 +169,7 @@ post-patch: -e 's|%%PERL_VERSION%%|${PERL_VERSION}|g;' \ -e 's|%%PERL_ARCH%%|${PERL_ARCH}|g;' \ -e 's|%%MAKE_CONF%%|${__MAKE_CONF}|g;' \ + -e 's|%%LINK_USRBIN%%|${LINK_USRBIN}|g;' \ ${FILESDIR}/use.perl \ > ${WRKDIR}/use.perl ${SED} -e 's|%%PERL%%|${PERL}|g; s|%%PERL_VERSION%%|${PERL_VERSION}|g; s|%%PKGNAME%%|${PKGNAME}|g' \ @@ -198,9 +207,7 @@ post-install: ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ ${BSDPAN_WRKSRC}/${files} ${BSDPAN_DEST}/${files} .endfor -.if defined(WITH_USE_PERL) PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.endif test: build @(cd ${WRKSRC}; make test) diff --git a/lang/perl5.16/files/use.perl b/lang/perl5.16/files/use.perl index a75ac2641a65..59ee8ee0fce9 100644 --- a/lang/perl5.16/files/use.perl +++ b/lang/perl5.16/files/use.perl @@ -18,15 +18,15 @@ else fi if [ "$2" = "POST-INSTALL" ] ; then - need_remove_links=yes - need_create_links=yes + need_remove_links=%%LINK_USRBIN%% + need_create_links=%%LINK_USRBIN%% need_cleanup_make_conf=yes need_cleanup_manpath=yes need_spam_make_conf=yes need_spam_manpath=yes need_post_install=yes elif [ "$2" = "POST-DEINSTALL" ] ; then - need_remove_links=yes + need_remove_links=%%LINK_USRBIN%% need_cleanup_make_conf=yes need_cleanup_manpath=yes else |