From kbyanc@kronos.alcnet.com Mon Nov 29 07:40:37 1999
Return-Path: <kbyanc@kronos.alcnet.com>
Received: from kronos.alcnet.com (kronos.alcnet.com [63.69.28.22])
	by hub.freebsd.org (Postfix) with ESMTP id 4543E154BE
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 29 Nov 1999 07:40:22 -0800 (PST)
	(envelope-from kbyanc@kronos.alcnet.com)
Received: (from kbyanc@localhost)
	by kronos.alcnet.com (8.9.3/8.9.3/antispam) id KAA68504;
	Mon, 29 Nov 1999 10:40:22 -0500 (EST)
Message-Id: <199911291540.KAA68504@kronos.alcnet.com>
Date: Mon, 29 Nov 1999 10:40:22 -0500 (EST)
From: kbyanc@posi.net
Sender: kbyanc@kronos.alcnet.com
Reply-To: kbyanc@posi.net
To: FreeBSD-gnats-submit@freebsd.org
Subject: update udmsearch port to 2.2.1
X-Send-Pr-Version: 3.2

>Number:         15166
>Category:       ports
>Synopsis:       update udmsearch port to 2.2.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 29 07:50:00 PST 1999
>Closed-Date:    Thu Dec 23 08:04:33 PST 1999
>Last-Modified:  Thu Dec 23 08:06:05 PST 1999
>Originator:     Kelly Yancey
>Release:        FreeBSD 3.2-STABLE i386
>Organization:
>Environment:
>Description:

  Recursive diff to be applied in ports/www directory to update udmsearch port to 2.2.1

	Another port, another poem
	For some committer to bemoan.
	I'll patch it, port it, send it in,
	until 'cvs commit' is my friend.

>How-To-Repeat:
>Fix:
	
diff -ur udmsearch.orig/Makefile udmsearch/Makefile
--- udmsearch.orig/Makefile	Mon Nov 29 10:30:36 1999
+++ udmsearch/Makefile	Mon Nov 29 10:31:12 1999
@@ -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: ports/www/udmsearch/Makefile,v 1.2 1999/11/14 02:17:48 steve Exp $
 #
 
-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 @@
 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 -ur udmsearch.orig/files/MESSAGE udmsearch/files/MESSAGE
--- udmsearch.orig/files/MESSAGE	Mon Nov 29 10:30:36 1999
+++ udmsearch/files/MESSAGE	Mon Nov 29 10:35:32 1999
@@ -5,23 +5,23 @@
   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 -ur udmsearch.orig/files/md5 udmsearch/files/md5
--- udmsearch.orig/files/md5	Mon Nov 29 10:30:36 1999
+++ udmsearch/files/md5	Mon Nov 29 10:31:25 1999
@@ -1 +1 @@
-MD5 (udmsearch-2.1.7.tar.gz) = d984191fce05a2c9e2258e2932271609
+MD5 (udmsearch-2.2.1.tar.gz) = 8e5d9cc6140da9ebe3ecc9814333168d

>Release-Note:
>Audit-Trail:

From: Kelly Yancey <kbyanc@posi.net>
To: freebsd-gnats-submit@freebsd.org
Cc:  
Subject: Re: ports/15166: update udmsearch port to 2.2.1
Date: Thu, 2 Dec 1999 23:51:06 -0500 (EST)

   Urg. Apparently I didn't patch it enough :) Here is a shar of the
 complete 2.2.1 port, including some things I overlooked when I
 originally submitted the PR for the upgrade to 2.2.1.
 
 # This is a shell archive.  Save it in a file, remove anything before
 # this line, and then unpack it by entering "sh file".  Note, it may
 # create directories; files and directories will be owned by you and
 # have default permissions.
 #
 # This archive contains:
 #
 #	udmsearch
 #	udmsearch/Makefile
 #	udmsearch/pkg
 #	udmsearch/pkg/PLIST
 #	udmsearch/pkg/COMMENT
 #	udmsearch/pkg/DESCR
 #	udmsearch/pkg/MESSAGE
 #	udmsearch/files
 #	udmsearch/files/md5
 #	udmsearch/files/MESSAGE
 #	udmsearch/patches
 #	udmsearch/patches/patch-aa
 #
 echo c - udmsearch
 mkdir -p udmsearch > /dev/null 2>&1
 echo x - udmsearch/Makefile
 sed 's/^X//' >udmsearch/Makefile << 'END-of-udmsearch/Makefile'
 X# New ports collection makefile for:	udmsearch
 X# Version required:	2.2.1
 X# Date created:		11/29/1999
 X# Whom:			Kelly Yancey <kbyanc@posi.net>
 X#
 X# $FreeBSD: ports/www/udmsearch/Makefile,v 1.2 1999/11/14 02:17:48 steve Exp $
 X#
 X
 XDISTNAME=		udmsearch-2.2.1
 XCATEGORIES=		www databases
 XMASTER_SITES=		http://mysearch.udm.net/Download/	\
 X			ftp://ftp.izhcom.ru/pub/unix/UdmSearch/	\
 X			http://mirror.kuenzler.ch/udmsearch/Download/
 X
 XMAINTAINER=		kbyanc@posi.net
 X
 XMAN1=			indexer.1
 XMAN5=			indexer.conf.5
 X
 XWRKSRC=			${WRKDIR}/udmsearch-2.2.1
 XUSE_GMAKE=		yes
 XGNU_CONFIGURE=		yes
 XCONFIGURE_ARGS=		--bindir=${PREFIX}/bin/udmsearch \
 X			--sysconfdir=${PREFIX}/etc/udmsearch
 X
 X.if defined(USE_POSTGRESQL)
 XLIB_DEPENDS=		pq.2:${PORTSDIR}/databases/postgresql
 XCONFIGURE_ARGS+=	--with-pgsql
 X
 X.elif defined(USE_MSQL)
 XBUILD_DEPENDS=		${PREFIX}/lib/libmsql.a:${PORTSDIR}/databases/msql
 XCONFIGURE_ARGS+=	--with-msql
 X
 X.else
 X# default to mysql
 X
 XLIB_DEPENDS=		mysqlclient.6:${PORTSDIR}/databases/mysql322-client
 XCONFIGURE_ARGS+=	--with-mysql
 X
 X.if !defined(USE_MYSQL)
 Xpre-fetch:
 X	@${ECHO}
 X	@${ECHO} "Defaulting to udmsearch with mysql support."
 X	@${ECHO}
 X	@${ECHO} "You may alternately build udmsearch with either msql or"
 X	@${ECHO} "postgresql support by invoking make with USE_MSQL=yes or"
 X	@${ECHO} "USE_POSTGRESQL=yes respectively."
 X	@${ECHO}
 X.endif
 X
 X.endif
 X
 Xpre-install:
 X	${MKDIR} ${PREFIX}/bin/udmsearch
 X	${MKDIR} ${PREFIX}/etc/udmsearch
 X
 Xpost-install:
 X	@cp -R ${WRKSRC}/create ${PREFIX}/etc/udmsearch
 X	@strip ${PREFIX}/sbin/indexer
 X	@strip ${PREFIX}/bin/udmsearch/search.cgi
 X	@${ECHO}
 X	@${CAT} ${PKGMESSAGE}
 X
 X.include <bsd.port.mk>
 END-of-udmsearch/Makefile
 echo c - udmsearch/pkg
 mkdir -p udmsearch/pkg > /dev/null 2>&1
 echo x - udmsearch/pkg/PLIST
 sed 's/^X//' >udmsearch/pkg/PLIST << 'END-of-udmsearch/pkg/PLIST'
 Xbin/udmsearch/search.cgi
 Xbin/udmsearch/search.phtml
 Xetc/udmsearch/indexer.conf-dist
 Xetc/udmsearch/search.htm-dist
 Xetc/udmsearch/create/msql/create.txt
 Xetc/udmsearch/create/mssql/create.txt
 Xetc/udmsearch/create/mysql/alter19-20.txt
 Xetc/udmsearch/create/mysql/alter20-21.txt
 Xetc/udmsearch/create/mysql/create.txt
 Xetc/udmsearch/create/pgsql/create.txt
 Xetc/udmsearch/create/odbc-mysql/create.txt
 Xetc/udmsearch/create/odbc-pgsql/create.txt
 Xetc/udmsearch/create/solid/README
 Xetc/udmsearch/create/solid/create.txt
 Xetc/udmsearch/create/stopwords/stop.cz.txt
 Xetc/udmsearch/create/stopwords/stop.de.txt
 Xetc/udmsearch/create/stopwords/stop.en.txt
 Xetc/udmsearch/create/stopwords/stop.es.txt
 Xetc/udmsearch/create/stopwords/stop.fr.txt
 Xetc/udmsearch/create/stopwords/stop.it.txt
 Xetc/udmsearch/create/stopwords/stop.nl.txt
 Xetc/udmsearch/create/stopwords/stop.no.txt
 Xetc/udmsearch/create/stopwords/stop.pt.txt
 Xetc/udmsearch/create/stopwords/stop.ru.txt
 Xetc/udmsearch/create/stopwords/stop.ua.txt
 Xshare/doc/udmsearch/parsers.txt
 Xshare/doc/udmsearch/syslog.txt
 Xshare/doc/udmsearch/templates.txt
 Xshare/doc/udmsearch/usage.txt
 Xsbin/indexer
 X@dirrm bin/udmsearch
 X@dirrm etc/udmsearch/create/msql
 X@dirrm etc/udmsearch/create/mssql
 X@dirrm etc/udmsearch/create/mysql
 X@dirrm etc/udmsearch/create/pgsql
 X@dirrm etc/udmsearch/create/odbc-mysql
 X@dirrm etc/udmsearch/create/odbc-pgsql
 X@dirrm etc/udmsearch/create/solid
 X@dirrm etc/udmsearch/create/stopwords
 X@dirrm etc/udmsearch/create
 X@dirrm etc/udmsearch
 X@dirrm share/doc/udmsearch
 END-of-udmsearch/pkg/PLIST
 echo x - udmsearch/pkg/COMMENT
 sed 's/^X//' >udmsearch/pkg/COMMENT << 'END-of-udmsearch/pkg/COMMENT'
 XFull featured SQL-based hypertext search engine
 END-of-udmsearch/pkg/COMMENT
 echo x - udmsearch/pkg/DESCR
 sed 's/^X//' >udmsearch/pkg/DESCR << 'END-of-udmsearch/pkg/DESCR'
 XUdmSearch is a full featured SQL-based search engine for intranet or small
 Xdomain Internet web servers. You can also use it to build specialized search
 Xengines such as cooking recipies or searching newspaper articles.
 X
 XProvides pre-built web search frontends in C (via CGI) and PHP.
 X
 XCurrently, supports using mySQL, msql, or postgresql database backends, with
 XmySQL being the default and best supported.
 X
 XWWW: http://mysearch.udm.net/
 X
 X -Kelly
 X  kbyanc@posi.net
 END-of-udmsearch/pkg/DESCR
 echo x - udmsearch/pkg/MESSAGE
 sed 's/^X//' >udmsearch/pkg/MESSAGE << 'END-of-udmsearch/pkg/MESSAGE'
 Xudmsearch is successfully installed.
 XNow, to use udmsearch you need to create the appropriate mysql database
 Xmanually:
 X
 X  Create mysql database 'udmsearch'.
 X  You can also use existing MySQL database, skip this step in this case. 
 X
 X	$ mysqladmin create udmsearch
 X
 X
 X  Create tables.
 X  If you are installing UdmSearch for the first time: 
 X
 X	$ mysql udmsearch < /usr/local/etc/udmsearch/create/create.txt
 X
 X  IMPORTANT: If you already use UdmSearch and want to upgrade from
 X  UdmSearch 2.0 or earlier while keep existing data, please do not use
 X  create.txt. Instead, to upgrade from UdmSearch 2.0, run 
 X
 X 	$ mysql udmsearch < /usr/local/etc/udmsearch/create/alter20-21.txt
 X
 X  or, to upgrade from UdmSearch 1.x, run 
 X        $ mysql udmsearch < /usr/local/etc/udmsearch/create/alter19-20.txt
 X        $ mysql udmsearch < /usr/local/etc/udmsearch/create/alter20-21.txt
 X
 XFor more information on how to use udmsearch, please refer to their
 Xweb site at http://mysearch.udm.net/
 END-of-udmsearch/pkg/MESSAGE
 echo c - udmsearch/files
 mkdir -p udmsearch/files > /dev/null 2>&1
 echo x - udmsearch/files/md5
 sed 's/^X//' >udmsearch/files/md5 << 'END-of-udmsearch/files/md5'
 XMD5 (udmsearch-2.2.1.tar.gz) = 8e5d9cc6140da9ebe3ecc9814333168d
 END-of-udmsearch/files/md5
 echo x - udmsearch/files/MESSAGE
 sed 's/^X//' >udmsearch/files/MESSAGE << 'END-of-udmsearch/files/MESSAGE'
 Xudmsearch is successfully installed.
 XNow, to use udmsearch you need to create the appropriate mysql database
 Xmanually:
 X
 X  Create mysql database 'udmsearch'.
 X  You can also use existing MySQL database, skip this step in this case. 
 X
 X    $ mysqladmin create udmsearch
 X
 X
 X  Create tables.
 X  If you are installing UdmSearch for the first time: 
 X
 X    $ mysql udmsearch < /usr/local/etc/udmsearch/create/mysql/create.txt
 X
 X  IMPORTANT: If you already use UdmSearch and want to upgrade from
 X  UdmSearch 2.0 or earlier while keep existing data, please do not use
 X  create.txt. Instead, to upgrade from UdmSearch 2.0, run 
 X
 X    $ mysql udmsearch < /usr/local/etc/udmsearch/create/mysql/alter20-21.txt
 X
 X  or, to upgrade from UdmSearch 1.x, run 
 X    $ mysql udmsearch < /usr/local/etc/udmsearch/create/mysql/alter19-20.txt
 X    $ mysql udmsearch < /usr/local/etc/udmsearch/create/mysql/alter20-21.txt
 X
 XFor more information on how to use udmsearch, please refer to their
 Xweb site at http://mysearch.udm.net/
 X
 END-of-udmsearch/files/MESSAGE
 echo c - udmsearch/patches
 mkdir -p udmsearch/patches > /dev/null 2>&1
 echo x - udmsearch/patches/patch-aa
 sed 's/^X//' >udmsearch/patches/patch-aa << 'END-of-udmsearch/patches/patch-aa'
 X--- doc/Makefile.in.orig	Thu Dec  2 22:11:39 1999
 X+++ doc/Makefile.in	Thu Dec  2 22:12:27 1999
 X@@ -261,9 +261,9 @@
 X 
 X 
 X install-data-local:
 X-	$(mkinstalldirs) $(prefix)/doc
 X-	echo ${INSTALL_DATA} docs $(DESTDIR)$(prefix)/doc/
 X-	${INSTALL_DATA} ${txt_DOCS} $(DESTDIR)$(prefix)/doc/
 X+	$(mkinstalldirs) $(prefix)/share/doc/udmsearch
 X+	echo ${INSTALL_DATA} docs $(DESTDIR)$(prefix)/share/doc/udmsearch
 X+	${INSTALL_DATA} ${txt_DOCS} $(DESTDIR)$(prefix)/share/doc/udmsearch
 X 
 X # Tell versions [3.59,3.63) of GNU make to not export all variables.
 X # Otherwise a system limit (for SysV at least) may be exceeded.
 END-of-udmsearch/patches/patch-aa
 exit
 
 
 --
 Kelly Yancey  -  kbyanc@posi.net  -  Richmond, VA
 Director of Technical Services, ALC Communications  http://www.alcnet.com/
 Maintainer, BSD Driver Database       http://www.posi.net/freebsd/drivers/
 Coordinator, Team FreeBSD        http://www.posi.net/freebsd/Team-FreeBSD/
 
 

From: Kelly Yancey <kbyanc@posi.net>
To: freebsd-gnats-submit@freebsd.org
Cc:  
Subject: Re: ports/15166: update udmsearch port to 2.2.1
Date: Fri, 3 Dec 1999 16:19:10 -0500 (EST)

   Despite my good inentions, Bill Fumerola pointed out that I really
 should have submitted the fix to this PR as a diff -ruN. So attached is
 just such a diff taken from ports/www. You have to apply that original
 patch included in this PR first, then this one to have a correct port.
 
   Kelly
 
 --
 Kelly Yancey  -  kbyanc@posi.net  -  Richmond, VA
 Director of Technical Services, ALC Communications  http://www.alcnet.com/
 Maintainer, BSD Driver Database       http://www.posi.net/freebsd/drivers/
 Coordinator, Team FreeBSD        http://www.posi.net/freebsd/Team-FreeBSD/
 
 
 diff -ruN udmsearch.orig/patches/patch-aa udmsearch/patches/patch-aa
 --- udmsearch.orig/patches/patch-aa	Wed Dec 31 19:00:00 1969
 +++ udmsearch/patches/patch-aa	Thu Dec  2 22:13:29 1999
 @@ -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 -ruN udmsearch.orig/pkg/PLIST udmsearch/pkg/PLIST
 --- udmsearch.orig/pkg/PLIST	Thu Dec  2 21:59:37 1999
 +++ udmsearch/pkg/PLIST	Thu Dec  2 22:38:35 1999
 @@ -1,14 +1,18 @@
  bin/udmsearch/search.cgi
 -bin/udmsearch/search.php3
 -bin/udmsearch/morph.php3
 -bin/udmsearch/udmsearch.gif
 +bin/udmsearch/search.phtml
  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 +23,20 @@
  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
 
 
State-Changed-From-To: open->closed 
State-Changed-By: steve 
State-Changed-When: Thu Dec 23 08:04:33 PST 1999 
State-Changed-Why:  
Update committed, thanks! 
>Unformatted:
 
