svn commit: r497023 - head/sysutils/nut

[Mathieu Arnold]

On Thu, Mar 28, 2019 at 02:17:06PM +0000, Cy Schubert wrote:
> Author: cy
> Date: Thu Mar 28 14:17:06 2019
> New Revision: 497023
> URL: https://svnweb.freebsd.org/changeset/ports/497023
> 
> Log:
>   Really fix where samples go.
> 
> Modified:
>   head/sysutils/nut/Makefile
>   head/sysutils/nut/pkg-plist
> 
> Modified: head/sysutils/nut/Makefile
> ==============================================================================
> --- head/sysutils/nut/Makefile	Thu Mar 28 14:07:25 2019	(r497022)
> +++ head/sysutils/nut/Makefile	Thu Mar 28 14:17:06 2019	(r497023)
> @@ -3,7 +3,7 @@
>  
>  PORTNAME=	nut
>  PORTVERSION=	2.7.4
> -PORTREVISION=	11
> +PORTREVISION=	12
>  CATEGORIES=	sysutils
>  MASTER_SITES=	http://www.networkupstools.org/source/${PORTVERSION:R}/
>  DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
> @@ -188,10 +188,9 @@ post-install:
>  	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
>  .endfor
>  .endif
> -	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/syslog.d
> -	${INSTALL_DATA} ${PATCHDIR}/nut.syslog ${STAGEDIR}${PREFIX}/etc/syslog.d/nut.sample
> -	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d
> -	${INSTALL_DATA} ${PATCHDIR}/nut.newsyslog ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d/nut.conf.sample
> +	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
> +	${INSTALL_DATA} ${PATCHDIR}/nut.syslog ${STAGEDIR}${EXAMPLESDIR}/syslog.sample
> +	${INSTALL_DATA} ${PATCHDIR}/nut.newsyslog ${STAGEDIR}${EXAMPLESDIR}/newsyslog.sample
>  	${MKDIR} ${STAGEDIR}/var/log/nut
>  
>  .include <bsd.port.mk>
> 
> Modified: head/sysutils/nut/pkg-plist
> ==============================================================================
> --- head/sysutils/nut/pkg-plist	Thu Mar 28 14:07:25 2019	(r497022)
> +++ head/sysutils/nut/pkg-plist	Thu Mar 28 14:17:06 2019	(r497023)
> @@ -17,8 +17,8 @@
>  @sample %%ETCDIR%%/upsd.users.sample
>  @sample %%ETCDIR%%/upsmon.conf.sample
>  @sample %%ETCDIR%%/upssched.conf.sample
> - at sample etc/newsyslog.conf.d/nut.conf.sample
> - at sample etc/syslog.d/nut.sample
> + at sample %%EXAMPLESDIR%%/newsyslog.sample
> + at sample %%EXAMPLESDIR%%/syslog.sample

Ok, but now, the non .sample files do not end up where they should.
This is the correct way to do it:

@sample %%EXAMPLESDIR%%/newsyslog.sample etc/newsyslog.conf.d/nut.conf
@sample %%EXAMPLESDIR%%/syslog.sample etc/syslog.d/nut

-- 
Mathieu Arnold
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 963 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-head/attachments/20190328/71cb8cbc/attachment.sig>