Date: Sun, 28 Oct 2001 00:37:03 +0200 (CEST) From: Christian Weisgerber <naddy@mips.inka.de> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/31540: www/surfraw: update to 1.0.4 Message-ID: <200110272237.f9RMb3h78300@kemoauc.mips.inka.de>
next in thread | raw e-mail | index | archive | help
>Number: 31540
>Category: ports
>Synopsis: www/surfraw: update to 1.0.4
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Oct 27 16:40:01 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator: Christian Weisgerber
>Release: FreeBSD 5.0-CURRENT alpha
>Organization:
>Environment:
System: FreeBSD kemoauc.mips.inka.de 5.0-CURRENT FreeBSD 5.0-CURRENT #0: Mon Oct 15 01:43:47 CEST 2001 naddy@kemoauc.mips.inka.de:/home/obj/usr/src/sys/KEMOAUC alpha
>Description:
Update of ports/www/surfraw to 1.0.4.
Adds debbugs, debcontents, debpackages, sourceforge, swhois, woffle.
Removes ircsearch, newscientist.
>How-To-Repeat:
>Fix:
diff -uNr /usr/ports/www/surfraw/Makefile surfraw/Makefile
--- /usr/ports/www/surfraw/Makefile Tue Aug 21 13:16:20 2001
+++ surfraw/Makefile Sat Oct 27 01:44:06 2001
@@ -5,10 +5,10 @@
# $FreeBSD: ports/www/surfraw/Makefile,v 1.4 2001/08/20 12:25:42 trevor Exp $
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@mips.inka.de
diff -uNr /usr/ports/www/surfraw/distinfo surfraw/distinfo
--- /usr/ports/www/surfraw/distinfo Sat Aug 4 21:00:31 2001
+++ surfraw/distinfo Sat Oct 27 01:56:05 2001
@@ -1 +1 @@
-MD5 (surfraw-1.0.3.tar.gz) = 02ccda12ac516f2d171912d782bcd6a6
+MD5 (surfraw-1.0.4.tar.gz) = 4d83c4dce08bb05853a59285e7ba301d
diff -uNr /usr/ports/www/surfraw/files/patch-aa surfraw/files/patch-aa
--- /usr/ports/www/surfraw/files/patch-aa Mon Aug 21 04:49:42 2000
+++ surfraw/files/patch-aa Sat Oct 27 22:55:18 2001
@@ -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 -uNr /usr/ports/www/surfraw/files/patch-ab surfraw/files/patch-ab
--- /usr/ports/www/surfraw/files/patch-ab Mon Aug 21 04:49:42 2000
+++ surfraw/files/patch-ab Thu Jan 1 01:00:00 1970
@@ -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 -uNr /usr/ports/www/surfraw/files/patch-ac surfraw/files/patch-ac
--- /usr/ports/www/surfraw/files/patch-ac Sun Sep 17 21:05:58 2000
+++ surfraw/files/patch-ac Sat Oct 27 23:02:06 2001
@@ -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 -uNr /usr/ports/www/surfraw/files/patch-ad surfraw/files/patch-ad
--- /usr/ports/www/surfraw/files/patch-ad Sat Aug 4 21:00:31 2001
+++ surfraw/files/patch-ad Sat Oct 27 23:05:24 2001
@@ -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
-
- 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
+
+$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
+-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 -uNr /usr/ports/www/surfraw/files/patch-ae surfraw/files/patch-ae
--- /usr/ports/www/surfraw/files/patch-ae Sun Sep 17 21:05:58 2000
+++ surfraw/files/patch-ae Sat Oct 27 23:06:11 2001
@@ -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 -uNr /usr/ports/www/surfraw/files/patch-af surfraw/files/patch-af
--- /usr/ports/www/surfraw/files/patch-af Sat Aug 4 21:00:32 2001
+++ surfraw/files/patch-af Sat Oct 27 23:07:32 2001
@@ -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)
-
- install-data:
-@@ -197,12 +197,12 @@
- install: install-exec install-data all
- @:
-
--uninstall: uninstall-binSCRIPTS uninstall-sysconfDATA
-+uninstall: uninstall-binSCRIPTS uninstall-pkgdataDATA
-
+@@ -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-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 -uNr /usr/ports/www/surfraw/pkg-plist surfraw/pkg-plist
--- /usr/ports/www/surfraw/pkg-plist Sat Aug 4 21:00:32 2001
+++ surfraw/pkg-plist Sat Oct 27 23:09:36 2001
@@ -9,31 +9,34 @@
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
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200110272237.f9RMb3h78300>