[87364] trunk/dports/devel/pficommon
hum at macports.org
hum at macports.org
Fri Nov 18 04:31:34 PST 2011
Revision: 87364
http://trac.macports.org/changeset/87364
Author: hum at macports.org
Date: 2011-11-18 04:31:33 -0800 (Fri, 18 Nov 2011)
Log Message:
-----------
pficommon: add variants to use MacPorts versions of database libraries; see http://lists.macosforge.org/pipermail/macports-dev/2011-November/016783.html.
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 2011-11-18 09:05:10 UTC (rev 87363)
+++ trunk/dports/devel/pficommon/Portfile 2011-11-18 12:31:33 UTC (rev 87364)
@@ -5,7 +5,7 @@
name pficommon
version 1.3.1
-revision 1
+revision 2
categories devel
platforms darwin
maintainers hum openmaintainer
@@ -21,6 +21,16 @@
patchfiles patch-wscript.diff
+# database version: my = MySQL, pg = PostgreSQL.
+set my_version 5
+set pg_version 91
+
+post-patch {
+ reinplace "s|@prefix@|${prefix}|g" ${worksrcpath}/src/database/wscript
+ reinplace "s|@my_version@|${my_version}|g" ${worksrcpath}/src/database/wscript
+ reinplace "s|@pg_version@|${pg_version}|g" ${worksrcpath}/src/database/wscript
+}
+
# msgpack for jubatus.
default_variants +mprpc
@@ -32,28 +42,50 @@
--disable-fcgi \
--disable-magickpp
-variant mysql description {Enable mysql} {
- depends_lib-append lib:mysql_config:mysql5
+variant mysql description {Enable MySQL} {
+ depends_lib-append port:mysql5
configure.args-delete --disable-mysql
}
-variant postgresql description {Enable postgresql} {
- depends_lib-append lib:libpq:postgresql91
+variant mysql5 description {Enable MySQL 5} {
+ depends_lib-append port:mysql5
+ configure.args-delete --disable-mysql
+}
+
+variant postgresql description {Enable PostgreSQL} {
+ depends_lib-append port:postgresql91
configure.args-delete --disable-postgresql
}
-variant fcgi description {Enable fcgi} {
+variant postgresql91 description {Enable PostgreSQL 9.1} {
+ depends_lib-append port:postgresql91
+ configure.args-delete --disable-postgresql
+}
+
+variant postgresql90 description {Enable PostgreSQL 9.0} {
+ depends_lib-append port:postgresql90
+ set pg_version 90
+ configure.args-delete --disable-postgresql
+}
+
+variant postgresql84 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} {
depends_lib-append port:fcgi
configure.args-replace s|--disable-fcgi|--with-fcgi=${prefix}|
}
-variant mprpc description {Enable mprpc} {
+variant mprpc description {Enable MessagePack RPC module} {
depends_lib-append port:msgpack
configure.args-delete --disable-mprpc
}
-variant magickpp description {Enable magick++} {
- depends_lib-append port:imagemagick
+variant magickpp description {Enable Magick++ of ImageMagick module} {
+ depends_lib-append port:ImageMagick
configure.args-delete --disable-magickpp
}
Modified: trunk/dports/devel/pficommon/files/patch-wscript.diff
===================================================================
--- trunk/dports/devel/pficommon/files/patch-wscript.diff 2011-11-18 09:05:10 UTC (rev 87363)
+++ trunk/dports/devel/pficommon/files/patch-wscript.diff 2011-11-18 12:31:33 UTC (rev 87364)
@@ -19,8 +19,8 @@
conf.env.BUILD_PGSQL and 'yes' or 'no',
conf.env.BUILD_MPRPC and 'yes' or 'no',
--- src/database/wscript.orig 2011-10-26 15:20:56.000000000 +0900
-+++ src/database/wscript 2011-11-12 23:46:35.000000000 +0900
-@@ -2,26 +2,36 @@
++++ src/database/wscript 2011-11-18 20:40:33.000000000 +0900
+@@ -2,15 +2,19 @@
import Options
def options(opt):
@@ -38,19 +38,14 @@
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 = 'mysql_config',
++ if conf.check_cfg(path = '@prefix@/bin/mysql_config at my_version@',
args = '--cflags --libs_r',
package = '',
uselib_store = 'MYSQL',
- mandatory = False):
+@@ -18,10 +22,10 @@
conf.env.BUILD_MYSQL = True
-+ if conf.check_cfg(path = 'mysql_config5',
-+ args = '--cflags --libs_r',
-+ package = '',
-+ uselib_store = 'MYSQL',
-+ mandatory = False):
-+ conf.env.BUILD_MYSQL = True
conf.env.BUILD_PGSQL = False
- if not Options.options.disable_database:
@@ -58,8 +53,8 @@
try:
- incdir = subprocess.check_output(['pg_config', '--includedir-server']).decode()
- libdir = subprocess.check_output(['pg_config', '--libdir']).decode()
-+ incdir = subprocess.check_output(['pg_config', '--includedir-server']).rstrip()
-+ libdir = subprocess.check_output(['pg_config', '--libdir']).rstrip()
++ incdir = subprocess.check_output(['@prefix@/lib/postgresql at pg_version@/bin/pg_config', '--includedir-server']).rstrip()
++ libdir = subprocess.check_output(['@prefix@/lib/postgresql at pg_version@/bin/pg_config', '--libdir']).rstrip()
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/20111118/97fa5837/attachment-0001.html>
More information about the macports-changes
mailing list