From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Sep 29 21:40:02 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 01F3C10656A0 for ; Mon, 29 Sep 2008 21:40:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id CC0628FC27 for ; Mon, 29 Sep 2008 21:40:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m8TLe18B097623 for ; Mon, 29 Sep 2008 21:40:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m8TLe1OR097622; Mon, 29 Sep 2008 21:40:01 GMT (envelope-from gnats) Resent-Date: Mon, 29 Sep 2008 21:40:01 GMT Resent-Message-Id: <200809292140.m8TLe1OR097622@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Matthew Seaman Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6091E10656A0 for ; Mon, 29 Sep 2008 21:32:27 +0000 (UTC) (envelope-from m.seaman@infracaninophile.co.uk) Received: from smtp.infracaninophile.co.uk (gate6.infracaninophile.co.uk [IPv6:2001:8b0:151:1::1]) by mx1.freebsd.org (Postfix) with ESMTP id D4F9F8FC13 for ; Mon, 29 Sep 2008 21:32:26 +0000 (UTC) (envelope-from m.seaman@infracaninophile.co.uk) Received: from happy-idiot-talk.infracaninophile.co.uk (localhost [IPv6:::1]) by smtp.infracaninophile.co.uk (8.14.3/8.14.3) with ESMTP id m8TLWIED048100 for ; Mon, 29 Sep 2008 22:32:18 +0100 (BST) (envelope-from matthew@happy-idiot-talk.infracaninophile.co.uk) Received: (from matthew@localhost) by happy-idiot-talk.infracaninophile.co.uk (8.14.3/8.14.3/Submit) id m8TLWIhE048099; Mon, 29 Sep 2008 22:32:18 +0100 (BST) (envelope-from matthew) Message-Id: <200809292132.m8TLWIhE048099@happy-idiot-talk.infracaninophile.co.uk> Date: Mon, 29 Sep 2008 22:32:18 +0100 (BST) From: Matthew Seaman To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/127730: [maintainer] textproc/sphinxsearch 64 bit ID support, expat handling X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Matthew Seaman List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Sep 2008 21:40:02 -0000 >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@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: