4 files changed, 35 insertions, 260 deletions

diff --git a/www/mnogosearch/Makefile b/www/mnogosearch/Makefile
index fa2443df67b7..e66c9fce8815 100644
--- a/www/mnogosearch/Makefile
+++ b/www/mnogosearch/Makefile
@@ -6,19 +6,18 @@
 #
 
 PORTNAME=	mnogosearch
-PORTVERSION=	3.3.10
-PORTREVISION=	1
+PORTVERSION=	3.3.11
 CATEGORIES=	www databases
-MASTER_SITES=	http://www.mnogosearch.org/Download/
+MASTER_SITES=	http://www.mnogosearch.org/Download/ \
+		http://www.bayofrum.net/dist/${PORTNAME}/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	utisoft@gmail.com
 COMMENT=	Full featured SQL-based hypertext search engine
 
 MAN1=		indexer.1
 MAN5=		indexer.conf.5
 
-OPTIONS=	\
-		THREADS "Enable pthreads"		on  \
+OPTIONS=	THREADS "Enable pthreads"		on  \
 		SSL     "Enable SSL"			on  \
 		ASIAN   "Enable asian charsets"	off \
 		SYSLOG  "Send logs to syslog"   on  \
@@ -92,15 +91,22 @@ CONFIGURE_ARGS+=	--with-sqlite=${LOCALBASE}
 
 .if defined(WITHOUT_SQLITE) && !defined(WITH_MYSQL) && \
     !defined(WITH_MSQL) && !defined(WITH_PGSQL)
-BROKEN=	needs at least one database driver
+IGNORE=	needs at least one database driver
 .endif
 
-DOCS=	INSTALL ChangeLog
+DOCS=		ChangeLog INSTALL
+PORTDOCS=	*
 PORTEXAMPLES=	README *.conf
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
-		${WRKSRC}/configure
+.if !defined (NOPORTDOCS)
+	@${REINPLACE_CMD} -e 's#$$(DESTDIR)$$(prefix)/doc#${DOCSDIR}#' \
+		${WRKSRC}/Makefile.in ${WRKSRC}/doc/Makefile.in
+.else
+	@${REINPLACE_CMD} -e \
+		's#^SUBDIRS = include src doc#SUBDIRS = include src#' \
+		${WRKSRC}/Makefile.in
+.endif
 
 pre-install-su:
 	@${MKDIR} ${DATADIR}/
@@ -108,13 +114,12 @@ pre-install-su:
 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
 .if !defined (NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}/
-.for f in ${DOCS}
+.    for f in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/
-.endfor
+.    endfor
 .endif
 .if !defined(NOPORTEXAMPLES)
 	${MKDIR} ${EXAMPLESDIR}/
diff --git a/www/mnogosearch/distinfo b/www/mnogosearch/distinfo
index c8eae02a92da..1894772bcfeb 100644
--- a/www/mnogosearch/distinfo
+++ b/www/mnogosearch/distinfo
@@ -1,3 +1,2 @@
-MD5 (mnogosearch-3.3.10.tar.gz) = a03a73fd46c981505cf4c09e984b92c6
-SHA256 (mnogosearch-3.3.10.tar.gz) = b1cd578a7a22ed2660b51529728389946a456faca27fb32b6c53f52ab415cf11
-SIZE (mnogosearch-3.3.10.tar.gz) = 3870413
+SHA256 (mnogosearch-3.3.11.tar.gz) = 51c77e7a7b40f0a599ebae8db1dbd68d30ba79ca243578c22b2939d7f8f8405c
+SIZE (mnogosearch-3.3.11.tar.gz) = 3945775
diff --git a/www/mnogosearch/files/patch-aa b/www/mnogosearch/files/patch-aa
deleted file mode 100644
index a6958ed82b5f..000000000000
--- a/www/mnogosearch/files/patch-aa
+++ /dev/null
@@ -1,25 +0,0 @@
---- doc/Makefile.in.orig	Mon Mar 28 23:59:54 2005
-+++ doc/Makefile.in	Fri Jun 10 15:32:00 2005
-@@ -174,7 +174,7 @@
- build_vendor = @build_vendor@
- datadir = @datadir@
- db_PROGS = @db_PROGS@
--doc_FILES = ${@doc_FILES@}
-+doc_FILES = ${HTML_ALL}
- efOBJ = @efOBJ@
- exec_prefix = @exec_prefix@
- host = @host@
-@@ -687,11 +687,11 @@
- 
- 
- install-data-local: $(doc_FILES)
--	$(mkinstalldirs) $(DESTDIR)$(prefix)/doc
-+	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/doc/mnogosearch
- 	echo ${INSTALL_DATA} docs $(DESTDIR)$(prefix)/doc/
- 	list='${doc_FILES}'; \
- 	for p in $$list; do \
--		${INSTALL_DATA} $(srcdir)/$$p $(DESTDIR)$(prefix)/doc/ ; \
-+		${INSTALL_DATA} $(srcdir)/$$p $(DESTDIR)$(prefix)/share/doc/mnogosearch ; \
- 	done
- 
- uninstall-local:
diff --git a/www/mnogosearch/pkg-plist b/www/mnogosearch/pkg-plist
index e4f786e51e83..0699fd487567 100644
--- a/www/mnogosearch/pkg-plist
+++ b/www/mnogosearch/pkg-plist
@@ -61,6 +61,7 @@ bin/udm-config
 %%ETCDIR%%/langmap/it.latin1.lm
 %%ETCDIR%%/langmap/ja.euc-jp.lm
 %%ETCDIR%%/langmap/ja.sjis.lm
+%%ETCDIR%%/langmap/ka.utf8.lm
 %%ETCDIR%%/langmap/la.ascii.lm
 %%ETCDIR%%/langmap/lt.cp1257.lm
 %%ETCDIR%%/langmap/lt.latin4.lm
@@ -106,6 +107,8 @@ bin/udm-config
 %%ETCDIR%%/langmap/vi.viscii.lm
 %%ETCDIR%%/langmap/zh.big5.lm
 %%ETCDIR%%/langmap/zh.gb2312.lm
+%%ETCDIR%%/langmap/zh-hans.utf8.lm
+%%ETCDIR%%/langmap/zh-hant.utf8.lm
 %%ETCDIR%%/mandarin.freq
 %%ETCDIR%%/node.xml-dist
 %%ETCDIR%%/search.htm-dist
@@ -152,10 +155,12 @@ include/udm_crc32.h
 include/udm_crossword.h
 include/udm_db.h
 include/udm_db_int.h
+include/udm_dirent.h
 include/udm_doc.h
 include/udm_env.h
 include/udm_execget.h
 include/udm_ftp.h
+include/udm_getopt.h
 include/udm_guesser.h
 include/udm_hash.h
 include/udm_host.h
@@ -171,6 +176,7 @@ include/udm_parsehtml.h
 include/udm_parser.h
 include/udm_parsexml.h
 include/udm_proto.h
+include/udm_regex.h
 include/udm_result.h
 include/udm_robots.h
 include/udm_sdp.h
@@ -231,6 +237,12 @@ sbin/indexer
 %%DATADIR%%/mimer/drop.blob.sql
 %%DATADIR%%/mimer/drop.multi.sql
 %%DATADIR%%/mimer/drop.single.sql
+%%DATADIR%%/monetdb/create.blob.sql
+%%DATADIR%%/monetdb/create.multi.sql
+%%DATADIR%%/monetdb/create.single.sql
+%%DATADIR%%/monetdb/drop.blob.sql
+%%DATADIR%%/monetdb/drop.multi.sql
+%%DATADIR%%/monetdb/drop.single.sql
 %%DATADIR%%/mssql/create.blob.sql
 %%DATADIR%%/mssql/create.multi.sql
 %%DATADIR%%/mssql/create.single.sql
@@ -267,230 +279,15 @@ sbin/indexer
 %%DATADIR%%/sybase/drop.blob.sql
 %%DATADIR%%/sybase/drop.multi.sql
 %%DATADIR%%/sybase/drop.single.sql
+%%DATADIR%%/virtuoso/create.blob.sql
 %%DATADIR%%/virtuoso/create.multi.sql
 %%DATADIR%%/virtuoso/create.single.sql
+%%DATADIR%%/virtuoso/drop.blob.sql
 %%DATADIR%%/virtuoso/drop.multi.sql
 %%DATADIR%%/virtuoso/drop.single.sql
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%DOCSDIR%%/body-after.html
-%%DOCSDIR%%/body-before.html
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/mnogo.css
-%%DOCSDIR%%/msearch-authors.html
-%%DOCSDIR%%/msearch-binarydistrib.html
-%%DOCSDIR%%/msearch-bugs.html
-%%DOCSDIR%%/msearch-c-api-udmagentaddline.html
-%%DOCSDIR%%/msearch-c-api-udmagentfree.html
-%%DOCSDIR%%/msearch-c-api-udmagentinit.html
-%%DOCSDIR%%/msearch-c-api-udmenvfree.html
-%%DOCSDIR%%/msearch-c-api-udmenvinit.html
-%%DOCSDIR%%/msearch-c-api-udmfind2.html
-%%DOCSDIR%%/msearch-c-api-udmresultfree.html
-%%DOCSDIR%%/msearch-c-api.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-alwaysfoundword.html
-%%DOCSDIR%%/msearch-cmdref-authbasic.html
-%%DOCSDIR%%/msearch-cmdref-browsercharset.html
-%%DOCSDIR%%/msearch-cmdref-cache.html
-%%DOCSDIR%%/msearch-cmdref-casefolding.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-complexsynonyms.html
-%%DOCSDIR%%/msearch-cmdref-crosswords.html
-%%DOCSDIR%%/msearch-cmdref-customlog.html
-%%DOCSDIR%%/msearch-cmdref-cvsignore.html
-%%DOCSDIR%%/msearch-cmdref-datefactor.html
-%%DOCSDIR%%/msearch-cmdref-dateformat.html
-%%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-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
-%%DOCSDIR%%/msearch-cmdref-holdbadhrefs.html
-%%DOCSDIR%%/msearch-cmdref-hrefonly.html
-%%DOCSDIR%%/msearch-cmdref-htdbaddr.html
-%%DOCSDIR%%/msearch-cmdref-htdbdoc.html
-%%DOCSDIR%%/msearch-cmdref-htdblimit.html
-%%DOCSDIR%%/msearch-cmdref-htdblist.html
-%%DOCSDIR%%/msearch-cmdref-httpheader.html
-%%DOCSDIR%%/msearch-cmdref-idffactor.html
-%%DOCSDIR%%/msearch-cmdref-importenv.html
-%%DOCSDIR%%/msearch-cmdref-include.html
-%%DOCSDIR%%/msearch-cmdref-index.html
-%%DOCSDIR%%/msearch-cmdref-indexif.html
-%%DOCSDIR%%/msearch-cmdref-indextime.html
-%%DOCSDIR%%/msearch-cmdref-ispelluseprefixes.html
-%%DOCSDIR%%/msearch-cmdref-langmapfile.html
-%%DOCSDIR%%/msearch-cmdref-langmapupdate.html
-%%DOCSDIR%%/msearch-cmdref-limit.html
-%%DOCSDIR%%/msearch-cmdref-loadchineselist.html
-%%DOCSDIR%%/msearch-cmdref-loadtaginfo.html
-%%DOCSDIR%%/msearch-cmdref-loadthailist.html
-%%DOCSDIR%%/msearch-cmdref-loadurlinfo.html
-%%DOCSDIR%%/msearch-cmdref-localcharset.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
-%%DOCSDIR%%/msearch-cmdref-maxneterrors.html
-%%DOCSDIR%%/msearch-cmdref-maxwordlength.html
-%%DOCSDIR%%/msearch-cmdref-mime.html
-%%DOCSDIR%%/msearch-cmdref-mincoordfactor.html
-%%DOCSDIR%%/msearch-cmdref-minwordlength.html
-%%DOCSDIR%%/msearch-cmdref-mirrorheadersroot.html
-%%DOCSDIR%%/msearch-cmdref-mirrorperiod.html
-%%DOCSDIR%%/msearch-cmdref-mirrorroot.html
-%%DOCSDIR%%/msearch-cmdref-neterrordelaytime.html
-%%DOCSDIR%%/msearch-cmdref-newsextensions.html
-%%DOCSDIR%%/msearch-cmdref-noindexif.html
-%%DOCSDIR%%/msearch-cmdref-numdistinctwordfactor.html
-%%DOCSDIR%%/msearch-cmdref-numsections.html
-%%DOCSDIR%%/msearch-cmdref-numwordfactor.html
-%%DOCSDIR%%/msearch-cmdref-parsertimeout.html
-%%DOCSDIR%%/msearch-cmdref-period.html
-%%DOCSDIR%%/msearch-cmdref-poprankfeedback.html
-%%DOCSDIR%%/msearch-cmdref-poprankshowcntratio.html
-%%DOCSDIR%%/msearch-cmdref-poprankshowcntweight.html
-%%DOCSDIR%%/msearch-cmdref-poprankskipsamesite.html
-%%DOCSDIR%%/msearch-cmdref-poprankuseshowcnt.html
-%%DOCSDIR%%/msearch-cmdref-poprankusetracking.html
-%%DOCSDIR%%/msearch-cmdref-proxy.html
-%%DOCSDIR%%/msearch-cmdref-proxyauthbasic.html
-%%DOCSDIR%%/msearch-cmdref-r.html
-%%DOCSDIR%%/msearch-cmdref-readtimeout.html
-%%DOCSDIR%%/msearch-cmdref-realm.html
-%%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
-%%DOCSDIR%%/msearch-cmdref-serverweight.html
-%%DOCSDIR%%/msearch-cmdref-skip.html
-%%DOCSDIR%%/msearch-cmdref-spell.html
-%%DOCSDIR%%/msearch-cmdref-sqlwordforms.html
-%%DOCSDIR%%/msearch-cmdref-starthops.html
-%%DOCSDIR%%/msearch-cmdref-stopwordfile.html
-%%DOCSDIR%%/msearch-cmdref-strictmodethreshold.html
-%%DOCSDIR%%/msearch-cmdref-stripaccents.html
-%%DOCSDIR%%/msearch-cmdref-subnet.html
-%%DOCSDIR%%/msearch-cmdref-substringmatchminwordlength.html
-%%DOCSDIR%%/msearch-cmdref-suggest.html
-%%DOCSDIR%%/msearch-cmdref-synonym.html
-%%DOCSDIR%%/msearch-cmdref-syslogfacility.html
-%%DOCSDIR%%/msearch-cmdref-tag.html
-%%DOCSDIR%%/msearch-cmdref-url.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-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
-%%DOCSDIR%%/msearch-disclaimer.html
-%%DOCSDIR%%/msearch-doingsearch.html
-%%DOCSDIR%%/msearch-extended-indexing.html
-%%DOCSDIR%%/msearch-faq.html
-%%DOCSDIR%%/msearch-fuzzy.html
-%%DOCSDIR%%/msearch-get.html
-%%DOCSDIR%%/msearch-howstore.html
-%%DOCSDIR%%/msearch-html.html
-%%DOCSDIR%%/msearch-htmlparser-comments.html
-%%DOCSDIR%%/msearch-htmlparser-links.html
-%%DOCSDIR%%/msearch-htmlparser-meta.html
-%%DOCSDIR%%/msearch-htmlparser-spec.html
-%%DOCSDIR%%/msearch-htmlparser.html
-%%DOCSDIR%%/msearch-http-codes.html
-%%DOCSDIR%%/msearch-index.html
-%%DOCSDIR%%/msearch-indexer-configuration.html
-%%DOCSDIR%%/msearch-indexing.html
-%%DOCSDIR%%/msearch-inetd.html
-%%DOCSDIR%%/msearch-install.html
-%%DOCSDIR%%/msearch-installing.html
-%%DOCSDIR%%/msearch-installproblem.html
-%%DOCSDIR%%/msearch-international.html
-%%DOCSDIR%%/msearch-intro.html
-%%DOCSDIR%%/msearch-itips.html
-%%DOCSDIR%%/msearch-lib.html
-%%DOCSDIR%%/msearch-misc.html
-%%DOCSDIR%%/msearch-multilang.html
-%%DOCSDIR%%/msearch-opsys.html
-%%DOCSDIR%%/msearch-oracle.html
-%%DOCSDIR%%/msearch-perf.html
-%%DOCSDIR%%/msearch-reference.html
-%%DOCSDIR%%/msearch-register.html
-%%DOCSDIR%%/msearch-rel.html
-%%DOCSDIR%%/msearch-srcache.html
-%%DOCSDIR%%/msearch-stored.html
-%%DOCSDIR%%/msearch-subsections.html
-%%DOCSDIR%%/msearch-syslog.html
-%%DOCSDIR%%/msearch-tags.html
-%%DOCSDIR%%/msearch-templates.html
-%%DOCSDIR%%/msearch-toolsreq.html
-%%DOCSDIR%%/msearch-track.html
-%%DOCSDIR%%/msearch-udmstemmer.html
-%%DOCSDIR%%/msearch-vary.html
 @dirrm %%DATADIR%%/cache
 @dirrm %%DATADIR%%/mimer
+@dirrm %%DATADIR%%/monetdb
 @dirrm %%DATADIR%%/sqlite
 @dirrm %%DATADIR%%/virtuoso
 @dirrm %%DATADIR%%/pgsql
@@ -505,4 +302,3 @@ sbin/indexer
 @dirrm %%ETCDIR%%/stopwords
 @dirrm %%ETCDIR%%/langmap
 @dirrm %%ETCDIR%%
-@dirrm %%DOCSDIR%%