Index: head/www/swish-e/Makefile
===================================================================
--- head/www/swish-e/Makefile	(revision 357558)
+++ head/www/swish-e/Makefile	(revision 357559)
@@ -1,38 +1,34 @@
 # Created by: Daniel O'Connor <doconnor@gsoft.com.au>
 # $FreeBSD$
 
 PORTNAME=	swish-e
 PORTVERSION=	2.4.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www textproc
 MASTER_SITES=	http://swish-e.org/distribution/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple web indexing for humans - enhanced
 
-USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 USE_GNOME=	libxml2
-USES=		gmake
+USES=		gmake libtool
 GNU_CONFIGURE=	yes
 MAKE_ARGS+=	pkgconfigdir="${PREFIX}/libdata/pkgconfig" \
-		pkgdatadir="${DATADIR}"
+                pkgdatadir="${DATADIR}"
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	*
 .endif
 
-MAN1=		SWISH-CONFIG.1 SWISH-FAQ.1 SWISH-LIBRARY.1 SWISH-RUN.1 swish-e.1
-
-NO_STAGE=	yes
-.if defined(NOPORTDOCS)
 post-patch:
+.if defined(NOPORTDOCS)
 	@${REINPLACE_CMD} -E 's/^(install-data-am:) install-docDATA(.*)/\1\2/' \
 		${WRKSRC}/Makefile.in
 .for p in pod prog-bin conf filter-bin filters html
 	@${REINPLACE_CMD} -E 's/^(install-data-am:).*DATA(.*)/\1\2/' \
 		${WRKSRC}/${p}/Makefile.in
 .endfor
 .endif
 
 .include <bsd.port.mk>
Index: head/www/swish-e/pkg-plist
===================================================================
--- head/www/swish-e/pkg-plist	(revision 357558)
+++ head/www/swish-e/pkg-plist	(revision 357559)
@@ -1,48 +1,53 @@
 bin/swish-config
 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/libswish-e.so.2.0.0
 lib/swish-e/perl/SWISH/Filters/Doc2txt.pm
 lib/swish-e/perl/SWISH/Filters/Doc2html.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
-@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
 libdata/pkgconfig/swish-e.pc
-@dirrm lib/swish-e
+man/man1/SWISH-CONFIG.1.gz
+man/man1/SWISH-FAQ.1.gz
+man/man1/SWISH-LIBRARY.1.gz
+man/man1/SWISH-RUN.1.gz
+man/man1/swish-e.1.gz
 %%DATADIR%%/swish.tmpl
 %%DATADIR%%/swish.tt
 %%DATADIR%%/templates/search.tt
 %%DATADIR%%/templates/page_layout
 %%DATADIR%%/templates/common_header
 %%DATADIR%%/templates/common_footer
 %%DATADIR%%/templates/style.css
 %%DATADIR%%/templates/markup.css
 @dirrm %%DATADIR%%/templates
 @dirrm %%DATADIR%%
+@dirrm lib/swish-e/perl/SWISH/Filters
+@dirrm lib/swish-e/perl/SWISH
+@dirrm lib/swish-e/perl
+@dirrm lib/swish-e