[Midnightbsd-cvs] mports [18601] trunk/textproc/sphinxsearch: update sphinx search to 2.2.7, based on the freebsd port

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri Apr 10 07:33:10 EDT 2015


Revision: 18601
          http://svnweb.midnightbsd.org/mports/?rev=18601
Author:   laffer1
Date:     2015-04-10 07:33:09 -0400 (Fri, 10 Apr 2015)
Log Message:
-----------
update sphinx search to 2.2.7, based on the freebsd port

Modified Paths:
--------------
    trunk/textproc/sphinxsearch/Makefile
    trunk/textproc/sphinxsearch/distinfo
    trunk/textproc/sphinxsearch/pkg-descr
    trunk/textproc/sphinxsearch/pkg-plist

Added Paths:
-----------
    trunk/textproc/sphinxsearch/files/sphinxsearch.in

Removed Paths:
-------------
    trunk/textproc/sphinxsearch/files/sphinxsearch.sh.in
    trunk/textproc/sphinxsearch/pkg-message

Property Changed:
----------------
    trunk/textproc/sphinxsearch/files/pkg-deinstall.in
    trunk/textproc/sphinxsearch/pkg-descr

Modified: trunk/textproc/sphinxsearch/Makefile
===================================================================
--- trunk/textproc/sphinxsearch/Makefile	2015-04-09 01:21:43 UTC (rev 18600)
+++ trunk/textproc/sphinxsearch/Makefile	2015-04-10 11:33:09 UTC (rev 18601)
@@ -6,90 +6,91 @@
 # See http://www.infracaninophile.co.uk/articles/sphinxse.html
 
 PORTNAME=	sphinxsearch
-PORTVERSION=	0.9.9
+PORTVERSION=	2.2.7
 CATEGORIES=	textproc databases
-MASTER_SITES=	http://sphinxsearch.com/files/
-DISTNAME=	sphinx-${PORTVERSION}
+MASTER_SITES=	http://sphinxsearch.com/files/ \
+		http://snowball.tartarus.org/dist/:libstemmer
+DISTNAME=	sphinx-${PORTVERSION}-release
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Sphinx Full-Text Search Engine
+
 LICENSE=	gpl2
 
-LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
+# If expat is present on the system and configure finds it, it will
+# unconditionally link the output binary against it.  There's no way
+# of turning this off.  So for consistency, make sure it's always on.
+LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
 
-OPTIONS=	MYSQL            "MySQL support"                    on  \
-		PGSQL            "PostgreSQL support"               off \
-		ICONV		 "Iconv support"		    on  \
-		OPTIMIZED_CFLAGS "Use compiler optimization (-O3)"  off \
-		ID64		 "use 64-bit document and word IDs" off \
-		UNIXODBC	 "unixODBC support"		    off
+OPTIONS_DEFINE=	ICONV ID64 LIBSTEMMER MYSQL OPTIMIZED_CFLAGS PGSQL \
+		RE2 SYSLOG UNIXODBC DOCS
+OPTIONS_DEFAULT=ICONV MYSQL SYSLOG
 
-## FFR
-##		LIBSTEMMER	 "compile with libstemmer support"  off
+ICONV_CONFIGURE_WITH=	iconv
+ICONV_USES=		iconv
+ICONV_LDFLAGS=		${ICONV_LIB}
 
-CONFLICTS=	sphinxsearch-devel-[0-9]*
+# Changes document and word IDs to a 64bit type, useful if you have
+# more than about 4.2E9 such items to deal with.  Means corresponding
+# changes in DB schema.  Disabled by default.
+ID64_DESC=		Use 64-bit document and word IDs
+ID64_CONFIGURE_ENABLE=	id64
 
-.include <bsd.mport.options.mk>
+# Note: The snowball project doesn't release numbered versions of it's
+# pre-processors.  Instead, at arbitrary but fairly long intervals a
+# snapshot of their source repository is turned into a tarball (always
+# the same filename) and placed on their web site.  It's like they
+# want to make it as hard as possible for anyone to package and use
+# their software.
+#
+# Adds support for two additional word stemmming pre-processors from
+# the Snowball project (http://snowball.tartarus.org/) -- these
+# essentially do exactly the same thing as the built in English,
+# Russian and Czech stemmers but also support French, Spanish,
+# Portuguese, Italian, Romanian, German, Dutch, Swedish, Norwegian,
+# Danish, Finnish, Hungarian.  Disabled by default.
+LIBSTEMMER_DESC=	Compile with libstemmer support
+LIBSTEMMER_CONFIGURE_WITH=libstemmer
+LIBSTEMMER_DISTNAME=	libstemmer_c
+LIBSTEMMER_DISTFILES=	${LIBSTEMMER_DISTNAME}.tgz:libstemmer
 
+.if make(makesum) || defined(FETCH_ALL)
+OPTIONS_SET_FORCE= LIBSTEMMER
+.endif
+
 # The port will successfully compile with both PGSQL and MYSQL support
 # simultaneously.  Not sure how useful that is in practice though.
 
-.if defined(WITH_MYSQL) && !defined(WITHOUT_MYSQL)
-CONFIGURE_ARGS+=	--with-mysql
-USE_MYSQL=		yes
-.else
-CONFIGURE_ARGS+=	--without-mysql
-.endif
+MYSQL_CONFIGURE_WITH=	mysql
+MYSQL_CONFIGURE_ON=	--with-mysql-includes=${LOCALBASE}/include/mysql \
+			--with-mysql-libs=${LOCALBASE}/lib/mysql
+MYSQL_USE=		mysql
 
-.if defined(WITH_PGSQL) && !defined(WITHOUT_PGSQL)
-CONFIGURE_ARGS+=	--with-pgsql
-USE_PGSQL=		yes
-.else
-CONFIGURE_ARGS+=	--without-pgsql
-.endif
+OPTIMIZED_CFLAGS_CXXFLAGS=-O3 -fomit-frame-pointer
 
-.if defined(WITH_ICONV) && !defined(WITHOUT_ICONV)
-CONFIGURE_ARGS+=	--with-iconv
-USE_ICONV=		yes
-.else
-CONFIGURE_ARGS+=	--without-iconv
-.endif
+PGSQL_CONFIGURE_WITH=	pgsql
+PGSQL_CONFIGURE_ON=	--with-pgsql-includes=${LOCALBASE}/include \
+			--with-pgsql-libs=${LOCALBASE}/lib
+PGSQL_USES=		pgsql
 
-.if defined(WITH_OPTIMIZED_CFLAGS)
-CXXFLAGS+=		-O3 -fomit-frame-pointer
-.endif
+# Why does this insist on linking against the libre2.a static library?
 
-# Changes document and word IDs to a 64bit type, useful if you have
-# more than about 4.2E9 such items to deal with.  Means corresponding
-# changes in DB schema.  Disabled by default.
-.if defined(WITH_ID64)
-CONFIGURE_ARGS+=	--enable-id64
-.endif
+RE2_DESC=		Enable re2 regular expression library
+RE2_CONFIGURE_WITH=	re2
+RE2_BUILD_DEPENDS=	${LOCALBASE}/lib/libre2.a:${PORTSDIR}/devel/re2
 
-.if defined(WITH_UNIXODBC)
-CONFIGURE_ARGS+=	--with-unixodbc
-LIB_DEPENDS+=		odbc.1:${PORTSDIR}/databases/unixODBC
-.else
-CONFIGURE_ARGS+=	--without-unixodbc
-.endif
+SYSLOG_DESC=		Enable logging via syslog
+SYSLOG_CONFIGURE_WITH=	syslog
 
-## FFR.  The snowball project doesn't release numbered versions of it's
-## pre-processors.  Instead, at arbitrary intervals a snapshot of their
-## source repository is turned into a tarball (always the same filename)
-## and placed on their web site.  It's like they want to make it as hard
-## as possible for anyone to package and use their software.
-##
-## # Adds support for two additional word stemmming pre-processors from
-## # the Snowball project (http://snowball.tartarus.org/) -- these
-## # essentially do exactly the same thing as the built in English and
-## # Russian stemmers but are slightly slower and may produce subtly
-## # different output. Disabled by default.
-## .if defined(WITH_LIBSTEMMER) && !defined(WITHOUT_LIBSTEMMER)
-## CONFIGURE_ARGS+=	--with-libstemmer
-## .else
-## CONFIGURE_ARGS+=	--without-libstemmer
-## .endif
+UNIXODBC_CONFIGURE_WITH=unixodbc
+UNIXODBC_LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/unixODBC
 
+CONFLICTS=	sphinxsearch-devel-[0-9]* dpsearch-[0-9]* rdb-[0-9]* \
+		swish++-[0-9]* xaira-[0-9]*
+
+.include <bsd.mport.options.mk>
+
 USERS?=		_sphinx
 GROUPS?=	_sphinx
 
@@ -101,11 +102,11 @@
 # don't ask.
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=		CC=${CC} CPPFLAGS="${CXXFLAGS}"
+CPPFLAGS+=	${CXXFLAGS}
 CFGFILE=	${PREFIX}/etc/sphinx.conf
-USE_RC_SUBR=	sphinxsearch.sh
-SUB_LIST+=	PORTNAME=${PORTNAME}     \
-		CFGFILE=${CFGFILE}       \
+USE_RC_SUBR=	sphinxsearch
+SUB_LIST+=	PORTNAME=${PORTNAME}	 \
+		CFGFILE=${CFGFILE}	 \
 		SPHINX_USR=${USERS}	 \
 		SPHINX_GRP=${GROUPS}	 \
 		SPHINX_DIR=${SPHINX_DIR} \
@@ -113,53 +114,60 @@
 		SPHINX_LOG=${SPHINX_LOG}
 SUB_FILES+=	pkg-deinstall
 
-.if !defined(NOPORTEXAMPLES)
 EXAMPLES=	example.sql api
-PORTEXAMPLES=	*
-.endif
 
-.if !defined(NOPORTDOCS)
 DOCS=		doc/sphinx.css doc/sphinx.html doc/sphinx.txt doc/sphinx.xml
+DOCSRC=		${WRKSRC}/doc
+
+MAN1SRC=	indexer.1 indextool.1 spelldump.1
+MAN8SRC=	searchd.8
+
+post-extract:
+.if ${PORT_OPTIONS:MLIBSTEMMER}
+	@( cd ${WRKDIR} && ${COPYTREE_SHARE} ${LIBSTEMMER_DISTNAME} ${WRKSRC} )
 .endif
 
 # Fix up the sample configuration file to correspond to FreeBSD norms
-
 post-patch:
 	@${REINPLACE_CMD} \
-	    -e "s!@CONFDIR@/log/searchd.pid!${SPHINX_RUN}/searchd.pid!"    \
+	    -e "s!@CONFDIR@/log/searchd.pid!${SPHINX_RUN}/searchd.pid!"	   \
 	    -e "s!@CONFDIR@/log/query.log!${SPHINX_LOG}/sphinx-query.log!" \
-	    -e "s!@CONFDIR@/log/searchd.log!${SPHINX_LOG}/searchd.log!"    \
-	    -e "s!@CONFDIR@!${SPHINX_DIR}!"                                \
+	    -e "s!@CONFDIR@/log/searchd.log!${SPHINX_LOG}/searchd.log!"	   \
+	    -e "s!@CONFDIR@!${SPHINX_DIR}!"				   \
 	    ${WRKSRC}/sphinx.conf.in
+	${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
 
-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/spelldump ${PREFIX}/bin/spelldump
-	${INSTALL_PROGRAM} ${WRKSRC}/src/searchd ${PREFIX}/sbin/searchd
-	${INSTALL_DATA}    ${WRKSRC}/sphinx.conf.dist ${CFGFILE}.sample
+	${INSTALL_PROGRAM} ${WRKSRC}/src/searchd   ${PREFIX}/sbin/searchd
+	${INSTALL_DATA}	   ${WRKSRC}/sphinx.conf.dist ${CFGFILE}.sample
 
 install-docs:
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for doc in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
 .endfor
-.endif
 
+install-man:
+.for man in ${MAN1SRC}
+	${INSTALL_MAN} ${DOCSRC}/${man} ${MANPREFIX}/man/man1/${man}
+.endfor
+.for man in ${MAN8SRC}
+	${INSTALL_MAN} ${DOCSRC}/${man} ${MANPREFIX}/man/man8/${man}
+.endfor
+
 install-examples:
-.if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${EXAMPLESDIR}
 .for example in ${EXAMPLES}
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} ${example} ${EXAMPLESDIR}
 .endfor
-.endif
 
-post-install-cfg:
-	@if [ ! -f ${CFGFILE} ]; then \
-	  ${CP} -p ${CFGFILE}.sample ${CFGFILE} ; \
-	fi
-
 .include <bsd.port.mk>

Modified: trunk/textproc/sphinxsearch/distinfo
===================================================================
--- trunk/textproc/sphinxsearch/distinfo	2015-04-09 01:21:43 UTC (rev 18600)
+++ trunk/textproc/sphinxsearch/distinfo	2015-04-10 11:33:09 UTC (rev 18601)
@@ -1,3 +1,4 @@
-SHA256 (sphinx-0.9.9.tar.gz) = bf8f55ffc095ff6b628f0cbc7eb54761811140140679a1c869cc1b17c42803e4
-RMD160 (sphinx-0.9.9.tar.gz) = ed3cd1a9328114c1d2a6325cce5520065076c275
-SIZE (sphinx-0.9.9.tar.gz) = 1218359
+SHA256 (sphinx-2.2.7-release.tar.gz) = 613487b66f75a925d4bbe9f04e0b062bd45a8792319672351a80e18a0724c63d
+SIZE (sphinx-2.2.7-release.tar.gz) = 2969037
+SHA256 (libstemmer_c.tgz) = 6530c3638f29f5b03bc3786bb9212e39adaf3bf15b5b0a483b2eb5111f7f416e
+SIZE (libstemmer_c.tgz) = 129584

Index: trunk/textproc/sphinxsearch/files/pkg-deinstall.in
===================================================================
--- trunk/textproc/sphinxsearch/files/pkg-deinstall.in	2015-04-09 01:21:43 UTC (rev 18600)
+++ trunk/textproc/sphinxsearch/files/pkg-deinstall.in	2015-04-10 11:33:09 UTC (rev 18601)

Property changes on: trunk/textproc/sphinxsearch/files/pkg-deinstall.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Copied: trunk/textproc/sphinxsearch/files/sphinxsearch.in (from rev 18592, trunk/textproc/sphinxsearch/files/sphinxsearch.sh.in)
===================================================================
--- trunk/textproc/sphinxsearch/files/sphinxsearch.in	                        (rev 0)
+++ trunk/textproc/sphinxsearch/files/sphinxsearch.in	2015-04-10 11:33:09 UTC (rev 18601)
@@ -0,0 +1,80 @@
+#!/bin/sh
+#
+# $FreeBSD: head/textproc/sphinxsearch/files/sphinxsearch.in 340872 2014-01-24 00:14:07Z mat $
+#
+# PROVIDE: %%PORTNAME%%
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable %%PORTNAME%%:
+#
+# %%PORTNAME%%_enable="YES"
+#
+# Other rc.conf variables:
+#
+# %%PORTNAME%%_conffile="%%CFGFILE%%"
+#                          -- path to config file
+# %%PORTNAME%%_pidfile="%%SPHINX_RUN%%/searchd.pid"
+#                          -- location of pidfile: must match setting
+#                             in ${%%PORTNAME%%_conffile}
+# %%PORTNAME%%_user="%%SPHINX_USR%%"
+#                          -- user to run searchd as
+# %%PORTNAME%%_group="%%SPHINX_GRP%%"
+#                          -- group to run searchd as
+# %%PORTNAME%%_logdir="%%SPHINX_LOG%%"
+#                          -- directory searchd writes logs to
+# %%PORTNAME%%_dir="%%SPHINX_DIR%%"
+#                          -- working directory used by searchd et al:
+#                             must match setting in ${%%PORTNAME%%_conffile}
+#
+. /etc/rc.subr
+
+name=%%PORTNAME%%
+rcvar=%%PORTNAME%%_enable
+
+load_rc_config ${name}
+
+: ${%%PORTNAME%%_enable="NO"}
+: ${%%PORTNAME%%_conffile="%%CFGFILE%%"}
+: ${%%PORTNAME%%_pidfile="%%SPHINX_RUN%%/searchd.pid"}
+: ${%%PORTNAME%%_user="%%SPHINX_USR%%"}
+: ${%%PORTNAME%%_group="%%SPHINX_GRP%%"}
+: ${%%PORTNAME%%_logdir="%%SPHINX_LOG%%"}
+: ${%%PORTNAME%%_dir="%%SPHINX_DIR%%"}
+
+command=%%PREFIX%%/sbin/searchd
+pidfile=${%%PORTNAME%%_pidfile}
+required_files=${%%PORTNAME%%_conffile}
+start_precmd=%%PORTNAME%%_prestart
+
+%%PORTNAME%%_prestart ()
+{
+    piddir=$(dirname ${%%PORTNAME%%_pidfile})
+    if [ ! -d ${piddir} ]; then
+	mkdir -m 755 -p ${piddir}
+	chown -R ${%%PORTNAME%%_user}:${%%PORTNAME%%_group} ${piddir}
+    fi
+    if [ ! -d ${%%PORTNAME%%_logdir} ]; then
+	mkdir -m 755 -p ${%%PORTNAME%%_logdir}
+	chown -R ${%%PORTNAME%%_user}:${%%PORTNAME%%_group} \
+	    ${%%PORTNAME%%_logdir}
+    fi
+    if [ ! -d ${%%PORTNAME%%_dir} ]; then
+	mkdir -m 755 -p ${%%PORTNAME%%_dir} ${%%PORTNAME%%_dir}/data
+	chown -R ${%%PORTNAME%%_user}:${%%PORTNAME%%_group} \
+	    ${%%PORTNAME%%_dir}
+    fi
+}
+
+case "${%%PORTNAME%%_flags}" in
+    *--config\ *)
+    echo "Warning \$%%PORTNAME%%_flags includes --config option." \
+	"Please use \$%%PORTNAME%%_conffile instead."
+    ;;
+    *)
+    %%PORTNAME%%_flags="--config ${%%PORTNAME%%_conffile} ${%%PORTNAME%%_flags}"
+    ;;
+esac
+
+run_rc_command "$1"

Deleted: trunk/textproc/sphinxsearch/files/sphinxsearch.sh.in
===================================================================
--- trunk/textproc/sphinxsearch/files/sphinxsearch.sh.in	2015-04-09 01:21:43 UTC (rev 18600)
+++ trunk/textproc/sphinxsearch/files/sphinxsearch.sh.in	2015-04-10 11:33:09 UTC (rev 18601)
@@ -1,80 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/textproc/sphinxsearch/files/sphinxsearch.sh.in,v 1.5 2009/12/03 09:07:28 pav Exp $
-#
-# PROVIDE: %%PORTNAME%%
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable %%PORTNAME%%:
-#
-# %%PORTNAME%%_enable="YES"
-#
-# Other rc.conf variables:
-#
-# %%PORTNAME%%_conffile="%%CFGFILE%%"
-#                          -- path to config file
-# %%PORTNAME%%_pidfile="%%SPHINX_RUN%%/searchd.pid"
-#                          -- location of pidfile: must match setting
-#                             in ${%%PORTNAME%%_conffile}
-# %%PORTNAME%%_user="%%SPHINX_USR%%"
-#                          -- user to run searchd as
-# %%PORTNAME%%_group="%%SPHINX_GRP%%"
-#                          -- group to run searchd as
-# %%PORTNAME%%_logdir="%%SPHINX_LOG%%"
-#                          -- directory searchd writes logs to
-# %%PORTNAME%%_dir="%%SPHINX_DIR%%"
-#                          -- working directory used by searchd et al:
-#                             must match setting in ${%%PORTNAME%%_conffile}
-#
-. /etc/rc.subr
-
-name=%%PORTNAME%%
-rcvar=`set_rcvar`
-
-load_rc_config ${name}
-
-: ${%%PORTNAME%%_enable="NO"}
-: ${%%PORTNAME%%_conffile="%%CFGFILE%%"}
-: ${%%PORTNAME%%_pidfile="%%SPHINX_RUN%%/searchd.pid"}
-: ${%%PORTNAME%%_user="%%SPHINX_USR%%"}
-: ${%%PORTNAME%%_group="%%SPHINX_GRP%%"}
-: ${%%PORTNAME%%_logdir="%%SPHINX_LOG%%"}
-: ${%%PORTNAME%%_dir="%%SPHINX_DIR%%"}
-
-command=%%PREFIX%%/sbin/searchd
-pidfile=${%%PORTNAME%%_pidfile}
-required_files=${%%PORTNAME%%_conffile}
-start_precmd=%%PORTNAME%%_prestart
-
-%%PORTNAME%%_prestart ()
-{
-    piddir=$(dirname ${%%PORTNAME%%_pidfile})
-    if [ ! -d ${piddir} ]; then
-	mkdir -m 755 -p ${piddir}
-	chown -R ${%%PORTNAME%%_user}:${%%PORTNAME%%_group} ${piddir}
-    fi
-    if [ ! -d ${%%PORTNAME%%_logdir} ]; then
-	mkdir -m 755 -p ${%%PORTNAME%%_logdir}
-	chown -R ${%%PORTNAME%%_user}:${%%PORTNAME%%_group} \
-	    ${%%PORTNAME%%_logdir}
-    fi
-    if [ ! -d ${%%PORTNAME%%_dir} ]; then
-	mkdir -m 755 -p ${%%PORTNAME%%_dir} ${%%PORTNAME%%_dir}/data
-	chown -R ${%%PORTNAME%%_user}:${%%PORTNAME%%_group} \
-	    ${%%PORTNAME%%_dir}
-    fi
-}
-
-case "${%%PORTNAME%%_flags}" in
-    *--config\ *)
-    echo "Warning \$%%PORTNAME%%_flags includes --config option." \
-	"Please use \$%%PORTNAME%%_conffile instead."
-    ;;
-    *)
-    %%PORTNAME%%_flags="--config ${%%PORTNAME%%_conffile} ${%%PORTNAME%%_flags}"
-    ;;
-esac
-
-run_rc_command "$1"

Modified: trunk/textproc/sphinxsearch/pkg-descr
===================================================================
--- trunk/textproc/sphinxsearch/pkg-descr	2015-04-09 01:21:43 UTC (rev 18600)
+++ trunk/textproc/sphinxsearch/pkg-descr	2015-04-10 11:33:09 UTC (rev 18601)
@@ -1,14 +1,27 @@
-Sphinx is a full-text search engine, distributed under GPL version
-2. Commercial license is also available for embedded use.
+Sphinx is an open source full text search server, designed from the
+ground up with performance, relevance (aka search quality), and
+integration simplicity in mind. It's written in C++ and works on Linux
+(RedHat, Ubuntu, etc), Windows, MacOS, Solaris, FreeBSD, and a few
+other systems.
 
-Generally, it's a standalone search engine, meant to provide fast,
-size-efficient and relevant fulltext search functions to other
-applications. Sphinx was specially designed to integrate well with SQL
-databases and scripting languages. Currently built-in data sources
-support fetching data either via direct connection to MySQL, or from
-an XML pipe.
+Sphinx lets you either batch index and search data stored in an SQL
+database, NoSQL storage, or just files quickly easily and or index and
+search data on the fly, working with Sphinx pretty much as with a
+database server.
 
-As for the name, Sphinx is an acronym which is officially decoded as
-SQL Phrase Index.
+A variety of text processing features enable fine-tuning Sphinx for
+your particular application requirements, and a number of relevance
+functions ensures you can tweak search quality as well.
 
-WWW: http://www.sphinxsearch.com/
+Searching via SphinxAPI is as simple as 3 lines of code, and querying
+via SphinxQL is even simpler, with search queries expressed in good
+old SQL.
+
+Sphinx clusters scale up to billions of documents and tens of millions
+search queries per day, powering top websites such as Craigslist,
+DailyMotion, NetLog, etc.
+
+And last but not least, it's open-sourced under GPLv2, and the
+community edition is free to use.
+
+WWW: http://sphinxsearch.com/


Property changes on: trunk/textproc/sphinxsearch/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: trunk/textproc/sphinxsearch/pkg-message
===================================================================
--- trunk/textproc/sphinxsearch/pkg-message	2015-04-09 01:21:43 UTC (rev 18600)
+++ trunk/textproc/sphinxsearch/pkg-message	2015-04-10 11:33:09 UTC (rev 18601)
@@ -1,17 +0,0 @@
-
-   Note: for people upgrading from earlier versions to sphinx-0.9.9
-   ================================================================
-
-   Please be aware that sphinx now uses these IANA[1] sanctioned port
-   numbers by default:
-
-    sphinxql        9306/tcp    Sphinx search server (MySQL listener)
-    #                           Andrew Aksyonoff <shodan&sphinxsearch.com> 20 October 2009
-
-    sphinxapi       9312/tcp    Sphinx search server
-    #                           Andrew Aksyonoff <shodan&sphinxsearch.com> 20 October 2009
-
-   This is a change from the port numbers used by default in earlier
-   versions.
-
-       [1] http://www.iana.org/assignments/port-numbers

Modified: trunk/textproc/sphinxsearch/pkg-plist
===================================================================
--- trunk/textproc/sphinxsearch/pkg-plist	2015-04-09 01:21:43 UTC (rev 18600)
+++ trunk/textproc/sphinxsearch/pkg-plist	2015-04-10 11:33:09 UTC (rev 18601)
@@ -1,12 +1,133 @@
 bin/indexer
-bin/search
+bin/indextool
 bin/spelldump
 sbin/searchd
- at unexec if cmp -s %D/etc/sphinx.conf.sample %D/etc/sphinx.conf; then rm -f %D/etc/sphinx.conf; fi
-etc/sphinx.conf.sample
- at exec if [ ! -f %D/etc/sphinx.conf ] ; then cp -p %D/%F %B/sphinx.conf; fi
+ at sample etc/sphinx.conf.sample
+%%PORTDOCS%%man/man1/indexer.1.gz
+%%PORTDOCS%%man/man1/indextool.1.gz
+%%PORTDOCS%%man/man1/spelldump.1.gz
+%%PORTDOCS%%man/man8/searchd.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/sphinx.css
 %%PORTDOCS%%%%DOCSDIR%%/sphinx.html
 %%PORTDOCS%%%%DOCSDIR%%/sphinx.txt
 %%PORTDOCS%%%%DOCSDIR%%/sphinx.xml
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/java/MANIFEST.MF
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/java/Makefile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/java/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/java/SphinxClient.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/java/SphinxException.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/java/SphinxMatch.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/java/SphinxResult.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/java/SphinxWordInfo.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/java/mk.cmd
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/java/mkdoc.cmd
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/java/test.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/COPYING
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/Makefile.am
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/Makefile.in
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/build.mk
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/buildconf.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/config.guess
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/config.sub
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/configure
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/configure.in
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/install-sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/libsphinxclient.vcproj
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/ltmain.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/missing
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/smoke_ref.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/smoke_test.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/smoke_test.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/sphinxclient.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/sphinxclient.h
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/sphinxclient_config.h.in
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/test.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/test.sln
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/test.vcproj
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/test03.sln
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/test03.vcproj
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/README.rdoc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/Rakefile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/init.rb
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/install.rb
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/lib/sphinx.rb
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/lib/sphinx/client.rb
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/lib/sphinx/request.rb
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/lib/sphinx/response.rb
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/client_response_spec.rb
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/client_spec.rb
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/default_search.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/default_search_index.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/excerpt_custom.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/excerpt_default.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/excerpt_flags.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/field_weights.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/filter.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/filter_exclude.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/filter_float_range.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/filter_float_range_exclude.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/filter_range.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/filter_range_exclude.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/filter_range_int64.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/filter_ranges.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/filters.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/filters_different.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/geo_anchor.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/group_by_attr.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/group_by_attrpair.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/group_by_day.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/group_by_day_sort.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/group_by_month.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/group_by_week.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/group_by_year.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/group_distinct.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/id_range.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/id_range64.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/index_weights.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/keywords.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/limits.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/limits_cutoff.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/limits_max.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/limits_max_cutoff.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/match_all.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/match_any.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/match_boolean.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/match_extended.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/match_extended2.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/match_fullscan.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/match_phrase.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/max_query_time.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/miltiple_queries.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/ranking_bm25.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/ranking_none.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/ranking_proximity.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/ranking_proximity_bm25.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/ranking_wordcount.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/retries.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/retries_delay.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/select.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/set_override.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/sort_attr_asc.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/sort_attr_desc.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/sort_expr.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/sort_extended.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/sort_relevance.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/sort_time_segments.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/sphinxapi.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/update_attributes.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/update_attributes_mva.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/weights.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/sphinx/sphinx-id64.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/sphinx/sphinx.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/sphinx/sphinx_test.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/sphinx.yml.tpl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/tasks/sphinx.rake
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/test.rb
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/sphinxapi.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/sphinxapi.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/test.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/test.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/test2.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/test2.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example.sql



More information about the Midnightbsd-cvs mailing list