portlint (27 fatal errors and 6 warnings eliminated).

Added some patches.
Set NO_PACKAGE, since the hostname is compiled into several binaries.

4 files changed, 78 insertions, 62 deletions

diff --git a/ftp/ftpsearch/Makefile b/ftp/ftpsearch/Makefile
index d31aee90e460..c86cc0842d95 100644
--- a/ftp/ftpsearch/Makefile
+++ b/ftp/ftpsearch/Makefile
@@ -1,20 +1,44 @@
 # New ports collection makefile for:	ftpsearch
-# Version required:	
+# Version required:	1.0
 # Date created:		07 Dec 1996
-# Whom:			tegge@idt.ntnu.no
+# Whom:			Tor.Egge@idi.ntnu.no
 #
-# $Id: Makefile,v 1.2 1997/02/18 10:08:23 obrien Exp $
+# $Id: Makefile,v 1.3 1997/02/19 09:31:07 tg Exp $
 #
 
 DISTNAME=	ftpsearch-1.0
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftpsearch.ntnu.no/pub/ftpsearch/
 
-MAINTAINER=	tegge@idt.ntnu.no
+MAINTAINER=	Tor.Egge@idi.ntnu.no
+
+NO_PACKAGE=	"Hostname compiled in"
+
+PATCH_SITES =   ftp://ftpsearch.ntnu.no/pub/ftpsearch/
+PATCHFILES =	ftpsearch-1.0.patch1 \
+		ftpsearch-1.0.patch2 \
+		ftpsearch-1.0.patch3 \
+		ftpsearch-1.0.patch4 \
+		ftpsearch-1.0.patch5 \
+		ftpsearch-1.0.patch6
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	FTPSEARCHROOT=${PREFIX}/ftpsearch
 
+MANPREFIX=${PREFIX}/ftpsearch
+MAN1 = ftpsearch.1
+MAN5 = cnames.5 ftpcli_config.5 sites.5 sites.alias.5 sites.skip.5
+MAN7 = datasets.7
+MAN8 =  astat.8 autoupdateconfig.pl.8 cardusage.8 checkenv.pl.8 chknavig.8 \
+	chksites.pl.8 domainhelp.8 freq.8 ftpcli.8 \
+	ftpsearchshell.8 gateway.8 genaliases.8 gendataset.8 genit.pl.8 \
+	genmotd.pl.8 genspecter.8 genspecter2.8 listsite.8 load.8 \
+	makesuffix.8 mergesites.8 nsslave.8 parsesite.8 removeoldparsed.pl.8 \
+	search.8 sgateway.8 siteadmin.pl.8 sortsuffix.8
+
+pre-install:
+	find ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} \{} \;
+
 post-install:
 	ln -sf ${PREFIX}/ftpsearch/bin/gateway ${PREFIX}/bin/ftpsearch
 
diff --git a/ftp/ftpsearch/distinfo b/ftp/ftpsearch/distinfo
index 098e184901b8..ed3e5d9306ec 100644
--- a/ftp/ftpsearch/distinfo
+++ b/ftp/ftpsearch/distinfo
@@ -1 +1,7 @@
 MD5 (ftpsearch-1.0.tar.gz) = cf8c0799305a0a06823015e298f7bb34
+MD5 (ftpsearch-1.0.patch1) = 9168674710aae785de76c923363b55ae
+MD5 (ftpsearch-1.0.patch2) = 0127029d73338efb4a6a4483950abec6
+MD5 (ftpsearch-1.0.patch3) = cbafadd99004b74c17dba6f88cd0131f
+MD5 (ftpsearch-1.0.patch4) = 69a7fc28a9947da42b71d71bbac74336
+MD5 (ftpsearch-1.0.patch5) = dd63d1cab58451abdad7cdf1d871731a
+MD5 (ftpsearch-1.0.patch6) = 4eb3617097dc569217fdbb72975b2106
diff --git a/ftp/ftpsearch/pkg-descr b/ftp/ftpsearch/pkg-descr
index 901c32e91dd7..f1b1a07ea21d 100644
--- a/ftp/ftpsearch/pkg-descr
+++ b/ftp/ftpsearch/pkg-descr
@@ -1,28 +1,13 @@
-                     * FTP search 1.0 alpha *
+                     FTP search 1.0
 
-This is an alpha version of FTP search. FTP search is a program
-for indexing/searching in the contents on ftp servers. Now you 
-can have your own small scale server indexing your ftp server
-only. 
+FTP search is a program for indexing/searching in the contents on ftp servers.
+Now you can have your own small scale server indexing your ftp server only. 
 
 After performing make/make install of this port, you must go to
-/usr/local/ftpsearch and perform `make setup' to configure the
-software for the first time. If it fails, you may have to edit
-/usr/local/ftpsearch/etc/sites a little (specifying the ftp server
-you want to index), and check the file in with rcs again. Then you
-can try `make setup' one more. If it fails this time too, read the
-INSTALL file and examine the logs.
-
-If you have lots of network bandwidth, CPU, RAM and disk space, you
-can configure it to index almost every ftp server. It is recommended
-that you cooperate with others running an FTP search server, to avoid
-loading the same long-distance links with multiple transfers of the
-same ls listings. 
-
-This is the software that runs on ftpsearch.ntnu.no. That machine is a
-PC running FreeBSD 3.0-current. It has 15 GB disk, a 100 MHz Pentium
-processor, 128 MB memory and 2 MS160SE cards with 96 MB RAM on each
-card. It currently indexes 4700 ftp servers, with over 66 million
-files, and handles around 550000 requests/day with this software.
+/usr/local/ftpsearch and perform `make setup' to configure the software for the
+first time. If it fails, you may have to edit /usr/local/ftpsearch/etc/sites 
+a little (specifying the ftp server you want to index), and check the file in 
+with rcs again. Then you can try `make setup' one more. If it fails this time
+too, read the INSTALL file and examine the logs.
 
 - Tor Egge
diff --git a/ftp/ftpsearch/pkg-plist b/ftp/ftpsearch/pkg-plist
index 1b5353ff1b87..ce0ec27883fc 100644
--- a/ftp/ftpsearch/pkg-plist
+++ b/ftp/ftpsearch/pkg-plist
@@ -52,41 +52,41 @@ ftpsearch/gpl/namelen.gpl
 ftpsearch/gpl/namelen2.gpl
 ftpsearch/gpl/namelen3.gpl
 ftpsearch/gpl/namelen4.gpl
-ftpsearch/man/man1/ftpsearch.1
-ftpsearch/man/man5/cnames.5
-ftpsearch/man/man5/ftpcli_config.5
-ftpsearch/man/man5/sites.5
-ftpsearch/man/man5/sites.alias.5
-ftpsearch/man/man5/sites.skip.5
-ftpsearch/man/man7/datasets.7
-ftpsearch/man/man8/astat.8
-ftpsearch/man/man8/autoupdateconfig.pl.8
-ftpsearch/man/man8/cardusage.8
-ftpsearch/man/man8/checkenv.pl.8
-ftpsearch/man/man8/chknavig.8
-ftpsearch/man/man8/chksites.pl.8
-ftpsearch/man/man8/domainhelp.8
-ftpsearch/man/man8/freq.8
-ftpsearch/man/man8/ftpcli.8
-ftpsearch/man/man8/ftpsearchshell.8
-ftpsearch/man/man8/gateway.8
-ftpsearch/man/man8/genaliases.8
-ftpsearch/man/man8/gendataset.8
-ftpsearch/man/man8/genit.pl.8
-ftpsearch/man/man8/genmotd.pl.8
-ftpsearch/man/man8/genspecter.8
-ftpsearch/man/man8/genspecter2.8
-ftpsearch/man/man8/listsite.8
-ftpsearch/man/man8/load.8
-ftpsearch/man/man8/makesuffix.8
-ftpsearch/man/man8/mergesites.8
-ftpsearch/man/man8/nsslave.8
-ftpsearch/man/man8/parsesite.8
-ftpsearch/man/man8/removeoldparsed.pl.8
-ftpsearch/man/man8/search.8
-ftpsearch/man/man8/sgateway.8
-ftpsearch/man/man8/siteadmin.pl.8
-ftpsearch/man/man8/sortsuffix.8
+ftpsearch/man/man1/ftpsearch.1.gz
+ftpsearch/man/man5/cnames.5.gz
+ftpsearch/man/man5/ftpcli_config.5.gz
+ftpsearch/man/man5/sites.5.gz
+ftpsearch/man/man5/sites.alias.5.gz
+ftpsearch/man/man5/sites.skip.5.gz
+ftpsearch/man/man7/datasets.7.gz
+ftpsearch/man/man8/astat.8.gz
+ftpsearch/man/man8/autoupdateconfig.pl.8.gz
+ftpsearch/man/man8/cardusage.8.gz
+ftpsearch/man/man8/checkenv.pl.8.gz
+ftpsearch/man/man8/chknavig.8.gz
+ftpsearch/man/man8/chksites.pl.8.gz
+ftpsearch/man/man8/domainhelp.8.gz
+ftpsearch/man/man8/freq.8.gz
+ftpsearch/man/man8/ftpcli.8.gz
+ftpsearch/man/man8/ftpsearchshell.8.gz
+ftpsearch/man/man8/gateway.8.gz
+ftpsearch/man/man8/genaliases.8.gz
+ftpsearch/man/man8/gendataset.8.gz
+ftpsearch/man/man8/genit.pl.8.gz
+ftpsearch/man/man8/genmotd.pl.8.gz
+ftpsearch/man/man8/genspecter.8.gz
+ftpsearch/man/man8/genspecter2.8.gz
+ftpsearch/man/man8/listsite.8.gz
+ftpsearch/man/man8/load.8.gz
+ftpsearch/man/man8/makesuffix.8.gz
+ftpsearch/man/man8/mergesites.8.gz
+ftpsearch/man/man8/nsslave.8.gz
+ftpsearch/man/man8/parsesite.8.gz
+ftpsearch/man/man8/removeoldparsed.pl.8.gz
+ftpsearch/man/man8/search.8.gz
+ftpsearch/man/man8/sgateway.8.gz
+ftpsearch/man/man8/siteadmin.pl.8.gz
+ftpsearch/man/man8/sortsuffix.8.gz
 ftpsearch/plots/Makefile
 ftpsearch/plots/astatlastweek
 ftpsearch/plots/dinfo.gpl
@@ -206,3 +206,4 @@ ftpsearch/public_html/web-statistics/web-statistics.html
 @dirrm ftpsearch/public_html
 @dirrm ftpsearch/plots
 @dirrm ftpsearch
+@exec mkdir -p %D/ftpsearch/public_html/response-info