Fix plist problems in libgda4.

Register depend on libgcrypt.
Fix building of postgres and mysql providers.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14816 df743ca5-7f9a-e211-a948-0013205c9059

6 files changed, 104 insertions, 3 deletions

diff --git a/databases/libgda4-mysql/Makefile b/databases/libgda4-mysql/Makefile
new file mode 100644
index 000000000..299a0d134
--- /dev/null
+++ b/databases/libgda4-mysql/Makefile
@@ -0,0 +1,23 @@
+# New ports collection makefile for:	libgda2
+# Date created:				02 June 2002
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom: ports/databases/libgda4-mysql/Makefile,v 1.1 2008/08/18 23:53:35 kwm Exp $
+#
+
+PORTREVISION?=	0
+CATEGORIES=	databases gnome
+PKGNAMESUFFIX?=	-mysql
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Provides mysql backend for the libgda4 library
+
+MASTERDIR=	${.CURDIR}/../libgda4
+BUILD_WRKSRC=	${WRKSRC}/providers/mysql/
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+PLIST=		${.CURDIR}/pkg-plist
+
+LIBGDA4_SLAVE=	mysql
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/libgda4-mysql/pkg-plist b/databases/libgda4-mysql/pkg-plist
new file mode 100644
index 000000000..b5ff48b6f
--- /dev/null
+++ b/databases/libgda4-mysql/pkg-plist
@@ -0,0 +1,18 @@
+lib/libgda-%%VERSION%%/providers/libgda-mysql.a
+lib/libgda-%%VERSION%%/providers/libgda-mysql.la
+lib/libgda-%%VERSION%%/providers/libgda-mysql.so
+libdata/pkgconfig/libgda-mysql-%%VERSION%%.pc
+share/libgda-%%VERSION%%/mysql_specs_add_column.xml
+share/libgda-%%VERSION%%/mysql_specs_comment_table.xml
+share/libgda-%%VERSION%%/mysql_specs_comment_column.xml
+share/libgda-%%VERSION%%/mysql_specs_create_db.xml
+share/libgda-%%VERSION%%/mysql_specs_create_index.xml
+share/libgda-%%VERSION%%/mysql_specs_create_table.xml
+share/libgda-%%VERSION%%/mysql_specs_create_view.xml
+share/libgda-%%VERSION%%/mysql_specs_drop_column.xml
+share/libgda-%%VERSION%%/mysql_specs_drop_db.xml
+share/libgda-%%VERSION%%/mysql_specs_drop_index.xml
+share/libgda-%%VERSION%%/mysql_specs_drop_table.xml
+share/libgda-%%VERSION%%/mysql_specs_drop_view.xml
+share/libgda-%%VERSION%%/mysql_specs_dsn.xml
+share/libgda-%%VERSION%%/mysql_specs_rename_table.xml
diff --git a/databases/libgda4-postgresql/Makefile b/databases/libgda4-postgresql/Makefile
new file mode 100644
index 000000000..4c0b210af
--- /dev/null
+++ b/databases/libgda4-postgresql/Makefile
@@ -0,0 +1,23 @@
+# New ports collection makefile for:	libgda2
+# Date created:				02 June 2002
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom: ports/databases/libgda4-postgresql/Makefile,v 1.1 2008/08/18 23:53:36 kwm Exp $
+#
+
+PORTREVISION?=	0
+CATEGORIES=	databases gnome
+PKGNAMESUFFIX?=	-postgresql
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Provides postgresql access for the libgda4 library
+
+MASTERDIR=	${.CURDIR}/../libgda4
+BUILD_WRKSRC=	${WRKSRC}/providers/postgres/
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+PLIST=		${.CURDIR}/pkg-plist
+
+LIBGDA4_SLAVE=	postgresql
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/libgda4-postgresql/pkg-plist b/databases/libgda4-postgresql/pkg-plist
new file mode 100644
index 000000000..02ae080c9
--- /dev/null
+++ b/databases/libgda4-postgresql/pkg-plist
@@ -0,0 +1,20 @@
+lib/libgda-%%VERSION%%/providers/libgda-postgres.a
+lib/libgda-%%VERSION%%/providers/libgda-postgres.la
+lib/libgda-%%VERSION%%/providers/libgda-postgres.so
+libdata/pkgconfig/libgda-postgres-%%VERSION%%.pc
+share/libgda-%%VERSION%%/postgres_specs_add_column.xml
+share/libgda-%%VERSION%%/postgres_specs_create_db.xml
+share/libgda-%%VERSION%%/postgres_specs_create_index.xml
+share/libgda-%%VERSION%%/postgres_specs_create_role.xml
+share/libgda-%%VERSION%%/postgres_specs_create_table.xml
+share/libgda-%%VERSION%%/postgres_specs_create_user.xml
+share/libgda-%%VERSION%%/postgres_specs_create_view.xml
+share/libgda-%%VERSION%%/postgres_specs_drop_column.xml
+share/libgda-%%VERSION%%/postgres_specs_drop_db.xml
+share/libgda-%%VERSION%%/postgres_specs_drop_index.xml
+share/libgda-%%VERSION%%/postgres_specs_drop_role.xml
+share/libgda-%%VERSION%%/postgres_specs_drop_table.xml
+share/libgda-%%VERSION%%/postgres_specs_drop_user.xml
+share/libgda-%%VERSION%%/postgres_specs_drop_view.xml
+share/libgda-%%VERSION%%/postgres_specs_dsn.xml
+share/libgda-%%VERSION%%/postgres_specs_rename_table.xml
diff --git a/databases/libgda4/Makefile b/databases/libgda4/Makefile
index 946c00154..7049df813 100644
--- a/databases/libgda4/Makefile
+++ b/databases/libgda4/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/databases/libgda4/Makefile,v 1.11 2010/09/18 12:04:38 kwm Exp $
+#   $MCom: ports/databases/libgda4/Makefile,v 1.12 2010/09/28 07:19:33 kwm Exp $
 #
 
 PORTNAME=	libgda4
 PORTVERSION?=	4.2.0
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/4$//}/${PORTVERSION:R}
@@ -25,6 +25,7 @@ LIBGDA4_SLAVE?=	no
 
 BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
+		gcrypt.17:${PORTSDIR}/security/libgcrypt \
     		soup-2.4.1:${PORTSDIR}/devel/libsoup \
 		json-glib-1.0.0:${PORTSDIR}/devel/json-glib
 RUN_DEPENDS=	${LOCALBASE}/lib/girepository-1.0/GObject-2.0.typelib:${PORTSDIR}/devel/gobject-introspection
@@ -45,6 +46,10 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 OPTIONS=	UI "Build UI tools" on
 .endif
 
+.if defined(WITH_UI)
+INSTALLS_ICONS=	yes
+.endif
+
 .include <bsd.port.pre.mk>
 
 #VERSION=	${PORTVERSION:R}
@@ -54,6 +59,7 @@ PLIST_SUB=	VERSION=${VERSION}
 .if ${LIBGDA4_SLAVE}=="no"
 .if defined(WITH_UI)
 CONFIGURE_ARGS+=--with-ui
+BUILD_DEPENDS+=	xml2po:${PORTSDIR}/textproc/gnome-doc-utils
 USE_GNOME+=	gtk20
 PLIST_SUB+=	UI=""
 .else
@@ -148,12 +154,21 @@ post-patch:
 		${WRKSRC}/providers/bdb/gda-bdb-test.c
 .if ${LIBGDA4_SLAVE}!="no"
 #. for d in msql firebird odbc freetds mdb ldap mysql sqlite postgres
-. for d in bdb jdbc mdb mysql postgres
+. for d in bdb jdbc mdb mysql postgres reuseable/postgres reuseable/mysql
 	@${REINPLACE_CMD} -e 's|$$(top_builddir)/libgda/libgda-4.0.la|${LOCALBASE}/lib/libgda-4.0.la|g' \
 		${WRKSRC}/providers/${d}/Makefile.in
 . endfor
 .endif
 
+pre-build:
+.if ${LIBGDA4_SLAVE}=="postgresql"
+	cd ${WRKSRC}/providers/reuseable/postgres && ${GMAKE} libgda-postgres.la
+.endif
+
+.if ${LIBGDA4_SLAVE}=="mysql"
+	cd ${WRKSRC}/providers/reuseable/mysql && ${GMAKE} libgda-mysql.la
+.endif
+
 .if ${LIBGDA4_SLAVE}=="no"
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/data/config \
diff --git a/databases/libgda4/pkg-plist b/databases/libgda4/pkg-plist
index 4892cc956..fd5db921a 100644
--- a/databases/libgda4/pkg-plist
+++ b/databases/libgda4/pkg-plist
@@ -316,6 +316,7 @@ share/libgda-%%VERSION%%/dtd/libgda-server-operation.dtd
 %%UI%%share/libgda-%%VERSION%%/icons/hicolor/32x32/actions/bookmark-view.png
 %%UI%%share/libgda-%%VERSION%%/icons/hicolor/32x32/actions/glade.png
 %%UI%%share/libgda-%%VERSION%%/icons/hicolor/32x32/actions/history-view.png
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/icon-theme.cache
 %%UI%%share/libgda-%%VERSION%%/icons/hicolor/scalable/actions/bookmark-view.svg
 %%UI%%share/libgda-%%VERSION%%/icons/hicolor/scalable/actions/glade.svg
 %%UI%%share/libgda-%%VERSION%%/icons/hicolor/scalable/actions/history-view.svg
@@ -461,6 +462,7 @@ share/locale/zh_TW/LC_MESSAGES/libgda-%%VERSION%%.mo
 @dirrm share/libgda-%%VERSION%%/dtd
 %%UI%%@dirrm share/libgda-%%VERSION%%/demo
 @dirrm share/libgda-%%VERSION%%/
+%%UI%%@dirrmtry share/applications
 @dirrm lib/libgda-%%VERSION%%/providers
 %%UI%%@dirrm lib/libgda-%%VERSION%%/plugins
 @dirrm lib/libgda-%%VERSION%%