[94320] trunk/dports/devel/pficommon

[hum at macports.org]

Revision: 94320
          https://trac.macports.org/changeset/94320
Author:   hum at macports.org
Date:     2012-06-15 05:00:54 -0700 (Fri, 15 Jun 2012)
Log Message:
-----------
pficommon: restore --disable-mysql and --disable-postgresql in configure.args.

Modified Paths:
--------------
    trunk/dports/devel/pficommon/Portfile
    trunk/dports/devel/pficommon/files/patch-wscript.diff

Modified: trunk/dports/devel/pficommon/Portfile
===================================================================
--- trunk/dports/devel/pficommon/Portfile	2012-06-15 11:58:20 UTC (rev 94319)
+++ trunk/dports/devel/pficommon/Portfile	2012-06-15 12:00:54 UTC (rev 94320)
@@ -34,7 +34,9 @@
 
 configure.cmd       ./waf configure
 configure.universal_args
-configure.args-append     --disable-mprpc \
+configure.args-append     --disable-mysql \
+                          --disable-postgresql \
+                          --disable-mprpc \
                           --disable-fcgi \
                           --disable-magickpp 
 
@@ -42,22 +44,26 @@
 
 variant mysql5 description {Enable MySQL 5} {
     depends_lib-append    port:mysql5
+    configure.args-delete --disable-mysql
 }
 
 variant postgresql requires postgresql91 description {Obsolete compatibility variant} {}
 
 variant postgresql91 conflicts postgresql90 postgresql84 description {Enable PostgreSQL 9.1} {
     depends_lib-append    port:postgresql91
+    configure.args-delete --disable-postgresql
 }
 
 variant postgresql90 conflicts postgresql91 postgresql84 description {Enable PostgreSQL 9.0} {
     depends_lib-append    port:postgresql90
     set pg_version        90
+    configure.args-delete --disable-postgresql
 }
 
 variant postgresql84 conflicts postgresql91 postgresql90 description {Enable PostgreSQL 8.4} {
     depends_lib-append    port:postgresql84
     set pg_version        84
+    configure.args-delete --disable-postgresql
 }
 
 variant fcgi description {Enable FastCGI module} {

Modified: trunk/dports/devel/pficommon/files/patch-wscript.diff
===================================================================
--- trunk/dports/devel/pficommon/files/patch-wscript.diff	2012-06-15 11:58:20 UTC (rev 94319)
+++ trunk/dports/devel/pficommon/files/patch-wscript.diff	2012-06-15 12:00:54 UTC (rev 94320)
@@ -34,3 +34,65 @@
          conf.env.BUILD_MYSQL and 'yes' or 'no',
          conf.env.BUILD_PGSQL and 'yes' or 'no',
          conf.env.BUILD_MPRPC and 'yes' or 'no',
+*** src/database/wscript.orig	Wed Jun 13 22:36:32 2012
+--- src/database/wscript	Fri Jun 15 20:34:13 2012
+***************
+*** 2,16 ****
+  import Options
+  
+  def options(opt):
+!   opt.add_option('--disable-database',
+                   action = 'store_true',
+                   default = False,
+!                  help = 'disable database')
+  
+  def configure(conf):
+    conf.env.BUILD_MYSQL = False
+!   if not Options.options.disable_database:
+!     if conf.check_cfg(path = 'mysql_config',
+                        args = '--cflags --libs_r',
+                        package = '',
+                        uselib_store = 'MYSQL',
+--- 2,20 ----
+  import Options
+  
+  def options(opt):
+!   opt.add_option('--disable-mysql',
+                   action = 'store_true',
+                   default = False,
+!                  help = 'disable mysql')
+!   opt.add_option('--disable-postgresql',
+!                  action = 'store_true',
+!                  default = False,
+!                  help = 'disable postgresql')
+  
+  def configure(conf):
+    conf.env.BUILD_MYSQL = False
+!   if not Options.options.disable_mysql:
+!     if conf.check_cfg(path = '@prefix@/bin/mysql_config at my_version@',
+                        args = '--cflags --libs_r',
+                        package = '',
+                        uselib_store = 'MYSQL',
+***************
+*** 21,30 ****
+          conf.env.BUILD_MYSQL = True
+  
+    conf.env.BUILD_PGSQL = False
+!   if not Options.options.disable_database:
+      try:
+!       incdir = subprocess.check_output(['pg_config', '--includedir-server']).decode()
+!       libdir = subprocess.check_output(['pg_config', '--libdir']).decode()
+        if conf.check_cxx(lib = 'pq',
+                          header_name = 'postgres.h',
+                          cxxflags = '-I' + incdir,
+--- 25,34 ----
+          conf.env.BUILD_MYSQL = True
+  
+    conf.env.BUILD_PGSQL = False
+!   if not Options.options.disable_postgresql:
+      try:
+!       incdir = subprocess.check_output(['@prefix@/lib/postgresql at pg_version@/bin/pg_config', '--includedir-server']).decode()
+!       libdir = subprocess.check_output(['@prefix@/lib/postgresql at pg_version@/bin/pg_config', '--libdir']).decode()
+        if conf.check_cxx(lib = 'pq',
+                          header_name = 'postgres.h',
+                          cxxflags = '-I' + incdir,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120615/f4e95bde/attachment.html>