diff options
| author | swills <swills@FreeBSD.org> | 2013-04-24 23:34:56 +0800 |
|---|---|---|
| committer | swills <swills@FreeBSD.org> | 2013-04-24 23:34:56 +0800 |
| commit | f93aa9efd43a8fc6c649d1a8042167c29d675fd7 (patch) | |
| tree | 451f4426f2d50b487684abd0e1fadda6943106a2 /net-mgmt | |
| parent | a63ad5c5d20990d960e58a48055c4bce7d6e758b (diff) | |
| download | freebsd-ports-gnome-f93aa9efd43a8fc6c649d1a8042167c29d675fd7.tar.gz freebsd-ports-gnome-f93aa9efd43a8fc6c649d1a8042167c29d675fd7.tar.zst freebsd-ports-gnome-f93aa9efd43a8fc6c649d1a8042167c29d675fd7.zip | |
- Update to 4.3.11
- Use USERS/GROUPS
- Mark MAKE_JOBS_UNSAFE
- Give maintainership to submitter
PR: ports/178084
Submitted by: Mark Felder <feld@feld.me>
Diffstat (limited to 'net-mgmt')
| -rw-r--r-- | net-mgmt/xymon-client/Makefile | 13 | ||||
| -rw-r--r-- | net-mgmt/xymon-client/distinfo | 4 | ||||
| -rw-r--r-- | net-mgmt/xymon-client/files/patch-Makefile | 12 |
3 files changed, 15 insertions, 14 deletions
diff --git a/net-mgmt/xymon-client/Makefile b/net-mgmt/xymon-client/Makefile index c62ff172ba79..23f733b956bb 100644 --- a/net-mgmt/xymon-client/Makefile +++ b/net-mgmt/xymon-client/Makefile @@ -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 xymonclient.cfg localclient.cfg 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 \ diff --git a/net-mgmt/xymon-client/distinfo b/net-mgmt/xymon-client/distinfo index 8b69ff600254..f89f9a9c135a 100644 --- a/net-mgmt/xymon-client/distinfo +++ b/net-mgmt/xymon-client/distinfo @@ -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 diff --git a/net-mgmt/xymon-client/files/patch-Makefile b/net-mgmt/xymon-client/files/patch-Makefile index 47341ec4a998..026bff8198db 100644 --- a/net-mgmt/xymon-client/files/patch-Makefile +++ b/net-mgmt/xymon-client/files/patch-Makefile @@ -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 |