From owner-svn-ports-all@FreeBSD.ORG Sun Dec 30 10:14:52 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5A944714; Sun, 30 Dec 2012 10:14:52 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 403BD8FC0C; Sun, 30 Dec 2012 10:14:52 +0000 (UTC) Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBUAEqp2076772; Sun, 30 Dec 2012 10:14:52 GMT (envelope-from matthew@svn.freebsd.org) Received: (from matthew@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBUAEpUs076766; Sun, 30 Dec 2012 10:14:51 GMT (envelope-from matthew@svn.freebsd.org) Message-Id: <201212301014.qBUAEpUs076766@svn.freebsd.org> From: Matthew Seaman Date: Sun, 30 Dec 2012 10:14:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r309660 - head/textproc/sphinxsearch 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.14 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: Sun, 30 Dec 2012 10:14:52 -0000 Author: matthew Date: Sun Dec 30 10:14:51 2012 New Revision: 309660 URL: http://svnweb.freebsd.org/changeset/ports/309660 Log: Add some missing content to the package: -install indextool -install man pages Submitted by: David@ibendit.com Modified: head/textproc/sphinxsearch/Makefile head/textproc/sphinxsearch/pkg-plist (contents, props changed) Modified: head/textproc/sphinxsearch/Makefile ============================================================================== --- head/textproc/sphinxsearch/Makefile Sun Dec 30 09:46:06 2012 (r309659) +++ head/textproc/sphinxsearch/Makefile Sun Dec 30 10:14:51 2012 (r309660) @@ -1,12 +1,13 @@ # Created by: Matthew Seaman # $FreeBSD$ -# + # Note: the Sphinx Storage Engine MySQL plugin is not supported by # this port. You need a patched version of mysql server for that. # See http://www.infracaninophile.co.uk/articles/sphinxse.html PORTNAME= sphinxsearch PORTVERSION= 2.0.6 +PORTREVISION= 1 CATEGORIES= textproc databases MASTER_SITES= http://sphinxsearch.com/files/ DISTNAME= sphinx-${PORTVERSION}-release @@ -23,7 +24,7 @@ LICENSE= GPLv2 LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2 OPTIONS_DEFINE= ICONV ID64 LIBSTEMMER MYSQL OPTIMIZED_CFLAGS PGSQL \ - SYSLOG UNIXODBC + SYSLOG UNIXODBC #ICONV_DESC= Iconv support ID64_DESC= use 64-bit document and word IDs @@ -36,7 +37,7 @@ UNIXODBC_DESC= unixODBC support OPTIONS_DEFAULT= ICONV MYSQL SYSLOG -CONFLICTS= sphinxsearch-devel-[0-9]* dpsearch-[0-9]* rdb-2.6d \ +CONFLICTS= sphinxsearch-devel-[0-9]* dpsearch-[0-9]* rdb-[0-9]* \ swish++-[0-9]* xaira-[0-9]* .include @@ -150,6 +151,9 @@ PORTEXAMPLES= * .if ${PORT_OPTIONS:MDOCS} DOCS= doc/sphinx.css doc/sphinx.html doc/sphinx.txt doc/sphinx.xml +MAN1= indexer.1 indextool.1 search.1 spelldump.1 +MAN8= searchd.8 +DOCSRC= ${WRKSRC}/doc .endif post-extract: @@ -167,14 +171,22 @@ post-patch: -e "s!@CONFDIR@/log/searchd.log!${SPHINX_LOG}/searchd.log!" \ -e "s!@CONFDIR@!${SPHINX_DIR}!" \ ${WRKSRC}/sphinx.conf.in +.if ${PORT_OPTIONS:MDOCS} + ${SED} -e 's/"1"/"8"/' ${DOCSRC}/searchd.1 > ${DOCSRC}/searchd.8 +.for man in ${MAN1} + ${SED} -i~ -e 's/\\fBsearchd\\fR(1)/\\fBsearchd\\fR(8)/' \ + ${DOCSRC}/${man} +.endfor +.endif -do-install: install-bin install-docs install-examples +do-install: install-bin install-docs install-man install-examples install-bin: - ${INSTALL_PROGRAM} ${WRKSRC}/src/indexer ${PREFIX}/bin/indexer - ${INSTALL_PROGRAM} ${WRKSRC}/src/search ${PREFIX}/bin/search + ${INSTALL_PROGRAM} ${WRKSRC}/src/indexer ${PREFIX}/bin/indexer + ${INSTALL_PROGRAM} ${WRKSRC}/src/indextool ${PREFIX}/bin/indextool + ${INSTALL_PROGRAM} ${WRKSRC}/src/search ${PREFIX}/bin/search ${INSTALL_PROGRAM} ${WRKSRC}/src/spelldump ${PREFIX}/bin/spelldump - ${INSTALL_PROGRAM} ${WRKSRC}/src/searchd ${PREFIX}/sbin/searchd + ${INSTALL_PROGRAM} ${WRKSRC}/src/searchd ${PREFIX}/sbin/searchd ${INSTALL_DATA} ${WRKSRC}/sphinx.conf.dist ${CFGFILE}.sample install-docs: @@ -185,6 +197,16 @@ install-docs: .endfor .endif +install-man: +.if ${PORT_OPTIONS:MDOCS} +.for man in ${MAN1} + ${INSTALL_MAN} ${DOCSRC}/${man} ${MANPREFIX}/man/man1/${man} +.endfor +.for man in ${MAN8} + ${INSTALL_MAN} ${DOCSRC}/${man} ${MANPREFIX}/man/man8/${man} +.endfor +.endif + install-examples: .if ${PORT_OPTIONS:MEXAMPLES} @${MKDIR} ${EXAMPLESDIR} Modified: head/textproc/sphinxsearch/pkg-plist ============================================================================== --- head/textproc/sphinxsearch/pkg-plist Sun Dec 30 09:46:06 2012 (r309659) +++ head/textproc/sphinxsearch/pkg-plist Sun Dec 30 10:14:51 2012 (r309660) @@ -1,4 +1,5 @@ bin/indexer +bin/indextool bin/search bin/spelldump sbin/searchd