From sevan@newbie.thingamajig-systems.co.uk  Thu Jan 14 02:33:03 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 87850106566B
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 14 Jan 2010 02:33:03 +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 C87E98FC08
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 14 Jan 2010 02:33:02 +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 o0E2T6DX006004
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 14 Jan 2010 02:29:06 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 o0E2T6bi006003;
	Thu, 14 Jan 2010 02:29:06 GMT
	(envelope-from sevan)
Message-Id: <201001140229.o0E2T6bi006003@newbie.thingamajig-systems.co.uk>
Date: Thu, 14 Jan 2010 02:29:06 GMT
From: Sevan Janiyan <venture37@geeklan.co.uk>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] mail/smtpfeed: use SUB_FILES & DOCSDIR
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         142806
>Category:       ports
>Synopsis:       [PATCH] mail/smtpfeed: use SUB_FILES & DOCSDIR
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pgollucci
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jan 14 02:40:01 UTC 2010
>Closed-Date:    Sun Jan 31 03:54:41 UTC 2010
>Last-Modified:  Sun Jan 31 03:54:41 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:
Use SUB_FILES to update pkg-message
Use DOCSDIR in pkg-plist

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

Removed file(s):
- pkg-message

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

--- smtpfeed-1.20.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/smtpfeed/Makefile,v
retrieving revision 1.41
diff -u -r1.41 Makefile
--- Makefile	7 Nov 2003 09:28:12 -0000	1.41
+++ Makefile	14 Jan 2010 02:27:54 -0000
@@ -13,7 +13,7 @@
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	SMTP Fast Exploding External Deliverer for Sendmail
 
-NO_PACKAGE=	"complex configuration for sendmail.cf needed"
+NO_PACKAGE=	complex configuration for sendmail.cf needed
 
 GNU_CONFIGURE=	yes
 
@@ -24,6 +24,8 @@
 		OPTIONS OPTIONS.j README README.j RELEASE.NOTE SIGNAL \
 		SIGNAL.j TODO smtpfeed.html
 
+SUB_FILES=	pkg-message
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/smtpfeed ${PREFIX}/libexec
 	${INSTALL_MAN} ${WRKSRC}/smtpfeed.8 ${MANPREFIX}/man/man8
@@ -33,6 +35,6 @@
 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
-	@${SED} -e 's#/usr/local#${PREFIX}#' ${PKGMESSAGE}
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
Index: pkg-message
===================================================================
RCS file: pkg-message
diff -N pkg-message
--- pkg-message	23 Aug 2003 01:35:58 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-**************************************************************
-smtpfeed is installed into /usr/local/libexec/smtpfeed.
-You'll need to perform 2 steps, (a) to (b), to make smtpfeed
-work:
-	(a) replace /etc/mail/sendmail.cf
-	(b) setting up /etc/syslog.conf
-
-(a) depends on what kind of configuration tool you are using
-with sendmail.cf.  Read through documentation in
-/usr/local/share/doc/smtpfeed for details.
-(b) see file named INSTALL in
-/usr/local/share/doc/smtpfeed for details.
-**************************************************************
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/mail/smtpfeed/pkg-plist,v
retrieving revision 1.5
diff -u -r1.5 pkg-plist
--- pkg-plist	23 Aug 2003 01:35:58 -0000	1.5
+++ pkg-plist	14 Jan 2010 02:27:54 -0000
@@ -1,20 +1,20 @@
 libexec/smtpfeed
-%%PORTDOCS%%share/doc/smtpfeed/COPYRIGHT
-%%PORTDOCS%%share/doc/smtpfeed/FEATURES
-%%PORTDOCS%%share/doc/smtpfeed/FEATURES.j
-%%PORTDOCS%%share/doc/smtpfeed/FYI
-%%PORTDOCS%%share/doc/smtpfeed/FYI.j
-%%PORTDOCS%%share/doc/smtpfeed/INSTALL
-%%PORTDOCS%%share/doc/smtpfeed/INSTALL.j
-%%PORTDOCS%%share/doc/smtpfeed/ML-ADMIN
-%%PORTDOCS%%share/doc/smtpfeed/ML-ADMIN.j
-%%PORTDOCS%%share/doc/smtpfeed/OPTIONS
-%%PORTDOCS%%share/doc/smtpfeed/OPTIONS.j
-%%PORTDOCS%%share/doc/smtpfeed/README
-%%PORTDOCS%%share/doc/smtpfeed/README.j
-%%PORTDOCS%%share/doc/smtpfeed/RELEASE.NOTE
-%%PORTDOCS%%share/doc/smtpfeed/SIGNAL
-%%PORTDOCS%%share/doc/smtpfeed/SIGNAL.j
-%%PORTDOCS%%share/doc/smtpfeed/TODO
-%%PORTDOCS%%share/doc/smtpfeed/smtpfeed.html
-%%PORTDOCS%%@dirrm share/doc/smtpfeed
+%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
+%%PORTDOCS%%%%DOCSDIR%%/FEATURES
+%%PORTDOCS%%%%DOCSDIR%%/FEATURES.j
+%%PORTDOCS%%%%DOCSDIR%%/FYI
+%%PORTDOCS%%%%DOCSDIR%%/FYI.j
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.j
+%%PORTDOCS%%%%DOCSDIR%%/ML-ADMIN
+%%PORTDOCS%%%%DOCSDIR%%/ML-ADMIN.j
+%%PORTDOCS%%%%DOCSDIR%%/OPTIONS
+%%PORTDOCS%%%%DOCSDIR%%/OPTIONS.j
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.j
+%%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTE
+%%PORTDOCS%%%%DOCSDIR%%/SIGNAL
+%%PORTDOCS%%%%DOCSDIR%%/SIGNAL.j
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/smtpfeed.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
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	14 Jan 2010 02:27:54 -0000
@@ -0,0 +1,13 @@
+**************************************************************
+smtpfeed is installed into %%PREFIX%%/libexec/smtpfeed.
+You'll need to perform 2 steps, (a) to (b), to make smtpfeed
+work:
+	(a) replace /etc/mail/sendmail.cf
+	(b) setting up /etc/syslog.conf
+
+(a) depends on what kind of configuration tool you are using
+with sendmail.cf.  Read through documentation in
+%%DOCSDIR%% for details.
+(b) see file named INSTALL in
+%%DOCSDIR%% for details.
+**************************************************************
--- smtpfeed-1.20.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->pgollucci 
Responsible-Changed-By: pgollucci 
Responsible-Changed-When: Thu Jan 14 02:55:45 UTC 2010 
Responsible-Changed-Why:  
I'll take it. 

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

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

 pgollucci    2010-01-31 03:44:46 UTC
 
   FreeBSD ports repository
 
   Modified files:
     mail/smtpfeed        Makefile pkg-plist 
   Added files:
     mail/smtpfeed/files  pkg-message.in 
   Removed files:
     mail/smtpfeed        pkg-message 
   Log:
   - use SUB_FILES & DOCSDIR
   
   PR:             ports/142806
   Submitted by:   Sevan Janiyan <venture37@geeklan.co.uk>
   
   Revision  Changes    Path
   1.42      +4 -2      ports/mail/smtpfeed/Makefile
   1.1       +13 -0     ports/mail/smtpfeed/files/pkg-message.in (new)
   1.4       +0 -13     ports/mail/smtpfeed/pkg-message (dead)
   1.6       +19 -19    ports/mail/smtpfeed/pkg-plist
 _______________________________________________
 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:40 UTC 2010 
State-Changed-Why:  
Committed. Thanks! 

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