Update to swish-e 2.4.5:

- bugfixes
- FileFilter is using fork/exec directly, avoiding possible shell escape
issues
- proximity suppor tfor matchs
- fix sparc64 issues
- switch to GPL as license with a special link clause
- make use of strcoll for sorting

8 files changed, 122 insertions, 101 deletions

diff --git a/www/swish-e/Makefile b/www/swish-e/Makefile
index cc942f081ac..943f81161d1 100644
--- a/www/swish-e/Makefile
+++ b/www/swish-e/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.27 2007/02/22 19:27:24 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2007/08/16 00:14:42 joerg Exp $
 
-DISTNAME=	swish-e-2.4.3
-PKGREVISION=	# empty
+DISTNAME=	swish-e-2.4.5
 CATEGORIES=	www textproc
 MASTER_SITES=	http://swish-e.org/distribution/
 
@@ -9,6 +8,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://swish-e.org/
 COMMENT=	Simple web indexing for humans - enhanced
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 
@@ -19,14 +20,6 @@ CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib}
 USE_TOOLS+=	perl:run
 REPLACE_PERL=	prog-bin/*.pl conf/*.pl filter-bin/*.pl html/*.pl
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "FreeBSD"
-PLIST_SUBST+=	LIBSWISH_E="@comment "
-.else
-PLIST_SUBST+=	LIBSWISH_E=
-.endif
-
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/www/swish-e/PLIST b/www/swish-e/PLIST
index 326cca66d7e..1cf2997cc7f 100644
--- a/www/swish-e/PLIST
+++ b/www/swish-e/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2006/02/07 13:22:53 kim Exp $
+@comment $NetBSD: PLIST,v 1.5 2007/08/16 00:14:42 joerg Exp $
 bin/swish-config
 bin/swish-e
 bin/swish-filter-test
@@ -14,6 +14,7 @@ lib/swish-e/perl/SWISH/Filters/Doc2txt.pm
 lib/swish-e/perl/SWISH/Filters/ID3toHTML.pm
 lib/swish-e/perl/SWISH/Filters/Pdf2HTML.pm
 lib/swish-e/perl/SWISH/Filters/XLtoHTML.pm
+lib/swish-e/perl/SWISH/Filters/pp2html.pm
 lib/swish-e/perl/SWISH/ParseQuery.pm
 lib/swish-e/perl/SWISH/PhraseHighlight.pm
 lib/swish-e/perl/SWISH/SimpleHighlight.pm
@@ -37,62 +38,62 @@ man/man1/swish-e.1
 share/doc/swish-e/INSTALL
 share/doc/swish-e/README
 share/doc/swish-e/README.cvs
-share/doc/swish-e/examples/conf/README
-share/doc/swish-e/examples/conf/example1.config
-share/doc/swish-e/examples/conf/example2.config
-share/doc/swish-e/examples/conf/example3.config
-share/doc/swish-e/examples/conf/example4.config
-share/doc/swish-e/examples/conf/example5.config
-share/doc/swish-e/examples/conf/example6.config
-share/doc/swish-e/examples/conf/example7.config
-share/doc/swish-e/examples/conf/example8.config
-share/doc/swish-e/examples/conf/example9.config
-share/doc/swish-e/examples/conf/example9.pl
-share/doc/swish-e/examples/conf/stopwords/dutch.txt
-share/doc/swish-e/examples/conf/stopwords/english.txt
-share/doc/swish-e/examples/conf/stopwords/german.txt
-share/doc/swish-e/examples/conf/stopwords/spanish.txt
-share/doc/swish-e/examples/filter-bin/README
-share/doc/swish-e/examples/filter-bin/_binfilter.sh
-share/doc/swish-e/examples/filter-bin/_pdf2html.pl
-share/doc/swish-e/examples/filter-bin/swish_filter.pl
 share/doc/swish-e/examples/filters/README
-share/doc/swish-e/examples/prog-bin/MySQL.pl
-share/doc/swish-e/examples/prog-bin/README
-share/doc/swish-e/examples/prog-bin/SwishSpiderConfig.pl
-share/doc/swish-e/examples/prog-bin/doc2txt.pm
-share/doc/swish-e/examples/prog-bin/file.pl
-share/doc/swish-e/examples/prog-bin/index_hypermail.pl
-share/doc/swish-e/examples/prog-bin/pdf2html.pm
-share/doc/swish-e/examples/prog-bin/pdf2xml.pm
-share/doc/swish-e/html/.htaccess
-share/doc/swish-e/html/.swishcgi.conf
-share/doc/swish-e/html/API.html
-share/doc/swish-e/html/CHANGES.html
-share/doc/swish-e/html/Filter.html
-share/doc/swish-e/html/INSTALL.html
-share/doc/swish-e/html/README.html
-share/doc/swish-e/html/SWISH-3.0.html
-share/doc/swish-e/html/SWISH-BUGS.html
-share/doc/swish-e/html/SWISH-CONFIG.html
-share/doc/swish-e/html/SWISH-FAQ.html
-share/doc/swish-e/html/SWISH-LIBRARY.html
-share/doc/swish-e/html/SWISH-RUN.html
-share/doc/swish-e/html/SWISH-SEARCH.html
-share/doc/swish-e/html/images/dotrule1.gif
-share/doc/swish-e/html/images/swish.gif
-share/doc/swish-e/html/images/swish2.gif
-share/doc/swish-e/html/images/swish2b.gif
-share/doc/swish-e/html/images/swishbanner1.gif
+share/doc/swish-e/html/api.html
+share/doc/swish-e/html/changes.html
+share/doc/swish-e/html/filter.html
 share/doc/swish-e/html/index.html
-share/doc/swish-e/html/index_long.html
-share/doc/swish-e/html/search.html
-share/doc/swish-e/html/searchdoc.html
+share/doc/swish-e/html/install.html
+share/doc/swish-e/html/readme.html
+share/doc/swish-e/html/search.cgi.html
 share/doc/swish-e/html/spider.html
-share/doc/swish-e/html/split.pl
-share/doc/swish-e/html/style.css
-share/doc/swish-e/html/swish.conf
-share/doc/swish-e/html/swish.html
+share/doc/swish-e/html/swish-3.0.html
+share/doc/swish-e/html/swish-bugs.html
+share/doc/swish-e/html/swish-config.html
+share/doc/swish-e/html/swish-faq.html
+share/doc/swish-e/html/swish-library.html
+share/doc/swish-e/html/swish-run.html
+share/doc/swish-e/html/swish-search.html
+share/doc/swish-e/html/swish.cgi.html
+share/doc/swish-e/html/swish.css
+share/doc/swish-e/pod/CHANGES.pod
+share/doc/swish-e/pod/INSTALL.pod
+share/doc/swish-e/pod/README.pod
+share/doc/swish-e/pod/SWISH-3.0.pod
+share/doc/swish-e/pod/SWISH-BUGS.pod
+share/doc/swish-e/pod/SWISH-CONFIG.pod
+share/doc/swish-e/pod/SWISH-FAQ.pod
+share/doc/swish-e/pod/SWISH-LIBRARY.pod
+share/doc/swish-e/pod/SWISH-RUN.pod
+share/doc/swish-e/pod/SWISH-SEARCH.pod
+share/doc/swish-e/pod/swish-e.pod
+share/examples/swish-e/README
+share/examples/swish-e/example1.config
+share/examples/swish-e/example2.config
+share/examples/swish-e/example3.config
+share/examples/swish-e/example4.config
+share/examples/swish-e/example5.config
+share/examples/swish-e/example6.config
+share/examples/swish-e/example7.config
+share/examples/swish-e/example8.config
+share/examples/swish-e/example9.config
+share/examples/swish-e/example9.pl
+share/examples/swish-e/filter-bin/README
+share/examples/swish-e/filter-bin/_binfilter.sh
+share/examples/swish-e/filter-bin/_pdf2html.pl
+share/examples/swish-e/filter-bin/swish_filter.pl
+share/examples/swish-e/prog-bin/MySQL.pl
+share/examples/swish-e/prog-bin/README
+share/examples/swish-e/prog-bin/SwishSpiderConfig.pl
+share/examples/swish-e/prog-bin/doc2txt.pm
+share/examples/swish-e/prog-bin/file.pl
+share/examples/swish-e/prog-bin/index_hypermail.pl
+share/examples/swish-e/prog-bin/pdf2html.pm
+share/examples/swish-e/prog-bin/pdf2xml.pm
+share/examples/swish-e/stopwords/dutch.txt
+share/examples/swish-e/stopwords/english.txt
+share/examples/swish-e/stopwords/german.txt
+share/examples/swish-e/stopwords/spanish.txt
 share/swish-e/swish.tmpl
 share/swish-e/swish.tt
 share/swish-e/templates/common_footer
@@ -103,13 +104,13 @@ share/swish-e/templates/search.tt
 share/swish-e/templates/style.css
 @dirrm share/swish-e/templates
 @dirrm share/swish-e
-@dirrm share/doc/swish-e/html/images
+@dirrm share/examples/swish-e/stopwords
+@dirrm share/examples/swish-e/prog-bin
+@dirrm share/examples/swish-e/filter-bin
+@dirrm share/examples/swish-e
+@dirrm share/doc/swish-e/pod
 @dirrm share/doc/swish-e/html
-@dirrm share/doc/swish-e/examples/prog-bin
 @dirrm share/doc/swish-e/examples/filters
-@dirrm share/doc/swish-e/examples/filter-bin
-@dirrm share/doc/swish-e/examples/conf/stopwords
-@dirrm share/doc/swish-e/examples/conf
 @dirrm share/doc/swish-e/examples
 @dirrm share/doc/swish-e
 @dirrm lib/swish-e/perl/SWISH/Filters
diff --git a/www/swish-e/distinfo b/www/swish-e/distinfo
index 51bb48dabbc..0793de8dd72 100644
--- a/www/swish-e/distinfo
+++ b/www/swish-e/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.7 2006/02/07 17:17:23 joerg Exp $
+$NetBSD: distinfo,v 1.8 2007/08/16 00:14:43 joerg Exp $
 
-SHA1 (swish-e-2.4.3.tar.gz) = 7316ad716eeb724529f2ccf40d2acb03cba26ee2
-RMD160 (swish-e-2.4.3.tar.gz) = b877bbbdd1354becc8372c6050f2179fed8d1edf
-Size (swish-e-2.4.3.tar.gz) = 1563031 bytes
-SHA1 (patch-aa) = 17e175792d0d6bc40a1fd23fc7fba32a023bc8e0
-SHA1 (patch-ab) = d8bf46d4b54e0becfbf909e080b69a4c3104d24f
+SHA1 (swish-e-2.4.5.tar.gz) = 9e93580ef75c372eb232bc0a4940ce76f41a87f6
+RMD160 (swish-e-2.4.5.tar.gz) = b89d8cc8d8f850d2ddf0b52b583a1cb1c0f3c1b3
+Size (swish-e-2.4.5.tar.gz) = 1474881 bytes
+SHA1 (patch-ab) = ada134dbd6d362ebb2947a4ffc235663459002da
 SHA1 (patch-ac) = 48d4828baf70ea1f387e93973419329ee08ffe9c
+SHA1 (patch-ad) = 52e5061b9fb54d6f68b833dcbaa13c24b1138927
+SHA1 (patch-ae) = 216aaac5d791ec537f00c73d4e77033e90e15147
diff --git a/www/swish-e/patches/patch-aa b/www/swish-e/patches/patch-aa
deleted file mode 100644
index 14bea567617..00000000000
--- a/www/swish-e/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2004/06/27 18:30:54 kristerw Exp $
-
---- filters/SWISH/Makefile.in.orig	2003-12-18 06:49:40.000000000 +0100
-+++ filters/SWISH/Makefile.in	2004-06-27 19:47:52.000000000 +0200
-@@ -189,7 +189,7 @@
- nobase_perlmoduleSCRIPT_INSTALL = $(install_sh_SCRIPT)
- install-nobase_perlmoduleSCRIPTS: $(nobase_perlmodule_SCRIPTS)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(perlmoduledir)
-+	$(mkinstalldirs) $(DESTDIR)$(perlmoduledir)/Filters
- 	@list='$(nobase_perlmodule_SCRIPTS)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  if test -f $$d$$p; then \
diff --git a/www/swish-e/patches/patch-ab b/www/swish-e/patches/patch-ab
index 52b16868815..5aae24de88b 100644
--- a/www/swish-e/patches/patch-ab
+++ b/www/swish-e/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.6 2004/06/27 18:30:54 kristerw Exp $
+$NetBSD: patch-ab,v 1.7 2007/08/16 00:14:43 joerg Exp $
 
---- conf/Makefile.in.orig	2004-06-27 19:53:09.000000000 +0200
-+++ conf/Makefile.in	2004-06-27 19:55:25.000000000 +0200
-@@ -202,7 +202,7 @@
- nobase_exampleDATA_INSTALL = $(install_sh_DATA)
- install-nobase_exampleDATA: $(nobase_example_DATA)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(exampledir)
-+	$(mkinstalldirs) $(DESTDIR)$(exampledir)/stopwords
- 	@list='$(nobase_example_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f="$$p"; \
+--- conf/Makefile.in.orig	2007-01-15 19:54:01.000000000 +0100
++++ conf/Makefile.in
+@@ -185,7 +185,7 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-exampledir = $(datadir)/doc/$(PACKAGE)/examples/conf
++exampledir = ${PREFIX}/share/examples/swish-e
+ conf_dir = \
+     stopwords/dutch.txt \
+     stopwords/english.txt \
diff --git a/www/swish-e/patches/patch-ad b/www/swish-e/patches/patch-ad
new file mode 100644
index 00000000000..587980c022c
--- /dev/null
+++ b/www/swish-e/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2007/08/16 00:14:43 joerg Exp $
+
+--- filter-bin/Makefile.in.orig	2007-08-11 03:33:31.000000000 +0200
++++ filter-bin/Makefile.in
+@@ -185,7 +185,7 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-exampledir = $(datadir)/doc/$(PACKAGE)/examples/filter-bin
++exampledir = ${PREFIX}/share/examples/swish-e/filter-bin
+ example_DATA = \
+     README \
+     swish_filter.pl \
diff --git a/www/swish-e/patches/patch-ae b/www/swish-e/patches/patch-ae
new file mode 100644
index 00000000000..bc87130db92
--- /dev/null
+++ b/www/swish-e/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2007/08/16 00:14:43 joerg Exp $
+
+--- prog-bin/Makefile.in.orig	2007-08-11 03:34:16.000000000 +0200
++++ prog-bin/Makefile.in
+@@ -191,7 +191,7 @@ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ perlmoduledir = $(libexecdir)/perl
+-exampledir = $(datadir)/doc/$(PACKAGE)/examples/prog-bin
++exampledir = ${PREFIX}/share/examples/swish-e/prog-bin
+ libexec_SCRIPTS = spider.pl DirTree.pl
+ 
+ # These are really out dated
diff --git a/www/swish-e/patches/patch-af b/www/swish-e/patches/patch-af
new file mode 100644
index 00000000000..954c0c55714
--- /dev/null
+++ b/www/swish-e/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2007/08/16 00:14:43 joerg Exp $
+
+--- filters/Makefile.in.orig	2007-08-11 03:41:08.000000000 +0200
++++ filters/Makefile.in
+@@ -198,7 +198,7 @@ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ SUBDIRS = SWISH
+-exampledir = $(datadir)/doc/$(PACKAGE)/examples/filters
++exampledir = ${PREFIX}/share/examples/swish-e/filters
+ bin_SCRIPTS = swish-filter-test
+ example_DATA = README
+ CLEANFILES = swish-filter-test