5 files changed, 40 insertions, 14 deletions

diff --git a/www/udmsearch/Makefile b/www/udmsearch/Makefile
index f1b57ccd32b3..d43ef294799a 100644
--- a/www/udmsearch/Makefile
+++ b/www/udmsearch/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	udmsearch
-# Version required:	2.1.7
-# Date created:		11/05/1999
+# Version required:	2.2.1
+# Date created:		11/29/1999
 # Whom:			Kelly Yancey <kbyanc@posi.net>
 #
 # $FreeBSD$
 #
 
-DISTNAME=		udmsearch-2.1.7
+DISTNAME=		udmsearch-2.2.1
 CATEGORIES=		www databases
 MASTER_SITES=		http://mysearch.udm.net/Download/	\
 			ftp://ftp.izhcom.ru/pub/unix/UdmSearch/	\
@@ -17,7 +17,7 @@ MAINTAINER=		kbyanc@posi.net
 MAN1=			indexer.1
 MAN5=			indexer.conf.5
 
-WRKSRC=			${WRKDIR}/udmsearch-2.1.7a
+WRKSRC=			${WRKDIR}/udmsearch-2.2.1
 USE_GMAKE=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--bindir=${PREFIX}/bin/udmsearch \
diff --git a/www/udmsearch/distinfo b/www/udmsearch/distinfo
index 8cc7d9787968..ea97c9b8d5c1 100644
--- a/www/udmsearch/distinfo
+++ b/www/udmsearch/distinfo
@@ -1 +1 @@
-MD5 (udmsearch-2.1.7.tar.gz) = d984191fce05a2c9e2258e2932271609
+MD5 (udmsearch-2.2.1.tar.gz) = 8e5d9cc6140da9ebe3ecc9814333168d
diff --git a/www/udmsearch/files/patch-aa b/www/udmsearch/files/patch-aa
new file mode 100644
index 000000000000..c096e52436e7
--- /dev/null
+++ b/www/udmsearch/files/patch-aa
@@ -0,0 +1,15 @@
+--- doc/Makefile.in.orig	Thu Dec  2 22:11:39 1999
++++ doc/Makefile.in	Thu Dec  2 22:12:27 1999
+@@ -261,9 +261,9 @@
+ 
+ 
+ install-data-local:
+-	$(mkinstalldirs) $(prefix)/doc
+-	echo ${INSTALL_DATA} docs $(DESTDIR)$(prefix)/doc/
+-	${INSTALL_DATA} ${txt_DOCS} $(DESTDIR)$(prefix)/doc/
++	$(mkinstalldirs) $(prefix)/share/doc/udmsearch
++	echo ${INSTALL_DATA} docs $(DESTDIR)$(prefix)/share/doc/udmsearch
++	${INSTALL_DATA} ${txt_DOCS} $(DESTDIR)$(prefix)/share/doc/udmsearch
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/www/udmsearch/pkg-message b/www/udmsearch/pkg-message
index ab34a61052a0..60ecfc159f85 100644
--- a/www/udmsearch/pkg-message
+++ b/www/udmsearch/pkg-message
@@ -5,23 +5,23 @@ manually:
   Create mysql database 'udmsearch'.
   You can also use existing MySQL database, skip this step in this case. 
 
-	$ mysqladmin create udmsearch
+    $ mysqladmin create udmsearch
 
 
   Create tables.
   If you are installing UdmSearch for the first time: 
 
-	$ mysql udmsearch < /usr/local/etc/udmsearch/create/create.txt
+    $ mysql udmsearch < /usr/local/etc/udmsearch/create/mysql/create.txt
 
   IMPORTANT: If you already use UdmSearch and want to upgrade from
   UdmSearch 2.0 or earlier while keep existing data, please do not use
   create.txt. Instead, to upgrade from UdmSearch 2.0, run 
 
- 	$ mysql udmsearch < /usr/local/etc/udmsearch/create/alter20-21.txt
+    $ mysql udmsearch < /usr/local/etc/udmsearch/create/mysql/alter20-21.txt
 
   or, to upgrade from UdmSearch 1.x, run 
-        $ mysql udmsearch < /usr/local/etc/udmsearch/create/alter19-20.txt
-        $ mysql udmsearch < /usr/local/etc/udmsearch/create/alter20-21.txt
+    $ mysql udmsearch < /usr/local/etc/udmsearch/create/mysql/alter19-20.txt
+    $ mysql udmsearch < /usr/local/etc/udmsearch/create/mysql/alter20-21.txt
 
 For more information on how to use udmsearch, please refer to their
 web site at http://mysearch.udm.net/
diff --git a/www/udmsearch/pkg-plist b/www/udmsearch/pkg-plist
index 9000cbb48e4e..83c361ffb970 100644
--- a/www/udmsearch/pkg-plist
+++ b/www/udmsearch/pkg-plist
@@ -1,14 +1,17 @@
 bin/udmsearch/search.cgi
-bin/udmsearch/search.php3
-bin/udmsearch/morph.php3
-bin/udmsearch/udmsearch.gif
 etc/udmsearch/indexer.conf-dist
 etc/udmsearch/search.htm-dist
 etc/udmsearch/create/msql/create.txt
+etc/udmsearch/create/mssql/create.txt
 etc/udmsearch/create/mysql/alter19-20.txt
 etc/udmsearch/create/mysql/alter20-21.txt
 etc/udmsearch/create/mysql/create.txt
 etc/udmsearch/create/pgsql/create.txt
+etc/udmsearch/create/odbc-mysql/create.txt
+etc/udmsearch/create/odbc-pgsql/create.txt
+etc/udmsearch/create/solid/README
+etc/udmsearch/create/solid/create.txt
+etc/udmsearch/create/stopwords/stop.cz.txt
 etc/udmsearch/create/stopwords/stop.de.txt
 etc/udmsearch/create/stopwords/stop.en.txt
 etc/udmsearch/create/stopwords/stop.es.txt
@@ -19,12 +22,20 @@ etc/udmsearch/create/stopwords/stop.no.txt
 etc/udmsearch/create/stopwords/stop.pt.txt
 etc/udmsearch/create/stopwords/stop.ru.txt
 etc/udmsearch/create/stopwords/stop.ua.txt
-doc/UdmSearch.sgml
+share/doc/udmsearch/parsers.txt
+share/doc/udmsearch/syslog.txt
+share/doc/udmsearch/templates.txt
+share/doc/udmsearch/usage.txt
 sbin/indexer
 @dirrm bin/udmsearch
 @dirrm etc/udmsearch/create/msql
+@dirrm etc/udmsearch/create/mssql
 @dirrm etc/udmsearch/create/mysql
 @dirrm etc/udmsearch/create/pgsql
+@dirrm etc/udmsearch/create/odbc-mysql
+@dirrm etc/udmsearch/create/odbc-pgsql
+@dirrm etc/udmsearch/create/solid
 @dirrm etc/udmsearch/create/stopwords
 @dirrm etc/udmsearch/create
 @dirrm etc/udmsearch
+@dirrm share/doc/udmsearch