Upgrade to 3.1.11

7 files changed, 57 insertions, 19 deletions

diff --git a/www/mnogosearch31/Makefile b/www/mnogosearch31/Makefile
index bfb1fd880913..e4aec52c6ebe 100644
--- a/www/mnogosearch31/Makefile
+++ b/www/mnogosearch31/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mnogosearch
-PORTVERSION=    3.1.10
+PORTVERSION=    3.1.11
 CATEGORIES=	www databases
 MASTER_SITES=	http://search.mnogo.ru/Download/
 
@@ -20,7 +20,8 @@ NO_LATEST_LINK=	yes
 INSTALLS_SHLIB= yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS= --enable-shared \
+CONFIGURE_ARGS= --enable-phrase \
+		--enable-shared \
 		--enable-freebsd-pthreads \
 		--sysconfdir=${PREFIX}/etc/mnogosearch \
 		--localstatedir=/var/mnogosearch
@@ -44,6 +45,8 @@ LIB_DEPENDS=		mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
 
 .else
+CONFIGURE_ARGS+=        --with-built-in
+
 pre-fetch:
 	@${ECHO}
 	@${ECHO} "Defaulting to mnoGoSearch with built-in database."
@@ -54,6 +57,9 @@ pre-fetch:
 	@${ECHO}
 .endif
 
+post-patch:
+	cp ${FILESDIR}/cross*.txt ${WRKSRC}/create/msql
+
 pre-install:
 	@${MKDIR} ${PREFIX}/share/mnogosearch
 
diff --git a/www/mnogosearch31/distinfo b/www/mnogosearch31/distinfo
index df407a1fae80..8cd87641a606 100644
--- a/www/mnogosearch31/distinfo
+++ b/www/mnogosearch31/distinfo
@@ -1 +1 @@
-MD5 (mnogosearch-3.1.10.tar.gz) = 8751c774232ed65131a9bd4e80b69c0a
+MD5 (mnogosearch-3.1.11.tar.gz) = ef4489ee3c9f8bcfce7a3ac4e9bd8a18
diff --git a/www/mnogosearch31/files/cross-crc.txt b/www/mnogosearch31/files/cross-crc.txt
new file mode 100644
index 000000000000..b68750b0b1f9
--- /dev/null
+++ b/www/mnogosearch31/files/cross-crc.txt
@@ -0,0 +1,12 @@
+DROP TABLE ncrossdict\g
+
+CREATE TABLE ncrossdict (
+  url_id int NOT NULL,
+  ref_id int NOT NULL,
+  word_id int NOT NULL,
+  intag  int NOT NULL
+)\g
+
+CREATE  INDEX ncrossdict_url_id ON ncrossdict (url_id)\g
+CREATE  INDEX ncrossdict_ref_id ON ncrossdict (ref_id)\g
+CREATE  INDEX ncrossdict_word_id ON ncrossdict (word_id)\g
diff --git a/www/mnogosearch31/files/cross.txt b/www/mnogosearch31/files/cross.txt
new file mode 100644
index 000000000000..d8dd2048b2fe
--- /dev/null
+++ b/www/mnogosearch31/files/cross.txt
@@ -0,0 +1,13 @@
+DROP TABLE crossdict\g
+
+CREATE TABLE crossdict (
+  url_id int NOT NULL,
+  ref_id int NOT NULL,
+  word   char(32) NOT NULL,
+  intag  int NOT NULL
+)\g
+
+
+CREATE  INDEX crossdict_url_id ON crossdict (url_id)\g
+CREATE  INDEX crossdict_ref_id ON crossdict (ref_id)\g
+CREATE  INDEX crossdict_word ON crossdict (word)\g
diff --git a/www/mnogosearch31/files/patch-aa b/www/mnogosearch31/files/patch-aa
index a68fa1fdd9b3..ef92f8ae606d 100644
--- a/www/mnogosearch31/files/patch-aa
+++ b/www/mnogosearch31/files/patch-aa
@@ -1,14 +1,13 @@
-diff -ru ../udmsearch-3.0.19/doc/Makefile.in ./doc/Makefile.in
---- ../udmsearch-3.0.19/doc/Makefile.in	Thu Jun 15 10:27:15 2000
-+++ ./doc/Makefile.in	Sat Jul  8 15:09:00 2000
-@@ -273,9 +273,9 @@
+--- doc/Makefile.in.orig	Tue Feb 20 14:12:34 2001
++++ doc/Makefile.in	Tue Feb 20 19:32:44 2001
+@@ -285,9 +285,9 @@
  
  
  install-data-local:
--	$(mkinstalldirs) $(prefix)/doc
+-	$(mkinstalldirs) $(DESTDIR)$(prefix)/doc
 -	echo ${INSTALL_DATA} docs $(DESTDIR)$(prefix)/doc/
 -	${INSTALL_DATA} ${txt_DOCS} $(DESTDIR)$(prefix)/doc/
-+	$(mkinstalldirs) $(prefix)/share/doc/mnogosearch
++	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/doc/mnogosearch
 +	echo ${INSTALL_DATA} docs $(DESTDIR)$(prefix)/share/doc/mnogosearch
 +	${INSTALL_DATA} ${txt_DOCS} $(DESTDIR)$(prefix)/share/doc/mnogosearch
  
diff --git a/www/mnogosearch31/files/patch-ac b/www/mnogosearch31/files/patch-ac
index f8965e801efc..d8ef2290a0b6 100644
--- a/www/mnogosearch31/files/patch-ac
+++ b/www/mnogosearch31/files/patch-ac
@@ -1,11 +1,11 @@
---- run-splitter.in.bak	Wed Jan 10 15:25:43 2001
-+++ run-splitter.in	Sun Jan 28 12:06:37 2001
-@@ -2,7 +2,7 @@
+--- etc/search.htm-dist.bak	Fri Feb 16 12:49:16 2001
++++ etc/search.htm-dist	Tue Feb 20 20:00:27 2001
+@@ -126,7 +126,7 @@
+ <SELECT NAME="wm">
+ <OPTION VALUE="wrd" SELECTED="$wm">Whole word
+ <OPTION VALUE="beg" SELECTED="$wm">Beginning
+-<OPTION VALUE="beg" SELECTED="$wm">Ending
++<OPTION VALUE="end" SELECTED="$wm">Ending
+ <OPTION VALUE="sub" SELECTED="$wm">Substring
+ </SELECT>
  
- PREFIX=@prefix@
- 
--VAR=$PREFIX/var
-+VAR=/var/mnogosearch
- SBIN=$PREFIX/sbin
- PID=$VAR/cachelogd.pid
- SPLITTER=$SBIN/splitter
diff --git a/www/mnogosearch31/pkg-plist b/www/mnogosearch31/pkg-plist
index 5ec82e1902a6..4069af3c33f8 100644
--- a/www/mnogosearch31/pkg-plist
+++ b/www/mnogosearch31/pkg-plist
@@ -30,6 +30,7 @@ include/udm_robots.h
 include/udm_search_tl.h
 include/udm_searchtool.h
 include/udm_server.h
+include/udm_services.h
 include/udm_signals.h
 include/udm_socket.h
 include/udm_spell.h
@@ -49,6 +50,7 @@ sbin/run-splitter
 sbin/splitter
 bin/udm-config
 share/doc/mnogosearch/HTDB.txt
+share/doc/mnogosearch/HTML-design.txt
 share/doc/mnogosearch/HTTP-codes.txt
 share/doc/mnogosearch/INSTALL
 share/doc/mnogosearch/NEWS.html
@@ -81,6 +83,8 @@ share/mnogosearch/create/ibase/create.sql
 share/mnogosearch/create/msql/crc-multi.txt
 share/mnogosearch/create/msql/crc.txt
 share/mnogosearch/create/msql/create.txt
+share/mnogosearch/create/msql/cross-crc.txt
+share/mnogosearch/create/msql/cross.txt
 share/mnogosearch/create/msql/ispell.txt
 share/mnogosearch/create/msql/multi.txt
 share/mnogosearch/create/msql/track.txt
@@ -89,6 +93,8 @@ share/mnogosearch/create/mysql/categories.txt
 share/mnogosearch/create/mysql/crc-multi.txt
 share/mnogosearch/create/mysql/crc.txt
 share/mnogosearch/create/mysql/create.txt
+share/mnogosearch/create/mysql/cross-crc.txt
+share/mnogosearch/create/mysql/cross.txt
 share/mnogosearch/create/mysql/ispell.txt
 share/mnogosearch/create/mysql/multi.txt
 share/mnogosearch/create/mysql/servers.txt
@@ -105,6 +111,8 @@ share/mnogosearch/create/pgsql/categories.txt
 share/mnogosearch/create/pgsql/crc-multi.txt
 share/mnogosearch/create/pgsql/crc.txt
 share/mnogosearch/create/pgsql/create.txt
+share/mnogosearch/create/pgsql/cross-crc.txt
+share/mnogosearch/create/pgsql/cross.txt
 share/mnogosearch/create/pgsql/grant.txt
 share/mnogosearch/create/pgsql/ispell.txt
 share/mnogosearch/create/pgsql/multi.txt