Make portlint happy. I am using cports.sh in MC portstools.

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

6 files changed, 20 insertions, 299 deletions

diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index c3f6ccf53..f5dab457f 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/databases/evolution-data-server/Makefile,v 1.208 2011/04/30 20:43:13 mezz Exp $
+#   $MCom: ports/databases/evolution-data-server/Makefile,v 1.209 2011/06/04 22:51:27 mezz Exp $
 #
 
 PORTNAME=	evolution-data-server
@@ -41,8 +41,8 @@ CONFIGURE_ARGS=	--enable-static \
 		--enable-gnome-keyring=yes \
 		--with-openldap=yes \
 		--with-libdb=${LOCALBASE}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} ${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS=	-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} ${PTHREAD_CFLAGS}
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
 PLIST_SUB=	VERSION="2.32" EVO_VERSION="1.2"
 
diff --git a/databases/evolution-data-server3/Makefile b/databases/evolution-data-server3/Makefile
index 7c190c915..c8ff17d37 100644
--- a/databases/evolution-data-server3/Makefile
+++ b/databases/evolution-data-server3/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/databases/evolution-data-server3/Makefile,v 1.14 2011/05/24 11:21:08 kwm Exp $
+#   $MCom: ports/databases/evolution-data-server3/Makefile,v 1.15 2011/06/04 22:51:27 mezz Exp $
 #
 
 PORTNAME=	evolution-data-server
@@ -42,8 +42,8 @@ CONFIGURE_ARGS=	--enable-static \
 		--enable-gtk3 \
 		--with-openldap=yes \
 		--with-libdb=${LOCALBASE}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} ${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS=	-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} ${PTHREAD_CFLAGS}
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
 PLIST_SUB=	VERSION="3.0" EVO_VERSION="1.2"
 
diff --git a/databases/libgda4/Makefile b/databases/libgda4/Makefile
index d4ff82303..0c77e358e 100644
--- a/databases/libgda4/Makefile
+++ b/databases/libgda4/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/databases/libgda4/Makefile,v 1.18 2011/05/14 08:17:22 kwm Exp $
+#   $MCom: ports/databases/libgda4/Makefile,v 1.19 2011/06/02 15:43:38 kwm Exp $
 #
 
 PORTNAME=	libgda4
@@ -18,7 +18,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER?=	gnome@FreeBSD.org
 COMMENT?=	Provides uniform access to different kinds of data sources
 
-CONFLICTS=	libgda5-ui-*
+CONFLICTS=	libgda5-ui-[0-9]*
 
 USE_XZ=		yes
 LIBGDA4_SLAVE?=	no
@@ -42,23 +42,22 @@ MAKE_JOBS_UNSAFE=yes
 CONFIGURE_ARGS=	--without-oracle \
 		--disable-crypto \
 		--enable-introspection=no
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -lintl"
+CPPFLAGS=	-I${LOCALBASE}/include
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -lintl"
 
 .if ${LIBGDA4_SLAVE}=="no"
 OPTIONS=	UI "Build UI tools" on
 .endif
 
-.if defined(WITH_UI)
-INSTALLS_ICONS=	yes
-.endif
-
 .include <bsd.port.options.mk>
 
-#VERSION=	${PORTVERSION:R}
 VERSION=	4.0
 PLIST_SUB=	VERSION=${VERSION}
 
+.if defined(WITH_UI)
+INSTALLS_ICONS=	yes
+.endif
+
 .if ${LIBGDA4_SLAVE}=="no"
 .if defined(WITH_UI)
 CONFIGURE_ARGS+=--with-ui
@@ -103,13 +102,6 @@ CONFIGURE_ARGS+=	--with-postgres=${LOCALBASE}
 CONFIGURE_ARGS+=	--without-postgres
 .endif
 
-.if ${LIBGDA4_SLAVE}=="firebird"
-LIB_DEPENDS+=		gds.2:${PORTSDIR}/databases/firebird2-client
-CONFIGURE_ARGS+=	--with-firebird=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=	--without-firebird
-.endif
-
 # MDB (MS Access)
 .if ${LIBGDA4_SLAVE}=="mdb"
 LIB_DEPENDS+=		mdbsql.0:${PORTSDIR}/databases/mdbtools
diff --git a/databases/libgda5-ui/Makefile b/databases/libgda5-ui/Makefile
index f10bd9b38..9d230ac05 100644
--- a/databases/libgda5-ui/Makefile
+++ b/databases/libgda5-ui/Makefile
@@ -3,21 +3,21 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/databases/libgda4-postgresql/Makefile,v 1.3 2010/10/18 12:47:12 kwm Exp $
+#   $MCom: ports/databases/libgda5-ui/Makefile,v 1.1 2011/03/30 19:23:04 kwm Exp $
 #
 
 PORTREVISION?=	0
 CATEGORIES=	databases gnome
 PKGNAMESUFFIX?=	-ui
 
-CONFLICTS=	libgda4-4.*
-
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	libgda 5 ui library
+COMMENT=	The libgda 5 ui library
 
 MASTERDIR=	${.CURDIR}/../libgda5
 PLIST=		${.CURDIR}/pkg-plist
 
+CONFLICTS=	libgda4-4.*
+
 LIBGDA5_SLAVE=	ui
 
 do-build:
diff --git a/databases/libgda5-ui/pkg-plist.bak b/databases/libgda5-ui/pkg-plist.bak
deleted file mode 100644
index 3e866a6bd..000000000
--- a/databases/libgda5-ui/pkg-plist.bak
+++ /dev/null
@@ -1,263 +0,0 @@
-bin/gda-browser-%%VERSION%%
-bin/gda-control-center-%%VERSION%%
-bin/gdaui-demo-%%VERSION%%
-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
-include/libgda-%%VERSION%%/libgda-ui/gdaui-data-proxy.h
-include/libgda-%%VERSION%%/libgda-ui/gdaui-data-selector.h
-include/libgda-%%VERSION%%/libgda-ui/gdaui-data-store.h
-include/libgda-%%VERSION%%/libgda-ui/gdaui-decl.h
-include/libgda-%%VERSION%%/libgda-ui/gdaui-easy.h
-include/libgda-%%VERSION%%/libgda-ui/gdaui-enum-types.h
-include/libgda-%%VERSION%%/libgda-ui/gdaui-enums.h
-include/libgda-%%VERSION%%/libgda-ui/gdaui-form.h
-include/libgda-%%VERSION%%/libgda-ui/gdaui-grid.h
-include/libgda-%%VERSION%%/libgda-ui/gdaui-login.h
-include/libgda-%%VERSION%%/libgda-ui/gdaui-plugin.h
-include/libgda-%%VERSION%%/libgda-ui/gdaui-provider-selector.h
-include/libgda-%%VERSION%%/libgda-ui/gdaui-raw-form.h
-include/libgda-%%VERSION%%/libgda-ui/gdaui-raw-grid.h
-include/libgda-%%VERSION%%/libgda-ui/gdaui-rt-editor.h
-include/libgda-%%VERSION%%/libgda-ui/gdaui-server-operation.h
-include/libgda-%%VERSION%%/libgda-ui/gdaui-tree-store.h
-include/libgda-%%VERSION%%/libgda-ui/libgda-ui.h
-lib/libgda-%%VERSION%%/plugins/gdaui-entry-filesel-spec.xml
-lib/libgda-%%VERSION%%/plugins/gdaui-entry-password.xml
-lib/libgda-%%VERSION%%/plugins/gdaui-entry-pict-spec.xml
-lib/libgda-%%VERSION%%/plugins/gdaui-entry-pict-spec_string.xml
-lib/libgda-%%VERSION%%/plugins/gdaui-entry-text-spec.xml
-lib/libgda-%%VERSION%%/plugins/libgda-ui-plugins.a
-lib/libgda-%%VERSION%%/plugins/libgda-ui-plugins.la
-lib/libgda-%%VERSION%%/plugins/libgda-ui-plugins.so
-lib/libgda-ui-%%VERSION%%.a
-lib/libgda-ui-%%VERSION%%.la
-lib/libgda-ui-%%VERSION%%.so
-lib/libgda-ui-%%VERSION%%.so.5
-libdata/pkgconfig/libgda-ui-%%VERSION%%.pc
-share/applications/gda-browser-%%VERSION%%.desktop
-share/applications/gda-control-center-%%VERSION%%.desktop
-share/gnome/help/gda-browser-%%VERSION%%/C/actions.page
-share/gnome/help/gda-browser-%%VERSION%%/C/data-manager-perspective.page
-share/gnome/help/gda-browser-%%VERSION%%/C/data-manager-source-editor.page
-share/gnome/help/gda-browser-%%VERSION%%/C/data-manager-xml-syntax.page
-share/gnome/help/gda-browser-%%VERSION%%/C/declaredfk.page
-share/gnome/help/gda-browser-%%VERSION%%/C/diagram.page
-share/gnome/help/gda-browser-%%VERSION%%/C/features.page
-share/gnome/help/gda-browser-%%VERSION%%/C/figures/action-1.png
-share/gnome/help/gda-browser-%%VERSION%%/C/figures/action-2.png
-share/gnome/help/gda-browser-%%VERSION%%/C/figures/action-3.png
-share/gnome/help/gda-browser-%%VERSION%%/C/figures/action-4.png
-share/gnome/help/gda-browser-%%VERSION%%/C/figures/cnc_open.png
-share/gnome/help/gda-browser-%%VERSION%%/C/figures/data-man-mode.png
-share/gnome/help/gda-browser-%%VERSION%%/C/figures/data-man-persp.png
-share/gnome/help/gda-browser-%%VERSION%%/C/figures/data-man-uicompose.png
-share/gnome/help/gda-browser-%%VERSION%%/C/figures/data-man-xmlcompose.png
-share/gnome/help/gda-browser-%%VERSION%%/C/figures/declaredfk-dialog.png
-share/gnome/help/gda-browser-%%VERSION%%/C/figures/declaredfk.png
-share/gnome/help/gda-browser-%%VERSION%%/C/figures/diagram.png
-share/gnome/help/gda-browser-%%VERSION%%/C/figures/mainwin.png
-share/gnome/help/gda-browser-%%VERSION%%/C/figures/query-exec-persp.png
-share/gnome/help/gda-browser-%%VERSION%%/C/figures/schema-browser-persp.png
-share/gnome/help/gda-browser-%%VERSION%%/C/figures/table-insert-data.png
-share/gnome/help/gda-browser-%%VERSION%%/C/figures/trans-begin.png
-share/gnome/help/gda-browser-%%VERSION%%/C/figures/trans-commit.png
-share/gnome/help/gda-browser-%%VERSION%%/C/figures/trans-rollback.png
-share/gnome/help/gda-browser-%%VERSION%%/C/general-ui.page
-share/gnome/help/gda-browser-%%VERSION%%/C/index.page
-share/gnome/help/gda-browser-%%VERSION%%/C/legal.xml
-share/gnome/help/gda-browser-%%VERSION%%/C/query-execution-perspective.page
-share/gnome/help/gda-browser-%%VERSION%%/C/schema-browser-perspective.page
-share/gnome/help/gda-browser-%%VERSION%%/C/table-insert-data.page
-share/gnome/help/gda-browser-%%VERSION%%/C/transactions.page
-share/gnome/help/gda-browser-%%VERSION%%/C/variables.page
-share/gnome/help/gda-browser-%%VERSION%%/de/actions.page
-share/gnome/help/gda-browser-%%VERSION%%/de/data-manager-perspective.page
-share/gnome/help/gda-browser-%%VERSION%%/de/data-manager-source-editor.page
-share/gnome/help/gda-browser-%%VERSION%%/de/data-manager-xml-syntax.page
-share/gnome/help/gda-browser-%%VERSION%%/de/declaredfk.page
-share/gnome/help/gda-browser-%%VERSION%%/de/diagram.page
-share/gnome/help/gda-browser-%%VERSION%%/de/features.page
-share/gnome/help/gda-browser-%%VERSION%%/de/figures/action-1.png
-share/gnome/help/gda-browser-%%VERSION%%/de/figures/action-2.png
-share/gnome/help/gda-browser-%%VERSION%%/de/figures/action-3.png
-share/gnome/help/gda-browser-%%VERSION%%/de/figures/action-4.png
-share/gnome/help/gda-browser-%%VERSION%%/de/figures/cnc_open.png
-share/gnome/help/gda-browser-%%VERSION%%/de/figures/data-man-mode.png
-share/gnome/help/gda-browser-%%VERSION%%/de/figures/data-man-persp.png
-share/gnome/help/gda-browser-%%VERSION%%/de/figures/data-man-uicompose.png
-share/gnome/help/gda-browser-%%VERSION%%/de/figures/data-man-xmlcompose.png
-share/gnome/help/gda-browser-%%VERSION%%/de/figures/declaredfk-dialog.png
-share/gnome/help/gda-browser-%%VERSION%%/de/figures/declaredfk.png
-share/gnome/help/gda-browser-%%VERSION%%/de/figures/diagram.png
-share/gnome/help/gda-browser-%%VERSION%%/de/figures/mainwin.png
-share/gnome/help/gda-browser-%%VERSION%%/de/figures/query-exec-persp.png
-share/gnome/help/gda-browser-%%VERSION%%/de/figures/schema-browser-persp.png
-share/gnome/help/gda-browser-%%VERSION%%/de/figures/table-insert-data.png
-share/gnome/help/gda-browser-%%VERSION%%/de/figures/trans-begin.png
-share/gnome/help/gda-browser-%%VERSION%%/de/figures/trans-commit.png
-share/gnome/help/gda-browser-%%VERSION%%/de/figures/trans-rollback.png
-share/gnome/help/gda-browser-%%VERSION%%/de/general-ui.page
-share/gnome/help/gda-browser-%%VERSION%%/de/index.page
-share/gnome/help/gda-browser-%%VERSION%%/de/legal.xml
-share/gnome/help/gda-browser-%%VERSION%%/de/query-execution-perspective.page
-share/gnome/help/gda-browser-%%VERSION%%/de/schema-browser-perspective.page
-share/gnome/help/gda-browser-%%VERSION%%/de/table-insert-data.page
-share/gnome/help/gda-browser-%%VERSION%%/de/transactions.page
-share/gnome/help/gda-browser-%%VERSION%%/de/variables.page
-share/gnome/help/gda-browser-%%VERSION%%/es/actions.page
-share/gnome/help/gda-browser-%%VERSION%%/es/data-manager-perspective.page
-share/gnome/help/gda-browser-%%VERSION%%/es/data-manager-source-editor.page
-share/gnome/help/gda-browser-%%VERSION%%/es/data-manager-xml-syntax.page
-share/gnome/help/gda-browser-%%VERSION%%/es/declaredfk.page
-share/gnome/help/gda-browser-%%VERSION%%/es/diagram.page
-share/gnome/help/gda-browser-%%VERSION%%/es/features.page
-share/gnome/help/gda-browser-%%VERSION%%/es/figures/action-1.png
-share/gnome/help/gda-browser-%%VERSION%%/es/figures/action-2.png
-share/gnome/help/gda-browser-%%VERSION%%/es/figures/action-3.png
-share/gnome/help/gda-browser-%%VERSION%%/es/figures/action-4.png
-share/gnome/help/gda-browser-%%VERSION%%/es/figures/cnc_open.png
-share/gnome/help/gda-browser-%%VERSION%%/es/figures/data-man-mode.png
-share/gnome/help/gda-browser-%%VERSION%%/es/figures/data-man-persp.png
-share/gnome/help/gda-browser-%%VERSION%%/es/figures/data-man-uicompose.png
-share/gnome/help/gda-browser-%%VERSION%%/es/figures/data-man-xmlcompose.png
-share/gnome/help/gda-browser-%%VERSION%%/es/figures/declaredfk-dialog.png
-share/gnome/help/gda-browser-%%VERSION%%/es/figures/declaredfk.png
-share/gnome/help/gda-browser-%%VERSION%%/es/figures/diagram.png
-share/gnome/help/gda-browser-%%VERSION%%/es/figures/mainwin.png
-share/gnome/help/gda-browser-%%VERSION%%/es/figures/query-exec-persp.png
-share/gnome/help/gda-browser-%%VERSION%%/es/figures/schema-browser-persp.png
-share/gnome/help/gda-browser-%%VERSION%%/es/figures/table-insert-data.png
-share/gnome/help/gda-browser-%%VERSION%%/es/figures/trans-begin.png
-share/gnome/help/gda-browser-%%VERSION%%/es/figures/trans-commit.png
-share/gnome/help/gda-browser-%%VERSION%%/es/figures/trans-rollback.png
-share/gnome/help/gda-browser-%%VERSION%%/es/general-ui.page
-share/gnome/help/gda-browser-%%VERSION%%/es/index.page
-share/gnome/help/gda-browser-%%VERSION%%/es/legal.xml
-share/gnome/help/gda-browser-%%VERSION%%/es/query-execution-perspective.page
-share/gnome/help/gda-browser-%%VERSION%%/es/schema-browser-perspective.page
-share/gnome/help/gda-browser-%%VERSION%%/es/table-insert-data.page
-share/gnome/help/gda-browser-%%VERSION%%/es/transactions.page
-share/gnome/help/gda-browser-%%VERSION%%/es/variables.page
-share/gnome/help/gda-browser-%%VERSION%%/sl/actions.page
-share/gnome/help/gda-browser-%%VERSION%%/sl/data-manager-perspective.page
-share/gnome/help/gda-browser-%%VERSION%%/sl/data-manager-source-editor.page
-share/gnome/help/gda-browser-%%VERSION%%/sl/data-manager-xml-syntax.page
-share/gnome/help/gda-browser-%%VERSION%%/sl/declaredfk.page
-share/gnome/help/gda-browser-%%VERSION%%/sl/diagram.page
-share/gnome/help/gda-browser-%%VERSION%%/sl/features.page
-share/gnome/help/gda-browser-%%VERSION%%/sl/figures/action-1.png
-share/gnome/help/gda-browser-%%VERSION%%/sl/figures/action-2.png
-share/gnome/help/gda-browser-%%VERSION%%/sl/figures/action-3.png
-share/gnome/help/gda-browser-%%VERSION%%/sl/figures/action-4.png
-share/gnome/help/gda-browser-%%VERSION%%/sl/figures/cnc_open.png
-share/gnome/help/gda-browser-%%VERSION%%/sl/figures/data-man-mode.png
-share/gnome/help/gda-browser-%%VERSION%%/sl/figures/data-man-persp.png
-share/gnome/help/gda-browser-%%VERSION%%/sl/figures/data-man-uicompose.png
-share/gnome/help/gda-browser-%%VERSION%%/sl/figures/data-man-xmlcompose.png
-share/gnome/help/gda-browser-%%VERSION%%/sl/figures/declaredfk-dialog.png
-share/gnome/help/gda-browser-%%VERSION%%/sl/figures/declaredfk.png
-share/gnome/help/gda-browser-%%VERSION%%/sl/figures/diagram.png
-share/gnome/help/gda-browser-%%VERSION%%/sl/figures/mainwin.png
-share/gnome/help/gda-browser-%%VERSION%%/sl/figures/query-exec-persp.png
-share/gnome/help/gda-browser-%%VERSION%%/sl/figures/schema-browser-persp.png
-share/gnome/help/gda-browser-%%VERSION%%/sl/figures/table-insert-data.png
-share/gnome/help/gda-browser-%%VERSION%%/sl/figures/trans-begin.png
-share/gnome/help/gda-browser-%%VERSION%%/sl/figures/trans-commit.png
-share/gnome/help/gda-browser-%%VERSION%%/sl/figures/trans-rollback.png
-share/gnome/help/gda-browser-%%VERSION%%/sl/general-ui.page
-share/gnome/help/gda-browser-%%VERSION%%/sl/index.page
-share/gnome/help/gda-browser-%%VERSION%%/sl/legal.xml
-share/gnome/help/gda-browser-%%VERSION%%/sl/query-execution-perspective.page
-share/gnome/help/gda-browser-%%VERSION%%/sl/schema-browser-perspective.page
-share/gnome/help/gda-browser-%%VERSION%%/sl/table-insert-data.page
-share/gnome/help/gda-browser-%%VERSION%%/sl/transactions.page
-share/gnome/help/gda-browser-%%VERSION%%/sl/variables.page
-share/icons/hicolor/16x16/apps/gda-control-center.png
-share/icons/hicolor/22x22/apps/gda-control-center.png
-share/icons/hicolor/24x24/apps/gda-control-center.png
-share/icons/hicolor/256x256/apps/gda-control-center.png
-share/icons/hicolor/32x32/apps/gda-control-center.png
-share/icons/hicolor/48x48/apps/gda-control-center.png
-share/libgda-%%VERSION%%/demo/basic_form.c
-share/libgda-%%VERSION%%/demo/cloud.c
-share/libgda-%%VERSION%%/demo/combo.c
-share/libgda-%%VERSION%%/demo/custom_layout.xml
-share/libgda-%%VERSION%%/demo/data_model_dir.c
-share/libgda-%%VERSION%%/demo/ddl_queries.c
-share/libgda-%%VERSION%%/demo/demo_db.db
-share/libgda-%%VERSION%%/demo/form.c
-share/libgda-%%VERSION%%/demo/form_data_layout.c
-share/libgda-%%VERSION%%/demo/form_pict.c
-share/libgda-%%VERSION%%/demo/form_rw.c
-share/libgda-%%VERSION%%/demo/grid.c
-share/libgda-%%VERSION%%/demo/grid_data_layout.c
-share/libgda-%%VERSION%%/demo/grid_pict.c
-share/libgda-%%VERSION%%/demo/grid_rw.c
-share/libgda-%%VERSION%%/demo/linked_grid_form.c
-share/libgda-%%VERSION%%/demo/linked_model_param.c
-share/libgda-%%VERSION%%/demo/login.c
-share/libgda-%%VERSION%%/demo/provider_sel.c
-share/libgda-%%VERSION%%/demo/tree.c
-share/libgda-%%VERSION%%/dtd/gdaui-layout.dtd
-share/libgda-%%VERSION%%/import_encodings.xml
-share/libgda-%%VERSION%%/icons/hicolor/16x16/actions/bookmark-view.png
-share/libgda-%%VERSION%%/icons/hicolor/16x16/actions/glade.png
-share/libgda-%%VERSION%%/icons/hicolor/16x16/actions/history-view.png
-share/libgda-%%VERSION%%/icons/hicolor/22x22/actions/bookmark-view.png
-share/libgda-%%VERSION%%/icons/hicolor/22x22/actions/glade.png
-share/libgda-%%VERSION%%/icons/hicolor/22x22/actions/history-view.png
-share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/bookmark-view.png
-share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/glade.png
-share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/history-view.png
-share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/transaction-begin.png
-share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/transaction-commit.png
-share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/transaction-rollback.png
-share/libgda-%%VERSION%%/icons/hicolor/32x32/actions/bookmark-view.png
-share/libgda-%%VERSION%%/icons/hicolor/32x32/actions/glade.png
-share/libgda-%%VERSION%%/icons/hicolor/32x32/actions/history-view.png
-share/libgda-%%VERSION%%/icons/hicolor/icon-theme.cache
-share/libgda-%%VERSION%%/icons/hicolor/scalable/actions/bookmark-view.svg
-share/libgda-%%VERSION%%/icons/hicolor/scalable/actions/glade.svg
-share/libgda-%%VERSION%%/icons/hicolor/scalable/actions/history-view.svg
-share/libgda-%%VERSION%%/language-specs/gda-sql.lang
-share/libgda-%%VERSION%%/pixmaps/bin-attachment-16x16.png
-share/libgda-%%VERSION%%/pixmaps/gda-browser-action.png
-share/libgda-%%VERSION%%/pixmaps/gda-browser-auth-big.png
-share/libgda-%%VERSION%%/pixmaps/gda-browser-auth.png
-share/libgda-%%VERSION%%/pixmaps/gda-browser-bookmark.png
-share/libgda-%%VERSION%%/pixmaps/gda-browser-column-fk.png
-share/libgda-%%VERSION%%/pixmaps/gda-browser-column-fknn.png
-share/libgda-%%VERSION%%/pixmaps/gda-browser-column-nn.png
-share/libgda-%%VERSION%%/pixmaps/gda-browser-column-pk.png
-share/libgda-%%VERSION%%/pixmaps/gda-browser-column.png
-share/libgda-%%VERSION%%/pixmaps/gda-browser-connected-big.png
-share/libgda-%%VERSION%%/pixmaps/gda-browser-connected.png
-share/libgda-%%VERSION%%/pixmaps/gda-browser-diagram.png
-share/libgda-%%VERSION%%/pixmaps/gda-browser-form.png
-share/libgda-%%VERSION%%/pixmaps/gda-browser-grid.png
-share/libgda-%%VERSION%%/pixmaps/gda-browser-menu-ind.png
-share/libgda-%%VERSION%%/pixmaps/gda-browser-non-connected-big.png
-share/libgda-%%VERSION%%/pixmaps/gda-browser-non-connected.png
-share/libgda-%%VERSION%%/pixmaps/gda-browser-query.png
-share/libgda-%%VERSION%%/pixmaps/gda-browser-reference.png
-share/libgda-%%VERSION%%/pixmaps/gda-browser-schema.png
-share/libgda-%%VERSION%%/pixmaps/gda-browser-table.png
-share/libgda-%%VERSION%%/pixmaps/gda-browser.png
-share/libgda-%%VERSION%%/pixmaps/gda-control-center-newcnc.png
-share/libgda-%%VERSION%%/pixmaps/gda-control-center.png
-share/libgda-%%VERSION%%/pixmaps/gdaui-generic.png
-share/libgda-%%VERSION%%/server_operation.glade
-share/libgda-%%VERSION%%/ui/gdaui-entry-number.xml
-share/libgda-%%VERSION%%/ui/gdaui-entry-string.xml
-share/pixmaps/gda-browser-%%VERSION%%.png
-@dirrm share/libgda-%%VERSION%%/ui
-@dirrm share/libgda-%%VERSION%%/pixmaps
-@dirrm share/libgda-%%VERSION%%/language-specs
-@dirrm share/libgda-%%VERSION%%/demo
-@dirrm lib/libgda-%%VERSION%%/plugins
-@dirrm include/libgda-%%VERSION%%/libgda-ui
diff --git a/databases/libgda5/Makefile b/databases/libgda5/Makefile
index ac45a9b43..b90f5b64b 100644
--- a/databases/libgda5/Makefile
+++ b/databases/libgda5/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/databases/libgda5/Makefile,v 1.2 2011/06/02 13:29:13 kwm Exp $
+#   $MCom: ports/databases/libgda5/Makefile,v 1.3 2011/06/02 15:39:39 kwm Exp $
 #
 
 PORTNAME=	libgda5
@@ -45,7 +45,6 @@ CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.options.mk>
 
-#VERSION=	${PORTVERSION:R}
 VERSION=	5.0
 PLIST_SUB=	VERSION=${VERSION}
 
@@ -58,11 +57,11 @@ USE_GNOME+=	libgda5
 .if ${LIBGDA5_SLAVE}=="ui"
 CONFIGURE_ARGS+=--with-ui
 USE_GNOME+=	gtk30 gnomedocutils
+INSTALLS_ICONS=	yes
 .else
 CONFIGURE_ARGS+=--without-ui
 .endif
 
-
 .if ${LIBGDA5_SLAVE}=="bdb"
 USE_BDB=		yes
 CONFIGURE_ARGS+=	--with-bdb=${LOCALBASE}
@@ -91,13 +90,6 @@ CONFIGURE_ARGS+=	--with-postgres=${LOCALBASE}
 CONFIGURE_ARGS+=	--without-postgres
 .endif
 
-.if ${LIBGDA5_SLAVE}=="firebird"
-LIB_DEPENDS+=		gds.2:${PORTSDIR}/databases/firebird2-client
-CONFIGURE_ARGS+=	--with-firebird=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=	--without-firebird
-.endif
-
 # MDB (MS Access)
 .if ${LIBGDA5_SLAVE}=="mdb"
 LIB_DEPENDS+=		mdbsql.0:${PORTSDIR}/databases/mdbtools