Port update for ftplocate-2.02

PR:		56088
Submitted by:	Chung-Kie Tung <tung@turtle.ee.ncku.edu.tw>

5 files changed, 36 insertions, 51 deletions

diff --git a/ftp/ftplocate/Makefile b/ftp/ftplocate/Makefile
index a44e9e321ff5..8c719ee7a02f 100644
--- a/ftp/ftplocate/Makefile
+++ b/ftp/ftplocate/Makefile
@@ -6,21 +6,17 @@
 #
 
 PORTNAME=	ftplocate
-PORTVERSION=	2.01
-PORTREVISION=	1
+PORTVERSION=	2.02
 CATEGORIES=	ftp www
-MASTER_SITES=	ftp://ftp.ee.ncku.edu.tw/pub/ftplocate/
+MASTER_SITES=	http://turtle.ee.ncku.edu.tw/ftplocate/download/
 
 MAINTAINER=	tung@turtle.ee.ncku.edu.tw
 COMMENT=	A ftp search engine supporting filename and description search
 
-BUILD_DEPENDS=  ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
 RUN_DEPENDS=	glimpse:${PORTSDIR}/textproc/glimpse \
 		unzip:${PORTSDIR}/archivers/unzip
 
-USE_PERL5_BUILD=yes
-USE_PERL5_RUN=	yes
-USE_REINPLACE=	yes
+USE_PERL5=	yes
 NO_BUILD=	yes
 
 PL_FILES=	install.pl bin/dcollect.pl bin/dindex.pl bin/dsearch.pl \
@@ -29,13 +25,16 @@ PL_FILES=	install.pl bin/dcollect.pl bin/dindex.pl bin/dsearch.pl \
 		bin/flserv.pl bin/flsummary.pl bin/fltop.pl \
 		bin/fltrain.pl bin/flcatsite.pl template/ftplocate
 
-post-patch:
+post-extract:
 .for f in ${PL_FILES}
-	@${REINPLACE_CMD} -e 's,/usr/local/bin/perl,${PERL},' ${WRKSRC}/${f}
+	@${PERL} -pi -e 's,/usr/bin/perl,${PERL},' ${WRKSRC}/${f}
 .endfor
-	@${REINPLACE_CMD} -e "s,/usr/local,${PREFIX},g" ${WRKSRC}/install.pl
+	@${PERL} -pi -e 's,(/usr/local/www|/usr/local/apache/share),${PREFIX}/www,g' ${WRKSRC}/install.pl
+	@${PERL} -pi -e 's,/usr/local/bin/ftplocate,${PREFIX}/bin/ftplocate,g' ${WRKSRC}/install.pl
+	@${PERL} -pi -e 's,htdocs,data,g' ${WRKSRC}/install.pl
 
 do-install:
+	@${MKDIR} ${PREFIX}/www/data ${PREFIX}/www/cgi-bin
 	cd ${WRKSRC}; ${PERL} install.pl -y -c -bsdport
 
 .include <bsd.port.mk>
diff --git a/ftp/ftplocate/distinfo b/ftp/ftplocate/distinfo
index 463a6958ce85..682e279701bf 100644
--- a/ftp/ftplocate/distinfo
+++ b/ftp/ftplocate/distinfo
@@ -1 +1 @@
-MD5 (ftplocate-2.01.tar.gz) = 83dfcbff4df5e2813ccd1f68bb7cbd53
+MD5 (ftplocate-2.02.tar.gz) = 73ebb8d67bdc823ac5281150912143f4
diff --git a/ftp/ftplocate/files/patch-install.pl b/ftp/ftplocate/files/patch-install.pl
deleted file mode 100644
index 787b04470d77..000000000000
--- a/ftp/ftplocate/files/patch-install.pl
+++ /dev/null
@@ -1,18 +0,0 @@
---- install.pl.orig	Thu Aug 23 21:12:47 2001
-+++ install.pl	Thu Aug 23 21:17:01 2001
-@@ -251,6 +251,7 @@
- 
- $defhtmldir="/usr/local/apache/share/htdocs";
- foreach (
-+	"/usr/local/www/data",
- 	"/usr/local/apache/share/htdocs",
- 	"/usr/local/apache/htdocs",
- 	"/opt/apache/share/htdocs", 
-@@ -261,6 +262,7 @@
- 
- $defcgidir="/usr/local/apache/share/cgi-bin";
- foreach (
-+	"/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-descr b/ftp/ftplocate/pkg-descr
index 810aa84e0251..0bb6efbf5d17 100644
--- a/ftp/ftplocate/pkg-descr
+++ b/ftp/ftplocate/pkg-descr
@@ -9,7 +9,7 @@ knowing the filename. Files with same description will be grouped together.
 
 See the following URL for more information.
 
-WWW: http://ftp.ee.ncku.edu.tw/ftplocate/
+WWW: http://turtle.ee.ncku.edu.tw/ftplocate/
 
 Chung-Kie Tung
 tung@turtle.ee.ncku.edu.tw
diff --git a/ftp/ftplocate/pkg-plist b/ftp/ftplocate/pkg-plist
index 4c78a4c0ddd1..2cf81e3d43f5 100644
--- a/ftp/ftplocate/pkg-plist
+++ b/ftp/ftplocate/pkg-plist
@@ -1,34 +1,38 @@
 bin/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/dcollect.pl
+www/cgi-bin/ftplocate/dindex.pl
+www/cgi-bin/ftplocate/dsearch.pl
+www/cgi-bin/ftplocate/flcatsite.pl
+www/cgi-bin/ftplocate/flcollect.pl
+www/cgi-bin/ftplocate/flfilter.pl
+www/cgi-bin/ftplocate/flhistory.pl
+www/cgi-bin/ftplocate/flindex.pl
+www/cgi-bin/ftplocate/flmap.pl
+www/cgi-bin/ftplocate/flmodule.pl
+www/cgi-bin/ftplocate/flsearch.pl
+www/cgi-bin/ftplocate/flserv.pl
+www/cgi-bin/ftplocate/flsummary.pl
+www/cgi-bin/ftplocate/fltop.pl
+www/cgi-bin/ftplocate/fltrain.pl
+www/cgi-bin/ftplocate/ftp.pl
 www/cgi-bin/ftplocate/indexer.sh
+www/cgi-bin/ftplocate/lang.english
+www/cgi-bin/ftplocate/lang.zhtw
+www/cgi-bin/ftplocate/lchat.pl
 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/faq.txt
 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
+www/data/ftplocate/index.html
+www/data/ftplocate/readme.english.html
+www/data/ftplocate/readme.zhtw.html
+@exec install -d -o www -g www -m 755 %D/www/cgi-bin/ftplocate/cache
 @exec install -d %D/www/cgi-bin/ftplocate/filelist %D/www/cgi-bin/ftplocate/desc
+@exec chown www.www %D/www/cgi-bin/ftplocate/log.user
 @dirrm www/data/ftplocate
 @dirrm www/cgi-bin/ftplocate/filelist
 @dirrm www/cgi-bin/ftplocate/desc