svn commit: r414318 - in head/www: nginx nginx-devel

[Pierre Guinoiseau]

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 at 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 at freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/svn-ports-all
> To unsubscribe, send any mail to "svn-ports-all-unsubscribe at freebsd.org"

-- 
Pierre Guinoiseau <pierre at guinoiseau.eu>
http://segmentationfau.lt/ | +PierreGuinoiseau | @peikk00
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20160504/05a8c725/attachment.sig>