<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[137724] trunk/dports/databases/libgda5</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/137724">137724</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2015-06-17 21:19:52 -0700 (Wed, 17 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>libgda5: update to version 5.2.4, add variants +vala +db53 +db60 +postgresql94, drop variant +postgresql84 (long past EOL), default variants +db60 +postgresql94 +vala.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdatabaseslibgda5Portfile">trunk/dports/databases/libgda5/Portfile</a></li>
<li><a href="#trunkdportsdatabaseslibgda5filespatchbdbdiff">trunk/dports/databases/libgda5/files/patch-bdb.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsdatabaseslibgda5filespatchconfigureacdiff">trunk/dports/databases/libgda5/files/patch-configure.ac.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdatabaseslibgda5Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/databases/libgda5/Portfile (137723 => 137724)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/databases/libgda5/Portfile 2015-06-18 03:54:33 UTC (rev 137723)
+++ trunk/dports/databases/libgda5/Portfile 2015-06-18 04:19:52 UTC (rev 137724)
</span><span class="lines">@@ -6,8 +6,7 @@
</span><span class="cx">
</span><span class="cx"> name libgda5
</span><span class="cx"> set gname libgda
</span><del>-version 5.2.2
-revision 2
</del><ins>+version 5.2.4
</ins><span class="cx"> license {GPL-2 LGPL}
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description GDA provides uniform access to different kinds of data sources.
</span><span class="lines">@@ -23,8 +22,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 d391a7ea74d08ae4f5f5fe7ba6c49f2f254be5f9 \
- sha256 c9b8b1c32f1011e47b73c5dcf36649aaef2f1edaa5f5d75be20d9caadc2bc3e4
</del><ins>+checksums rmd160 6e39fb20c046ff98d0bb6a347785535b9267aa1d \
+ sha256 2cee38dd583ccbaa5bdf6c01ca5f88cc08758b9b144938a51a478eb2684b765e
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><span class="lines">@@ -53,8 +52,11 @@
</span><span class="cx">
</span><span class="cx"> gobject_introspection yes
</span><span class="cx">
</span><del>-patchfiles patch-bdb.diff
</del><ins>+patchfiles patch-configure.ac.diff \
+ patch-bdb.diff
</ins><span class="cx">
</span><ins>+# patch-slname.diff
+
</ins><span class="cx"> # reconfigure using upstream autogen.sh for intltool 0.51 compatibility
</span><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="lines">@@ -83,6 +85,17 @@
</span><span class="cx"> --with-java=no \
</span><span class="cx"> --with-jni=no
</span><span class="cx">
</span><ins>+variant vala description {Build vala bindings and extensions} {
+ depends_lib-append port:vala \
+ port:libgee
+ configure.env-append VALA_API_VERSION=0.28
+ configure.args-append --enable-vala=yes \
+ --enable-gdaui-vala=yes \
+ --enable-vala-extensions=yes
+}
+
+default_variants +vala
+
</ins><span class="cx"> variant mysql5 \
</span><span class="cx"> description {support for current MySQL 5.x} {
</span><span class="cx"> depends_lib-append path:bin/mysql_config5:mysql5
</span><span class="lines">@@ -93,15 +106,7 @@
</span><span class="cx"> configure.cppflags-append "-I${prefix}/include/mysql5/mysql"
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant postgresql84 conflicts postgresql90 postgresql91 postgresql92 postgresql93 \
- description {support for PostgreSQL 8.4.x} {
- configure.cppflags-append "-I${prefix}/include/postgresql84"
- depends_lib-append port:postgresql84
- configure.args-delete --with-postgres=no
- configure.args-append --with-postgres=${prefix}/lib/postgresql84
-}
-
-variant postgresql90 conflicts postgresql84 postgresql91 postgresql92 postgresql93 \
</del><ins>+variant postgresql90 conflicts postgresql91 postgresql92 postgresql93 postgresql94 \
</ins><span class="cx"> description {support for PostgreSQL 9.0.x} {
</span><span class="cx"> configure.cppflags-append "-I${prefix}/include/postgresql90"
</span><span class="cx"> depends_lib-append port:postgresql90
</span><span class="lines">@@ -109,7 +114,7 @@
</span><span class="cx"> configure.args-append --with-postgres=${prefix}/lib/postgresql90
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant postgresql91 conflicts postgresql84 postgresql90 postgresql92 postgresql93 \
</del><ins>+variant postgresql91 conflicts postgresql90 postgresql92 postgresql93 postgresql94 \
</ins><span class="cx"> description {support for PostgreSQL 9.1.x} {
</span><span class="cx"> configure.cppflags-append "-I${prefix}/include/postgresql91"
</span><span class="cx"> depends_lib-append port:postgresql91
</span><span class="lines">@@ -117,7 +122,7 @@
</span><span class="cx"> configure.args-append --with-postgres=${prefix}/lib/postgresql91
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant postgresql92 conflicts postgresql84 postgresql90 postgresql91 postgresql93 \
</del><ins>+variant postgresql92 conflicts postgresql90 postgresql91 postgresql93 postgresql94 \
</ins><span class="cx"> description {support for PostgreSQL 9.2.x} {
</span><span class="cx"> configure.cppflags-append "-I${prefix}/include/postgresql92"
</span><span class="cx"> depends_lib-append port:postgresql92
</span><span class="lines">@@ -125,7 +130,7 @@
</span><span class="cx"> configure.args-append --with-postgres=${prefix}/lib/postgresql92
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant postgresql93 conflicts postgresql84 postgresql90 postgresql91 postgresql92 \
</del><ins>+variant postgresql93 conflicts postgresql90 postgresql91 postgresql92 postgresql94 \
</ins><span class="cx"> description {support for PostgreSQL 9.3.x} {
</span><span class="cx"> configure.cppflags-append "-I${prefix}/include/postgresql93"
</span><span class="cx"> depends_lib-append port:postgresql93
</span><span class="lines">@@ -133,14 +138,22 @@
</span><span class="cx"> configure.args-append --with-postgres=${prefix}/lib/postgresql93
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if {![variant_isset postgresql84] && \
- ![variant_isset postgresql90] && \
</del><ins>+variant postgresql94 conflicts postgresql90 postgresql91 postgresql92 postgresql93 \
+ description {support for PostgreSQL 9.4.x} {
+ configure.cppflags-append "-I${prefix}/include/postgresql94"
+ depends_lib-append port:postgresql94
+ configure.args-delete --with-postgres=no
+ configure.args-append --with-postgres=${prefix}/lib/postgresql94
+}
+
+if {![variant_isset postgresql90] && \
</ins><span class="cx"> ![variant_isset postgresql91] && \
</span><del>- ![variant_isset postgresql92] } {
- default_variants +postgresql93
</del><ins>+ ![variant_isset postgresql92] && \
+ ![variant_isset postgresql93] } {
+ default_variants +postgresql94
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-variant db47 conflicts db48 db51 \
</del><ins>+variant db47 conflicts db48 db51 db53 db60 \
</ins><span class="cx"> description {support for Berkeley DB 4.7.x} {
</span><span class="cx"> set db_version 47
</span><span class="cx"> depends_lib-append port:db${db_version}
</span><span class="lines">@@ -150,7 +163,7 @@
</span><span class="cx"> --with-bdb-libdir-name=lib/db${db_version}
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant db48 conflicts db47 db51 \
</del><ins>+variant db48 conflicts db47 db51 db53 db60 \
</ins><span class="cx"> description {support for Berkeley DB 4.8.x} {
</span><span class="cx"> set db_version 48
</span><span class="cx"> depends_lib-append port:db${db_version}
</span><span class="lines">@@ -160,7 +173,7 @@
</span><span class="cx"> --with-bdb-libdir-name=lib/db${db_version}
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant db51 conflicts db47 db48 \
</del><ins>+variant db51 conflicts db47 db48 db53 db60 \
</ins><span class="cx"> description {support for Berkeley DB 5.1.x} {
</span><span class="cx"> set db_version 51
</span><span class="cx"> depends_lib-append port:db${db_version}
</span><span class="lines">@@ -170,10 +183,33 @@
</span><span class="cx"> --with-bdb-libdir-name=lib/db${db_version}
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if {![variant_isset db47] && ![variant_isset db48]} {
- default_variants +db51
</del><ins>+variant db53 conflicts db47 db48 db51 db60 \
+ description {support for Berkeley DB 5.3.x} {
+ set db_version 53
+ depends_lib-append port:db${db_version}
+ configure.cppflags-append "-I${prefix}/include/db${db_version}"
+ configure.args-delete --with-bdb=no
+ configure.args-append --with-bdb=${prefix} \
+ --with-bdb-libdir-name=lib/db${db_version}
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+variant db60 conflicts db47 db48 db51 db53 \
+ description {support for Berkeley DB 6.0.x} {
+ set db_version 60
+ depends_lib-append port:db${db_version}
+ configure.cppflags-append "-I${prefix}/include/db${db_version}"
+ configure.args-delete --with-bdb=no
+ configure.args-append --with-bdb=${prefix} \
+ --with-bdb-libdir-name=lib/db${db_version}
+}
+
+if {![variant_isset db47] && \
+ ![variant_isset db48] && \
+ ![variant_isset db51] && \
+ ![variant_isset db53]} {
+ default_variants +db60
+}
+
</ins><span class="cx"> post-activate {
</span><span class="cx"> system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
</span><span class="cx"> system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span></span></pre></div>
<a id="trunkdportsdatabaseslibgda5filespatchbdbdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/databases/libgda5/files/patch-bdb.diff (137723 => 137724)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/databases/libgda5/files/patch-bdb.diff 2015-06-18 03:54:33 UTC (rev 137723)
+++ trunk/dports/databases/libgda5/files/patch-bdb.diff 2015-06-18 04:19:52 UTC (rev 137724)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- m4/bdb.m4.orig 2013-01-18 12:03:42.000000000 -0800
-+++ m4/bdb.m4 2013-10-01 12:15:14.000000000 -0700
-@@ -119,6 +119,9 @@
</del><ins>+--- m4/bdb.m4.orig 2014-02-05 12:28:20.000000000 -0800
++++ m4/bdb.m4 2015-06-14 01:02:03.000000000 -0700
+@@ -133,6 +133,9 @@
</ins><span class="cx"> if test $platform_win32 = yes
</span><span class="cx"> then
</span><span class="cx"> sversion=`echo $version | sed -e 's,\.,,g'`
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> else
</span><span class="cx"> sversion=`echo $version | sed -e 's,\..*,,g'`
</span><span class="cx"> fi
</span><del>-@@ -135,6 +138,12 @@
</del><ins>+@@ -149,6 +152,12 @@
</ins><span class="cx"> db_lib="-ldb$sversion"
</span><span class="cx"> db_libfile="$d/$bdb_loclibdir/libdb$sversion$bdb_libext"
</span><span class="cx"> try_headers="db.h db$version/db.h db$sversion/db.h"
</span><span class="lines">@@ -23,16 +23,16 @@
</span><span class="cx"> else
</span><span class="cx"> db_libfilename="libdb-$version$bdb_libext"
</span><span class="cx"> db_lib="-ldb-$version"
</span><del>-@@ -145,7 +154,7 @@
</del><ins>+@@ -159,7 +168,7 @@
</ins><span class="cx">
</span><span class="cx"> for db_hdr in $try_headers
</span><span class="cx"> do
</span><del>-- #echo "Checking for files $d/include/$db_hdr and $db_libfile"
-+ echo "Checking for files $d/include/$db_hdr and $db_libfile"
- if test -f $d/include/$db_hdr -a -f $db_libfile
</del><ins>+- #echo "Checking for files $d/$bdb_locincludedir/$db_hdr and $db_libfile"
++ echo "Checking for files $d/$bdb_locincludedir/$db_hdr and $db_libfile"
+ if test -f $d/$bdb_locincludedir/$db_hdr -a -f $db_libfile
</ins><span class="cx"> then
</span><span class="cx"> save_CFLAGS="$CFLAGS"
</span><del>-@@ -222,6 +231,9 @@
</del><ins>+@@ -236,6 +245,9 @@
</ins><span class="cx"> if test "x$platform_win32" = xyes
</span><span class="cx"> then
</span><span class="cx"> bdbsql_loclibdir=bin
</span><span class="lines">@@ -42,16 +42,16 @@
</span><span class="cx"> else
</span><span class="cx"> bdbsql_loclibdir=lib
</span><span class="cx"> fi
</span><del>-@@ -232,10 +244,13 @@
</del><ins>+@@ -246,10 +258,13 @@
</ins><span class="cx"> if test "x$BDB_DIR" != x
</span><span class="cx"> then
</span><span class="cx"> AC_MSG_CHECKING([for Berkeley DB SQL files along with found BDB installation])
</span><del>-- #echo "Checking $BDB_DIR/include/dbsql.h and $BDB_DIR/include/libdb/dbsql.h"
-- if test -f $BDB_DIR/include/dbsql.h -o -f $BDB_DIR/include/libdb/dbsql.h
</del><ins>+- #echo "Checking $BDB_DIR/$bdb_locincludedir/dbsql.h and $BDB_DIR/$bdb_locincludedir/libdb/dbsql.h"
+- if test -f $BDB_DIR/$bdb_locincludedir/dbsql.h -o -f $BDB_DIR/$bdb_locincludedir/libdb/dbsql.h
</ins><span class="cx"> + echo "Checking $BDB_DIR/include/db$sversion/dbsql.h, $BDB_DIR/include/dbsql.h and $BDB_DIR/include/libdb/dbsql.h"
</span><span class="cx"> + if test -f $BDB_DIR/include/db$sversion/dbsql.h -o $BDB_DIR/include/dbsql.h -o -f $BDB_DIR/include/libdb/dbsql.h
</span><span class="cx"> then
</span><del>-- if test -f $BDB_DIR/include/libdb/dbsql.h
</del><ins>+- if test -f $BDB_DIR/$bdb_locincludedir/libdb/dbsql.h
</ins><span class="cx"> + if test -f $BDB_DIR/include/db$sversion/dbsql.h
</span><span class="cx"> + then
</span><span class="cx"> + BDBSQL_CFLAGS="$BDB_CFLAGS/db$sversion"
</span><span class="lines">@@ -59,22 +59,3 @@
</span><span class="cx"> then
</span><span class="cx"> BDBSQL_CFLAGS="$BDB_CFLAGS/libdb"
</span><span class="cx"> else
</span><del>---- configure.ac.orig 2013-11-17 07:18:01.000000000 -0800
-+++ configure.ac 2013-11-19 20:42:58.000000000 -0800
-@@ -378,7 +378,7 @@
- AC_DEFINE(ENABLE_BINRELOC)
- br_cv_binreloc=yes
- fi
-- PKG_CHECK_MODULES(MAC_INTEGRATION, ige-mac-integration, have_ige=yes, have_ige=no)
-+ PKG_CHECK_MODULES(MAC_INTEGRATION, ige-mac-integration, have_ige=no, have_ige=no)
- if test x"$have_ige" = "xyes"
- then
- AC_DEFINE(HAVE_MAC_INTEGRATION)
-@@ -388,6 +388,7 @@
- LIBTOOL_EXPORT_OPTIONS=$EXPORT_SYM_REGEX
- LIBTOOL_PROV_EXPORT_OPTIONS=$EXPORT_PROV_SYM_REGEX
- LIBTOOL_UI_EXPORT_OPTIONS=$EXPORT_UI_SYM_REGEX
-+ linklibext=.dylib
- AC_DEFINE(HAVE_CARBON)
- COREDEPS_LIBS="$COREDEPS_LIBS -framework Carbon"
- ;;
</del></span></pre></div>
<a id="trunkdportsdatabaseslibgda5filespatchconfigureacdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/databases/libgda5/files/patch-configure.ac.diff (0 => 137724)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/databases/libgda5/files/patch-configure.ac.diff (rev 0)
+++ trunk/dports/databases/libgda5/files/patch-configure.ac.diff 2015-06-18 04:19:52 UTC (rev 137724)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+--- configure.ac.orig 2015-06-13 02:07:23.000000000 -0700
++++ configure.ac 2015-06-14 01:06:53.000000000 -0700
+@@ -378,7 +378,7 @@
+ AC_DEFINE(ENABLE_BINRELOC)
+ br_cv_binreloc=yes
+ fi
+- PKG_CHECK_MODULES(MAC_INTEGRATION, ige-mac-integration, have_ige=yes, have_ige=no)
++ PKG_CHECK_MODULES(MAC_INTEGRATION, ige-mac-integration, have_ige=no, have_ige=no)
+ if test x"$have_ige" = "xyes"
+ then
+ AC_DEFINE(HAVE_MAC_INTEGRATION)
+@@ -388,6 +388,7 @@
+ LIBTOOL_EXPORT_OPTIONS=$EXPORT_SYM_REGEX
+ LIBTOOL_PROV_EXPORT_OPTIONS=$EXPORT_PROV_SYM_REGEX
+ LIBTOOL_UI_EXPORT_OPTIONS=$EXPORT_UI_SYM_REGEX
++ linklibext=.dylib
+ AC_DEFINE(HAVE_CARBON)
+ COREDEPS_LIBS="$COREDEPS_LIBS -framework Carbon"
+ ;;
</ins></span></pre>
</div>
</div>
</body>
</html>