Some relocation fixes & portlint:

- config does not need a defaults file
- config generated with sed, not patch, compliant with ${PREFIX}
- use ${INSTALL_SCRIPT} in two places instead of ${INSTALL_PROGRAM}

3 files changed, 62 insertions, 76 deletions

diff --git a/net/icb/Makefile b/net/icb/Makefile
index 88bbd6243e2..92b40242a72 100644
--- a/net/icb/Makefile
+++ b/net/icb/Makefile
@@ -3,7 +3,7 @@
 # Date created:		18 March 1998
 # Whom:			cjs
 #
-# $NetBSD: Makefile,v 1.2 1998/03/19 11:46:01 frueauf Exp $
+# $NetBSD: Makefile,v 1.3 1998/03/20 00:09:18 tv Exp $
 #
 
 DISTNAME=		icb-5.0.5
@@ -12,12 +12,15 @@ MASTER_SITES=		ftp://ftp.netbsd.org/pub/NetBSD/packages/distfiles/
 
 MAINTAINER=		cjs@netbsd.org
 
+do-configure:
+	@cd ${WRKSRC}; \
+	${SED} -e s,@PREFIX@,${PREFIX},g ${FILESDIR}/config >${WRKSRC}/config
+
 do-install:
-	pwd
 	${INSTALL_PROGRAM} ${WRKSRC}/icb/icb ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/icbserverdb ${PREFIX}/libdata
+	${INSTALL_SCRIPT} ${WRKSRC}/icbserverdb ${PREFIX}/libdata
 	${INSTALL} -d ${PREFIX}/libdata/icb
-	${INSTALL_PROGRAM} ${WRKSRC}/sample.icbrc \
+	${INSTALL_SCRIPT} ${WRKSRC}/sample.icbrc \
 		${WRKSRC}/contrib/bartender \
 		${WRKSRC}/contrib/confuse \
 		${WRKSRC}/contrib/echofile \
diff --git a/net/icb/files/config b/net/icb/files/config
new file mode 100644
index 00000000000..a7a20001204
--- /dev/null
+++ b/net/icb/files/config
@@ -0,0 +1,55 @@
+#
+#	THIS IS AN AUTOMATICALLY GENERATED FILE
+#
+#	If you edit this file and later run "setup", your
+#	changes will be lost. This file gets fed to "make",
+#	so keep that in mind if you make changes.
+#
+
+# Installing user's home directory
+HOME		= /nonexistent
+
+# Directory where the client will be installed.
+BINDIR		= @PREFIX@/bin
+
+# Directory where the manual page will be installed.
+MANDIR		= @PREFIX@/man
+
+# Compiler to use.
+CC		= cc
+
+# Compile options.
+CFLAGS		= -O2  -DNO_LRAND48 -DSTRINGS_H -DTIME_H
+TCLCFLAGS	= -O2  -DNO_LRAND48 -DSTRINGS_H -DTIME_H
+
+# Lint flags
+LFLAGS		= -u  -DNO_LRAND48 -DSTRINGS_H -DTIME_H
+
+# System dependent source file.
+SYSDEP		=sysdep.bsd
+
+# Other libraries to include.
+OTHERLIBS	=-lcurses -ltermcap
+
+# Resolver library
+RESOLVLIB	=
+
+# Parallel makes. Set to & for Sequents.
+PMAKE		=
+
+# Makefile dependency generator.
+MAKEDEPEND	= makedepend
+
+# Makefile dependency generator.
+DEPENDFLAGS	= -fMake  -DNO_LRAND48 -DSTRINGS_H -DTIME_H
+
+# Hostname and port of remote server.
+DEFAULTHOST	= crater.unm.edu
+DEFAULTPORT	= 7326
+
+# Directory for support files
+LIBDIR = @PREFIX@/libdata
+
+# location of server database
+SERVERLIST = @PREFIX@/libdata/icbserverdb
+
diff --git a/net/icb/patches/patch-aa b/net/icb/patches/patch-aa
deleted file mode 100644
index 9710910cfb8..00000000000
--- a/net/icb/patches/patch-aa
+++ /dev/null
@@ -1,72 +0,0 @@
---- config	Wed Dec 31 16:00:00 1969
-+++ config	Wed Mar 18 13:30:49 1998
-@@ -0,0 +1,55 @@
-+#
-+#	THIS IS AN AUTOMATICALLY GENERATED FILE
-+#
-+#	If you edit this file and later run "setup", your
-+#	changes will be lost. This file gets fed to "make",
-+#	so keep that in mind if you make changes.
-+#
-+
-+# Installing user's home directory
-+HOME		= /home/cjs
-+
-+# Directory where the client will be installed.
-+BINDIR		= /usr/pkg/bin
-+
-+# Directory where the manual page will be installed.
-+MANDIR		= /usr/pkg/man
-+
-+# Compiler to use.
-+CC		= cc
-+
-+# Compile options.
-+CFLAGS		= -O2  -DNO_LRAND48 -DSTRINGS_H -DTIME_H
-+TCLCFLAGS	= -O2  -DNO_LRAND48 -DSTRINGS_H -DTIME_H
-+
-+# Lint flags
-+LFLAGS		= -u  -DNO_LRAND48 -DSTRINGS_H -DTIME_H
-+
-+# System dependent source file.
-+SYSDEP		=sysdep.bsd
-+
-+# Other libraries to include.
-+OTHERLIBS	=-lcurses -ltermcap
-+
-+# Resolver library
-+RESOLVLIB	=-lresolv
-+
-+# Parallel makes. Set to & for Sequents.
-+PMAKE		=
-+
-+# Makefile dependency generator.
-+MAKEDEPEND	= makedepend
-+
-+# Makefile dependency generator.
-+DEPENDFLAGS	= -fMake  -DNO_LRAND48 -DSTRINGS_H -DTIME_H
-+
-+# Hostname and port of remote server.
-+DEFAULTHOST	= crater.unm.edu
-+DEFAULTPORT	= 7326
-+
-+# Directory for support files
-+LIBDIR = /usr/pkg/libdata
-+
-+# location of server database
-+SERVERLIST = /usr/pkg/libdata/icbserverdb
-+
-diff -u -r --new-file work.orig/icb-5.0.5/defaults work/icb-5.0.5/defaults
---- defaults	Wed Dec 31 16:00:00 1969
-+++ defaults	Wed Mar 18 13:30:49 1998
-@@ -0,0 +1,10 @@
-+defsystem="netbsd"
-+defbindir="/usr/pkg/bin"
-+defmandir="/usr/pkg/man"
-+deflibdir="/usr/pkg/libdata"
-+defcompiler="cc"
-+defextra="-O2"
-+defmakedepend="makedepend"
-+defdependopts="-fMake"
-+defhost="crater.unm.edu"
-+defport="7326"