ports/127730: [maintainer] textproc/sphinxsearch 64 bit ID support, expat handling

[Matthew Seaman]

>Number:         127730
>Category:       ports
>Synopsis:       [maintainer] textproc/sphinxsearch 64 bit ID support, expat handling
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 29 21:40:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Matthew Seaman
>Release:        FreeBSD 7.1-PRERELEASE i386
>Organization:
Infracaninophile
>Environment:
System: FreeBSD happy-idiot-talk.infracaninophile.co.uk 7.1-PRERELEASE FreeBSD 7.1-PRERELEASE #45: Sun Sep 21 18:18:24 BST 2008 root at happy-idiot-talk.infracaninophile.co.uk:/usr/obj/usr/src/sys/HAPPY-IDIOT-TALK i386


	
>Description:

Two things:

  * Add an ID64 knob to toggle support for 64 bit identifiers
    in sphinxsearch.

  * Force library dependency on expat.  The configure script will
    automatically add expat support if it detects it on the system,
    and there's no way of overriding that.  Means that previously,
    when installed from a binary package built on the cluster, there
    was no expat support compiled in, but when compiled from source
    there frequently would be. Therefore, for consistencies' sake,
    always depend on expat.

>How-To-Repeat:
	
>Fix:

	

--- sphinxsearch.diff begins here ---
diff -Nur /usr/ports/textproc/sphinxsearch/Makefile sphinxsearch/Makefile
--- /usr/ports/textproc/sphinxsearch/Makefile	2008-08-21 19:20:23.000000000 +0100
+++ sphinxsearch/Makefile	2008-09-29 22:12:41.000000000 +0100
@@ -6,9 +6,11 @@
 #
 # 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=	0.9.8
+PORTREVISION=	2
 CATEGORIES=	textproc databases
 MASTER_SITES=	http://www.sphinxsearch.com/downloads/
 DISTNAME=	sphinx-${PORTVERSION}
@@ -18,10 +20,19 @@
 
 CONFLICTS=	sphinxsearch-devel-[0-9]*
 
-OPTIONS=	MYSQL            "MySQL support"                   on  \
-		PGSQL            "PostgreSQL support"              off \
-		ICONV		 "Iconv support"		   on  \
-		OPTIMIZED_CFLAGS "Use compiler optimization (-O3)" off
+# 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=	expat.6:${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
+
+## FFR
+##		LIBSTEMMER	 "compile with libstemmer support"  off
 
 SPHINX_USR?=	_sphinx
 SPHINX_UID?=	312
@@ -88,6 +99,30 @@
 CXXFLAGS+=		-O3 -fomit-frame-pointer
 .endif
 
+# 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
+
+## 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
+
 # Fix up the sample configuration file to correspond to FreeBSD norms
 
 post-patch:
--- sphinxsearch.diff ends here ---


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