From owner-svn-ports-all@FreeBSD.ORG Thu Jun 5 01:45:03 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BEFB3863; Thu, 5 Jun 2014 01:45:03 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id ABF422C72; Thu, 5 Jun 2014 01:45:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s551j38i043398; Thu, 5 Jun 2014 01:45:03 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s551j2j4043387; Thu, 5 Jun 2014 01:45:02 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201406050145.s551j2j4043387@svn.freebsd.org> From: Martin Wilke Date: Thu, 5 Jun 2014 01:45:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r356568 - in head/www/udmsearch: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jun 2014 01:45:03 -0000 Author: miwi Date: Thu Jun 5 01:45:02 2014 New Revision: 356568 URL: http://svnweb.freebsd.org/changeset/ports/356568 QAT: https://qat.redports.org/buildarchive/r356568/ Log: - Stage report PR: 190512 Submitted by: maintainer Added: head/www/udmsearch/files/patch-Makefile.in (contents, props changed) head/www/udmsearch/files/patch-doc-Makefile.in (contents, props changed) head/www/udmsearch/files/pkg-message.in (contents, props changed) Deleted: head/www/udmsearch/files/patch-configure.in head/www/udmsearch/pkg-message Modified: head/www/udmsearch/Makefile head/www/udmsearch/pkg-plist Modified: head/www/udmsearch/Makefile ============================================================================== --- head/www/udmsearch/Makefile Thu Jun 5 01:42:05 2014 (r356567) +++ head/www/udmsearch/Makefile Thu Jun 5 01:45:02 2014 (r356568) @@ -3,6 +3,7 @@ PORTNAME= udmsearch PORTVERSION= 3.1.7 +PORTREVISION= 1 CATEGORIES= www databases MASTER_SITES= http://www.mnogosearch.org/Download/ \ http://udmsearch.real-time.com/Download/ @@ -10,8 +11,7 @@ MASTER_SITES= http://www.mnogosearch.org MAINTAINER= 5u623l20@gmail.com COMMENT= Full featured SQL-based hypertext search engine -OPTIONS_DEFINE= MSQL MYSQL PGSQL -OPTIONS_DEFAULT= MYSQL +LICENSE= GPLv2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-charset-guesser \ @@ -19,34 +19,29 @@ CONFIGURE_ARGS= --enable-charset-guesser --sysconfdir=${PREFIX}/etc/udmsearch \ --localstatedir=/var/udmsearch -MAN1= indexer.1 -MAN5= indexer.conf.5 +OPTIONS_DEFINE= MSQL MYSQL PGSQL DOCS +OPTIONS_DEFAULT= MYSQL -NO_STAGE= yes -.include +MSQL_BUILD_DEPENDS= ${LOCALBASE}/lib/libmsql.a:${PORTSDIR}/databases/msql +MSQL_CONFIGURE_ON+= --with-msql=${LOCALBASE} +MYSQL_USE= MYSQL=YES +MYSQL_CONFIGURE_ON+= --with-mysql=${LOCALBASE} +PGSQL_USE= PGSQL=YES +PGSQL_CONFIGURE_ON+= --with-pgsql=${LOCALBASE}/pgsql -.if ${PORT_OPTIONS:MMSQL} -BUILD_DEPENDS= ${PREFIX}/lib/libmsql.a:${PORTSDIR}/databases/msql -CONFIGURE_ARGS+= --with-msql=${LOCALBASE} -.endif - -.if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= YES -CONFIGURE_ARGS+= --with-mysql=${LOCALBASE} -.endif - -.if ${PORT_OPTIONS:MPGSQL} -USE_PGSQL= YES -CONFIGURE_ARGS+= --with-pgsql=${LOCALBASE}/pgsql -.endif +PORTDOCS= * + +SUB_FILES= pkg-message +.include pre-install: - @${MKDIR} ${DATADIR} + @${MKDIR} ${STAGEDIR}${DATADIR} post-install: - @${CP} -R ${WRKSRC}/create ${DATADIR} - @${INSTALL_DATA} ${WRKSRC}/INSTALL ${DOCSDIR} - @${ECHO_MSG} - @${CAT} ${PKGMESSAGE} + @${CP} -R ${WRKSRC}/create ${STAGEDIR}${DATADIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/INSTALL ${STAGEDIR}${DOCSDIR} + ${CP} ${WRKSRC}/doc/*.txt ${STAGEDIR}${DOCSDIR} + ${CP} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR} .include Added: head/www/udmsearch/files/patch-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/udmsearch/files/patch-Makefile.in Thu Jun 5 01:45:02 2014 (r356568) @@ -0,0 +1,11 @@ +--- Makefile.in.orig 2014-05-12 02:45:44.003408363 +0600 ++++ Makefile.in 2014-05-12 02:47:54.685398481 +0600 +@@ -350,7 +350,7 @@ + install-data: install-data-recursive + + install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am + install: install-recursive + uninstall-am: uninstall-binSCRIPTS + uninstall: uninstall-recursive Added: head/www/udmsearch/files/patch-doc-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/udmsearch/files/patch-doc-Makefile.in Thu Jun 5 01:45:02 2014 (r356568) @@ -0,0 +1,11 @@ +--- doc/Makefile.in.orig 2014-05-12 02:17:06.920526387 +0600 ++++ doc/Makefile.in 2014-05-12 02:17:22.799526083 +0600 +@@ -230,7 +230,7 @@ + install-exec-am: + install-exec: install-exec-am + +-install-data-am: install-man install-data-local ++install-data-am: install-man + install-data: install-data-am + + install-am: all-am Added: head/www/udmsearch/files/pkg-message.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/udmsearch/files/pkg-message.in Thu Jun 5 01:45:02 2014 (r356568) @@ -0,0 +1,6 @@ +Udmsearch is successfully installed. +Now, to use udmsearch you need to create the appropriate mysql database +manually: Please read INSTALL file located in %%DOCSDIR%%. + +For more information on how to use udmsearch, please refer to their +web site at http://search.mnoGo.ru/ Modified: head/www/udmsearch/pkg-plist ============================================================================== --- head/www/udmsearch/pkg-plist Thu Jun 5 01:42:05 2014 (r356567) +++ head/www/udmsearch/pkg-plist Thu Jun 5 01:45:02 2014 (r356568) @@ -49,33 +49,6 @@ %%DATADIR%%/create/virtuoso/crc.txt %%DATADIR%%/create/virtuoso/create.txt %%DATADIR%%/create/virtuoso/multi.txt -%%DOCSDIR%%/HTDB.txt -%%DOCSDIR%%/HTTP-codes.txt -%%DOCSDIR%%/INSTALL -%%DOCSDIR%%/NEWS.html -%%DOCSDIR%%/UdmSearch-Oracle8.html -%%DOCSDIR%%/bugs.txt -%%DOCSDIR%%/cache.txt -%%DOCSDIR%%/cachemode.txt -%%DOCSDIR%%/categories.txt -%%DOCSDIR%%/charset.txt -%%DOCSDIR%%/follow.txt -%%DOCSDIR%%/hrefonly.txt -%%DOCSDIR%%/html.txt -%%DOCSDIR%%/ispell.txt -%%DOCSDIR%%/lib.txt -%%DOCSDIR%%/mp3.txt -%%DOCSDIR%%/negotiation.txt -%%DOCSDIR%%/parsers.txt -%%DOCSDIR%%/performance.txt -%%DOCSDIR%%/search.txt -%%DOCSDIR%%/srv_table.txt -%%DOCSDIR%%/storage.txt -%%DOCSDIR%%/syslog.txt -%%DOCSDIR%%/tags.txt -%%DOCSDIR%%/templates.txt -%%DOCSDIR%%/tracking.txt -%%DOCSDIR%%/usage.txt bin/search.cgi bin/udm-config etc/udmsearch/indexer.conf-dist @@ -112,6 +85,8 @@ lib/libudmsearch.a lib/libudmsearch.la sbin/indexer sbin/splitter +man/man1/indexer.1.gz +man/man5/indexer.conf.5.gz @dirrmtry %%DATADIR%%/create/ibase @dirrmtry %%DATADIR%%/create/msql @dirrmtry %%DATADIR%%/create/mssql @@ -124,5 +99,5 @@ sbin/splitter @dirrmtry %%DATADIR%%/create/virtuoso @dirrmtry %%DATADIR%%/create @dirrmtry %%DATADIR%% -@dirrmtry %%DOCSDIR%% +%%PORTDOCS%%@dirrmtry %%DOCSDIR%% @dirrmtry etc/udmsearch