Update to 1.0.3.

PR:  29050
Submitted by:  maintainer

5 files changed, 66 insertions, 87 deletions

diff --git a/www/surfraw/distinfo b/www/surfraw/distinfo
index 5e2f9e69293f..b6671d1b0fff 100644
--- a/www/surfraw/distinfo
+++ b/www/surfraw/distinfo
@@ -1 +1 @@
-MD5 (surfraw-1.0.1.tar.gz) = da4b780bf227f74cc39679b81b0503fc
+MD5 (surfraw-1.0.3.tar.gz) = 02ccda12ac516f2d171912d782bcd6a6
diff --git a/www/surfraw/files/patch-ad b/www/surfraw/files/patch-ad
index 9fb345ead26b..f983cedcbfa1 100644
--- a/www/surfraw/files/patch-ad
+++ b/www/surfraw/files/patch-ad
@@ -1,14 +1,14 @@
---- Makefile.in.orig	Fri Aug 25 15:44:47 2000
-+++ Makefile.in	Sun Sep 17 16:26:48 2000
+--- 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
+ 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 		  $(devel_extra)
- 
-@@ -80,8 +79,6 @@
+ 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
  SCRIPTS =  $(bin_SCRIPTS)
  
@@ -17,7 +17,7 @@
  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 \
-@@ -139,25 +136,6 @@
+@@ -141,25 +138,6 @@
  	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
  	done
  
@@ -43,49 +43,29 @@
  # 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,
-@@ -313,7 +291,7 @@
- check: check-recursive
- installcheck-am:
+@@ -280,11 +258,11 @@
+ check: all-am
+ 	$(MAKE) check-recursive
  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:
-@@ -322,15 +300,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)
- 
  
- mostlyclean-generic:
-@@ -363,12 +341,11 @@
- maintainer-clean: maintainer-clean-recursive
+ 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."
  	-rm -f config.status
  
 -.PHONY: uninstall-binSCRIPTS install-binSCRIPTS uninstall-sysconfDATA \
 -install-sysconfDATA 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 \
-+.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 \
++.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 \
diff --git a/www/surfraw/files/patch-af b/www/surfraw/files/patch-af
index 18f5a83857e7..4174a6480de3 100644
--- a/www/surfraw/files/patch-af
+++ b/www/surfraw/files/patch-af
@@ -1,13 +1,13 @@
---- elvi/Makefile.in.orig	Sun Sep 17 14:45:22 2000
-+++ elvi/Makefile.in	Sun Sep 17 14:50:10 2000
-@@ -70,14 +70,14 @@
- bin_SCRIPTS =  		  altavista 		  appwatch 		  ask 		  austlii 		  britannica 		  cite 		  cnn 		  currency 		  deja 		  excite 		  fast 		  ftpsearch 		  freshmeat 		  jake 		  google 		  ircsearch 		  linuxdoc 		  netbsd 		  newscientist 		  pubmed 		  raging 		  rhyme 		  slashdot 		  sundocs 		  stockquote 		  sunsolve 		  thesaurus 		  translate 		  W 		  webster 		  wetandwild 		  xxx 		  yahoo
+--- 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
  
+-sysconf_DATA	= surfraw_elvi.list
++pkgdata_DATA	= surfraw_elvi.list
  
--sysconf_DATA = surfraw_elvi.list
-+pkgdata_DATA = surfraw_elvi.list
- 
- EXTRA_DIST = $(bin_SCRIPTS)
+ EXTRA_DIST	= $(bin_SCRIPTS)
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_CLEAN_FILES = 
  SCRIPTS =  $(bin_SCRIPTS)
@@ -17,7 +17,7 @@
  
  DIST_COMMON =  Makefile.am Makefile.in
  
-@@ -115,23 +115,23 @@
+@@ -150,23 +150,23 @@
  	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
  	done
  
@@ -51,42 +51,38 @@
  	done
  tags: TAGS
  TAGS:
-@@ -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
+@@ -188,7 +188,7 @@
+ check: all
+ 	$(MAKE)
+ installcheck:
+-install-exec: install-binSCRIPTS install-sysconfDATA
++install-exec: install-binSCRIPTS install-pkgdataDATA
+ 	@$(NORMAL_INSTALL)
  
--install-data-am:
-+install-data-am: install-pkgdataDATA
- install-data: install-data-am
+ install-data: 
+@@ -197,12 +197,12 @@
+ install: install-exec install-data all
+ 	@:
+ 
+-uninstall: uninstall-binSCRIPTS uninstall-sysconfDATA
++uninstall: uninstall-binSCRIPTS uninstall-pkgdataDATA
  
- 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) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+ 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
  installdirs:
--	$(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(sysconfdir)
-+	$(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(pkgdatadir)
+-	$(mkinstalldirs)  $(DATADIR)$(bindir) $(DATADIR)$(sysconfdir)
++	$(mkinstalldirs)  $(DATADIR)$(bindir) $(DATADIR)$(pkgdatadir)
  
  
  mostlyclean-generic:
-@@ -206,8 +206,8 @@
- 
- maintainer-clean: maintainer-clean-am
+@@ -230,8 +230,8 @@
+ 	@echo "This command is intended for maintainers to use;"
+ 	@echo "it deletes files that may require special tools to rebuild."
  
 -.PHONY: uninstall-binSCRIPTS install-binSCRIPTS uninstall-sysconfDATA \
--install-sysconfDATA tags distdir info-am info dvi-am dvi check check-am \
+-install-sysconfDATA tags distdir info dvi installcheck install-exec \
 +.PHONY: uninstall-binSCRIPTS install-binSCRIPTS uninstall-pkgdataDATA \
-+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 \
++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
diff --git a/www/surfraw/pkg-deinstall b/www/surfraw/pkg-deinstall
index be71e9d11ff4..521f2bff7ef8 100644
--- a/www/surfraw/pkg-deinstall
+++ b/www/surfraw/pkg-deinstall
@@ -37,12 +37,12 @@ fi
 #
 case $2 in
     DEINSTALL)
+        : nothing to deinstall for this port
+	;;
+    POST-DEINSTALL)
 	if [ -f ${CONFIG_FILE} ]; then
 	    do_notice "$1"
 	fi
-	;;
-    POST-DEINSTALL)
-        : nothing to post-deinstall for this port
         ;;
     *)
 	echo "usage: $0 distname { DEINSTALL | POST-DEINSTALL }" >&2
diff --git a/www/surfraw/pkg-plist b/www/surfraw/pkg-plist
index 13f08958820e..d514d9b0768d 100644
--- a/www/surfraw/pkg-plist
+++ b/www/surfraw/pkg-plist
@@ -1,5 +1,7 @@
+@comment $FreeBSD$
 bin/W
 bin/altavista
+bin/amazon
 bin/appwatch
 bin/ask
 bin/austlii
@@ -21,6 +23,7 @@ bin/newscientist
 bin/pubmed
 bin/raging
 bin/rhyme
+bin/scaleplus
 bin/slashdot
 bin/stockquote
 bin/sundocs