svn commit: r497002 - head/sysutils/nut
Mathieu Arnold
mat at FreeBSD.org
Thu Mar 28 13:15:47 UTC 2019
On Thu, Mar 28, 2019 at 01:00:50AM +0000, Cy Schubert wrote:
> Author: cy
> Date: Thu Mar 28 01:00:49 2019
> New Revision: 497002
> URL: https://svnweb.freebsd.org/changeset/ports/497002
>
> Log:
> Make the two new sample files actually samples. While here mark all
> sample files as samples.
>
> Reported by: mat@
>
> Modified:
> head/sysutils/nut/Makefile
> head/sysutils/nut/pkg-plist
>
> Modified: head/sysutils/nut/Makefile
> ==============================================================================
> --- head/sysutils/nut/Makefile Thu Mar 28 00:40:37 2019 (r497001)
> +++ head/sysutils/nut/Makefile Thu Mar 28 01:00:49 2019 (r497002)
> @@ -3,7 +3,7 @@
>
> PORTNAME= nut
> PORTVERSION= 2.7.4
> -PORTREVISION= 10
> +PORTREVISION= 11
> CATEGORIES= sysutils
> MASTER_SITES= http://www.networkupstools.org/source/${PORTVERSION:R}/
> DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
> @@ -189,9 +189,9 @@ post-install:
> .endfor
> .endif
> @${MKDIR} ${STAGEDIR}${PREFIX}/etc/syslog.d
> - ${INSTALL_DATA} ${PATCHDIR}/nut.syslog ${STAGEDIR}${PREFIX}/etc/syslog.d/nut
> + ${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
> + ${INSTALL_DATA} ${PATCHDIR}/nut.newsyslog ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d/nut.conf.sample
> ${MKDIR} ${STAGEDIR}/var/log/nut
As I said in my previous email, you MUST NOT put the sample files in the
".d" directory as both syslogd and newsyslog grab all the files from the
directory, you end up having the definitions twice. You MUST store the
.sample files somewhere else.
> .include <bsd.port.mk>
>
> Modified: head/sysutils/nut/pkg-plist
> ==============================================================================
> --- head/sysutils/nut/pkg-plist Thu Mar 28 00:40:37 2019 (r497001)
> +++ head/sysutils/nut/pkg-plist Thu Mar 28 01:00:49 2019 (r497002)
> @@ -1,24 +1,24 @@
> %%NUT_CGI%%%%CGIDIR%%/upsimage.cgi
> %%NUT_CGI%%%%CGIDIR%%/upsset.cgi
> %%NUT_CGI%%%%CGIDIR%%/upsstats.cgi
> -%%NUT_CGI%%%%CGIETCDIR%%hosts.conf.sample
> -%%NUT_CGI%%%%CGIETCDIR%%upsset.conf.sample
> -%%NUT_CGI%%%%CGIETCDIR%%upsstats.html.sample
> -%%NUT_CGI%%%%CGIETCDIR%%upsstats-single.html.sample
> +%%NUT_CGI%%@sample %%CGIETCDIR%%hosts.conf.sample
> +%%NUT_CGI%%@sample %%CGIETCDIR%%upsset.conf.sample
> +%%NUT_CGI%%@sample %%CGIETCDIR%%upsstats.html.sample
> +%%NUT_CGI%%@sample %%CGIETCDIR%%upsstats-single.html.sample
> %%NUT_CGI%%%%WWWDIR%%/bottom.html
> %%NUT_CGI%%%%WWWDIR%%/header.html
> %%NUT_CGI%%%%WWWDIR%%/index.html
> %%NUT_CGI%%%%WWWDIR%%/nut-banner.png
> %%ETCDIR%%/cmdvartab
> %%ETCDIR%%/driver.list
> -%%ETCDIR%%/nut.conf.sample
> -%%ETCDIR%%/ups.conf.sample
> -%%ETCDIR%%/upsd.conf.sample
> -%%ETCDIR%%/upsd.users.sample
> -%%ETCDIR%%/upsmon.conf.sample
> -%%ETCDIR%%/upssched.conf.sample
> -etc/newsyslog.conf.d/nut.conf
> -etc/syslog.d/nut
> + at sample %%ETCDIR%%/nut.conf.sample
> + at sample %%ETCDIR%%/ups.conf.sample
> + at sample %%ETCDIR%%/upsd.conf.sample
> + at sample %%ETCDIR%%/upsd.users.sample
> + at sample %%ETCDIR%%/upsmon.conf.sample
> + at sample %%ETCDIR%%/upssched.conf.sample
> + at sample etc/newsyslog.conf.d/nut.conf.sample
> + at sample etc/syslog.d/nut.sample
> %%NUT_USB%%etc/devd/nut-usb.conf
> @stopdaemon nut_upsmon
> @stopdaemon nut_upslog
>
>
--
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/359bd1c9/attachment.sig>
More information about the svn-ports-head
mailing list