[84943] trunk/dports/databases/soci-devel/Portfile

[titus at macports.org]

Revision: 84943
          http://trac.macports.org/changeset/84943
Author:   titus at macports.org
Date:     2011-10-04 23:25:03 -0700 (Tue, 04 Oct 2011)
Log Message:
-----------
replaced hardcoded optlocal, removed variants using osx sqlite and postgresql libraries

Modified Paths:
--------------
    trunk/dports/databases/soci-devel/Portfile

Modified: trunk/dports/databases/soci-devel/Portfile
===================================================================
--- trunk/dports/databases/soci-devel/Portfile	2011-10-05 05:58:23 UTC (rev 84942)
+++ trunk/dports/databases/soci-devel/Portfile	2011-10-05 06:25:03 UTC (rev 84943)
@@ -6,6 +6,7 @@
 
 name                        soci-devel
 version                     20110925
+revision                    1
 license                     Boost-1.0
 categories                  databases devel
 platforms                   darwin
@@ -47,15 +48,15 @@
 variant mysql4 conflicts mysql5 description {Build MySQL 4 backend} {
     depends_lib-append          port:mysql4
     configure.args-delete       -DWITH_MYSQL=OFF
-    configure.args-append       -DMYSQL_INCLUDE_DIR=/opt/local/include/mysql
-    configure.args-append       -DMYSQL_LIBRARY=/opt/local/lib/mysql/libmysqlclient_r.dylib
+    configure.args-append       -DMYSQL_INCLUDE_DIR=${prefix}/include/mysql
+    configure.args-append       -DMYSQL_LIBRARY=${prefix}/lib/mysql/libmysqlclient_r.dylib
 }
 
 variant mysql5 conflicts mysql4 description {Build MySQL 5 backend} {
     depends_lib-append          port:mysql5
     configure.args-delete       -DWITH_MYSQL=OFF
-    configure.args-append       -DMYSQL_INCLUDE_DIR=/opt/local/include/mysql5/mysql
-    configure.args-append       -DMYSQL_LIBRARY=/opt/local/lib/mysql5/mysql/libmysqlclient_r.dylib
+    configure.args-append       -DMYSQL_INCLUDE_DIR=${prefix}/include/mysql5/mysql
+    configure.args-append       -DMYSQL_LIBRARY=${prefix}/lib/mysql5/mysql/libmysqlclient_r.dylib
 }
 
 variant odbc description {Build ODBC backend} {
@@ -69,18 +70,7 @@
     configure.env-append        ORACLE_HOME=${prefix}/lib/oracle
 }
 
-# on darwin 11 offer built in postgres
-platform darwin 11 {
-    variant system_postgresql conflicts postgresql84 postgresql90 \
-            description {Build SOCI PostgreSQL backend, using OSX system libraries} {
-        configure.args-delete       -DWITH_POSTGRESQL=OFF
-        configure.args-append       -DPG_CONFIG=/usr/bin/pg_config
-        configure.args-append       -DPOSTGRESQL_INCLUDE_DIR=/usr/include
-        configure.args-append       -DPOSTGRESQL_LIBRARIES=/usr/lib/libpq.dylib
-    }
-}
-
-variant postgresql84 conflicts postgresql90 system_postgresql \
+variant postgresql84 conflicts postgresql90 \
         description {Build PostgreSQL 8.4 backend, using MacPorts postgresql84 port} {
     depends_lib-append           port:postgresql84
     configure.args-append       -DPG_CONFIG=${prefix}/lib/postgresql84/bin/pg_config
@@ -89,7 +79,7 @@
     configure.args-delete       -DWITH_POSTGRESQL=OFF
 }
 
-variant postgresql90 conflicts postgresql84 system_postgresql \
+variant postgresql90 conflicts postgresql84 \
         description {Build PostgreSQL 9.0 backend, using MacPorts postgresql90 port} {
     depends_lib-append          port:postgresql90
     configure.args-append       -DPG_CONFIG=${prefix}/lib/postgresql90/bin/pg_config
@@ -98,16 +88,7 @@
     configure.args-delete       -DWITH_POSTGRESQL=OFF
 }
 
-variant sqlite3 conflicts system_sqlite3 description {Build SQLite 3 backend, using MacPorts sqlite3 port} {
+variant sqlite3 conflicts description {Build SQLite 3 backend, using MacPorts sqlite3 port} {
     depends_lib-append          port:sqlite3
     configure.args-delete       -DWITH_SQLITE3=OFF
 }
-
-platform darwin {
-    variant system_sqlite3 conflicts sqlite3 \
-            description {Build SOCI Sqlite3 backend, using OSX system libraries} {
-        configure.args-delete       -DWITH_SQLITE3=OFF
-        configure.args-append       -DSQLITE3_INCLUDE_DIR=/usr/include
-        configure.args-append       -DSQLITE3_LIBRARY=/usr/lib/libsqlite3.dylib
-    }
-}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111004/d9a5b049/attachment-0001.html>