From owner-svn-ports-all@FreeBSD.ORG Wed Apr 24 15:34:57 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id E325F741; Wed, 24 Apr 2013 15:34:57 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id D54361C1A; Wed, 24 Apr 2013 15:34:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3OFYv4Q091911; Wed, 24 Apr 2013 15:34:57 GMT (envelope-from swills@svn.freebsd.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3OFYvaX091908; Wed, 24 Apr 2013 15:34:57 GMT (envelope-from swills@svn.freebsd.org) Message-Id: <201304241534.r3OFYvaX091908@svn.freebsd.org> From: Steve Wills Date: Wed, 24 Apr 2013 15:34:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r316441 - in head/net-mgmt/xymon-client: . files 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Apr 2013 15:34:58 -0000 Author: swills Date: Wed Apr 24 15:34:56 2013 New Revision: 316441 URL: http://svnweb.freebsd.org/changeset/ports/316441 Log: - Update to 4.3.11 - Use USERS/GROUPS - Mark MAKE_JOBS_UNSAFE - Give maintainership to submitter PR: ports/178084 Submitted by: Mark Felder Modified: head/net-mgmt/xymon-client/Makefile (contents, props changed) head/net-mgmt/xymon-client/distinfo (contents, props changed) head/net-mgmt/xymon-client/files/patch-Makefile (contents, props changed) Modified: head/net-mgmt/xymon-client/Makefile ============================================================================== --- head/net-mgmt/xymon-client/Makefile Wed Apr 24 15:23:54 2013 (r316440) +++ head/net-mgmt/xymon-client/Makefile Wed Apr 24 15:34:56 2013 (r316441) @@ -1,21 +1,25 @@ # $FreeBSD$ PORTNAME= xymon -PORTVERSION= 4.3.10 +PORTVERSION= 4.3.11 CATEGORIES= net-mgmt www MASTER_SITES= SF/xymon/Xymon/${PORTVERSION} PKGNAMESUFFIX= -client${PKGNAMESUFFIX2} DIST_SUBDIR= repacked -MAINTAINER= ports@FreeBSD.org +MAINTAINER= feld@feld.me COMMENT= System for monitoring servers and networks - Client LICENSE= GPLv2 +USERS= xymon +GROUPS= xymon + # Options XYMONUSER?= xymon XYMONHOSTIP?= 127.0.0.1 +MAKE_JOBS_UNSAFE= yes USE_GMAKE= yes CONFIGURE_ENV= MAKE=gmake MAKE_ENV+= XYMONUSER="${XYMONUSER}" @@ -28,11 +32,6 @@ CONFIG_FILES= clientlaunch.cfg xymonclie do-configure: ${CP} ${FILESDIR}/Makefile ${WRKSRC}/ -pre-install: - if ! pw groupshow ${XYMONUSER}; then pw groupadd ${XYMONUSER} -g 280; fi - if ! pw usershow ${XYMONUSER}; then pw useradd ${XYMONUSER} -g ${XYMONUSER} -u 280 \ - -h - -d ${WWWDIR} -s /usr/sbin/nologin -c "Xymon Monitor"; fi - post-install: .for i in ${CONFIG_FILES} ${CP} -np ${WWWDIR}/client/etc/${i}.DIST \ Modified: head/net-mgmt/xymon-client/distinfo ============================================================================== --- head/net-mgmt/xymon-client/distinfo Wed Apr 24 15:23:54 2013 (r316440) +++ head/net-mgmt/xymon-client/distinfo Wed Apr 24 15:34:56 2013 (r316441) @@ -1,2 +1,2 @@ -SHA256 (repacked/xymon-4.3.10.tar.gz) = 06b519cbe94b93a4b1ea5601d55e58f3ad8304acf555cf3d11ba04cee47455c1 -SIZE (repacked/xymon-4.3.10.tar.gz) = 2754807 +SHA256 (repacked/xymon-4.3.11.tar.gz) = d36f4ea320816375377d97784b7f0e04b8df3dfd19f75a2f1ff4b9f86e6829ee +SIZE (repacked/xymon-4.3.11.tar.gz) = 2760418 Modified: head/net-mgmt/xymon-client/files/patch-Makefile ============================================================================== --- head/net-mgmt/xymon-client/files/patch-Makefile Wed Apr 24 15:23:54 2013 (r316440) +++ head/net-mgmt/xymon-client/files/patch-Makefile Wed Apr 24 15:34:56 2013 (r316441) @@ -1,20 +1,22 @@ ---- client/Makefile.orig 2011-12-12 23:15:39.000000000 +0100 -+++ client/Makefile 2012-01-12 06:47:33.000000000 +0100 -@@ -64,14 +64,14 @@ +--- client/Makefile.orig 2012-11-14 05:29:54.000000000 -0600 ++++ client/Makefile 2013-04-23 09:14:36.635076021 -0500 +@@ -69,15 +69,15 @@ if test ! -d $(INSTALLROOT)$(XYMONHOME)/logs ; then mkdir -p $(INSTALLROOT)$(XYMONHOME)/logs ; fi if test ! -d $(INSTALLROOT)$(XYMONHOME)/ext ; then mkdir -p $(INSTALLROOT)$(XYMONHOME)/ext ; fi if test ! -d $(INSTALLROOT)$(XYMONHOME)/local ; then mkdir -p $(INSTALLROOT)$(XYMONHOME)/local ; fi - if test ! -f $(INSTALLROOT)$(XYMONHOME)/etc/localclient.cfg ; then cp localclient.cfg $(INSTALLROOT)$(XYMONHOME)/etc/ ; fi + if test ! -f $(INSTALLROOT)$(XYMONHOME)/etc/localclient.cfg ; then cp localclient.cfg $(INSTALLROOT)$(XYMONHOME)/etc/localclient.cfg.DIST ; fi if test ! -f $(INSTALLROOT)$(XYMONHOME)/local/README; then cp README-local $(INSTALLROOT)$(XYMONHOME)/local/README ; chmod 644 $(INSTALLROOT)$(XYMONHOME)/local/README; fi + chmod 755 runclient.sh $(PROGRAMS) xymonclient*.sh $(COMMONTOOLS) $(EXTRATOOLS) cp -fp runclient.sh $(INSTALLROOT)$(XYMONHOME) cp -fp $(PROGRAMS) xymonclient*.sh $(COMMONTOOLS) $(EXTRATOOLS) $(INSTALLROOT)$(XYMONHOME)/bin/ - chmod ugo+x $(INSTALLROOT)$(XYMONHOME)/bin/* - ../build/merge-sects clientlaunch.cfg $(INSTALLROOT)$(XYMONHOME)/etc/clientlaunch.cfg - ../build/merge-lines xymonclient.cfg $(INSTALLROOT)$(XYMONHOME)/etc/xymonclient.cfg +- chmod 644 $(INSTALLROOT)$(XYMONHOME)/etc/clientlaunch.cfg $(INSTALLROOT)$(XYMONHOME)/etc/xymonclient.cfg + ../build/merge-sects clientlaunch.cfg $(INSTALLROOT)$(XYMONHOME)/etc/clientlaunch.cfg.DIST + ../build/merge-lines xymonclient.cfg $(INSTALLROOT)$(XYMONHOME)/etc/xymonclient.cfg.DIST ++ chmod 644 $(INSTALLROOT)$(XYMONHOME)/etc/clientlaunch.cfg.DIST $(INSTALLROOT)$(XYMONHOME)/etc/xymonclient.cfg.DIST + ifndef PKGBUILD chown -R $(XYMONUSER) $(INSTALLROOT)$(XYMONHOME) - endif