[107038] trunk/dports/devel/pficommon

[hum at macports.org]

Revision: 107038
          https://trac.macports.org/changeset/107038
Author:   hum at macports.org
Date:     2013-06-15 06:23:29 -0700 (Sat, 15 Jun 2013)
Log Message:
-----------
pficommon: update to 20130603; add postgresql93 variant; fix the pathes of mysql_config and pg_config in src/database/wscript; see #39012.

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-06-15 12:23:59 UTC (rev 107037)
+++ trunk/dports/devel/pficommon/Portfile	2013-06-15 13:23:29 UTC (rev 107038)
@@ -4,8 +4,8 @@
 PortSystem          1.0
 PortGroup           github 1.0
 
-github.setup        pfi pficommon 4734013fa1f997a72ff7f4673baf8dcc26f82d83
-version             20130401
+github.setup        pfi pficommon 97700c8a4cbf506398dd9c8e6c270fe4c1055427
+version             20130603
 
 categories          devel
 maintainers         hum openmaintainer
@@ -16,19 +16,20 @@
 platforms           darwin
 license             BSD
 
-checksums           rmd160  e4de1dc4aa1ff7623dcd2cb87ae6c75cb5dfad58 \
-                    sha256  976e30b7f16005935ed48fc44b4bb3a7686a50f80ad85179d0b9289495798f0a
+checksums           rmd160  936cc492d00c5aa48d9adad212c08fbb34b83513 \
+                    sha256  d5d152586945e84a3c937ef8d417ea9a9f8a9443cd574b3d72c0a62bf6693782
 
 patchfiles          patch-wscript.diff
 
-# optional database version: my = MySQL, pg = PostgreSQL.
-set my_version      55
-set pg_version      92
+# optional database: my = MySQL, pg = PostgreSQL.
+set my_pkg          mysql55
+set pg_version      93
 
 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
+    set mysql_config    ${prefix}/lib/${my_pkg}/bin/mysql_config
+    set pg_config       ${prefix}/lib/postgresql${pg_version}/bin/pg_config
+    reinplace "s|@mysql_config@|${mysql_config}|g" ${worksrcpath}/src/database/wscript
+    reinplace "s|@pg_config@|${pg_config}|g"       ${worksrcpath}/src/database/wscript
 }
 
 # msgpack for jubatus.
@@ -44,11 +45,13 @@
 
 variant mysql55 conflicts mysql51 mariadb percona description {Enable MySQL 5.5} {
     depends_lib-append    port:mysql55
+    set my_pkg            mysql55
     configure.args-delete --disable-mysql
 }
 
 variant mysql51 conflicts mysql55 mariadb percona description {Enable MySQL 5.1} {
     depends_lib-append    port:mysql51
+    set my_pkg            mysql51
     configure.args-delete --disable-mysql
 }
 
@@ -56,31 +59,41 @@
 
 variant mariadb conflicts mysql55 mysql51 percona description {Enable MariaDB} {
     depends_lib-append    port:mariadb
+    set my_pkg            mariadb
     configure.args-delete --disable-mysql
 }
 
 variant percona conflicts mysql55 mysql51 mysql5 mariadb description {Enable Percona} {
     depends_lib-append    port:percona
+    set my_pkg            percona
     configure.args-delete --disable-mysql
 }
 
-variant postgresql92 conflicts postgresql91 postgresql90 postgresql84 description {Enable PostgreSQL 9.2} {
+variant postgresql93 conflicts postgresql92 postgresql91 postgresql90 postgresql84 description {Enable PostgreSQL 9.3} {
+    depends_lib-append    port:postgresql93
+    set pg_version        93
+    configure.args-delete --disable-postgresql
+}
+
+variant postgresql92 conflicts postgresql93 postgresql91 postgresql90 postgresql84 description {Enable PostgreSQL 9.2} {
     depends_lib-append    port:postgresql92
+    set pg_version        92
     configure.args-delete --disable-postgresql
 }
 
-variant postgresql91 conflicts postgresql92 postgresql90 postgresql84 description {Enable PostgreSQL 9.1} {
+variant postgresql91 conflicts postgresql93 postgresql92 postgresql90 postgresql84 description {Enable PostgreSQL 9.1} {
     depends_lib-append    port:postgresql91
+    set pg_version        91
     configure.args-delete --disable-postgresql
 }
 
-variant postgresql90 conflicts postgresql92 postgresql91 postgresql84 description {Enable PostgreSQL 9.0} {
+variant postgresql90 conflicts postgresql93 postgresql92 postgresql91 postgresql84 description {Enable PostgreSQL 9.0} {
     depends_lib-append    port:postgresql90
     set pg_version        90
     configure.args-delete --disable-postgresql
 }
 
-variant postgresql84 conflicts postgresql92 postgresql91 postgresql90 description {Enable PostgreSQL 8.4} {
+variant postgresql84 conflicts postgresql93 postgresql92 postgresql91 postgresql90 description {Enable PostgreSQL 8.4} {
     depends_lib-append    port:postgresql84
     set pg_version        84
     configure.args-delete --disable-postgresql

Modified: trunk/dports/devel/pficommon/files/patch-wscript.diff
===================================================================
--- trunk/dports/devel/pficommon/files/patch-wscript.diff	2013-06-15 12:23:59 UTC (rev 107037)
+++ trunk/dports/devel/pficommon/files/patch-wscript.diff	2013-06-15 13:23:29 UTC (rev 107038)
@@ -56,7 +56,7 @@
 -  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',
++    if conf.check_cfg(path = '@mysql_config@',
                        args = '--cflags --libs_r',
                        package = '',
                        uselib_store = 'MYSQL',
@@ -69,8 +69,8 @@
      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()
++      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,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130615/334849c5/attachment.html>