Changeset 99043
- Timestamp:
- Oct 25, 2012, 12:55:56 AM (12 years ago)
- Location:
- trunk/dports/textproc/sphinx
- Files:
-
- 1 deleted
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/dports/textproc/sphinx/Portfile
r97751 r99043 5 5 6 6 name sphinx 7 version 0.9.9 8 revision 1 7 version 2.0.6 9 8 categories textproc net 10 9 license GPL-2 … … 24 23 homepage http://sphinxsearch.com/ 25 24 master_sites ${homepage}files/ 25 distname ${name}-${version}-release 26 26 27 checksums sha1 8c739b96d756a50972c27c7004488b55d7458015\28 rmd160 ed3cd1a9328114c1d2a6325cce5520065076c27527 checksums rmd160 6fd53230457e62a6aabcb5321265abd8ea324cf6 \ 28 sha256 de943c397efda706661b3a12e12e9f8cc8a03bf6c02c5a6ba967a06384feede2 29 29 30 30 depends_lib port:expat \ 31 31 port:libiconv 32 32 33 patchfiles endian.patch \ 34 src_sphinxexpr.cpp.patch 33 patchfiles endian.patch 35 34 36 configure.args --mandir=${prefix}/share/man \ 37 --datadir=${prefix}/share/doc \ 35 configure.args --datadir=${prefix}/share/doc \ 38 36 --sysconfdir=${prefix}/etc/sphinx \ 39 --without-mysql \ 40 ac_cv_search_iconv=-liconv 37 --without-mysql 41 38 42 39 test.run yes 43 40 44 variant postgres conflicts postgresql83 postgresql84 postgresql90 postgresql91 description {Enable PostgreSQL 8.2 support} { 41 variant postgres requires postgresql82 description {Legacy compatibility variant} {} 42 43 variant postgresql82 conflicts postgresql83 postgresql84 postgresql90 postgresql91 postgresql92 description {Enable PostgreSQL 8.2 support} { 45 44 depends_lib-append port:postgresql82 46 45 configure.args-append --with-pgsql \ … … 49 48 } 50 49 51 variant postgresql83 conflicts postgres postgresql84 postgresql90 postgresql91description {Enable PostgreSQL 8.3 support} {50 variant postgresql83 conflicts postgresql82 postgresql84 postgresql90 postgresql91 postgresql92 description {Enable PostgreSQL 8.3 support} { 52 51 depends_lib-append port:postgresql83 53 52 configure.args-append --with-pgsql \ … … 56 55 } 57 56 58 variant postgresql84 conflicts postgres postgresql83 postgresql90 postgresql91description {Enable PostgreSQL 8.4 support} {57 variant postgresql84 conflicts postgresql82 postgresql83 postgresql90 postgresql91 postgresql92 description {Enable PostgreSQL 8.4 support} { 59 58 depends_lib-append port:postgresql84 60 59 configure.args-append --with-pgsql \ … … 63 62 } 64 63 65 variant postgresql90 conflicts postgres postgresql83 postgresql84 postgresql91description {Enable PostgreSQL 9.0 support} {64 variant postgresql90 conflicts postgresql82 postgresql83 postgresql84 postgresql91 postgresql92 description {Enable PostgreSQL 9.0 support} { 66 65 depends_lib-append port:postgresql90 67 66 configure.args-append --with-pgsql \ … … 70 69 } 71 70 72 variant postgresql91 conflicts postgres postgresql83 postgresql84 postgresql90description {Enable PostgreSQL 9.1 support} {71 variant postgresql91 conflicts postgresql82 postgresql83 postgresql84 postgresql90 postgresql92 description {Enable PostgreSQL 9.1 support} { 73 72 depends_lib-append port:postgresql91 74 73 configure.args-append --with-pgsql \ … … 77 76 } 78 77 79 variant mysql5 description {Enable MySQL 5 support} { 78 variant postgresql92 conflicts postgresql82 postgresql83 postgresql84 postgresql90 postgresql91 description {Enable PostgreSQL 9.2 support} { 79 depends_lib-append port:postgresql91 80 configure.args-append --with-pgsql \ 81 --with-pgsql-includes=${prefix}/include/postgresql91 \ 82 --with-pgsql-libs=${prefix}/lib/postgresql91 83 } 84 85 variant mysql5 conflicts mysql51 mysql55 mariadb percona description {Enable MySQL 5 support} { 80 86 depends_lib-append path:bin/mysql_config5:mysql5 81 87 configure.args-delete --without-mysql … … 84 90 } 85 91 86 if {![variant_isset postgres] && ![variant_isset postgresql83] && ![variant_isset postgresql84] && ![variant_isset postgresql90] && ![variant_isset mysql5]} { 92 variant mysql51 conflicts mysql5 mysql55 mariadb percona description {Enable MySQL 5.1 support} { 93 depends_lib-append port:mysql51 94 configure.args-delete --without-mysql 95 configure.args-append --with-mysql-includes=${prefix}/include/mysql51/mysql \ 96 --with-mysql-libs=${prefix}/lib/mysql51/mysql 97 } 98 99 variant mysql55 conflicts mysql5 mysql51 mariadb percona description {Enable MySQL 5.5 support} { 100 depends_lib-append port:mysql55 101 configure.args-delete --without-mysql 102 configure.args-append --with-mysql-includes=${prefix}/include/mysql55/mysql \ 103 --with-mysql-libs=${prefix}/lib/mysql55/mysql 104 } 105 106 variant mariadb conflicts mysql5 mysql51 mysql55 percona description {Enable MariaDB support} { 107 depends_lib-append port:mariadb 108 configure.args-delete --without-mysql 109 configure.args-append --with-mysql-includes=${prefix}/include/mariadb/mysql \ 110 --with-mysql-libs=${prefix}/lib/mariadb/mysql 111 } 112 113 variant percona conflicts mysql5 mysql51 mysql55 mariadb description {Enable Percona support} { 114 depends_lib-append port:percona 115 configure.args-delete --without-mysql 116 configure.args-append --with-mysql-includes=${prefix}/include/percona/mysql \ 117 --with-mysql-libs=${prefix}/lib/percona/mysql 118 } 119 120 if {![variant_isset postgresql82] && ![variant_isset postgresql83] && ![variant_isset postgresql84] && ![variant_isset postgresql90] && ![variant_isset postgresql91] && ![variant_isset postgresql92] && ![variant_isset mysql5] && ![variant_isset mysql51] && ![variant_isset mysql55] && ![variant_isset mariadb] && ![variant_isset percona]} { 87 121 default_variants +mysql5 88 122 } -
trunk/dports/textproc/sphinx/files/endian.patch
r87626 r99043 1 --- src/sphinxstemru.cpp.orig 2009-03-03 02:42:35.000000000 +1100 2 +++ src/sphinxstemru.cpp 2011-11-30 02:05:50.000000000 +1100 3 @@ -68,6 +68,47 @@ struct RussianAlphabetWin1251_t 1 --- configure.orig 2012-10-21 15:50:56.000000000 -0500 2 +++ configure 2012-10-24 19:43:13.000000000 -0500 3 @@ -7785,231 +7785,6 @@ 4 5 fi 6 7 -# check endianness 8 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 9 -$as_echo_n "checking whether byte ordering is bigendian... " >&6; } 10 -if test "${ac_cv_c_bigendian+set}" = set; then : 11 - $as_echo_n "(cached) " >&6 12 -else 13 - ac_cv_c_bigendian=unknown 14 - # See if we're dealing with a universal compiler. 15 - cat confdefs.h - <<_ACEOF >conftest.$ac_ext 16 -/* end confdefs.h. */ 17 -#ifndef __APPLE_CC__ 18 - not a universal capable compiler 19 - #endif 20 - typedef int dummy; 21 - 22 -_ACEOF 23 -if ac_fn_cxx_try_compile "$LINENO"; then : 24 - 25 - # Check for potential -arch flags. It is not universal unless 26 - # there are at least two -arch flags with different values. 27 - ac_arch= 28 - ac_prev= 29 - for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do 30 - if test -n "$ac_prev"; then 31 - case $ac_word in 32 - i?86 | x86_64 | ppc | ppc64) 33 - if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then 34 - ac_arch=$ac_word 35 - else 36 - ac_cv_c_bigendian=universal 37 - break 38 - fi 39 - ;; 40 - esac 41 - ac_prev= 42 - elif test "x$ac_word" = "x-arch"; then 43 - ac_prev=arch 44 - fi 45 - done 46 -fi 47 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 48 - if test $ac_cv_c_bigendian = unknown; then 49 - # See if sys/param.h defines the BYTE_ORDER macro. 50 - cat confdefs.h - <<_ACEOF >conftest.$ac_ext 51 -/* end confdefs.h. */ 52 -#include <sys/types.h> 53 - #include <sys/param.h> 54 - 55 -int 56 -main () 57 -{ 58 -#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \ 59 - && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \ 60 - && LITTLE_ENDIAN) 61 - bogus endian macros 62 - #endif 63 - 64 - ; 65 - return 0; 66 -} 67 -_ACEOF 68 -if ac_fn_cxx_try_compile "$LINENO"; then : 69 - # It does; now see whether it defined to BIG_ENDIAN or not. 70 - cat confdefs.h - <<_ACEOF >conftest.$ac_ext 71 -/* end confdefs.h. */ 72 -#include <sys/types.h> 73 - #include <sys/param.h> 74 - 75 -int 76 -main () 77 -{ 78 -#if BYTE_ORDER != BIG_ENDIAN 79 - not big endian 80 - #endif 81 - 82 - ; 83 - return 0; 84 -} 85 -_ACEOF 86 -if ac_fn_cxx_try_compile "$LINENO"; then : 87 - ac_cv_c_bigendian=yes 88 -else 89 - ac_cv_c_bigendian=no 90 -fi 91 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 92 -fi 93 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 94 - fi 95 - if test $ac_cv_c_bigendian = unknown; then 96 - # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). 97 - cat confdefs.h - <<_ACEOF >conftest.$ac_ext 98 -/* end confdefs.h. */ 99 -#include <limits.h> 100 - 101 -int 102 -main () 103 -{ 104 -#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN) 105 - bogus endian macros 106 - #endif 107 - 108 - ; 109 - return 0; 110 -} 111 -_ACEOF 112 -if ac_fn_cxx_try_compile "$LINENO"; then : 113 - # It does; now see whether it defined to _BIG_ENDIAN or not. 114 - cat confdefs.h - <<_ACEOF >conftest.$ac_ext 115 -/* end confdefs.h. */ 116 -#include <limits.h> 117 - 118 -int 119 -main () 120 -{ 121 -#ifndef _BIG_ENDIAN 122 - not big endian 123 - #endif 124 - 125 - ; 126 - return 0; 127 -} 128 -_ACEOF 129 -if ac_fn_cxx_try_compile "$LINENO"; then : 130 - ac_cv_c_bigendian=yes 131 -else 132 - ac_cv_c_bigendian=no 133 -fi 134 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 135 -fi 136 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 137 - fi 138 - if test $ac_cv_c_bigendian = unknown; then 139 - # Compile a test program. 140 - if test "$cross_compiling" = yes; then : 141 - # Try to guess by grepping values from an object file. 142 - cat confdefs.h - <<_ACEOF >conftest.$ac_ext 143 -/* end confdefs.h. */ 144 -short int ascii_mm[] = 145 - { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; 146 - short int ascii_ii[] = 147 - { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; 148 - int use_ascii (int i) { 149 - return ascii_mm[i] + ascii_ii[i]; 150 - } 151 - short int ebcdic_ii[] = 152 - { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; 153 - short int ebcdic_mm[] = 154 - { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; 155 - int use_ebcdic (int i) { 156 - return ebcdic_mm[i] + ebcdic_ii[i]; 157 - } 158 - extern int foo; 159 - 160 -int 161 -main () 162 -{ 163 -return use_ascii (foo) == use_ebcdic (foo); 164 - ; 165 - return 0; 166 -} 167 -_ACEOF 168 -if ac_fn_cxx_try_compile "$LINENO"; then : 169 - if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then 170 - ac_cv_c_bigendian=yes 171 - fi 172 - if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then 173 - if test "$ac_cv_c_bigendian" = unknown; then 174 - ac_cv_c_bigendian=no 175 - else 176 - # finding both strings is unlikely to happen, but who knows? 177 - ac_cv_c_bigendian=unknown 178 - fi 179 - fi 180 -fi 181 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 182 -else 183 - cat confdefs.h - <<_ACEOF >conftest.$ac_ext 184 -/* end confdefs.h. */ 185 -$ac_includes_default 186 -int 187 -main () 188 -{ 189 - 190 - /* Are we little or big endian? From Harbison&Steele. */ 191 - union 192 - { 193 - long int l; 194 - char c[sizeof (long int)]; 195 - } u; 196 - u.l = 1; 197 - return u.c[sizeof (long int) - 1] == 1; 198 - 199 - ; 200 - return 0; 201 -} 202 -_ACEOF 203 -if ac_fn_cxx_try_run "$LINENO"; then : 204 - ac_cv_c_bigendian=no 205 -else 206 - ac_cv_c_bigendian=yes 207 -fi 208 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ 209 - conftest.$ac_objext conftest.beam conftest.$ac_ext 210 -fi 211 - 212 - fi 213 -fi 214 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 215 -$as_echo "$ac_cv_c_bigendian" >&6; } 216 - case $ac_cv_c_bigendian in #( 217 - yes) 218 - 219 -$as_echo "#define USE_LITTLE_ENDIAN 0" >>confdefs.h 220 -;; #( 221 - no) 222 - 223 -$as_echo "#define USE_LITTLE_ENDIAN 1" >>confdefs.h 224 - ;; #( 225 - universal) 226 - as_fn_error "universial endianess not supported" "$LINENO" 5 227 - 228 - ;; #( 229 - *) 230 - as_fn_error "unknown endianess not supported" "$LINENO" 5 ;; 231 - esac 232 233 234 235 --- src/sphinx.h.orig 2012-10-19 04:48:07.000000000 -0500 236 +++ src/sphinx.h 2012-10-24 19:32:00.000000000 -0500 237 @@ -128,9 +128,6 @@ 238 239 STATIC_ASSERT ( ( 1 << ROWITEM_SHIFT )==ROWITEM_BITS, INVALID_ROWITEM_SHIFT ); 240 241 -#ifndef USE_LITTLE_ENDIAN 242 -#error Please define endianness 243 -#endif 244 245 template < typename DOCID > 246 inline DOCID DOCINFO2ID_T ( const DWORD * pDocinfo ); 247 @@ -142,7 +139,7 @@ 248 249 template<> inline uint64_t DOCINFO2ID_T ( const DWORD * pDocinfo ) 250 { 251 -#if USE_LITTLE_ENDIAN 252 +#ifdef __LITTLE_ENDIAN__ 253 return uint64_t(pDocinfo[0]) + (uint64_t(pDocinfo[1])<<32); 254 #else 255 return uint64_t(pDocinfo[1]) + (uint64_t(pDocinfo[0])<<32); 256 @@ -156,7 +153,7 @@ 257 258 inline void DOCINFOSETID ( DWORD * pDocinfo, uint64_t uValue ) 259 { 260 -#if USE_LITTLE_ENDIAN 261 +#ifdef __LITTLE_ENDIAN__ 262 pDocinfo[0] = (DWORD)uValue; 263 pDocinfo[1] = (DWORD)(uValue>>32); 264 #else 265 --- src/sphinxstemru.cpp.orig 2012-10-17 05:36:31.000000000 -0500 266 +++ src/sphinxstemru.cpp 2012-10-24 19:32:20.000000000 -0500 267 @@ -70,7 +70,7 @@ 4 268 // UTF-8 implementation 5 269 ///////////////////////////////////////////////////////////////////////////// 6 270 7 +#ifdef __BIG_ENDIAN__ 8 +struct RussianAlphabetUTF8_t 9 +{ 10 + enum 11 + { 12 + A = 0xD0B0U, 13 + B = 0xD0B1U, 14 + V = 0xD0B2U, 15 + G = 0xD0B3U, 16 + D = 0xD0B4U, 17 + E = 0xD0B5U, 18 + YO = 0xD191U, 19 + ZH = 0xD0B6U, 20 + Z = 0xD0B7U, 21 + I = 0xD0B8U, 22 + IY = 0xD0B9U, 23 + K = 0xD0BAU, 24 + L = 0xD0BBU, 25 + M = 0xD0BCU, 26 + N = 0xD0BDU, 27 + O = 0xD0BEU, 28 + P = 0xD0BFU, 29 + R = 0xD180U, 30 + S = 0xD181U, 31 + T = 0xD182U, 32 + U = 0xD183U, 33 + F = 0xD184U, 34 + H = 0xD185U, 35 + TS = 0xD186U, 36 + CH = 0xD187U, 37 + SH = 0xD188U, 38 + SCH = 0xD189U, 39 + TVY = 0xD18AU, // TVYordiy znak 40 + Y = 0xD18BU, 41 + MYA = 0xD18CU, // MYAgkiy znak 42 + EE = 0xD18DU, 43 + YU = 0xD18EU, 44 + YA = 0xD18FU 45 + }; 46 +}; 47 +#else 271 -#if USE_LITTLE_ENDIAN 272 +#ifdef __LITTLE_ENDIAN__ 48 273 struct RussianAlphabetUTF8_t 49 274 { 50 275 enum 51 @@ -107,6 +148,7 @@ struct RussianAlphabetUTF8_t52 YA = 0x8FD1U53 };54 };55 +#endif56 57 #define LOC_CHAR_TYPE unsigned short58 #define LOC_PREFIX(_a) _a##_utf8
Note: See TracChangeset
for help on using the changeset viewer.