From owner-svn-ports-all@FreeBSD.ORG  Mon Nov  4 16:45:25 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id B8D69EFC;
 Mon,  4 Nov 2013 16:45:25 +0000 (UTC)
 (envelope-from feld@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8C7CE228B;
 Mon,  4 Nov 2013 16:45:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA4GjP4U050303;
 Mon, 4 Nov 2013 16:45:25 GMT (envelope-from feld@svn.freebsd.org)
Received: (from feld@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA4GjPbe050301;
 Mon, 4 Nov 2013 16:45:25 GMT (envelope-from feld@svn.freebsd.org)
Message-Id: <201311041645.rA4GjPbe050301@svn.freebsd.org>
From: Mark Felder <feld@FreeBSD.org>
Date: Mon, 4 Nov 2013 16:45:25 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r332740 - head/net-mgmt/xymon-client
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.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Nov 2013 16:45:25 -0000

Author: feld
Date: Mon Nov  4 16:45:24 2013
New Revision: 332740
URL: http://svnweb.freebsd.org/changeset/ports/332740

Log:
  Support STAGE
  
  Approved by:	swills (mentor)

Modified:
  head/net-mgmt/xymon-client/Makefile
  head/net-mgmt/xymon-client/pkg-plist

Modified: head/net-mgmt/xymon-client/Makefile
==============================================================================
--- head/net-mgmt/xymon-client/Makefile	Mon Nov  4 16:06:15 2013	(r332739)
+++ head/net-mgmt/xymon-client/Makefile	Mon Nov  4 16:45:24 2013	(r332740)
@@ -20,23 +20,25 @@ XYMONUSER?=	xymon
 XYMONHOSTIP?=	127.0.0.1
 
 MAKE_JOBS_UNSAFE=	yes
-USE_GMAKE=	yes
+USES=		gmake
 CONFIGURE_ENV=	MAKE=gmake
 MAKE_ENV+=	XYMONUSER="${XYMONUSER}"
 MAKE_ENV+=	XYMONHOSTIP="${XYMONHOSTIP}"
+MAKE_ENV+=	INSTALLROOT="${STAGEDIR}"
+MAKE_ENV+=	PKGBUILD=1
+MANPREFIX=	${STAGEDIR}${PREFIX}
 USE_RC_SUBR=	xymon-client
 PLIST_SUB+=	XYMONUSER="${XYMONUSER}"
 CONFIG_FILES=	clientlaunch.cfg xymonclient.cfg localclient.cfg
 
 # Configure script is interactive
-NO_STAGE=	yes
 do-configure:
 	${CP} ${FILESDIR}/Makefile ${WRKSRC}/
 
 post-install:
 .for i in ${CONFIG_FILES}
-	${CP} -np ${WWWDIR}/client/etc/${i}.DIST \
-		${WWWDIR}/client/etc/${i} || ${TRUE}
+	${CP} -np ${STAGEDIR}${WWWDIR}/client/etc/${i}.DIST \
+		${STAGEDIR}${WWWDIR}/client/etc/${i} || ${TRUE}
 .endfor
 
 .include <bsd.port.mk>

Modified: head/net-mgmt/xymon-client/pkg-plist
==============================================================================
--- head/net-mgmt/xymon-client/pkg-plist	Mon Nov  4 16:06:15 2013	(r332739)
+++ head/net-mgmt/xymon-client/pkg-plist	Mon Nov  4 16:45:24 2013	(r332740)
@@ -1,6 +1,3 @@
-@exec if ! pw groupshow %%XYMONUSER%% 2>/dev/null; then pw groupadd %%XYMONUSER%% -g 280; fi
-@exec if ! pw usershow %%XYMONUSER%% 2>/dev/null; then pw useradd %%XYMONUSER%% -g %%XYMONUSER%% -u 280 -h - -d %%WWWDIR%% -s /usr/sbin/nologin -c "Xymon Monitor"; fi
-@unexec if pw usershow %%XYMONUSER%%; then pw userdel %%XYMONUSER%%; fi
 %%WWWDIR%%/client/bin/clientupdate
 %%WWWDIR%%/client/bin/freebsd-meminfo
 %%WWWDIR%%/client/bin/orcaxymon
@@ -36,12 +33,7 @@
 @exec [ ! -f %B/localclient.cfg ] && cp %B/%f %B/localclient.cfg
 %%WWWDIR%%/client/local/README
 %%WWWDIR%%/client/runclient.sh
-@exec mkdir %D/%%WWWDIR%%/client/ext
-@exec mkdir %D/%%WWWDIR%%/client/logs
-@exec mkdir %D/%%WWWDIR%%/client/tmp
-@exec chown %%XYMONUSER%% %D/%%WWWDIR%%/client/ext
-@exec chown %%XYMONUSER%% %D/%%WWWDIR%%/client/logs
-@exec chown %%XYMONUSER%% %D/%%WWWDIR%%/client/tmp
+@exec chown -R %%XYMONUSER%% %D/%%WWWDIR%%/client
 @dirrm %%WWWDIR%%/client/tmp
 @dirrm %%WWWDIR%%/client/logs
 @dirrm %%WWWDIR%%/client/local