From b0f26e75a96113dd789d883afe09accfb172cf4d Mon Sep 17 00:00:00 2001 From: kwm Date: Tue, 29 Jun 2010 21:43:25 +0000 Subject: Update to 4.1.7. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14283 df743ca5-7f9a-e211-a948-0013205c9059 --- databases/libgda4/Makefile | 4 ++-- databases/libgda4/distinfo | 6 +++--- databases/libgda4/files/patch-configure | 14 ++++++++++++++ databases/libgda4/files/patch-libgda-ui_Makefile.in | 12 ------------ databases/libgda4/files/patch-libgda_Makefile.in | 12 ------------ databases/libgda4/pkg-plist | 1 + 6 files changed, 20 insertions(+), 29 deletions(-) create mode 100644 databases/libgda4/files/patch-configure delete mode 100644 databases/libgda4/files/patch-libgda-ui_Makefile.in delete mode 100644 databases/libgda4/files/patch-libgda_Makefile.in (limited to 'databases/libgda4') diff --git a/databases/libgda4/Makefile b/databases/libgda4/Makefile index 6b257c8ee..70a9b05c9 100644 --- a/databases/libgda4/Makefile +++ b/databases/libgda4/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom$ +# $MCom: ports/databases/libgda4/Makefile,v 1.7 2010/06/05 22:07:25 kwm Exp $ # PORTNAME= libgda4 -PORTVERSION?= 4.1.6 +PORTVERSION?= 4.1.7 PORTREVISION?= 0 CATEGORIES= databases gnome MASTER_SITES= GNOME diff --git a/databases/libgda4/distinfo b/databases/libgda4/distinfo index 7a2e3c694..e751b6ef7 100644 --- a/databases/libgda4/distinfo +++ b/databases/libgda4/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgda-4.1.6.tar.bz2) = 353dbf284ca7b43935a8fb8863b8391b -SHA256 (gnome2/libgda-4.1.6.tar.bz2) = 1e1c7ec56662c5463ffad28030ae1017d4af6add6cccb92ec4e3b45dcb5f3c59 -SIZE (gnome2/libgda-4.1.6.tar.bz2) = 12583049 +MD5 (gnome2/libgda-4.1.7.tar.bz2) = b400f71c8366df7a6d366adca7b50979 +SHA256 (gnome2/libgda-4.1.7.tar.bz2) = aff26ae773cc63689ca8224dddbbe0bf3df899faec2888bc41be617692920def +SIZE (gnome2/libgda-4.1.7.tar.bz2) = 12728572 diff --git a/databases/libgda4/files/patch-configure b/databases/libgda4/files/patch-configure new file mode 100644 index 000000000..4cd767811 --- /dev/null +++ b/databases/libgda4/files/patch-configure @@ -0,0 +1,14 @@ +--- configure.orig 2010-06-29 23:18:23.000000000 +0200 ++++ configure 2010-06-29 23:20:36.000000000 +0200 +@@ -19720,9 +19720,9 @@ + INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` + INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` + INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` +- INTROSPECTION_GIRDIR=${INTROSPECTION_GIRDIR/$datadir/\$(datadir)} ++ INTROSPECTION_GIRDIR=`echo ${INTROSPECTION_GIRDIR} | sed -e "s|${datadir}|\\\$(datadir)|"` + INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" +- INTROSPECTION_TYPELIBDIR=${INTROSPECTION_TYPELIBDIR/$libdir/\$(libdir)} ++ INTROSPECTION_TYPELIBDIR=`echo ${INTROSPECTION_TYPELIBDIR} | sed -e "s|${libdir}|\\\$(libdir)|"` + INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` + INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` + INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection diff --git a/databases/libgda4/files/patch-libgda-ui_Makefile.in b/databases/libgda4/files/patch-libgda-ui_Makefile.in deleted file mode 100644 index 62cc1eed9..000000000 --- a/databases/libgda4/files/patch-libgda-ui_Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ ---- libgda-ui/Makefile.in.orig 2010-06-05 23:32:44.000000000 +0200 -+++ libgda-ui/Makefile.in 2010-06-05 23:33:54.000000000 +0200 -@@ -1199,7 +1199,8 @@ - @HAVE_INTROSPECTION_TRUE@ --include=libxml2-2.0 \ - @HAVE_INTROSPECTION_TRUE@ --include=Gtk-2.0 \ - @HAVE_INTROSPECTION_TRUE@ --include=Gda-4.0 \ --@HAVE_INTROSPECTION_TRUE@ --library=gda-ui-@GDA_ABI_VERSION@ \ -+@HAVE_INTROSPECTION_TRUE@ --libtool="$(LIBTOOL)" \ -+@HAVE_INTROSPECTION_TRUE@ --library=libgda-ui-@GDA_ABI_VERSION@.la \ - @HAVE_INTROSPECTION_TRUE@ $(INCLUDE_CFLAGS) \ - @HAVE_INTROSPECTION_TRUE@ --output $@ \ - @HAVE_INTROSPECTION_TRUE@ $(addprefix $(srcdir)/, $(ui_sources)) \ diff --git a/databases/libgda4/files/patch-libgda_Makefile.in b/databases/libgda4/files/patch-libgda_Makefile.in deleted file mode 100644 index e33d5924a..000000000 --- a/databases/libgda4/files/patch-libgda_Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ ---- libgda/Makefile.in.orig 2010-03-21 03:57:28.000000000 -0400 -+++ libgda/Makefile.in 2010-03-21 03:58:29.000000000 -0400 -@@ -1349,7 +1349,8 @@ dist-hook: - @HAVE_INTROSPECTION_TRUE@ --include=GL-1.0 \ - @HAVE_INTROSPECTION_TRUE@ --include=GObject-2.0 \ - @HAVE_INTROSPECTION_TRUE@ --include=libxml2-2.0 \ --@HAVE_INTROSPECTION_TRUE@ --library=gda-@GDA_ABI_VERSION@ \ -+@HAVE_INTROSPECTION_TRUE@ --libtool="$(LIBTOOL)" \ -+@HAVE_INTROSPECTION_TRUE@ --library=libgda-@GDA_ABI_VERSION@.la \ - @HAVE_INTROSPECTION_TRUE@ $(INCLUDE_CFLAGS) \ - @HAVE_INTROSPECTION_TRUE@ --output $@ \ - @HAVE_INTROSPECTION_TRUE@ $(addprefix $(srcdir)/, $(gda_headers)) \ diff --git a/databases/libgda4/pkg-plist b/databases/libgda4/pkg-plist index d73203ae0..9feeafaf2 100644 --- a/databases/libgda4/pkg-plist +++ b/databases/libgda4/pkg-plist @@ -24,6 +24,7 @@ include/libgda-%%VERSION%%/libgda-report/libgda-report.h include/libgda-%%VERSION%%/libgda-ui/gdaui-basic-form.h include/libgda-%%VERSION%%/libgda-ui/gdaui-cloud.h include/libgda-%%VERSION%%/libgda-ui/gdaui-combo.h +include/libgda-%%VERSION%%/libgda-ui/gdaui-data-cell-renderer-util.h include/libgda-%%VERSION%%/libgda-ui/gdaui-data-entry.h include/libgda-%%VERSION%%/libgda-ui/gdaui-data-filter.h include/libgda-%%VERSION%%/libgda-ui/gdaui-data-proxy-info.h -- cgit v1.2.3