Bump netsaint-base to nb1 using patches provided in PR 16293 by Greg

A. Woods <woods@planix.com> with some modifications by me.  Changes are:

	- better support for building optional plugin packages
	- install no longer overwrites existing config files
	- sample config files are installed in share/examples
	- build no longer fails if not done as root
	- appropriate netsaint users and groups are now created
	- no longer installs one-time setup script in sbin
	- daemon logo

7 files changed, 86 insertions, 53 deletions

diff --git a/net/netsaint-base/MESSAGE b/net/netsaint-base/MESSAGE
index 0f73c467460..a489dbe363d 100644
--- a/net/netsaint-base/MESSAGE
+++ b/net/netsaint-base/MESSAGE
@@ -1,18 +1,26 @@
-==========================================================================
-$NetBSD: MESSAGE,v 1.1 2001/10/31 22:56:45 zuntum Exp $
+$NetBSD: MESSAGE,v 1.2 2002/04/14 10:57:10 rh Exp $
 
-  netsaint-base has now been installed.  Before using this package for
-  the first time, you need to run 'netsaint-setup.sh' and then set up the
-  configuration files in ${PREFIX}/etc/netsaint (simply copy over the
-  sample configuration files you find there and edit them accordingly).
+Before using the netsaint-base package for the first time, you need to
+run the ${PREFIX}/etc/netsaint/netsaint-setup.sh script (as root) and
+then set up the configuration files.  You can copy the sample
+configuration files from ${PREFIX}/share/examples/netsaint to
+${PREFIX}/etc/netsaint and then edit them accordingly.
 
-  If you want to use the web frontend, you need to make sure that the
-  user your CGI scripts are running under has write access to the
-  directory 'netsaint.cmd' resides in (see 'command_file' in the
-  'netsaint.cfg' configuration file for more information).
+The documentation is installed in ${PREFIX}/share/netsaint/docs.
   
-  Please note that without plug-ins, this package will not do anything
-  useful.  It is therefore recommended to install the 'netsaint-plugins'
-  package as well.
+Please note that without additional "plug-in" testing programs this
+package will not do anything very useful.  It is therefore recommended
+you install the 'netsaint-plugins' package as well, and perhaps the
+other 'netsaint-plugin-*' packages too.
 
-==========================================================================
+Important Information About the Future of NetSaint
+--------------------------------------------------
+Date: 01-16-2002
+
+For various reasons, I am planning on no longer using "NetSaint" as the
+title of this software package.  Version 0.0.7 will be will be the last
+release of this software package under the "NetSaint" name.
+
+- Ethan Galstad 
+    netsaint@netsaint.org
+    egalstad@sourceforge.net
diff --git a/net/netsaint-base/Makefile b/net/netsaint-base/Makefile
index a2ea3830121..0c0fb7ac16f 100644
--- a/net/netsaint-base/Makefile
+++ b/net/netsaint-base/Makefile
@@ -1,34 +1,38 @@
-# $NetBSD: Makefile,v 1.11 2002/03/25 12:54:17 rh Exp $
+# $NetBSD: Makefile,v 1.12 2002/04/14 10:57:11 rh Exp $
 #
 
 DISTNAME=		netsaint-0.0.7
 PKGNAME=		${DISTNAME:S/-/-base-/}
-CATEGORIES=		net
+PKGREVISION=		1
 MASTER_SITES=		http://www.netsaint.org/download/
 
 MAINTAINER=		murray@river-styx.org
 HOMEPAGE=		http://www.netsaint.org/
 COMMENT=		network monitor
 
-DEPENDS+=		gd>=1.8.4nb1:../../graphics/gd
+USE_BUILDLINK_ONLY=	# defined
 
 .include "../../net/netsaint-base/Makefile.common"
 
+CONFIGURE_ARGS+=	--with-ping-command='/sbin/ping -n -c %d %s'
+
 INSTALL_TARGET=		install install-config
 
 post-configure:
-	${SED} <${FILESDIR}/netsaint-setup.sh >${WRKDIR}/netsaint-setup.sh	\
+	${SED} < ${FILESDIR}/netsaint-setup.sh > ${WRKDIR}/netsaint-setup.sh	\
 		-e 's:@@USER@@:${NETSAINT_USER}:g'	\
 		-e 's:@@GROUP@@:${NETSAINT_GROUP}:g'
 
+post-build:
+	cd ${WRKDIR}; uudecode ${FILESDIR}/logofullsize.gif.uu
+	cd ${WRKDIR}; uudecode ${FILESDIR}/sblogo.gif.uu
+
 post-install:
-	cd ${WRKDIR} && ${INSTALL_SCRIPT} netsaint-setup.sh ${PREFIX}/sbin;	\
-	cd ${PREFIX}/etc/netsaint;	\
-	${MV} commands.cfg commands.cfg.sample;	\
-	${MV} hosts.cfg hosts.cfg.sample;	\
-	${MV} netsaint.cfg netsaint.cfg.sample;	\
-	${MV} nscgi.cfg nscgi.cfg.sample;	\
-	${MV} resource.cfg resource.cfg.sample;	\
-	${CHMOD} u+x *.sample
+	${INSTALL_DATA_DIR} ${PREFIX}/etc/netsaint
+	${INSTALL_SCRIPT} ${WRKDIR}/netsaint-setup.sh ${PREFIX}/etc/netsaint
+	${INSTALL_DATA} ${WRKDIR}/logofullsize.gif ${PREFIX}/share/netsaint/images
+	${INSTALL_DATA} ${WRKDIR}/sblogo.gif ${PREFIX}/share/netsaint/images
 
+.include "../../graphics/gd/buildlink.mk"
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/netsaint-base/Makefile.common b/net/netsaint-base/Makefile.common
index 9c89823db12..1ac793f9ca5 100644
--- a/net/netsaint-base/Makefile.common
+++ b/net/netsaint-base/Makefile.common
@@ -1,8 +1,23 @@
-# $NetBSD: Makefile.common,v 1.2 2002/03/25 12:54:17 rh Exp $
+# $NetBSD: Makefile.common,v 1.3 2002/04/14 10:57:11 rh Exp $
 #
 
+CATEGORIES=		net sysutils
+
 NETSAINT_USER?=		netsaint
-NETSAINT_GROUP?=	${NETSAINT_USER}
+NETSAINT_USER_ID?=	200
+NETSAINT_GROUP?=	netsaint
+NETSAINT_GROUP_ID?=	200
+
+NETSTADM_USER?=		netstadm
+NETSTADM_USER_ID?=	201
+NETSTADM_GROUP?=	netstadm
+NETSTADM_GROUP_ID?=	201
+
+PKG_GROUPS=	${NETSAINT_GROUP}:${NETSAINT_GROUP_ID} \
+		${NETSTADM_GROUP}:${NETSTADM_GROUP_ID}
+
+PKG_USERS=	${NETSAINT_USER}:${NETSAINT_GROUP}:${NETSAINT_USER_ID}:NetSaint\\ Runtime\\ User	\
+		${NETSTADM_USER}:${NETSTADM_GROUP}:${NETSTADM_USER_ID}:NetSaint\\ Administrator:${PREFIX}/etc/netsaint:${SH}
 
 USE_X11=		YES
 GNU_CONFIGURE=		YES
diff --git a/net/netsaint-base/PLIST b/net/netsaint-base/PLIST
index 2ebb15d4816..a96860f6736 100644
--- a/net/netsaint-base/PLIST
+++ b/net/netsaint-base/PLIST
@@ -1,10 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2002/03/25 12:54:18 rh Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/04/14 10:57:11 rh Exp $
 bin/netsaint
-etc/netsaint/commands.cfg.sample
-etc/netsaint/hosts.cfg.sample
-etc/netsaint/netsaint.cfg.sample
-etc/netsaint/nscgi.cfg.sample
-etc/netsaint/resource.cfg.sample
+etc/netsaint/netsaint-setup.sh
 libexec/netsaint/cgi-bin/avail.cgi
 libexec/netsaint/cgi-bin/cmd.cgi
 libexec/netsaint/cgi-bin/config.cgi
@@ -20,7 +16,11 @@ libexec/netsaint/cgi-bin/statuswml.cgi
 libexec/netsaint/cgi-bin/statuswrl.cgi
 libexec/netsaint/cgi-bin/tac.cgi
 libexec/netsaint/cgi-bin/trends.cgi
-sbin/netsaint-setup.sh
+share/examples/netsaint/commands.cfg
+share/examples/netsaint/hosts.cfg
+share/examples/netsaint/netsaint.cfg
+share/examples/netsaint/nscgi.cfg
+share/examples/netsaint/resource.cfg
 share/netsaint/docs/about.html
 share/netsaint/docs/addons.html
 share/netsaint/docs/cgiauth.html
@@ -283,6 +283,7 @@ share/netsaint/stylesheets/trends.css
 @dirrm share/netsaint/docs/developer
 @dirrm share/netsaint/docs
 @dirrm share/netsaint
+@dirrm share/examples/netsaint
 @dirrm libexec/netsaint/cgi-bin
 @dirrm libexec/netsaint
 @dirrm etc/netsaint
diff --git a/net/netsaint-base/distinfo b/net/netsaint-base/distinfo
index 90452302ee0..b687faed850 100644
--- a/net/netsaint-base/distinfo
+++ b/net/netsaint-base/distinfo
@@ -1,7 +1,7 @@
 
 SHA1 (netsaint-0.0.7.tar.gz) = 5ce4832c9cccaba0baa49fe3e222c6753a811143
 Size (netsaint-0.0.7.tar.gz) = 1278019 bytes
-SHA1 (patch-aa) = b3f9d59f06d7cc3b9824142c6f69d42b6eae8452
+SHA1 (patch-aa) = c5269a622a1c597f4ff0b17f90290324d0313af3
 SHA1 (patch-ab) = 9708d1139dde1908563b9d44a8f339aad39e18b9
 SHA1 (patch-ac) = 3489bb8fb1148ca8fa0cc25c4decdfe8ebe5ada9
 SHA1 (patch-ad) = 53d82c97be2b1b232d860cbc3210c4228b50944b
diff --git a/net/netsaint-base/files/netsaint-setup.sh b/net/netsaint-base/files/netsaint-setup.sh
index cc156b5121c..a9165b81161 100644
--- a/net/netsaint-base/files/netsaint-setup.sh
+++ b/net/netsaint-base/files/netsaint-setup.sh
@@ -1,6 +1,8 @@
-#!/bin/sh
+#! /bin/sh
 #
-#       $NetBSD: netsaint-setup.sh,v 1.2 2002/03/25 12:54:18 rh Exp $
+#ident "@(#)$NetBSD: netsaint-setup.sh,v 1.3 2002/04/14 10:57:11 rh Exp $"
+#
+# Run this script as root to create these necessary runtime directories.
 #
 install -m 0755 -o @@USER@@ -g @@GROUP@@ -d /var/log/netsaint
 install -m 0755 -o @@USER@@ -g @@GROUP@@ -d /var/log/netsaint/archives
diff --git a/net/netsaint-base/patches/patch-aa b/net/netsaint-base/patches/patch-aa
index 4658743f84c..4fea76c2322 100644
--- a/net/netsaint-base/patches/patch-aa
+++ b/net/netsaint-base/patches/patch-aa
@@ -1,8 +1,16 @@
-$NetBSD: patch-aa,v 1.2 2002/03/25 12:54:19 rh Exp $
+$NetBSD: patch-aa,v 1.3 2002/04/14 10:57:11 rh Exp $
 
---- Makefile.in.orig	Mon Oct 22 04:49:39 2001
-+++ Makefile.in
-@@ -95,28 +95,26 @@
+--- Makefile.in.orig	Sun Oct 21 14:49:39 2001
++++ Makefile.in	Tue Apr  9 22:11:27 2002
+@@ -26,6 +26,7 @@
+ BINDIR=@bindir@
+ CGIDIR=@sbindir@
+ HTMLDIR=@datadir@
++SAMPDIR=@prefix@/share/examples/netsaint
+ INSTALL=@INSTALL@
+ INSTALL_OPTS=@INSTALL_OPTS@
+ COMMAND_OPTS=@COMMAND_OPTS@
+@@ -95,28 +96,21 @@
  	cd $(SRC_BASE); $(MAKE) $@ ; cd ..
  	cd $(SRC_CGI); $(MAKE) $@ ; cd ..
  	cd $(SRC_HTM); $(MAKE) $@ ; cd ..
@@ -11,11 +19,6 @@ $NetBSD: patch-aa,v 1.2 2002/03/25 12:54:19 rh Exp $
 -	if [ $(INSTALLPERLSTUFF) = yes ]; then \
 -		$(INSTALL) -m 664 $(INSTALL_OPTS) p1.pl $(DESTDIR)$(BINDIR); \
 -	fi;
-+#	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)
-+#	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives
-+#	if [ $(INSTALLPERLSTUFF) = yes ]; then \
-+#		$(INSTALL) -m 664 $(INSTALL_OPTS) p1.pl $(DESTDIR)$(BINDIR); \
-+#	fi;
  
  install-config:
 -	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
@@ -24,12 +27,12 @@ $NetBSD: patch-aa,v 1.2 2002/03/25 12:54:19 rh Exp $
 -	$(INSTALL) -m 664 $(INSTALL_OPTS) commands.cfg $(DESTDIR)$(CFGDIR)
 -	$(INSTALL) -m 664 $(INSTALL_OPTS) nscgi.cfg $(DESTDIR)$(CFGDIR)
 -	$(INSTALL) -m 660 $(INSTALL_OPTS) resource.cfg $(DESTDIR)$(CFGDIR)
-+	[ -d ${DESTDIR}${CFGDIR} ] || ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${CFGDIR}
-+	${BSD_INSTALL_DATA} netsaint.cfg $(DESTDIR)$(CFGDIR)
-+	${BSD_INSTALL_DATA} hosts.cfg $(DESTDIR)$(CFGDIR)
-+	${BSD_INSTALL_DATA} commands.cfg $(DESTDIR)$(CFGDIR)
-+	${BSD_INSTALL_DATA} nscgi.cfg $(DESTDIR)$(CFGDIR)
-+	${BSD_INSTALL_DATA} resource.cfg $(DESTDIR)$(CFGDIR)
++	[ -d $(DESTDIR)$(SAMPDIR) ] || ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(SAMPDIR)
++	${BSD_INSTALL_DATA} netsaint.cfg $(DESTDIR)$(SAMPDIR)
++	${BSD_INSTALL_DATA} hosts.cfg $(DESTDIR)$(SAMPDIR)
++	${BSD_INSTALL_DATA} commands.cfg $(DESTDIR)$(SAMPDIR)
++	${BSD_INSTALL_DATA} nscgi.cfg $(DESTDIR)$(SAMPDIR)
++	${BSD_INSTALL_DATA} resource.cfg $(DESTDIR)$(SAMPDIR)
  
  install-init: install-daemoninit