4 files changed, 109 insertions, 81 deletions

diff --git a/www/swish-e/Makefile b/www/swish-e/Makefile
index ef7b37a7fb50..e7a0a077c5d0 100644
--- a/www/swish-e/Makefile
+++ b/www/swish-e/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	swish-e
-PORTVERSION=	2.2.2
-PORTREVISION=	1
+PORTVERSION=	2.4.1
 CATEGORIES=	www textproc
 MASTER_SITES=	http://swish-e.org/Download/
 
-MAINTAINER=	doconnor@gsoft.com.au
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple web indexing for humans - enhanced
 
 LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
@@ -19,44 +18,6 @@ LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
-do-install:
-	$(INSTALL_PROGRAM) ${WRKSRC}/src/swish-e ${PREFIX}/bin
-	$(MKDIR) -p $(PREFIX)/share/examples/swish-e
-	$(INSTALL_DATA) ${WRKSRC}/README ${PREFIX}/share/examples/swish-e
-	$(INSTALL_DATA) ${WRKSRC}/conf/example1.config ${PREFIX}/share/examples/swish-e
-	$(INSTALL_DATA) ${WRKSRC}/conf/example2.config ${PREFIX}/share/examples/swish-e
-	$(INSTALL_DATA) ${WRKSRC}/conf/example3.config ${PREFIX}/share/examples/swish-e
-	$(INSTALL_DATA) ${WRKSRC}/conf/example4.config ${PREFIX}/share/examples/swish-e
-	$(INSTALL_DATA) ${WRKSRC}/conf/example5.config ${PREFIX}/share/examples/swish-e
-	$(INSTALL_DATA) ${WRKSRC}/conf/example6.config ${PREFIX}/share/examples/swish-e
-	$(INSTALL_DATA) ${WRKSRC}/conf/example7.config ${PREFIX}/share/examples/swish-e
-	$(INSTALL_DATA) ${WRKSRC}/conf/example8.config ${PREFIX}/share/examples/swish-e
-	$(INSTALL_DATA) ${WRKSRC}/conf/example9.pl ${PREFIX}/share/examples/swish-e
-	$(MKDIR) -p $(PREFIX)/share/examples/swish-e/stopwords
-	$(INSTALL_DATA) ${WRKSRC}/conf/stopwords/dutch.txt ${PREFIX}/share/examples/swish-e/stopwords
-	$(INSTALL_DATA) ${WRKSRC}/conf/stopwords/english.txt ${PREFIX}/share/examples/swish-e/stopwords
-	$(INSTALL_DATA) ${WRKSRC}/conf/stopwords/german.txt ${PREFIX}/share/examples/swish-e/stopwords
-	$(INSTALL_DATA) ${WRKSRC}/conf/stopwords/spanish.txt ${PREFIX}/share/examples/swish-e/stopwords
-	$(MKDIR) -p $(PREFIX)/share/doc/swish-e
-	$(INSTALL_DATA) ${WRKSRC}/html/CHANGES.html ${PREFIX}/share/doc/swish-e
-	$(INSTALL_DATA) ${WRKSRC}/html/INSTALL.html ${PREFIX}/share/doc/swish-e
-	$(INSTALL_DATA) ${WRKSRC}/html/README.html ${PREFIX}/share/doc/swish-e
-	$(INSTALL_DATA) ${WRKSRC}/html/SWISH-3.0.html ${PREFIX}/share/doc/swish-e
-	$(INSTALL_DATA) ${WRKSRC}/html/SWISH-BUGS.html ${PREFIX}/share/doc/swish-e
-	$(INSTALL_DATA) ${WRKSRC}/html/SWISH-CONFIG.html ${PREFIX}/share/doc/swish-e
-	$(INSTALL_DATA) ${WRKSRC}/html/SWISH-FAQ.html ${PREFIX}/share/doc/swish-e
-	$(INSTALL_DATA) ${WRKSRC}/html/SWISH-LIBRARY.html ${PREFIX}/share/doc/swish-e
-	$(INSTALL_DATA) ${WRKSRC}/html/SWISH-PERL.html ${PREFIX}/share/doc/swish-e
-	$(INSTALL_DATA) ${WRKSRC}/html/SWISH-RUN.html ${PREFIX}/share/doc/swish-e
-	$(INSTALL_DATA) ${WRKSRC}/html/SWISH-SEARCH.html ${PREFIX}/share/doc/swish-e
-	$(INSTALL_DATA) ${WRKSRC}/html/index.html ${PREFIX}/share/doc/swish-e
-	$(INSTALL_DATA) ${WRKSRC}/html/index_long.html ${PREFIX}/share/doc/swish-e
-	$(INSTALL_DATA) ${WRKSRC}/html/style.css ${PREFIX}/share/doc/swish-e
-	$(MKDIR) -p $(PREFIX)/share/doc/swish-e/images
-	$(INSTALL_DATA) ${WRKSRC}/html/images/dotrule1.gif ${PREFIX}/share/doc/swish-e/images
-	$(INSTALL_DATA) ${WRKSRC}/html/images/swish.gif ${PREFIX}/share/doc/swish-e/images
-	$(INSTALL_DATA) ${WRKSRC}/html/images/swish2.gif ${PREFIX}/share/doc/swish-e/images
-	$(INSTALL_DATA) ${WRKSRC}/html/images/swish2b.gif ${PREFIX}/share/doc/swish-e/images
-	$(INSTALL_DATA) ${WRKSRC}/html/images/swishbanner1.gif ${PREFIX}/share/doc/swish-e/images
+MAN1=	SWISH-CONFIG.1 SWISH-FAQ.1 SWISH-LIBRARY.1 SWISH-RUN.1 swish-e.1
 
 .include <bsd.port.mk>
diff --git a/www/swish-e/distinfo b/www/swish-e/distinfo
index 90db98af367d..f56e967a4449 100644
--- a/www/swish-e/distinfo
+++ b/www/swish-e/distinfo
@@ -1 +1 @@
-MD5 (swish-e-2.2.2.tar.gz) = 5a3ba1f5d980da2c2eb8059ae1cd7095
+MD5 (swish-e-2.4.1.tar.gz) = 359919de072be8a69def1c9920076cdf
diff --git a/www/swish-e/pkg-descr b/www/swish-e/pkg-descr
index 761a6df24bd0..dc51ddcf6c23 100644
--- a/www/swish-e/pkg-descr
+++ b/www/swish-e/pkg-descr
@@ -6,4 +6,4 @@ 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.
 
-WWW: http://sunsite.berkeley.edu/SWISH-E/
+WWW: http://swish-e.org/
diff --git a/www/swish-e/pkg-plist b/www/swish-e/pkg-plist
index dfecc9678630..6feda78b59af 100644
--- a/www/swish-e/pkg-plist
+++ b/www/swish-e/pkg-plist
@@ -1,38 +1,105 @@
-share/doc/swish-e/CHANGES.html
-share/doc/swish-e/INSTALL.html
-share/doc/swish-e/README.html
-share/doc/swish-e/SWISH-3.0.html
-share/doc/swish-e/SWISH-BUGS.html
-share/doc/swish-e/SWISH-CONFIG.html
-share/doc/swish-e/SWISH-FAQ.html
-share/doc/swish-e/SWISH-LIBRARY.html
-share/doc/swish-e/SWISH-PERL.html
-share/doc/swish-e/SWISH-RUN.html
-share/doc/swish-e/SWISH-SEARCH.html
-share/doc/swish-e/index.html
-share/doc/swish-e/index_long.html
-share/doc/swish-e/style.css
-share/doc/swish-e/images/dotrule1.gif
-share/doc/swish-e/images/swish.gif
-share/doc/swish-e/images/swish2.gif
-share/doc/swish-e/images/swish2b.gif
-share/doc/swish-e/images/swishbanner1.gif
-@dirrm share/doc/swish-e/images
-@dirrm share/doc/swish-e
-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.pl
-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
-@dirrm share/examples/swish-e/stopwords
-@dirrm share/examples/swish-e
 bin/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
+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
+@dirrm lib/swish-e/perl/SWISH/Filters
+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/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
+@dirrm lib/swish-e/perl/SWISH
+lib/swish-e/perl/doc2txt.pm
+lib/swish-e/perl/pdf2html.pm
+lib/swish-e/perl/pdf2xml.pm
+@dirrm lib/swish-e/perl
+lib/swish-e/DirTree.pl
+lib/swish-e/search.cgi
+lib/swish-e/spider.pl
+lib/swish-e/swish.cgi
+lib/swish-e/swishspider
+@dirrm lib/swish-e
+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
+@dirrm share/doc/swish-e/examples/conf/stopwords
+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
+@dirrm share/doc/swish-e/examples/conf
+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
+@dirrm share/doc/swish-e/examples/filter-bin
+share/doc/swish-e/examples/filters/README
+@dirrm share/doc/swish-e/examples/filters
+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
+@dirrm share/doc/swish-e/examples/prog-bin
+@dirrm share/doc/swish-e/examples
+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
+@dirrm share/doc/swish-e/html/images
+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/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
+@dirrm share/doc/swish-e/html
+share/doc/swish-e/INSTALL
+share/doc/swish-e/README
+share/doc/swish-e/README.cvs
+@dirrm share/doc/swish-e
+share/swish-e/search.tt
+share/swish-e/swish.tmpl
+@dirrm share/swish-e