diff options
author | Sergey A. Osokin <osa@FreeBSD.org> | 2015-04-07 23:32:16 +0000 |
---|---|---|
committer | Sergey A. Osokin <osa@FreeBSD.org> | 2015-04-07 23:32:16 +0000 |
commit | c0e6f4111aca09d67e37dffe732e773d80b9d63a (patch) | |
tree | 904f0bd6db3c1ec0378b3eafd8cda7695aea39d0 /www | |
parent | 0e736bceef0f6cf86ddd66eb8563320356fc5c05 (diff) | |
download | ports-c0e6f4111aca09d67e37dffe732e773d80b9d63a.tar.gz ports-c0e6f4111aca09d67e37dffe732e773d80b9d63a.zip |
Notes
Diffstat (limited to 'www')
-rw-r--r-- | www/nginx-devel/Makefile | 6 | ||||
-rw-r--r-- | www/nginx-devel/pkg-plist | 2 | ||||
-rw-r--r-- | www/nginx/Makefile | 2 | ||||
-rw-r--r-- | www/nginx/pkg-plist | 2 |
4 files changed, 4 insertions, 8 deletions
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index b41ec3cebf7c..baf7c355d236 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -7,8 +7,8 @@ CATEGORIES= www MASTER_SITES= http://nginx.org/download/ MASTER_SITES+= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= osa -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} PKGNAMESUFFIX= -devel +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= osa@FreeBSD.org COMMENT= Robust and small WWW server @@ -296,7 +296,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/samizdatco-nginx-http-auth-digest-${GIT_A .if ${PORT_OPTIONS:MHTTP_AUTH_LDAP} # WWW: https://github.com/kvspb/nginx-auth-ldap -GIT_HTTP_AUTH_LDAP_VERSION= c4dc7c9153 +GIT_HTTP_AUTH_LDAP_VERSION= c4dc7c9153 MASTER_SITES+= LOCAL/rm:http_auth_ldap DISTFILES+= http_auth_ldap-${GIT_HTTP_AUTH_LDAP_VERSION}.tar.gz:http_auth_ldap CONFIGURE_ARGS+=--add-module=${WRKDIR}/http_auth_ldap-${GIT_HTTP_AUTH_LDAP_VERSION} @@ -998,7 +998,7 @@ post-install: ${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 + ${INSTALL_MAN} ${WRKSRC}/objs/nginx.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 .if ${PORT_OPTIONS:MNAXSI} ${ECHO_CMD} etc/nginx/naxsi_core.rules >> ${TMPPLIST} diff --git a/www/nginx-devel/pkg-plist b/www/nginx-devel/pkg-plist index 834b9fc75825..df0a1025e643 100644 --- a/www/nginx-devel/pkg-plist +++ b/www/nginx-devel/pkg-plist @@ -16,7 +16,6 @@ @unexec if cmp -s %D/%%ETCDIR%%/nginx.conf-dist %D/%%ETCDIR%%/nginx.conf; then rm -f %D/%%ETCDIR%%/nginx.conf; fi %%ETCDIR%%/nginx.conf-dist @exec if [ ! -f %D/%%ETCDIR%%/nginx.conf ] ; then cp -p %D/%F %B/nginx.conf; fi -@dirrmtry %%ETCDIR%% %%WWWDATA%%@exec mkdir -p -m 755 %D/www/nginx-dist %%WWWDATA%%@exec if [ ! -d %D/www/nginx/ ] ; then ln -fs %D/www/nginx-dist %D/www/nginx; fi %%WWWDATA%%www/nginx-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING @@ -24,7 +23,6 @@ %%WWWDATA%%www/nginx-dist/50x.html %%WWWDATA%%@exec chmod a-w %D/www/nginx-dist %%WWWDATA%%@unexec if [ -L %D/www/nginx ]; then rm -f %D/www/nginx; fi -%%WWWDATA%%@dirrmtry www/nginx-dist sbin/nginx @unexec if [ -z ${UPGRADE_PORT} ] ; then rm -fr %%NGINX_TMPDIR%%; fi man/man8/nginx.8.gz diff --git a/www/nginx/Makefile b/www/nginx/Makefile index 5c7d207f8d3a..b0fe207bbeb3 100644 --- a/www/nginx/Makefile +++ b/www/nginx/Makefile @@ -1019,7 +1019,7 @@ post-install: ${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 + ${INSTALL_MAN} ${WRKSRC}/objs/nginx.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 .if ${PORT_OPTIONS:MNAXSI} ${ECHO_CMD} etc/nginx/naxsi_core.rules >> ${TMPPLIST} diff --git a/www/nginx/pkg-plist b/www/nginx/pkg-plist index 834b9fc75825..df0a1025e643 100644 --- a/www/nginx/pkg-plist +++ b/www/nginx/pkg-plist @@ -16,7 +16,6 @@ @unexec if cmp -s %D/%%ETCDIR%%/nginx.conf-dist %D/%%ETCDIR%%/nginx.conf; then rm -f %D/%%ETCDIR%%/nginx.conf; fi %%ETCDIR%%/nginx.conf-dist @exec if [ ! -f %D/%%ETCDIR%%/nginx.conf ] ; then cp -p %D/%F %B/nginx.conf; fi -@dirrmtry %%ETCDIR%% %%WWWDATA%%@exec mkdir -p -m 755 %D/www/nginx-dist %%WWWDATA%%@exec if [ ! -d %D/www/nginx/ ] ; then ln -fs %D/www/nginx-dist %D/www/nginx; fi %%WWWDATA%%www/nginx-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING @@ -24,7 +23,6 @@ %%WWWDATA%%www/nginx-dist/50x.html %%WWWDATA%%@exec chmod a-w %D/www/nginx-dist %%WWWDATA%%@unexec if [ -L %D/www/nginx ]; then rm -f %D/www/nginx; fi -%%WWWDATA%%@dirrmtry www/nginx-dist sbin/nginx @unexec if [ -z ${UPGRADE_PORT} ] ; then rm -fr %%NGINX_TMPDIR%%; fi man/man8/nginx.8.gz |