update surfraw to 2.2.0

feedback merdely, "if it works for you" jasper
This commit is contained in:
sthen 2008-01-17 20:33:43 +00:00
parent db4df44a28
commit c49eb51f3e
8 changed files with 223 additions and 190 deletions

View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.16 2007/09/15 20:38:26 merdely Exp $
# $OpenBSD: Makefile,v 1.17 2008/01/17 20:33:43 sthen Exp $
COMMENT= command line interface to popular WWW search engines
DISTNAME= surfraw-1.0.7
PKGNAME= ${DISTNAME}p0
DISTNAME= surfraw-2.2.0
CATEGORIES= www
HOMEPAGE= http://surfraw.sourceforge.net/
HOMEPAGE= http://surfraw.alioth.debian.org/
# Public Domain
PERMIT_PACKAGE_CDROM= Yes
@ -13,16 +12,25 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ftp://ftp.netbsd.org/pub/NetBSD/misc/proff/ \
ftp://ftp.funet.fi/pub/NetBSD/misc/proff/
MASTER_SITES= ${HOMEPAGE}/dist/
CONFIGURE_STYLE= gnu
CONFIGURE_STYLE= gnu
USE_GMAKE= yes
pre-configure:
@perl -pi -e 's,\.(1sr|1)\.gz,.1,g' ${WRKSRC}/links.IN
post-install:
${INSTALL_MAN} ${WRKSRC}/elvi.1sr ${PREFIX}/man/man1/elvi.1
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/surfraw
${INSTALL_DATA} ${WRKSRC}/surfraw.conf ${PREFIX}/share/examples/surfraw
${INSTALL_DATA} ${WRKSRC}/surfraw.conf ${WRKSRC}/surfraw.bookmarks} \
${PREFIX}/share/examples/surfraw
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/surfraw
${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/HACKING \
${PREFIX}/share/doc/surfraw
REGRESS_DEPENDS= ::www/p5-libwww \
::www/surfraw
REGRESS_TARGET= test
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
MD5 (surfraw-1.0.7.tar.gz) = CVc4K73r89Z4h5+l0lksnQ==
RMD160 (surfraw-1.0.7.tar.gz) = MgP6Zh3fqnRWqi77I2rcdI9640E=
SHA1 (surfraw-1.0.7.tar.gz) = G5k2cGawsPBcL5e9HyH8oq7t4Lk=
SHA256 (surfraw-1.0.7.tar.gz) = KnhMKKICGeSm3gh/Wybd7KTH6hMZaKUro6L3m0xAl8g=
SIZE (surfraw-1.0.7.tar.gz) = 63596
MD5 (surfraw-2.2.0.tar.gz) = mxuY6ft9Itbk66qEb5yWMw==
RMD160 (surfraw-2.2.0.tar.gz) = EyrcjTi9QQNQwqif/Lox31bboLg=
SHA1 (surfraw-2.2.0.tar.gz) = UIU1QoZDya6Y+0BfDRdw3d7QQ5k=
SHA256 (surfraw-2.2.0.tar.gz) = G6Gu0Ihk0oUqq+ZfxMBn6ruOo8cNnwtXXSnOktms4W8=
SIZE (surfraw-2.2.0.tar.gz) = 127765

View File

@ -0,0 +1,19 @@
$OpenBSD: patch-Makefile_in,v 1.1 2008/01/17 20:33:43 sthen Exp $
--- Makefile.in.orig Fri Sep 14 10:51:42 2007
+++ Makefile.in Thu Nov 22 02:54:22 2007
@@ -747,13 +747,13 @@ install-data-hook: links
do \
ln -sf $$target $(DESTDIR)/$$link ;\
done < links
-@OPENSEARCH_TRUE@ ln -sf elvi.1sr.gz $(DESTDIR)/@mandir@/man1/opensearch.1sr.gz
+@OPENSEARCH_TRUE@ ln -sf elvi.1 $(DESTDIR)/@mandir@/man1/opensearch.1
submit-lsm: surfraw.lsm
mail -s add LSM@qqx.org < $<
test: all
- make -C test test
+ ${MAKE} -C test test
.PHONY: test

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-elvi_Makefile_am,v 1.3 2001/12/25 17:26:50 naddy Exp $
--- elvi/Makefile.am.orig Sun Dec 23 11:15:17 2001
+++ elvi/Makefile.am Mon Dec 24 19:52:05 2001
@@ -43,7 +43,7 @@ bin_SCRIPTS = \
woffle \
xxx \
yahoo
-sysconf_DATA = surfraw_elvi.list
+pkgdata_DATA = surfraw_elvi.list
EXTRA_DIST = $(bin_SCRIPTS)

View File

@ -1,92 +0,0 @@
--- elvi/Makefile.in.orig Sun Dec 23 11:18:10 2001
+++ elvi/Makefile.in Mon Dec 24 19:52:05 2001
@@ -70,14 +70,14 @@ sr_text_browser = @sr_text_browser@
bin_SCRIPTS = altavista amazon appwatch ask austlii britannica cite cnn currency debbugs debcontents debpackages deja excite fast filesearching freebsd ftpfind ftpsearch freshmeat jake google slinuxdoc netbsd openbsd 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 @@ uninstall-binSCRIPTS:
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-am: all-am
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-am: maintainer-clean-g
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 \

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-surfraw_conf_IN,v 1.1 2008/01/17 20:33:43 sthen Exp $
--- surfraw.conf.IN.orig Thu Nov 22 01:57:12 2007
+++ surfraw.conf.IN Thu Nov 22 01:57:30 2007
@@ -38,7 +38,7 @@ defyn SURFRAW_graphical no
# name/path of text browser executable
# e.g links, lynx, w3m
-def SURFRAW_text_browser sensible-browser
+def SURFRAW_text_browser /usr/bin/lynx
# name/path of browser executable
# e.g mozilla, netscape etc

View File

@ -1,27 +0,0 @@
--- surfraw.conf.in.orig Wed Nov 7 01:21:16 2001
+++ surfraw.conf.in Wed Nov 7 01:22:00 2001
@@ -34,15 +34,15 @@ def SURFRAW_conf $HOME/.surfraw.conf
# graphical browser? defaults to yes for meatminds. text browser users can
# work it out how to change it.
-def SURFRAW_graphical yes
+def SURFRAW_graphical no
# name/path of text browser executable
# e.g links, lynx, w3m
-def SURFRAW_text_browser @sr_text_browser@
+def SURFRAW_text_browser /usr/bin/lynx
# name/path of browser executable
# e.g mozilla, netscape etc
-def SURFRAW_graphical_browser @sr_graphical_browser@
+def SURFRAW_graphical_browser none
# text browser arguments, or "none"
def SURFRAW_text_browser_args none
@@ -80,4 +80,4 @@ def SURFRAW_results 30
defyn SURFRAW_escape_url_args yes
# file containing list of elvi
-def SURFRAW_elvi_list @sysconfdir@/surfraw_elvi.list
+def SURFRAW_elvi_list @datadir@/@PACKAGE@/surfraw_elvi.list

View File

@ -1,53 +1,178 @@
@comment $OpenBSD: PLIST,v 1.9 2004/09/29 09:38:13 xsa 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
@comment $OpenBSD: PLIST,v 1.10 2008/01/17 20:33:43 sthen Exp $
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
bin/surfraw-update-path
lib/surfraw/
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 man/man1/W.1
@man man/man1/alioth.1
@man man/man1/altavista.1
@man man/man1/amazon.1
@man man/man1/archpkg.1
@man man/man1/ask.1
@man man/man1/austlii.1
@man man/man1/bbcnews.1
@man man/man1/cddb.1
@man man/man1/cia.1
@man man/man1/cite.1
@man man/man1/cnn.1
@man man/man1/codesearch.1
@man man/man1/ctan.1
@man man/man1/currency.1
@man man/man1/cve.1
@man man/man1/debbugs.1
@man man/man1/debcontents.1
@man man/man1/deblists.1
@man man/man1/deblogs.1
@man man/man1/debpackages.1
@man man/man1/debpts.1
@man man/man1/debsec.1
@man man/man1/debwiki.1
@man man/man1/deja.1
@man man/man1/discogs.1
@man man/man1/dmoz.1
@man man/man1/ebay.1
@man man/man1/elvi.1
man/man1/elvi.1sr
@man man/man1/etym.1
@man man/man1/excite.1
@man man/man1/fast.1
@man man/man1/filesearching.1
@man man/man1/foldoc.1
@man man/man1/freebsd.1
@man man/man1/freedb.1
@man man/man1/freshmeat.1
@man man/man1/fsfdir.1
@man man/man1/genpkg.1
@man man/man1/google.1
@man man/man1/gutenberg.1
@man man/man1/happypenguin.1
@man man/man1/imdb.1
@man man/man1/ixquick.1
@man man/man1/lastfm.1
@man man/man1/leodict.1
@man man/man1/musicbrainz.1
@man man/man1/netbsd.1
@man man/man1/openbsd.1
@man man/man1/opensearch-discover.1
@man man/man1/opensearch-genquery.1
@man man/man1/opensearch.1
@man man/man1/pgpkeys.1
@man man/man1/port.1
@man man/man1/pubmed.1
@man man/man1/rae.1
@man man/man1/rfc.1
@man man/man1/rhyme.1
@man man/man1/scaleplus.1
@man man/man1/scholar.1
@man man/man1/scpan.1
@man man/man1/slashdot.1
@man man/man1/slinuxdoc.1
@man man/man1/sourceforge.1
@man man/man1/sr.1
@man man/man1/stockquote.1
@man man/man1/sundocs.1
@man man/man1/sunsolve.1
@man man/man1/surfraw-update-path.1
@man man/man1/surfraw.1
@man man/man1/thesaurus.1
@man man/man1/translate.1
@man man/man1/w3css.1
@man man/man1/w3html.1
@man man/man1/w3link.1
@man man/man1/w3rdf.1
@man man/man1/wayback.1
@man man/man1/webster.1
@man man/man1/wetandwild.1
@man man/man1/wikipedia.1
@man man/man1/woffle.1
@man man/man1/xxx.1
@man man/man1/yahoo.1
@man man/man1/yubnub.1
share/doc/surfraw/
share/doc/surfraw/HACKING
share/doc/surfraw/README
share/examples/surfraw/
share/examples/surfraw/surfraw.bookmarks
@sample ${SYSCONFDIR}/surfraw.bookmarks
share/examples/surfraw/surfraw.conf
@sample ${SYSCONFDIR}/surfraw.conf
share/surfraw/
share/surfraw/surfraw_elvi.list