- Update to 4.47

- Fix build after objformat removal [1]

PR:		114497
Submitted by:	Maxime Zakharov <maxime@datapark.ru>
		miwi

3 files changed, 21 insertions, 8 deletions

diff --git a/www/dpsearch/Makefile b/www/dpsearch/Makefile
index ee220501afd0..9cec6ea0a4f2 100644
--- a/www/dpsearch/Makefile
+++ b/www/dpsearch/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dpsearch
-PORTVERSION=	4.46
+PORTVERSION=	4.47
 CATEGORIES=	www
 MASTER_SITES=	http://www.dataparksearch.org/ \
 		http://dataparksearch.newsa.ru/
@@ -133,6 +133,7 @@ CONFIGURE_ARGS+=	--with-sqlite=${LOCALBASE}
 post-patch:
 	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
 		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|echo aout|echo elf|g' ${WRKSRC}/configure
 
 pre-install:
 	@${MKDIR} ${DATADIR}
diff --git a/www/dpsearch/distinfo b/www/dpsearch/distinfo
index a4152193d37e..f0013f8d7a2a 100644
--- a/www/dpsearch/distinfo
+++ b/www/dpsearch/distinfo
@@ -1,3 +1,3 @@
-MD5 (dpsearch-4.46.tar.gz) = 7937ff42ce35d97d9993133df07b5311
-SHA256 (dpsearch-4.46.tar.gz) = 2def7e3aa64a407461af7a4fc72707528d1a843fc2cedd4d3c27c9d50646b8b8
-SIZE (dpsearch-4.46.tar.gz) = 2240023
+MD5 (dpsearch-4.47.tar.gz) = e887a451b5f997ccf4fa2b78755b7891
+SHA256 (dpsearch-4.47.tar.gz) = dd901ba1017ffc2abd9771479ba52a6f99e9ce99bacb8848c889fe279b484557
+SIZE (dpsearch-4.47.tar.gz) = 2453695
diff --git a/www/dpsearch/pkg-plist b/www/dpsearch/pkg-plist
index 5cd2bf6effda..4f4d2bfb3894 100644
--- a/www/dpsearch/pkg-plist
+++ b/www/dpsearch/pkg-plist
@@ -367,11 +367,9 @@ 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
 sbin/cached
 sbin/dpconv
@@ -397,8 +395,6 @@ sbin/stored
 %%DOCSDIR%%/dpsearch-cjk.ru.html
 %%DOCSDIR%%/dpsearch-content-enc.en.html
 %%DOCSDIR%%/dpsearch-content-enc.ru.html
-%%DOCSDIR%%/dpsearch-db2.en.html
-%%DOCSDIR%%/dpsearch-db2.ru.html
 %%DOCSDIR%%/dpsearch-dbschema.en.html
 %%DOCSDIR%%/dpsearch-dbschema.ru.html
 %%DOCSDIR%%/dpsearch-disclaimer.en.html
@@ -474,6 +470,8 @@ sbin/stored
 %%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
@@ -490,47 +488,61 @@ sbin/stored
 %%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
 %%DATADIR%%/ibase/create.single.sql
+%%DATADIR%%/ibase/drop.cache.sql
 %%DATADIR%%/ibase/drop.crc-multi.sql
 %%DATADIR%%/ibase/drop.multi.sql
 %%DATADIR%%/ibase/drop.single.sql
+%%DATADIR%%/mimer/create.cache.sql
 %%DATADIR%%/mimer/create.crc-multi.sql
 %%DATADIR%%/mimer/create.multi.sql
 %%DATADIR%%/mimer/create.single.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.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
 %%DATADIR%%/mysql/create.single.sql
+%%DATADIR%%/mysql/drop.cache.sql
 %%DATADIR%%/mysql/drop.crc-multi.sql
 %%DATADIR%%/mysql/drop.multi.sql
 %%DATADIR%%/mysql/drop.single.sql
+%%DATADIR%%/oracle/create.cache.sql
 %%DATADIR%%/oracle/create.crc-multi.sql
 %%DATADIR%%/oracle/create.multi.sql
 %%DATADIR%%/oracle/create.single.sql
+%%DATADIR%%/oracle/drop.cache.sql
 %%DATADIR%%/oracle/drop.crc-multi.sql
 %%DATADIR%%/oracle/drop.multi.sql
 %%DATADIR%%/oracle/drop.single.sql
+%%DATADIR%%/pgsql/create.cache.sql
 %%DATADIR%%/pgsql/create.crc-multi.sql
 %%DATADIR%%/pgsql/create.crc.sql
 %%DATADIR%%/pgsql/create.multi.sql
 %%DATADIR%%/pgsql/create.single.sql
+%%DATADIR%%/pgsql/drop.cache.sql
 %%DATADIR%%/pgsql/drop.crc-multi.sql
 %%DATADIR%%/pgsql/drop.crc.sql
 %%DATADIR%%/pgsql/drop.multi.sql
 %%DATADIR%%/pgsql/drop.single.sql
+%%DATADIR%%/sqlite/create.cache.sql
 %%DATADIR%%/sqlite/create.crc-multi.sql
 %%DATADIR%%/sqlite/create.multi.sql
 %%DATADIR%%/sqlite/create.single.sql
+%%DATADIR%%/sqlite/drop.cache.sql
 %%DATADIR%%/sqlite/drop.crc-multi.sql
 %%DATADIR%%/sqlite/drop.multi.sql
 %%DATADIR%%/sqlite/drop.single.sql