4 files changed, 42 insertions, 123 deletions

diff --git a/www/dpsearch/Makefile b/www/dpsearch/Makefile
index f08fa79455ae..98e2a5e790a8 100644
--- a/www/dpsearch/Makefile
+++ b/www/dpsearch/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	dpsearch
-PORTVERSION=	4.50
-PORTREVISION=	1
+PORTVERSION=	4.51
 CATEGORIES=	www
 MASTER_SITES=	http://dataparksearch.googlecode.com/files/ \
 		http://www.dataparksearch.org/
@@ -19,6 +18,7 @@ USE_LDCONFIG=	yes
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+PORTDOCS=	*
 DOCSDIR=	${PREFIX}/share/doc/dataparksearch
 CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/etc/dpsearch \
 		--localstatedir=/var/dpsearch \
@@ -128,6 +128,11 @@ CONFIGURE_ARGS+=	--with-sqlite=${LOCALBASE}
 
 .endif
 
+post-extract:
+.if defined(NOPORTDOCS)
+EXTRA_PATCHES+=      ${FILESDIR}/extra-patch-doc_Makefile.in
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
 		${WRKSRC}/configure
diff --git a/www/dpsearch/distinfo b/www/dpsearch/distinfo
index 340c18fc969b..2bf4b41d4cee 100644
--- a/www/dpsearch/distinfo
+++ b/www/dpsearch/distinfo
@@ -1,3 +1,3 @@
-MD5 (dpsearch-4.50.tar.bz2) = 56ecdca294777c196086f9fea2020586
-SHA256 (dpsearch-4.50.tar.bz2) = ab39d357731173c8a2272aa47a6a7f7a66975f8b8f42d86997cbb121be2b8c19
-SIZE (dpsearch-4.50.tar.bz2) = 2112004
+MD5 (dpsearch-4.51.tar.bz2) = e7ad178b3cd072b2595651cb130bf42a
+SHA256 (dpsearch-4.51.tar.bz2) = ccb5ec6dfea3d0cab891eac3ea519b64902a55d529ae0fe7bcb68fc90c0aa438
+SIZE (dpsearch-4.51.tar.bz2) = 2159219
diff --git a/www/dpsearch/files/extra-patch-doc_Makefile.in b/www/dpsearch/files/extra-patch-doc_Makefile.in
new file mode 100644
index 000000000000..96dd2743c9f6
--- /dev/null
+++ b/www/dpsearch/files/extra-patch-doc_Makefile.in
@@ -0,0 +1,23 @@
+--- doc/Makefile.in.orig	2008-12-31 06:24:25.000000000 -0900
++++ doc/Makefile.in	2009-01-13 02:09:48.000000000 -0900
+@@ -570,13 +570,13 @@
+ dist-hook:
+ 	cp -rf $(srcdir)/samples $(distdir)
+ 
+-install-data-local: $(PDF_FILES) $(HTML_FILES)
+-	$(mkinstalldirs) $(DESTDIR)$(datadir)/doc/dataparksearch
+-	echo ${INSTALL_DATA} docs $(DESTDIR)$(datadir)/doc/dataparksearch/
+-	list='${HTML_FILES} ${PDF_FILES}'; \
+-	for p in $$list; do \
+-		${INSTALL_DATA} $(srcdir)/$$p $(DESTDIR)$(datadir)/doc/dataparksearch/ ; \
+-	done
++#install-data-local: $(PDF_FILES) $(HTML_FILES)
++#	$(mkinstalldirs) $(DESTDIR)$(datadir)/doc/dataparksearch
++#	echo ${INSTALL_DATA} docs $(DESTDIR)$(datadir)/doc/dataparksearch/
++#	list='${HTML_FILES} ${PDF_FILES}'; \
++#	for p in $$list; do \
++#		${INSTALL_DATA} $(srcdir)/$$p $(DESTDIR)$(datadir)/doc/dataparksearch/ ; \
++#	done
+ 
+ uninstall-local:
+ 	list='${PDF_FILES} ${HTML_FILES}'; \
diff --git a/www/dpsearch/pkg-plist b/www/dpsearch/pkg-plist
index 93c2014d34df..7500a44aa78e 100644
--- a/www/dpsearch/pkg-plist
+++ b/www/dpsearch/pkg-plist
@@ -166,6 +166,8 @@ etc/dpsearch/langmap/nap.utf-8.lm
 etc/dpsearch/langmap/nds.utf-8.lm
 etc/dpsearch/langmap/nl.latin1.bible.lm
 etc/dpsearch/langmap/nl.latin1.lm
+etc/dpsearch/langmap/nl.utf-8.lm
+etc/dpsearch/langmap/nl.windows-1252.lm
 etc/dpsearch/langmap/nn.utf-8.lm
 etc/dpsearch/langmap/no.latin1.lm
 etc/dpsearch/langmap/no.utf-8.lm
@@ -185,6 +187,8 @@ etc/dpsearch/langmap/ro.ascii.lm
 etc/dpsearch/langmap/ro.cp1250.lm
 etc/dpsearch/langmap/ro.latin2.lm
 etc/dpsearch/langmap/ro.utf-8.lm
+etc/dpsearch/langmap/ru-old.koi8-c.lm
+etc/dpsearch/langmap/ru-old.utf-8.lm
 etc/dpsearch/langmap/ru.cp1251.lm
 etc/dpsearch/langmap/ru.cp866.lm
 etc/dpsearch/langmap/ru.cyrillic.lm
@@ -215,6 +219,7 @@ etc/dpsearch/langmap/sr.utf-8.lm
 etc/dpsearch/langmap/su.utf-8.lm
 etc/dpsearch/langmap/sv.latin1.bible.lm
 etc/dpsearch/langmap/sv.latin1.lm
+etc/dpsearch/langmap/sv.utf-8.bible.lm
 etc/dpsearch/langmap/sv.utf-8.lm
 etc/dpsearch/langmap/sw.latin1.lm
 etc/dpsearch/langmap/sw.utf-8.lm
@@ -372,14 +377,12 @@ include/dps_xmalloc.h
 include/dpsearch.h
 lib/libdpcharset-4.so
 lib/libdpcharset.a
+lib/libdpcharset.la
 lib/libdpcharset.so
 lib/libdpsearch-4.so
 lib/libdpsearch.a
+lib/libdpsearch.la
 lib/libdpsearch.so
-%%APACHE%%lib/libdpsearch_mod-4.so
-%%APACHE%%lib/libdpsearch_mod.a
-%%APACHE%%lib/libdpsearch_mod.so
-%%APACHE%%%%APACHEMODDIR%%/mod_dpsearch.so
 sbin/cached
 sbin/dpconv
 sbin/dpguesser
@@ -388,117 +391,6 @@ sbin/run-splitter
 sbin/searchd
 sbin/splitter
 sbin/stored
-%%DOCSDIR%%/README.html
-%%DOCSDIR%%/body-after.html
-%%DOCSDIR%%/body-before.html
-%%DOCSDIR%%/datapark.css
-%%DOCSDIR%%/dpsearch-aliases.en.html
-%%DOCSDIR%%/dpsearch-aliases.ru.html
-%%DOCSDIR%%/dpsearch-authors.en.html
-%%DOCSDIR%%/dpsearch-authors.ru.html
-%%DOCSDIR%%/dpsearch-cachemode.en.html
-%%DOCSDIR%%/dpsearch-cachemode.ru.html
-%%DOCSDIR%%/dpsearch-categories.en.html
-%%DOCSDIR%%/dpsearch-categories.ru.html
-%%DOCSDIR%%/dpsearch-cjk.en.html
-%%DOCSDIR%%/dpsearch-cjk.ru.html
-%%DOCSDIR%%/dpsearch-clones.en.html
-%%DOCSDIR%%/dpsearch-clones.ru.html
-%%DOCSDIR%%/dpsearch-content-enc.en.html
-%%DOCSDIR%%/dpsearch-content-enc.ru.html
-%%DOCSDIR%%/dpsearch-dbschema.en.html
-%%DOCSDIR%%/dpsearch-dbschema.ru.html
-%%DOCSDIR%%/dpsearch-disclaimer.en.html
-%%DOCSDIR%%/dpsearch-disclaimer.ru.html
-%%DOCSDIR%%/dpsearch-doingsearch.en.html
-%%DOCSDIR%%/dpsearch-doingsearch.ru.html
-%%DOCSDIR%%/dpsearch-donations.en.html
-%%DOCSDIR%%/dpsearch-extended-indexing.en.html
-%%DOCSDIR%%/dpsearch-extended-indexing.ru.html
-%%DOCSDIR%%/dpsearch-follow.en.html
-%%DOCSDIR%%/dpsearch-follow.ru.html
-%%DOCSDIR%%/dpsearch-fuzzy.en.html
-%%DOCSDIR%%/dpsearch-fuzzy.ru.html
-%%DOCSDIR%%/dpsearch-get.en.html
-%%DOCSDIR%%/dpsearch-get.ru.html
-%%DOCSDIR%%/dpsearch-howstore.en.html
-%%DOCSDIR%%/dpsearch-howstore.ru.html
-%%DOCSDIR%%/dpsearch-html.en.html
-%%DOCSDIR%%/dpsearch-html.ru.html
-%%DOCSDIR%%/dpsearch-htmlparser-bodypatterns.en.html
-%%DOCSDIR%%/dpsearch-htmlparser-bodypatterns.ru.html
-%%DOCSDIR%%/dpsearch-htmlparser-comments.en.html
-%%DOCSDIR%%/dpsearch-htmlparser-comments.ru.html
-%%DOCSDIR%%/dpsearch-htmlparser-links.en.html
-%%DOCSDIR%%/dpsearch-htmlparser-links.ru.html
-%%DOCSDIR%%/dpsearch-htmlparser-meta.en.html
-%%DOCSDIR%%/dpsearch-htmlparser-meta.ru.html
-%%DOCSDIR%%/dpsearch-htmlparser-spec.en.html
-%%DOCSDIR%%/dpsearch-htmlparser-spec.ru.html
-%%DOCSDIR%%/dpsearch-htmlparser.en.html
-%%DOCSDIR%%/dpsearch-htmlparser.ru.html
-%%DOCSDIR%%/dpsearch-http-codes.en.html
-%%DOCSDIR%%/dpsearch-http-codes.ru.html
-%%DOCSDIR%%/dpsearch-index-ru.ru.html
-%%DOCSDIR%%/dpsearch-index.en.html
-%%DOCSDIR%%/dpsearch-indexcmd.en.html
-%%DOCSDIR%%/dpsearch-indexcmd.ru.html
-%%DOCSDIR%%/dpsearch-indexing.en.html
-%%DOCSDIR%%/dpsearch-indexing.ru.html
-%%DOCSDIR%%/dpsearch-install.en.html
-%%DOCSDIR%%/dpsearch-install.ru.html
-%%DOCSDIR%%/dpsearch-installing.en.html
-%%DOCSDIR%%/dpsearch-installing.ru.html
-%%DOCSDIR%%/dpsearch-installproblem.en.html
-%%DOCSDIR%%/dpsearch-installproblem.ru.html
-%%DOCSDIR%%/dpsearch-international.en.html
-%%DOCSDIR%%/dpsearch-international.ru.html
-%%DOCSDIR%%/dpsearch-intro.en.html
-%%DOCSDIR%%/dpsearch-intro.ru.html
-%%DOCSDIR%%/dpsearch-lib.en.html
-%%DOCSDIR%%/dpsearch-lib.ru.html
-%%DOCSDIR%%/dpsearch-misc.en.html
-%%DOCSDIR%%/dpsearch-misc.ru.html
-%%DOCSDIR%%/dpsearch-mod_dpsearch.en.html
-%%DOCSDIR%%/dpsearch-mod_dpsearch.ru.html
-%%DOCSDIR%%/dpsearch-multilang.en.html
-%%DOCSDIR%%/dpsearch-multilang.ru.html
-%%DOCSDIR%%/dpsearch-opsys.en.html
-%%DOCSDIR%%/dpsearch-opsys.ru.html
-%%DOCSDIR%%/dpsearch-oracle.en.html
-%%DOCSDIR%%/dpsearch-oracle.ru.html
-%%DOCSDIR%%/dpsearch-pars.en.html
-%%DOCSDIR%%/dpsearch-pars.ru.html
-%%DOCSDIR%%/dpsearch-perf.en.html
-%%DOCSDIR%%/dpsearch-perf.ru.html
-%%DOCSDIR%%/dpsearch-register.en.html
-%%DOCSDIR%%/dpsearch-register.ru.html
-%%DOCSDIR%%/dpsearch-rel.en.html
-%%DOCSDIR%%/dpsearch-rel.ru.html
-%%DOCSDIR%%/dpsearch-searchd.en.html
-%%DOCSDIR%%/dpsearch-searchd.ru.html
-%%DOCSDIR%%/dpsearch-srcache.en.html
-%%DOCSDIR%%/dpsearch-srcache.ru.html
-%%DOCSDIR%%/dpsearch-srvtable.en.html
-%%DOCSDIR%%/dpsearch-srvtable.ru.html
-%%DOCSDIR%%/dpsearch-stopwords.en.html
-%%DOCSDIR%%/dpsearch-stopwords.ru.html
-%%DOCSDIR%%/dpsearch-stored.en.html
-%%DOCSDIR%%/dpsearch-stored.ru.html
-%%DOCSDIR%%/dpsearch-subsections.en.html
-%%DOCSDIR%%/dpsearch-subsections.ru.html
-%%DOCSDIR%%/dpsearch-syslog.en.html
-%%DOCSDIR%%/dpsearch-syslog.ru.html
-%%DOCSDIR%%/dpsearch-templates.en.html
-%%DOCSDIR%%/dpsearch-templates.ru.html
-%%DOCSDIR%%/dpsearch-toolsreq.en.html
-%%DOCSDIR%%/dpsearch-toolsreq.ru.html
-%%DOCSDIR%%/dpsearch-track.en.html
-%%DOCSDIR%%/dpsearch-track.ru.html
-%%DOCSDIR%%/dpsearch-vary.en.html
-%%DOCSDIR%%/dpsearch-vary.ru.html
-%%DOCSDIR%%/index.en.html
-%%DOCSDIR%%/index.ru.html
 %%DATADIR%%/ibase/create.cache.sql
 %%DATADIR%%/ibase/create.crc-multi.sql
 %%DATADIR%%/ibase/create.multi.sql
@@ -511,18 +403,18 @@ sbin/stored
 %%DATADIR%%/mimer/create.crc-multi.sql
 %%DATADIR%%/mimer/create.multi.sql
 %%DATADIR%%/mimer/create.single.sql
+%%DATADIR%%/mimer/drop.cache.sql
 %%DATADIR%%/mimer/drop.crc-multi.sql
 %%DATADIR%%/mimer/drop.multi.sql
 %%DATADIR%%/mimer/drop.single.sql
-%%DATADIR%%/mimer/drop.cache.sql
 %%DATADIR%%/mssql/create.cache.sql
 %%DATADIR%%/mssql/create.crc-multi.sql
 %%DATADIR%%/mssql/create.multi.sql
 %%DATADIR%%/mssql/create.single.sql
+%%DATADIR%%/mssql/drop.cache.sql
 %%DATADIR%%/mssql/drop.crc-multi.sql
 %%DATADIR%%/mssql/drop.multi.sql
 %%DATADIR%%/mssql/drop.single.sql
-%%DATADIR%%/mssql/drop.cache.sql
 %%DATADIR%%/mysql/create.cache.sql
 %%DATADIR%%/mysql/create.crc-multi.sql
 %%DATADIR%%/mysql/create.multi.sql
@@ -565,7 +457,6 @@ sbin/stored
 @dirrm %%DATADIR%%/mimer
 @dirrm %%DATADIR%%/ibase
 @dirrm %%DATADIR%%
-@dirrm %%DOCSDIR%%
 @dirrm etc/dpsearch/synonym
 @dirrm etc/dpsearch/stopwords
 @dirrm etc/dpsearch/langmap