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.

6 files changed, 37 insertions, 22 deletions

diff --git a/net/xymonclient/Makefile b/net/xymonclient/Makefile
index 461349a1a4b..5f00f278886 100644
--- a/net/xymonclient/Makefile
+++ b/net/xymonclient/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2012/08/07 02:36:12 sbd Exp $
+# $NetBSD: Makefile,v 1.13 2012/08/07 06:51:58 sbd Exp $
 #
 
 DISTNAME=		xymon-4.3.7
 PKGNAME=		xymonclient-4.3.7
+PKGREVISION=		1
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xymon/}
 
@@ -112,7 +113,7 @@ OWN_DIRS_PERMS+=	${XYTMPDIR}/client ${XYMONUSER} ${XYMONGROUP} 0755
 OWN_DIRS_PERMS+=	${XYMONVAR} ${XYMONUSER} ${XYMONGROUP} 0755
 OWN_DIRS_PERMS+=	${XYMONVAR}/data ${XYMONUSER} ${XYMONGROUP} 0755
 
-CFILES+=		clientlaunch.cfg xymonclient.cfg
+CFILES+=		clientlaunch.cfg localclient.cfg xymonclient.cfg
 .for file in ${CFILES}
 CONF_FILES_PERMS+=	${EXAMPLEDIR}/${file} ${PKG_SYSCONFDIR.xymon}/${file} ${XYMONUSER} ${XYMONGROUP} 0644
 .endfor
diff --git a/net/xymonclient/PLIST b/net/xymonclient/PLIST
index b271f470205..694b22152ca 100644
--- a/net/xymonclient/PLIST
+++ b/net/xymonclient/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2012/08/07 02:36:12 sbd Exp $
+@comment $NetBSD: PLIST,v 1.4 2012/08/07 06:51:58 sbd Exp $
 libexec/xymon/client/clientupdate
+libexec/xymon/client/local/README
 libexec/xymon/client/logfetch
 libexec/xymon/client/msgcache
 ${PLIST.meminfo}libexec/xymon/client/${LOWER_OPSYS}-meminfo
@@ -26,6 +27,7 @@ libexec/xymon/client/xymongrep
 libexec/xymon/client/xymonlaunch
 share/examples/rc.d/xymonclient
 share/examples/xymon/clientlaunch.cfg
+share/examples/xymon/localclient.cfg
 share/examples/xymon/xymonclient.cfg
 @pkgdir share/examples/xymon
 @pkgdir libexec/xymon/ext/client
diff --git a/net/xymonclient/distinfo b/net/xymonclient/distinfo
index 6a11f390809..ba869a0d810 100644
--- a/net/xymonclient/distinfo
+++ b/net/xymonclient/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.7 2012/04/28 20:55:31 gendalia Exp $
+$NetBSD: distinfo,v 1.8 2012/08/07 06:51:58 sbd Exp $
 
 SHA1 (xymon-4.3.7.tar.gz) = 29339157a1a6155d134ed1ad9985391d43034ee8
 RMD160 (xymon-4.3.7.tar.gz) = 9547eac47a5893f978cace54b5761e9cabe75941
 Size (xymon-4.3.7.tar.gz) = 2740378 bytes
-SHA1 (patch-aa) = 0475a9a92883ab3350bb8043366d455d841cb173
-SHA1 (patch-ab) = 7486e1cb5733898c8511d7ee212fd90741ba3d83
-SHA1 (patch-ac) = 0258c470159d648e9b7499b6665e36793d2aac41
+SHA1 (patch-aa) = 0810ac0098d3aa1f97ebee68d8d6cce1e09d6960
+SHA1 (patch-ab) = 21a760554e2cefd276eda4ee3905594287ad3482
+SHA1 (patch-ac) = db38e4ad886c01c2315be98fa49e6568c626722d
 SHA1 (patch-ad) = aa29eefcf9f0fa87014166692dcf146cebd70ef5
 SHA1 (patch-ae) = dadd2d81ed55c70f03994b2d868cfe643969a8ba
 SHA1 (patch-af) = ae5d0acde8e2cd05527253c41e31a806b04614f6
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)