Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 15 Jul 2008 23:29:55 +0100 (BST)
From:      Matthew Seaman <m.seaman@infracaninophile.co.uk>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/125656: [maintainer] textproc/sphinxsearch -- update to 0.9.8
Message-ID:  <200807152229.m6FMTt91036303@happy-idiot-talk.infracaninophile.co.uk>
Resent-Message-ID: <200807152240.m6FMe2Nl038701@freefall.freebsd.org>

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

>Number:         125656
>Category:       ports
>Synopsis:       [maintainer] textproc/sphinxsearch -- update to 0.9.8
>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:   Tue Jul 15 22:40:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Matthew Seaman
>Release:        FreeBSD 7.0-STABLE i386
>Organization:
Infracaninophile
>Environment:
System: FreeBSD happy-idiot-talk.infracaninophile.co.uk 7.0-STABLE FreeBSD 7.0-STABLE #39: Thu Jun 19 21:16:44 BST 2008 root@happy-idiot-talk.infracaninophile.co.uk:/usr/obj/usr/src/sys/HAPPY-IDIOT-TALK i386


	
>Description:

The long awaited stable release 0.9.8 of sphinxsearch.

Changes to the port include:

   * files/patch-src-sphinxsearch.h removed -- incorporated upstream
   * add new option to control linking against libiconv
   * correct use of NOPORTDOC vs. NOPORTEXAMPLES
   * dynamically generate the list of example files installed
   * now includes additional API examples for ruby, python and java


>How-To-Repeat:
	
>Fix:

	

--- sphinxsearch.diff begins here ---
diff -Nur /usr/ports/textproc/sphinxsearch/Makefile sphinxsearch/Makefile
--- /usr/ports/textproc/sphinxsearch/Makefile	2008-01-19 12:05:53.000000000 +0000
+++ sphinxsearch/Makefile	2008-07-15 23:16:56.000000000 +0100
@@ -8,8 +8,7 @@
 # this port.  You need a patched version of mysql server for that.
 
 PORTNAME=	sphinxsearch
-PORTVERSION=	0.9.7
-PORTREVISION=	1
+PORTVERSION=	0.9.8
 CATEGORIES=	textproc databases
 MASTER_SITES=	http://www.sphinxsearch.com/downloads/
 DISTNAME=	sphinx-${PORTVERSION}
@@ -21,6 +20,7 @@
 
 OPTIONS=	MYSQL            "MySQL support"                   on  \
 		PGSQL            "PostgreSQL support"              off \
+		ICONV		 "Iconv support"		   on  \
 		OPTIMIZED_CFLAGS "Use compiler optimization (-O3)" off
 
 SPHINX_USR?=	_sphinx
@@ -50,8 +50,12 @@
 		SPHINX_LOG=${SPHINX_LOG}
 SUB_FILES+=	pkg-install pkg-deinstall
 
+.if !defined(NOPORTEXAMPLES)
+EXAMPLES=	example.sql api
+PORTEXAMPLES=	*
+.endif
+
 .if !defined(NOPORTDOCS)
-EXAMPLES=	example.sql api/sphinxapi.php api/test.php api/test2.php
 DOCS=		doc/sphinx.css doc/sphinx.html doc/sphinx.txt doc/sphinx.xml
 .endif
 
@@ -74,6 +78,13 @@
 CONFIGURE_ARGS+=	--without-pgsql
 .endif
 
+.if defined(WITH_ICONV) && !defined(WITHOUT_ICONV)
+CONFIGURE_ARGS+=	--with-iconv
+LIB_DEPENDS+=		iconv:${PORTSDIR}/converters/libiconv
+.else
+CONFIGURE_ARGS+=	--without-iconv
+.endif
+
 .if defined(WITH_OPTIMIZED_CFLAGS)
 CXXFLAGS+=		-O3 -fomit-frame-pointer
 .endif
@@ -108,10 +119,10 @@
 .endif
 
 install-examples:
-.if !defined(NOPORTDOCS)
+.if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${EXAMPLESDIR}
 .for example in ${EXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/${example} ${EXAMPLESDIR}
+	@cd ${WRKSRC} && ${COPYTREE_SHARE} ${example} ${EXAMPLESDIR}
 .endfor
 .endif
 
diff -Nur /usr/ports/textproc/sphinxsearch/distinfo sphinxsearch/distinfo
--- /usr/ports/textproc/sphinxsearch/distinfo	2007-04-15 20:07:30.000000000 +0100
+++ sphinxsearch/distinfo	2008-07-15 21:15:07.000000000 +0100
@@ -1,3 +1,3 @@
-MD5 (sphinx-0.9.7.tar.gz) = 32f2b7e98d8485c86108851d52c5cef4
-SHA256 (sphinx-0.9.7.tar.gz) = 6c841b9042f880394858dd0373a1e3343c30e815422671ba3872691326c1c0a4
-SIZE (sphinx-0.9.7.tar.gz) = 344500
+MD5 (sphinx-0.9.8.tar.gz) = 347e547b79b733778d7553ede34e0aac
+SHA256 (sphinx-0.9.8.tar.gz) = 86de861550fc7b119b3cbe63a34bad32ac771f44c930d229775ac124c83571d9
+SIZE (sphinx-0.9.8.tar.gz) = 728864
diff -Nur /usr/ports/textproc/sphinxsearch/files/patch-src-sphinxsearch.h sphinxsearch/files/patch-src-sphinxsearch.h
--- /usr/ports/textproc/sphinxsearch/files/patch-src-sphinxsearch.h	2007-06-04 08:24:48.000000000 +0100
+++ sphinxsearch/files/patch-src-sphinxsearch.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,13 +0,0 @@
---- src/sphinxstd.h.orig	Tue May 29 19:50:47 2007
-+++ src/sphinxstd.h	Tue May 29 19:52:23 2007
-@@ -57,9 +57,7 @@
- #error "Internal 64-bit integer macros already defined."
- #endif
- 
--#if __STDC_VERSION__>=199901L || __STDC_VERSION>=199901L || defined(_STDINT_H) || defined(_STDINT_H_)
--#include <stdint.h>
--#else // no stdint.h
-+#if !HAVE_STDINT_H
- 
- #if defined(_MSC_VER)
- typedef __int64 int64_t;
diff -Nur /usr/ports/textproc/sphinxsearch/pkg-plist sphinxsearch/pkg-plist
--- /usr/ports/textproc/sphinxsearch/pkg-plist	2006-11-18 22:54:06.000000000 +0000
+++ sphinxsearch/pkg-plist	2008-07-15 23:14:18.000000000 +0100
@@ -8,9 +8,4 @@
 %%PORTDOCS%%%%DOCSDIR%%/sphinx.html
 %%PORTDOCS%%%%DOCSDIR%%/sphinx.txt
 %%PORTDOCS%%%%DOCSDIR%%/sphinx.xml
-%%PORTDOCS%%%%EXAMPLESDIR%%/example.sql
-%%PORTDOCS%%%%EXAMPLESDIR%%/sphinxapi.php
-%%PORTDOCS%%%%EXAMPLESDIR%%/test.php
-%%PORTDOCS%%%%EXAMPLESDIR%%/test2.php
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
--- 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?200807152229.m6FMTt91036303>