[137724] trunk/dports/databases/libgda5
devans at macports.org
devans at macports.org
Wed Jun 17 21:19:52 PDT 2015
Revision: 137724
https://trac.macports.org/changeset/137724
Author: devans at macports.org
Date: 2015-06-17 21:19:52 -0700 (Wed, 17 Jun 2015)
Log Message:
-----------
libgda5: update to version 5.2.4, add variants +vala +db53 +db60 +postgresql94, drop variant +postgresql84 (long past EOL), default variants +db60 +postgresql94 +vala.
Modified Paths:
--------------
trunk/dports/databases/libgda5/Portfile
trunk/dports/databases/libgda5/files/patch-bdb.diff
Added Paths:
-----------
trunk/dports/databases/libgda5/files/patch-configure.ac.diff
Modified: trunk/dports/databases/libgda5/Portfile
===================================================================
--- 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)
@@ -6,8 +6,7 @@
name libgda5
set gname libgda
-version 5.2.2
-revision 2
+version 5.2.4
license {GPL-2 LGPL}
set branch [join [lrange [split ${version} .] 0 1] .]
description GDA provides uniform access to different kinds of data sources.
@@ -23,8 +22,8 @@
use_xz yes
-checksums rmd160 d391a7ea74d08ae4f5f5fe7ba6c49f2f254be5f9 \
- sha256 c9b8b1c32f1011e47b73c5dcf36649aaef2f1edaa5f5d75be20d9caadc2bc3e4
+checksums rmd160 6e39fb20c046ff98d0bb6a347785535b9267aa1d \
+ sha256 2cee38dd583ccbaa5bdf6c01ca5f88cc08758b9b144938a51a478eb2684b765e
depends_build port:pkgconfig \
port:intltool \
@@ -53,8 +52,11 @@
gobject_introspection yes
-patchfiles patch-bdb.diff
+patchfiles patch-configure.ac.diff \
+ patch-bdb.diff
+# patch-slname.diff
+
# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
post-patch {
@@ -83,6 +85,17 @@
--with-java=no \
--with-jni=no
+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
+
variant mysql5 \
description {support for current MySQL 5.x} {
depends_lib-append path:bin/mysql_config5:mysql5
@@ -93,15 +106,7 @@
configure.cppflags-append "-I${prefix}/include/mysql5/mysql"
}
-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 \
+variant postgresql90 conflicts postgresql91 postgresql92 postgresql93 postgresql94 \
description {support for PostgreSQL 9.0.x} {
configure.cppflags-append "-I${prefix}/include/postgresql90"
depends_lib-append port:postgresql90
@@ -109,7 +114,7 @@
configure.args-append --with-postgres=${prefix}/lib/postgresql90
}
-variant postgresql91 conflicts postgresql84 postgresql90 postgresql92 postgresql93 \
+variant postgresql91 conflicts postgresql90 postgresql92 postgresql93 postgresql94 \
description {support for PostgreSQL 9.1.x} {
configure.cppflags-append "-I${prefix}/include/postgresql91"
depends_lib-append port:postgresql91
@@ -117,7 +122,7 @@
configure.args-append --with-postgres=${prefix}/lib/postgresql91
}
-variant postgresql92 conflicts postgresql84 postgresql90 postgresql91 postgresql93 \
+variant postgresql92 conflicts postgresql90 postgresql91 postgresql93 postgresql94 \
description {support for PostgreSQL 9.2.x} {
configure.cppflags-append "-I${prefix}/include/postgresql92"
depends_lib-append port:postgresql92
@@ -125,7 +130,7 @@
configure.args-append --with-postgres=${prefix}/lib/postgresql92
}
-variant postgresql93 conflicts postgresql84 postgresql90 postgresql91 postgresql92 \
+variant postgresql93 conflicts postgresql90 postgresql91 postgresql92 postgresql94 \
description {support for PostgreSQL 9.3.x} {
configure.cppflags-append "-I${prefix}/include/postgresql93"
depends_lib-append port:postgresql93
@@ -133,14 +138,22 @@
configure.args-append --with-postgres=${prefix}/lib/postgresql93
}
-if {![variant_isset postgresql84] && \
- ![variant_isset postgresql90] && \
+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] && \
![variant_isset postgresql91] && \
- ![variant_isset postgresql92] } {
- default_variants +postgresql93
+ ![variant_isset postgresql92] && \
+ ![variant_isset postgresql93] } {
+ default_variants +postgresql94
}
-variant db47 conflicts db48 db51 \
+variant db47 conflicts db48 db51 db53 db60 \
description {support for Berkeley DB 4.7.x} {
set db_version 47
depends_lib-append port:db${db_version}
@@ -150,7 +163,7 @@
--with-bdb-libdir-name=lib/db${db_version}
}
-variant db48 conflicts db47 db51 \
+variant db48 conflicts db47 db51 db53 db60 \
description {support for Berkeley DB 4.8.x} {
set db_version 48
depends_lib-append port:db${db_version}
@@ -160,7 +173,7 @@
--with-bdb-libdir-name=lib/db${db_version}
}
-variant db51 conflicts db47 db48 \
+variant db51 conflicts db47 db48 db53 db60 \
description {support for Berkeley DB 5.1.x} {
set db_version 51
depends_lib-append port:db${db_version}
@@ -170,10 +183,33 @@
--with-bdb-libdir-name=lib/db${db_version}
}
-if {![variant_isset db47] && ![variant_isset db48]} {
- default_variants +db51
+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}
}
+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
+}
+
post-activate {
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
Modified: trunk/dports/databases/libgda5/files/patch-bdb.diff
===================================================================
--- 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)
@@ -1,6 +1,6 @@
---- 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 @@
+--- 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 @@
if test $platform_win32 = yes
then
sversion=`echo $version | sed -e 's,\.,,g'`
@@ -10,7 +10,7 @@
else
sversion=`echo $version | sed -e 's,\..*,,g'`
fi
-@@ -135,6 +138,12 @@
+@@ -149,6 +152,12 @@
db_lib="-ldb$sversion"
db_libfile="$d/$bdb_loclibdir/libdb$sversion$bdb_libext"
try_headers="db.h db$version/db.h db$sversion/db.h"
@@ -23,16 +23,16 @@
else
db_libfilename="libdb-$version$bdb_libext"
db_lib="-ldb-$version"
-@@ -145,7 +154,7 @@
+@@ -159,7 +168,7 @@
for db_hdr in $try_headers
do
-- #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
+- #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
then
save_CFLAGS="$CFLAGS"
-@@ -222,6 +231,9 @@
+@@ -236,6 +245,9 @@
if test "x$platform_win32" = xyes
then
bdbsql_loclibdir=bin
@@ -42,16 +42,16 @@
else
bdbsql_loclibdir=lib
fi
-@@ -232,10 +244,13 @@
+@@ -246,10 +258,13 @@
if test "x$BDB_DIR" != x
then
AC_MSG_CHECKING([for Berkeley DB SQL files along with found BDB installation])
-- #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
+- #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
+ echo "Checking $BDB_DIR/include/db$sversion/dbsql.h, $BDB_DIR/include/dbsql.h and $BDB_DIR/include/libdb/dbsql.h"
+ if test -f $BDB_DIR/include/db$sversion/dbsql.h -o $BDB_DIR/include/dbsql.h -o -f $BDB_DIR/include/libdb/dbsql.h
then
-- if test -f $BDB_DIR/include/libdb/dbsql.h
+- if test -f $BDB_DIR/$bdb_locincludedir/libdb/dbsql.h
+ if test -f $BDB_DIR/include/db$sversion/dbsql.h
+ then
+ BDBSQL_CFLAGS="$BDB_CFLAGS/db$sversion"
@@ -59,22 +59,3 @@
then
BDBSQL_CFLAGS="$BDB_CFLAGS/libdb"
else
---- 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"
- ;;
Added: trunk/dports/databases/libgda5/files/patch-configure.ac.diff
===================================================================
--- 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)
@@ -0,0 +1,19 @@
+--- 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"
+ ;;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150617/814ebf05/attachment.html>
More information about the macports-changes
mailing list