Unbreak ftp/ftplocate

PR:		ports/46324
Submitted by:	Michael L. Hostbaek <mich@freebsdcluster.org>

3 files changed, 42 insertions, 42 deletions

diff --git a/ftp/ftplocate/Makefile b/ftp/ftplocate/Makefile
index e08294b5ec99..fba548857f4c 100644
--- a/ftp/ftplocate/Makefile
+++ b/ftp/ftplocate/Makefile
@@ -13,13 +13,13 @@ MASTER_SITES=	ftp://ftp.ee.ncku.edu.tw/pub/ftplocate/
 
 MAINTAINER=	tung@turtle.ee.ncku.edu.tw
 
-BROKEN=		"Incorrect pkg-plist"
-
 BUILD_DEPENDS=  ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
 RUN_DEPENDS=	glimpse:${PORTSDIR}/textproc/glimpse \
 		unzip:${PORTSDIR}/archivers/unzip
 
-USE_PERL5=	yes
+USE_PERL5_BUILD=yes
+USE_PERL5_RUN=	yes
+USE_REINPLACE=	yes
 NO_BUILD=	yes
 
 PL_FILES=	install.pl bin/dcollect.pl bin/dindex.pl bin/dsearch.pl \
@@ -30,9 +30,9 @@ PL_FILES=	install.pl bin/dcollect.pl bin/dindex.pl bin/dsearch.pl \
 
 post-patch:
 .for f in ${PL_FILES}
-	@${PERL} -pi -e 's,/usr/local/bin/perl,${PERL},' ${WRKSRC}/${f}
+	@${REINPLACE_CMD} -e 's,/usr/local/bin/perl,${PERL},' ${WRKSRC}/${f}
 .endfor
-	@${PERL} -pi -e "s,/usr/local,${PREFIX},g" ${WRKSRC}/install.pl
+	@${REINPLACE_CMD} -e "s,/usr/local,${PREFIX},g" ${WRKSRC}/install.pl
 
 do-install:
 	cd ${WRKSRC}; ${PERL} install.pl -y -c -bsdport
diff --git a/ftp/ftplocate/files/patch-install.pl b/ftp/ftplocate/files/patch-install.pl
index 8afffd06dc56..787b04470d77 100644
--- a/ftp/ftplocate/files/patch-install.pl
+++ b/ftp/ftplocate/files/patch-install.pl
@@ -4,7 +4,7 @@
  
  $defhtmldir="/usr/local/apache/share/htdocs";
  foreach (
-+	"/usr/local/www/data.default",
++	"/usr/local/www/data",
  	"/usr/local/apache/share/htdocs",
  	"/usr/local/apache/htdocs",
  	"/opt/apache/share/htdocs", 
@@ -12,7 +12,7 @@
  
  $defcgidir="/usr/local/apache/share/cgi-bin";
  foreach (
-+	"/usr/local/www/cgi-bin.default",
++	"/usr/local/www/cgi-bin",
  	"/usr/local/apache/share/cgi-bin",
  	"/usr/local/apache/cgi-bin",
  	"/opt/apache/share/cgi-bin", 
diff --git a/ftp/ftplocate/pkg-plist b/ftp/ftplocate/pkg-plist
index 9bae07c33959..4c78a4c0ddd1 100644
--- a/ftp/ftplocate/pkg-plist
+++ b/ftp/ftplocate/pkg-plist
@@ -1,36 +1,36 @@
 bin/ftplocate
-www/cgi-bin.default/ftplocate/dcollect.pl
-www/cgi-bin.default/ftplocate/lang.english
-www/cgi-bin.default/ftplocate/fltrain.pl
-www/cgi-bin.default/ftplocate/fltop.pl
-www/cgi-bin.default/ftplocate/flsummary.pl
-www/cgi-bin.default/ftplocate/flserv.pl
-www/cgi-bin.default/ftplocate/flsearch.pl
-www/cgi-bin.default/ftplocate/flmodule.pl
-www/cgi-bin.default/ftplocate/flmap.pl
-www/cgi-bin.default/ftplocate/flindex.pl
-www/cgi-bin.default/ftplocate/flhistory.pl
-www/cgi-bin.default/ftplocate/flfilter.pl
-www/cgi-bin.default/ftplocate/flcollect.pl
-www/cgi-bin.default/ftplocate/flcatsite.pl
-www/cgi-bin.default/ftplocate/dsearch.pl
-www/cgi-bin.default/ftplocate/dindex.pl
-www/cgi-bin.default/ftplocate/lang.zhtw
-www/cgi-bin.default/ftplocate/config
-www/cgi-bin.default/ftplocate/config.site
-www/cgi-bin.default/ftplocate/indexer.sh
-www/cgi-bin.default/ftplocate/log.map
-www/cgi-bin.default/ftplocate/log.system
-www/cgi-bin.default/ftplocate/log.user
-www/data.default/ftplocate/readme.zhtw.html
-www/data.default/ftplocate/readme.english.html
-www/data.default/ftplocate/index.html
-www/data.default/ftplocate/help.english.html
-www/data.default/ftplocate/help.zhtw.html
-@exec install -d -o nobody -g nobody -m 755 %D/www/cgi-bin.default/ftplocate/cache
-@exec install -d %D/www/cgi-bin.default/ftplocate/filelist %D/www/cgi-bin/ftplocate/desc
-@dirrm www/data.default/ftplocate
-@dirrm www/cgi-bin.default/ftplocate/filelist
-@dirrm www/cgi-bin.default/ftplocate/desc
-@dirrm www/cgi-bin.default/ftplocate/cache
-@dirrm www/cgi-bin.default/ftplocate
+www/cgi-bin/ftplocate/dcollect.pl
+www/cgi-bin/ftplocate/lang.english
+www/cgi-bin/ftplocate/fltrain.pl
+www/cgi-bin/ftplocate/fltop.pl
+www/cgi-bin/ftplocate/flsummary.pl
+www/cgi-bin/ftplocate/flserv.pl
+www/cgi-bin/ftplocate/flsearch.pl
+www/cgi-bin/ftplocate/flmodule.pl
+www/cgi-bin/ftplocate/flmap.pl
+www/cgi-bin/ftplocate/flindex.pl
+www/cgi-bin/ftplocate/flhistory.pl
+www/cgi-bin/ftplocate/flfilter.pl
+www/cgi-bin/ftplocate/flcollect.pl
+www/cgi-bin/ftplocate/flcatsite.pl
+www/cgi-bin/ftplocate/dsearch.pl
+www/cgi-bin/ftplocate/dindex.pl
+www/cgi-bin/ftplocate/lang.zhtw
+www/cgi-bin/ftplocate/config
+www/cgi-bin/ftplocate/config.site
+www/cgi-bin/ftplocate/indexer.sh
+www/cgi-bin/ftplocate/log.map
+www/cgi-bin/ftplocate/log.system
+www/cgi-bin/ftplocate/log.user
+www/data/ftplocate/readme.zhtw.html
+www/data/ftplocate/readme.english.html
+www/data/ftplocate/index.html
+www/data/ftplocate/help.english.html
+www/data/ftplocate/help.zhtw.html
+@exec install -d -o nobody -g nobody -m 755 %D/www/cgi-bin/ftplocate/cache
+@exec install -d %D/www/cgi-bin/ftplocate/filelist %D/www/cgi-bin/ftplocate/desc
+@dirrm www/data/ftplocate
+@dirrm www/cgi-bin/ftplocate/filelist
+@dirrm www/cgi-bin/ftplocate/desc
+@dirrm www/cgi-bin/ftplocate/cache
+@dirrm www/cgi-bin/ftplocate