[67429] trunk/dports/textproc/sphinx/Portfile

[jmr at macports.org]

Revision: 67429
          http://trac.macports.org/changeset/67429
Author:   jmr at macports.org
Date:     2010-05-09 06:56:57 -0700 (Sun, 09 May 2010)
Log Message:
-----------
sphinx: update to 0.9.9 (#22768), fix building with postgres variants (#22804), make mysql support a variant (#16727), add missing dependency on expat and enable libiconv support

Modified Paths:
--------------
    trunk/dports/textproc/sphinx/Portfile

Modified: trunk/dports/textproc/sphinx/Portfile
===================================================================
--- trunk/dports/textproc/sphinx/Portfile	2010-05-09 13:47:53 UTC (rev 67428)
+++ trunk/dports/textproc/sphinx/Portfile	2010-05-09 13:56:57 UTC (rev 67429)
@@ -4,7 +4,7 @@
 PortSystem 1.0
 
 name			    sphinx
-version			    0.9.8.1
+version			    0.9.9
 categories		    textproc net
 maintainers		    brett openmaintainer
 
@@ -16,44 +16,52 @@
                     designed to integrate well with SQL databases and \
                     scripting languages. Currently built-in data sources \
                     support fetching data either via direct connection to \
-                    MySQL, or from an XML pipe.
+                    MySQL or PostgreSQL, or from an XML pipe.
 
-homepage		    http://www.sphinxsearch.com
-master_sites    	${homepage}/downloads/
-checksums       	sha1 eed4c6f5b314f965c19cca8aebd0b6d847cd35f9
+homepage		    http://www.sphinxsearch.com/
+master_sites    	${homepage}downloads/
+checksums       	sha1 8c739b96d756a50972c27c7004488b55d7458015 \
+                   	rmd160 ed3cd1a9328114c1d2a6325cce5520065076c275
 
-depends_lib		    path:bin/mysql_config5:mysql5
+depends_lib		    port:expat \
+                    port:libiconv
+
 configure.args      --mandir=${prefix}/share/man \
                     --datadir=${prefix}/share/doc \
                     --sysconfdir=${prefix}/etc/sphinx \
-		            --with-mysql-includes=${prefix}/include/mysql5/mysql \
-		            --with-mysql-libs=${prefix}/lib/mysql5/mysql
+                    --without-mysql \
+                    ac_cv_search_iconv=-liconv
 
 test.run            yes
 
 variant postgres conflicts postgresql83 postgresql84 description {Enable PostgreSQL support for old PgSQL 8.2} {
     depends_lib-append      port:postgresql82
-    depends_lib-delete      path:bin/mysql_config5:mysql5
-    configure.args-append   --with-pgsql
-    configure.args-append   --with-pgsql-includes=${prefix}/include/postgresql82
-    configure.args-append   --with-pgsql-libs=${prefix}/lib/postgresql82
-    configure.args-delete   --with-mysql-includes
+    configure.args-append   --with-pgsql \
+                            --with-pgsql-includes=${prefix}/include/postgresql82 \
+                            --with-pgsql-libs=${prefix}/lib/postgresql82
 }
 
 variant postgresql83 conflicts postgres postgresql84 description {Enable PostgreSQL support for newer PgSQL v8.3} {
     depends_lib-append      port:postgresql83
-    depends_lib-delete      path:bin/mysql_config5:mysql5
-    configure.args-append   --with-pgsql
-    configure.args-append   --with-pgsql-includes=${prefix}/include/postgresql83
-    configure.args-append   --with-pgsql-libs=${prefix}/lib/postgresql83
-    configure.args-delete   --with-mysql-includes
+    configure.args-append   --with-pgsql \
+                            --with-pgsql-includes=${prefix}/include/postgresql83 \
+                            --with-pgsql-libs=${prefix}/lib/postgresql83
 }
 
 variant postgresql84 conflicts postgres postgresql83 description {Enable PostgreSQL support for newer PgSQL v8.4} {
     depends_lib-append      port:postgresql84
-    depends_lib-delete      path:bin/mysql_config5:mysql5
-    configure.args-append   --with-pgsql
-    configure.args-append   --with-pgsql-includes=${prefix}/include/postgresql84
-    configure.args-append   --with-pgsql-libs=${prefix}/lib/postgresql84
-    configure.args-delete   --with-mysql-includes
+    configure.args-append   --with-pgsql \
+                            --with-pgsql-includes=${prefix}/include/postgresql84 \
+                            --with-pgsql-libs=${prefix}/lib/postgresql84
 }
+
+variant mysql5 description {Enable MySQL 5 support} {
+    depends_lib-append      path:bin/mysql_config5:mysql5
+    configure.args-delete   --without-mysql
+    configure.args-append   --with-mysql-includes=${prefix}/include/mysql5/mysql \
+		                    --with-mysql-libs=${prefix}/lib/mysql5/mysql
+}
+
+if {![variant_isset postgres] && ![variant_isset postgresql83] && ![variant_isset postgresql84] && ![variant_isset mysql5]} {
+    default_variants +mysql5
+}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100509/abd65c32/attachment.html>