Re-organise use of directories to fit hier(7) better.

Include a DEINSTALL script that warns the user about generate files that
may be left.

4 files changed, 43 insertions, 12 deletions

diff --git a/net/nocol/files/patch-sum b/net/nocol/files/patch-sum
index d8dbdce3421..5df94fd9b2e 100644
--- a/net/nocol/files/patch-sum
+++ b/net/nocol/files/patch-sum
@@ -1,9 +1,10 @@
-$NetBSD: patch-sum,v 1.6 2000/09/02 09:35:43 skrll Exp $
+$NetBSD: patch-sum,v 1.7 2000/10/16 07:38:44 skrll Exp $
 
 MD5 (patch-aa) = a8be5ffe066d39833ce92464615250b1
 MD5 (patch-ab) = 03afd4c3309bd3c138dce2dc85fc03a2
 MD5 (patch-ac) = b849c9ba9dd69eec016911366801701a
 MD5 (patch-ad) = ffd1b88e39704817d4d9f08428a79996
-MD5 (patch-ae) = b3c73c4a5e6a1a174aee8f97eda90680
+MD5 (patch-ae) = ccf9c13b56fed84d1bd7c573413a049c
 MD5 (patch-af) = da9e64f9771ba97dfdf6cb56d77e1fca
 MD5 (patch-ag) = b69da64f1676807c9429873d69c6a8da
+MD5 (patch-ah) = 94617c3949e0dd8ebd0fe69e48ebab02
diff --git a/net/nocol/patches/patch-ae b/net/nocol/patches/patch-ae
index db4192d71dd..8f7e9d31ef4 100644
--- a/net/nocol/patches/patch-ae
+++ b/net/nocol/patches/patch-ae
@@ -1,12 +1,20 @@
-$NetBSD: patch-ae,v 1.1 2000/07/13 15:34:13 abs Exp $
+$NetBSD: patch-ae,v 1.2 2000/10/16 07:38:44 skrll Exp $
 
 --- Makefile.head.orig	Wed Jan 19 04:08:32 2000
-+++ Makefile.head	Thu Jul 13 15:46:48 2000
-@@ -45,7 +45,7 @@
- DATADIR=	$(ROOTDIR)/data
- MSGSDIR=	$(ROOTDIR)/msgs
- HELPDIR=	$(ROOTDIR)/help
++++ Makefile.head
+@@ -41,11 +41,11 @@
+ #	EXAMPLESDIR	directory to store example config files
+ BINDIR= 	$(ROOTDIR)/bin
+ ETCDIR=		$(ROOTDIR)/etc
+-PIDDIR=		$(ROOTDIR)/run
+-DATADIR=	$(ROOTDIR)/data
+-MSGSDIR=	$(ROOTDIR)/msgs
+-HELPDIR=	$(ROOTDIR)/help
 -EXAMPLESDIR=	$(ETCDIR)/samples
++PIDDIR=		/var/run
++DATADIR=	/var/run/data
++MSGSDIR=	/var/run/msgs
++HELPDIR=	$(ROOTDIR)/share/nocol/help
 +EXAMPLESDIR=	${ROOTDIR}/share/examples/nocol
  
  ##
diff --git a/net/nocol/pkg/DEINSTALL b/net/nocol/pkg/DEINSTALL
new file mode 100755
index 00000000000..487b661120a
--- /dev/null
+++ b/net/nocol/pkg/DEINSTALL
@@ -0,0 +1,23 @@
+#! /bin/sh
+#
+# $NetBSD: DEINSTALL,v 1.1 2000/10/16 07:38:45 skrll Exp $
+#
+
+case "$2" in
+        DEINSTALL) cat <<EOF
+
+---------------------------------------------------------------------------
+Data files and messages created by nocol are store is /var/run/msgs and 
+/var/run/data. You may want to remove these directories manually if you
+don't need them any longer:
+
+	rm -fr /var/run/msgs /var/run/data
+
+For further information look at $PKG_PREFIX/share
+---------------------------------------------------------------------------
+
+EOF
+        ;;
+esac    
+
+exit 0
diff --git a/net/nocol/pkg/PLIST b/net/nocol/pkg/PLIST
index ac856f6a98f..8a083f1a369 100644
--- a/net/nocol/pkg/PLIST
+++ b/net/nocol/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2000/07/13 15:34:14 abs Exp $
+@comment $NetBSD: PLIST,v 1.5 2000/10/16 07:38:45 skrll Exp $
 bin/apcmon
 bin/armon
 bin/bgpmon
@@ -65,7 +65,6 @@ bin/upsmon
 bin/webnocol.cgi
 etc/mib-v2.txt
 etc/netconsole-help
-help/default
 man/mann/etherload.n
 man/mann/eventselect.n
 man/mann/genmon.n
@@ -119,10 +118,10 @@ share/nocol/gifs/info.jpg
 share/nocol/gifs/redsq.gif
 share/nocol/gifs/warning.jpg
 share/nocol/gifs/yellowsq.gif
+share/nocol/help/default
 share/nocol/warning.wav
 @dirrm bin/hostmon-osclients
 @dirrm share/examples/nocol
-@dirrm run
-@dirrm msgs
+@dirrm share/nocol/help
 @dirrm share/nocol/gifs
 @dirrm share/nocol