Date: Mon, 14 Jan 2008 19:52:42 +0000 (UTC) From: Philippe Audeoud <jadawin@tuxaco.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/119669: [update] www/surfraw - update to 2.2.0 Message-ID: <20080114195242.92473857C0@ilove.tuxaco.net> Resent-Message-ID: <200801141950.m0EJo0nw018024@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 119669
>Category: ports
>Synopsis: [update] www/surfraw - update to 2.2.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon Jan 14 19:50:00 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Philippe Audeoud
>Release: FreeBSD 7.0-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD athines 7.0-PRERELEASE FreeBSD 7.0-PRERELEASE #1: Mon Jan 7 21:29:03 CET 2008 root@glenrothes:/usr/obj/usr/src/sys/GENERIC i386
>Description:
- update to 2.2.0
- take maintainership
- update pkg-descr
- update pkg-plist
- remove patches
>How-To-Repeat:
>Fix:
--- patch-surfraw.1 begins here ---
diff -ruN www/surfraw.orig/Makefile www/surfraw/Makefile
--- www/surfraw.orig/Makefile 2008-01-10 16:35:22.000000000 +0000
+++ www/surfraw/Makefile 2008-01-14 17:15:06.000000000 +0000
@@ -5,14 +5,22 @@
# $FreeBSD: ports/www/surfraw/Makefile,v 1.14 2005/10/03 07:13:27 linimon Exp $
PORTNAME= surfraw
-PORTVERSION= 1.0.7
+PORTVERSION= 2.2.0
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_NETBSD}
+MASTER_SITES= http://surfraw.alioth.debian.org/dist/
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= jadawin@tuxaco.net
COMMENT= Command line interface to popular WWW search engines
GNU_CONFIGURE= yes
+USE_GMAKE= yes
+USE_PERL5= yes
+
+MAN1= surfraw-update-path.1 \
+ surfraw.1 \
+ elvi.1sr \
+ opensearch-discover.1 \
+ opensearch-genquery.1
post-install:
${MKDIR} ${PREFIX}/share/examples/surfraw
diff -ruN www/surfraw.orig/distinfo www/surfraw/distinfo
--- www/surfraw.orig/distinfo 2008-01-10 16:35:22.000000000 +0000
+++ www/surfraw/distinfo 2008-01-14 16:01:25.000000000 +0000
@@ -1,3 +1,3 @@
-MD5 (surfraw-1.0.7.tar.gz) = 0957382bbdebf3d678879fa5d2592c9d
-SHA256 (surfraw-1.0.7.tar.gz) = 2a784c28a20219e4a6de087f5b26ddeca4c7ea131968a52ba3a2f79b4c4097c8
-SIZE (surfraw-1.0.7.tar.gz) = 63596
+MD5 (surfraw-2.2.0.tar.gz) = 9b1b98e9fb7d22d6e4ebaa846f9c9633
+SHA256 (surfraw-2.2.0.tar.gz) = 1ba1aed08864d2852aabe65fc4c067eabb8ea3c70d9f0b575d29ce92d9ace16f
+SIZE (surfraw-2.2.0.tar.gz) = 127765
diff -ruN www/surfraw.orig/files/patch-aa www/surfraw/files/patch-aa
--- www/surfraw.orig/files/patch-aa 2008-01-10 16:35:22.000000000 +0000
+++ www/surfraw/files/patch-aa 1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-
-$FreeBSD: ports/www/surfraw/files/patch-aa,v 1.2 2001/11/04 15:52:09 naddy Exp $
-
---- 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
--def SURFRAW_elvi_list @sysconfdir@/surfraw_elvi.list
-+def SURFRAW_elvi_list @prefix@/share/surfraw/surfraw_elvi.list
diff -ruN www/surfraw.orig/files/patch-ad www/surfraw/files/patch-ad
--- www/surfraw.orig/files/patch-ad 2008-01-10 16:35:22.000000000 +0000
+++ www/surfraw/files/patch-ad 1970-01-01 00:00:00.000000000 +0000
@@ -1,94 +0,0 @@
-
-$FreeBSD: ports/www/surfraw/files/patch-ad,v 1.3 2001/11/04 15:52:09 naddy Exp $
-
---- 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 surfraw.conf.in \
-@@ -136,25 +133,6 @@
- rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
- done
-
--install-sysconfDATA: $(sysconf_DATA)
-- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
-- @list='$(sysconf_DATA)'; for p in $$list; do \
-- if test -f $(srcdir)/$$p; then \
-- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p"; \
-- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p; \
-- else if test -f $$p; then \
-- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(sysconfdir)/$$p"; \
-- $(INSTALL_DATA) $$p $(DESTDIR)$(sysconfdir)/$$p; \
-- fi; fi; \
-- done
--
--uninstall-sysconfDATA:
-- @$(NORMAL_UNINSTALL)
-- list='$(sysconf_DATA)'; for p in $$list; do \
-- rm -f $(DESTDIR)$(sysconfdir)/$$p; \
-- done
--
- # 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,
-@@ -310,7 +288,7 @@
- check: check-recursive
- installcheck-am:
- installcheck: installcheck-recursive
--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)
-
-
- 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 \
--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 -ruN www/surfraw.orig/files/patch-af www/surfraw/files/patch-af
--- www/surfraw.orig/files/patch-af 2008-01-10 16:35:22.000000000 +0000
+++ www/surfraw/files/patch-af 1970-01-01 00:00:00.000000000 +0000
@@ -1,95 +0,0 @@
-
-$FreeBSD: ports/www/surfraw/files/patch-af,v 1.3 2001/11/04 15:52:09 naddy Exp $
-
---- 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 @@
-
- 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
-
--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)
-
--DATA = $(sysconf_DATA)
-+DATA = $(pkgdata_DATA)
-
- DIST_COMMON = Makefile.am Makefile.in
-
-@@ -115,23 +115,23 @@
- rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
- done
-
--install-sysconfDATA: $(sysconf_DATA)
-+install-pkgdataDATA: $(pkgdata_DATA)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
-- @list='$(sysconf_DATA)'; for p in $$list; do \
-+ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-+ @list='$(pkgdata_DATA)'; for p in $$list; do \
- if test -f $(srcdir)/$$p; then \
-- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p"; \
-- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p; \
-+ echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p"; \
-+ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p; \
- else if test -f $$p; then \
-- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(sysconfdir)/$$p"; \
-- $(INSTALL_DATA) $$p $(DESTDIR)$(sysconfdir)/$$p; \
-+ echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p"; \
-+ $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p; \
- fi; fi; \
- done
-
--uninstall-sysconfDATA:
-+uninstall-pkgdataDATA:
- @$(NORMAL_UNINSTALL)
-- list='$(sysconf_DATA)'; for p in $$list; do \
-- rm -f $(DESTDIR)$(sysconfdir)/$$p; \
-+ list='$(pkgdata_DATA)'; for p in $$list; do \
-+ rm -f $(DESTDIR)$(pkgdatadir)/$$p; \
- 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
-
--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) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
- installdirs:
-- $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(sysconfdir)
-+ $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(pkgdatadir)
-
-
- mostlyclean-generic:
-@@ -206,8 +206,8 @@
-
- maintainer-clean: maintainer-clean-am
-
--.PHONY: uninstall-binSCRIPTS install-binSCRIPTS uninstall-sysconfDATA \
--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-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 -ruN www/surfraw.orig/pkg-descr www/surfraw/pkg-descr
--- www/surfraw.orig/pkg-descr 2008-01-10 16:35:22.000000000 +0000
+++ www/surfraw/pkg-descr 2008-01-14 17:08:12.000000000 +0000
@@ -3,4 +3,4 @@
amazon.com, research index, slashdot and many others. Output is
directed to a browser.
-WWW: http://surfraw.sourceforge.net/
+WWW: http://surfraw.alioth.debian.org/
diff -ruN www/surfraw.orig/pkg-plist www/surfraw/pkg-plist
--- www/surfraw.orig/pkg-plist 2008-01-10 16:35:22.000000000 +0000
+++ www/surfraw/pkg-plist 2008-01-14 17:15:48.000000000 +0000
@@ -1,50 +1,168 @@
-@comment $FreeBSD: ports/www/surfraw/pkg-plist,v 1.6 2001/12/25 17:25:33 naddy Exp $
-bin/W
-bin/altavista
-bin/amazon
-bin/appwatch
-bin/ask
-bin/austlii
-bin/britannica
-bin/cite
-bin/cnn
-bin/currency
-bin/debbugs
-bin/debcontents
-bin/debpackages
-bin/deja
-bin/excite
-bin/fast
-bin/filesearching
-bin/freebsd
-bin/freshmeat
-bin/ftpfind
-bin/ftpsearch
-bin/google
-bin/jake
-bin/netbsd
-bin/openbsd
-bin/pubmed
-bin/raging
-bin/rhyme
-bin/scaleplus
-bin/slashdot
-bin/slinuxdoc
-bin/sourceforge
-bin/stockquote
-bin/sundocs
-bin/sunsolve
+bin/opensearch-discover
+bin/opensearch-genquery
+bin/sr
bin/surfraw
-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
+bin/surfraw-update-path
+etc/surfraw.bookmarks
+etc/surfraw.conf
+lib/surfraw/W
+lib/surfraw/alioth
+lib/surfraw/altavista
+lib/surfraw/amazon
+lib/surfraw/archpkg
+lib/surfraw/ask
+lib/surfraw/austlii
+lib/surfraw/bbcnews
+lib/surfraw/cddb
+lib/surfraw/cia
+lib/surfraw/cite
+lib/surfraw/cnn
+lib/surfraw/codesearch
+lib/surfraw/ctan
+lib/surfraw/currency
+lib/surfraw/cve
+lib/surfraw/debbugs
+lib/surfraw/debcontents
+lib/surfraw/deblists
+lib/surfraw/deblogs
+lib/surfraw/debpackages
+lib/surfraw/debpts
+lib/surfraw/debsec
+lib/surfraw/debwiki
+lib/surfraw/deja
+lib/surfraw/discogs
+lib/surfraw/dmoz
+lib/surfraw/ebay
+lib/surfraw/etym
+lib/surfraw/excite
+lib/surfraw/fast
+lib/surfraw/filesearching
+lib/surfraw/foldoc
+lib/surfraw/freebsd
+lib/surfraw/freedb
+lib/surfraw/freshmeat
+lib/surfraw/fsfdir
+lib/surfraw/genpkg
+lib/surfraw/google
+lib/surfraw/gutenberg
+lib/surfraw/happypenguin
+lib/surfraw/imdb
+lib/surfraw/ixquick
+lib/surfraw/lastfm
+lib/surfraw/leodict
+lib/surfraw/musicbrainz
+lib/surfraw/netbsd
+lib/surfraw/openbsd
+lib/surfraw/opensearch
+lib/surfraw/pgpkeys
+lib/surfraw/port
+lib/surfraw/pubmed
+lib/surfraw/rae
+lib/surfraw/rfc
+lib/surfraw/rhyme
+lib/surfraw/scaleplus
+lib/surfraw/scholar
+lib/surfraw/scpan
+lib/surfraw/slashdot
+lib/surfraw/slinuxdoc
+lib/surfraw/sourceforge
+lib/surfraw/stockquote
+lib/surfraw/sundocs
+lib/surfraw/sunsolve
+lib/surfraw/thesaurus
+lib/surfraw/translate
+lib/surfraw/w3css
+lib/surfraw/w3html
+lib/surfraw/w3link
+lib/surfraw/w3rdf
+lib/surfraw/wayback
+lib/surfraw/webster
+lib/surfraw/wetandwild
+lib/surfraw/wikipedia
+lib/surfraw/woffle
+lib/surfraw/xxx
+lib/surfraw/yahoo
+lib/surfraw/yubnub
+man/man1/sr.1.gz
+man/man1/W.1.gz
+man/man1/alioth.1sr.gz
+man/man1/altavista.1sr.gz
+man/man1/amazon.1sr.gz
+man/man1/archpkg.1sr.gz
+man/man1/ask.1sr.gz
+man/man1/austlii.1sr.gz
+man/man1/bbcnews.1sr.gz
+man/man1/cddb.1sr.gz
+man/man1/cite.1sr.gz
+man/man1/cia.1sr.gz
+man/man1/cnn.1sr.gz
+man/man1/codesearch.1sr.gz
+man/man1/ctan.1sr.gz
+man/man1/currency.1sr.gz
+man/man1/cve.1sr.gz
+man/man1/debbugs.1sr.gz
+man/man1/debcontents.1sr.gz
+man/man1/deblists.1sr.gz
+man/man1/deblogs.1sr.gz
+man/man1/debpackages.1sr.gz
+man/man1/debpts.1sr.gz
+man/man1/debsec.1sr.gz
+man/man1/debwiki.1sr.gz
+man/man1/deja.1sr.gz
+man/man1/discogs.1sr.gz
+man/man1/dmoz.1sr.gz
+man/man1/ebay.1sr.gz
+man/man1/etym.1sr.gz
+man/man1/excite.1sr.gz
+man/man1/fast.1sr.gz
+man/man1/filesearching.1sr.gz
+man/man1/imdb.1sr.gz
+man/man1/foldoc.1sr.gz
+man/man1/freebsd.1sr.gz
+man/man1/freedb.1sr.gz
+man/man1/freshmeat.1sr.gz
+man/man1/fsfdir.1sr.gz
+man/man1/genpkg.1sr.gz
+man/man1/google.1sr.gz
+man/man1/gutenberg.1sr.gz
+man/man1/happypenguin.1sr.gz
+man/man1/ixquick.1sr.gz
+man/man1/lastfm.1sr.gz
+man/man1/leodict.1sr.gz
+man/man1/musicbrainz.1sr.gz
+man/man1/netbsd.1sr.gz
+man/man1/openbsd.1sr.gz
+man/man1/pgpkeys.1sr.gz
+man/man1/port.1sr.gz
+man/man1/pubmed.1sr.gz
+man/man1/rae.1sr.gz
+man/man1/rfc.1sr.gz
+man/man1/rhyme.1sr.gz
+man/man1/scaleplus.1sr.gz
+man/man1/scholar.1sr.gz
+man/man1/scpan.1sr.gz
+man/man1/slashdot.1sr.gz
+man/man1/slinuxdoc.1sr.gz
+man/man1/sourceforge.1sr.gz
+man/man1/stockquote.1sr.gz
+man/man1/sundocs.1sr.gz
+man/man1/sunsolve.1sr.gz
+man/man1/thesaurus.1sr.gz
+man/man1/translate.1sr.gz
+man/man1/w3css.1sr.gz
+man/man1/w3html.1sr.gz
+man/man1/w3link.1sr.gz
+man/man1/w3rdf.1sr.gz
+man/man1/wayback.1sr.gz
+man/man1/webster.1sr.gz
+man/man1/wetandwild.1sr.gz
+man/man1/wikipedia.1sr.gz
+man/man1/woffle.1sr.gz
+man/man1/xxx.1sr.gz
+man/man1/yahoo.1sr.gz
+man/man1/yubnub.1sr.gz
+man/man1/opensearch.1sr.gz
share/examples/surfraw/surfraw.conf
-share/surfraw/surfraw_elvi.list
+@unexec if cmp -s %D/etc/surfraw.conf %D/share/examples/surfraw/surfraw.conf; then rm -f %D/etc/surfraw.conf; fi
@dirrm share/examples/surfraw
-@dirrm share/surfraw
+@dirrm lib/surfraw
--- patch-surfraw.1 ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20080114195242.92473857C0>