Update to version 2.1.7.

PR:		14708, 14724
Submitted by:	maintainer

5 files changed, 49 insertions, 22 deletions

diff --git a/www/udmsearch/Makefile b/www/udmsearch/Makefile
index 3389228fc1f4..f1b57ccd32b3 100644
--- a/www/udmsearch/Makefile
+++ b/www/udmsearch/Makefile
@@ -1,37 +1,61 @@
 # New ports collection makefile for:	udmsearch
-# Version required:	2.1.5
-# Date created:		10/19/1999
+# Version required:	2.1.7
+# Date created:		11/05/1999
 # Whom:			Kelly Yancey <kbyanc@posi.net>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	udmsearch-2.1.5
-CATEGORIES=	www databases
-MASTER_SITES=	http://search.udm.net/about/Download/	\
-		http://mysearch.udm.net/Download/	\
-		ftp://ftp.izhcom.ru/pub/unix/UdmSearch/	\
-		http://mirror.kuenzler.ch/udmsearch/Download/
+DISTNAME=		udmsearch-2.1.7
+CATEGORIES=		www databases
+MASTER_SITES=		http://mysearch.udm.net/Download/	\
+			ftp://ftp.izhcom.ru/pub/unix/UdmSearch/	\
+			http://mirror.kuenzler.ch/udmsearch/Download/
 
-MAINTAINER=	kbyanc@posi.net
+MAINTAINER=		kbyanc@posi.net
 
-LIB_DEPENDS=	mysqlclient.6:${PORTSDIR}/databases/mysql322-client
+MAN1=			indexer.1
+MAN5=			indexer.conf.5
 
-MAN1=		indexer.1
-MAN5=		indexer.conf.5
+WRKSRC=			${WRKDIR}/udmsearch-2.1.7a
+USE_GMAKE=		yes
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS=		--bindir=${PREFIX}/bin/udmsearch \
+			--sysconfdir=${PREFIX}/etc/udmsearch
 
-USE_GMAKE=	yes
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS= --prefix=${PREFIX} \
-		--bindir=${PREFIX}/bin/udmsearch \
-		--sysconfdir=${PREFIX}/etc/udmsearch \
+.if defined(USE_POSTGRESQL)
+LIB_DEPENDS=		pq.2:${PORTSDIR}/databases/postgresql
+CONFIGURE_ARGS+=	--with-pgsql
+
+.elif defined(USE_MSQL)
+BUILD_DEPENDS=		${PREFIX}/lib/libmsql.a:${PORTSDIR}/databases/msql
+CONFIGURE_ARGS+=	--with-msql
+
+.else
+# default to mysql
+
+LIB_DEPENDS=		mysqlclient.6:${PORTSDIR}/databases/mysql322-client
+CONFIGURE_ARGS+=	--with-mysql
+
+.if !defined(USE_MYSQL)
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Defaulting to udmsearch with mysql support."
+	@${ECHO}
+	@${ECHO} "You may alternately build udmsearch with either msql or"
+	@${ECHO} "postgresql support by invoking make with USE_MSQL=yes or"
+	@${ECHO} "USE_POSTGRESQL=yes respectively."
+	@${ECHO}
+.endif
+
+.endif
 
 pre-install:
 	${MKDIR} ${PREFIX}/bin/udmsearch
 	${MKDIR} ${PREFIX}/etc/udmsearch
 
 post-install:
-	@cp -R ${WRKDIR}/${DISTNAME}/create ${PREFIX}/etc/udmsearch
+	@cp -R ${WRKSRC}/create ${PREFIX}/etc/udmsearch
 	@strip ${PREFIX}/sbin/indexer
 	@strip ${PREFIX}/bin/udmsearch/search.cgi
 	@${ECHO}
diff --git a/www/udmsearch/distinfo b/www/udmsearch/distinfo
index 1dc3cb0deb06..8cc7d9787968 100644
--- a/www/udmsearch/distinfo
+++ b/www/udmsearch/distinfo
@@ -1 +1 @@
-MD5 (udmsearch-2.1.5.tar.gz) = 35adb0c32a1e9af078130e63bfe7be25
+MD5 (udmsearch-2.1.7.tar.gz) = d984191fce05a2c9e2258e2932271609
diff --git a/www/udmsearch/pkg-comment b/www/udmsearch/pkg-comment
index f5807d93964f..16cd6e026f50 100644
--- a/www/udmsearch/pkg-comment
+++ b/www/udmsearch/pkg-comment
@@ -1 +1 @@
-Full featured MySQL-based hypertext search engine
+Full featured SQL-based hypertext search engine
diff --git a/www/udmsearch/pkg-descr b/www/udmsearch/pkg-descr
index fcc636cb7742..2ef7aecc0866 100644
--- a/www/udmsearch/pkg-descr
+++ b/www/udmsearch/pkg-descr
@@ -1,9 +1,12 @@
-UdmSearch is a full featured MySQL-based search engine for intranet or small
+UdmSearch is a full featured SQL-based search engine for intranet or small
 domain Internet web servers. You can also use it to build specialized search
 engines such as cooking recipies or searching newspaper articles.
 
 Provides pre-built web search frontends in C (via CGI) and PHP.
 
+Currently, supports using mySQL, msql, or postgresql database backends, with
+mySQL being the default and best supported.
+
 WWW: http://mysearch.udm.net/
 
  -Kelly
diff --git a/www/udmsearch/pkg-plist b/www/udmsearch/pkg-plist
index 2120f0af4963..9000cbb48e4e 100644
--- a/www/udmsearch/pkg-plist
+++ b/www/udmsearch/pkg-plist
@@ -1,5 +1,4 @@
 bin/udmsearch/search.cgi
-bin/udmsearch/search.phtml
 bin/udmsearch/search.php3
 bin/udmsearch/morph.php3
 bin/udmsearch/udmsearch.gif
@@ -14,6 +13,7 @@ etc/udmsearch/create/stopwords/stop.de.txt
 etc/udmsearch/create/stopwords/stop.en.txt
 etc/udmsearch/create/stopwords/stop.es.txt
 etc/udmsearch/create/stopwords/stop.fr.txt
+etc/udmsearch/create/stopwords/stop.it.txt
 etc/udmsearch/create/stopwords/stop.nl.txt
 etc/udmsearch/create/stopwords/stop.no.txt
 etc/udmsearch/create/stopwords/stop.pt.txt