- Update to 4.31 [1]

- Improve pkg-message

[1]:
PR:		ports/82560
Submitted by:	Maxime Zakharov <maxime@sochi.net.ru>

6 files changed, 23 insertions, 12 deletions

diff --git a/www/dpsearch/Makefile b/www/dpsearch/Makefile
index a28ccae76f07..f23360e555eb 100644
--- a/www/dpsearch/Makefile
+++ b/www/dpsearch/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	dpsearch
-PORTVERSION=	4.29
+PORTVERSION=	4.31
 CATEGORIES=	www
 MASTER_SITES=	http://dataparksearch.newsa.ru/ \
-		http://dataparksearch.h0t.de/ \
 		http://www.dataparksearch.org/
 
 MAINTAINER=	ports@FreeBSD.org
@@ -28,6 +27,8 @@ CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/etc/dpsearch \
 		--enable-mp3 \
 		--with-zlib
 
+SUB_FILES=	pkg-message
+
 OPTIONS=	DPSEARCH_THREADS  "Enable pthreads"                       on  \
 		DPSEARCH_SSL      "Enable SSL"                            on  \
 		DPSEARCH_GUESSER  "Enable charset and language guesser"   on  \
@@ -133,7 +134,6 @@ pre-install:
 post-install:
 	${CHMOD} 700 /var/dpsearch/cache
 	${CHOWN} -R www:www /var/dpsearch/
-	@${ECHO}
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/dpsearch/distinfo b/www/dpsearch/distinfo
index bf77f39ea310..715a82c31a6f 100644
--- a/www/dpsearch/distinfo
+++ b/www/dpsearch/distinfo
@@ -1,2 +1,2 @@
-MD5 (dpsearch-4.29.tar.gz) = a5a3a34ab3f696390b1ff71c56607734
-SIZE (dpsearch-4.29.tar.gz) = 1938546
+MD5 (dpsearch-4.31.tar.gz) = 1c84f3919bb484614f3e3ab891639c2a
+SIZE (dpsearch-4.31.tar.gz) = 1972056
diff --git a/www/dpsearch/files/pkg-message.in b/www/dpsearch/files/pkg-message.in
new file mode 100644
index 000000000000..185dd286e4b8
--- /dev/null
+++ b/www/dpsearch/files/pkg-message.in
@@ -0,0 +1,11 @@
+===============================================================================
+DataparkSearch Engine is now installed.
+
+To use DataparkSearch, you need to create the appropriate *sql database
+manually. Please read the documentation located in:
+
+%%DOCSDIR%%
+
+For more information on how to use DataparkSearch Engine, please refer to their
+web site at http://www.dataparksearch.org/
+===============================================================================
diff --git a/www/dpsearch/pkg-descr b/www/dpsearch/pkg-descr
index 88684b58c1f6..7614539a61e0 100644
--- a/www/dpsearch/pkg-descr
+++ b/www/dpsearch/pkg-descr
@@ -10,7 +10,7 @@ Key features:
 * External parsers support for other document types;
 * Ability to index multilangual sites using content negotiation;
 * Searching all of the word forms using ispell affixes and dictionaries;
-* Stopwords and synonyms lists;
+* Stopwords, synonyms and acronyms lists;
 * Boolean query language support;
 * Results sorting by relevancy, popularity rank, last modified time and by 
   importance (a multiplication of relevancy and popularity rank);
diff --git a/www/dpsearch/pkg-message b/www/dpsearch/pkg-message
deleted file mode 100644
index 68c973de5fed..000000000000
--- a/www/dpsearch/pkg-message
+++ /dev/null
@@ -1,6 +0,0 @@
-DataparkSearch Engine is successfully installed.
-Now, to use DataparkSearch you need to create the appropriate *sql database
-manually: Please read documenation located in ${PREFIX}/share/doc/dataparksearch.
-
-For more information on how to use DataparkSearch Engine, please refer to their
-web site at http://www.dataparksearch.org/
diff --git a/www/dpsearch/pkg-plist b/www/dpsearch/pkg-plist
index d686a185b8a0..217d1b9a4b3c 100644
--- a/www/dpsearch/pkg-plist
+++ b/www/dpsearch/pkg-plist
@@ -1,7 +1,10 @@
 bin/dps-config
 bin/search.cgi
 bin/storedoc.cgi
+etc/dpsearch/acronym/en.acr
+etc/dpsearch/acronym/en.cs.acr
 etc/dpsearch/acronym/en.fido.acr
+etc/dpsearch/acronym/ru.acr
 etc/dpsearch/cached.conf-dist
 etc/dpsearch/indexer.conf-dist
 etc/dpsearch/langmap.conf-dist
@@ -67,6 +70,7 @@ etc/dpsearch/langmap/hr.latin2.lm
 etc/dpsearch/langmap/hu.cp1250.lm
 etc/dpsearch/langmap/hu.latin2.lm
 etc/dpsearch/langmap/hy.armscii-8.lm
+etc/dpsearch/langmap/id.latin1.lm
 etc/dpsearch/langmap/is.latin1.lm
 etc/dpsearch/langmap/it.latin1.lm
 etc/dpsearch/langmap/ja.euc-jp.lit.lm
@@ -138,6 +142,7 @@ etc/dpsearch/langmap/tl.ascii.lm
 etc/dpsearch/langmap/tr.cp1254.lm
 etc/dpsearch/langmap/tr.cp857.lm
 etc/dpsearch/langmap/tr.latin5.lm
+etc/dpsearch/langmap/tr.utf-8.lm
 etc/dpsearch/langmap/uk.cp1251.lm
 etc/dpsearch/langmap/uk.cp866u.lm
 etc/dpsearch/langmap/uk.koi8-u.lm
@@ -294,6 +299,7 @@ sbin/stored
 %%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-fuzzy.en.html