ports/142731: [PATCH] mail/dbmail: use $SUB_FILES to dynamically adjust pkg-message

[Sevan Janiyan]

>Number:         142731
>Category:       ports
>Synopsis:       [PATCH] mail/dbmail: use $SUB_FILES to dynamically adjust pkg-message
>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:   Mon Jan 11 23:20:03 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Sevan Janiyan
>Release:        FreeBSD 8.0-RELEASE-p2 amd64
>Organization:
>Environment:
System: FreeBSD newbie.thingamajig-systems.co.uk 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #0: Tue Jan  5 21:11:58 UTC
>Description:
No need to invoke sed manually.

Added file(s):
- files/pkg-message.in

Removed file(s):
- pkg-message

Port maintainer (mark_sf at kikg.ifmo.ru) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- dbmail-2.1.7_3.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/dbmail21/Makefile,v
retrieving revision 1.37
diff -u -r1.37 Makefile
--- Makefile	2 Aug 2009 19:34:32 -0000	1.37
+++ Makefile	11 Jan 2010 23:09:10 -0000
@@ -48,8 +48,7 @@
 		dbmail-pop3d.8 dbmail-sievecmd.8 dbmail-timsieved.8 \
 		dbmail-users.8 dbmail-util.8
 MANCOMPRESSED=	no
-MSG_FILE=	${PKGDIR}/pkg-message
-PKGMESSAGE=	${WRKDIR}/pkg-message
+SUB_FILES=	pkg-message
 LATEST_LINK=	dbmail21
 
 PLIST_SUB+=	PORTNAME=${PORTNAME}
@@ -108,8 +107,6 @@
 post-patch:
 	@${FIND} ${WRKSRC} -name CVS -type d | ${XARGS} ${RM} -fr
 	@${FIND} ${WRKSRC} -name *.orig -type f | ${XARGS} ${RM} -fr
-	${SED}  -e 's|%%DATADIR%%|${DATADIR}|g' \
-	        ${MSG_FILE} > ${PKGMESSAGE}
 
 post-configure:
 	@${REINPLACE_CMD} -i.orig 's!/etc/dbmail.conf!${PREFIX}/etc/dbmail.conf!g' \
Index: pkg-message
===================================================================
RCS file: pkg-message
diff -N pkg-message
--- pkg-message	23 Nov 2006 13:55:03 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-
-IMPORTANT NOTE FOR ADMINS UPGRADING FROM 1.X->2.X!!!
-
-	*) Don't forget to update the database using a script from
-	   %%DATADIR%%/
-	*) Many programs have been renamed and their arguments changed.
-	*) Read the upgrading notes.
-	*) Don't be careless with this upgrade or mail will be lost!
-	*) dbmail can be controled by setting dbmail_imapd_enable,
-	   dbmail_lmtpd_enable, and/or dbmail_pop3d_enable in
-	   /etc/rc.conf.
-
Index: files/pkg-message.in
===================================================================
RCS file: files/pkg-message.in
diff -N files/pkg-message.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/pkg-message.in	11 Jan 2010 23:09:10 -0000
@@ -0,0 +1,12 @@
+
+IMPORTANT NOTE FOR ADMINS UPGRADING FROM 1.X->2.X!!!
+
+	*) Don't forget to update the database using a script from
+	   %%DATADIR%%/
+	*) Many programs have been renamed and their arguments changed.
+	*) Read the upgrading notes.
+	*) Don't be careless with this upgrade or mail will be lost!
+	*) dbmail can be controled by setting dbmail_imapd_enable,
+	   dbmail_lmtpd_enable, and/or dbmail_pop3d_enable in
+	   /etc/rc.conf.
+
--- dbmail-2.1.7_3.patch ends here ---

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