Revision: 111791 https://trac.macports.org/changeset/111791 Author: devans@macports.org Date: 2013-10-01 15:07:04 -0700 (Tue, 01 Oct 2013) Log Message: ----------- libgda5: * update dependencies * really enable gobject introspection * fix m4/bdb.m4 to work with MacPorts Berkeley DB file layout * replace broken +bdb variant with new +db47 +db48 +db51 * default is +db51 which provides additional Berkeley DB SQL support Modified Paths: -------------- trunk/dports/databases/libgda5/Portfile Added Paths: ----------- trunk/dports/databases/libgda5/files/ trunk/dports/databases/libgda5/files/patch-bdb.diff Modified: trunk/dports/databases/libgda5/Portfile =================================================================== --- trunk/dports/databases/libgda5/Portfile 2013-10-01 20:39:46 UTC (rev 111790) +++ trunk/dports/databases/libgda5/Portfile 2013-10-01 22:07:04 UTC (rev 111791) @@ -6,7 +6,7 @@ name libgda5 set gname libgda version 5.1.2 -revision 3 +revision 4 license {GPL-2 LGPL} set branch [join [lrange [split ${version} .] 0 1] .] @@ -21,11 +21,14 @@ homepage http://www.gnome-db.org/ distname libgda-${version} master_sites gnome:sources/${gname}/${branch}/ + use_xz yes checksums rmd160 36b06a9e07a2e8d81d2d093021712fa2d8b361f0 \ sha256 59c4416a151297a406091fcfe7af781ea88af3381d10b365ba73b1eb8e23b6c5 +patchfiles patch-bdb.diff + depends_skip_archcheck gnome-settings-daemon depends_build port:pkgconfig \ @@ -36,17 +39,20 @@ depends_lib port:desktop-file-utils \ port:readline \ path:bin/dot:graphviz \ - port:gtksourceview2 \ - port:goocanvas \ + port:gtk3 \ + port:gtksourceview3 \ + port:goocanvas2 \ port:iso-codes \ + port:libsecret \ port:libsoup \ - port:libtool \ + port:libgcrypt \ + port:libxml2 \ + port:libxslt \ port:gobject-introspection depends_run port:gnome-settings-daemon \ port:yelp -default_variants +bdb # Don't do intltool's INTLTOOL_PERL dance use_autoreconf yes @@ -57,9 +63,10 @@ # to avoid dlopen 'Can't find file libsqlite3.so' errors # -configure.args --with-bdb=${prefix} \ - --enable-system-sqlite=no \ +configure.args --enable-system-sqlite=no \ --enable-introspection=yes \ + --enable-gda-gi=yes \ + --enable-gdaui-gi=yes \ --disable-silent-rules \ --with-ldap=no \ --with-bdb=no \ @@ -115,31 +122,43 @@ configure.args-append --with-postgres=${prefix}/lib/postgresql91 } -variant bdb description {support for Berkeley DB} { -# -# prefer Berkeley DB 4.7 over 4.6 -# and depend on it if 4.6 is not installed -# if both are installed configure will select 4.7 -# otherwise look for 4.6 -# - if ([file exists ${prefix}/include/db52/db.h]) { - depends_lib-append port:db52 - } elseif ([file exists ${prefix}/include/db46/db.h]) { - depends_lib-append port:db46 - } elseif ([file exists ${prefix}/include/db47/db.h]) { - depends_lib-append port:db47 - } elseif ([file exists ${prefix}/include/db48/db.h]) { - depends_lib-append port:db48 - } elseif ([file exists ${prefix}/include/db51/db.h]) { - depends_lib-append port:db51 - } +variant db47 conflicts db48 db51 \ + description {support for Berkeley DB 4.7.x} { + set db_version 47 + 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} } -default_variants +bdb +variant db48 conflicts db47 db51 \ + description {support for Berkeley DB 4.8.x} { + set db_version 48 + 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 db51 conflicts db47 db48 \ + description {support for Berkeley DB 5.1.x} { + set db_version 51 + 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]} { + default_variants +db51 +} + post-activate { - system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor" system "${prefix}/bin/update-desktop-database ${prefix}/share/applications" + system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor" } livecheck.type gnome-with-unstable Added: trunk/dports/databases/libgda5/files/patch-bdb.diff =================================================================== --- trunk/dports/databases/libgda5/files/patch-bdb.diff (rev 0) +++ trunk/dports/databases/libgda5/files/patch-bdb.diff 2013-10-01 22:07:04 UTC (rev 111791) @@ -0,0 +1,80 @@ +--- configure.ac.orig 2013-01-23 13:19:39.000000000 -0800 ++++ configure.ac 2013-09-29 01:49:27.000000000 -0700 +@@ -337,7 +337,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) +@@ -347,6 +347,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" + ;; +--- 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 @@ + if test $platform_win32 = yes + then + sversion=`echo $version | sed -e 's,\.,,g'` ++ elif test $platform_carbon = yes ++ then ++ sversion=`echo $version | sed -e 's,\.,,g'` + else + sversion=`echo $version | sed -e 's,\..*,,g'` + fi +@@ -135,6 +138,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" ++ elif test $platform_carbon = yes ++ then ++ db_libfilename="libdb-$version$bdb_libext" ++ db_lib="-ldb-$version" ++ db_libfile="$d/$bdb_loclibdir/libdb-$version$bdb_libext" ++ try_headers="db.h db$version/db.h db$sversion/db.h" + else + db_libfilename="libdb-$version$bdb_libext" + db_lib="-ldb-$version" +@@ -145,7 +154,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 + then + save_CFLAGS="$CFLAGS" +@@ -222,6 +231,9 @@ + if test "x$platform_win32" = xyes + then + bdbsql_loclibdir=bin ++ elif test "x$platform_carbon" = xyes ++ then ++ bdbsql_loclibdir=$bdb_loclibdir + else + bdbsql_loclibdir=lib + fi +@@ -232,10 +244,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/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/include/db$sversion/dbsql.h ++ then ++ BDBSQL_CFLAGS="$BDB_CFLAGS/db$sversion" ++ elif test -f $BDB_DIR/include/libdb/dbsql.h + then + BDBSQL_CFLAGS="$BDB_CFLAGS/libdb" + else