Let the default configuration file be installed as "wwwoffle.conf.install",

rather than "wwwoffle.conf.default", so that wwwoffle-upgrade-config*.pl
can use it to populate the new config file with comments (and to minimize
gratuitious changes).

4 files changed, 19 insertions, 13 deletions

diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile
index b3bd1a10269..1267f7d9420 100644
--- a/www/wwwoffle/Makefile
+++ b/www/wwwoffle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2001/08/14 04:51:46 fredb Exp $
+# $NetBSD: Makefile,v 1.32 2001/08/18 20:31:13 fredb Exp $
 
 DISTNAME=	wwwoffle-2.6d
 CATEGORIES=	www
@@ -51,12 +51,9 @@ pre-install:
 	fi
 
 post-install:
-	if [ -f ${PREFIX}/etc/wwwoffle/wwwoffle.conf.install ]; then \
-	  ${MV} ${PREFIX}/etc/wwwoffle/wwwoffle.conf.install \
-		${PREFIX}/etc/wwwoffle/wwwoffle.conf.default; \
-	else \
-	  ${CP} -p ${PREFIX}/etc/wwwoffle/wwwoffle.conf \
-	    ${PREFIX}/etc/wwwoffle/wwwoffle.conf.default; \
+	if [ ! -f ${PREFIX}/etc/wwwoffle/wwwoffle.conf.install ]; then \
+		${CP} -p ${PREFIX}/etc/wwwoffle/wwwoffle.conf \
+		  ${PREFIX}/etc/wwwoffle/wwwoffle.conf.install; \
 	fi
 	${INSTALL_PROGRAM} ${WRKSRC}/convert-cache \
 	  ${PREFIX}/sbin/wwwoffle-convert-cache
diff --git a/www/wwwoffle/distinfo b/www/wwwoffle/distinfo
index b691b4310e2..121c6bdccf8 100644
--- a/www/wwwoffle/distinfo
+++ b/www/wwwoffle/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2001/08/18 20:04:08 fredb Exp $
+$NetBSD: distinfo,v 1.6 2001/08/18 20:31:14 fredb Exp $
 
 SHA1 (wwwoffle-2.6d.tgz) = abb7cdfb03dfffb3ae777753938068c25e390c63
 Size (wwwoffle-2.6d.tgz) = 645469 bytes
-SHA1 (patch-aa) = ff6a4f4386a0894a941021340c56aa112c7b7b50
+SHA1 (patch-aa) = ed2b9ad709b1ad849517e241fb8fb8c8d375662f
 SHA1 (patch-ac) = 14c3cbff4c9bf2ecf0cf97222db43a3339cecaf2
diff --git a/www/wwwoffle/patches/patch-aa b/www/wwwoffle/patches/patch-aa
index 33bd0bcb5b5..5c8a43c4216 100644
--- a/www/wwwoffle/patches/patch-aa
+++ b/www/wwwoffle/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.14 2001/08/14 04:51:46 fredb Exp $
+$NetBSD: patch-aa,v 1.15 2001/08/18 20:31:15 fredb Exp $
 
 --- Makefile.orig	Tue May 29 13:29:03 2001
 +++ Makefile
@@ -95,3 +95,12 @@ $NetBSD: patch-aa,v 1.14 2001/08/14 04:51:46 fredb Exp $
  
  ####
  
+@@ -396,7 +396,7 @@
+ 	@[ ! -f $(CONFDIR)/wwwoffle.conf ] || \
+ 	 (echo "WWWOFFLE: " ;\
+ 	  echo "WWWOFFLE: There is already a config file $(CONFDIR)/wwwoffle.conf." ;\
+-	  echo "WWWOFFLE: Run 'upgrade-config.pl $(CONFDIR)/wwwoffle.conf' to upgrade it." ;\
++	  echo "WWWOFFLE: Run 'wwwoffle-upgrade-config.pl $(CONFDIR)/wwwoffle.conf' to upgrade it." ;\
+ 	  echo "WWWOFFLE: " )
+ 	[  ! -f $(CONFDIR)/wwwoffle.conf ] || $(INSTALL) -c -m 640 wwwoffle.conf.install $(CONFDIR)/wwwoffle.conf.install
+ 	[    -f $(CONFDIR)/wwwoffle.conf ] || $(INSTALL) -c -m 640 wwwoffle.conf.install $(CONFDIR)/wwwoffle.conf
diff --git a/www/wwwoffle/pkg/PLIST b/www/wwwoffle/pkg/PLIST
index 70dc0dfe274..8e9c48c4ddf 100644
--- a/www/wwwoffle/pkg/PLIST
+++ b/www/wwwoffle/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2001/04/13 13:46:35 itojun Exp $
+@comment $NetBSD: PLIST,v 1.13 2001/08/18 20:31:15 fredb Exp $
 bin/wwwoffle
 bin/wwwoffle-ls
 bin/wwwoffle-mv
@@ -8,8 +8,8 @@ bin/wwwoffle-tools
 bin/wwwoffle-write
 etc/rc.d/wwwoffle
 etc/rc.d/wwwoffled
-etc/wwwoffle/wwwoffle.conf.default
-@exec if [ ! -f %D/etc/wwwoffle/wwwoffle.conf ]; then cp -p %D/etc/wwwoffle/wwwoffle.conf.default %D/etc/wwwoffle/wwwoffle.conf; fi
+etc/wwwoffle/wwwoffle.conf.install
+@exec if [ ! -f %D/etc/wwwoffle/wwwoffle.conf ]; then cp -p %D/etc/wwwoffle/wwwoffle.conf.install %D/etc/wwwoffle/wwwoffle.conf; fi
 libdata/wwwoffle-spool.tar.gz
 man/man1/wwwoffle.1
 man/man5/wwwoffle.conf.5