Attachment 205868 Details for Bug 239283 – Updates port to 3.1.1

[patch] Updates port to 3.1.1

sphinxsearch-3.1.1.patch (text/plain), 11.83 KB, created by Daniel Ylitalo on 2019-07-18 15:20:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Ylitalo

Created: 2019-07-18 15:20:14 UTC

Size: 11.83 KB

patch

obsolete

>Index: textproc/Makefile
>===================================================================
>--- textproc/Makefile	(revision 506850)
>+++ textproc/Makefile	(working copy)
>@@ -1705,6 +1705,7 @@
>     SUBDIR += sowing
>     SUBDIR += spellutils
>     SUBDIR += sphinxsearch
>+    SUBDIR += sphinxsearch2
>     SUBDIR += sphinxsearch-devel
>     SUBDIR += spiff
>     SUBDIR += splitpatch
>Index: textproc/sphinxsearch/Makefile
>===================================================================
>--- textproc/sphinxsearch/Makefile	(revision 506850)
>+++ textproc/sphinxsearch/Makefile	(working copy)
>@@ -6,13 +6,10 @@
> # See http://www.infracaninophile.co.uk/articles/sphinxse.html
> 
> PORTNAME=	sphinxsearch
>-PORTVERSION=	2.2.11
>-PORTREVISION=	2
>+PORTVERSION=	3.1.1
> CATEGORIES=	textproc databases
>-MASTER_SITES=	http://sphinxsearch.com/files/ \
>-		http://snowball.tartarus.org/dist/:libstemmer
>-DISTNAME=	sphinx-${PORTVERSION}-release
>-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
>+MASTER_SITES=	http://www.sphinxsearch.com/files/
>+DISTNAME=	sphinx-${PORTVERSION}-612d99f-freebsd-amd64
> 
> MAINTAINER=	matthew@FreeBSD.org
> COMMENT=	Sphinx Full-Text Search Engine
>@@ -19,76 +16,14 @@
> 
> LICENSE=	GPLv2
> 
>-# 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:textproc/expat2
>+OPTIONS_DEFINE=	ICONV MYSQL PGSQL DOCS EXAMPLES
>+OPTIONS_DEFAULT=ICONV MYSQL
> 
>-OPTIONS_DEFINE=	ICONV ID64 LIBSTEMMER MYSQL OPTIMIZED_CFLAGS PGSQL \
>-		RE2 SYSLOG UNIXODBC DOCS EXAMPLES
>-OPTIONS_DEFAULT=ICONV ID64 MYSQL SYSLOG
>-
>-ICONV_CONFIGURE_WITH=	iconv
> ICONV_USES=		iconv
>-ICONV_LDFLAGS=		${ICONV_LIB}
>-
>-# 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
>-
>-# 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.
>-
>-MYSQL_CONFIGURE_WITH=	mysql
>-MYSQL_CONFIGURE_ON=	--with-mysql-includes=${LOCALBASE}/include/mysql \
>-			--with-mysql-libs=${LOCALBASE}/lib/mysql
> MYSQL_USES=		mysql
>-
>-OPTIMIZED_CFLAGS_CXXFLAGS=-O3 -fomit-frame-pointer
>-
>-PGSQL_CONFIGURE_WITH=	pgsql
>-PGSQL_CONFIGURE_ON=	--with-pgsql-includes=${LOCALBASE}/include \
>-			--with-pgsql-libs=${LOCALBASE}/lib
> PGSQL_USES=		pgsql
> 
>-# Why does this insist on linking against the libre2.a static library?
>-
>-RE2_DESC=		Enable re2 regular expression library
>-RE2_CONFIGURE_WITH=	re2
>-RE2_BUILD_DEPENDS=	${LOCALBASE}/lib/libre2.a:devel/re2
>-RE2_BROKEN=		Bad C++ code in re2.h
>-
>-SYSLOG_DESC=		Enable logging via syslog
>-SYSLOG_CONFIGURE_WITH=	syslog
>-
>-UNIXODBC_CONFIGURE_WITH=unixodbc
>-UNIXODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
>-
>-CONFLICTS=	sphinxsearch-devel-[0-9]* dpsearch-[0-9]* rdb-[0-9]* \
>+CONFLICTS=	sphinxsearch2 sphinxsearch-devel-[0-9]* dpsearch-[0-9]* rdb-[0-9]* \
> 		swish++-[0-9]* xaira-[0-9]*
> 
> USERS?=		_sphinx
>@@ -98,11 +33,9 @@
> SPHINX_RUN?=	/var/run/${PORTNAME}
> SPHINX_LOG?=	/var/log/${PORTNAME}
> 
>-# Yes, the conflation of CPPFLAGS and CXXFLAGS is deliberate.  No,
>-# don't ask.
>+NO_BUILD=	yes
>+WRKSRC=		${WRKDIR}/sphinx-${PORTVERSION}
> 
>-GNU_CONFIGURE=	yes
>-CPPFLAGS+=	${CXXFLAGS}
> CFGFILE=	${PREFIX}/etc/sphinx.conf
> USE_RC_SUBR=	sphinxsearch
> SUB_LIST+=	PORTNAME=${PORTNAME}	 \
>@@ -114,20 +47,13 @@
> 		SPHINX_LOG=${SPHINX_LOG}
> SUB_FILES+=	pkg-deinstall
> 
>-BINS=		indexer indextool spelldump wordbreaker
>+BINS=		indexer indextool wordbreaker
> 
>-EXAMPLES=	example.sql api
>+EXAMPLES=	etc/example.sql api src misc
> 
>-DOCS=		doc/sphinx.css doc/sphinx.html doc/sphinx.txt doc/sphinx.xml \
>-		sphinx-min.conf.dist
>+DOCS=		doc/sphinx3.md doc/sphinx3.html etc/sphinx-min.conf.dist
> DOCSRC=		${WRKSRC}/doc
> 
>-MAN1SRC=	indexer.1 indextool.1 spelldump.1
>-MAN8SRC=	searchd.8
>-
>-post-extract-LIBSTEMMER-on:
>-	@( cd ${WRKDIR} && ${COPYTREE_SHARE} ${LIBSTEMMER_DISTNAME} ${WRKSRC} )
>-
> # Fix up the sample configuration file to correspond to FreeBSD norms
> post-patch:
> 	@${REINPLACE_CMD} \
>@@ -135,25 +61,14 @@
> 	    -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}!"				   \
>-	    ${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
>+	    ${WRKSRC}/etc/sphinx.conf.dist
> 
> do-install:
> .for bin in ${BINS}
>-	${INSTALL_PROGRAM} ${WRKSRC}/src/${bin} ${STAGEDIR}${PREFIX}/bin/${bin}
>+	${INSTALL_PROGRAM} ${WRKSRC}/bin/${bin} ${STAGEDIR}${PREFIX}/bin/${bin}
> .endfor
>-	${INSTALL_PROGRAM} ${WRKSRC}/src/searchd ${STAGEDIR}${PREFIX}/sbin/searchd
>-	${INSTALL_DATA}	   ${WRKSRC}/sphinx.conf.dist ${STAGEDIR}${CFGFILE}.sample
>-.for man in ${MAN1SRC}
>-	${INSTALL_MAN} ${DOCSRC}/${man} ${STAGEDIR}${MANPREFIX}/man/man1/${man}
>-.endfor
>-.for man in ${MAN8SRC}
>-	${INSTALL_MAN} ${DOCSRC}/${man} ${STAGEDIR}${MANPREFIX}/man/man8/${man}
>-.endfor
>+	${INSTALL_PROGRAM} ${WRKSRC}/bin/searchd ${STAGEDIR}${PREFIX}/sbin/searchd
>+	${INSTALL_DATA}	   ${WRKSRC}/etc/sphinx.conf.dist ${STAGEDIR}${CFGFILE}.sample
> 
> do-install-DOCS-on:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>Index: textproc/sphinxsearch/distinfo
>===================================================================
>--- textproc/sphinxsearch/distinfo	(revision 506850)
>+++ textproc/sphinxsearch/distinfo	(working copy)
>@@ -1,5 +1,3 @@
>-TIMESTAMP = 1469637573
>-SHA256 (sphinx-2.2.11-release.tar.gz) = 6662039f093314f896950519fa781bc87610f926f64b3d349229002f06ac41a9
>-SIZE (sphinx-2.2.11-release.tar.gz) = 3061998
>-SHA256 (libstemmer_c.tgz) = 6530c3638f29f5b03bc3786bb9212e39adaf3bf15b5b0a483b2eb5111f7f416e
>-SIZE (libstemmer_c.tgz) = 129584
>+TIMESTAMP = 1563454340
>+SHA256 (sphinx-3.1.1-612d99f-freebsd-amd64.tar.gz) = 65c8cc3736637d878b5e99db428f7ff19d8d2ed17ef8aed18af509905f663c66
>+SIZE (sphinx-3.1.1-612d99f-freebsd-amd64.tar.gz) = 24533075
>Index: textproc/sphinxsearch/pkg-plist
>===================================================================
>--- textproc/sphinxsearch/pkg-plist	(revision 506850)
>+++ textproc/sphinxsearch/pkg-plist	(working copy)
>@@ -1,18 +1,11 @@
> bin/indexer
> bin/indextool
>-bin/spelldump
> bin/wordbreaker
> @sample etc/sphinx.conf.sample
>-man/man1/indexer.1.gz
>-man/man1/indextool.1.gz
>-man/man1/spelldump.1.gz
>-man/man8/searchd.8.gz
> sbin/searchd
> %%PORTDOCS%%%%DOCSDIR%%/sphinx-min.conf.dist
>-%%PORTDOCS%%%%DOCSDIR%%/sphinx.css
>-%%PORTDOCS%%%%DOCSDIR%%/sphinx.html
>-%%PORTDOCS%%%%DOCSDIR%%/sphinx.txt
>-%%PORTDOCS%%%%DOCSDIR%%/sphinx.xml
>+%%PORTDOCS%%%%DOCSDIR%%/sphinx3.html
>+%%PORTDOCS%%%%DOCSDIR%%/sphinx3.md
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/java/MANIFEST.MF
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/java/Makefile
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/java/README
>@@ -133,4 +126,15 @@
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/test.py
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/test2.php
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/test2.py
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example.sql
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/etc/example.sql
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/raminfo.py
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/resolve.py
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/search_json_pretty.php
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/searchd
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/suggest/README
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/suggest/suggest.conf
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/suggest/suggest.php
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/wordbreak.pl
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/sphinxudf.c
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/sphinxudf.h
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/udfexample.c
>Index: textproc/sphinxsearch2/Makefile
>===================================================================
>--- textproc/sphinxsearch2/Makefile	(revision 506850)
>+++ textproc/sphinxsearch2/Makefile	(working copy)
>@@ -7,10 +7,10 @@
> 
> PORTNAME=	sphinxsearch
> PORTVERSION=	2.2.11
>-PORTREVISION=	2
> CATEGORIES=	textproc databases
> MASTER_SITES=	http://sphinxsearch.com/files/ \
> 		http://snowball.tartarus.org/dist/:libstemmer
>+PKGNAMESUFFIX=	2
> DISTNAME=	sphinx-${PORTVERSION}-release
> DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
> 
>@@ -88,8 +88,8 @@
> UNIXODBC_CONFIGURE_WITH=unixodbc
> UNIXODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
> 
>-CONFLICTS=	sphinxsearch-devel-[0-9]* dpsearch-[0-9]* rdb-[0-9]* \
>-		swish++-[0-9]* xaira-[0-9]*
>+CONFLICTS=	sphinxsearch sphinxsearch-devel-[0-9]* dpsearch-[0-9]* \
>+		rdb-[0-9]* swish++-[0-9]* xaira-[0-9]*
> 
> USERS?=		_sphinx
> GROUPS?=	_sphinx
>Index: textproc/sphinxsearch2/distinfo
>===================================================================
>Index: textproc/sphinxsearch2/files/patch-src_llsphinxjson.c
>===================================================================
>Index: textproc/sphinxsearch2/files/patch-src_llsphinxql.c
>===================================================================
>Index: textproc/sphinxsearch2/files/patch-src_searchd.cpp
>===================================================================
>Index: textproc/sphinxsearch2/files/patch-src_sphinx.cpp
>===================================================================
>Index: textproc/sphinxsearch2/files/patch-src_sphinx.h
>===================================================================
>Index: textproc/sphinxsearch2/files/patch-src_sphinxaot.cpp
>===================================================================
>Index: textproc/sphinxsearch2/files/patch-src_sphinxint.h
>===================================================================
>Index: textproc/sphinxsearch2/files/patch-src_sphinxplugin.cpp
>===================================================================
>Index: textproc/sphinxsearch2/files/patch-src_sphinxrt.cpp
>===================================================================
>Index: textproc/sphinxsearch2/files/patch-src_sphinxsort.cpp
>===================================================================
>Index: textproc/sphinxsearch2/files/patch-src_sphinxstd.h
>===================================================================
>Index: textproc/sphinxsearch2/files/patch-src_sphinxstemen.cpp
>===================================================================
>Index: textproc/sphinxsearch2/files/patch-src_sphinxstemru.inl
>===================================================================
>Index: textproc/sphinxsearch2/files/patch-src_sphinxutils.cpp
>===================================================================
>Index: textproc/sphinxsearch2/files/pkg-deinstall.in
>===================================================================
>Index: textproc/sphinxsearch2/files/sphinxsearch.in
>===================================================================
>Index: textproc/sphinxsearch2/pkg-descr
>===================================================================
>Index: textproc/sphinxsearch2/pkg-plist
>===================================================================

Actions: View | Diff

Attachments on bug 239283: 205868 | 205874