Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 20 Apr 2005 08:39:59 -0300 (BRST)
From:      Renato Botelho <freebsd@galle.com.br>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        yasuf@big.or.jp
Subject:   ports/80141: [PATCH] ftp/ftpmirror: Unbreak, pacify portlint
Message-ID:  <200504201139.j3KBdxkE032904@data.galle.com.br>
Resent-Message-ID: <200504201150.j3KBoM4q065451@freefall.freebsd.org>

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

>Number:         80141
>Category:       ports
>Synopsis:       [PATCH] ftp/ftpmirror: Unbreak, pacify portlint
>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:   Wed Apr 20 11:50:21 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Renato Botelho
>Release:        FreeBSD 5.3-RELEASE-p9 i386
>Organization:
Galle Folheados - http://www.galle.com.br
>Environment:
System: FreeBSD data.galle.com.br 5.3-RELEASE-p9 FreeBSD 5.3-RELEASE-p9 #9: Fri Apr 15 07:52:00 BRST 2005
>Description:
- Patch Makefile.in to use pure_install instead install and unbreak the port
- Change perl to ${PERL}
- Use PORTDOCS and DOCSDIR on pkg-plist
- Rename patch-aa to patch-Fan_Fan.pm to reflect which file is patched

Added file(s):
- files/patch-Fan_Fan.pm
- files/patch-Makefile.in

Removed file(s):
- files/patch-aa

Port maintainer (yasuf@big.or.jp) is cc'd.

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

--- ftpmirror-1.96_3.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/ftp/ftpmirror/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- Makefile	28 Feb 2005 00:26:38 -0000	1.13
+++ Makefile	20 Apr 2005 11:37:26 -0000
@@ -16,17 +16,15 @@
 
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Socket6.pm:${PORTSDIR}/net/p5-Socket6
 
-BROKEN=		Installs perllocal.pod file
-
 USE_PERL5=	YES
 GNU_CONFIGURE=	YES
 
 CONFIGURE_ENV+=	PERL="${PERL}" INSTALL_PROGRAM="${INSTALL_SCRIPT}"
 
 post-configure:
-	perl -i.bak -pe 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/Fan/Fan.pm
+	${PERL} -i.bak -pe 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/Fan/Fan.pm
 .for f in ftpmirror rotate
-	perl -i.bak -pe 's,^#!.*$$,#!${PERL}, if $$. == 1' ${WRKSRC}/${f}
+	${PERL} -i.bak -pe 's,^#!.*$$,#!${PERL}, if $$. == 1' ${WRKSRC}/${f}
 .endfor
 
 post-install:
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/ftp/ftpmirror/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- pkg-plist	24 Oct 2003 12:02:24 -0000	1.2
+++ pkg-plist	20 Apr 2005 11:37:26 -0000
@@ -278,6 +278,6 @@
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Usage
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Fan
-share/doc/ftpmirror/README.jis
-share/doc/ftpmirror/RELEASE.jis
-@dirrm share/doc/ftpmirror
+%%PORTDOCS%%%%DOCSDIR%%/README.jis
+%%PORTDOCS%%%%DOCSDIR%%/RELEASE.jis
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: files/patch-Fan_Fan.pm
===================================================================
RCS file: files/patch-Fan_Fan.pm
diff -N files/patch-Fan_Fan.pm
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-Fan_Fan.pm	20 Apr 2005 11:37:26 -0000
@@ -0,0 +1,11 @@
+--- Fan/Fan.pm.orig	Sun Nov 21 17:24:27 1999
++++ Fan/Fan.pm	Wed Jan 12 13:28:20 2000
+@@ -48,7 +48,7 @@
+ 
+ ;# Where configuration files are.
+ BEGIN {
+-	$sysconfdir = "/usr/local/etc";
++	$sysconfdir = '%%PREFIX%%/etc';
+ }
+ 
+ ;#
Index: files/patch-Makefile.in
===================================================================
RCS file: files/patch-Makefile.in
diff -N files/patch-Makefile.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-Makefile.in	20 Apr 2005 11:37:26 -0000
@@ -0,0 +1,17 @@
+--- Makefile.in.orig	Wed Apr 20 08:24:33 2005
++++ Makefile.in	Wed Apr 20 08:26:40 2005
+@@ -40,10 +40,13 @@
+ 	${INSTALL_DATA} $? $@
+ 
+ # for subdirectories...
+-all clean realclean install:: Fan/Makefile
++all clean realclean:: Fan/Makefile
+ 	@ for d in ${SUBDIR} ; do \
+ 		( echo "make $@ in $$d..." && cd $$d && make $@ ) ; \
+ 	done
++
++install:: Fan/Makefile
++	( echo "make pure_install in Fan..." && cd Fan && make pure_install ) ; \
+ 
+ # Fan subdirectory requres Makefile first.
+ Fan/Makefile:: Fan/Makefile.PL
Index: files/patch-aa
===================================================================
RCS file: files/patch-aa
diff -N files/patch-aa
--- files/patch-aa	29 Feb 2000 02:32:11 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- Fan/Fan.pm.orig	Sun Nov 21 17:24:27 1999
-+++ Fan/Fan.pm	Wed Jan 12 13:28:20 2000
-@@ -48,7 +48,7 @@
- 
- ;# Where configuration files are.
- BEGIN {
--	$sysconfdir = "/usr/local/etc";
-+	$sysconfdir = '%%PREFIX%%/etc';
- }
- 
- ;#
--- ftpmirror-1.96_3.patch ends here ---

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



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