Reorganize the code a bit to let different providers be built as external

packages easily.

3 files changed, 35 insertions, 14 deletions

diff --git a/databases/libgda/Makefile b/databases/libgda/Makefile
index 84fceb9f0ae..1e67438b469 100644
--- a/databases/libgda/Makefile
+++ b/databases/libgda/Makefile
@@ -1,11 +1,13 @@
-# $NetBSD: Makefile,v 1.9 2004/03/11 14:00:29 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2004/05/06 11:15:31 jmmv Exp $
 #
 
 .include "Makefile.common"
 
-COMMENT=		GNU Database access library
-
 PKGCONFIG_OVERRIDE=	libgda.pc.in
 
+PKG_SYSCONFSUBDIR=	libgda
+EGDIR=			${PREFIX}/share/examples/libgda
+CONF_FILES+=		${EGDIR}/config ${PKG_SYSCONFDIR}/config
+
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/libgda/Makefile.common b/databases/libgda/Makefile.common
index d8b3880395d..221e01e5630 100644
--- a/databases/libgda/Makefile.common
+++ b/databases/libgda/Makefile.common
@@ -1,13 +1,17 @@
-# $NetBSD: Makefile.common,v 1.19 2004/04/20 16:15:48 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.20 2004/05/06 11:15:31 jmmv Exp $
 #
 
-DISTNAME?=		libgda-1.0.4
-CATEGORIES?=		databases gnome
-MASTER_SITES?=		${MASTER_SITE_GNOME:=sources/libgda/1.0/}
-EXTRACT_SUFX?=		.tar.bz2
+DISTNAME=		libgda-1.0.4
+CATEGORIES=		databases gnome
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgda/1.0/}
+EXTRACT_SUFX=		.tar.bz2
 
-MAINTAINER?=		sab@posix.org.uk
-HOMEPAGE?=		http://www.gnome-db.org/
+MAINTAINER=		sab@posix.org.uk
+HOMEPAGE=		http://www.gnome-db.org/
+COMMENT=		GNU database access library
+
+DISTINFO_FILE=		${.CURDIR}/../../databases/libgda/distinfo
+PATCHDIR=		${.CURDIR}/../../databases/libgda/patches
 
 USE_X11=		YES
 USE_GNU_TOOLS+=		make
@@ -22,9 +26,21 @@ CONFIGURE_ARGS+=	--enable-gtk-doc=no
 CONFIGURE_ARGS+=	--with-html-dir="${PREFIX}/share/doc/html"
 CONFIGURE_ARGS+=	--without-ldap
 
-PKG_SYSCONFSUBDIR=	libgda
-EGDIR=			${PREFIX}/share/examples/libgda
-CONF_FILES+=		${EGDIR}/config ${PKG_SYSCONFDIR}/config
+.if defined(LIBGDA_PROVIDER) && !empty(LIBGDA_PROVIDER)
+PKGNAME=		${DISTNAME:S/libgda-/libgda-${LIBGDA_PROVIDER}-/}
+COMMENT+=		- ${LIBGDA_PROVIDER} provider
+
+BUILD_DIRS=		${WRKSRC}/providers/postgres
+INSTALL_DIRS=		${WRKSRC}/providers/postgres
+
+SUBST_CLASSES+=		libs
+SUBST_STAGE.libs=	pre-configure
+SUBST_MESSAGE.libs=	"Fixing references to installes libraries."
+SUBST_FILES.libs=	providers/${LIBGDA_PROVIDER}/Makefile.in
+SUBST_SED.libs+=	-e 's|$$(top_builddir)/libgda/libgda-2.la|${BUILDLINK_PREFIX.libgda}/lib/libgda-2.la|'
+
+.include "../../databases/libgda/buildlink3.mk"
+.endif
 
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/databases/libgda/buildlink3.mk b/databases/libgda/buildlink3.mk
index f68793294fb..fe3f05a80d0 100644
--- a/databases/libgda/buildlink3.mk
+++ b/databases/libgda/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:09 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/05/06 11:15:31 jmmv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBGDA_BUILDLINK3_MK:=	${LIBGDA_BUILDLINK3_MK}+
@@ -13,6 +13,9 @@ BUILDLINK_PACKAGES+=	libgda
 .if !empty(LIBGDA_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libgda+=	libgda>=1.0.3
 BUILDLINK_PKGSRCDIR.libgda?=	../../databases/libgda
+
+PRINT_PLIST_AWK+=	/^@dirrm lib\/libgda\/providers$$/ \
+				{ print "@comment in libgda: " $$0; next; }
 .endif	# LIBGDA_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"