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

5 files changed, 51 insertions, 25 deletions

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