- substiture SYSCONFDIR into DEINSTALL/INSTALL

- using FAKE means you don't have to remove files/dirs durring install
that you do not want in the package, just don't include them in the PLIST
- unconditionally show DEINSTALL message, just because SYSCONFDIR has been
removed doesn't mean that LOG_DIR has too
- ${FOO} -> $FOO and add $SAMPLE_CONFIG_DIR to INSTALL script

net/icecast/Makefile

@@ -1,32 +1,33 @@
-# $OpenBSD: Makefile,v 1.2 2000/08/29 03:40:35 fgsch Exp $
+# $OpenBSD: Makefile,v 1.3 2000/08/29 04:27:50 brad Exp $
-
-DISTNAME=	icecast-1.3.7
-CATEGORIES=	audio net www
-NEED_VERSION=	1.310
-MASTER_SITES=	http://www.icecast.org/releases/
-MAINTAINER=	fgsch@openbsd.org
 
 ONLY_FOR_ARCH=	i386
 
+DISTNAME=	icecast-1.3.7
+CATEGORIES=	audio net www
+NEED_VERSION=	1.320
+MASTER_SITES=	http://www.icecast.org/releases/
+
 HOMEPAGE=	http://www.icecast.org/
 
+MAINTAINER=	fgsch@openbsd.org
+
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-CONFIGURE_STYLE= gnu
+SYSCONFDIR=	/etc/icecast
-CONFIGURE_ARGS+= --with-crypt
+SUBST_VARS=	SYSCONFDIR
 
-DOCFILES=	AUTHORS BUGS CHANGES COPYING FAQ README
+CONFIGURE_STYLE= gnu
+CONFIGURE_ARGS=	--with-crypt
+
+DOCS=	AUTHORS BUGS CHANGES COPYING FAQ README
 
 post-patch:
 	@cp ${FILESDIR}/icepass.c ${WRKSRC}/src
 
 post-install:
-	@rm -f ${PREFIX}/share/icecast/templates/manual.html
+	cd ${WRKSRC}; $(INSTALL_DATA) $(DOCS) ${PREFIX}/share/doc/icecast
-	@rmdir ${PREFIX}/share/icecast/static
-	cd ${WRKSRC} && $(INSTALL_DATA) $(DOCFILES) \
-	    ${PREFIX}/share/doc/icecast
 
 .include <bsd.port.mk>

net/icecast/pkg/DEINSTALL

@@ -1,27 +1,25 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.1.1.1 2000/08/28 16:14:21 fgsch Exp $
+# $OpenBSD: DEINSTALL,v 1.2 2000/08/29 04:27:51 brad Exp $
 #
 # icecast de-installation
 
 set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
-CONFIG_DIR=/etc/icecast
+CONFIG_DIR=${SYSCONFDIR}
 LOG_DIR=/var/log/icecast
 
-if [ -d ${CONFIG_DIR} ]; then
+echo
-    echo
+echo "+---------------"
-    echo "+---------------"
+echo "| To completely deinstall the $1 package you need to perform"
-    echo "| To completely deinstall the $1 package you need to perform"
+echo "| these steps as root:"
-    echo "| these steps as root:"
+echo "|"
-    echo "|"
+echo "|           rm -rf $CONFIG_DIR"
-    echo "|           rm -rf ${CONFIG_DIR}"
+echo "|           rm -rf $LOG_DIR"
-    echo "|           rm -rf ${LOG_DIR}"
+echo "|"
-    echo "|"
+echo "| Do not do this if you plan on re-installing $1"
-    echo "| Do not do this if you plan on re-installing $1"
+echo "| at some future time."
-    echo "| at some future time."
+echo "+---------------"
-    echo "+---------------"
+echo
-    echo
-fi
 
 exit 0

net/icecast/pkg/INSTALL

@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: INSTALL,v 1.1.1.1 2000/08/28 16:14:21 fgsch Exp $
+# $OpenBSD: INSTALL,v 1.2 2000/08/29 04:27:51 brad Exp $
 #
 # Pre/post-installation setup of icecast
 
@@ -8,36 +8,32 @@
 set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
-CONFIG_DIR=/etc/icecast
+CONFIG_DIR=${SYSCONFDIR}
-CONFIG_FILE=${CONFIG_DIR}/icecast.conf
+CONFIG_FILE=$CONFIG_DIR/icecast.conf
+SAMPLE_CONFIG_DIR=$PREFIX/share/examples/icecast
 LOG_DIR=/var/log/icecast
 
-install -d -o root -g wheel -m 755 ${LOG_DIR}
+install -d -o root -g wheel -m 755 $LOG_DIR
 
-# 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 files in ${CONFIG_DIR},"
+    echo "| The existing $1 configuration files in $CONFIG_DIR,"
     echo "| have NOT been changed.  You may want to compare them to the"
-    echo "| current sample files, ${PREFIX}/share/examples/icecast/icecast.conf.dist,"
+    echo "| current sample files, $SAMPLE_CONFIG_DIR/icecast.conf.dist,"
     echo "| and update your configuration as needed."
     echo "+---------------"
     echo
 }
 
-# Function: install the icecast configuration files from the samples
-#
 do_install()
 {
-    install -d -o root -g wheel -m 755 ${CONFIG_DIR}
+    install -d -o root -g wheel -m 755 $CONFIG_DIR
-    install -o root -g wheel -m 644 \
+    install -o root -g wheel -m 644 $SAMPLE_CONFIG_DIR/icecast.conf.dist $CONFIG_FILE
-	${PREFIX}/share/examples/icecast/icecast.conf.dist ${CONFIG_FILE}
     echo
     echo "+---------------"
-    echo "| The $1 configuration files in ${CONFIG_DIR},"
+    echo "| The $1 configuration files in $CONFIG_DIR,"
     echo "| have been installed.  Please view these files and change"
     echo "| the configuration to meet your needs"
     echo "+---------------"