From afe636d7b23683692d6ebea5067e045318a30bac Mon Sep 17 00:00:00 2001
From: dillo <dillo@pkgsrc.org>
Date: Fri, 26 Jan 2007 10:59:59 +0000
Subject: Modifications for upcoming libgda-mysql package.

---
 databases/libgda/Makefile.common  |  4 +++-
 databases/libgda/distinfo         |  3 ++-
 databases/libgda/patches/patch-al | 23 +++++++++++++++++++++++
 3 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 databases/libgda/patches/patch-al

(limited to 'databases/libgda')

diff --git a/databases/libgda/Makefile.common b/databases/libgda/Makefile.common
index 823c6e4d82e..3786f416cef 100644
--- a/databases/libgda/Makefile.common
+++ b/databases/libgda/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.45 2007/01/21 19:14:20 wiz Exp $
+# $NetBSD: Makefile.common,v 1.46 2007/01/26 10:59:59 dillo Exp $
 #
 
 DISTNAME=		libgda-2.99.2
@@ -20,7 +20,9 @@ GNU_CONFIGURE=		YES
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--without-ldap
+.if !defined(LIBGDA_PROVIDER) || empty(LIBGDA_PROVIDER:Mmysql)
 CONFIGURE_ARGS+=	--without-mysql
+.endif
 
 .if defined(LIBGDA_PROVIDER) && !empty(LIBGDA_PROVIDER)
 PKGNAME=		${DISTNAME:S/libgda-/libgda-${LIBGDA_PROVIDER}-/}
diff --git a/databases/libgda/distinfo b/databases/libgda/distinfo
index f50cec175e4..84f8ade1263 100644
--- a/databases/libgda/distinfo
+++ b/databases/libgda/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2007/01/21 19:14:20 wiz Exp $
+$NetBSD: distinfo,v 1.28 2007/01/26 10:59:59 dillo Exp $
 
 SHA1 (libgda-2.99.2.tar.bz2) = d6863053d0117ef0ca421412e78e2e9d5df9c4ff
 RMD160 (libgda-2.99.2.tar.bz2) = dda55b176b6d63d6b5a74e7069ed59ecc108ee60
@@ -11,3 +11,4 @@ SHA1 (patch-ae) = 1041214da337151f3b356ef6093e5168fa81b2bb
 SHA1 (patch-ah) = 1a2ef8200b2ccedb632e7f952c7e214128c51693
 SHA1 (patch-aj) = e42905b1b74de4d85e13b5164ac86914b597c7cb
 SHA1 (patch-ak) = 2059de5e09a674407a1da3052f06fcd74066c36b
+SHA1 (patch-al) = a4c597e29c60bdc5e48a0a9677b14b41a96eb005
diff --git a/databases/libgda/patches/patch-al b/databases/libgda/patches/patch-al
new file mode 100644
index 00000000000..5e2d0e1ed05
--- /dev/null
+++ b/databases/libgda/patches/patch-al
@@ -0,0 +1,23 @@
+$NetBSD: patch-al,v 1.1 2007/01/26 11:00:00 dillo Exp $
+
+--- providers/mysql/Makefile.in.orig	2006-12-22 15:01:57.000000000 +0100
++++ providers/mysql/Makefile.in
+@@ -55,8 +55,7 @@ am__installdirs = "$(DESTDIR)$(providerd
+ providerLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(provider_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+-libgda_mysql_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+-	$(top_builddir)/libgda/libgda-3.0.la $(am__DEPENDENCIES_1)
++libgda_mysql_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ am_libgda_mysql_la_OBJECTS = gda-mysql-ddl.lo gda-mysql-provider.lo \
+ 	gda-mysql-recordset.lo libmain.lo utils.lo
+ libgda_mysql_la_OBJECTS = $(am_libgda_mysql_la_OBJECTS)
+@@ -364,7 +363,7 @@ libgda_mysql_la_SOURCES = \
+ libgda_mysql_la_LDFLAGS = -export-dynamic -module -avoid-version
+ libgda_mysql_la_LIBADD = \
+ 	$(LIBGDA_LIBS) \
+-	$(top_builddir)/libgda/libgda-3.0.la \
++	-lgda-3.0 \
+ 	$(MYSQL_LIBS)
+ 
+ xmldir = $(datadir)/libgda
-- 
cgit v1.2.3