svn commit: r550222 - in head/sysutils: nut nut-devel

[Cy Schubert]

Author: cy
Date: Sat Sep 26 20:46:02 2020
New Revision: 550222
URL: https://svnweb.freebsd.org/changeset/ports/550222

Log:
  Revert r549867. The permissions were wrong.
  
  PR:		249893

Modified:
  head/sysutils/nut-devel/Makefile   (contents, props changed)
  head/sysutils/nut-devel/pkg-plist   (contents, props changed)
  head/sysutils/nut/Makefile   (contents, props changed)
  head/sysutils/nut/pkg-plist   (contents, props changed)

Modified: head/sysutils/nut-devel/Makefile
==============================================================================
--- head/sysutils/nut-devel/Makefile	Sat Sep 26 20:45:41 2020	(r550221)
+++ head/sysutils/nut-devel/Makefile	Sat Sep 26 20:46:02 2020	(r550222)
@@ -3,7 +3,7 @@
 
 PORTNAME=	nut
 PORTVERSION=	${NUT_COMMIT_DATE}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 PKGNAMESUFFIX=	-devel
 # MASTER_SITES=	http://www.networkupstools.org/source/${PORTVERSION:R}/

Modified: head/sysutils/nut-devel/pkg-plist
==============================================================================
--- head/sysutils/nut-devel/pkg-plist	Sat Sep 26 20:45:41 2020	(r550221)
+++ head/sysutils/nut-devel/pkg-plist	Sat Sep 26 20:46:02 2020	(r550222)
@@ -1,22 +1,22 @@
 %%NUT_CGI%%%%CGIDIR%%/upsimage.cgi
 %%NUT_CGI%%%%CGIDIR%%/upsset.cgi
 %%NUT_CGI%%%%CGIDIR%%/upsstats.cgi
-%%NUT_CGI%%@sample(root,uucp,0640) %%CGIETCDIR%%hosts.conf.sample
-%%NUT_CGI%%@sample(root,uucp,0640) %%CGIETCDIR%%upsset.conf.sample
-%%NUT_CGI%%@sample(root,uucp,0640) %%CGIETCDIR%%upsstats.html.sample
-%%NUT_CGI%%@sample(root,uucp,0640) %%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
- at sample(root,uucp,0640) %%ETCDIR%%/nut.conf.sample
- at sample(root,uucp,0640) %%ETCDIR%%/ups.conf.sample
- at sample(root,uucp,0640) %%ETCDIR%%/upsd.conf.sample
- at sample(root,uucp,0640) %%ETCDIR%%/upsd.users.sample
- at sample(root,uucp,0640) %%ETCDIR%%/upsmon.conf.sample
- at sample(root,uucp,0640) %%ETCDIR%%/upssched.conf.sample
+ 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
 @sample %%EXAMPLESDIR%%/newsyslog.sample etc/newsyslog.conf.d/nut.conf
 @sample %%EXAMPLESDIR%%/syslog.sample etc/syslog.d/nut
 %%NUT_USB%%etc/devd/nut-usb.conf

Modified: head/sysutils/nut/Makefile
==============================================================================
--- head/sysutils/nut/Makefile	Sat Sep 26 20:45:41 2020	(r550221)
+++ head/sysutils/nut/Makefile	Sat Sep 26 20:46:02 2020	(r550222)
@@ -3,7 +3,7 @@
 
 PORTNAME=	nut
 PORTVERSION=	2.7.4
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.networkupstools.org/source/${PORTVERSION:R}/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}

Modified: head/sysutils/nut/pkg-plist
==============================================================================
--- head/sysutils/nut/pkg-plist	Sat Sep 26 20:45:41 2020	(r550221)
+++ head/sysutils/nut/pkg-plist	Sat Sep 26 20:46:02 2020	(r550222)
@@ -1,22 +1,22 @@
 %%NUT_CGI%%%%CGIDIR%%/upsimage.cgi
 %%NUT_CGI%%%%CGIDIR%%/upsset.cgi
 %%NUT_CGI%%%%CGIDIR%%/upsstats.cgi
-%%NUT_CGI%%@sample(root,uucp,0640) %%CGIETCDIR%%hosts.conf.sample
-%%NUT_CGI%%@sample(root,uucp,0640) %%CGIETCDIR%%upsset.conf.sample
-%%NUT_CGI%%@sample(root,uucp,0640) %%CGIETCDIR%%upsstats.html.sample
-%%NUT_CGI%%@sample(root,uucp,0640) %%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
- at sample(root,uucp,0640) %%ETCDIR%%/nut.conf.sample
- at sample(root,uucp,0640) %%ETCDIR%%/ups.conf.sample
- at sample(root,uucp,0640) %%ETCDIR%%/upsd.conf.sample
- at sample(root,uucp,0640) %%ETCDIR%%/upsd.users.sample
- at sample(root,uucp,0640) %%ETCDIR%%/upsmon.conf.sample
- at sample(root,uucp,0640) %%ETCDIR%%/upssched.conf.sample
+ 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
 @sample %%EXAMPLESDIR%%/newsyslog.sample etc/newsyslog.conf.d/nut.conf
 @sample %%EXAMPLESDIR%%/syslog.sample etc/syslog.d/nut
 %%NUT_USB%%etc/devd/nut-usb.conf