Adapt to use shared INSTALL/DEINSTALL scripts by using the logic in

bsd.pkg.install.mk:

	* Remove old DEINSTALL/INSTALL scripts.
	* Move some text printed at POST-INSTALL time into the MESSAGE file.
	* Adjust rc.d scripts to respect rc.conf settings, so that the
	  script may be directly copied into /etc/rc.d.

3 files changed, 10 insertions, 201 deletions

diff --git a/www/surfraw/DEINSTALL b/www/surfraw/DEINSTALL
deleted file mode 100644
index bb4a088a979..00000000000
--- a/www/surfraw/DEINSTALL
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: DEINSTALL,v 1.4 2001/11/06 23:12:00 jlam Exp $
-
-PKGNAME=$1
-STAGE=$2
-
-CAT="@CAT@"
-CMP="@CMP@"
-ECHO="@ECHO@"
-RM="@RM@"
-RMDIR="@RMDIR@"
-TR="@TR@"
-TRUE="@TRUE@"
-
-SAMPLECONFDIR=${PKG_PREFIX}/share/examples/@PKGBASE@
-CONFDIR=@SURFRAW_SYSCONFDIR@
-MAKEDIRS=""
-
-CONFFILES=" \
-	${SAMPLECONFDIR}/surfraw.conf ${CONFDIR}/surfraw.conf : \
-	${SAMPLECONFDIR}/surfraw_elvi.list ${CONFDIR}/surfraw_elvi.list \
-	"
-
-case ${STAGE} in
-DEINSTALL)
-	# Remove configuration files if they don't differ from the default
-	# config file.
-	#
-	${ECHO} ${CONFFILES} | ${TR} ":" "\012" | while read SAMPLEFILE FILE
-	do
-		if ${CMP} -s ${FILE} ${SAMPLEFILE}
-		then
-			${RM} -f ${FILE}
-		fi
-	done
-	;;
-
-POST-DEINSTALL)
-	modified_files=`						\
-		${ECHO} ${CONFFILES} | ${TR} ":" "\012" |		\
-		while read SAMPLEFILE FILE;				\
-	  	do							\
-			if [ -f ${FILE} ];				\
-			then						\
-				${ECHO} ${FILE};			\
-			fi;						\
-	  	done;							\
-	`
-
-	existing_dirs=''
-	for dir in __dummy ${MAKEDIRS}
-	do
-		if [ "${dir}" != "__dummy" -a			\
-		     "${dir}" != "/etc" -a			\
-		     "${dir}" != "${PKG_PREFIX}/etc" ]
-		then
-			${RMDIR} -p ${dir} 2>/dev/null || ${TRUE}
-			if [ -d ${dir} ]
-			then
-				existing_dirs="${existing_dirs} ${dir}"
-			fi
-		fi
-	done
-
-	if [ -n "${modified_files}" -o -n "${existing_dirs}" ]
-	then
-		${CAT} << EOF
-===========================================================================
-If you won't be using ${PKGNAME} any longer, you may want to remove
-EOF
-		if [ -n "${modified_files}" ]
-		then
-			${CAT} << EOF
-
-  * the following files:
-
-EOF
-			for file in ${modified_files}
-			do
-				${ECHO} "	${file}"
-			done
-		fi
-		if [ -n "${existing_dirs}" ]
-		then
-			${CAT} << EOF
-
-* the following directories:
-
-EOF
-			for dir in ${existing_dirs}
-			do
-				${ECHO} "	${dir}"
-			done
-		fi
-		${CAT} << EOF
-===========================================================================
-EOF
-	fi
-	;;
-
-*)
-	${ECHO} "Unexpected argument: ${STAGE}"
-	exit 1
-	;;
-esac
-exit 0
diff --git a/www/surfraw/INSTALL b/www/surfraw/INSTALL
deleted file mode 100644
index e9ffb363131..00000000000
--- a/www/surfraw/INSTALL
+++ /dev/null
@@ -1,68 +0,0 @@
-#! /bin/sh
-#
-# $NetBSD: INSTALL,v 1.2 2001/11/06 10:58:03 jlam Exp $
-
-PKGNAME=$1
-STAGE=$2
-
-CAT="@CAT@"
-CHMOD="@CHMOD@"
-CP="@CP@"
-ECHO="@ECHO@"
-MKDIR="@MKDIR@"
-TR="@TR@"
-
-SAMPLECONFDIR=${PKG_PREFIX}/share/examples/@PKGBASE@
-CONFDIR=@SURFRAW_SYSCONFDIR@
-MAKEDIRS="${CONFDIR}"
-
-CONFFILES=" \
-	${SAMPLECONFDIR}/surfraw.conf ${CONFDIR}/surfraw.conf : \
-	${SAMPLECONFDIR}/surfraw_elvi.list ${CONFDIR}/surfraw_elvi.list \
-        "
-
-case ${STAGE} in
-PRE-INSTALL)
-	;;
-
-POST-INSTALL)
-	for dir in __dummy ${MAKEDIRS}
-	do
-		if [ "${dir}" != "__dummy" ]
-		then
-			${MKDIR} ${dir}
-		fi
-	done
-
-	${ECHO} "Installing configuration files:"
-	${ECHO} ${CONFFILES} | ${TR} ":" "\012" | while read SAMPLEFILE FILE
-	do
-		if [ -f ${FILE} ]
-		then
-			${ECHO} "    ${FILE} already exists"
-		else
-			${ECHO} "    ${FILE}"
-			${CP} ${SAMPLEFILE} ${FILE}
-			${CHMOD} 644 ${FILE}
-		fi
-	done
-	${CAT} << EOF
-===========================================================================
-You may wish to customize the following files:
-
-EOF
-	${ECHO} ${CONFFILES} | ${TR} ":" "\012" | while read SAMPLEFILE FILE
-	do
-		${ECHO} "	${FILE}"
-	done
-	${CAT} << EOF
-===========================================================================
-EOF
-	;;
-
-*)
-	${ECHO} "Unexpected argument: ${STAGE}"
-	exit 1
-	;;
-esac
-exit 0
diff --git a/www/surfraw/Makefile b/www/surfraw/Makefile
index a960dc7f363..b5bfd1889bb 100644
--- a/www/surfraw/Makefile
+++ b/www/surfraw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/11/07 06:12:20 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2001/11/19 16:23:16 jlam Exp $
 #
 
 DISTNAME=	surfraw-1.0.5
@@ -14,7 +14,7 @@ CONFLICTS+=	surfaw-[0-9]*
 USE_BUILDLINK_ONLY=	YES
 AUTOMAKE_OVERRIDE=	YES
 GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--sysconfdir=${SURFRAW_SYSCONFDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${CONFDIR}
 
 # Override sysconfdir so that the installation puts the example config file
 # in ${EGDIR}.
@@ -22,32 +22,15 @@ CONFIGURE_ARGS+=	--sysconfdir=${SURFRAW_SYSCONFDIR}
 MAKE_FLAGS+=		sysconfdir=${EGDIR}
 MAKE_ENV+=		AM_MAKEFLAGS="${MAKE_FLAGS}"
 
-SURFRAW_SYSCONFDIR?=	${PREFIX}/etc
-DOCDIR=			${PREFIX}/share/doc/surfraw
-EGDIR=			${PREFIX}/share/examples/${PKGBASE}
-
-DEINSTALL_FILE=		${WRKDIR}/DEINSTALL
-INSTALL_FILE=		${WRKDIR}/INSTALL
-
-PLIST_SUBST+=           PKGBASE=${PKGBASE}
-
-FILES_SUBST+=           PKGBASE=${PKGBASE}
-FILES_SUBST+=           SURFRAW_SYSCONFDIR=${SURFRAW_SYSCONFDIR}
-FILES_SUBST+=           CAT=${CAT:Q}
-FILES_SUBST+=           CHMOD=${CHMOD:Q}
-FILES_SUBST+=           CMP=${CMP:Q}
-FILES_SUBST+=           CP=${CP:Q}
-FILES_SUBST+=           ECHO=${ECHO:Q}
-FILES_SUBST+=           MKDIR=${MKDIR:Q}
-FILES_SUBST+=           RM=${RM:Q}
-FILES_SUBST+=           RMDIR=${RMDIR:Q}
-FILES_SUBST+=           TR=${TR:Q}
-FILES_SUBST+=           TRUE=${TRUE:Q}
-FILES_SUBST_SED=        ${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/}
+DOCDIR=		${PREFIX}/share/doc/surfraw
+EGDIR=		${PREFIX}/share/examples/${PKGBASE}
+
+CONF_FILES=	${EGDIR}/surfraw.conf ${CONFDIR}/surfraw.conf
+SUPPORT_FILES=	${EGDIR}/surfraw_elvi.list ${CONFDIR}/surfraw_elvi.list
+
+PLIST_SUBST+=	PKGBASE=${PKGBASE}
 
 pre-install:
-	${SED} ${FILES_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
-	${SED} ${FILES_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE}
 	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL
 
 post-install:
@@ -55,4 +38,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
 	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"