From owner-svn-ports-all@FreeBSD.ORG Tue Apr 7 23:32:18 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CB5BA56D; Tue, 7 Apr 2015 23:32:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B6F38E29; Tue, 7 Apr 2015 23:32:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t37NWI2f024840; Tue, 7 Apr 2015 23:32:18 GMT (envelope-from osa@FreeBSD.org) Received: (from osa@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t37NWHBV024816; Tue, 7 Apr 2015 23:32:17 GMT (envelope-from osa@FreeBSD.org) Message-Id: <201504072332.t37NWHBV024816@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: osa set sender to osa@FreeBSD.org using -f From: "Sergey A. Osokin" Date: Tue, 7 Apr 2015 23:32:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r383547 - in head/www: nginx nginx-devel X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Apr 2015 23:32:18 -0000 Author: osa Date: Tue Apr 7 23:32:16 2015 New Revision: 383547 URL: https://svnweb.freebsd.org/changeset/ports/383547 Log: Fix a couple portlint warnings. PR: 199163 Modified: head/www/nginx-devel/Makefile head/www/nginx-devel/pkg-plist head/www/nginx/Makefile head/www/nginx/pkg-plist Modified: head/www/nginx-devel/Makefile ============================================================================== --- head/www/nginx-devel/Makefile Tue Apr 7 22:28:20 2015 (r383546) +++ head/www/nginx-devel/Makefile Tue Apr 7 23:32:16 2015 (r383547) @@ -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}/s .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} Modified: head/www/nginx-devel/pkg-plist ============================================================================== --- head/www/nginx-devel/pkg-plist Tue Apr 7 22:28:20 2015 (r383546) +++ head/www/nginx-devel/pkg-plist Tue Apr 7 23:32:16 2015 (r383547) @@ -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 Modified: head/www/nginx/Makefile ============================================================================== --- head/www/nginx/Makefile Tue Apr 7 22:28:20 2015 (r383546) +++ head/www/nginx/Makefile Tue Apr 7 23:32:16 2015 (r383547) @@ -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} Modified: head/www/nginx/pkg-plist ============================================================================== --- head/www/nginx/pkg-plist Tue Apr 7 22:28:20 2015 (r383546) +++ head/www/nginx/pkg-plist Tue Apr 7 23:32:16 2015 (r383547) @@ -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