diff options
author | Mathieu Arnold <mat@FreeBSD.org> | 2014-11-26 13:08:24 +0000 |
---|---|---|
committer | Mathieu Arnold <mat@FreeBSD.org> | 2014-11-26 13:08:24 +0000 |
commit | eee58d187e2c55fca6f53b9e482d33cf5346fe81 (patch) | |
tree | 0d350fe6ad6a2fe3222d838f3c72856c78cd449f /www/nginx-devel/Makefile | |
parent | 3f1df82a16a1e89db9a69b36ade7342f34095ab4 (diff) | |
download | ports-eee58d187e2c55fca6f53b9e482d33cf5346fe81.tar.gz ports-eee58d187e2c55fca6f53b9e482d33cf5346fe81.zip |
Change the way Perl modules are installed, update the default Perl to 5.18.
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.
PR: 194969
Differential Revision: https://reviews.freebsd.org/D1019
Exp-run by: antoine
Reviewed by: perl@
Approved by: portmgr
Notes
Notes:
svn path=/head/; revision=373448
Diffstat (limited to 'www/nginx-devel/Makefile')
-rw-r--r-- | www/nginx-devel/Makefile | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index e7a90d7087f8..f5e50dbb9d56 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -3,6 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.7.7 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://nginx.org/download/ MASTER_SITES+= ${MASTER_SITE_LOCAL} @@ -985,11 +986,11 @@ do-install: .endif .if !empty(PORT_OPTIONS:MHTTP) && !empty(PORT_OPTIONS:MHTTP_PERL) - ${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/auto/nginx + ${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/nginx ${INSTALL_PROGRAM} ${WRKSRC}/objs/src/http/modules/perl/blib/arch/auto/nginx/nginx.so \ - ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/auto/nginx + ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/nginx ${INSTALL_DATA} ${WRKSRC}/objs/src/http/modules/perl/blib/lib/nginx.pm \ - ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/ + ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/ .endif .if ${PORT_OPTIONS:MNAXSI} @@ -1000,9 +1001,9 @@ do-install: post-install: .if !empty(PORT_OPTIONS:MHTTP) && !empty(PORT_OPTIONS:MHTTP_PERL) - ${ECHO_CMD} ${SITE_PERL_REL}/${PERL_ARCH}/auto/nginx/nginx.so >> ${TMPPLIST} - ${ECHO_CMD} ${SITE_PERL_REL}/${PERL_ARCH}/nginx.pm >> ${TMPPLIST} - ${ECHO_CMD} @dirrm ${SITE_PERL_REL}/${PERL_ARCH}/auto/nginx >> ${TMPPLIST} + ${ECHO_CMD} ${SITE_ARCH_REL}/auto/nginx/nginx.so >> ${TMPPLIST} + ${ECHO_CMD} ${SITE_ARCH_REL}/nginx.pm >> ${TMPPLIST} + ${ECHO_CMD} @dirrm ${SITE_ARCH_REL}/auto/nginx >> ${TMPPLIST} .endif @${INSTALL_MAN} ${WRKSRC}/objs/nginx.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 |