From owner-svn-ports-head@freebsd.org Fri Apr 29 23:08:14 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 38E7EB21223; Fri, 29 Apr 2016 23:08:14 +0000 (UTC) (envelope-from osa@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 E41141390; Fri, 29 Apr 2016 23:08:13 +0000 (UTC) (envelope-from osa@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3TN8DRq061710; Fri, 29 Apr 2016 23:08:13 GMT (envelope-from osa@FreeBSD.org) Received: (from osa@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3TN8Dxf061708; Fri, 29 Apr 2016 23:08:13 GMT (envelope-from osa@FreeBSD.org) Message-Id: <201604292308.u3TN8Dxf061708@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: osa set sender to osa@FreeBSD.org using -f From: "Sergey A. Osokin" Date: Fri, 29 Apr 2016 23:08:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r414318 - 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-head@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Apr 2016 23:08:14 -0000 Author: osa Date: Fri Apr 29 23:08:12 2016 New Revision: 414318 URL: https://svnweb.freebsd.org/changeset/ports/414318 Log: Change the MODULESDIR from ${ETCDIR}/modules to ${PREFIX}/libexec/${PORTNAME}. Bump PORTREVISION. PR: 209151 Modified: head/www/nginx-devel/Makefile head/www/nginx/Makefile Modified: head/www/nginx-devel/Makefile ============================================================================== --- head/www/nginx-devel/Makefile Fri Apr 29 22:43:12 2016 (r414317) +++ head/www/nginx-devel/Makefile Fri Apr 29 23:08:12 2016 (r414318) @@ -3,6 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.10.0 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://nginx.org/download/ MASTER_SITES+= LOCAL/osa @@ -270,7 +271,7 @@ CONFIGURE_ARGS+=--prefix=${ETCDIR} \ --user=${WWWOWN} --group=${WWWGRP} .if !empty(PORT_OPTIONS:MDSO) -MODULESDIR= ${ETCDIR}/modules +MODULESDIR= ${PREFIX}/libexec/${PORTNAME} CONFIGURE_ARGS+=--modules-path=${MODULESDIR} .endif @@ -1282,9 +1283,9 @@ post-install: (cd ${STAGEDIR}${PREFIX} && ${FIND} ${MODULESDIR:S|${PREFIX}/||} \ ! -type d >>${TMPPLIST}) # Update nginx.conf-dist with a list of staged dynamic modules - (cd ${STAGEDIR}${ETCDIR} && \ - ${FIND} ${MODULESDIR:S|${ETCDIR}/||} -type f -name '*.so' \ - -exec ${ECHO_CMD} "load_module {};" \; \ + (cd ${STAGEDIR} && \ + ${FIND} ${MODULESDIR:S|^/||} -type f -name '*.so' \ + -exec ${ECHO_CMD} "load_module /{};" \; \ >>${STAGEDIR}${ETCDIR}/nginx.conf-dist && \ ${CAT} ${WRKSRC}/conf/nginx.conf \ >>${STAGEDIR}${ETCDIR}/nginx.conf-dist) Modified: head/www/nginx/Makefile ============================================================================== --- head/www/nginx/Makefile Fri Apr 29 22:43:12 2016 (r414317) +++ head/www/nginx/Makefile Fri Apr 29 23:08:12 2016 (r414318) @@ -3,6 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.10.0 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= http://nginx.org/download/ @@ -270,7 +271,7 @@ CONFIGURE_ARGS+=--prefix=${ETCDIR} \ --user=${WWWOWN} --group=${WWWGRP} .if !empty(PORT_OPTIONS:MDSO) -MODULESDIR= ${ETCDIR}/modules +MODULESDIR= ${PREFIX}/libexec/${PORTNAME} CONFIGURE_ARGS+=--modules-path=${MODULESDIR} .endif @@ -1282,9 +1283,9 @@ post-install: (cd ${STAGEDIR}${PREFIX} && ${FIND} ${MODULESDIR:S|${PREFIX}/||} \ ! -type d >>${TMPPLIST}) # Update nginx.conf-dist with a list of staged dynamic modules - (cd ${STAGEDIR}${ETCDIR} && \ - ${FIND} ${MODULESDIR:S|${ETCDIR}/||} -type f -name '*.so' \ - -exec ${ECHO_CMD} "load_module {};" \; \ + (cd ${STAGEDIR} && \ + ${FIND} ${MODULESDIR:S|^/||} -type f -name '*.so' \ + -exec ${ECHO_CMD} "load_module /{};" \; \ >>${STAGEDIR}${ETCDIR}/nginx.conf-dist && \ ${CAT} ${WRKSRC}/conf/nginx.conf \ >>${STAGEDIR}${ETCDIR}/nginx.conf-dist)