Date: Wed, 4 May 2016 00:55:25 +0000 From: "Sergey A. Osokin" <osa@FreeBSD.org> To: Pierre Guinoiseau <pierre@guinoiseau.eu> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r414318 - in head/www: nginx nginx-devel Message-ID: <20160504005525.GB74041@FreeBSD.org> In-Reply-To: <20160503225453.GA92088@kyleck.sig11.fr> References: <201604292308.u3TN8Dxf061708@repo.freebsd.org> <20160503225453.GA92088@kyleck.sig11.fr>
next in thread | previous in thread | raw e-mail | index | archive | help
Done. On Wed, May 04, 2016 at 10:54:53AM +1200, Pierre Guinoiseau wrote: > Hi, > > could you add an entry in UPDATING for that change? It breaks existing > configurations. > > Cheers, > Pierre > > On 29/04/2016 23:08:12, Sergey A. Osokin <osa@FreeBSD.org> wrote: > > > 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) > > _______________________________________________ > > svn-ports-all@freebsd.org mailing list > > https://lists.freebsd.org/mailman/listinfo/svn-ports-all > > To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org" > > -- > Pierre Guinoiseau <pierre@guinoiseau.eu> > http://segmentationfau.lt/ | +PierreGuinoiseau | @peikk00
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20160504005525.GB74041>