Update to 1.0.4.

Adds debbugs, debcontents, debpackages, sourceforge, swhois, woffle.
Removes ircsearch, newscientist.

PR:		31540
Approved by:	trevor

9 files changed, 123 insertions, 92 deletions

diff --git a/www/surfraw/Makefile b/www/surfraw/Makefile
index 25a4e28a16b6..1413ec5d27c9 100644
--- a/www/surfraw/Makefile
+++ b/www/surfraw/Makefile
@@ -5,10 +5,10 @@
 # $FreeBSD$
 
 PORTNAME=	surfraw
-PORTVERSION=	1.0.3
+PORTVERSION=	1.0.4
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	surfraw
+MASTER_SITES=	ftp://ftp.netbsd.org/pub/NetBSD/misc/proff/ \
+		ftp://ftp.funet.fi/pub/NetBSD/misc/proff/
 
 MAINTAINER=	naddy@FreeBSD.org
 
diff --git a/www/surfraw/distinfo b/www/surfraw/distinfo
index b6671d1b0fff..78c2cf62983e 100644
--- a/www/surfraw/distinfo
+++ b/www/surfraw/distinfo
@@ -1 +1 @@
-MD5 (surfraw-1.0.3.tar.gz) = 02ccda12ac516f2d171912d782bcd6a6
+MD5 (surfraw-1.0.4.tar.gz) = 4d83c4dce08bb05853a59285e7ba301d
diff --git a/www/surfraw/files/patch-aa b/www/surfraw/files/patch-aa
index ba9ee48e5d71..9b22acbbe738 100644
--- a/www/surfraw/files/patch-aa
+++ b/www/surfraw/files/patch-aa
@@ -1,6 +1,9 @@
---- surfraw.conf.in.orig	Sun Aug  6 16:09:01 2000
-+++ surfraw.conf.in	Sun Aug 20 19:38:34 2000
-@@ -59,4 +59,4 @@
+
+$FreeBSD$
+
+--- surfraw.conf.in.orig	Sat Oct 27 22:53:46 2001
++++ surfraw.conf.in	Sat Oct 27 22:54:11 2001
+@@ -73,4 +73,4 @@
  defyn SURFRAW_escape_url_args	yes
  
  # file containing list of elvi
diff --git a/www/surfraw/files/patch-ab b/www/surfraw/files/patch-ab
deleted file mode 100644
index 9e3131cd2d9b..000000000000
--- a/www/surfraw/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- surfraw.in.orig	Sun Aug 20 19:47:02 2000
-+++ surfraw.in	Sun Aug 20 19:47:17 2000
-@@ -245,7 +245,7 @@
- }
- 
- w3_browse_url () {
--   if ok SURFRAW_new_screen && ! test -z "$STY"; then
-+   if ok SURFRAW_new_screen && [ ! -z "$STY" ]; then
-    	screen=yes
-    else
-    	screen=no
diff --git a/www/surfraw/files/patch-ac b/www/surfraw/files/patch-ac
index bfa2e8128653..dc744d0feaa1 100644
--- a/www/surfraw/files/patch-ac
+++ b/www/surfraw/files/patch-ac
@@ -1,10 +1,13 @@
---- Makefile.am.orig	Thu Aug 24 20:43:26 2000
-+++ Makefile.am	Sun Sep 17 16:26:39 2000
-@@ -3,7 +3,6 @@
+
+$FreeBSD$
+
+--- Makefile.am.orig	Sat Oct 27 23:01:39 2001
++++ Makefile.am	Sat Oct 27 23:01:53 2001
+@@ -2,7 +2,6 @@
  SUBDIRS		= elvi
  
- bin_SCRIPTS	= surfraw surfraw-netscape-remote
+ bin_SCRIPTS	= surfraw
 -sysconf_DATA	= surfraw.conf
  devel_extra	= banner prebuild
  EXTRA_DIST	= surfraw.lsm.in surfraw.in surfraw.spec.in \
-                   aclocal.m4 \
+                   aclocal.m4 HACKING \
diff --git a/www/surfraw/files/patch-ad b/www/surfraw/files/patch-ad
index f983cedcbfa1..7c4b62ec1147 100644
--- a/www/surfraw/files/patch-ad
+++ b/www/surfraw/files/patch-ad
@@ -1,23 +1,26 @@
---- Makefile.in.orig	Wed Jul 18 01:09:52 2001
-+++ Makefile.in	Wed Jul 18 01:12:28 2001
-@@ -70,7 +70,6 @@
- SUBDIRS		= elvi
+
+$FreeBSD$
+
+--- Makefile.in.orig	Sat Oct 27 23:03:37 2001
++++ Makefile.in	Sat Oct 27 23:04:04 2001
+@@ -71,7 +71,6 @@
+ SUBDIRS = elvi
  
- bin_SCRIPTS	= surfraw surfraw-netscape-remote
--sysconf_DATA	= surfraw.conf
- devel_extra	= banner prebuild
- EXTRA_DIST	= surfraw.lsm.in surfraw.in surfraw.spec.in \
-                   aclocal.m4 HACKING \
-@@ -81,8 +80,6 @@
- surfraw-netscape-remote
+ bin_SCRIPTS = surfraw
+-sysconf_DATA = surfraw.conf
+ devel_extra = banner prebuild
+ EXTRA_DIST = surfraw.lsm.in surfraw.in surfraw.spec.in                   aclocal.m4 HACKING 		  $(devel_extra)
+ 
+@@ -80,8 +79,6 @@
+ CONFIG_CLEAN_FILES =  surfraw.conf surfraw.lsm surfraw surfraw.spec
  SCRIPTS =  $(bin_SCRIPTS)
  
 -DATA =  $(sysconf_DATA)
 -
  DIST_COMMON =  README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
  Makefile.in NEWS TODO aclocal.m4 config.guess config.sub configure \
- configure.in install-sh missing mkinstalldirs \
-@@ -141,25 +138,6 @@
+ configure.in install-sh missing mkinstalldirs surfraw.conf.in \
+@@ -136,25 +133,6 @@
  	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
  	done
  
@@ -43,29 +46,49 @@
  # This directory's subdirectories are mostly independent; you can cd
  # into them and run `make' without going through this Makefile.
  # To change the values of `make' variables: instead of editing Makefiles,
-@@ -280,11 +258,11 @@
- check: all-am
- 	$(MAKE) check-recursive
+@@ -310,7 +288,7 @@
+ check: check-recursive
+ installcheck-am:
  installcheck: installcheck-recursive
--all-am: Makefile $(SCRIPTS) $(DATA)
-+all-am: Makefile $(SCRIPTS)
- 
 -install-exec-am: install-binSCRIPTS install-sysconfDATA
 +install-exec-am: install-binSCRIPTS
+ install-exec: install-exec-recursive
  
+ install-data-am:
+@@ -319,15 +297,15 @@
+ install-am: all-am
+ 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+ install: install-recursive
 -uninstall-am: uninstall-binSCRIPTS uninstall-sysconfDATA
 +uninstall-am: uninstall-binSCRIPTS
+ uninstall: uninstall-recursive
+-all-am: Makefile $(SCRIPTS) $(DATA)
++all-am: Makefile $(SCRIPTS)
+ all-redirect: all-recursive
+ install-strip:
+ 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+ installdirs: installdirs-recursive
+ installdirs-am:
+-	$(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(sysconfdir)
++	$(mkinstalldirs)  $(DESTDIR)$(bindir)
+ 
  
- install-exec: install-exec-recursive install-exec-am
- 	@$(NORMAL_INSTALL)
-@@ -338,8 +316,8 @@
- 	@echo "it deletes files that may require special tools to rebuild."
+ mostlyclean-generic:
+@@ -360,12 +338,11 @@
+ maintainer-clean: maintainer-clean-recursive
  	-rm -f config.status
  
 -.PHONY: uninstall-binSCRIPTS install-binSCRIPTS uninstall-sysconfDATA \
 -install-sysconfDATA install-data-recursive uninstall-data-recursive \
-+.PHONY: uninstall-binSCRIPTS install-binSCRIPTS \
-+install-data-recursive uninstall-data-recursive \
- install-exec-recursive uninstall-exec-recursive installdirs-recursive \
- uninstalldirs-recursive all-recursive check-recursive \
- installcheck-recursive info-recursive dvi-recursive \
+-install-exec-recursive uninstall-exec-recursive installdirs-recursive \
+-uninstalldirs-recursive all-recursive check-recursive \
+-installcheck-recursive info-recursive dvi-recursive \
+-mostlyclean-recursive distclean-recursive clean-recursive \
++.PHONY: uninstall-binSCRIPTS install-binSCRIPTS install-data-recursive \
++uninstall-data-recursive install-exec-recursive \
++uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
++all-recursive check-recursive installcheck-recursive info-recursive \
++dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
+ maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
+ distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
+ dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
diff --git a/www/surfraw/files/patch-ae b/www/surfraw/files/patch-ae
index 85f7d8f6771f..ca8f7f12365e 100644
--- a/www/surfraw/files/patch-ae
+++ b/www/surfraw/files/patch-ae
@@ -1,9 +1,12 @@
---- elvi/Makefile.am.orig	Sun Sep 17 14:45:18 2000
-+++ elvi/Makefile.am	Sun Sep 17 14:48:39 2000
-@@ -34,7 +34,7 @@
+
+$FreeBSD$
+
+--- elvi/Makefile.am.orig	Sat Oct 27 23:05:41 2001
++++ elvi/Makefile.am	Sat Oct 27 23:05:58 2001
+@@ -39,7 +39,7 @@
+ 		  woffle \
  		  xxx \
  		  yahoo
- 
 -sysconf_DATA	= surfraw_elvi.list
 +pkgdata_DATA	= surfraw_elvi.list
  
diff --git a/www/surfraw/files/patch-af b/www/surfraw/files/patch-af
index 4174a6480de3..5cfe64e43395 100644
--- a/www/surfraw/files/patch-af
+++ b/www/surfraw/files/patch-af
@@ -1,13 +1,16 @@
---- elvi/Makefile.in.orig	Sat Jan 13 03:39:42 2001
-+++ elvi/Makefile.in	Wed Jul 18 01:16:36 2001
-@@ -104,14 +104,14 @@
- 		  xxx \
- 		  yahoo
+
+$FreeBSD$
+
+--- elvi/Makefile.in.orig	Sat Oct 27 23:06:22 2001
++++ elvi/Makefile.in	Sat Oct 27 23:07:02 2001
+@@ -70,14 +70,14 @@
  
--sysconf_DATA	= surfraw_elvi.list
-+pkgdata_DATA	= surfraw_elvi.list
+ bin_SCRIPTS =  		  altavista 		  amazon 		  appwatch 		  ask 		  austlii 		  britannica 		  cite 		  cnn 		  currency 		  debbugs 		  debcontents 		  debpackages 		  deja 		  excite 		  fast 		  ftpsearch 		  freshmeat 		  jake 		  google 		  linuxdoc 		  netbsd 		  pubmed 		  raging 		  rhyme 		  slashdot 		  sundocs 		  sourceforge 		  stockquote 		  scaleplus 		  sunsolve 		  swhois 		  thesaurus 		  translate 		  W 		  webster 		  wetandwild 		  woffle 		  xxx 		  yahoo
  
- EXTRA_DIST	= $(bin_SCRIPTS)
+-sysconf_DATA = surfraw_elvi.list
++pkgdata_DATA = surfraw_elvi.list
+ 
+ EXTRA_DIST = $(bin_SCRIPTS)
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_CLEAN_FILES = 
  SCRIPTS =  $(bin_SCRIPTS)
@@ -17,7 +20,7 @@
  
  DIST_COMMON =  Makefile.am Makefile.in
  
-@@ -150,23 +150,23 @@
+@@ -115,23 +115,23 @@
  	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
  	done
  
@@ -51,38 +54,42 @@
  	done
  tags: TAGS
  TAGS:
-@@ -188,7 +188,7 @@
- check: all
- 	$(MAKE)
- installcheck:
--install-exec: install-binSCRIPTS install-sysconfDATA
-+install-exec: install-binSCRIPTS install-pkgdataDATA
- 	@$(NORMAL_INSTALL)
+@@ -160,23 +160,23 @@
+ check: check-am
+ installcheck-am:
+ installcheck: installcheck-am
+-install-exec-am: install-binSCRIPTS install-sysconfDATA
++install-exec-am: install-binSCRIPTS
+ install-exec: install-exec-am
  
- install-data: 
-@@ -197,12 +197,12 @@
- install: install-exec install-data all
- 	@:
- 
--uninstall: uninstall-binSCRIPTS uninstall-sysconfDATA
-+uninstall: uninstall-binSCRIPTS uninstall-pkgdataDATA
+-install-data-am:
++install-data-am: install-pkgdataDATA
+ install-data: install-data-am
  
+ install-am: all-am
+ 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+ install: install-am
+-uninstall-am: uninstall-binSCRIPTS uninstall-sysconfDATA
++uninstall-am: uninstall-binSCRIPTS uninstall-pkgdataDATA
+ uninstall: uninstall-am
+ all-am: Makefile $(SCRIPTS) $(DATA)
+ all-redirect: all-am
  install-strip:
- 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
+ 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
  installdirs:
--	$(mkinstalldirs)  $(DATADIR)$(bindir) $(DATADIR)$(sysconfdir)
-+	$(mkinstalldirs)  $(DATADIR)$(bindir) $(DATADIR)$(pkgdatadir)
+-	$(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(sysconfdir)
++	$(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(pkgdatadir)
  
  
  mostlyclean-generic:
-@@ -230,8 +230,8 @@
- 	@echo "This command is intended for maintainers to use;"
- 	@echo "it deletes files that may require special tools to rebuild."
+@@ -206,8 +206,8 @@
+ 
+ maintainer-clean: maintainer-clean-am
  
 -.PHONY: uninstall-binSCRIPTS install-binSCRIPTS uninstall-sysconfDATA \
--install-sysconfDATA tags distdir info dvi installcheck install-exec \
+-install-sysconfDATA tags distdir info-am info dvi-am dvi check check-am \
 +.PHONY: uninstall-binSCRIPTS install-binSCRIPTS uninstall-pkgdataDATA \
-+install-pkgdataDATA tags distdir info dvi installcheck install-exec \
- install-data install uninstall all installdirs mostlyclean-generic \
- distclean-generic clean-generic maintainer-clean-generic clean \
- mostlyclean distclean maintainer-clean
++install-pkgdataDATA tags distdir info-am info dvi-am dvi check check-am \
+ installcheck-am installcheck install-exec-am install-exec \
+ install-data-am install-data install-am install uninstall-am uninstall \
+ all-redirect all-am all installdirs mostlyclean-generic \
diff --git a/www/surfraw/pkg-plist b/www/surfraw/pkg-plist
index d514d9b0768d..5f620a0c162b 100644
--- a/www/surfraw/pkg-plist
+++ b/www/surfraw/pkg-plist
@@ -9,31 +9,34 @@ 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
 @unexec if cmp -s %D/etc/surfraw.conf %D/share/examples/surfraw/surfraw.conf; then rm -f %D/etc/surfraw.conf; fi