Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 9 Jan 2010 06:21:27 GMT
From:      Sevan Janiyan <venture37@geeklan.co.uk>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/142517: [patch] ftp/p5-Net-FTPServer use $SUB_FILES to dynamically adjust pkg-message
Message-ID:  <201001090621.o096LRsU055883@www.freebsd.org>
Resent-Message-ID: <201001090630.o096U3hU039575@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>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:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 09 06:30:02 UTC 2010
>Closed-Date:
>Last-Modified:
>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:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001090621.o096LRsU055883>