From owner-svn-ports-all@freebsd.org  Thu Sep 17 06:15:42 2015
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5F3B69CE4D9;
 Thu, 17 Sep 2015 06:15:42 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 375E017D3;
 Thu, 17 Sep 2015 06:15:42 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8H6FgqH025168;
 Thu, 17 Sep 2015 06:15:42 GMT (envelope-from cy@FreeBSD.org)
Received: (from cy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8H6FfMn025165;
 Thu, 17 Sep 2015 06:15:41 GMT (envelope-from cy@FreeBSD.org)
Message-Id: <201509170615.t8H6FfMn025165@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org
 using -f
From: Cy Schubert <cy@FreeBSD.org>
Date: Thu, 17 Sep 2015 06:15:41 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r397100 - head/sysutils/nut
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Sep 2015 06:15:42 -0000

Author: cy
Date: Thu Sep 17 06:15:41 2015
New Revision: 397100
URL: https://svnweb.freebsd.org/changeset/ports/397100

Log:
  Install netxml-ups, update pkg-plist.
  
  PR:		203048
  Submitted by:	amdmi3

Modified:
  head/sysutils/nut/Makefile
  head/sysutils/nut/pkg-plist

Modified: head/sysutils/nut/Makefile
==============================================================================
--- head/sysutils/nut/Makefile	Thu Sep 17 04:47:59 2015	(r397099)
+++ head/sysutils/nut/Makefile	Thu Sep 17 06:15:41 2015	(r397100)
@@ -3,6 +3,7 @@
 
 PORTNAME=	nut
 PORTVERSION=	2.7.3
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.networkupstools.org/source/${PORTVERSION:R}/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig
@@ -165,8 +166,9 @@ pre-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/nut
 	@${REINPLACE_CMD} -e 's/device-name\*/cdev/g' ${WRKSRC}/scripts/devd/nut-usb.conf
 
-.if ${PORT_OPTIONS:MDOCS}
 post-install:
+	@${MKDIR} ${STAGEDIR}${STATEDIR}
+.if ${PORT_OPTIONS:MDOCS}
 .if ${PORT_OPTIONS:MBASH}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d/
 	${INSTALL_DATA} ${WRKSRC}/scripts/misc/nut.bash_completion ${STAGEDIR}${PREFIX}/etc/bash_completion.d/

Modified: head/sysutils/nut/pkg-plist
==============================================================================
--- head/sysutils/nut/pkg-plist	Thu Sep 17 04:47:59 2015	(r397099)
+++ head/sysutils/nut/pkg-plist	Thu Sep 17 06:15:41 2015	(r397100)
@@ -79,6 +79,7 @@ libdata/pkgconfig/libupsclient.pc
 %%NUT_SERIAL%%libexec/nut/mge-utalk
 %%NUT_SERIAL%%libexec/nut/microdowell
 %%NUT_SERIAL%%libexec/nut/mge-shut
+libexec/nut/netxml-ups
 %%NUT_SERIAL%%libexec/nut/oldmge-shut
 %%NUT_SERIAL%%libexec/nut/oneac
 %%NUT_SERIAL%%libexec/nut/optiups
@@ -176,6 +177,7 @@ man/man5/upssched.conf.5.gz
 %%NUT_SERIAL%%man/man8/apcupsd-ups.8.gz
 %%NUT_SERIAL%%man/man8/blazer_ser.8.gz
 %%NUT_USB%%man/man8/blazer_usb.8.gz
+man/man8/netxml-ups.8.gz
 man/man8/nut-recorder.8.gz
 man/man8/nut-scanner.8.gz
 %%NUT_USB%%man/man8/nutdrv_atcl_usb.8.gz
@@ -243,13 +245,4 @@ sbin/upsd
 sbin/upsdrvctl
 sbin/upsmon
 sbin/upssched
-@exec mkdir %%STATEDIR%%
-@exec chown %%NUT_USER%%:%%NUT_GROUP%% %%STATEDIR%%
-@exec chmod 750 %%STATEDIR%%
-@unexec test -d %%STATEDIR%% && rmdir %%STATEDIR%%
-%%NUT_CGI%%@dirrmtry %%CGIDIR%%
-@dirrmtry %%ETCDIR%%
-%%NUT_CGI%%@dirrmtry www/cgi-bin
-%%BASH%%@dirrmtry etc/bash_completion.d
-@dirrmtry libexec/nut
-%%NUT_CGI%%@dirrmtry %%WWWDIR%%
+@dir(%%NUT_USER%%,%%NUT_GROUP%%,750) %%STATEDIR%%