diff options
author | sbd <sbd> | 2012-08-07 06:51:58 +0000 |
---|---|---|
committer | sbd <sbd> | 2012-08-07 06:51:58 +0000 |
commit | 9690bba55d36a91f2171049b8b369fd0c587f499 (patch) | |
tree | 2ddd060f098754d786a9ced1f114d6e0fb796500 /net/xymonclient/patches | |
parent | 9fb644a0e19d4dd6a0d62ada4f54bb7074108d5f (diff) | |
download | pkgsrc-9690bba55d36a91f2171049b8b369fd0c587f499.tar.gz |
Installed files fixes (two files were being installed to '/'):
1) Make sure INSTALLLOCALDIR is define/passed down to the client directory
install target.
2) Install 'localclient.cfg' INSTALLETCDIR and add it as a config file.
Update PLIST.
Bump PKGREVISION.
Diffstat (limited to 'net/xymonclient/patches')
-rw-r--r-- | net/xymonclient/patches/patch-aa | 12 | ||||
-rw-r--r-- | net/xymonclient/patches/patch-ab | 17 | ||||
-rw-r--r-- | net/xymonclient/patches/patch-ac | 13 |
3 files changed, 27 insertions, 15 deletions
diff --git a/net/xymonclient/patches/patch-aa b/net/xymonclient/patches/patch-aa index 366c93b1d85..ee92aedddc8 100644 --- a/net/xymonclient/patches/patch-aa +++ b/net/xymonclient/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.3 2011/04/22 15:37:02 spz Exp $ +$NetBSD: patch-aa,v 1.4 2012/08/07 06:51:58 sbd Exp $ --- configure.client.orig 2011-03-08 17:20:28.000000000 +0000 +++ configure.client @@ -55,7 +55,7 @@ $NetBSD: patch-aa,v 1.3 2011/04/22 15:37:02 spz Exp $ fi if test -d "$XYMONTOPDIR" then -@@ -158,9 +160,12 @@ echo "# Toplevel dir" +@@ -158,9 +160,12 @@ echo "# Toplevel dir" echo "XYMONTOPDIR = $XYMONTOPDIR" >>Makefile echo "# Server home dir for etc/, www/" >>Makefile echo "XYMONHOME = $XYMONHOME" >>Makefile @@ -68,7 +68,7 @@ $NetBSD: patch-aa,v 1.3 2011/04/22 15:37:02 spz Exp $ echo "# Username running Xymon" >>Makefile echo "XYMONUSER = $XYMONUSER" >>Makefile echo "# Xymon server IP-address" >>Makefile -@@ -194,6 +199,9 @@ fi +@@ -194,9 +199,15 @@ fi if test "$INSTALLETCDIR" != ""; then echo "INSTALLETCDIR = $INSTALLETCDIR" >>Makefile fi @@ -78,3 +78,9 @@ $NetBSD: patch-aa,v 1.3 2011/04/22 15:37:02 spz Exp $ if test "$INSTALLEXTDIR" != ""; then echo "INSTALLEXTDIR = $INSTALLEXTDIR" >>Makefile fi ++if test "$INSTALLLOCALDIR" != ""; then ++ echo "INSTALLLOCALDIR = $INSTALLLOCALDIR" >>Makefile ++fi + if test "$INSTALLTMPDIR" != ""; then + echo "INSTALLTMPDIR = $INSTALLTMPDIR" >>Makefile + fi diff --git a/net/xymonclient/patches/patch-ab b/net/xymonclient/patches/patch-ab index b25b9e95a49..be40a731e3e 100644 --- a/net/xymonclient/patches/patch-ab +++ b/net/xymonclient/patches/patch-ab @@ -1,18 +1,21 @@ -$NetBSD: patch-ab,v 1.3 2011/04/22 15:37:02 spz Exp $ +$NetBSD: patch-ab,v 1.4 2012/08/07 06:51:58 sbd Exp $ ---- build/Makefile.rules.orig 2011-03-08 17:20:28.000000000 +0000 +--- build/Makefile.rules.orig 2011-09-03 13:57:39.000000000 +0000 +++ build/Makefile.rules -@@ -34,6 +34,9 @@ endif +@@ -34,6 +34,12 @@ endif ifndef INSTALLETCDIR INSTALLETCDIR = $(XYMONHOME)/etc endif +ifndef INSTALLEXADIR +INSTALLEXADIR = $(XYMONHOME)/etc +endif ++ifndef INSTALLLOCALDIR ++INSTALLLOCALDIR = $(XYMONHOME)/local ++endif ifndef INSTALLEXTDIR INSTALLEXTDIR = $(XYMONHOME)/ext endif -@@ -167,64 +170,66 @@ install-servermsg: +@@ -167,64 +173,66 @@ install-servermsg: @echo "To view the Xymon webpages, go to http://${XYMONHOSTNAME}${XYMONHOSTURL}" install-dirs: @@ -86,7 +89,7 @@ $NetBSD: patch-ab,v 1.3 2011/04/22 15:37:02 spz Exp $ chown $(XYMONUSER) $(INSTALLROOT)$(INSTALLWWWDIR) $(INSTALLROOT)$(INSTALLWWWDIR)/gifs $(INSTALLROOT)$(INSTALLWWWDIR)/help $(INSTALLROOT)$(INSTALLWWWDIR)/html $(INSTALLROOT)$(INSTALLWWWDIR)/menu $(INSTALLROOT)$(INSTALLWWWDIR)/notes $(INSTALLROOT)$(INSTALLWWWDIR)/rep $(INSTALLROOT)$(INSTALLWWWDIR)/snap $(INSTALLROOT)$(INSTALLWWWDIR)/wml chgrp `$(IDTOOL) -g $(XYMONUSER)` $(INSTALLROOT)$(INSTALLWWWDIR) $(INSTALLROOT)$(INSTALLWWWDIR)/gifs $(INSTALLROOT)$(INSTALLWWWDIR)/help $(INSTALLROOT)$(INSTALLWWWDIR)/html $(INSTALLROOT)$(INSTALLWWWDIR)/menu $(INSTALLROOT)$(INSTALLWWWDIR)/notes $(INSTALLROOT)$(INSTALLWWWDIR)/rep $(INSTALLROOT)$(INSTALLWWWDIR)/snap $(INSTALLROOT)$(INSTALLWWWDIR)/wml ifdef HTTPDGID -@@ -283,25 +288,25 @@ ifndef PKGBUILD +@@ -283,25 +291,25 @@ ifndef PKGBUILD endif install-common: install-dirs @@ -119,7 +122,7 @@ $NetBSD: patch-ab,v 1.3 2011/04/22 15:37:02 spz Exp $ # NOTE: This one is normally not used - man-page install is done by the sub-Makefiles during "make install" -@@ -314,23 +319,23 @@ install-man: +@@ -314,23 +322,23 @@ install-man: XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" $(MAKE) -C web install-man install-docs: @@ -128,7 +131,7 @@ $NetBSD: patch-ab,v 1.3 2011/04/22 15:37:02 spz Exp $ install-custom: - XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C custom install || echo "Skipped custom modules" -+ XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C custom install || echo "Skipped custom modules" ++ XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLLOCALDIR="$(INSTALLLOCALDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C custom install || echo "Skipped custom modules" client-install: install-client diff --git a/net/xymonclient/patches/patch-ac b/net/xymonclient/patches/patch-ac index e1bd6f36a44..76bf2e73719 100644 --- a/net/xymonclient/patches/patch-ac +++ b/net/xymonclient/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.3 2012/04/28 20:55:31 gendalia Exp $ +$NetBSD: patch-ac,v 1.4 2012/08/07 06:51:58 sbd Exp $ ---- client/Makefile.orig 2011-03-08 17:20:28.000000000 +0000 +--- client/Makefile.orig 2011-12-12 22:15:39.000000000 +0000 +++ client/Makefile -@@ -19,6 +19,22 @@ endif +@@ -19,6 +19,25 @@ endif PROGRAMS=xymonlaunch logfetch clientupdate orcaxymon msgcache COMMONTOOLS=xymon xymoncmd xymongrep xymoncfg xymondigest @@ -15,6 +15,9 @@ $NetBSD: patch-ac,v 1.3 2012/04/28 20:55:31 gendalia Exp $ +ifndef INSTALLEXTDIR +INSTALLEXTDIR = $(XYMONHOME)/ext +endif ++ifndef INSTALLLOCALDIR ++INSTALLLOCALDIR = $(XYMONHOME)/local ++endif +ifndef INSTALLTMPDIR +INSTALLTMPDIR = $(XYMONHOME)/tmp +endif @@ -25,7 +28,7 @@ $NetBSD: patch-ac,v 1.3 2012/04/28 20:55:31 gendalia Exp $ all: $(PROGRAMS) $(COMMONTOOLS) xymonclient.cfg clientlaunch.cfg $(EXTRATOOLS) xymonclient.cfg: xymonclient.cfg.DIST -@@ -58,28 +74,58 @@ netbsd-meminfo: netbsd-meminfo.c +@@ -58,28 +77,58 @@ netbsd-meminfo: netbsd-meminfo.c install: if test ! -d $(INSTALLROOT)$(XYMONHOME) ; then mkdir -p $(INSTALLROOT)$(XYMONHOME) ; fi @@ -76,7 +79,7 @@ $NetBSD: patch-ac,v 1.3 2012/04/28 20:55:31 gendalia Exp $ + ln -sf $(INSTALLLOCALDIR) $(INSTALLROOT)$(XYMONHOME)/local +endif +endif -+ if test ! -f $(INSTALLROOT)$(INSTALLEXADIR)/localclient.cfg ; then cp localclient.cfg $(INSTALLROOT)$(INSTALLEXADIR) ; fi ++ if test ! -f $(INSTALLROOT)$(INSTALLETCDIR)/localclient.cfg ; then cp localclient.cfg $(INSTALLROOT)$(INSTALLETCDIR) ; fi + if test ! -f $(INSTALLROOT)$(INSTALLLOCALDIR)/README; then cp README-local $(INSTALLROOT)$(INSTALLLOCALDIR)/README ; chmod 644 $(INSTALLROOT)$(INSTALLLOCALDIR)/README; fi + cp -fp runclient.sh $(INSTALLROOT)$(INSTALLBINDIR) + cp -fp $(PROGRAMS) xymonclient*.sh $(COMMONTOOLS) $(EXTRATOOLS) $(INSTALLROOT)$(INSTALLBINDIR) |