Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 29 Dec 2011 12:46:21 GMT
From:      Matthew Seaman <m.seaman@infracaninophile.co.uk>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/163693: [maintainer] textproc/sphinxsearch -- update to 2.0.3
Message-ID:  <201112291246.pBTCkLtR092793@lucid-nonsense.infracaninophile.co.uk>
Resent-Message-ID: <201112291250.pBTCoCUv024193@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         163693
>Category:       ports
>Synopsis:       [maintainer] textproc/sphinxsearch -- update to 2.0.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Dec 29 12:50:11 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Matthew Seaman
>Release:        FreeBSD 8.2-STABLE amd64
>Organization:
Infracaninophile
>Environment:
System: FreeBSD lucid-nonsense.infracaninophile.co.uk 8.2-STABLE FreeBSD 8.2-STABLE #0 r228845: Fri Dec 23 19:13:12 GMT 2011 root@lucid-nonsense.infracaninophile.co.uk:/usr/obj/usr/src/sys/LUCID-NONSENSE amd64


	
>Description:

* Update to version 2.0.3

 -- Announcement:

   http://sphinxsearch.com/news/49

 -- New OPTION 'WITH_SYSLOG' to enable syslog support (on by default)

 -- ChangeLog:

   http://sphinxsearch.com/docs/2.0.2/rel202.html

* Drop the pkg-message: the change to the default port numbers happened 
  long ago now, and this is no longer relevant.

* Whitespace fixup in Makefile -- use tabs consistently.

* Update pkg-message with descriptive text from sphinxsearch.com website.

Note in passing: this will make textproc/sphinxsearch leapfrog
available version of textproc/sphinxsearch-devel.  

>How-To-Repeat:
	
>Fix:

	

--- sphinxsearch.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/sphinxsearch/Makefile,v
retrieving revision 1.17
diff -u -u -r1.17 Makefile
--- Makefile	30 Sep 2011 19:38:14 -0000	1.17
+++ Makefile	29 Dec 2011 10:44:45 -0000
@@ -1,6 +1,6 @@
 # New ports collection makefile for:  Sphinx full-text search engine
-# Date created:         12 November 2006
-# Whom:                 Matthew Seaman <m.seaman@infracaninophile.co.uk>
+# Date created:		12 November 2006
+# Whom:			Matthew Seaman <m.seaman@infracaninophile.co.uk>
 #
 # $FreeBSD: ports/textproc/sphinxsearch/Makefile,v 1.17 2011/09/30 19:38:14 crees Exp $
 #
@@ -9,11 +9,10 @@
 # See http://www.infracaninophile.co.uk/articles/sphinxse.html
 
 PORTNAME=	sphinxsearch
-PORTVERSION=	0.9.9
-PORTREVISION=	2
+PORTVERSION=	2.0.3
 CATEGORIES=	textproc databases
 MASTER_SITES=	http://sphinxsearch.com/files/
-DISTNAME=	sphinx-${PORTVERSION}
+DISTNAME=	sphinx-${PORTVERSION}-release
 
 MAINTAINER=	m.seaman@infracaninophile.co.uk
 COMMENT=	Sphinx Full-Text Search Engine
@@ -22,18 +21,19 @@
 
 # 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.
+# of turning this off.  So for consistency, make sure it's always on.
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
-OPTIONS=	MYSQL            "MySQL support"                    on  \
-		PGSQL            "PostgreSQL support"               off \
-		ICONV		 "Iconv support"		    on  \
+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
+		UNIXODBC	 "unixODBC support"		    off \
+		SYSLOG		 "enable logging via syslog"	    on
 
 ## FFR
-##		LIBSTEMMER	 "compile with libstemmer support"  off
+##	       LIBSTEMMER	"compile with libstemmer support"  off
 
 CONFLICTS=	sphinxsearch-devel-[0-9]*
 
@@ -81,17 +81,24 @@
 CONFIGURE_ARGS+=	--without-unixodbc
 .endif
 
-## 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.
+.if defined(WITH_SYSLOG) && !defined(WITHOUT_SYSLOG)
+CONFIGURE_ARGS+=	--with-syslog
+.else
+CONFIGURE_ARGS+=	--without-syslog
+.endif
+
+## 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.
+## # 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
@@ -112,8 +119,8 @@
 CPPFLAGS+=	${CXXFLAGS}
 CFGFILE=	${PREFIX}/etc/sphinx.conf
 USE_RC_SUBR=	sphinxsearch.sh
-SUB_LIST+=	PORTNAME=${PORTNAME}     \
-		CFGFILE=${CFGFILE}       \
+SUB_LIST+=	PORTNAME=${PORTNAME}	 \
+		CFGFILE=${CFGFILE}	 \
 		SPHINX_USR=${USERS}	 \
 		SPHINX_GRP=${GROUPS}	 \
 		SPHINX_DIR=${SPHINX_DIR} \
@@ -134,20 +141,20 @@
 
 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
 
 do-install: install-bin install-docs install-examples
 
 install-bin:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/indexer ${PREFIX}/bin/indexer
-	${INSTALL_PROGRAM} ${WRKSRC}/src/search  ${PREFIX}/bin/search
+	${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_DATA}    ${WRKSRC}/sphinx.conf.dist ${CFGFILE}.sample
+	${INSTALL_DATA}	   ${WRKSRC}/sphinx.conf.dist ${CFGFILE}.sample
 
 install-docs:
 .if !defined(NOPORTDOCS)
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/textproc/sphinxsearch/distinfo,v
retrieving revision 1.7
diff -u -u -r1.7 distinfo
--- distinfo	15 Jan 2011 15:27:17 -0000	1.7
+++ distinfo	29 Dec 2011 10:44:45 -0000
@@ -1,2 +1,2 @@
-SHA256 (sphinx-0.9.9.tar.gz) = bf8f55ffc095ff6b628f0cbc7eb54761811140140679a1c869cc1b17c42803e4
-SIZE (sphinx-0.9.9.tar.gz) = 1218359
+SHA256 (sphinx-2.0.3-release.tar.gz) = 875af63473875b7c7e152e85ed34bd1a92d09db062a289b594bf049b3a8c82dd
+SIZE (sphinx-2.0.3-release.tar.gz) = 1923911
Index: pkg-descr
===================================================================
RCS file: /home/ncvs/ports/textproc/sphinxsearch/pkg-descr,v
retrieving revision 1.1
diff -u -u -r1.1 pkg-descr
--- pkg-descr	18 Nov 2006 22:54:06 -0000	1.1
+++ pkg-descr	29 Dec 2011 10:44:45 -0000
@@ -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/
Index: pkg-message
===================================================================
RCS file: pkg-message
diff -N pkg-message
--- pkg-message	3 Dec 2009 09:07:28 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -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
--- sphinxsearch.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201112291246.pBTCkLtR092793>