4 files changed, 34 insertions, 27 deletions

diff --git a/www/mnogosearch/Makefile b/www/mnogosearch/Makefile
index af931e16c9bd..95aa80b9185e 100644
--- a/www/mnogosearch/Makefile
+++ b/www/mnogosearch/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mnogosearch
-PORTVERSION=	3.2.39
-PORTREVISION=	1
+PORTVERSION=	3.3.4
 CATEGORIES=	www databases
 MASTER_SITES=	http://www.mnogosearch.org/Download/
 
@@ -17,7 +16,7 @@ COMMENT=	Full featured SQL-based hypertext search engine
 MAN1=		indexer.1
 MAN5=		indexer.conf.5
 
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 USE_GNOME=	lthack
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
@@ -47,7 +46,10 @@ USE_OPENSSL=	yes
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_MNOGO_THREADS)
+.ifdef WITHOUT_MNOGO_THREADS
+CONFIGURE_ARGS+=	--disable-pthreads
+CFLAGS+=	-DCONSOLE
+.else
 CONFIGURE_ARGS+=	--enable-pthreads
 CFLAGS+=	${PTHREAD_CFLAGS}
 CONFIGURE_ENV+=	LIBS="${PTHREAD_LIBS}"
@@ -87,7 +89,7 @@ CONFIGURE_ARGS+=	--with-sqlite=${LOCALBASE}
 
 .if defined(WITHOUT_MNOGO_SQLITE) && !defined(WITH_MNOGO_MYSQL) && \
     !defined(WITH_MNOGO_MSQL) && !defined(WITH_MNOGO_PGSQL)
-BROKEN=	"You need to select at least one database driver"
+BROKEN=	needs at least one database driver
 .endif
 
 post-patch:
diff --git a/www/mnogosearch/distinfo b/www/mnogosearch/distinfo
index 0536427f9425..9a82e93dfbc6 100644
--- a/www/mnogosearch/distinfo
+++ b/www/mnogosearch/distinfo
@@ -1,3 +1,3 @@
-MD5 (mnogosearch-3.2.39.tar.gz) = d6bb08841c2c7b3b70bd38e907bd93d0
-SHA256 (mnogosearch-3.2.39.tar.gz) = 327f0a2a753e014bfb78659ef500cb34639890f02e78663f779db891956427e2
-SIZE (mnogosearch-3.2.39.tar.gz) = 3408018
+MD5 (mnogosearch-3.3.4.tar.gz) = f62b9f4e339a025ea593143b74ee5a56
+SHA256 (mnogosearch-3.3.4.tar.gz) = 31d7e4223181fbd3a2a308c1689a4fc465d3bdb28758a5ff876b7619159adc6b
+SIZE (mnogosearch-3.3.4.tar.gz) = 3559399
diff --git a/www/mnogosearch/pkg-message b/www/mnogosearch/pkg-message
index 34b6011ceefe..5f59491364b8 100644
--- a/www/mnogosearch/pkg-message
+++ b/www/mnogosearch/pkg-message
@@ -3,4 +3,4 @@ Now, to use mnoGoSearch you need to create the appropriate *sql database
 manually: Please read INSTALL file located in ${PREFIX}/share/doc/mnogosearch.
 
 For more information on how to use mnoGoSearch, please refer to their
-web site at http://search.mnoGo.ru/
+web site at http://www.mnogosearch.org/
diff --git a/www/mnogosearch/pkg-plist b/www/mnogosearch/pkg-plist
index 3c485db40b25..a13f071b33bd 100644
--- a/www/mnogosearch/pkg-plist
+++ b/www/mnogosearch/pkg-plist
@@ -48,6 +48,7 @@ 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
@@ -106,6 +107,7 @@ 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
@@ -132,7 +134,7 @@ etc/mnogosearch/stopwords/tr.sl
 etc/mnogosearch/stopwords/ua.sl
 etc/mnogosearch/stopwords/zh.sl
 etc/mnogosearch/synonym/english.syn
-etc/mnogosearch/synonym/francais.syn
+etc/mnogosearch/synonym/french.syn
 etc/mnogosearch/synonym/italian.syn
 etc/mnogosearch/synonym/russian.syn
 etc/mnogosearch/synonym/russian.big.syn
@@ -197,12 +199,12 @@ include/udm_wild.h
 include/udm_word.h
 include/udm_xmalloc.h
 include/udmsearch.h
-lib/libmnogocharset-3.2.so
+lib/libmnogocharset-3.3.so
 lib/libmnogocharset.a
 lib/libmnogocharset.la
 lib/libmnogocharset.so
-lib/libmnogosearch-3.2.so.%%SHLIB_VER%%
-lib/libmnogosearch-3.2.so
+lib/libmnogosearch-3.3.so.%%SHLIB_VER%%
+lib/libmnogosearch-3.3.so
 lib/libmnogosearch.a
 lib/libmnogosearch.la
 lib/libmnogosearch.so
@@ -214,25 +216,26 @@ sbin/indexer
 %%DOCSDIR%%/index.html
 %%DOCSDIR%%/mnogo.css
 %%DOCSDIR%%/msearch-authors.html
+%%DOCSDIR%%/msearch-bugs.html
 %%DOCSDIR%%/msearch-binarydistrib.html
 %%DOCSDIR%%/msearch-cachemode.html
 %%DOCSDIR%%/msearch-changelog.html
 %%DOCSDIR%%/msearch-cjk.html
+%%DOCSDIR%%/msearch-cluster.html
 %%DOCSDIR%%/msearch-cmdref-addtype.html
 %%DOCSDIR%%/msearch-cmdref-affix.html
 %%DOCSDIR%%/msearch-cmdref-alias.html
 %%DOCSDIR%%/msearch-cmdref-aliasprog.html
 %%DOCSDIR%%/msearch-cmdref-allow.html
-%%DOCSDIR%%/msearch-cmdref-alnumfactor.html
 %%DOCSDIR%%/msearch-cmdref-alwaysfoundword.html
 %%DOCSDIR%%/msearch-cmdref-authbasic.html
-%%DOCSDIR%%/msearch-cmdref-basefiles.html
 %%DOCSDIR%%/msearch-cmdref-browsercharset.html
 %%DOCSDIR%%/msearch-cmdref-cache.html
 %%DOCSDIR%%/msearch-cmdref-category.html
 %%DOCSDIR%%/msearch-cmdref-checkmp3.html
 %%DOCSDIR%%/msearch-cmdref-checkmp3only.html
 %%DOCSDIR%%/msearch-cmdref-checkonly.html
+%%DOCSDIR%%/msearch-cmdref-collectlinks.html
 %%DOCSDIR%%/msearch-cmdref-crosswords.html
 %%DOCSDIR%%/msearch-cmdref-customlog.html
 %%DOCSDIR%%/msearch-cmdref-cvsignore.html
@@ -241,19 +244,18 @@ sbin/indexer
 %%DOCSDIR%%/msearch-cmdref-dbaddr.html
 %%DOCSDIR%%/msearch-cmdref-defaultcontenttype.html
 %%DOCSDIR%%/msearch-cmdref-defaultlang.html
+%%DOCSDIR%%/msearch-cmdref-dehyphenate.html
 %%DOCSDIR%%/msearch-cmdref-detectclones.html
 %%DOCSDIR%%/msearch-cmdref-disallow.html
 %%DOCSDIR%%/msearch-cmdref-docmemcachesize.html
 %%DOCSDIR%%/msearch-cmdref-docsizeweight.html
 %%DOCSDIR%%/msearch-cmdref-doctimeout.html
-%%DOCSDIR%%/msearch-cmdref-dostore.html
 %%DOCSDIR%%/msearch-cmdref-excerptpadding.html
 %%DOCSDIR%%/msearch-cmdref-excerptsize.html
 %%DOCSDIR%%/msearch-cmdref-excerptstopword.html
 %%DOCSDIR%%/msearch-cmdref-flushservertable.html
 %%DOCSDIR%%/msearch-cmdref-followsymlinks.html
 %%DOCSDIR%%/msearch-cmdref-forceiischarset1251.html
-%%DOCSDIR%%/msearch-cmdref-groupbysite.html
 %%DOCSDIR%%/msearch-cmdref-guesserusemeta.html
 %%DOCSDIR%%/msearch-cmdref-hlbeg.html
 %%DOCSDIR%%/msearch-cmdref-hlend.html
@@ -269,8 +271,6 @@ sbin/indexer
 %%DOCSDIR%%/msearch-cmdref-index.html
 %%DOCSDIR%%/msearch-cmdref-indexif.html
 %%DOCSDIR%%/msearch-cmdref-indextime.html
-%%DOCSDIR%%/msearch-cmdref-ispellcorrectfactor.html
-%%DOCSDIR%%/msearch-cmdref-ispellincorrectfactor.html
 %%DOCSDIR%%/msearch-cmdref-ispelluseprefixes.html
 %%DOCSDIR%%/msearch-cmdref-langmapfile.html
 %%DOCSDIR%%/msearch-cmdref-langmapupdate.html
@@ -278,7 +278,8 @@ sbin/indexer
 %%DOCSDIR%%/msearch-cmdref-loadchineselist.html
 %%DOCSDIR%%/msearch-cmdref-loadthailist.html
 %%DOCSDIR%%/msearch-cmdref-localcharset.html
-%%DOCSDIR%%/msearch-cmdref-logsonly.html
+%%DOCSDIR%%/msearch-cmdref-locale.html
+%%DOCSDIR%%/msearch-cmdref-loglevel.html
 %%DOCSDIR%%/msearch-cmdref-maxdocpersite.html
 %%DOCSDIR%%/msearch-cmdref-maxdocsize.html
 %%DOCSDIR%%/msearch-cmdref-maxhops.html
@@ -293,11 +294,9 @@ sbin/indexer
 %%DOCSDIR%%/msearch-cmdref-neterrordelaytime.html
 %%DOCSDIR%%/msearch-cmdref-newsextensions.html
 %%DOCSDIR%%/msearch-cmdref-noindexif.html
-%%DOCSDIR%%/msearch-cmdref-numberfactor.html
+%%DOCSDIR%%/msearch-cmdref-numdistinctwordfactor.html
 %%DOCSDIR%%/msearch-cmdref-numsections.html
 %%DOCSDIR%%/msearch-cmdref-numwordfactor.html
-%%DOCSDIR%%/msearch-cmdref-optimizeinterval.html
-%%DOCSDIR%%/msearch-cmdref-optimizeratio.html
 %%DOCSDIR%%/msearch-cmdref-parsertimeout.html
 %%DOCSDIR%%/msearch-cmdref-period.html
 %%DOCSDIR%%/msearch-cmdref-poprankfeedback.html
@@ -314,9 +313,11 @@ sbin/indexer
 %%DOCSDIR%%/msearch-cmdref-remotecharset.html
 %%DOCSDIR%%/msearch-cmdref-remotefilenamecharset.html
 %%DOCSDIR%%/msearch-cmdref-replacevar.html
+%%DOCSDIR%%/msearch-cmdref-resultcontenttype.html
 %%DOCSDIR%%/msearch-cmdref-resultslimit.html
 %%DOCSDIR%%/msearch-cmdref-reversealias.html
 %%DOCSDIR%%/msearch-cmdref-robots.html
+%%DOCSDIR%%/msearch-cmdref-savesectionsize.html
 %%DOCSDIR%%/msearch-cmdref-section.html
 %%DOCSDIR%%/msearch-cmdref-server.html
 %%DOCSDIR%%/msearch-cmdref-servertable.html
@@ -325,7 +326,6 @@ sbin/indexer
 %%DOCSDIR%%/msearch-cmdref-sqlwordforms.html
 %%DOCSDIR%%/msearch-cmdref-starthops.html
 %%DOCSDIR%%/msearch-cmdref-stopwordfile.html
-%%DOCSDIR%%/msearch-cmdref-storedfiles.html
 %%DOCSDIR%%/msearch-cmdref-strictmodethreshold.html
 %%DOCSDIR%%/msearch-cmdref-subnet.html
 %%DOCSDIR%%/msearch-cmdref-suggest.html
@@ -333,20 +333,21 @@ sbin/indexer
 %%DOCSDIR%%/msearch-cmdref-syslogfacility.html
 %%DOCSDIR%%/msearch-cmdref-tag.html
 %%DOCSDIR%%/msearch-cmdref-url.html
-%%DOCSDIR%%/msearch-cmdref-urldaddr.html
-%%DOCSDIR%%/msearch-cmdref-urldatafiles.html
 %%DOCSDIR%%/msearch-cmdref-urldatathreshold.html
 %%DOCSDIR%%/msearch-cmdref-urlselectcachesize.html
 %%DOCSDIR%%/msearch-cmdref-usecookie.html
 %%DOCSDIR%%/msearch-cmdref-usecrc32urlid.html
 %%DOCSDIR%%/msearch-cmdref-usenumericoperators.html
 %%DOCSDIR%%/msearch-cmdref-useremotecontenttype.html
+%%DOCSDIR%%/msearch-cmdref-userscore.html
+%%DOCSDIR%%/msearch-cmdref-userscorefactor.html
 %%DOCSDIR%%/msearch-cmdref-vardir.html
 %%DOCSDIR%%/msearch-cmdref-varylang.html
 %%DOCSDIR%%/msearch-cmdref-wf.html
 %%DOCSDIR%%/msearch-cmdref-wordcachesize.html
+%%DOCSDIR%%/msearch-cmdref-worddensityfactor.html
 %%DOCSDIR%%/msearch-cmdref-worddistanceweight.html
-%%DOCSDIR%%/msearch-cmdref-wrdfiles.html
+%%DOCSDIR%%/msearch-cmdref-wordformfactor.html
 %%DOCSDIR%%/msearch-cmdref.html
 %%DOCSDIR%%/msearch-content-enc.html
 %%DOCSDIR%%/msearch-db2.html
@@ -406,10 +407,14 @@ sbin/indexer
 %%DATADIR%%/db2/create.single.sql
 %%DATADIR%%/db2/drop.multi.sql
 %%DATADIR%%/db2/drop.single.sql
+%%DATADIR%%/db2/create.blob.sql
+%%DATADIR%%/db2/drop.blob.sql
 %%DATADIR%%/ibase/create.multi.sql
 %%DATADIR%%/ibase/create.single.sql
 %%DATADIR%%/ibase/drop.multi.sql
 %%DATADIR%%/ibase/drop.single.sql
+%%DATADIR%%/ibase/create.blob.sql
+%%DATADIR%%/ibase/drop.blob.sql
 %%DATADIR%%/mimer/create.multi.sql
 %%DATADIR%%/mimer/create.single.sql
 %%DATADIR%%/mimer/drop.multi.sql