- Update to 3.3.8

- Adopt
- Convert to ports/KNOBS std
- Use SUB_FILES for pkg-message
- Use USE_MYSQL, USE_APACHE, USE_SQLITE
- honor NOPORTEXAMPLES

4 files changed, 261 insertions, 246 deletions

diff --git a/www/mnogosearch/Makefile b/www/mnogosearch/Makefile
index f19cfceccbd5..f2d3b8fc3990 100644
--- a/www/mnogosearch/Makefile
+++ b/www/mnogosearch/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	mnogosearch
-PORTVERSION=	3.3.7
+PORTVERSION=	3.3.8
 CATEGORIES=	www databases
 MASTER_SITES=	http://www.mnogosearch.org/Download/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	pgollucci@FreeBSD.org
 COMMENT=	Full featured SQL-based hypertext search engine
 
 MAN1=		indexer.1
@@ -30,14 +30,17 @@ MAKE_ENV+=	MKDIRPROG="${MKDIR}"
 PLIST_SUB+=	SHLIB_VER=${SHLIB_VER}
 SHLIB_VER=	1
 
-OPTIONS=	MNOGO_THREADS "Enable pthreads"			on \
-		MNOGO_SSL     "Enable SSL"			on  \
-		MNOGO_ASIAN   "Enable asian charsets"		off \
-		MNOGO_SYSLOG  "Send logs to syslog"             on  \
-		MNOGO_PGSQL   "Use PGSQL"			off \
-		MNOGO_MSQL    "Use MSQL"			off \
-		MNOGO_MYSQL   "Use MySQL"			off \
-		MNOGO_SQLITE  "Use SQLite 2.x"			on
+SUB_FILES+=	pkg-message
+
+OPTIONS= \
+		THREADS "Enable pthreads"		on  \
+		SSL     "Enable SSL"			on  \
+		ASIAN   "Enable asian charsets"	off \
+		SYSLOG  "Send logs to syslog"   on  \
+		PGSQL   "Use PGSQL"				off \
+		MSQL    "Use MSQL"				off \
+		MYSQL   "Use MySQL"				off \
+		SQLITE  "Use SQLite 2.x"		on
 
 .if !defined(NO_OPENSSL)
 USE_OPENSSL=	yes
@@ -45,7 +48,7 @@ USE_OPENSSL=	yes
 
 .include <bsd.port.pre.mk>
 
-.ifdef WITHOUT_MNOGO_THREADS
+.ifdef WITHOUT_THREADS
 CONFIGURE_ARGS+=	--disable-pthreads
 CFLAGS+=	-DCONSOLE
 .else
@@ -54,58 +57,67 @@ CFLAGS+=	${PTHREAD_CFLAGS}
 CONFIGURE_ENV+=	LIBS="${PTHREAD_LIBS}"
 .endif
 
-.if !defined(WITHOUT_MNOGO_SSL) || !defined(NO_OPENSSL)
+.if !defined(WITHOUT_SSL) || !defined(NO_OPENSSL)
 CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}
 .endif
 
-.ifdef WITH_MNOGO_ASIAN
+.ifdef WITH_ASIAN
 CONFIGURE_ARGS+=	--with-extra-charsets=all
 .endif
 
-.ifdef WITHOUT_MNOGO_SYSLOG
+.ifdef WITHOUT_SYSLOG
 CONFIGURE_ARGS+=	--disable-syslog
 .endif
 
-.ifdef WITH_MNOGO_PGSQL
+.ifdef WITH_PGSQL
 USE_PGSQL=		yes
 CONFIGURE_ARGS+=	--with-pgsql=${LOCALBASE}
 .endif
 
-.ifdef WITH_MNOGO_MSQL
+.ifdef WITH_MSQL
 LIB_DEPENDS+=		msql.1:${PORTSDIR}/databases/msql
 CONFIGURE_ARGS+=	--with-msql=${LOCALBASE}
 .endif
 
-.ifdef WITH_MNOGO_MYSQL
-LIB_DEPENDS+=		mysqlclient:${PORTSDIR}/databases/mysql41-client
+.ifdef WITH_MYSQL
+USE_MYSQL=	yes
+WANT_MYSQL_VER=	41
 CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
 .endif
 
-.ifndef WITHOUT_MNOGO_SQLITE
-LIB_DEPENDS+=		sqlite.2:${PORTSDIR}/databases/sqlite2
+.ifndef WITHOUT_SQLITE
+USE_SQLITE=	2
 CONFIGURE_ARGS+=	--with-sqlite=${LOCALBASE}
 .endif
 
-.if defined(WITHOUT_MNOGO_SQLITE) && !defined(WITH_MNOGO_MYSQL) && \
-    !defined(WITH_MNOGO_MSQL) && !defined(WITH_MNOGO_PGSQL)
+.if defined(WITHOUT_SQLITE) && !defined(WITH_MYSQL) && \
+    !defined(WITH_MSQL) && !defined(WITH_PGSQL)
 BROKEN=	needs at least one database driver
 .endif
 
+DOCS=	INSTALL ChangeLog
+PORTEXAMPLES=	README *.conf
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
 		${WRKSRC}/configure
 
 pre-install:
-	@${MKDIR} ${PREFIX}/share/mnogosearch
+	@${MKDIR} ${DATADIR}/
 
 post-install:
 	${LN} -sf libmnogosearch.so \
 		${PREFIX}/lib/libmnogosearch-${PORTVERSION:R}.so.${SHLIB_VER}
 	${CHMOD} 700 /var/mnogosearch/cache
 	${CHOWN} -R ${WWWOWN}:${WWWGRP} /var/mnogosearch
-	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/samples/* ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/INSTALL ${WRKSRC}/ChangeLog ${DOCSDIR}
+	${MKDIR} ${DOCSDIR}/
+.for f in ${DOCS}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/
+.endfor
+.if !defined(NOPORTEXAMPLES)
+	${MKDIR} ${EXAMPLESDIR}/
+	${INSTALL_DATA} ${WRKSRC}/doc/samples/* ${EXAMPLESDIR}/
+.endif
 	@${ECHO}
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/www/mnogosearch/distinfo b/www/mnogosearch/distinfo
index f636f8cd7dfa..b3a2c3fbbd8c 100644
--- a/www/mnogosearch/distinfo
+++ b/www/mnogosearch/distinfo
@@ -1,3 +1,3 @@
-MD5 (mnogosearch-3.3.7.tar.gz) = 9780f069410963dfcb7701730e41e601
-SHA256 (mnogosearch-3.3.7.tar.gz) = ca9b272b81f385b80c4c321d5648eaa27b871604f382dbe06dd45a21332a1a34
-SIZE (mnogosearch-3.3.7.tar.gz) = 3630336
+MD5 (mnogosearch-3.3.8.tar.gz) = 4c561e3f7fb4c7328e2aa242474d7836
+SHA256 (mnogosearch-3.3.8.tar.gz) = 9c11580d0d6c61c207f01af0a7d2f279aeb431845a8b427253a2c021ab4ea143
+SIZE (mnogosearch-3.3.8.tar.gz) = 3755044
diff --git a/www/mnogosearch/pkg-message b/www/mnogosearch/files/pkg-message.in
index 5f59491364b8..dca5bf258a56 100644
--- a/www/mnogosearch/pkg-message
+++ b/www/mnogosearch/files/pkg-message.in
@@ -1,6 +1,6 @@
 mnoGoSearch is successfully installed.
 Now, to use mnoGoSearch you need to create the appropriate *sql database
-manually: Please read INSTALL file located in ${PREFIX}/share/doc/mnogosearch.
+manually: Please read INSTALL file located in %%DOCSDIR%%.
 
 For more information on how to use mnoGoSearch, please refer to their
 web site at http://www.mnogosearch.org/
diff --git a/www/mnogosearch/pkg-plist b/www/mnogosearch/pkg-plist
index 67a873ddfabb..42a1663c4bf2 100644
--- a/www/mnogosearch/pkg-plist
+++ b/www/mnogosearch/pkg-plist
@@ -2,145 +2,143 @@ bin/mconv
 bin/mguesser
 bin/search.cgi
 bin/udm-config
-
-etc/mnogosearch/TraditionalChinese.freq
-etc/mnogosearch/indexer.conf-dist
-etc/mnogosearch/langmap.conf-dist
-etc/mnogosearch/langmap/af.latin1.bible.lm
-etc/mnogosearch/langmap/af.latin1.lm
-etc/mnogosearch/langmap/ar.arabic.lm
-etc/mnogosearch/langmap/ar.arabic.quran.lm
-etc/mnogosearch/langmap/ar.cp1256.lm
-etc/mnogosearch/langmap/ar.cp1256.quran.lm
-etc/mnogosearch/langmap/az.utf8.lm
-etc/mnogosearch/langmap/be.cp1251.lm
-etc/mnogosearch/langmap/bg.cp1251.bible.lm
-etc/mnogosearch/langmap/bg.cp1251.lm
-etc/mnogosearch/langmap/bg.cyrillic.bible.lm
-etc/mnogosearch/langmap/bg.cyrillic.lm
-etc/mnogosearch/langmap/br.latin1.lm
-etc/mnogosearch/langmap/bs.ascii.lm
-etc/mnogosearch/langmap/bs.cp1250.lm
-etc/mnogosearch/langmap/bs.latin2.lm
-etc/mnogosearch/langmap/ca.latin1.lit.lm
-etc/mnogosearch/langmap/ca.latin1.lm
-etc/mnogosearch/langmap/cs.cp1250.lm
-etc/mnogosearch/langmap/cs.latin2.lm
-etc/mnogosearch/langmap/cy.latin1.lm
-etc/mnogosearch/langmap/da.latin1.bible.lm
-etc/mnogosearch/langmap/da.latin1.lm
-etc/mnogosearch/langmap/de.latin1.bible.lm
-etc/mnogosearch/langmap/de.latin1.lm
-etc/mnogosearch/langmap/el.cp1253.lm
-etc/mnogosearch/langmap/el.greek.lm
-etc/mnogosearch/langmap/en.ascii.lm
-etc/mnogosearch/langmap/eo.latin1-h.as.lm
-etc/mnogosearch/langmap/eo.latin1-x.as.lm
-etc/mnogosearch/langmap/eo.latin3.as.lm
-etc/mnogosearch/langmap/eo.latin3.lm
-etc/mnogosearch/langmap/eo.utf8.as.lm
-etc/mnogosearch/langmap/es.latin1.bible.lm
-etc/mnogosearch/langmap/es.latin1.lm
-etc/mnogosearch/langmap/et.cp1257.lm
-etc/mnogosearch/langmap/et.latin4.lm
-etc/mnogosearch/langmap/eu.latin1.lm
-etc/mnogosearch/langmap/fi.latin1.lm
-etc/mnogosearch/langmap/fr.latin1.bible.lm
-etc/mnogosearch/langmap/fr.latin1.lm
-etc/mnogosearch/langmap/ga.latin1.lit.lm
-etc/mnogosearch/langmap/ga.latin1.lm
-etc/mnogosearch/langmap/hi.utf8.lm
-etc/mnogosearch/langmap/he.hebrew.lm
-etc/mnogosearch/langmap/hr.ascii.lm
-etc/mnogosearch/langmap/hr.cp1250.bible.lm
-etc/mnogosearch/langmap/hr.cp1250.lm
-etc/mnogosearch/langmap/hr.latin2.lm
-etc/mnogosearch/langmap/hu.cp1250.lm
-etc/mnogosearch/langmap/hu.latin2.lm
-etc/mnogosearch/langmap/hy.armscii-8.lm
-etc/mnogosearch/langmap/is.latin1.lm
-etc/mnogosearch/langmap/it.latin1.lm
-etc/mnogosearch/langmap/ja.euc-jp.lm
-etc/mnogosearch/langmap/ja.sjis.lm
-etc/mnogosearch/langmap/la.ascii.lm
-etc/mnogosearch/langmap/lt.cp1257.lm
-etc/mnogosearch/langmap/lt.latin4.lm
-etc/mnogosearch/langmap/lv.cp1257.lm
-etc/mnogosearch/langmap/lv.latin4.lm
-etc/mnogosearch/langmap/nl.latin1.bible.lm
-etc/mnogosearch/langmap/nl.latin1.lm
-etc/mnogosearch/langmap/no.latin1.lm
-etc/mnogosearch/langmap/pl.latin2.lm
-etc/mnogosearch/langmap/pt-br.latin1.lm
-etc/mnogosearch/langmap/pt-pt.latin1.lm
-etc/mnogosearch/langmap/ro.ascii.lm
-etc/mnogosearch/langmap/ro.cp1250.lm
-etc/mnogosearch/langmap/ro.latin2.lm
-etc/mnogosearch/langmap/ru.cp1251.lm
-etc/mnogosearch/langmap/ru.cp866.lm
-etc/mnogosearch/langmap/ru.cyrillic.lm
-etc/mnogosearch/langmap/ru.koi8-r.lm
-etc/mnogosearch/langmap/ru.maccyr.lm
-etc/mnogosearch/langmap/ru.utf8.lm
-etc/mnogosearch/langmap/sk.ascii.lm
-etc/mnogosearch/langmap/sk.cp1250.lm
-etc/mnogosearch/langmap/sk.latin2.lm
-etc/mnogosearch/langmap/sl.ascii.lm
-etc/mnogosearch/langmap/sl.cp1250.lm
-etc/mnogosearch/langmap/sl.latin2.lm
-etc/mnogosearch/langmap/sq.latin1.lm
-etc/mnogosearch/langmap/sr.cp1250.lm
-etc/mnogosearch/langmap/sr.latin2.lm
-etc/mnogosearch/langmap/sv.latin1.bible.lm
-etc/mnogosearch/langmap/sv.latin1.lm
-etc/mnogosearch/langmap/sw.latin1.lm
-etc/mnogosearch/langmap/ta.tscii.lm
-etc/mnogosearch/langmap/th.cp874.lm
-etc/mnogosearch/langmap/th.tis-620.lm
-etc/mnogosearch/langmap/tl.ascii.bible.lm
-etc/mnogosearch/langmap/tl.ascii.lm
-etc/mnogosearch/langmap/tr.cp1254.lm
-etc/mnogosearch/langmap/tr.cp857.lm
-etc/mnogosearch/langmap/tr.latin5.lm
-etc/mnogosearch/langmap/ua.cp1251.lm
-etc/mnogosearch/langmap/ua.koi8-u.lm
-etc/mnogosearch/langmap/vi.viscii.lm
-etc/mnogosearch/langmap/zh.big5.lm
-etc/mnogosearch/langmap/zh.gb2312.lm
-etc/mnogosearch/mandarin.freq
-etc/mnogosearch/node.xml-dist
-etc/mnogosearch/search.htm-dist
-etc/mnogosearch/stopwords.conf-dist
-etc/mnogosearch/stopwords/ct.sl
-etc/mnogosearch/stopwords/cz.sl
-etc/mnogosearch/stopwords/da.sl
-etc/mnogosearch/stopwords/de.sl
-etc/mnogosearch/stopwords/en.big.sl
-etc/mnogosearch/stopwords/en.huge.sl
-etc/mnogosearch/stopwords/en.sl
-etc/mnogosearch/stopwords/es.sl
-etc/mnogosearch/stopwords/fr.sl
-etc/mnogosearch/stopwords/hu.sl
-etc/mnogosearch/stopwords/it.sl
-etc/mnogosearch/stopwords/ja.sl
-etc/mnogosearch/stopwords/lt.sl
-etc/mnogosearch/stopwords/nl.sl
-etc/mnogosearch/stopwords/no.sl
-etc/mnogosearch/stopwords/pl.sl
-etc/mnogosearch/stopwords/pt.sl
-etc/mnogosearch/stopwords/ru.sl
-etc/mnogosearch/stopwords/se.sl
-etc/mnogosearch/stopwords/sk.sl
-etc/mnogosearch/stopwords/tr.sl
-etc/mnogosearch/stopwords/ua.sl
-etc/mnogosearch/stopwords/zh.sl
-etc/mnogosearch/synonym/english.syn
-etc/mnogosearch/synonym/french.syn
-etc/mnogosearch/synonym/italian.syn
-etc/mnogosearch/synonym/russian.syn
-etc/mnogosearch/synonym/russian.big.syn
-etc/mnogosearch/thai.freq
-
+%%ETCDIR%%/TraditionalChinese.freq
+%%ETCDIR%%/indexer.conf-dist
+%%ETCDIR%%/langmap.conf-dist
+%%ETCDIR%%/langmap/af.latin1.bible.lm
+%%ETCDIR%%/langmap/af.latin1.lm
+%%ETCDIR%%/langmap/ar.arabic.lm
+%%ETCDIR%%/langmap/ar.arabic.quran.lm
+%%ETCDIR%%/langmap/ar.cp1256.lm
+%%ETCDIR%%/langmap/ar.cp1256.quran.lm
+%%ETCDIR%%/langmap/az.utf8.lm
+%%ETCDIR%%/langmap/be.cp1251.lm
+%%ETCDIR%%/langmap/bg.cp1251.bible.lm
+%%ETCDIR%%/langmap/bg.cp1251.lm
+%%ETCDIR%%/langmap/bg.cyrillic.bible.lm
+%%ETCDIR%%/langmap/bg.cyrillic.lm
+%%ETCDIR%%/langmap/br.latin1.lm
+%%ETCDIR%%/langmap/bs.ascii.lm
+%%ETCDIR%%/langmap/bs.cp1250.lm
+%%ETCDIR%%/langmap/bs.latin2.lm
+%%ETCDIR%%/langmap/ca.latin1.lit.lm
+%%ETCDIR%%/langmap/ca.latin1.lm
+%%ETCDIR%%/langmap/cs.cp1250.lm
+%%ETCDIR%%/langmap/cs.latin2.lm
+%%ETCDIR%%/langmap/cy.latin1.lm
+%%ETCDIR%%/langmap/da.latin1.bible.lm
+%%ETCDIR%%/langmap/da.latin1.lm
+%%ETCDIR%%/langmap/de.latin1.bible.lm
+%%ETCDIR%%/langmap/de.latin1.lm
+%%ETCDIR%%/langmap/el.cp1253.lm
+%%ETCDIR%%/langmap/el.greek.lm
+%%ETCDIR%%/langmap/en.ascii.lm
+%%ETCDIR%%/langmap/eo.latin1-h.as.lm
+%%ETCDIR%%/langmap/eo.latin1-x.as.lm
+%%ETCDIR%%/langmap/eo.latin3.as.lm
+%%ETCDIR%%/langmap/eo.latin3.lm
+%%ETCDIR%%/langmap/eo.utf8.as.lm
+%%ETCDIR%%/langmap/es.latin1.bible.lm
+%%ETCDIR%%/langmap/es.latin1.lm
+%%ETCDIR%%/langmap/et.cp1257.lm
+%%ETCDIR%%/langmap/et.latin4.lm
+%%ETCDIR%%/langmap/eu.latin1.lm
+%%ETCDIR%%/langmap/fi.latin1.lm
+%%ETCDIR%%/langmap/fr.latin1.bible.lm
+%%ETCDIR%%/langmap/fr.latin1.lm
+%%ETCDIR%%/langmap/ga.latin1.lit.lm
+%%ETCDIR%%/langmap/ga.latin1.lm
+%%ETCDIR%%/langmap/hi.utf8.lm
+%%ETCDIR%%/langmap/he.hebrew.lm
+%%ETCDIR%%/langmap/hr.ascii.lm
+%%ETCDIR%%/langmap/hr.cp1250.bible.lm
+%%ETCDIR%%/langmap/hr.cp1250.lm
+%%ETCDIR%%/langmap/hr.latin2.lm
+%%ETCDIR%%/langmap/hu.cp1250.lm
+%%ETCDIR%%/langmap/hu.latin2.lm
+%%ETCDIR%%/langmap/hy.armscii-8.lm
+%%ETCDIR%%/langmap/is.latin1.lm
+%%ETCDIR%%/langmap/it.latin1.lm
+%%ETCDIR%%/langmap/ja.euc-jp.lm
+%%ETCDIR%%/langmap/ja.sjis.lm
+%%ETCDIR%%/langmap/la.ascii.lm
+%%ETCDIR%%/langmap/lt.cp1257.lm
+%%ETCDIR%%/langmap/lt.latin4.lm
+%%ETCDIR%%/langmap/lv.cp1257.lm
+%%ETCDIR%%/langmap/lv.latin4.lm
+%%ETCDIR%%/langmap/nl.latin1.bible.lm
+%%ETCDIR%%/langmap/nl.latin1.lm
+%%ETCDIR%%/langmap/no.latin1.lm
+%%ETCDIR%%/langmap/pl.latin2.lm
+%%ETCDIR%%/langmap/pt-br.latin1.lm
+%%ETCDIR%%/langmap/pt-pt.latin1.lm
+%%ETCDIR%%/langmap/ro.ascii.lm
+%%ETCDIR%%/langmap/ro.cp1250.lm
+%%ETCDIR%%/langmap/ro.latin2.lm
+%%ETCDIR%%/langmap/ru.cp1251.lm
+%%ETCDIR%%/langmap/ru.cp866.lm
+%%ETCDIR%%/langmap/ru.cyrillic.lm
+%%ETCDIR%%/langmap/ru.koi8-r.lm
+%%ETCDIR%%/langmap/ru.maccyr.lm
+%%ETCDIR%%/langmap/ru.utf8.lm
+%%ETCDIR%%/langmap/sk.ascii.lm
+%%ETCDIR%%/langmap/sk.cp1250.lm
+%%ETCDIR%%/langmap/sk.latin2.lm
+%%ETCDIR%%/langmap/sl.ascii.lm
+%%ETCDIR%%/langmap/sl.cp1250.lm
+%%ETCDIR%%/langmap/sl.latin2.lm
+%%ETCDIR%%/langmap/sq.latin1.lm
+%%ETCDIR%%/langmap/sr.cp1250.lm
+%%ETCDIR%%/langmap/sr.latin2.lm
+%%ETCDIR%%/langmap/sv.latin1.bible.lm
+%%ETCDIR%%/langmap/sv.latin1.lm
+%%ETCDIR%%/langmap/sw.latin1.lm
+%%ETCDIR%%/langmap/ta.tscii.lm
+%%ETCDIR%%/langmap/th.cp874.lm
+%%ETCDIR%%/langmap/th.tis-620.lm
+%%ETCDIR%%/langmap/tl.ascii.bible.lm
+%%ETCDIR%%/langmap/tl.ascii.lm
+%%ETCDIR%%/langmap/tr.cp1254.lm
+%%ETCDIR%%/langmap/tr.cp857.lm
+%%ETCDIR%%/langmap/tr.latin5.lm
+%%ETCDIR%%/langmap/ua.cp1251.lm
+%%ETCDIR%%/langmap/ua.koi8-u.lm
+%%ETCDIR%%/langmap/vi.viscii.lm
+%%ETCDIR%%/langmap/zh.big5.lm
+%%ETCDIR%%/langmap/zh.gb2312.lm
+%%ETCDIR%%/mandarin.freq
+%%ETCDIR%%/node.xml-dist
+%%ETCDIR%%/search.htm-dist
+%%ETCDIR%%/stopwords.conf-dist
+%%ETCDIR%%/stopwords/ct.sl
+%%ETCDIR%%/stopwords/cz.sl
+%%ETCDIR%%/stopwords/da.sl
+%%ETCDIR%%/stopwords/de.sl
+%%ETCDIR%%/stopwords/en.big.sl
+%%ETCDIR%%/stopwords/en.huge.sl
+%%ETCDIR%%/stopwords/en.sl
+%%ETCDIR%%/stopwords/es.sl
+%%ETCDIR%%/stopwords/fr.sl
+%%ETCDIR%%/stopwords/hu.sl
+%%ETCDIR%%/stopwords/it.sl
+%%ETCDIR%%/stopwords/ja.sl
+%%ETCDIR%%/stopwords/lt.sl
+%%ETCDIR%%/stopwords/nl.sl
+%%ETCDIR%%/stopwords/no.sl
+%%ETCDIR%%/stopwords/pl.sl
+%%ETCDIR%%/stopwords/pt.sl
+%%ETCDIR%%/stopwords/ru.sl
+%%ETCDIR%%/stopwords/se.sl
+%%ETCDIR%%/stopwords/sk.sl
+%%ETCDIR%%/stopwords/tr.sl
+%%ETCDIR%%/stopwords/ua.sl
+%%ETCDIR%%/stopwords/zh.sl
+%%ETCDIR%%/synonym/english.syn
+%%ETCDIR%%/synonym/french.syn
+%%ETCDIR%%/synonym/italian.syn
+%%ETCDIR%%/synonym/russian.syn
+%%ETCDIR%%/synonym/russian.big.syn
+%%ETCDIR%%/thai.freq
 include/udm_agent.h
 include/udm_alias.h
 include/udm_autoconf.h
@@ -201,7 +199,6 @@ include/udm_wild.h
 include/udm_word.h
 include/udm_xmalloc.h
 include/udmsearch.h
-
 lib/libmnogocharset-3.3.so
 lib/libmnogocharset.a
 lib/libmnogocharset.la
@@ -212,7 +209,68 @@ lib/libmnogosearch.a
 lib/libmnogosearch.la
 lib/libmnogosearch.so
 sbin/indexer
-
+%%DATADIR%%/cache/create.multi.sql
+%%DATADIR%%/cache/create.single.sql
+%%DATADIR%%/cache/drop.multi.sql
+%%DATADIR%%/cache/drop.single.sql
+%%DATADIR%%/db2/create.blob.sql
+%%DATADIR%%/db2/create.multi.sql
+%%DATADIR%%/db2/create.single.sql
+%%DATADIR%%/db2/drop.blob.sql
+%%DATADIR%%/db2/drop.multi.sql
+%%DATADIR%%/db2/drop.single.sql
+%%DATADIR%%/ibase/create.blob.sql
+%%DATADIR%%/ibase/create.multi.sql
+%%DATADIR%%/ibase/create.single.sql
+%%DATADIR%%/ibase/drop.blob.sql
+%%DATADIR%%/ibase/drop.multi.sql
+%%DATADIR%%/ibase/drop.single.sql
+%%DATADIR%%/mimer/create.blob.sql
+%%DATADIR%%/mimer/create.multi.sql
+%%DATADIR%%/mimer/create.single.sql
+%%DATADIR%%/mimer/drop.blob.sql
+%%DATADIR%%/mimer/drop.multi.sql
+%%DATADIR%%/mimer/drop.single.sql
+%%DATADIR%%/mssql/create.blob.sql
+%%DATADIR%%/mssql/create.multi.sql
+%%DATADIR%%/mssql/create.single.sql
+%%DATADIR%%/mssql/drop.blob.sql
+%%DATADIR%%/mssql/drop.multi.sql
+%%DATADIR%%/mssql/drop.single.sql
+%%DATADIR%%/mysql/create.blob.sql
+%%DATADIR%%/mysql/create.multi.sql
+%%DATADIR%%/mysql/create.single.sql
+%%DATADIR%%/mysql/drop.blob.sql
+%%DATADIR%%/mysql/drop.multi.sql
+%%DATADIR%%/mysql/drop.single.sql
+%%DATADIR%%/oracle/create.blob.sql
+%%DATADIR%%/oracle/create.multi.sql
+%%DATADIR%%/oracle/create.single.sql
+%%DATADIR%%/oracle/drop.blob.sql
+%%DATADIR%%/oracle/drop.multi.sql
+%%DATADIR%%/oracle/drop.single.sql
+%%DATADIR%%/pgsql/create.blob.sql
+%%DATADIR%%/pgsql/create.multi.sql
+%%DATADIR%%/pgsql/create.single.sql
+%%DATADIR%%/pgsql/drop.blob.sql
+%%DATADIR%%/pgsql/drop.multi.sql
+%%DATADIR%%/pgsql/drop.single.sql
+%%DATADIR%%/sqlite/create.blob.sql
+%%DATADIR%%/sqlite/create.multi.sql
+%%DATADIR%%/sqlite/create.single.sql
+%%DATADIR%%/sqlite/drop.blob.sql
+%%DATADIR%%/sqlite/drop.multi.sql
+%%DATADIR%%/sqlite/drop.single.sql
+%%DATADIR%%/sybase/create.blob.sql
+%%DATADIR%%/sybase/create.multi.sql
+%%DATADIR%%/sybase/create.single.sql
+%%DATADIR%%/sybase/drop.blob.sql
+%%DATADIR%%/sybase/drop.multi.sql
+%%DATADIR%%/sybase/drop.single.sql
+%%DATADIR%%/virtuoso/create.multi.sql
+%%DATADIR%%/virtuoso/create.single.sql
+%%DATADIR%%/virtuoso/drop.multi.sql
+%%DATADIR%%/virtuoso/drop.single.sql
 %%DOCSDIR%%/ChangeLog
 %%DOCSDIR%%/INSTALL
 %%DOCSDIR%%/body-after.html
@@ -368,6 +426,21 @@ sbin/indexer
 %%DOCSDIR%%/msearch-cmdref-worddistanceweight.html
 %%DOCSDIR%%/msearch-cmdref-wordformfactor.html
 %%DOCSDIR%%/msearch-cmdref.html
+%%DOCSDIR%%/msearch-cmdref-addencoding.html
+%%DOCSDIR%%/msearch-cmdref-crawldelay.html
+%%DOCSDIR%%/msearch-cmdref-crawlerthreads.html
+%%DOCSDIR%%/msearch-cmdref-loadurlbasicinfo.html
+%%DOCSDIR%%/msearch-cmdref-log2stderr.html
+%%DOCSDIR%%/msearch-cmdref-pagesperscreen.html
+%%DOCSDIR%%/msearch-cmdref-skipif.html
+%%DOCSDIR%%/msearch-cmdref-urlselectskiplock.html
+%%DOCSDIR%%/msearch-cmdref-uselocalcachedcopy.html
+%%DOCSDIR%%/msearch-cmdref-usercachequery.html
+%%DOCSDIR%%/msearch-cmdref-userorder.html
+%%DOCSDIR%%/msearch-cmdref-usersitescore.html
+%%DOCSDIR%%/msearch-contriblist.html
+%%DOCSDIR%%/msearch-parsers.html
+%%DOCSDIR%%/msearch-templates-oper.html
 %%DOCSDIR%%/msearch-content-enc.html
 %%DOCSDIR%%/msearch-db2.html
 %%DOCSDIR%%/msearch-dbschema.html
@@ -414,77 +487,6 @@ sbin/indexer
 %%DOCSDIR%%/msearch-track.html
 %%DOCSDIR%%/msearch-udmstemmer.html
 %%DOCSDIR%%/msearch-vary.html
-
-%%EXAMPLESDIR%%/README
-%%EXAMPLESDIR%%/ftpsearch.conf
-%%EXAMPLESDIR%%/htdb.conf
-%%EXAMPLESDIR%%/minimal.conf
-%%EXAMPLESDIR%%/news.conf
-
-%%DATADIR%%/cache/create.multi.sql
-%%DATADIR%%/cache/create.single.sql
-%%DATADIR%%/cache/drop.multi.sql
-%%DATADIR%%/cache/drop.single.sql
-%%DATADIR%%/db2/create.blob.sql
-%%DATADIR%%/db2/create.multi.sql
-%%DATADIR%%/db2/create.single.sql
-%%DATADIR%%/db2/drop.blob.sql
-%%DATADIR%%/db2/drop.multi.sql
-%%DATADIR%%/db2/drop.single.sql
-%%DATADIR%%/ibase/create.blob.sql
-%%DATADIR%%/ibase/create.multi.sql
-%%DATADIR%%/ibase/create.single.sql
-%%DATADIR%%/ibase/drop.blob.sql
-%%DATADIR%%/ibase/drop.multi.sql
-%%DATADIR%%/ibase/drop.single.sql
-%%DATADIR%%/mimer/create.blob.sql
-%%DATADIR%%/mimer/create.multi.sql
-%%DATADIR%%/mimer/create.single.sql
-%%DATADIR%%/mimer/drop.blob.sql
-%%DATADIR%%/mimer/drop.multi.sql
-%%DATADIR%%/mimer/drop.single.sql
-%%DATADIR%%/mssql/create.blob.sql
-%%DATADIR%%/mssql/create.multi.sql
-%%DATADIR%%/mssql/create.single.sql
-%%DATADIR%%/mssql/drop.blob.sql
-%%DATADIR%%/mssql/drop.multi.sql
-%%DATADIR%%/mssql/drop.single.sql
-%%DATADIR%%/mysql/create.blob.sql
-%%DATADIR%%/mysql/create.multi.sql
-%%DATADIR%%/mysql/create.single.sql
-%%DATADIR%%/mysql/drop.blob.sql
-%%DATADIR%%/mysql/drop.multi.sql
-%%DATADIR%%/mysql/drop.single.sql
-%%DATADIR%%/oracle/create.blob.sql
-%%DATADIR%%/oracle/create.multi.sql
-%%DATADIR%%/oracle/create.single.sql
-%%DATADIR%%/oracle/drop.blob.sql
-%%DATADIR%%/oracle/drop.multi.sql
-%%DATADIR%%/oracle/drop.single.sql
-%%DATADIR%%/pgsql/create.blob.sql
-%%DATADIR%%/pgsql/create.multi.sql
-%%DATADIR%%/pgsql/create.single.sql
-%%DATADIR%%/pgsql/drop.blob.sql
-%%DATADIR%%/pgsql/drop.multi.sql
-%%DATADIR%%/pgsql/drop.single.sql
-%%DATADIR%%/sqlite/create.blob.sql
-%%DATADIR%%/sqlite/create.multi.sql
-%%DATADIR%%/sqlite/create.single.sql
-%%DATADIR%%/sqlite/drop.blob.sql
-%%DATADIR%%/sqlite/drop.multi.sql
-%%DATADIR%%/sqlite/drop.single.sql
-%%DATADIR%%/sybase/create.blob.sql
-%%DATADIR%%/sybase/create.multi.sql
-%%DATADIR%%/sybase/create.single.sql
-%%DATADIR%%/sybase/drop.blob.sql
-%%DATADIR%%/sybase/drop.multi.sql
-%%DATADIR%%/sybase/drop.single.sql
-%%DATADIR%%/virtuoso/create.multi.sql
-%%DATADIR%%/virtuoso/create.single.sql
-%%DATADIR%%/virtuoso/drop.multi.sql
-%%DATADIR%%/virtuoso/drop.single.sql
-
-@dirrm %%EXAMPLESDIR%%
 @dirrm %%DATADIR%%/cache
 @dirrm %%DATADIR%%/mimer
 @dirrm %%DATADIR%%/sqlite
@@ -497,8 +499,9 @@ sbin/indexer
 @dirrm %%DATADIR%%/mssql
 @dirrm %%DATADIR%%/sybase
 @dirrm %%DATADIR%%
-@dirrm etc/mnogosearch/synonym
-@dirrm etc/mnogosearch/stopwords
-@dirrm etc/mnogosearch/langmap
-@dirrmtry etc/mnogosearch
+@dirrm %%ETCDIR%%/synonym
+@dirrm %%ETCDIR%%/stopwords
+@dirrm %%ETCDIR%%/langmap
+@dirrm %%ETCDIR%%
 @dirrm %%DOCSDIR%%
+