Date: Wed, 4 May 2016 10:54:53 +1200 From: Pierre Guinoiseau <pierre@guinoiseau.eu> To: "Sergey A. Osokin" <osa@FreeBSD.org> 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: <20160503225453.GA92088@kyleck.sig11.fr> In-Reply-To: <201604292308.u3TN8Dxf061708@repo.freebsd.org> References: <201604292308.u3TN8Dxf061708@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--J2SCkAp4GZ/dPZZf Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 >=20 > Log: > Change the MODULESDIR from ${ETCDIR}/modules to ${PREFIX}/libexec/${POR= TNAME}. > Bump PORTREVISION. > =20 > PR: 209151 >=20 > Modified: > head/www/nginx-devel/Makefile > head/www/nginx/Makefile >=20 > Modified: head/www/nginx-devel/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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 @@ > =20 > PORTNAME=3D nginx > PORTVERSION=3D 1.10.0 > +PORTREVISION=3D 1 > CATEGORIES=3D www > MASTER_SITES=3D http://nginx.org/download/ > MASTER_SITES+=3D LOCAL/osa > @@ -270,7 +271,7 @@ CONFIGURE_ARGS+=3D--prefix=3D${ETCDIR} \ > --user=3D${WWWOWN} --group=3D${WWWGRP} > =20 > .if !empty(PORT_OPTIONS:MDSO) > -MODULESDIR=3D ${ETCDIR}/modules > +MODULESDIR=3D ${PREFIX}/libexec/${PORTNAME} > CONFIGURE_ARGS+=3D--modules-path=3D${MODULESDIR} > .endif > =20 > @@ -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) >=20 > Modified: head/www/nginx/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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 @@ > =20 > PORTNAME=3D nginx > PORTVERSION=3D 1.10.0 > +PORTREVISION=3D 1 > PORTEPOCH=3D 2 > CATEGORIES=3D www > MASTER_SITES=3D http://nginx.org/download/ > @@ -270,7 +271,7 @@ CONFIGURE_ARGS+=3D--prefix=3D${ETCDIR} \ > --user=3D${WWWOWN} --group=3D${WWWGRP} > =20 > .if !empty(PORT_OPTIONS:MDSO) > -MODULESDIR=3D ${ETCDIR}/modules > +MODULESDIR=3D ${PREFIX}/libexec/${PORTNAME} > CONFIGURE_ARGS+=3D--modules-path=3D${MODULESDIR} > .endif > =20 > @@ -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" --=20 Pierre Guinoiseau <pierre@guinoiseau.eu> http://segmentationfau.lt/ | +PierreGuinoiseau | @peikk00 --J2SCkAp4GZ/dPZZf Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAABCgAGBQJXKSw4AAoJEFBNg+ogrffPWgEP/1zWPdHxanhI7iLS7TgQyQ78 03AkYlpaCogMVU6f1wRALbqAaZVmh875ecYI027fIOUOOrfyidFe23y2t6Yfj0Xr lKGFr07Lg7E2kzOGRU9z27B/Gihbzg+Og0BHJyX7lVkSjOZE6uf23ZAXg6dWplaU ZBzbulVxIodf+v/6jTdwkfSPXfqCe+DWiLozUYqHdFEvY0DExF1g5qJ3WXpGTTEk hHLzYpSp38OnEZmuaAba38dqwVGTZBv/MfUc8UUcNEdjCUIhl1i0bjyePadUDq2B D1m+UaO9tmudKNGHixWC/pw8dC55Pf0RPp8rsidwDIqjmptWmhCQ5Pm2Zw8TbLpP YtUG7NYN70BmY0t2UWWYxNcU9JtmEE8w03eKlrhZHQ9lim1A7iTvOFkcrjEwMgvr 7AkZRJbRsQZu4nRyUdQfGL6lWMTJWkAZ0nDmfSF6BDiLzMcdphOhgFDEA/65L3UU Hl1aCCOaBCWCrpG/wBaLAGOd/cM6DobIr3LBV0qzjTdoYEs9Bp7NUKAw+kp574hX Q9teEFdamQ0cRwm60lHRFIfyA9UyVAa3x91gwnbdtgPxuUp7+ULv9zn7T45uU56Y ttgQ/EiGKhbDO658WIoIenOiRnZzdaizhQFRir+gc0c1y6IXyHEc/LvNE7Uq5AZv D24lHJV86sBHVY52ExTT =Q/OI -----END PGP SIGNATURE----- --J2SCkAp4GZ/dPZZf--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20160503225453.GA92088>