Index: head/textproc/sphinxsearch/Makefile =================================================================== --- head/textproc/sphinxsearch/Makefile (revision 460878) +++ head/textproc/sphinxsearch/Makefile (revision 460879) @@ -1,170 +1,170 @@ # Created by: Matthew Seaman # $FreeBSD$ # 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= 2.2.11 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc databases MASTER_SITES= http://sphinxsearch.com/files/ \ http://snowball.tartarus.org/dist/:libstemmer DISTNAME= sphinx-${PORTVERSION}-release DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= matthew@FreeBSD.org COMMENT= Sphinx Full-Text Search Engine 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 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]* \ swish++-[0-9]* xaira-[0-9]* USERS?= _sphinx GROUPS?= _sphinx SPHINX_DIR?= /var/db/${PORTNAME} SPHINX_RUN?= /var/run/${PORTNAME} SPHINX_LOG?= /var/log/${PORTNAME} # Yes, the conflation of CPPFLAGS and CXXFLAGS is deliberate. No, # don't ask. GNU_CONFIGURE= yes CPPFLAGS+= ${CXXFLAGS} CFGFILE= ${PREFIX}/etc/sphinx.conf USE_RC_SUBR= sphinxsearch SUB_LIST+= PORTNAME=${PORTNAME} \ CFGFILE=${CFGFILE} \ SPHINX_USR=${USERS} \ SPHINX_GRP=${GROUPS} \ SPHINX_DIR=${SPHINX_DIR} \ SPHINX_RUN=${SPHINX_RUN} \ SPHINX_LOG=${SPHINX_LOG} SUB_FILES+= pkg-deinstall BINS= indexer indextool spelldump wordbreaker EXAMPLES= example.sql api DOCS= doc/sphinx.css doc/sphinx.html doc/sphinx.txt doc/sphinx.xml \ 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/searchd.pid!${SPHINX_RUN}/searchd.pid!" \ -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 do-install: .for bin in ${BINS} ${INSTALL_PROGRAM} ${WRKSRC}/src/${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 do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for doc in ${DOCS} ${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR} .endfor do-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} .for example in ${EXAMPLES} @cd ${WRKSRC} && ${COPYTREE_SHARE} ${example} ${STAGEDIR}${EXAMPLESDIR} .endfor .include Index: head/textproc/sphinxsearch/files/patch-src_llsphinxjson.c =================================================================== --- head/textproc/sphinxsearch/files/patch-src_llsphinxjson.c (nonexistent) +++ head/textproc/sphinxsearch/files/patch-src_llsphinxjson.c (revision 460879) @@ -0,0 +1,89 @@ +--- 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: head/textproc/sphinxsearch/files/patch-src_llsphinxjson.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/textproc/sphinxsearch/files/patch-src_llsphinxql.c =================================================================== --- head/textproc/sphinxsearch/files/patch-src_llsphinxql.c (nonexistent) +++ head/textproc/sphinxsearch/files/patch-src_llsphinxql.c (revision 460879) @@ -0,0 +1,89 @@ +--- 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: head/textproc/sphinxsearch/files/patch-src_llsphinxql.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/textproc/sphinxsearch/files/patch-src_searchd.cpp =================================================================== --- head/textproc/sphinxsearch/files/patch-src_searchd.cpp (nonexistent) +++ head/textproc/sphinxsearch/files/patch-src_searchd.cpp (revision 460879) @@ -0,0 +1,23 @@ +--- 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: head/textproc/sphinxsearch/files/patch-src_searchd.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/textproc/sphinxsearch/files/patch-src_sphinx.cpp =================================================================== --- head/textproc/sphinxsearch/files/patch-src_sphinx.cpp (nonexistent) +++ head/textproc/sphinxsearch/files/patch-src_sphinx.cpp (revision 460879) @@ -0,0 +1,111 @@ +--- 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: head/textproc/sphinxsearch/files/patch-src_sphinx.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/textproc/sphinxsearch/files/patch-src_sphinx.h =================================================================== --- head/textproc/sphinxsearch/files/patch-src_sphinx.h (nonexistent) +++ head/textproc/sphinxsearch/files/patch-src_sphinx.h (revision 460879) @@ -0,0 +1,11 @@ +--- 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: head/textproc/sphinxsearch/files/patch-src_sphinx.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/textproc/sphinxsearch/files/patch-src_sphinxaot.cpp =================================================================== --- head/textproc/sphinxsearch/files/patch-src_sphinxaot.cpp (nonexistent) +++ head/textproc/sphinxsearch/files/patch-src_sphinxaot.cpp (revision 460879) @@ -0,0 +1,11 @@ +--- 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: head/textproc/sphinxsearch/files/patch-src_sphinxaot.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/textproc/sphinxsearch/files/patch-src_sphinxint.h =================================================================== --- head/textproc/sphinxsearch/files/patch-src_sphinxint.h (nonexistent) +++ head/textproc/sphinxsearch/files/patch-src_sphinxint.h (revision 460879) @@ -0,0 +1,13 @@ +--- 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: head/textproc/sphinxsearch/files/patch-src_sphinxint.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/textproc/sphinxsearch/files/patch-src_sphinxplugin.cpp =================================================================== --- head/textproc/sphinxsearch/files/patch-src_sphinxplugin.cpp (nonexistent) +++ head/textproc/sphinxsearch/files/patch-src_sphinxplugin.cpp (revision 460879) @@ -0,0 +1,11 @@ +--- 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(&(((T*)1000)->M)) - reinterpret_cast(1000)) ++ ((int)(reinterpret_cast(&(((T*)1000)->M)) - reinterpret_cast(1000))) + #endif + + static SymbolDesc_t g_dSymbolsUDF[] = Property changes on: head/textproc/sphinxsearch/files/patch-src_sphinxplugin.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/textproc/sphinxsearch/files/patch-src_sphinxrt.cpp =================================================================== --- head/textproc/sphinxsearch/files/patch-src_sphinxrt.cpp (nonexistent) +++ head/textproc/sphinxsearch/files/patch-src_sphinxrt.cpp (revision 460879) @@ -0,0 +1,11 @@ +--- 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> 1) & 033333333333) - ((n >> 2) & 011111111111); + return ( (tmp + (tmp >> 3) ) & 030707070707) % 63; + } Property changes on: head/textproc/sphinxsearch/files/patch-src_sphinxstd.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/textproc/sphinxsearch/files/patch-src_sphinxstemen.cpp =================================================================== --- head/textproc/sphinxsearch/files/patch-src_sphinxstemen.cpp (nonexistent) +++ head/textproc/sphinxsearch/files/patch-src_sphinxstemen.cpp (revision 460879) @@ -0,0 +1,11 @@ +--- 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: head/textproc/sphinxsearch/files/patch-src_sphinxstemen.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/textproc/sphinxsearch/files/patch-src_sphinxstemru.inl =================================================================== --- head/textproc/sphinxsearch/files/patch-src_sphinxstemru.inl (nonexistent) +++ head/textproc/sphinxsearch/files/patch-src_sphinxstemru.inl (revision 460879) @@ -0,0 +1,20 @@ +--- 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: head/textproc/sphinxsearch/files/patch-src_sphinxstemru.inl ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/textproc/sphinxsearch/files/patch-src_sphinxutils.cpp =================================================================== --- head/textproc/sphinxsearch/files/patch-src_sphinxutils.cpp (nonexistent) +++ head/textproc/sphinxsearch/files/patch-src_sphinxutils.cpp (revision 460879) @@ -0,0 +1,16 @@ +--- 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: head/textproc/sphinxsearch/files/patch-src_sphinxutils.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property