From sevan@newbie.thingamajig-systems.co.uk  Mon Jan 11 23:13:09 2010
Return-Path: <sevan@newbie.thingamajig-systems.co.uk>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 38C281065695
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 11 Jan 2010 23:13:09 +0000 (UTC)
	(envelope-from sevan@newbie.thingamajig-systems.co.uk)
Received: from newbie.thingamajig-systems.co.uk (newbie.thingamajig-systems.co.uk [93.97.185.103])
	by mx1.freebsd.org (Postfix) with ESMTP id 6704F8FC0A
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 11 Jan 2010 23:13:07 +0000 (UTC)
Received: from newbie.thingamajig-systems.co.uk (localhost [127.0.0.1])
	by newbie.thingamajig-systems.co.uk (8.14.3/8.14.3) with ESMTP id o0BN9JP8003008;
	Mon, 11 Jan 2010 23:09:19 GMT
	(envelope-from sevan@newbie.thingamajig-systems.co.uk)
Received: (from root@localhost)
	by newbie.thingamajig-systems.co.uk (8.14.3/8.14.3/Submit) id o0BN9JYk003007;
	Mon, 11 Jan 2010 23:09:19 GMT
	(envelope-from sevan)
Message-Id: <201001112309.o0BN9JYk003007@newbie.thingamajig-systems.co.uk>
Date: Mon, 11 Jan 2010 23:09:19 GMT
From: Sevan Janiyan <venture37@geeklan.co.uk>
To: FreeBSD-gnats-submit@freebsd.org
Cc: mark_sf@kikg.ifmo.ru
Subject: [PATCH] mail/dbmail: use $SUB_FILES to dynamically adjust pkg-message
X-Send-Pr-Version: 3.113
X-GNATS-Notify: mark_sf@kikg.ifmo.ru

>Number:         142731
>Category:       ports
>Synopsis:       [PATCH] mail/dbmail: use $SUB_FILES to dynamically adjust pkg-message
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pgollucci
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 11 23:20:03 UTC 2010
>Closed-Date:    Sun Jan 31 03:54:29 UTC 2010
>Last-Modified:  Sun Jan 31 03:54:29 UTC 2010
>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@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:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Mon Jan 11 23:20:17 UTC 2010 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142731 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: mark_sf@kikg.ifmo.ru
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/142731: [PATCH] mail/dbmail: use $SUB_FILES to dynamically adjust pkg-message
Date: Mon, 11 Jan 2010 23:20:15 UT

 Maintainer of mail/dbmail,
 
 Please note that PR ports/142731 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/142731
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
Responsible-Changed-From-To: freebsd-ports-bugs->pgollucci 
Responsible-Changed-By: pgollucci 
Responsible-Changed-When: Tue Jan 12 00:58:49 UTC 2010 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142731 

From: Mark Starovoytov <mark_sf@kikg.ifmo.ru>
To: Edwin Groothuis <bug-followup@FreeBSD.ORG>
Cc:  
Subject: Re[2]: ports/142731: [PATCH] mail/dbmail: use $SUB_FILES to dynamically adjust pkg-message
Date: Sat, 16 Jan 2010 22:25:43 +0300

 approved.
 
 -- 
 Best regards,
  Mark
 
State-Changed-From-To: feedback->open 
State-Changed-By: pgollucci 
State-Changed-When: Sun Jan 17 00:31:47 UTC 2010 
State-Changed-Why:  
Maintainer has approved. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142731 
State-Changed-From-To: open->feedback 
State-Changed-By: pgollucci 
State-Changed-When: Mon Jan 18 00:24:12 UTC 2010 
State-Changed-Why:  
Ask for submitter fix. 

Script started on Sun Jan 17 19:20:07 2010
[07:20 PM](2)pgollucci@frieza.p6m7g8.net j0 h1 c501
/pr/mail/dbmail
getpr 142731
[07:20 PM](2)pgollucci@frieza.p6m7g8.net j0 h2 c502
/pr/mail/dbmail
prpatch
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|
|--- 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
--------------------------
Patching file Makefile using Plan A...
Hunk #1 failed at 48.
Hunk #2 failed at 107.
2 out of 2 hunks failed--saving rejects to Makefile.rej
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|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
--------------------------
File to patch: files/pkg-message.in
Patching file files/pkg-message.in using Plan A...
Hunk #1 failed at 0.
1 out of 1 hunks failed--saving rejects to files/pkg-message.in.rej
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|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
--------------------------
Patching file files/pkg-message.in using Plan A...
Hunk #1 succeeded at 1.
Hmm...  Ignoring the trailing garbage.
done
./files/pkg-message.in.orig
./Makefile.orig
./files/pkg-message.in.rej
./Makefile.rej
Script done on Sun Jan 17 19:20:48 2010


http://www.freebsd.org/cgi/query-pr.cgi?pr=142731 

From: Mark Starovoytov <mark_sf@kikg.ifmo.ru>
To: bug-followup@FreeBSD.org, pgollucci@FreeBSD.org
Cc:  
Subject: Re: ports/142731: [PATCH] mail/dbmail: use $SUB_FILES to dynamically adjust pkg-message
Date: Mon, 18 Jan 2010 14:04:50 +0300

 ------------7D16116F2AFB320D
 Content-Type: text/plain; charset=windows-1251
 Content-Transfer-Encoding: 8bit
 
 try this patch.
 
 -- 
 Best regards,
  Mark
 ------------7D16116F2AFB320D
 Content-Type: application/octet-stream;
  name="dbmail21-2.1.7_3.patch"
 Content-transfer-encoding: base64
 Content-Disposition: attachment;
  filename="dbmail21-2.1.7_3.patch"
 
 ZGlmZiAtdXJOIGRibWFpbDIxL01ha2VmaWxlIGRibWFpbDIxL01ha2VmaWxlCi0tLSBkYm1h
 aWwyMS9NYWtlZmlsZQkyMDA5LTA4LTAyIDIzOjM0OjMyLjAwMDAwMDAwMCArMDQwMAorKysg
 ZGJtYWlsMjEvTWFrZWZpbGUJMjAxMC0wMS0xOCAxMzo0OTo0MC4wMDAwMDAwMDAgKzAzMDAK
 QEAgLTQ4LDggKzQ4LDcgQEAKIAkJZGJtYWlsLXBvcDNkLjggZGJtYWlsLXNpZXZlY21kLjgg
 ZGJtYWlsLXRpbXNpZXZlZC44IFwKIAkJZGJtYWlsLXVzZXJzLjggZGJtYWlsLXV0aWwuOAog
 TUFOQ09NUFJFU1NFRD0Jbm8KLU1TR19GSUxFPQkke1BLR0RJUn0vcGtnLW1lc3NhZ2UKLVBL
 R01FU1NBR0U9CSR7V1JLRElSfS9wa2ctbWVzc2FnZQorU1VCX0ZJTEVTPQlwa2ctbWVzc2Fn
 ZQogTEFURVNUX0xJTks9CWRibWFpbDIxCiAKIFBMSVNUX1NVQis9CVBPUlROQU1FPSR7UE9S
 VE5BTUV9CkBAIC0xMDgsOCArMTA3LDYgQEAKIHBvc3QtcGF0Y2g6CiAJQCR7RklORH0gJHtX
 UktTUkN9IC1uYW1lIENWUyAtdHlwZSBkIHwgJHtYQVJHU30gJHtSTX0gLWZyCiAJQCR7RklO
 RH0gJHtXUktTUkN9IC1uYW1lICoub3JpZyAtdHlwZSBmIHwgJHtYQVJHU30gJHtSTX0gLWZy
 Ci0JJHtTRUR9ICAtZSAnc3wlJURBVEFESVIlJXwke0RBVEFESVJ9fGcnIFwKLQkgICAgICAg
 ICR7TVNHX0ZJTEV9ID4gJHtQS0dNRVNTQUdFfQogCiBwb3N0LWNvbmZpZ3VyZToKIAlAJHtS
 RUlOUExBQ0VfQ01EfSAtaS5vcmlnICdzIS9ldGMvZGJtYWlsLmNvbmYhJHtQUkVGSVh9L2V0
 Yy9kYm1haWwuY29uZiFnJyBcCmRpZmYgLXVyTiBkYm1haWwyMS9maWxlcy9wa2ctbWVzc2Fn
 ZS5pbiBkYm1haWwyMS9maWxlcy9wa2ctbWVzc2FnZS5pbgotLS0gZGJtYWlsMjEvZmlsZXMv
 cGtnLW1lc3NhZ2UuaW4JMTk3MC0wMS0wMSAwMzowMDowMC4wMDAwMDAwMDAgKzAzMDAKKysr
 IGRibWFpbDIxL2ZpbGVzL3BrZy1tZXNzYWdlLmluCTIwMTAtMDEtMTggMTM6NDk6NDAuMDAw
 MDAwMDAwICswMzAwCkBAIC0wLDAgKzEsMTIgQEAKKworSU1QT1JUQU5UIE5PVEUgRk9SIEFE
 TUlOUyBVUEdSQURJTkcgRlJPTSAxLlgtPjIuWCEhIQorCisJKikgRG9uJ3QgZm9yZ2V0IHRv
 IHVwZGF0ZSB0aGUgZGF0YWJhc2UgdXNpbmcgYSBzY3JpcHQgZnJvbQorCSAgICUlREFUQURJ
 UiUlLworCSopIE1hbnkgcHJvZ3JhbXMgaGF2ZSBiZWVuIHJlbmFtZWQgYW5kIHRoZWlyIGFy
 Z3VtZW50cyBjaGFuZ2VkLgorCSopIFJlYWQgdGhlIHVwZ3JhZGluZyBub3Rlcy4KKwkqKSBE
 b24ndCBiZSBjYXJlbGVzcyB3aXRoIHRoaXMgdXBncmFkZSBvciBtYWlsIHdpbGwgYmUgbG9z
 dCEKKwkqKSBkYm1haWwgY2FuIGJlIGNvbnRyb2xlZCBieSBzZXR0aW5nIGRibWFpbF9pbWFw
 ZF9lbmFibGUsCisJICAgZGJtYWlsX2xtdHBkX2VuYWJsZSwgYW5kL29yIGRibWFpbF9wb3Az
 ZF9lbmFibGUgaW4KKwkgICAvZXRjL3JjLmNvbmYuCisKZGlmZiAtdXJOIGRibWFpbDIxL3Br
 Zy1tZXNzYWdlIGRibWFpbDIxL3BrZy1tZXNzYWdlCi0tLSBkYm1haWwyMS9wa2ctbWVzc2Fn
 ZQkyMDA2LTExLTIzIDE2OjU1OjAzLjAwMDAwMDAwMCArMDMwMAorKysgZGJtYWlsMjEvcGtn
 LW1lc3NhZ2UJMjAxMC0wMS0xOCAxMzo0OTo0MC4wMDAwMDAwMDAgKzAzMDAKQEAgLTEsMTIg
 KzAsMCBAQAotCi1JTVBPUlRBTlQgTk9URSBGT1IgQURNSU5TIFVQR1JBRElORyBGUk9NIDEu
 WC0+Mi5YISEhCi0KLQkqKSBEb24ndCBmb3JnZXQgdG8gdXBkYXRlIHRoZSBkYXRhYmFzZSB1
 c2luZyBhIHNjcmlwdCBmcm9tCi0JICAgJSVEQVRBRElSJSUvCi0JKikgTWFueSBwcm9ncmFt
 cyBoYXZlIGJlZW4gcmVuYW1lZCBhbmQgdGhlaXIgYXJndW1lbnRzIGNoYW5nZWQuCi0JKikg
 UmVhZCB0aGUgdXBncmFkaW5nIG5vdGVzLgotCSopIERvbid0IGJlIGNhcmVsZXNzIHdpdGgg
 dGhpcyB1cGdyYWRlIG9yIG1haWwgd2lsbCBiZSBsb3N0IQotCSopIGRibWFpbCBjYW4gYmUg
 Y29udHJvbGVkIGJ5IHNldHRpbmcgZGJtYWlsX2ltYXBkX2VuYWJsZSwKLQkgICBkYm1haWxf
 bG10cGRfZW5hYmxlLCBhbmQvb3IgZGJtYWlsX3BvcDNkX2VuYWJsZSBpbgotCSAgIC9ldGMv
 cmMuY29uZi4KLQo=
 ------------7D16116F2AFB320D--
 
State-Changed-From-To: feedback->open 
State-Changed-By: pgollucci 
State-Changed-When: Sun Jan 31 00:37:19 UTC 2010 
State-Changed-Why:  
Maintainer timeout > 14 days 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142731 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/142731: commit references a PR
Date: Sun, 31 Jan 2010 03:44:50 +0000 (UTC)

 pgollucci    2010-01-31 03:44:04 UTC
 
   FreeBSD ports repository
 
   Modified files:
     mail/dbmail/files    pkg-message.in 
   Log:
   - use $SUB_FILES to dynamically adjust pkg-message
   
   PR:             ports/142731
   Submitted by:   Sevan Janiyan <venture37@geeklan.co.uk>
   Approved by:    maintainer timeout (mark_sf@kikg.ifmo.ru; > 2 weeks)
   
   Revision  Changes    Path
   1.2       +12 -0     ports/mail/dbmail/files/pkg-message.in
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: pgollucci 
State-Changed-When: Sun Jan 31 03:54:28 UTC 2010 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142731 
>Unformatted:
