diff options
| author | jperkin <jperkin@pkgsrc.org> | 2015-10-12 14:53:17 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2015-10-12 14:53:17 +0000 |
| commit | e3408be272a5e846852bc7ca0eb0e6850c70fade (patch) | |
| tree | 31d990d6c2a7af07d0e7bf3fe4f8d54a08e79554 | |
| parent | e4e6b415632f5866b70416d7d998c4c0ec0c3d0c (diff) | |
| download | pkgsrc-e3408be272a5e846852bc7ca0eb0e6850c70fade.tar.gz | |
Fix install on Darwin, perl module extension suffix is ".bundle" not ".so".
| -rw-r--r-- | www/nginx-devel/PLIST | 4 | ||||
| -rw-r--r-- | www/nginx/Makefile.common | 11 | ||||
| -rw-r--r-- | www/nginx/PLIST | 4 |
3 files changed, 13 insertions, 6 deletions
diff --git a/www/nginx-devel/PLIST b/www/nginx-devel/PLIST index abfb494b57e..eaa62fe4c44 100644 --- a/www/nginx-devel/PLIST +++ b/www/nginx-devel/PLIST @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST,v 1.3 2014/07/15 12:55:03 fhajny Exp $ -${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/nginx/nginx.so +@comment $NetBSD: PLIST,v 1.4 2015/10/12 14:53:17 jperkin Exp $ +${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/nginx/nginx.${SOEXT} ${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/nginx.pm man/man8/nginx.8 sbin/nginx diff --git a/www/nginx/Makefile.common b/www/nginx/Makefile.common index 3b707790ce3..274ee913460 100644 --- a/www/nginx/Makefile.common +++ b/www/nginx/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.6 2015/09/30 13:36:00 imil Exp $ +# $NetBSD: Makefile.common,v 1.7 2015/10/12 14:53:17 jperkin Exp $ # used by www/nginx/Makefile # used by www/nginx-devel/Makefile @@ -89,6 +89,13 @@ MESSAGE_SUBST+= NGINX_PIDDIR=${NGINX_PIDDIR} MESSAGE_SUBST+= NGINX_USER=${NGINX_USER} MESSAGE_SUBST+= NGINX_GROUP=${NGINX_GROUP} +.if ${OPSYS} == "Darwin" +SOEXT= bundle +.else +SOEXT= so +.endif +PLIST_SUBST+= SOEXT=${SOEXT} + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${DESTDIR}${PREFIX}/sbin/nginx .for file in ${EGFILES} @@ -102,7 +109,7 @@ do-install: .endif .if !empty(PKG_OPTIONS:Mperl) ${INSTALL_LIB_DIR} ${DESTDIR}${PERL5_INSTALLVENDORARCH}/auto/nginx - ${INSTALL_LIB} ${WRKSRC}/objs/src/http/modules/perl/blib/arch/auto/nginx/nginx.so \ + ${INSTALL_LIB} ${WRKSRC}/objs/src/http/modules/perl/blib/arch/auto/nginx/nginx.${SOEXT} \ ${DESTDIR}${PERL5_INSTALLVENDORARCH}/auto/nginx ${INSTALL_DATA} ${WRKSRC}/objs/src/http/modules/perl/blib/lib/nginx.pm \ ${DESTDIR}${PERL5_INSTALLVENDORARCH} diff --git a/www/nginx/PLIST b/www/nginx/PLIST index b6b6b2623e3..63c24c88762 100644 --- a/www/nginx/PLIST +++ b/www/nginx/PLIST @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST,v 1.9 2014/06/20 18:48:37 fhajny Exp $ -${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/nginx/nginx.so +@comment $NetBSD: PLIST,v 1.10 2015/10/12 14:53:17 jperkin Exp $ +${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/nginx/nginx.${SOEXT} ${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/nginx.pm man/man8/nginx.8 sbin/nginx |