5 files changed, 44 insertions, 51 deletions

diff --git a/ftp/ftplocate/Makefile b/ftp/ftplocate/Makefile
index d1052278054b..20a146a76311 100644
--- a/ftp/ftplocate/Makefile
+++ b/ftp/ftplocate/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	Ftplocate
-# Version required:			1.50
+# Version required:			2.00
 # Date created:				7 December 1999
 # Whom:					tung@turtle.ee.ncku.edu.tw
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ftplocate-1.50
+DISTNAME=	ftplocate-2.00
 CATEGORIES=	ftp www
 MASTER_SITES=	ftp://ftp.ee.ncku.edu.tw/pub/
 
@@ -17,8 +17,11 @@ RUN_DEPENDS+=	glimpse:${PORTSDIR}/textproc/glimpse
 USE_PERL5=	yes
 NO_BUILD=	yes
 
-PL_FILES=	dcollect.pl dindex.pl dsearch.pl flcollect.pl flfilter.pl \
-		flhistory.pl flindex.pl flsearch.pl flserv.pl fltrain.pl
+PL_FILES=	install.pl bin/dcollect.pl bin/dindex.pl bin/dsearch.pl \
+		bin/flcollect.pl bin/flfilter.pl bin/flhistory.pl \
+		bin/flindex.pl bin/flmap.pl bin/flsearch.pl \
+		bin/flserv.pl bin/flsummary.pl bin/fltop.pl \
+		bin/fltrain.pl bin/flcatsite.pl template/ftplocate
 
 post-extract:
 .for f in ${PL_FILES}
@@ -26,26 +29,6 @@ post-extract:
 .endfor
 
 do-install:
-	${INSTALL} -d ${PREFIX}/www/cgi-bin/ftplocate \
-		${PREFIX}/www/cgi-bin/ftplocate/index \
-		${PREFIX}/www/cgi-bin/ftplocate/desc \
-		${PREFIX}/www/data
-	${INSTALL} -o nobody -g nobody -m 755 -d ${PREFIX}/www/cgi-bin/ftplocate/cache
-	cd ${WRKSRC}; \
-	${INSTALL_DATA} \
-		README README.zhtw fl.english fl.zhtw \
-		${PREFIX}/www/cgi-bin/ftplocate ;\
-	${INSTALL} -c -m 644 \
-		fl.config fl.share \
-		${PREFIX}/www/cgi-bin/ftplocate ;\
-	${INSTALL_SCRIPT} indexer.sh ${PREFIX}/www/cgi-bin/ftplocate; \
-	${INSTALL_DATA} \
-		flhelp.html flhelp.zhtw.html \
-		${PREFIX}/www/data ;\
-	${INSTALL_SCRIPT}  ftplocate ${PREFIX}/bin/
-.for f in ${PL_FILES}
-	${INSTALL_SCRIPT} ${WRKSRC}/${f} ${PREFIX}/www/cgi-bin/ftplocate
-.endfor
-	@${CAT} ${PKGMESSAGE}
+	cd ${WRKSRC}; install.pl -y
 
 .include <bsd.port.mk>
diff --git a/ftp/ftplocate/distinfo b/ftp/ftplocate/distinfo
index 5026c7635572..a38312f35098 100644
--- a/ftp/ftplocate/distinfo
+++ b/ftp/ftplocate/distinfo
@@ -1 +1 @@
-MD5 (ftplocate-1.50.tar.gz) = b80b9f0eb062891cf2730e3a20d4bfe1
+MD5 (ftplocate-2.00.tar.gz) = 331f9b160e3c67c81798c04541ae9328
diff --git a/ftp/ftplocate/pkg-comment b/ftp/ftplocate/pkg-comment
index 17231c316e7a..366c8f1c4712 100644
--- a/ftp/ftplocate/pkg-comment
+++ b/ftp/ftplocate/pkg-comment
@@ -1 +1 @@
-An ftp search engine supporting filename and description search
+A ftp search engine supporting filename and description search
diff --git a/ftp/ftplocate/pkg-descr b/ftp/ftplocate/pkg-descr
index ce95c554f87c..810aa84e0251 100644
--- a/ftp/ftplocate/pkg-descr
+++ b/ftp/ftplocate/pkg-descr
@@ -1,15 +1,15 @@
 FtpLocate is a fast FTP search engine written with Perl. It supports 
 indexing on multiple FTP servers and generates summaries for them. 
 
-FtpLocate provides the user two methods for searching: filename search and 
-description search. Filename search groups the results by FTP servers, 
-displaying the server nearest to the client first. With description search, 
-a user can find the files he wants without knowing the filename. Files with 
-same description will be grouped together.
+FtpLocate provides the user two types of searching: search by filename
+and search by description. Search by filename will group the results 
+by FTP servers and display the server nearest to the client first. 
+With search by description, a user can find the files he wants without 
+knowing the filename. Files with same description will be grouped together.
 
 See the following URL for more information.
 
-WWW: http://turtle.ee.ncku.edu.tw/ftplocate.html
+WWW: http://ftp.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 d8b2010b59ba..4c78a4c0ddd1 100644
--- a/ftp/ftplocate/pkg-plist
+++ b/ftp/ftplocate/pkg-plist
@@ -1,26 +1,36 @@
 bin/ftplocate
-www/cgi-bin/ftplocate/README
-www/cgi-bin/ftplocate/README.zhtw
 www/cgi-bin/ftplocate/dcollect.pl
-www/cgi-bin/ftplocate/dindex.pl
-www/cgi-bin/ftplocate/dsearch.pl
-www/cgi-bin/ftplocate/fl.config
-www/cgi-bin/ftplocate/fl.english
-www/cgi-bin/ftplocate/fl.share
-www/cgi-bin/ftplocate/fl.zhtw
-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/flsearch.pl
-www/cgi-bin/ftplocate/flserv.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/data/flhelp.html
-www/data/flhelp.zhtw.html
+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/index %D/www/cgi-bin/ftplocate/desc
-@dirrm www/cgi-bin/ftplocate/index
+@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