Update www/surfraw to 1.0.5. Changes from version 1.0.3 include:

	Note that SURFRAW_browser was made obsolete in 1.0.4.
		SURFRAW_text_browser and SURFRAW_graphical_browser
		replace its functionality
	STATE EXTRA CLEARLY THE FORMAT OF ~/.surfraw.conf so
		even Redhat users get it.
	New elvi: debbugs, debcontents, debpackages, swhois, woffle
	Dead elvi: ircsearch, newscientist
	-g and -t switch between graphical & text browsers
	-new opens a new window on -remote comprehending browsers
	Fix url space escaping problem

6 files changed, 132 insertions, 72 deletions

diff --git a/www/surfraw/DEINSTALL b/www/surfraw/DEINSTALL
index 5d063237fc2..0fea348ec35 100644
--- a/www/surfraw/DEINSTALL
+++ b/www/surfraw/DEINSTALL
@@ -1,27 +1,34 @@
 #!/bin/sh
 #
-# $NetBSD: DEINSTALL,v 1.1 2001/11/01 02:18:54 zuntum Exp $
+# $NetBSD: DEINSTALL,v 1.2 2001/11/06 10:58:03 jlam Exp $
 
 PKGNAME=$1
 STAGE=$2
 
 CAT="@CAT@"
 CMP="@CMP@"
+ECHO="@ECHO@"
 RM="@RM@"
+RMDIR="@RMDIR@"
+TR="@TR@"
+TRUE="@TRUE@"
 
-SAMPLECONFDIR=${PKG_PREFIX}/etc
-CONFDIR=${PKG_PREFIX}/etc
-CONFFILES="surfraw.conf"
+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.
 	#
-	for file in ${CONFFILES}
+	${ECHO} ${CONFFILES} | ${TR} ":" "\012" | while read SAMPLEFILE FILE
 	do
-		FILE=${CONFDIR}/${file}
-		SAMPLEFILE=${SAMPLECONFDIR}/${file}.dist
 		if ${CMP} -s ${FILE} ${SAMPLEFILE}
 		then
 			${RM} -f ${FILE}
@@ -39,18 +46,52 @@ POST-DEINSTALL)
 			modified_files="${modified_files} ${FILE}"
 		fi
 	done
-	if [ -n "${modified_files}" ]
+
+	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
-the following files:
+EOF
+		if [ -n "${modified_files}" ]
+		then
+			${CAT} << EOF
+
+  * the following files:
 
 EOF
-		for file in ${modified_files}
-		do
-			echo "	${file}"
-		done
+			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
@@ -58,7 +99,7 @@ EOF
 	;;
 
 *)
-	echo "Unexpected argument: ${STAGE}"
+	${ECHO} "Unexpected argument: ${STAGE}"
 	exit 1
 	;;
 esac
diff --git a/www/surfraw/INSTALL b/www/surfraw/INSTALL
index 5a76bad995a..e9ffb363131 100644
--- a/www/surfraw/INSTALL
+++ b/www/surfraw/INSTALL
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $NetBSD: INSTALL,v 1.1 2001/11/01 02:18:54 zuntum Exp $
+# $NetBSD: INSTALL,v 1.2 2001/11/06 10:58:03 jlam Exp $
 
 PKGNAME=$1
 STAGE=$2
@@ -8,40 +8,52 @@ STAGE=$2
 CAT="@CAT@"
 CHMOD="@CHMOD@"
 CP="@CP@"
+ECHO="@ECHO@"
+MKDIR="@MKDIR@"
+TR="@TR@"
 
-SAMPLECONFDIR=${PKG_PREFIX}/etc
-CONFDIR=${PKG_PREFIX}/etc
-CONFFILES="surfraw.conf"
+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:"
-	for file in ${CONFFILES}
+	${ECHO} "Installing configuration files:"
+	${ECHO} ${CONFFILES} | ${TR} ":" "\012" | while read SAMPLEFILE FILE
 	do
-		FILE=${CONFDIR}/${file}
-		SAMPLEFILE=${SAMPLECONFDIR}/${file}.dist
 		if [ -f ${FILE} ]
 		then
-			echo "    ${FILE} already exists"
+			${ECHO} "    ${FILE} already exists"
 		else
-			echo "    ${FILE}"
+			${ECHO} "    ${FILE}"
 			${CP} ${SAMPLEFILE} ${FILE}
 			${CHMOD} 644 ${FILE}
 		fi
 	done
 	${CAT} << EOF
 ===========================================================================
-Some files you might need to customize include the following:
+You may wish to customize the following files:
 
 EOF
-	for file in ${CONFFILES}
+	${ECHO} ${CONFFILES} | ${TR} ":" "\012" | while read SAMPLEFILE FILE
 	do
-		FILE=${CONFDIR}/${file}
-		echo "	${FILE}"
+		${ECHO} "	${FILE}"
 	done
 	${CAT} << EOF
 ===========================================================================
@@ -49,7 +61,7 @@ EOF
 	;;
 
 *)
-	echo "Unexpected argument: ${STAGE}"
+	${ECHO} "Unexpected argument: ${STAGE}"
 	exit 1
 	;;
 esac
diff --git a/www/surfraw/Makefile b/www/surfraw/Makefile
index 684a580afd7..d8105de2173 100644
--- a/www/surfraw/Makefile
+++ b/www/surfraw/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2001/09/27 23:18:58 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2001/11/06 10:58:04 jlam Exp $
 #
 
-DISTNAME=	surfraw-1.0.3
+DISTNAME=	surfraw-1.0.5
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=surfraw/}
+MASTER_SITES=	ftp://ftp.netbsd.org/pub/NetBSD/misc/proff/
 
 MAINTAINER=	jlam@netbsd.org
 HOMEPAGE=	http://surfraw.sourceforge.net/
@@ -11,28 +11,47 @@ COMMENT=	Shell Users' Revolutionary Front Rage Against the Web
 
 CONFLICTS+=	surfaw-[0-9]*
 
-GNU_CONFIGURE=	# defined
+USE_BUILDLINK_ONLY=	YES
+AUTOMAKE_OVERRIDE=	YES
+GNU_CONFIGURE=		YES
+CONFIGURE_ARGS+=	--sysconfdir=${SURFRAW_SYSCONFDIR}
 
-DEINSTALL_FILE=	${WRKDIR}/DEINSTALL
-INSTALL_FILE=	${WRKDIR}/INSTALL
-
-DOCDIR=		${PREFIX}/share/doc/surfraw
-
-FILES_SUBST=		CAT=${CAT:Q}
-FILES_SUBST+=		CHMOD=${CHMOD:Q}
-FILES_SUBST+=		CMP=${CMP:Q}
-FILES_SUBST+=		CP=${CP:Q}
-FILES_SUBST+=		RM=${RM:Q}
-FILES_SUBST_SED=	${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/}
+# Override sysconfdir so that the installation puts the example config file
+# in ${EGDIR}.
+#
+MAKE_FLAGS+=		sysconfdir=${EGDIR}
+
+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!@/}
 
 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:
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/surfraw.conf ${PREFIX}/etc/surfraw.conf.dist
 	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/surfraw/PLIST b/www/surfraw/PLIST
index 691d4e1f555..b570e12419a 100644
--- a/www/surfraw/PLIST
+++ b/www/surfraw/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:18:54 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/11/06 10:58:04 jlam Exp $
 bin/W
 bin/altavista
 bin/amazon
@@ -9,34 +9,38 @@ bin/britannica
 bin/cite
 bin/cnn
 bin/currency
+bin/debbugs
+bin/debcontents
+bin/debpackages
 bin/deja
 bin/excite
 bin/fast
 bin/freshmeat
 bin/ftpsearch
 bin/google
-bin/ircsearch
 bin/jake
 bin/linuxdoc
 bin/netbsd
-bin/newscientist
 bin/pubmed
 bin/raging
 bin/rhyme
 bin/scaleplus
 bin/slashdot
+bin/sourceforge
 bin/stockquote
 bin/sundocs
 bin/sunsolve
 bin/surfraw
-bin/surfraw-netscape-remote
+bin/swhois
 bin/thesaurus
 bin/translate
 bin/webster
 bin/wetandwild
+bin/woffle
 bin/xxx
 bin/yahoo
-etc/surfraw.conf.dist
-etc/surfraw_elvi.list
-share/doc/surfraw/README
-@dirrm share/doc/surfraw
+share/doc/${PKGBASE}/README
+share/examples/${PKGBASE}/surfraw.conf
+share/examples/${PKGBASE}/surfraw_elvi.list
+@dirrm share/examples/${PKGBASE}
+@dirrm share/doc/${PKGBASE}
diff --git a/www/surfraw/distinfo b/www/surfraw/distinfo
index 993811e3e08..65f53b16bdf 100644
--- a/www/surfraw/distinfo
+++ b/www/surfraw/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/05/21 21:55:03 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/11/06 10:58:04 jlam Exp $
 
-SHA1 (surfraw-1.0.3.tar.gz) = c98cb9aed84098e475f598b196fb2699da04574e
-Size (surfraw-1.0.3.tar.gz) = 65476 bytes
+SHA1 (surfraw-1.0.5.tar.gz) = c90e2f87a17e95f7e7b3c4be0945e502fe54145a
+Size (surfraw-1.0.5.tar.gz) = 61786 bytes
 SHA1 (patch-aa) = 2a3d06f8de7364444aac446746124119282bb00b
diff --git a/www/surfraw/patches/patch-aa b/www/surfraw/patches/patch-aa
deleted file mode 100644
index 368f302ffd2..00000000000
--- a/www/surfraw/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2001/04/11 11:17:55 jlam Exp $
-
---- Makefile.in.orig	Fri Jan 12 21:39:41 2001
-+++ Makefile.in	Wed Apr 11 06:49:15 2001
-@@ -282,9 +282,9 @@
- installcheck: installcheck-recursive
- all-am: Makefile $(SCRIPTS) $(DATA)
- 
--install-exec-am: install-binSCRIPTS install-sysconfDATA
-+install-exec-am: install-binSCRIPTS
- 
--uninstall-am: uninstall-binSCRIPTS uninstall-sysconfDATA
-+uninstall-am: uninstall-binSCRIPTS
- 
- install-exec: install-exec-recursive install-exec-am
- 	@$(NORMAL_INSTALL)