Attachment #205868 for bug #239283

Lines 1705-1710 Link Here

(-)textproc/Makefile (+1 lines)
1705	SUBDIR += sowing	1705	SUBDIR += sowing
1706	SUBDIR += spellutils	1706	SUBDIR += spellutils
1707	SUBDIR += sphinxsearch	1707	SUBDIR += sphinxsearch
		1708	SUBDIR += sphinxsearch2
1708	SUBDIR += sphinxsearch-devel	1709	SUBDIR += sphinxsearch-devel
1709	SUBDIR += spiff	1710	SUBDIR += spiff
1710	SUBDIR += splitpatch	1711	SUBDIR += splitpatch




# See http://www.infracaninophile.co.uk/articles/sphinxse.html

PORTNAME=	sphinxsearch
PORTVERSION=	3.1.1
PORTREVISION=	2
CATEGORIES=	textproc databases
MASTER_SITES=	http://www.sphinxsearch.com/files/
DISTNAME=	sphinx-${PORTVERSION}-612d99f-freebsd-amd64
DISTNAME=	sphinx-${PORTVERSION}-release
DISTFILES=	${DISTNAME}${EXTRACT_SUFX}

MAINTAINER=	matthew@FreeBSD.org
COMMENT=	Sphinx Full-Text Search Engine


LICENSE=	GPLv2

OPTIONS_DEFINE=	ICONV MYSQL PGSQL DOCS EXAMPLES
OPTIONS_DEFAULT=ICONV MYSQL
# of turning this off.  So for consistency, make sure it's always on.
LIB_DEPENDS=	libexpat.so:textproc/expat2

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

CONFLICTS=	sphinxsearch2 sphinxsearch-devel-[0-9]* dpsearch-[0-9]* rdb-[0-9]* \

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]* \
		swish++-[0-9]* xaira-[0-9]*

USERS?=		_sphinx

SPHINX_RUN?=	/var/run/${PORTNAME}
SPHINX_LOG?=	/var/log/${PORTNAME}

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}	 \

		SPHINX_LOG=${SPHINX_LOG}
SUB_FILES+=	pkg-deinstall

BINS=		indexer indextool wordbreaker

EXAMPLES=	etc/example.sql api src misc

DOCS=		doc/sphinx3.md doc/sphinx3.html etc/sphinx-min.conf.dist
		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} \

	    -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}/etc/sphinx.conf.dist
	${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

do-install:
.for bin in ${BINS}
	${INSTALL_PROGRAM} ${WRKSRC}/bin/${bin} ${STAGEDIR}${PREFIX}/bin/${bin}
.endfor
	${INSTALL_PROGRAM} ${WRKSRC}/bin/searchd ${STAGEDIR}${PREFIX}/sbin/searchd
	${INSTALL_DATA}	   ${WRKSRC}/etc/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

do-install-DOCS-on:
	@${MKDIR} ${STAGEDIR}${DOCSDIR}

Lines 1-5 Link Here

(-)textproc/sphinxsearch/distinfo (-5 / +3 lines)
1	TIMESTAMP = 1469637573	1	TIMESTAMP = 1563454340
2	SHA256 (sphinx-2.2.11-release.tar.gz) = 6662039f093314f896950519fa781bc87610f926f64b3d349229002f06ac41a9	2	SHA256 (sphinx-3.1.1-612d99f-freebsd-amd64.tar.gz) = 65c8cc3736637d878b5e99db428f7ff19d8d2ed17ef8aed18af509905f663c66
3	SIZE (sphinx-2.2.11-release.tar.gz) = 3061998	3	SIZE (sphinx-3.1.1-612d99f-freebsd-amd64.tar.gz) = 24533075
4	SHA256 (libstemmer_c.tgz) = 6530c3638f29f5b03bc3786bb9212e39adaf3bf15b5b0a483b2eb5111f7f416e
5	SIZE (libstemmer_c.tgz) = 129584




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%%/sphinx3.html
%%PORTDOCS%%%%DOCSDIR%%/sphinx3.md
%%PORTDOCS%%%%DOCSDIR%%/sphinx.txt
%%PORTDOCS%%%%DOCSDIR%%/sphinx.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/java/MANIFEST.MF
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/java/Makefile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/java/README

%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/test.py
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/test2.php
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/test2.py
%%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





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}


UNIXODBC_CONFIGURE_WITH=unixodbc
UNIXODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC

CONFLICTS=	sphinxsearch sphinxsearch-devel-[0-9]* dpsearch-[0-9]* \
		rdb-[0-9]* swish++-[0-9]* xaira-[0-9]*

USERS?=		_sphinx
GROUPS?=	_sphinx

Return to bug 239283

Lines 6-18 Link Here

(-)textproc/sphinxsearch/Makefile (-100 / +15 lines)
6	# See http://www.infracaninophile.co.uk/articles/sphinxse.html	6	# See http://www.infracaninophile.co.uk/articles/sphinxse.html
7		7
8	PORTNAME= sphinxsearch	8	PORTNAME= sphinxsearch
9	PORTVERSION= 2.2.11	9	PORTVERSION= 3.1.1
10	PORTREVISION= 2
11	CATEGORIES= textproc databases	10	CATEGORIES= textproc databases
12	MASTER_SITES= http://sphinxsearch.com/files/ \	11	MASTER_SITES= http://www.sphinxsearch.com/files/
13	http://snowball.tartarus.org/dist/:libstemmer	12	DISTNAME= sphinx-${PORTVERSION}-612d99f-freebsd-amd64
14	DISTNAME= sphinx-${PORTVERSION}-release
15	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
16		13
17	MAINTAINER= matthew@FreeBSD.org	14	MAINTAINER= matthew@FreeBSD.org
18	COMMENT= Sphinx Full-Text Search Engine	15	COMMENT= Sphinx Full-Text Search Engine
Lines 19-94 Link Here
19		16
20	LICENSE= GPLv2	17	LICENSE= GPLv2
21		18
22	# If expat is present on the system and configure finds it, it will	19	OPTIONS_DEFINE= ICONV MYSQL PGSQL DOCS EXAMPLES
23	# unconditionally link the output binary against it. There's no way	20	OPTIONS_DEFAULT=ICONV MYSQL
24	# of turning this off. So for consistency, make sure it's always on.
25	LIB_DEPENDS= libexpat.so:textproc/expat2
26		21
27	OPTIONS_DEFINE= ICONV ID64 LIBSTEMMER MYSQL OPTIMIZED_CFLAGS PGSQL \
28	RE2 SYSLOG UNIXODBC DOCS EXAMPLES
29	OPTIONS_DEFAULT=ICONV ID64 MYSQL SYSLOG
30
31	ICONV_CONFIGURE_WITH= iconv
32	ICONV_USES= iconv	22	ICONV_USES= iconv
33	ICONV_LDFLAGS= ${ICONV_LIB}
34
35	# Changes document and word IDs to a 64bit type, useful if you have
36	# more than about 4.2E9 such items to deal with. Means corresponding
37	# changes in DB schema. Disabled by default.
38	ID64_DESC= Use 64-bit document and word IDs
39	ID64_CONFIGURE_ENABLE= id64
40
41	# Note: The snowball project doesn't release numbered versions of it's
42	# pre-processors. Instead, at arbitrary but fairly long intervals a
43	# snapshot of their source repository is turned into a tarball (always
44	# the same filename) and placed on their web site. It's like they
45	# want to make it as hard as possible for anyone to package and use
46	# their software.
47	#
48	# Adds support for two additional word stemmming pre-processors from
49	# the Snowball project (http://snowball.tartarus.org/) -- these
50	# essentially do exactly the same thing as the built in English,
51	# Russian and Czech stemmers but also support French, Spanish,
52	# Portuguese, Italian, Romanian, German, Dutch, Swedish, Norwegian,
53	# Danish, Finnish, Hungarian. Disabled by default.
54	LIBSTEMMER_DESC= Compile with libstemmer support
55	LIBSTEMMER_CONFIGURE_WITH=libstemmer
56	LIBSTEMMER_DISTNAME= libstemmer_c
57	LIBSTEMMER_DISTFILES= ${LIBSTEMMER_DISTNAME}.tgz:libstemmer
58
59	.if make(makesum) \|\| defined(FETCH_ALL)
60	OPTIONS_SET_FORCE= LIBSTEMMER
61	.endif
62
63	# The port will successfully compile with both PGSQL and MYSQL support
64	# simultaneously. Not sure how useful that is in practice though.
65
66	MYSQL_CONFIGURE_WITH= mysql
67	MYSQL_CONFIGURE_ON= --with-mysql-includes=${LOCALBASE}/include/mysql \
68	--with-mysql-libs=${LOCALBASE}/lib/mysql
69	MYSQL_USES= mysql	23	MYSQL_USES= mysql
70
71	OPTIMIZED_CFLAGS_CXXFLAGS=-O3 -fomit-frame-pointer
72
73	PGSQL_CONFIGURE_WITH= pgsql
74	PGSQL_CONFIGURE_ON= --with-pgsql-includes=${LOCALBASE}/include \
75	--with-pgsql-libs=${LOCALBASE}/lib
76	PGSQL_USES= pgsql	24	PGSQL_USES= pgsql
77		25
78	# Why does this insist on linking against the libre2.a static library?	26	CONFLICTS= sphinxsearch2 sphinxsearch-devel-[0-9]* dpsearch-[0-9]* rdb-[0-9]* \
79
80	RE2_DESC= Enable re2 regular expression library
81	RE2_CONFIGURE_WITH= re2
82	RE2_BUILD_DEPENDS= ${LOCALBASE}/lib/libre2.a:devel/re2
83	RE2_BROKEN= Bad C++ code in re2.h
84
85	SYSLOG_DESC= Enable logging via syslog
86	SYSLOG_CONFIGURE_WITH= syslog
87
88	UNIXODBC_CONFIGURE_WITH=unixodbc
89	UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC
90
91	CONFLICTS= sphinxsearch-devel-[0-9]* dpsearch-[0-9]* rdb-[0-9]* \
92	swish++-[0-9]* xaira-[0-9]*	27	swish++-[0-9]* xaira-[0-9]*
93		28
94	USERS?= _sphinx	29	USERS?= _sphinx
Lines 98-108 Link Here
98	SPHINX_RUN?= /var/run/${PORTNAME}	33	SPHINX_RUN?= /var/run/${PORTNAME}
99	SPHINX_LOG?= /var/log/${PORTNAME}	34	SPHINX_LOG?= /var/log/${PORTNAME}
100		35
101	# Yes, the conflation of CPPFLAGS and CXXFLAGS is deliberate. No,	36	NO_BUILD= yes
102	# don't ask.	37	WRKSRC= ${WRKDIR}/sphinx-${PORTVERSION}
103		38
104	GNU_CONFIGURE= yes
105	CPPFLAGS+= ${CXXFLAGS}
106	CFGFILE= ${PREFIX}/etc/sphinx.conf	39	CFGFILE= ${PREFIX}/etc/sphinx.conf
107	USE_RC_SUBR= sphinxsearch	40	USE_RC_SUBR= sphinxsearch
108	SUB_LIST+= PORTNAME=${PORTNAME} \	41	SUB_LIST+= PORTNAME=${PORTNAME} \
Lines 114-133 Link Here
114	SPHINX_LOG=${SPHINX_LOG}	47	SPHINX_LOG=${SPHINX_LOG}
115	SUB_FILES+= pkg-deinstall	48	SUB_FILES+= pkg-deinstall
116		49
117	BINS= indexer indextool spelldump wordbreaker	50	BINS= indexer indextool wordbreaker
118		51
119	EXAMPLES= example.sql api	52	EXAMPLES= etc/example.sql api src misc
120		53
121	DOCS= doc/sphinx.css doc/sphinx.html doc/sphinx.txt doc/sphinx.xml \	54	DOCS= doc/sphinx3.md doc/sphinx3.html etc/sphinx-min.conf.dist
122	sphinx-min.conf.dist
123	DOCSRC= ${WRKSRC}/doc	55	DOCSRC= ${WRKSRC}/doc
124		56
125	MAN1SRC= indexer.1 indextool.1 spelldump.1
126	MAN8SRC= searchd.8
127
128	post-extract-LIBSTEMMER-on:
129	@( cd ${WRKDIR} && ${COPYTREE_SHARE} ${LIBSTEMMER_DISTNAME} ${WRKSRC} )
130
131	# Fix up the sample configuration file to correspond to FreeBSD norms	57	# Fix up the sample configuration file to correspond to FreeBSD norms
132	post-patch:	58	post-patch:
133	@${REINPLACE_CMD} \	59	@${REINPLACE_CMD} \
Lines 135-159 Link Here
135	-e "s!@CONFDIR@/log/query.log!${SPHINX_LOG}/sphinx-query.log!" \	61	-e "s!@CONFDIR@/log/query.log!${SPHINX_LOG}/sphinx-query.log!" \
136	-e "s!@CONFDIR@/log/searchd.log!${SPHINX_LOG}/searchd.log!" \	62	-e "s!@CONFDIR@/log/searchd.log!${SPHINX_LOG}/searchd.log!" \
137	-e "s!@CONFDIR@!${SPHINX_DIR}!" \	63	-e "s!@CONFDIR@!${SPHINX_DIR}!" \
138	${WRKSRC}/sphinx.conf.in	64	${WRKSRC}/etc/sphinx.conf.dist
139	${SED} -e 's/"1"/"8"/' ${DOCSRC}/searchd.1 > ${DOCSRC}/searchd.8
140	.for man in ${MAN1}
141	${SED} -i~ -e 's/\\fBsearchd\\fR(1)/\\fBsearchd\\fR(8)/' \
142	${DOCSRC}/${man}
143	.endfor
144		65
145	do-install:	66	do-install:
146	.for bin in ${BINS}	67	.for bin in ${BINS}
147	${INSTALL_PROGRAM} ${WRKSRC}/src/${bin} ${STAGEDIR}${PREFIX}/bin/${bin}	68	${INSTALL_PROGRAM} ${WRKSRC}/bin/${bin} ${STAGEDIR}${PREFIX}/bin/${bin}
148	.endfor	69	.endfor
149	${INSTALL_PROGRAM} ${WRKSRC}/src/searchd ${STAGEDIR}${PREFIX}/sbin/searchd	70	${INSTALL_PROGRAM} ${WRKSRC}/bin/searchd ${STAGEDIR}${PREFIX}/sbin/searchd
150	${INSTALL_DATA} ${WRKSRC}/sphinx.conf.dist ${STAGEDIR}${CFGFILE}.sample	71	${INSTALL_DATA} ${WRKSRC}/etc/sphinx.conf.dist ${STAGEDIR}${CFGFILE}.sample
151	.for man in ${MAN1SRC}
152	${INSTALL_MAN} ${DOCSRC}/${man} ${STAGEDIR}${MANPREFIX}/man/man1/${man}
153	.endfor
154	.for man in ${MAN8SRC}
155	${INSTALL_MAN} ${DOCSRC}/${man} ${STAGEDIR}${MANPREFIX}/man/man8/${man}
156	.endfor
157		72
158	do-install-DOCS-on:	73	do-install-DOCS-on:
159	@${MKDIR} ${STAGEDIR}${DOCSDIR}	74	@${MKDIR} ${STAGEDIR}${DOCSDIR}

Lines 1-18 Link Here

(-)textproc/sphinxsearch/pkg-plist (-10 / +14 lines)
1	bin/indexer	1	bin/indexer
2	bin/indextool	2	bin/indextool
3	bin/spelldump
4	bin/wordbreaker	3	bin/wordbreaker
5	@sample etc/sphinx.conf.sample	4	@sample etc/sphinx.conf.sample
6	man/man1/indexer.1.gz
7	man/man1/indextool.1.gz
8	man/man1/spelldump.1.gz
9	man/man8/searchd.8.gz
10	sbin/searchd	5	sbin/searchd
11	%%PORTDOCS%%%%DOCSDIR%%/sphinx-min.conf.dist	6	%%PORTDOCS%%%%DOCSDIR%%/sphinx-min.conf.dist
12	%%PORTDOCS%%%%DOCSDIR%%/sphinx.css	7	%%PORTDOCS%%%%DOCSDIR%%/sphinx3.html
13	%%PORTDOCS%%%%DOCSDIR%%/sphinx.html	8	%%PORTDOCS%%%%DOCSDIR%%/sphinx3.md
14	%%PORTDOCS%%%%DOCSDIR%%/sphinx.txt
15	%%PORTDOCS%%%%DOCSDIR%%/sphinx.xml
16	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/java/MANIFEST.MF	9	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/java/MANIFEST.MF
17	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/java/Makefile	10	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/java/Makefile
18	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/java/README	11	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/java/README
Lines 133-136 Link Here
133	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/test.py	126	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/test.py
134	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/test2.php	127	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/test2.php
135	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/test2.py	128	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/test2.py
136	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example.sql	129	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/etc/example.sql
		130	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/raminfo.py
		131	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/resolve.py
		132	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/search_json_pretty.php
		133	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/searchd
		134	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/suggest/README
		135	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/suggest/suggest.conf
		136	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/suggest/suggest.php
		137	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/wordbreak.pl
		138	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/sphinxudf.c
		139	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/sphinxudf.h
		140	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/udfexample.c

Lines 7-16 Link Here

(-)textproc/sphinxsearch2/Makefile (-3 / +3 lines)
7		7
8	PORTNAME= sphinxsearch	8	PORTNAME= sphinxsearch
9	PORTVERSION= 2.2.11	9	PORTVERSION= 2.2.11
10	PORTREVISION= 2
11	CATEGORIES= textproc databases	10	CATEGORIES= textproc databases
12	MASTER_SITES= http://sphinxsearch.com/files/ \	11	MASTER_SITES= http://sphinxsearch.com/files/ \
13	http://snowball.tartarus.org/dist/:libstemmer	12	http://snowball.tartarus.org/dist/:libstemmer
		13	PKGNAMESUFFIX= 2
14	DISTNAME= sphinx-${PORTVERSION}-release	14	DISTNAME= sphinx-${PORTVERSION}-release
15	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}	15	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
16		16
Lines 88-95 Link Here
88	UNIXODBC_CONFIGURE_WITH=unixodbc	88	UNIXODBC_CONFIGURE_WITH=unixodbc
89	UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC	89	UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC
90		90
91	CONFLICTS= sphinxsearch-devel-[0-9]* dpsearch-[0-9]* rdb-[0-9]* \	91	CONFLICTS= sphinxsearch sphinxsearch-devel-[0-9]* dpsearch-[0-9]* \
92	swish++-[0-9]* xaira-[0-9]*	92	rdb-[0-9]* swish++-[0-9]* xaira-[0-9]*
93		93
94	USERS?= _sphinx	94	USERS?= _sphinx
95	GROUPS?= _sphinx	95	GROUPS?= _sphinx