Update swish-e to 2.4.1, provided by Michal Pasternak in PR pkg/24124 plus

minor changes by me.

Too many changes to list here, please read this link to see the full
list of changes:

http://swish-e.org/current/docs/CHANGES.html (new features, bugfixes, etc).

8 files changed, 142 insertions, 102 deletions

diff --git a/doc/CHANGES b/doc/CHANGES
index 5c9ff5cb26c..4c5707b2ab1 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.4554 2004/01/22 14:25:32 adam Exp $
+$NetBSD: CHANGES,v 1.4555 2004/01/22 15:18:35 xtraeme Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -401,3 +401,4 @@ Changes to the packages collection and infrastructure in 2004:
 	Added quake3server-ut-3.0 [xtraeme 2004-01-22]
 	Removed xmule [jmmv 2004-01-22]
 	Updated gle to 3.1.0 [adam 2004-01-22]
+	Updated swish-e to 2.4.1 [xtraeme 2004-01-22]
diff --git a/doc/TODO b/doc/TODO
index cb41829fe28..2dc18a34629 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.1326 2004/01/22 11:35:23 markd Exp $
+$NetBSD: TODO,v 1.1327 2004/01/22 15:18:35 xtraeme Exp $
 
 Suggested new packages
 ======================
@@ -303,7 +303,6 @@ Suggested package updates
 	o staroffice-7p1
 	o stella-1.3
 	o subversion-0.35.1
-	o swish-e-2.4.1 [pkg/24124]
 	o t1lib-5.0.0
 	o tcl/tk-8.4.5
 	o tcl-expect-5.39.0
diff --git a/www/swish-e/DESCR b/www/swish-e/DESCR
index da0d072a4eb..2b494e95ed5 100644
--- a/www/swish-e/DESCR
+++ b/www/swish-e/DESCR
@@ -5,5 +5,3 @@ etc.). The SWISH-E software is free, and includes a package of Perl programs
 that enable anyone who is authorized to create and maintain their own indexes
 (AutoSwish). SWISH-E is an enhanced version of SWISH, which was originally
 written by Kevin Hughes and modified and released with his permission.
-
-http://sunsite.berkeley.edu/SWISH-E/
diff --git a/www/swish-e/Makefile b/www/swish-e/Makefile
index 18ff733977b..6ae86df2bb3 100644
--- a/www/swish-e/Makefile
+++ b/www/swish-e/Makefile
@@ -1,23 +1,34 @@
-# $NetBSD: Makefile,v 1.10 2004/01/20 12:28:00 agc Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/22 15:17:07 xtraeme Exp $
 # FreeBSD Id: ports/www/swish-e/Makefile,v 1.3 1999/08/31 02:43:18 peter Exp
 
-DISTNAME=       swish-efiles.1.3.2
-PKGNAME=        swish-e-1.3.2
+DISTNAME=       swish-e-2.4.1
 CATEGORIES=     www textproc
-MASTER_SITES=   ftp://sunsite.berkeley.edu/pub/swish-e/
+MASTER_SITES=	http://swish-e.org/Download/
 
-MAINTAINER=	bouyer@NetBSD.org
-HOMEPAGE= 	http://sunsite.berkeley.edu/SWISH-E/
+MAINTAINER=	dotz@irc.pl
+HOMEPAGE= 	http://swish-e.org/
 COMMENT= 	Simple web indexing for humans - enhanced
 
-WRKSRC=		${WRKDIR}/src
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+LIBTOOL_OVERRIDE=   ${WRKSRC}/libtool
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/swish-e ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/swish-e
-	${INSTALL_DATA} ${WRKSRC}/user.config ${PREFIX}/share/examples/swish-e
-	${INSTALL_DATA} ${WRKSRC}/test.html ${PREFIX}/share/examples/swish-e
-	${INSTALL_DATA} ${WRKSRC}/swishspider ${PREFIX}/share/examples/swish-e
-	${INSTALL_DATA} ${WRKSRC}/README-SWISH-E ${PREFIX}/share/examples/swish-e
+CONFIGURE_ARGS+=    --with-libxml2=${BUILDLINK_PREFIX.libxml2}
+CONFIGURE_ARGS+=    --with-pcre=${BUILDLINK_PREFIX.pcre}
+CONFIGURE_ARGS+=    --with-zlib=${BUILDLINK_PREFIX.zlib}
+
+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/buildlink2.mk"
+.include "../../devel/zlib/buildlink2.mk"
+.include "../../textproc/libxml2/buildlink2.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/swish-e/PLIST b/www/swish-e/PLIST
index 3c46bbdcf98..ff5a6d11f32 100644
--- a/www/swish-e/PLIST
+++ b/www/swish-e/PLIST
@@ -1,7 +1,112 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:18:55 zuntum Exp $
-share/examples/swish-e/user.config
-share/examples/swish-e/test.html
-share/examples/swish-e/swishspider
-share/examples/swish-e/README-SWISH-E
+@comment $NetBSD: PLIST,v 1.2 2004/01/22 15:17:07 xtraeme Exp $
 bin/swish-e
-@dirrm share/examples/swish-e
+bin/swish-filter-test
+include/swish-e.h
+lib/libswish-e.a
+lib/libswish-e.la
+lib/libswish-e.so
+lib/libswish-e.so.2
+${LIBSWISH_E}lib/libswish-e.so.2.0
+lib/swish-e/DirTree.pl
+lib/swish-e/perl/SWISH/DateRanges.pm
+lib/swish-e/perl/SWISH/DefaultHighlight.pm
+lib/swish-e/perl/SWISH/Filter.pm
+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/ParseQuery.pm
+lib/swish-e/perl/SWISH/PhraseHighlight.pm
+lib/swish-e/perl/SWISH/SimpleHighlight.pm
+lib/swish-e/perl/SWISH/TemplateDefault.pm
+lib/swish-e/perl/SWISH/TemplateDumper.pm
+lib/swish-e/perl/SWISH/TemplateFrame.pm
+lib/swish-e/perl/SWISH/TemplateHTMLTemplate.pm
+lib/swish-e/perl/SWISH/TemplateToolkit.pm
+lib/swish-e/perl/doc2txt.pm
+lib/swish-e/perl/pdf2html.pm
+lib/swish-e/perl/pdf2xml.pm
+lib/swish-e/search.cgi
+lib/swish-e/spider.pl
+lib/swish-e/swish.cgi
+lib/swish-e/swishspider
+man/man1/SWISH-CONFIG.1
+man/man1/SWISH-FAQ.1
+man/man1/SWISH-LIBRARY.1
+man/man1/SWISH-RUN.1
+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/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/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/swish-e/search.tt
+share/swish-e/swish.tmpl
+@dirrm share/swish-e
+@dirrm share/doc/swish-e/html/images
+@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
+@dirrm lib/swish-e/perl/SWISH
+@dirrm lib/swish-e/perl
+@dirrm lib/swish-e
diff --git a/www/swish-e/distinfo b/www/swish-e/distinfo
index c76c19d65d9..8d1ed4bacd0 100644
--- a/www/swish-e/distinfo
+++ b/www/swish-e/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/05/21 05:43:23 zuntum Exp $
+$NetBSD: distinfo,v 1.3 2004/01/22 15:17:07 xtraeme Exp $
 
-SHA1 (swish-efiles.1.3.2.tar.gz) = 001ba5c69296931c682ba8a8ee3fba56284112ab
-Size (swish-efiles.1.3.2.tar.gz) = 116381 bytes
-SHA1 (patch-aa) = 3485009ce9526a2221a998b52659607d7bc29fdf
-SHA1 (patch-ab) = 95fe9f4a2e33b9092364cd8b10a91b53edbf2a68
+SHA1 (swish-e-2.4.1.tar.gz) = fef447bb13a29f3758baeba09bceace8ca3529f2
+Size (swish-e-2.4.1.tar.gz) = 1491631 bytes
diff --git a/www/swish-e/patches/patch-aa b/www/swish-e/patches/patch-aa
deleted file mode 100644
index 0f9daab47e7..00000000000
--- a/www/swish-e/patches/patch-aa
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-aa,v 1.2 1999/12/14 16:30:02 bouyer Exp $
-
---- fs.c.orig	Wed Jan  6 19:27:02 1999
-+++ fs.c	Tue Dec 14 17:12:54 1999
-@@ -41,7 +41,6 @@
- static struct swline *titconlist = 0;
- static struct swline *fileislist = 0;
- static struct swline *suffixlist = 0;
--static struct swline *nocontentslist = 0;
- 
- 
- /* Have we already indexed a file or directory?
-@@ -365,23 +364,28 @@
- int ishtml(filename)
- char *filename;
- {
--	char *c, suffix[MAXSUFFIXLEN];
-+	char *c, *d;
- 	
-+	d = (char *) strrchr(filename, '/');
- 	c = (char *) strrchr(filename, '.');
- 	
-+	/* make sure the . is part of the filename */
-+	if (d != NULL && c < d) {
-+		return 0;
-+	}
-+	
- 	if (c == NULL)
- 		return 0;
--	strcpy(suffix, c + 1);
--	if (suffix[0] == '\0')
-+	if (c++ == '\0')
- 		return 0;
- 	
--	if (!strncmp(suffix, "htm", 3))
-+	if (!strncmp(c, "htm", 3))
- 		return 1;
--	else if (!strncmp(suffix, "HTM", 3))
-+	else if (!strncmp(c, "HTM", 3))
- 		return 1;
--	else if (!strncmp(suffix, "shtml", 5))
-+	else if (!strncmp(c, "shtml", 5))
- 		return 1;
--	else if (!strncmp(suffix, "SHTML", 5))
-+	else if (!strncmp(c, "SHTML", 5))
- 		return 1;
- 	return 0;
- }
diff --git a/www/swish-e/patches/patch-ab b/www/swish-e/patches/patch-ab
deleted file mode 100644
index 151b2dda6e1..00000000000
--- a/www/swish-e/patches/patch-ab
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2001/03/13 15:41:52 zuntum Exp $
-
---- Makefile.orig	Wed Jan  6 19:17:49 1999
-+++ Makefile
-@@ -8,11 +8,9 @@
- #CC= /opt/SUNWspro/bin/cc
- #CC= /usr/ccs/bin/ucbcc
- #CC = /vol/moby/moby_a/gnu/sun4_sunos5.1/bin/gcc
--CC = /usr/local/bin/gcc
- #CC = gcc
- 
- #CFLAGS = -Xa
--CFLAGS= -O2
- #CFLAGS=-g
- 
- LIBS=	-lm
-@@ -37,7 +35,6 @@
- swish-e:	
- 	make CFLAGS="-g" $(OBJS)
- 	$(CC) -o swish-e -g $(CFLAGS) $(OBJS) $(LIBS)
--	chmod 755 swish-e
- 
- quant:
- 	make CFLAGS="-g" $(OBJS)