FreeBSD Bugzilla – Attachment 205874 Details for
Bug 239283
textproc/sphinxsearch: Update to 3.1.1
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Updates port to 3.1.1
sphinxsearch-3.1.1-rev2.patch (text/plain), 35.67 KB, created by
Daniel Ylitalo
on 2019-07-18 17:31:06 UTC
(
hide
)
Description:
Updates port to 3.1.1
Filename:
MIME Type:
Creator:
Daniel Ylitalo
Created:
2019-07-18 17:31:06 UTC
Size:
35.67 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/files/patch-src_llsphinxjson.c >=================================================================== >--- textproc/sphinxsearch/files/patch-src_llsphinxjson.c (revision 506850) >+++ textproc/sphinxsearch/files/patch-src_llsphinxjson.c (nonexistent) >@@ -1,89 +0,0 @@ >---- src/llsphinxjson.c.orig 2018-02-03 14:14:04 UTC >-+++ src/llsphinxjson.c >-@@ -724,9 +724,9 @@ extern int yy2lex (yyscan_t yyscanner); >- */ >- YY_DECL >- { >-- register yy_state_type yy_current_state; >-- register char *yy_cp, *yy_bp; >-- register int yy_act; >-+ yy_state_type yy_current_state; >-+ char *yy_cp, *yy_bp; >-+ int yy_act; >- struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; >- >- #line 28 "sphinxjson.l" >-@@ -776,7 +776,7 @@ YY_DECL >- yy_match: >- do >- { >-- register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; >-+ YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; >- if ( yy_accept[yy_current_state] ) >- { >- yyg->yy_last_accepting_state = yy_current_state; >-@@ -1053,9 +1053,9 @@ case YY_STATE_EOF(ccomment): >- static int yy_get_next_buffer (yyscan_t yyscanner) >- { >- struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; >-- register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; >-- register char *source = yyg->yytext_ptr; >-- register int number_to_move, i; >-+ char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; >-+ char *source = yyg->yytext_ptr; >-+ int number_to_move, i; >- int ret_val; >- >- if ( yyg->yy_c_buf_p > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] ) >-@@ -1187,15 +1187,15 @@ static int yy_get_next_buffer (yyscan_t yyscanner) >- >- static yy_state_type yy_get_previous_state (yyscan_t yyscanner) >- { >-- register yy_state_type yy_current_state; >-- register char *yy_cp; >-+ yy_state_type yy_current_state; >-+ char *yy_cp; >- struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; >- >- yy_current_state = yyg->yy_start; >- >- for ( yy_cp = yyg->yytext_ptr + YY_MORE_ADJ; yy_cp < yyg->yy_c_buf_p; ++yy_cp ) >- { >-- register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); >-+ YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); >- if ( yy_accept[yy_current_state] ) >- { >- yyg->yy_last_accepting_state = yy_current_state; >-@@ -1220,11 +1220,11 @@ static int yy_get_next_buffer (yyscan_t yyscanner) >- */ >- static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state , yyscan_t yyscanner) >- { >-- register int yy_is_jam; >-+ int yy_is_jam; >- struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* This var may be unused depending upon options. */ >-- register char *yy_cp = yyg->yy_c_buf_p; >-+ char *yy_cp = yyg->yy_c_buf_p; >- >-- register YY_CHAR yy_c = 1; >-+ YY_CHAR yy_c = 1; >- if ( yy_accept[yy_current_state] ) >- { >- yyg->yy_last_accepting_state = yy_current_state; >-@@ -1986,7 +1986,7 @@ int yy2lex_destroy (yyscan_t yyscanner) >- #ifndef yytext_ptr >- static void yy_flex_strncpy (char* s1, yyconst char * s2, int n , yyscan_t yyscanner) >- { >-- register int i; >-+ int i; >- for ( i = 0; i < n; ++i ) >- s1[i] = s2[i]; >- } >-@@ -1995,7 +1995,7 @@ static void yy_flex_strncpy (char* s1, yyconst char * >- #ifdef YY_NEED_STRLEN >- static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner) >- { >-- register int n; >-+ int n; >- for ( n = 0; s[n]; ++n ) >- ; >- > >Property changes on: textproc/sphinxsearch/files/patch-src_llsphinxjson.c >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: textproc/sphinxsearch/files/patch-src_llsphinxql.c >=================================================================== >--- textproc/sphinxsearch/files/patch-src_llsphinxql.c (revision 506850) >+++ textproc/sphinxsearch/files/patch-src_llsphinxql.c (nonexistent) >@@ -1,89 +0,0 @@ >---- src/llsphinxql.c.orig 2018-02-03 15:30:11 UTC >-+++ src/llsphinxql.c >-@@ -1142,9 +1142,9 @@ extern int yylex (yyscan_t yyscanner); >- */ >- YY_DECL >- { >-- register yy_state_type yy_current_state; >-- register char *yy_cp, *yy_bp; >-- register int yy_act; >-+ yy_state_type yy_current_state; >-+ char *yy_cp, *yy_bp; >-+ int yy_act; >- struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; >- >- #line 31 "sphinxql.l" >-@@ -1194,7 +1194,7 @@ YY_DECL >- yy_match: >- do >- { >-- register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; >-+ YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; >- if ( yy_accept[yy_current_state] ) >- { >- yyg->yy_last_accepting_state = yy_current_state; >-@@ -2080,9 +2080,9 @@ case YY_STATE_EOF(ccomment): >- static int yy_get_next_buffer (yyscan_t yyscanner) >- { >- struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; >-- register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; >-- register char *source = yyg->yytext_ptr; >-- register int number_to_move, i; >-+ char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; >-+ char *source = yyg->yytext_ptr; >-+ int number_to_move, i; >- int ret_val; >- >- if ( yyg->yy_c_buf_p > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] ) >-@@ -2214,15 +2214,15 @@ static int yy_get_next_buffer (yyscan_t yyscanner) >- >- static yy_state_type yy_get_previous_state (yyscan_t yyscanner) >- { >-- register yy_state_type yy_current_state; >-- register char *yy_cp; >-+ yy_state_type yy_current_state; >-+ char *yy_cp; >- struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; >- >- yy_current_state = yyg->yy_start; >- >- for ( yy_cp = yyg->yytext_ptr + YY_MORE_ADJ; yy_cp < yyg->yy_c_buf_p; ++yy_cp ) >- { >-- register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); >-+ YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); >- if ( yy_accept[yy_current_state] ) >- { >- yyg->yy_last_accepting_state = yy_current_state; >-@@ -2247,11 +2247,11 @@ static int yy_get_next_buffer (yyscan_t yyscanner) >- */ >- static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state , yyscan_t yyscanner) >- { >-- register int yy_is_jam; >-+ int yy_is_jam; >- struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* This var may be unused depending upon options. */ >-- register char *yy_cp = yyg->yy_c_buf_p; >-+ char *yy_cp = yyg->yy_c_buf_p; >- >-- register YY_CHAR yy_c = 1; >-+ YY_CHAR yy_c = 1; >- if ( yy_accept[yy_current_state] ) >- { >- yyg->yy_last_accepting_state = yy_current_state; >-@@ -3013,7 +3013,7 @@ int yylex_destroy (yyscan_t yyscanner) >- #ifndef yytext_ptr >- static void yy_flex_strncpy (char* s1, yyconst char * s2, int n , yyscan_t yyscanner) >- { >-- register int i; >-+ int i; >- for ( i = 0; i < n; ++i ) >- s1[i] = s2[i]; >- } >-@@ -3022,7 +3022,7 @@ static void yy_flex_strncpy (char* s1, yyconst char * >- #ifdef YY_NEED_STRLEN >- static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner) >- { >-- register int n; >-+ int n; >- for ( n = 0; s[n]; ++n ) >- ; >- > >Property changes on: textproc/sphinxsearch/files/patch-src_llsphinxql.c >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: textproc/sphinxsearch/files/patch-src_searchd.cpp >=================================================================== >--- textproc/sphinxsearch/files/patch-src_searchd.cpp (revision 506850) >+++ textproc/sphinxsearch/files/patch-src_searchd.cpp (nonexistent) >@@ -1,23 +0,0 @@ >---- src/searchd.cpp.orig 2018-02-03 10:33:59 UTC >-+++ src/searchd.cpp >-@@ -8580,16 +8580,16 @@ struct GenericMatchSort_fn : public CSphMatchComparato >- >- case SPH_KEYPART_INT: >- { >-- register SphAttr_t aa = a->GetAttr ( m_tLocator[i] ); >-- register SphAttr_t bb = b->GetAttr ( m_tLocator[i] ); >-+ SphAttr_t aa = a->GetAttr ( m_tLocator[i] ); >-+ SphAttr_t bb = b->GetAttr ( m_tLocator[i] ); >- if ( aa==bb ) >- continue; >- return ( ( m_uAttrDesc>>i ) & 1 ) ^ ( aa < bb ); >- } >- case SPH_KEYPART_FLOAT: >- { >-- register float aa = a->GetAttrFloat ( m_tLocator[i] ); >-- register float bb = b->GetAttrFloat ( m_tLocator[i] ); >-+ float aa = a->GetAttrFloat ( m_tLocator[i] ); >-+ float bb = b->GetAttrFloat ( m_tLocator[i] ); >- if ( aa==bb ) >- continue; >- return ( ( m_uAttrDesc>>i ) & 1 ) ^ ( aa < bb ); > >Property changes on: textproc/sphinxsearch/files/patch-src_searchd.cpp >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: textproc/sphinxsearch/files/patch-src_sphinx.cpp >=================================================================== >--- textproc/sphinxsearch/files/patch-src_sphinx.cpp (revision 506850) >+++ textproc/sphinxsearch/files/patch-src_sphinx.cpp (nonexistent) >@@ -1,111 +0,0 @@ >---- src/sphinx.cpp.orig 2018-02-03 10:17:51 UTC >-+++ src/sphinx.cpp >-@@ -8346,8 +8346,8 @@ void CSphReader::ResetError() >- #if PARANOID >- >- #define SPH_VARINT_DECODE(_type,_getexpr) \ >-- register DWORD b = 0; \ >-- register _type v = 0; \ >-+ DWORD b = 0; \ >-+ _type v = 0; \ >- int it = 0; \ >- do { b = _getexpr; v = ( v<<7 ) + ( b&0x7f ); it++; } while ( b&0x80 ); \ >- assert ( (it-1)*7<=sizeof(_type)*8 ); \ >-@@ -8356,8 +8356,8 @@ void CSphReader::ResetError() >- #else >- >- #define SPH_VARINT_DECODE(_type,_getexpr) \ >-- register DWORD b = _getexpr; \ >-- register _type res = 0; \ >-+ DWORD b = _getexpr; \ >-+ _type res = 0; \ >- while ( b & 0x80 ) \ >- { \ >- res = ( res<<7 ) + ( b & 0x7f ); \ >-@@ -8722,8 +8722,8 @@ SphWordID_t CSphBin::ReadVLB () >- >- DWORD CSphBin::UnzipInt () >- { >-- register int b = 0; >-- register DWORD v = 0; >-+ int b = 0; >-+ DWORD v = 0; >- do >- { >- b = ReadByte(); >-@@ -8736,8 +8736,8 @@ DWORD CSphBin::UnzipInt () >- >- SphOffset_t CSphBin::UnzipOffset () >- { >-- register int b = 0; >-- register SphOffset_t v = 0; >-+ int b = 0; >-+ SphOffset_t v = 0; >- do >- { >- b = ReadByte(); >-@@ -11536,8 +11536,8 @@ bool CSphHitBuilder::cidxDone ( int iMemLimit, int iMi >- >- inline int encodeVLB ( BYTE * buf, DWORD v ) >- { >-- register BYTE b; >-- register int n = 0; >-+ BYTE b; >-+ int n = 0; >- >- do >- { >-@@ -23566,9 +23566,9 @@ SphWordID_t CSphDictKeywords::HitblockGetID ( const ch >- } >- >- // crc matches, check keyword >-- register int iWordLen = iLen; >-- register const char * a = pEntry->m_pKeyword; >-- register const char * b = sWord; >-+ int iWordLen = iLen; >-+ const char * a = pEntry->m_pKeyword; >-+ const char * b = sWord; >- while ( *a==*b && iWordLen-- ) >- { >- if ( !*a || !iWordLen ) >-@@ -24874,7 +24874,7 @@ static inline DWORD HtmlEntityHash ( const BYTE * str, >- 421, 421, 421, 421, 421, 421, 421 >- }; >- >-- register int hval = len; >-+ int hval = len; >- switch ( hval ) >- { >- default: hval += asso_values [ str[4] ]; >-@@ -25257,11 +25257,11 @@ static inline int HtmlEntityLookup ( const BYTE * str, >- >- if ( len<=MAX_WORD_LENGTH && len>=MIN_WORD_LENGTH ) >- { >-- register int key = HtmlEntityHash ( str, len ); >-+ int key = HtmlEntityHash ( str, len ); >- if ( key<=MAX_HASH_VALUE && key>=0 ) >- if ( len==lengthtable[key] ) >- { >-- register const char * s = wordlist[key].m_sName; >-+ const char * s = wordlist[key].m_sName; >- if ( *str==*s && !memcmp ( str+1, s+1, len-1 ) ) >- return wordlist[key].m_iCode; >- } >-@@ -27817,7 +27817,7 @@ const char * CSphSource_SQL::SqlUnpackColumn ( int iFi >- { >- m_bUnpackFailed = true; >- sphWarn ( "failed to unpack '%s', invalid column size (size=%d), " >-- "docid="DOCID_FMT, SqlFieldName(iIndex), iPackedLen, m_tDocInfo.m_uDocID ); >-+ "docid=" DOCID_FMT, SqlFieldName(iIndex), iPackedLen, m_tDocInfo.m_uDocID ); >- } >- return NULL; >- } >-@@ -27833,7 +27833,7 @@ const char * CSphSource_SQL::SqlUnpackColumn ( int iFi >- { >- m_bUnpackOverflow = true; >- sphWarn ( "failed to unpack '%s', column size limit exceeded (size=%d)," >-- " docid="DOCID_FMT, SqlFieldName(iIndex), (int)uSize, m_tDocInfo.m_uDocID ); >-+ " docid=" DOCID_FMT, SqlFieldName(iIndex), (int)uSize, m_tDocInfo.m_uDocID ); >- } >- return NULL; >- } > >Property changes on: textproc/sphinxsearch/files/patch-src_sphinx.cpp >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: textproc/sphinxsearch/files/patch-src_sphinx.h >=================================================================== >--- textproc/sphinxsearch/files/patch-src_sphinx.h (revision 506850) >+++ textproc/sphinxsearch/files/patch-src_sphinx.h (nonexistent) >@@ -1,11 +0,0 @@ >---- src/sphinx.h.orig 2018-02-03 10:16:36 UTC >-+++ src/sphinx.h >-@@ -433,7 +433,7 @@ class CSphLowercaser (public) >- { >- if ( iCode<0 || iCode>=MAX_CODE ) >- return iCode; >-- register int * pChunk = m_pChunk [ iCode >> CHUNK_BITS ]; >-+ int * pChunk = m_pChunk [ iCode >> CHUNK_BITS ]; >- if ( pChunk ) >- return pChunk [ iCode & CHUNK_MASK ]; >- return 0; > >Property changes on: textproc/sphinxsearch/files/patch-src_sphinx.h >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: textproc/sphinxsearch/files/patch-src_sphinxaot.cpp >=================================================================== >--- textproc/sphinxsearch/files/patch-src_sphinxaot.cpp (revision 506850) >+++ textproc/sphinxsearch/files/patch-src_sphinxaot.cpp (nonexistent) >@@ -1,11 +0,0 @@ >---- src/sphinxaot.cpp.orig 2018-02-03 10:35:17 UTC >-+++ src/sphinxaot.cpp >-@@ -1133,7 +1133,7 @@ static inline int Utf8ToWin1251 ( BYTE * pOut, const B >- assert ( pWord[1]>=0x80 && pWord[1]<0xC0 ); >- >- // table index D0 80..BF to 0..3F, and D1 80..BF to 40..7F >-- register BYTE uWin = dTable [ ( pWord[1] & 0x7F ) + ( ( pWord[0] & 1 )<<6 ) ]; >-+ BYTE uWin = dTable [ ( pWord[1] & 0x7F ) + ( ( pWord[0] & 1 )<<6 ) ]; >- pWord += 2; >- >- if ( !uWin ) > >Property changes on: textproc/sphinxsearch/files/patch-src_sphinxaot.cpp >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: textproc/sphinxsearch/files/patch-src_sphinxint.h >=================================================================== >--- textproc/sphinxsearch/files/patch-src_sphinxint.h (revision 506850) >+++ textproc/sphinxsearch/files/patch-src_sphinxint.h (nonexistent) >@@ -1,13 +0,0 @@ >---- src/sphinxint.h.orig 2018-02-03 10:17:12 UTC >-+++ src/sphinxint.h >-@@ -1074,8 +1074,8 @@ inline int FindBit ( DWORD uValue ) >- >- inline int sphEncodeVLB8 ( BYTE * buf, uint64_t v ) >- { >-- register BYTE b; >-- register int n = 0; >-+ BYTE b; >-+ int n = 0; >- >- do >- { > >Property changes on: textproc/sphinxsearch/files/patch-src_sphinxint.h >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: textproc/sphinxsearch/files/patch-src_sphinxplugin.cpp >=================================================================== >--- textproc/sphinxsearch/files/patch-src_sphinxplugin.cpp (revision 506850) >+++ textproc/sphinxsearch/files/patch-src_sphinxplugin.cpp (nonexistent) >@@ -1,11 +0,0 @@ >---- src/sphinxplugin.cpp.orig 2016-07-19 10:42:18 UTC >-+++ src/sphinxplugin.cpp >-@@ -219,7 +219,7 @@ static bool PluginLoadSymbols ( void * pDesc, const Sy >- >- #if !USE_WINDOWS >- #define offsetof(T, M) \ >-- (reinterpret_cast<char*>(&(((T*)1000)->M)) - reinterpret_cast<char*>(1000)) >-+ ((int)(reinterpret_cast<char*>(&(((T*)1000)->M)) - reinterpret_cast<char*>(1000))) >- #endif >- >- static SymbolDesc_t g_dSymbolsUDF[] = > >Property changes on: textproc/sphinxsearch/files/patch-src_sphinxplugin.cpp >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: textproc/sphinxsearch/files/patch-src_sphinxrt.cpp >=================================================================== >--- textproc/sphinxsearch/files/patch-src_sphinxrt.cpp (revision 506850) >+++ textproc/sphinxsearch/files/patch-src_sphinxrt.cpp (nonexistent) >@@ -1,11 +0,0 @@ >---- src/sphinxrt.cpp.orig 2018-02-03 10:48:40 UTC >-+++ src/sphinxrt.cpp >-@@ -4796,7 +4796,7 @@ int RtIndex_t::DebugCheck ( FILE * fp ) >- if ( !tWord.m_uDocs || !tWord.m_uHits || tWord.m_uHits<tWord.m_uDocs ) >- { >- sWord[sizeof(sWord)-1] = '\0'; >-- LOC_FAIL(( fp, "invalid docs/hits (segment=%d, word=%d, read_wordid="UINT64_FMT >-+ LOC_FAIL(( fp, "invalid docs/hits (segment=%d, word=%d, read_wordid=" UINT64_FMT >- ", read_word=%s, docs=%u, hits=%u)", >- iSegment, nWordsRead, (uint64_t)tWord.m_uWordID, >- sWord+1, tWord.m_uDocs, tWord.m_uHits )); > >Property changes on: textproc/sphinxsearch/files/patch-src_sphinxrt.cpp >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: textproc/sphinxsearch/files/patch-src_sphinxsort.cpp >=================================================================== >--- textproc/sphinxsearch/files/patch-src_sphinxsort.cpp (revision 506850) >+++ textproc/sphinxsearch/files/patch-src_sphinxsort.cpp (nonexistent) >@@ -1,22 +0,0 @@ >---- src/sphinxsort.cpp.orig 2018-02-03 10:36:00 UTC >-+++ src/sphinxsort.cpp >-@@ -3395,15 +3395,15 @@ struct MatchExpr_fn : public ISphMatchComparator >- case SPH_KEYPART_WEIGHT: SPH_TEST_PAIR ( a.m_iWeight, b.m_iWeight, _idx ); break; \ >- case SPH_KEYPART_INT: \ >- { \ >-- register SphAttr_t aa = a.GetAttr ( t.m_tLocator[_idx] ); \ >-- register SphAttr_t bb = b.GetAttr ( t.m_tLocator[_idx] ); \ >-+ SphAttr_t aa = a.GetAttr ( t.m_tLocator[_idx] ); \ >-+ SphAttr_t bb = b.GetAttr ( t.m_tLocator[_idx] ); \ >- SPH_TEST_PAIR ( aa, bb, _idx ); \ >- break; \ >- } \ >- case SPH_KEYPART_FLOAT: \ >- { \ >-- register float aa = a.GetAttrFloat ( t.m_tLocator[_idx] ); \ >-- register float bb = b.GetAttrFloat ( t.m_tLocator[_idx] ); \ >-+ float aa = a.GetAttrFloat ( t.m_tLocator[_idx] ); \ >-+ float bb = b.GetAttrFloat ( t.m_tLocator[_idx] ); \ >- SPH_TEST_PAIR ( aa, bb, _idx ) \ >- break; \ >- } \ > >Property changes on: textproc/sphinxsearch/files/patch-src_sphinxsort.cpp >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: textproc/sphinxsearch/files/patch-src_sphinxstd.h >=================================================================== >--- textproc/sphinxsearch/files/patch-src_sphinxstd.h (revision 506850) >+++ textproc/sphinxsearch/files/patch-src_sphinxstd.h (nonexistent) >@@ -1,11 +0,0 @@ >---- src/sphinxstd.h.orig 2018-02-03 10:22:51 UTC >-+++ src/sphinxstd.h >-@@ -274,7 +274,7 @@ inline int sphBitCount ( DWORD n ) >- // MIT HACKMEM count >- // works for 32-bit numbers only >- // fix last line for 64-bit numbers >-- register DWORD tmp; >-+ DWORD tmp; >- tmp = n - ((n >> 1) & 033333333333) - ((n >> 2) & 011111111111); >- return ( (tmp + (tmp >> 3) ) & 030707070707) % 63; >- } > >Property changes on: textproc/sphinxsearch/files/patch-src_sphinxstd.h >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: textproc/sphinxsearch/files/patch-src_sphinxstemen.cpp >=================================================================== >--- textproc/sphinxsearch/files/patch-src_sphinxstemen.cpp (revision 506850) >+++ textproc/sphinxsearch/files/patch-src_sphinxstemen.cpp (nonexistent) >@@ -1,11 +0,0 @@ >---- src/sphinxstemen.cpp.orig 2018-02-03 10:36:47 UTC >-+++ src/sphinxstemen.cpp >-@@ -47,7 +47,7 @@ static unsigned char vowel_map[] = >- >- static inline int stem_en_id ( unsigned char l ) >- { >-- register unsigned char * v = stem_en_doubles; >-+ unsigned char * v = stem_en_doubles; >- while ( *v && *v!=l ) v++; >- return ( *v==l ) ? 1 : 0; >- } > >Property changes on: textproc/sphinxsearch/files/patch-src_sphinxstemen.cpp >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: textproc/sphinxsearch/files/patch-src_sphinxstemru.inl >=================================================================== >--- textproc/sphinxsearch/files/patch-src_sphinxstemru.inl (revision 506850) >+++ textproc/sphinxsearch/files/patch-src_sphinxstemru.inl (nonexistent) >@@ -1,20 +0,0 @@ >---- src/sphinxstemru.inl.orig 2018-02-03 14:10:20 UTC >-+++ src/sphinxstemru.inl >-@@ -413,7 +413,7 @@ STEM_RU_FUNC_I(ru_noun) >- >- static int LOC_PREFIX(stem_ru_adjectival) ( LOC_CHAR_TYPE * word, int len ) >- { >-- register int i = LOC_PREFIX(stem_ru_adj_i) ( word, len ); >-+ int i = LOC_PREFIX(stem_ru_adj_i) ( word, len ); >- if ( i ) >- i += LOC_PREFIX(stem_ru_part_i) ( word, len-i ); >- return i; >-@@ -422,7 +422,7 @@ static int LOC_PREFIX(stem_ru_adjectival) ( LOC_CHAR_T >- >- static int LOC_PREFIX(stem_ru_verb_ov) ( LOC_CHAR_TYPE * word, int len ) >- { >-- register int i = LOC_PREFIX(stem_ru_verb_i) ( word, len ); >-+ int i = LOC_PREFIX(stem_ru_verb_i) ( word, len ); >- if ( i && (len>=i+2) && word[len-i-2] == RUS::O && word[len-i-1] == RUS::V ) >- return i+2; >- return i; > >Property changes on: textproc/sphinxsearch/files/patch-src_sphinxstemru.inl >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: textproc/sphinxsearch/files/patch-src_sphinxutils.cpp >=================================================================== >--- textproc/sphinxsearch/files/patch-src_sphinxutils.cpp (revision 506850) >+++ textproc/sphinxsearch/files/patch-src_sphinxutils.cpp (nonexistent) >@@ -1,16 +0,0 @@ >---- src/sphinxutils.cpp.orig 2018-02-03 10:25:41 UTC >-+++ src/sphinxutils.cpp >-@@ -2103,11 +2103,11 @@ void sphBacktrace ( int iFD, bool bSafe ) >- #endif >- >- #ifdef CONFIGURE_FLAGS >-- sphSafeInfo ( iFD, "Configured with flags: "CONFIGURE_FLAGS ); >-+ sphSafeInfo ( iFD, "Configured with flags: " CONFIGURE_FLAGS ); >- #endif >- >- #ifdef OS_UNAME >-- sphSafeInfo ( iFD, "Host OS is "OS_UNAME ); >-+ sphSafeInfo ( iFD, "Host OS is " OS_UNAME ); >- #endif >- >- bool bOk = true; > >Property changes on: textproc/sphinxsearch/files/patch-src_sphinxutils.cpp >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >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 >===================================================================
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=205874">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 239283
:
205868
| 205874