ports/57741: www/middleman removes it's config file on deinstall

[Ceri Davies]

>Number:         57741
>Category:       ports
>Synopsis:       www/middleman removes it's config file on deinstall
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct 08 05:20:14 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Ceri Davies
>Release:        FreeBSD 4.9-RC i386
>Organization:
>Environment:
System: FreeBSD shrike.private.submonkey.net 4.9-RC FreeBSD 4.9-RC #12: Fri Oct 3 21:06:47 BST 2003 setantae at shrike.private.submonkey.net:/usr/obj/usr/src/sys/SHRIKE i386


	
>Description:

	A "make deinstall" of the middleman port causes the configuration file
	to be deleted.  This is really annoying when upgrading the port.
	
>How-To-Repeat:

	# portupgrade middleman

	8< snip 8<

	--->  Deinstalling 'middleman-1.8.3'
	pkg_delete: '/usr/local/etc/mman.xml' fails original MD5 checksum - deleted anyway.

	
>Fix:


Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/www/middleman/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- Makefile	4 Oct 2003 12:29:06 -0000	1.13
+++ Makefile	8 Oct 2003 12:16:37 -0000
@@ -51,7 +51,7 @@
 	${INSTALL_MAN} ${WRKSRC}/man/mman.8 ${MANPREFIX}/man/man8
 	${INSTALL_PROGRAM} ${WRKSRC}/mman ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/config.xml \
-		${PREFIX}/etc/mman.xml
+		${PREFIX}/etc/mman.xml.dist
 	${INSTALL_DATA} ${WRKSRC}/scripts/mman.init \
 		${PREFIX}/etc/rc.d/mman.sh.sample
 .if !defined(NOPORTDOCS)
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/middleman/pkg-plist,v
retrieving revision 1.3
diff -u -r1.3 pkg-plist
--- pkg-plist	16 Jul 2003 08:42:44 -0000	1.3
+++ pkg-plist	8 Oct 2003 12:16:46 -0000
@@ -1,6 +1,6 @@
 bin/mman
 etc/rc.d/mman.sh.sample
-etc/mman.xml
+etc/mman.xml.dist
 %%PORTDOCS%%%%DOCSDIR%%/README.html
 %%PORTDOCS%%%%DOCSDIR%%/filter.pl
 %%PORTDOCS%%@dirrm %%DOCSDIR%%

>Release-Note:
>Audit-Trail:
>Unformatted: