- Depend on apache13

- install files to www/data.default and not deprecated apache/share/htdocs
- PERL-patch files in post-patch, not in post-extract
- Install to LOCALBASE, not hardcoded /usr/local
             ^^^^^^^^ ARGH

Apache-Dependency reported by:	bento

3 files changed, 57 insertions, 36 deletions

diff --git a/ftp/ftplocate/Makefile b/ftp/ftplocate/Makefile
index d01f7e94..cc332f7 100644
--- a/ftp/ftplocate/Makefile
+++ b/ftp/ftplocate/Makefile
@@ -7,11 +7,13 @@
 
 PORTNAME=	ftplocate
 PORTVERSION=	2.01
+PORTREVISION=	1
 CATEGORIES=	ftp www
 MASTER_SITES=	ftp://ftp.ee.ncku.edu.tw/pub/ftplocate/
 
 MAINTAINER=	tung@turtle.ee.ncku.edu.tw
 
+BUILD_DEPENDS=  ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
 RUN_DEPENDS=	glimpse:${PORTSDIR}/textproc/glimpse \
 		unzip:${PORTSDIR}/archivers/unzip
 
@@ -24,10 +26,11 @@ 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-extract:
+post-patch:
 .for f in ${PL_FILES}
 	@${PERL} -pi -e 's,/usr/local/bin/perl,${PERL},' ${WRKSRC}/${f}
 .endfor
+	@${PERL} -pi -e "s,/usr/local,${LOCALBASE},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
new file mode 100644
index 0000000..8afffd0
--- /dev/null
+++ b/ftp/ftplocate/files/patch-install.pl
@@ -0,0 +1,18 @@
+--- 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.default",
+ 	"/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.default",
+ 	"/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 4c78a4c..9bae07c 100644
--- a/ftp/ftplocate/pkg-plist
+++ b/ftp/ftplocate/pkg-plist
@@ -1,36 +1,36 @@
 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/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
+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