From nobody@FreeBSD.org  Sat Jan  9 06:21:28 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3B8F9106566C
	for <freebsd-gnats-submit@FreeBSD.org>; Sat,  9 Jan 2010 06:21:28 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 113F78FC0C
	for <freebsd-gnats-submit@FreeBSD.org>; Sat,  9 Jan 2010 06:21:28 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o096LRuW055884
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 9 Jan 2010 06:21:27 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o096LRsU055883;
	Sat, 9 Jan 2010 06:21:27 GMT
	(envelope-from nobody)
Message-Id: <201001090621.o096LRsU055883@www.freebsd.org>
Date: Sat, 9 Jan 2010 06:21:27 GMT
From: Sevan Janiyan <venture37@geeklan.co.uk>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] ftp/p5-Net-FTPServer use $SUB_FILES to dynamically adjust pkg-message
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         142517
>Category:       ports
>Synopsis:       [patch] ftp/p5-Net-FTPServer 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:   Sat Jan 09 06:30:02 UTC 2010
>Closed-Date:    Sun Jan 10 00:36:48 UTC 2010
>Last-Modified:  Sun Jan 10 00:40:02 UTC 2010
>Originator:     Sevan Janiyan
>Release:        
>Organization:
>Environment:
>Description:

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/ftp/p5-Net-FTPServer/Makefile,v
retrieving revision 1.33
diff -u -r1.33 Makefile
--- Makefile	22 Jul 2009 16:26:43 -0000	1.33
+++ Makefile	9 Jan 2010 06:17:30 -0000
@@ -28,7 +28,7 @@
 MAKE_ENV+=	NOCONF=1
 PERL_CONFIGURE=	yes
 
-PKGMESSAGE=	${WRKDIR}/pkg-message
+SUB_FILES=	pkg-message
 
 MAN3=	Net::FTPServer.3 \
 	Net::FTPServer::DBeg1::DirHandle.3 \
@@ -74,7 +74,6 @@
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
-	@${PERL} -p -e 's,PREFIX,${PREFIX},g' ${PKGDIR}/pkg-message > ${PKGMESSAGE}
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
Index: pkg-message
===================================================================
RCS file: pkg-message
diff -N pkg-message
--- pkg-message	23 Aug 2002 22:42:51 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,6 +0,0 @@
---------------------------------------------------------------------------
-You have installed p5-Net-FTPServer, a full-featured ftp daemon written in
-Perl.  For more information, please type `perldoc Net::FTPServer'.  The
-ftpd is installed as PREFIX/sbin/ftpd.pl, with an example config
-file in PREFIX/share/examples/Net-FTPServer.
---------------------------------------------------------------------------
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	9 Jan 2010 06:17:30 -0000
@@ -0,0 +1,6 @@
+--------------------------------------------------------------------------
+You have installed p5-Net-FTPServer, a full-featured ftp daemon written in
+Perl.  For more information, please type `perldoc Net::FTPServer'.  The
+ftpd is installed as %%PREFIX%%/sbin/ftpd.pl, with an example config
+file in %%PREFIX%%/share/examples/Net-FTPServer.
+--------------------------------------------------------------------------


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->perl 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sat Jan 9 06:30:15 UTC 2010 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142517 
Responsible-Changed-From-To: perl->pgollucci 
Responsible-Changed-By: pgollucci 
Responsible-Changed-When: Sat Jan 9 22:24:09 UTC 2010 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142517 
State-Changed-From-To: open->closed 
State-Changed-By: pgollucci 
State-Changed-When: Sun Jan 10 00:36:47 UTC 2010 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/142517: commit references a PR
Date: Sun, 10 Jan 2010 00:36:02 +0000 (UTC)

 pgollucci    2010-01-10 00:35:49 UTC
 
   FreeBSD ports repository
 
   Modified files:
     ftp/p5-Net-FTPServer Makefile 
   Added files:
     ftp/p5-Net-FTPServer/files pkg-message.in 
   Removed files:
     ftp/p5-Net-FTPServer pkg-message 
   Log:
   SUBFILES += pkg-message
   
   PR:             ports/142517
   Submitted by:   Sevan Janiyan <venture37@geeklan.co.uk>
   
   Revision  Changes    Path
   1.34      +1 -2      ports/ftp/p5-Net-FTPServer/Makefile
   1.1       +6 -0      ports/ftp/p5-Net-FTPServer/files/pkg-message.in (new)
   1.3       +0 -6      ports/ftp/p5-Net-FTPServer/pkg-message (dead)
 _______________________________________________
 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"
 
>Unformatted:
