Install mirror.defaults.dist as part of the package. Only copy it

to mirror.defaults if one does not already exist.  This preserves
local configuration information.

5 files changed, 24 insertions, 10 deletions

diff --git a/net/mirror/Makefile b/net/mirror/Makefile
index fe8ea2a60f3..b9dccdcfb41 100644
--- a/net/mirror/Makefile
+++ b/net/mirror/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2000/03/26 22:33:17 kim Exp $
+# $NetBSD: Makefile,v 1.10 2000/04/19 16:16:51 kim Exp $
 # FreeBSD Id: Makefile,v 1.6 1996/12/01 01:22:54 obrien Exp 
 #
 
@@ -19,4 +19,11 @@ MAKEFILE=	makefile
 pre-install:
 	${MKDIR} ${PREFIX}/lib/mirror
 
+post-install:
+	@if [ ! -f ${PREFIX}/lib/mirror/mirror.defaults ]; then \
+	    ${CP} -p \
+		${PREFIX}/lib/mirror/mirror.defaults.dist \
+		${PREFIX}/lib/mirror/mirror.defaults; \
+	fi
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/mirror/files/patch-sum b/net/mirror/files/patch-sum
index 26957da3cf2..69c9470c8a0 100644
--- a/net/mirror/files/patch-sum
+++ b/net/mirror/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.3 2000/03/26 22:33:18 kim Exp $
+$NetBSD: patch-sum,v 1.4 2000/04/19 16:16:52 kim Exp $
 
-MD5 (patch-aa) = 586c7aeaa06dab9dfebc7e6e2f8528f3
+MD5 (patch-aa) = de64e92f143eca516427df46633f3459
 MD5 (patch-ab) = b7ed2b99a3e7cfa0f1f0c02664e4f70a
 MD5 (patch-ac) = 54872e85faa939e28bc6b050d39c44f7
 MD5 (patch-ad) = 02f9cc76255af7ba20ea4c379426ca78
diff --git a/net/mirror/patches/patch-aa b/net/mirror/patches/patch-aa
index dfaed19383d..88c6c92585a 100644
--- a/net/mirror/patches/patch-aa
+++ b/net/mirror/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.4 2000/03/26 22:33:18 kim Exp $
+$NetBSD: patch-aa,v 1.5 2000/04/19 16:16:52 kim Exp $
 
---- makefile.orig	Mon Jun  1 14:28:47 1998
-+++ makefile	Sat Mar 25 02:45:05 2000
+--- makefile.orig	Mon Jun  1 21:28:47 1998
++++ makefile	Wed Apr 19 19:06:30 2000
 @@ -41,7 +41,7 @@
  	$(WEBFILES)
  
@@ -48,7 +48,7 @@ $NetBSD: patch-aa,v 1.4 2000/03/26 22:33:18 kim Exp $
 +	install -c -m $(EXMODE) -g $(GRP) mm.pl $(BINDIR)/mirrormaster
 +	install -c -m $(PLMODE) -g $(GRP) mirror.man $(MANDIR)/mirror.1
 +	install -c -m $(PLMODE) -g $(GRP) mm.man $(MANDIR)/mirrormaster.1
-+	install -c -m $(PLMODE) -g $(GRP) mirror.defaults $(PLDIR)/mirror.defaults
++	install -c -m $(PLMODE) -g $(GRP) mirror.defaults $(PLDIR)/mirror.defaults.dist
  
  # directory to install .pl (perl library) files for rperl
  RPLDIR = /usr/local/rperl5/lib/perl5
diff --git a/net/mirror/pkg/MESSAGE b/net/mirror/pkg/MESSAGE
new file mode 100644
index 00000000000..63536610b6b
--- /dev/null
+++ b/net/mirror/pkg/MESSAGE
@@ -0,0 +1,6 @@
+$NetBSD: MESSAGE,v 1.1 2000/04/19 16:16:52 kim Exp $
+==============================================================
+
+You may need to customize ${PREFIX}/lib/mirror/mirror.defaults
+
+==============================================================
diff --git a/net/mirror/pkg/PLIST b/net/mirror/pkg/PLIST
index 49b69af0df7..22d4e435602 100644
--- a/net/mirror/pkg/PLIST
+++ b/net/mirror/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 1997/11/06 10:03:42 agc Exp $
+@comment $NetBSD: PLIST,v 1.4 2000/04/19 16:16:52 kim Exp $
 bin/mirror
 bin/do_unlinks
 bin/pkgs_to_mmin
@@ -9,5 +9,6 @@ lib/mirror/lchat.pl
 lib/mirror/dateconv.pl
 lib/mirror/ftp.pl
 lib/mirror/lsparse.pl
-lib/mirror/mirror.defaults
-@dirrm lib/mirror
+lib/mirror/mirror.defaults.dist
+@exec if [ ! -f %D/lib/mirror/mirror.defaults ]; then cp -p %D/lib/mirror/mirror.defaults.dist %D/lib/mirror/mirror.defaults; fi
+@unexec rmdir %D/lib/mirror 2>/dev/null || true