- ${SED} -> sed

- cleanup Makefile
- make this port respect CC and CFLAGS
- fix port so it'll work in package form

net/icb/Makefile

@@ -1,34 +1,30 @@
-# $OpenBSD: Makefile,v 1.9 1999/04/09 04:11:49 brad Exp $
+# $OpenBSD: Makefile,v 1.10 1999/12/14 04:17:14 brad Exp $
 # $NetBSD: Makefile,v 1.6 1998/04/15 11:15:34 frueauf Exp $
 
 DISTNAME=	icb-5.0.9
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.swcp.com/pub/icb/clients/unix/  \
-		ftp://ftp.swcp.com/pub/icb/clients/  \
-		ftp://ftp.empire.net/pub/icb/clients/  \
+MASTER_SITES=	ftp://ftp.swcp.com/pub/icb/clients/unix/ \
+		ftp://ftp.swcp.com/pub/icb/clients/ \
+		ftp://ftp.empire.net/pub/icb/clients/ \
 		ftp://ftp.cs.unm.edu/pub/armijo/icb.src/clients/
-
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	ports@openbsd.org
 
 do-configure:
-	@cd ${WRKSRC}; \
-	${SED} -e s,@PREFIX@,${PREFIX},g ${FILESDIR}/config >${WRKSRC}/config
+	@sed	-e s,@PREFIX@,${PREFIX},g \
+		-e s,@CC@,${CC},g ${FILESDIR}/config > ${WRKSRC}/config
 
 do-install:
+	@mkdir -p ${PREFIX}/lib/icb
 	${INSTALL_PROGRAM} ${WRKSRC}/icb/icb ${PREFIX}/bin
-	@if [ -f ${PREFIX}/lib/icbserverdb ]; then \
-		${ECHO} "*** Found ${PREFIX}/lib/icbserverdb - not replacing"; \
-	else \
-		${ECHO} "Installing default ${PREFIX}/lib/icbserverdb."; \
-		${INSTALL_DATA} ${WRKSRC}/icbserverdb ${PREFIX}/lib; \
-	fi
-	${INSTALL} -d ${PREFIX}/lib/icb
-	${INSTALL_DATA} ${WRKSRC}/sample.icbrc \
-			${WRKSRC}/contrib/bartender \
-			${WRKSRC}/contrib/confuse \
-			${WRKSRC}/contrib/echofile \
-			${PREFIX}/lib/icb
+	${INSTALL_DATA} ${WRKSRC}/icbserverdb ${PREFIX}/lib/icb/sample.icbserverdb
+	${INSTALL_DATA} ${WRKSRC}/sample.icbrc ${PREFIX}/lib/icb
+.for f in bartender confuse echofile
+	${INSTALL_DATA} ${WRKSRC}/contrib/${f} ${PREFIX}/lib/icb
+.endfor
+
+post-install:
+	@PKG_PREFIX="${PREFIX}" sh ${PKGDIR}/INSTALL ${DISTNAME} POST-INSTALL
 
 .include <bsd.port.mk>

net/icb/files/config

@@ -16,11 +16,11 @@ BINDIR		= @PREFIX@/bin
 MANDIR		= @PREFIX@/man
 
 # Compiler to use.
-CC		= cc
+CC		= @CC@
 
 # Compile options.
-CFLAGS		= -O2 ${DEBUG} -DSTRINGS_H -DTIME_H
-TCLCFLAGS	= -O2 ${DEBUG} -DSTRINGS_H -DTIME_H
+CFLAGS		+= ${DEBUG} -DSTRINGS_H -DTIME_H
+TCLCFLAGS	+= ${DEBUG} -DSTRINGS_H -DTIME_H
 
 # Lint flags
 LFLAGS		= -u  -DSTRINGS_H -DTIME_H

net/icb/pkg/DEINSTALL

@@ -0,0 +1,24 @@
+# $OpenBSD: DEINSTALL,v 1.1 1999/12/14 04:17:15 brad Exp $
+#
+# icb de-installation
+
+set -e
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+PREFIX=${PKG_PREFIX:-/usr/local}
+CONFIG_FILE=${PREFIX}/lib/icbserverdb
+
+if [ -f ${CONFIG_FILE} ]; then
+    echo
+    echo "+---------------"
+    echo "| To completely deinstall the $1 package you need to perform"
+    echo "| this step as root:"
+    echo "|"
+    echo "|           rm -f ${CONFIG_FILE}"
+    echo "|"
+    echo "| Do not do this if you plan on re-installing $1"
+    echo "| at some future time."
+    echo "+---------------"
+    echo
+fi
+
+exit 0

net/icb/pkg/INSTALL

@@ -0,0 +1,68 @@
+#!/bin/sh
+# $OpenBSD: INSTALL,v 1.1 1999/12/14 04:17:15 brad Exp $
+#
+# Pre/post-installation setup of icb
+
+# exit on errors, use a sane path and install prefix
+#
+set -e
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+PREFIX=${PKG_PREFIX:-/usr/local}
+CONFIG_FILE=${PREFIX}/lib/icbserverdb
+
+# Function: tell the user what s/he needs to do to use the port just installed
+#
+do_notice()
+{
+    echo
+    echo "+---------------"
+    echo "| The existing $1 configuration file, ${CONFIG_FILE},"
+    echo "| has NOT been changed.  You may want to compare it to the"
+    echo "| current sample file, ${PREFIX}/lib/icb/sample.icbserverdb,"
+    echo "| and update your configuration as needed."
+    echo "+---------------"
+    echo
+}
+
+# Function: install the system icb config file from the sample
+#
+do_install()
+{
+    cp ${PREFIX}/lib/icb/sample.icbserverdb ${CONFIG_FILE}
+    echo
+    echo "+---------------"
+    echo "| The $1 configuration file, ${CONFIG_FILE},"
+    echo "| has been installed.  Please view this file and change"
+    echo "| the configuration to meet your needs"
+    echo "+---------------"
+    echo
+
+}
+
+# verify proper execution
+#
+if [ $# -ne 2 ]; then
+    echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
+    exit 1
+fi
+
+# Verify/process the command
+#
+case $2 in
+    PRE-INSTALL)
+	: nothing to pre-install for this port
+	;;
+    POST-INSTALL)
+	if [ -f $CONFIG_FILE ]; then
+	    do_notice $1
+	else
+	    do_install $1
+	fi
+	;;
+    *)
+	echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
+	exit 1
+	;;
+esac
+
+exit 0

net/icb/pkg/PLIST

@@ -1,10 +1,7 @@
 bin/icb
 lib/icb/sample.icbrc
+lib/icb/sample.icbserverdb
 lib/icb/bartender
 lib/icb/confuse
 lib/icb/echofile
 @dirrm lib/icb
-@unexec echo "***"
-@unexec echo "*** Leaving %D/lib/icbserverdb. You should delete it"
-@unexec echo "*** manually if you don't want to keep ICB servers database."
-@unexec echo "***"