Revision: 103267 https://trac.macports.org/changeset/103267 Author: hum@macports.org Date: 2013-02-19 07:51:19 -0800 (Tue, 19 Feb 2013) Log Message: ----------- pficommon: update to the latest in github. 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 2013-02-19 15:27:17 UTC (rev 103266) +++ trunk/dports/devel/pficommon/Portfile 2013-02-19 15:51:19 UTC (rev 103267) @@ -4,8 +4,7 @@ PortSystem 1.0 PortGroup github 1.0 -github.setup pfi pficommon d7fffe9ef29045f2e50cbd20cdd61a63a2055e15 -version 1.3.1.20130111 +github.setup pfi pficommon 4e34ef44b61b40a1eab37879487f9145549b7b10 categories devel maintainers hum openmaintainer @@ -16,8 +15,8 @@ platforms darwin license BSD -checksums rmd160 02f17bd3895f8f246d93196fcd2168b86cbbdf91 \ - sha256 fef3ef838dd26b14a82ddddf4779b734157f9681653edfa50b4f9c8c4bfc705f +checksums rmd160 1241d0f411ea0cc470e0d4062a47e69183ee1903 \ + sha256 e82f7e06182fe321a4389241842d9a83a59560db440ea4fe40b530ccdc36aaf0 patchfiles patch-wscript.diff @@ -105,5 +104,3 @@ } } } - -livecheck.version [join [lrange [split ${version} .] 0 2] .].0 Modified: trunk/dports/devel/pficommon/files/patch-wscript.diff =================================================================== --- trunk/dports/devel/pficommon/files/patch-wscript.diff 2013-02-19 15:27:17 UTC (rev 103266) +++ trunk/dports/devel/pficommon/files/patch-wscript.diff 2013-02-19 15:51:19 UTC (rev 103267) @@ -34,65 +34,43 @@ 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@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@pg_version@/bin/pg_config', '--includedir-server']).decode() -! libdir = subprocess.check_output(['@prefix@/lib/postgresql@pg_version@/bin/pg_config', '--libdir']).decode() - if conf.check_cxx(lib = 'pq', - header_name = 'postgres.h', - cxxflags = '-I' + incdir, +--- src/database/wscript.orig 2013-02-18 17:40:50.000000000 +0900 ++++ src/database/wscript 2013-02-20 00:40:00.000000000 +0900 +@@ -2,15 +2,19 @@ + from waflib import Options + + def options(opt): +- opt.add_option('--disable-database', ++ opt.add_option('--disable-mysql', + action = 'store_true', + default = False, +- help = 'disable database') ++ 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_database: +- if conf.check_cfg(path = 'mysql_config', ++ if not Options.options.disable_mysql: ++ if conf.check_cfg(path = '/opt/local/bin/mysql_config5', + args = '--cflags --libs_r', + package = '', + uselib_store = 'MYSQL', +@@ -21,10 +25,10 @@ + conf.env.BUILD_MYSQL = True + + conf.env.BUILD_PGSQL = False +- if not Options.options.disable_database: ++ if not Options.options.disable_postgresql: + try: +- incdir = subprocess.check_output(['pg_config', '--includedir-server']).decode() +- libdir = subprocess.check_output(['pg_config', '--libdir']).decode() ++ incdir = subprocess.check_output(['/opt/local/lib/postgresql91/bin/pg_config', '--includedir-server']).decode() ++ libdir = subprocess.check_output(['/opt/local/lib/postgresql91/bin/pg_config', '--libdir']).decode() + if conf.check_cxx(lib = 'pq', + header_name = 'postgres.h', + cxxflags = '-I' + incdir,