ports/85045: update: mail/nail 11.24 -> 11.25, preserve nail.rc, take maintainership

[Emanuel Haupt]

>Number:         85045
>Category:       ports
>Synopsis:       update: mail/nail 11.24 -> 11.25, preserve nail.rc, take maintainership
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 17 12:50:15 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Emanuel Haupt
>Release:        FreeBSD 4.11-RELEASE-p11 i386
>Organization:
>Environment:
System: FreeBSD admin.critical.ch 4.11-RELEASE-p11 FreeBSD 4.11-RELEASE-p11 #0: Thu Jun 30 09:36:40 CEST 2005 root at admin.critical.ch:/usr/obj/usr/src-release/src/sys/GENERIC i386


	
>Description:
- update: mail/nail 11.24 -> 11.25
- preserve etc/nail.rc if != etc/nail.rc.default
- take maintainership

note:
let me know if you prefer the 3 aditional lines in pkg-plist, i thought pkg-plist
for 4 lines would be overkill

>How-To-Repeat:
	
>Fix:

	



--- nail.patch begins here ---
diff -Nur nail.orig/Makefile nail/Makefile
--- nail.orig/Makefile	Fri Jul 15 09:12:34 2005
+++ nail/Makefile	Wed Aug 17 14:35:39 2005
@@ -1,17 +1,17 @@
 # New ports collection makefile for:	nail
-# Date created:		20 October 2000
-# Whom:			Kris Kennaway <kris at FreeBSD.org>
+# Date created:				20 October 2000
+# Whom:					Kris Kennaway <kris at FreeBSD.org>
 #
 # $FreeBSD: ports/mail/nail/Makefile,v 1.42 2005/07/14 14:41:30 pav Exp $
 #
 
 PORTNAME=	nail
-PORTVERSION=	11.24
+PORTVERSION=	11.25
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	ehaupt at critical.ch
 COMMENT=	BSD mail utility with MIME extensions
 
 USE_BZIP2=	yes
@@ -25,14 +25,20 @@
 		IPv6="-DHAVE_IPv6_FUNCS"
 
 MAN1=		nail.1
-PLIST_FILES=	bin/nail etc/nail.rc
+PLIST_FILES=	bin/nail \
+		"@unexec if cmp -s %D/etc/nail.rc %D/etc/nail.rc.default; then rm -f %D/etc/nail.rc; fi " \
+		"etc/nail.rc.default" \
+		"@exec [ -f %B/nail.rc ] || cp %B/%f %B/nail.rc"
 
 CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/nail ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/nail.rc ${PREFIX}/etc
 	${INSTALL_MAN} ${WRKSRC}/nail.1 ${MANPREFIX}/man/man1
+	${INSTALL_DATA} ${WRKSRC}/nail.rc ${PREFIX}/etc/nail.rc.default
+.if !exists(${PREFIX}/etc/nail.rc)
+	${INSTALL_DATA} ${WRKSRC}/nail.rc ${PREFIX}/etc
+.endif
 
 .include <bsd.port.mk>
diff -Nur nail.orig/distinfo nail/distinfo
--- nail.orig/distinfo	Fri Jul 15 09:12:34 2005
+++ nail/distinfo	Wed Aug 17 14:25:37 2005
@@ -1,2 +1,2 @@
-MD5 (nail-11.24.tar.bz2) = e127cdbba1220a45f6f1f463ac4b4fd1
-SIZE (nail-11.24.tar.bz2) = 266691
+MD5 (nail-11.25.tar.bz2) = 54f42db31911d734fcf37a89b72d4df7
+SIZE (nail-11.25.tar.bz2) = 267959
--- nail.patch ends here ---

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