summaryrefslogtreecommitdiff
path: root/www/surfraw
diff options
context:
space:
mode:
Diffstat (limited to 'www/surfraw')
-rw-r--r--www/surfraw/Makefile34
-rw-r--r--www/surfraw/PLIST146
-rw-r--r--www/surfraw/distinfo10
-rw-r--r--www/surfraw/patches/patch-aa13
-rw-r--r--www/surfraw/patches/patch-ab12
5 files changed, 146 insertions, 69 deletions
diff --git a/www/surfraw/Makefile b/www/surfraw/Makefile
index c0b0603226e..6a314a822fd 100644
--- a/www/surfraw/Makefile
+++ b/www/surfraw/Makefile
@@ -1,33 +1,39 @@
-# $NetBSD: Makefile,v 1.33 2007/02/18 18:14:57 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2007/10/27 11:25:29 wiz Exp $
#
-DISTNAME= surfraw-1.0.8
+DISTNAME= surfraw-2.2.0
CATEGORIES= www
-MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/wiz/
+MASTER_SITES= http://surfraw.alioth.debian.org/dist/
MAINTAINER= wiz@NetBSD.org
-#HOMEPAGE= http://surfraw.sourceforge.net/
+HOMEPAGE= http://surfraw.alioth.debian.org/
COMMENT= Shell Users' Revolutionary Front Rage Against the Web
CONFLICTS+= surfaw-[0-9]*
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
+USE_TOOLS+= gmake
-# Override sysconfdir so that the installation puts the example config file
-# in ${EGDIR}.
-#
-MAKE_FLAGS+= sysconfdir=${EGDIR:Q}
-MAKE_ENV+= AM_MAKEFLAGS=${MAKE_FLAGS:Q}
+DOCDIR= ${PREFIX}/share/doc/surfraw
+EGDIR= ${PREFIX}/share/examples/surfraw
+INSTALLATION_DIRS= ${DOCDIR}
+
+CONF_FILES= ${EGDIR}/surfraw.conf ${PKG_SYSCONFDIR}/surfraw.conf
+CONF_FILES+= ${EGDIR}/surfraw.bookmarks ${PKG_SYSCONFDIR}/surfraw.bookmarks
-DOCDIR= ${PREFIX}/share/doc/surfraw
-EGDIR= ${PREFIX}/share/examples/${PKGBASE}
+# avoid installing useless manpage links
+post-patch:
+ ${MV} ${WRKSRC}/links.IN ${WRKSRC}/links.IN.orig
+ ${GREP} -v elvi.1sr.gz ${WRKSRC}/links.IN.orig > ${WRKSRC}/links.IN
-CONF_FILES= ${EGDIR}/surfraw.conf ${PKG_SYSCONFDIR}/surfraw.conf
-CONF_FILES+= ${EGDIR}/surfraw_elvi.list ${PKG_SYSCONFDIR}/surfraw_elvi.list
+# Override installation to install config files in example dir
+do-install:
+ cd ${WRKSRC} && ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_ARGS} sysconfdir=${EGDIR} install
+# fix man page name; install additional documentation
post-install:
- ${INSTALL_DATA_DIR} ${DOCDIR}
${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
+ ${MV} ${PREFIX}/${PKGMANDIR}/man1/elvi.1sr ${PREFIX}/${PKGMANDIR}/man1/elvi.1
.include "../../mk/bsd.pkg.mk"
diff --git a/www/surfraw/PLIST b/www/surfraw/PLIST
index 72f539f86ea..67b8505f7a3 100644
--- a/www/surfraw/PLIST
+++ b/www/surfraw/PLIST
@@ -1,52 +1,96 @@
-@comment $NetBSD: PLIST,v 1.4 2007/02/18 18:14:57 wiz 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/leodict
-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 $NetBSD: PLIST,v 1.5 2007/10/27 11:25:29 wiz Exp $
+bin/opensearch-discover
+bin/opensearch-genquery
+bin/sr
bin/surfraw
-bin/swhois
-bin/thesaurus
-bin/translate
-bin/webster
-bin/wetandwild
-bin/wikipedia
-bin/woffle
-bin/xxx
-bin/yahoo
-share/doc/${PKGBASE}/README
-share/examples/${PKGBASE}/surfraw.conf
-share/examples/${PKGBASE}/surfraw_elvi.list
-@dirrm share/examples/${PKGBASE}
-@dirrm share/doc/${PKGBASE}
+bin/surfraw-update-path
+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/elvi.1
+man/man1/opensearch-discover.1
+man/man1/opensearch-genquery.1
+man/man1/sr.1
+man/man1/surfraw-update-path.1
+man/man1/surfraw.1
+share/doc/surfraw/README
+share/examples/surfraw/surfraw.bookmarks
+share/examples/surfraw/surfraw.conf
+@dirrm share/examples/surfraw
+@dirrm share/doc/surfraw
+@dirrm lib/surfraw
diff --git a/www/surfraw/distinfo b/www/surfraw/distinfo
index ed5e507f768..8ff42d0e649 100644
--- a/www/surfraw/distinfo
+++ b/www/surfraw/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.7 2007/02/18 18:14:57 wiz Exp $
+$NetBSD: distinfo,v 1.8 2007/10/27 11:25:29 wiz Exp $
-SHA1 (surfraw-1.0.8.tar.gz) = 53a170fe878dab3f0cbc9414008023f2527c63e4
-RMD160 (surfraw-1.0.8.tar.gz) = 6596cbcc5bbba22fe97582ffdcebc28605b0d56a
-Size (surfraw-1.0.8.tar.gz) = 98170 bytes
+SHA1 (surfraw-2.2.0.tar.gz) = 508535428643c9ae98fb405f0d1770ddded04399
+RMD160 (surfraw-2.2.0.tar.gz) = 132adc8d38bd410350c2a89ffcba31df56dba0b8
+Size (surfraw-2.2.0.tar.gz) = 127765 bytes
+SHA1 (patch-aa) = 2587982fce0a6445d11ea71ba7111cf16c01444f
+SHA1 (patch-ab) = a7e99d56668caab338996a20d65d08c7bfb48c27
diff --git a/www/surfraw/patches/patch-aa b/www/surfraw/patches/patch-aa
new file mode 100644
index 00000000000..290cee400e7
--- /dev/null
+++ b/www/surfraw/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.4 2007/10/27 11:25:29 wiz Exp $
+
+--- surfraw.IN.orig 2007-09-07 02:59:36.000000000 +0000
++++ surfraw.IN
+@@ -302,7 +302,7 @@ w3_parse_args () {
+ }
+
+ w3_browse_url () {
+- if ok SURFRAW_new_screen && test -n "$STY" && test $mode == text; then
++ if ok SURFRAW_new_screen && test -n "$STY" && test $mode = text; then
+ screen=yes
+ else
+ screen=no
diff --git a/www/surfraw/patches/patch-ab b/www/surfraw/patches/patch-ab
new file mode 100644
index 00000000000..418d3036f3e
--- /dev/null
+++ b/www/surfraw/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.1 2007/10/27 11:25:30 wiz Exp $
+
+--- Makefile.in.orig 2007-09-14 09:51:42.000000000 +0000
++++ Makefile.in
+@@ -747,7 +747,6 @@ 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
+
+ submit-lsm: surfraw.lsm
+ mail -s add LSM@qqx.org < $<