update gnomedb to 1.2

too many changes to list here, this pkg was really outdated

13 files changed, 251 insertions, 263 deletions

diff --git a/databases/libgda/Makefile b/databases/libgda/Makefile
index 9c2371cf042..477abfc4ab0 100644
--- a/databases/libgda/Makefile
+++ b/databases/libgda/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2005/02/05 17:01:29 jmmv Exp $
+# $NetBSD: Makefile,v 1.12 2005/02/24 19:17:10 drochner Exp $
 #
 
-PKGREVISION=		2
-
 .include "Makefile.common"
 
 PKGCONFIG_OVERRIDE=	libgda.pc.in
diff --git a/databases/libgda/Makefile.common b/databases/libgda/Makefile.common
index a6a8f39c33b..dff6eaf405b 100644
--- a/databases/libgda/Makefile.common
+++ b/databases/libgda/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.24 2005/02/05 17:01:29 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.25 2005/02/24 19:17:10 drochner Exp $
 #
 
-DISTNAME=		libgda-1.0.4
+DISTNAME=		libgda-1.2.0
 CATEGORIES=		databases gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgda/1.0/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgda/1.2/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		sab@posix.org.uk
@@ -25,6 +25,7 @@ CONFIGURE_ARGS+=	--sysconfdir="${PKG_SYSCONFDIR}"
 CONFIGURE_ARGS+=	--enable-gtk-doc=no
 CONFIGURE_ARGS+=	--with-html-dir="${PREFIX}/share/doc/html"
 CONFIGURE_ARGS+=	--without-ldap
+CONFIGURE_ARGS+=	--without-mysql
 
 .if defined(LIBGDA_PROVIDER) && !empty(LIBGDA_PROVIDER)
 PKGNAME=		${DISTNAME:S/libgda-/libgda-${LIBGDA_PROVIDER}-/}
diff --git a/databases/libgda/PLIST b/databases/libgda/PLIST
index db54336385f..6871d78457a 100644
--- a/databases/libgda/PLIST
+++ b/databases/libgda/PLIST
@@ -1,78 +1,81 @@
-@comment $NetBSD: PLIST,v 1.9 2004/09/22 08:09:22 jlam Exp $
+@comment $NetBSD: PLIST,v 1.10 2005/02/24 19:17:10 drochner Exp $
 bin/gda-report-test
 bin/gda-run
 bin/gda-test
-include/libgda-report/gda-report-document.h
-include/libgda-report/gda-report-item-detail.h
-include/libgda-report/gda-report-item-label.h
-include/libgda-report/gda-report-item-pagefooter.h
-include/libgda-report/gda-report-item-pageheader.h
-include/libgda-report/gda-report-item-repfield.h
-include/libgda-report/gda-report-item-report.h
-include/libgda-report/gda-report-item-reportfooter.h
-include/libgda-report/gda-report-item-reportheader.h
-include/libgda-report/gda-report-item-sqlquery.h
-include/libgda-report/gda-report-item.h
-include/libgda-report/gda-report-result.h
-include/libgda-report/gda-report-types.h
-include/libgda-report/gda-report-valid.h
-include/libgda-report/gda-report.h
-include/libgda/gda-blob.h
-include/libgda/gda-client.h
-include/libgda/gda-command.h
-include/libgda/gda-config.h
-include/libgda/gda-connection.h
-include/libgda/gda-data-model-array.h
-include/libgda/gda-data-model-hash.h
-include/libgda/gda-data-model-list.h
-include/libgda/gda-data-model.h
-include/libgda/gda-enum-types.h
-include/libgda/gda-error.h
-include/libgda/gda-export.h
-include/libgda/gda-field.h
-include/libgda/gda-log.h
-include/libgda/gda-marshal.h
-include/libgda/gda-parameter.h
-include/libgda/gda-quark-list.h
-include/libgda/gda-row.h
-include/libgda/gda-select.h
-include/libgda/gda-server-provider.h
-include/libgda/gda-table.h
-include/libgda/gda-transaction.h
-include/libgda/gda-util.h
-include/libgda/gda-value.h
-include/libgda/gda-xml-connection.h
-include/libgda/gda-xml-database.h
-include/libgda/gda-xml-document.h
-include/libgda/gda-xql-atom.h
-include/libgda/gda-xql-bin.h
-include/libgda/gda-xql-column.h
-include/libgda/gda-xql-const.h
-include/libgda/gda-xql-delete.h
-include/libgda/gda-xql-dml.h
-include/libgda/gda-xql-dual.h
-include/libgda/gda-xql-field.h
-include/libgda/gda-xql-func.h
-include/libgda/gda-xql-insert.h
-include/libgda/gda-xql-item.h
-include/libgda/gda-xql-join.h
-include/libgda/gda-xql-list.h
-include/libgda/gda-xql-query.h
-include/libgda/gda-xql-select.h
-include/libgda/gda-xql-stack.h
-include/libgda/gda-xql-target.h
-include/libgda/gda-xql-update.h
-include/libgda/gda-xql-utils.h
-include/libgda/gda-xql-value.h
-include/libgda/gda-xql-valueref.h
-include/libgda/libgda.h
+include/libgda-1.2/libgda-report/gda-report-document.h
+include/libgda-1.2/libgda-report/gda-report-item-detail.h
+include/libgda-1.2/libgda-report/gda-report-item-label.h
+include/libgda-1.2/libgda-report/gda-report-item-pagefooter.h
+include/libgda-1.2/libgda-report/gda-report-item-pageheader.h
+include/libgda-1.2/libgda-report/gda-report-item-repfield.h
+include/libgda-1.2/libgda-report/gda-report-item-report.h
+include/libgda-1.2/libgda-report/gda-report-item-reportfooter.h
+include/libgda-1.2/libgda-report/gda-report-item-reportheader.h
+include/libgda-1.2/libgda-report/gda-report-item-sqlquery.h
+include/libgda-1.2/libgda-report/gda-report-item.h
+include/libgda-1.2/libgda-report/gda-report-result.h
+include/libgda-1.2/libgda-report/gda-report-types.h
+include/libgda-1.2/libgda-report/gda-report-valid.h
+include/libgda-1.2/libgda-report/gda-report.h
+include/libgda-1.2/libgda/gda-blob.h
+include/libgda-1.2/libgda/gda-client.h
+include/libgda-1.2/libgda/gda-command.h
+include/libgda-1.2/libgda/gda-config.h
+include/libgda-1.2/libgda/gda-connection.h
+include/libgda-1.2/libgda/gda-data-model-array.h
+include/libgda-1.2/libgda/gda-data-model-hash.h
+include/libgda-1.2/libgda/gda-data-model-list.h
+include/libgda-1.2/libgda/gda-data-model.h
+include/libgda-1.2/libgda/gda-enum-types.h
+include/libgda-1.2/libgda/gda-error.h
+include/libgda-1.2/libgda/gda-field.h
+include/libgda-1.2/libgda/gda-log.h
+include/libgda-1.2/libgda/gda-marshal.h
+include/libgda-1.2/libgda/gda-parameter.h
+include/libgda-1.2/libgda/gda-quark-list.h
+include/libgda-1.2/libgda/gda-row.h
+include/libgda-1.2/libgda/gda-select.h
+include/libgda-1.2/libgda/gda-server-provider.h
+include/libgda-1.2/libgda/gda-table.h
+include/libgda-1.2/libgda/gda-transaction.h
+include/libgda-1.2/libgda/gda-util.h
+include/libgda-1.2/libgda/gda-value.h
+include/libgda-1.2/libgda/gda-xml-connection.h
+include/libgda-1.2/libgda/gda-xml-database.h
+include/libgda-1.2/libgda/gda-xml-document.h
+include/libgda-1.2/libgda/gda-xql-atom.h
+include/libgda-1.2/libgda/gda-xql-bin.h
+include/libgda-1.2/libgda/gda-xql-column.h
+include/libgda-1.2/libgda/gda-xql-const.h
+include/libgda-1.2/libgda/gda-xql-delete.h
+include/libgda-1.2/libgda/gda-xql-dml.h
+include/libgda-1.2/libgda/gda-xql-dual.h
+include/libgda-1.2/libgda/gda-xql-field.h
+include/libgda-1.2/libgda/gda-xql-func.h
+include/libgda-1.2/libgda/gda-xql-insert.h
+include/libgda-1.2/libgda/gda-xql-item.h
+include/libgda-1.2/libgda/gda-xql-join.h
+include/libgda-1.2/libgda/gda-xql-list.h
+include/libgda-1.2/libgda/gda-xql-query.h
+include/libgda-1.2/libgda/gda-xql-select.h
+include/libgda-1.2/libgda/gda-xql-stack.h
+include/libgda-1.2/libgda/gda-xql-target.h
+include/libgda-1.2/libgda/gda-xql-update.h
+include/libgda-1.2/libgda/gda-xql-utils.h
+include/libgda-1.2/libgda/gda-xql-value.h
+include/libgda-1.2/libgda/gda-xql-valueref.h
+include/libgda-1.2/libgda/libgda.h
+include/libgda-1.2/sql/sql_parser.h
 lib/libgda-2.la
 lib/libgda-report-2.la
 lib/libgda/providers/libgda-xml.la
 lib/libgdasql.la
 lib/pkgconfig/libgda.pc
 share/doc/html/libgda/architecture.html
-share/doc/html/libgda/c694.html
+share/doc/html/libgda/ch06.html
+share/doc/html/libgda/ch09s04.html
+share/doc/html/libgda/ch09s05.html
+share/doc/html/libgda/ch09s06.html
 share/doc/html/libgda/compiling.html
 share/doc/html/libgda/connecting.html
 share/doc/html/libgda/connections.html
@@ -89,13 +92,62 @@ share/doc/html/libgda/fdl-section8.html
 share/doc/html/libgda/fdl-section9.html
 share/doc/html/libgda/fdl-using.html
 share/doc/html/libgda/fdl.html
-share/doc/html/libgda/gdavalue.html
+share/doc/html/libgda/home.png
 share/doc/html/libgda/index.html
 share/doc/html/libgda/index.sgml
 share/doc/html/libgda/installation-configuring.html
 share/doc/html/libgda/installation-installing.html
 share/doc/html/libgda/installation.html
 share/doc/html/libgda/introduction.html
+share/doc/html/libgda/left.png
+share/doc/html/libgda/libgda-GdaClient.html
+share/doc/html/libgda/libgda-GdaConnection.html
+share/doc/html/libgda/libgda-GdaDataModel.html
+share/doc/html/libgda/libgda-GdaDataModelArray.html
+share/doc/html/libgda/libgda-GdaDataModelHash.html
+share/doc/html/libgda/libgda-GdaDataModelList.html
+share/doc/html/libgda/libgda-GdaError.html
+share/doc/html/libgda/libgda-GdaExport.html
+share/doc/html/libgda/libgda-GdaReportDocument.html
+share/doc/html/libgda/libgda-GdaReportItem.html
+share/doc/html/libgda/libgda-GdaReportItemDetail.html
+share/doc/html/libgda/libgda-GdaReportItemLabel.html
+share/doc/html/libgda/libgda-GdaReportItemPageFooter.html
+share/doc/html/libgda/libgda-GdaReportItemPageHeader.html
+share/doc/html/libgda/libgda-GdaReportItemRepField.html
+share/doc/html/libgda/libgda-GdaReportItemReport.html
+share/doc/html/libgda/libgda-GdaReportItemReportFooter.html
+share/doc/html/libgda/libgda-GdaReportItemReportHeader.html
+share/doc/html/libgda/libgda-GdaReportItemSqlQuery.html
+share/doc/html/libgda/libgda-GdaReportResult.html
+share/doc/html/libgda/libgda-GdaReportValid.html
+share/doc/html/libgda/libgda-GdaSelect.html
+share/doc/html/libgda/libgda-GdaServerProvider.html
+share/doc/html/libgda/libgda-GdaTable.html
+share/doc/html/libgda/libgda-GdaTransaction.html
+share/doc/html/libgda/libgda-GdaXmlConnection.html
+share/doc/html/libgda/libgda-GdaXmlDatabase.html
+share/doc/html/libgda/libgda-GdaXmlDocument.html
+share/doc/html/libgda/libgda-GdaXqlAtom.html
+share/doc/html/libgda/libgda-GdaXqlBin.html
+share/doc/html/libgda/libgda-GdaXqlColumn.html
+share/doc/html/libgda/libgda-GdaXqlConst.html
+share/doc/html/libgda/libgda-GdaXqlDelete.html
+share/doc/html/libgda/libgda-GdaXqlDml.html
+share/doc/html/libgda/libgda-GdaXqlDual.html
+share/doc/html/libgda/libgda-GdaXqlField.html
+share/doc/html/libgda/libgda-GdaXqlFunc.html
+share/doc/html/libgda/libgda-GdaXqlInsert.html
+share/doc/html/libgda/libgda-GdaXqlItem.html
+share/doc/html/libgda/libgda-GdaXqlJoin.html
+share/doc/html/libgda/libgda-GdaXqlList.html
+share/doc/html/libgda/libgda-GdaXqlQuery.html
+share/doc/html/libgda/libgda-GdaXqlSelect.html
+share/doc/html/libgda/libgda-GdaXqlStack.html
+share/doc/html/libgda/libgda-GdaXqlTarget.html
+share/doc/html/libgda/libgda-GdaXqlUpdate.html
+share/doc/html/libgda/libgda-GdaXqlValue.html
+share/doc/html/libgda/libgda-GdaXqlValueRef.html
 share/doc/html/libgda/libgda-api.html
 share/doc/html/libgda/libgda-gda-blob.html
 share/doc/html/libgda/libgda-gda-command.html
@@ -109,70 +161,23 @@ share/doc/html/libgda/libgda-gda-row.html
 share/doc/html/libgda/libgda-gda-util.html
 share/doc/html/libgda/libgda-gda-value.html
 share/doc/html/libgda/libgda-gda-xql-utils.html
-share/doc/html/libgda/libgda-gdaclient.html
-share/doc/html/libgda/libgda-gdaconnection.html
-share/doc/html/libgda/libgda-gdadatamodel.html
-share/doc/html/libgda/libgda-gdadatamodelarray.html
-share/doc/html/libgda/libgda-gdadatamodelhash.html
-share/doc/html/libgda/libgda-gdadatamodellist.html
-share/doc/html/libgda/libgda-gdaerror.html
-share/doc/html/libgda/libgda-gdaexport.html
-share/doc/html/libgda/libgda-gdareportdocument.html
-share/doc/html/libgda/libgda-gdareportitem.html
-share/doc/html/libgda/libgda-gdareportitemdetail.html
-share/doc/html/libgda/libgda-gdareportitemlabel.html
-share/doc/html/libgda/libgda-gdareportitempagefooter.html
-share/doc/html/libgda/libgda-gdareportitempageheader.html
-share/doc/html/libgda/libgda-gdareportitemrepfield.html
-share/doc/html/libgda/libgda-gdareportitemreport.html
-share/doc/html/libgda/libgda-gdareportitemreportfooter.html
-share/doc/html/libgda/libgda-gdareportitemreportheader.html
-share/doc/html/libgda/libgda-gdareportitemsqlquery.html
-share/doc/html/libgda/libgda-gdareportresult.html
-share/doc/html/libgda/libgda-gdareportvalid.html
-share/doc/html/libgda/libgda-gdaselect.html
-share/doc/html/libgda/libgda-gdaserverprovider.html
-share/doc/html/libgda/libgda-gdatable.html
-share/doc/html/libgda/libgda-gdatransaction.html
-share/doc/html/libgda/libgda-gdaxmlconnection.html
-share/doc/html/libgda/libgda-gdaxmldatabase.html
-share/doc/html/libgda/libgda-gdaxmldocument.html
-share/doc/html/libgda/libgda-gdaxqlatom.html
-share/doc/html/libgda/libgda-gdaxqlbin.html
-share/doc/html/libgda/libgda-gdaxqlcolumn.html
-share/doc/html/libgda/libgda-gdaxqlconst.html
-share/doc/html/libgda/libgda-gdaxqldelete.html
-share/doc/html/libgda/libgda-gdaxqldml.html
-share/doc/html/libgda/libgda-gdaxqldual.html
-share/doc/html/libgda/libgda-gdaxqlfield.html
-share/doc/html/libgda/libgda-gdaxqlfunc.html
-share/doc/html/libgda/libgda-gdaxqlinsert.html
-share/doc/html/libgda/libgda-gdaxqlitem.html
-share/doc/html/libgda/libgda-gdaxqljoin.html
-share/doc/html/libgda/libgda-gdaxqllist.html
-share/doc/html/libgda/libgda-gdaxqlquery.html
-share/doc/html/libgda/libgda-gdaxqlselect.html
-share/doc/html/libgda/libgda-gdaxqlstack.html
-share/doc/html/libgda/libgda-gdaxqltarget.html
-share/doc/html/libgda/libgda-gdaxqlupdate.html
-share/doc/html/libgda/libgda-gdaxqlvalue.html
-share/doc/html/libgda/libgda-gdaxqlvalueref.html
 share/doc/html/libgda/libgda-libgda.html
 share/doc/html/libgda/libgda-provider-class.html
 share/doc/html/libgda/libgda-provider-recordset.html
 share/doc/html/libgda/libgda-providers.html
 share/doc/html/libgda/libgda-reports.html
+share/doc/html/libgda/libgda-server-provider-details.html
 share/doc/html/libgda/libgda-xql.html
+share/doc/html/libgda/libgda.devhelp
 share/doc/html/libgda/main_example.html
+share/doc/html/libgda/manage-gdavalue.html
 share/doc/html/libgda/managing-errors.html
 share/doc/html/libgda/migration-configuration.html
 share/doc/html/libgda/migration-executing-commands.html
 share/doc/html/libgda/migration.html
 share/doc/html/libgda/processing-queries.html
-share/doc/html/libgda/x863.html
-share/doc/html/libgda/x892.html
-share/doc/html/libgda/x897.html
-share/examples/libgda/config
+share/doc/html/libgda/right.png
+share/doc/html/libgda/up.png
 share/libgda/xml/gda-report-result.dtd
 share/libgda/xml/gda-report.dtd
 share/libgda/xml/gda-xml-query.dtd
@@ -193,12 +198,12 @@ ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/libgda-2.mo
 ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/libgda-2.mo
 ${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/libgda-2.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/libgda-2.mo
-${PKGLOCALEDIR}/locale/id/LC_MESSAGES/libgda-2.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/libgda-2.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/libgda-2.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/libgda-2.mo
 ${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/libgda-2.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/libgda-2.mo
+${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/libgda-2.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/libgda-2.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/libgda-2.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/libgda-2.mo
@@ -207,6 +212,7 @@ ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/libgda-2.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/libgda-2.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/libgda-2.mo
 ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/libgda-2.mo
+${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/libgda-2.mo
 ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/libgda-2.mo
 ${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/libgda-2.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/libgda-2.mo
@@ -220,11 +226,10 @@ share/omf/libgda/libgda-C.omf
 @comment in scrollkeeper: @dirrm share/omf
 @dirrm share/libgda/xml
 @dirrm share/libgda
-@dirrm share/examples/libgda
 @dirrm share/doc/html/libgda
 @dirrm lib/libgda/providers
 @dirrm lib/libgda
-@exec ${MKDIR} %D/include/libgda/sql
-@dirrm include/libgda/sql
-@dirrm include/libgda-report
-@dirrm include/libgda
+@dirrm include/libgda-1.2/sql
+@dirrm include/libgda-1.2/libgda-report
+@dirrm include/libgda-1.2/libgda
+@dirrm include/libgda-1.2
diff --git a/databases/libgda/distinfo b/databases/libgda/distinfo
index 915096c0744..80e100fc593 100644
--- a/databases/libgda/distinfo
+++ b/databases/libgda/distinfo
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.12 2005/02/23 16:33:06 agc Exp $
+$NetBSD: distinfo,v 1.13 2005/02/24 19:17:10 drochner Exp $
 
-SHA1 (libgda-1.0.4.tar.bz2) = 8ea2b59c9b35230a2e43a6495b148b5507f2e79b
-RMD160 (libgda-1.0.4.tar.bz2) = e3bebea2e72979c42caae0cc9b086ac4d2a77413
-Size (libgda-1.0.4.tar.bz2) = 1112201 bytes
-SHA1 (patch-aa) = 72bb5daae7ad2d12e74256d443b1813d68fe86b3
-SHA1 (patch-ab) = 833f31fd0c045ff7c15e0a4e0d76f50f389c7cf2
-SHA1 (patch-ac) = 962381015f8df753b35c45935f90758c2c634efa
-SHA1 (patch-ad) = d46e46f0d40900c3dcac864fea9e96cc879382df
+SHA1 (libgda-1.2.0.tar.bz2) = ad48655656c2a8feaaa0a9dc0d5b0c57dfac9c60
+RMD160 (libgda-1.2.0.tar.bz2) = 64dd6985da240322c865702dda592c6f2b87702d
+Size (libgda-1.2.0.tar.bz2) = 1227157 bytes
+SHA1 (patch-aa) = 237d63c7b71bffb710782ca838bbb2fdc2c358a5
+SHA1 (patch-ab) = 7850e95dbd09185b1ec4ef855490ef89b28c8daa
+SHA1 (patch-ac) = 34dbe05c9018d94a853bc5efaaa9385798c08537
+SHA1 (patch-ad) = 69f9464fd1bd1f3543808bf13de2dd5610a284b7
+SHA1 (patch-ae) = 20596d6c5e6827f5ebe497c0c1ce8725125612c4
+SHA1 (patch-af) = d3721169a22d26bf884e9ba3b8758c07d5355e28
diff --git a/databases/libgda/patches/patch-aa b/databases/libgda/patches/patch-aa
index 39335a31b28..de4bf277049 100644
--- a/databases/libgda/patches/patch-aa
+++ b/databases/libgda/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2004/03/11 14:00:29 jmmv Exp $
+$NetBSD: patch-aa,v 1.4 2005/02/24 19:17:10 drochner Exp $
 
---- doc/C/Makefile.in.orig	2004-01-17 00:06:09.000000000 +0100
+--- doc/C/Makefile.in.orig	2004-10-10 00:26:49.000000000 +0200
 +++ doc/C/Makefile.in
-@@ -272,7 +272,7 @@ target_alias = @target_alias@
- 
- # The name of the module, e.g. 'glib'.
- DOC_MODULE = libgda
+@@ -116,7 +116,7 @@ HAVE_SCROLLKEEPER_TRUE = @HAVE_SCROLLKEE
+ HISTORY_LIB = @HISTORY_LIB@
+ HISTORY_LIB_FALSE = @HISTORY_LIB_FALSE@
+ HISTORY_LIB_TRUE = @HISTORY_LIB_TRUE@
 -HTML_DIR = $(datadir)/gtk-doc/html
 +HTML_DIR = $(datadir)/doc/html
- 
- # The top-level SGML file. Change it if you want.
- DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
+ IBMDB2_CFLAGS = @IBMDB2_CFLAGS@
+ IBMDB2_FALSE = @IBMDB2_FALSE@
+ IBMDB2_LIBS = @IBMDB2_LIBS@
diff --git a/databases/libgda/patches/patch-ab b/databases/libgda/patches/patch-ab
index f7f8a7025a3..949ab5f7ebd 100644
--- a/databases/libgda/patches/patch-ab
+++ b/databases/libgda/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.5 2004/03/11 14:00:29 jmmv Exp $
+$NetBSD: patch-ab,v 1.6 2005/02/24 19:17:10 drochner Exp $
 
---- data/Makefile.in.orig	2004-01-17 00:06:09.000000000 +0100
+--- data/Makefile.in.orig	2004-10-10 00:26:49.000000000 +0200
 +++ data/Makefile.in
-@@ -271,7 +271,7 @@ sysconfdir = @sysconfdir@
+@@ -283,7 +283,7 @@ sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  
  # Default global configuration file
 -configdir = $(sysconfdir)/libgda
-+configdir = $(datadir)/examples/libgda
++configdir = $(sysconfdir)/examples/libgda
  config_DATA = config
- 
  xmldir = $(datadir)/libgda/xml
+ xml_DATA = gda-xml-query.dtd 	\
diff --git a/databases/libgda/patches/patch-ac b/databases/libgda/patches/patch-ac
index f61120801bb..e0660ee0226 100644
--- a/databases/libgda/patches/patch-ac
+++ b/databases/libgda/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.3 2004/03/11 14:00:29 jmmv Exp $
+$NetBSD: patch-ac,v 1.4 2005/02/24 19:17:10 drochner Exp $
 
---- libgda/Makefile.in.orig	2004-01-17 00:23:36.000000000 +0100
+--- libgda/Makefile.in.orig	2004-10-10 00:26:50.000000000 +0200
 +++ libgda/Makefile.in
-@@ -277,7 +277,7 @@ INCLUDES = \
+@@ -374,7 +374,7 @@ INCLUDES = \
  	$(LIBGDA_CFLAGS) \
- 	-DLIBGDA_PLUGINDIR=\""$(libdir)/libgda/providers"\" \
+ 	-DLIBGDA_PLUGINDIR=\""$(prefix)/lib/libgda/providers"\" \
  	-DLIBGDA_LOCALEDIR=\""$(datadir)/locale"\" \
 -	-DLIBGDA_GLOBAL_CONFIG_FILE=\""$(sysconfdir)/libgda/config"\"
 +	-DLIBGDA_GLOBAL_CONFIG_FILE=\""$(sysconfdir)/config"\"
  
- 
  gda_marshal_built_files = gda-marshal.h gda-marshal.c
+ gda_headers = \
diff --git a/databases/libgda/patches/patch-ad b/databases/libgda/patches/patch-ad
index ea83cd0f332..edf5769898a 100644
--- a/databases/libgda/patches/patch-ad
+++ b/databases/libgda/patches/patch-ad
@@ -1,17 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2005/02/05 16:30:39 jmmv Exp $
+$NetBSD: patch-ad,v 1.3 2005/02/24 19:17:10 drochner Exp $
 
---- configure.orig	2004-04-18 21:09:46.000000000 +0200
+--- configure.orig	2004-12-28 14:20:35.000000000 +0100
 +++ configure
-@@ -2046,7 +2046,7 @@ if test -z "`$INTLTOOL_PERL -v | fgrep '
- echo "$as_me: error: perl 5.x required for intltool" >&2;}
-    { (exit 1); exit 1; }; }
- fi
--if `perl -e "require XML::Parser" 2>/dev/null`; then
-+if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
- :
- else
-    { { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
-@@ -22666,6 +22666,8 @@ else
+@@ -24322,6 +24322,8 @@ else
    BUILD_CONFIG_TOOL_TRUE='#'
    BUILD_CONFIG_TOOL_FALSE=
  fi
diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile
index 200fb20e78f..7d0ff4bb833 100644
--- a/databases/libgnomedb/Makefile
+++ b/databases/libgnomedb/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.30 2004/10/03 00:13:18 tv Exp $
+# $NetBSD: Makefile,v 1.31 2005/02/24 19:17:10 drochner Exp $
 #
 
-DISTNAME=		libgnomedb-1.0.4
-PKGREVISION=		1
+DISTNAME=		libgnomedb-1.2.0
 CATEGORIES=		databases gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgnomedb/1.0/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgnomedb/1.2/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		sab@posix.org.uk
diff --git a/databases/libgnomedb/PLIST b/databases/libgnomedb/PLIST
index f85dfaeaab7..1d3aca78b1b 100644
--- a/databases/libgnomedb/PLIST
+++ b/databases/libgnomedb/PLIST
@@ -1,41 +1,38 @@
-@comment $NetBSD: PLIST,v 1.9 2004/09/22 08:09:22 jlam Exp $
+@comment $NetBSD: PLIST,v 1.10 2005/02/24 19:17:10 drochner Exp $
 bin/gnome-database-properties
-include/libgnomedb/gnome-db-browser.h
-include/libgnomedb/gnome-db-combo.h
-include/libgnomedb/gnome-db-config.h
-include/libgnomedb/gnome-db-connection-properties.h
-include/libgnomedb/gnome-db-connection-selector.h
-include/libgnomedb/gnome-db-control-widget.h
-include/libgnomedb/gnome-db-control.h
-include/libgnomedb/gnome-db-data-source-selector.h
-include/libgnomedb/gnome-db-dsn-config-druid.h
-include/libgnomedb/gnome-db-dsn-config.h
-include/libgnomedb/gnome-db-editor.h
-include/libgnomedb/gnome-db-error-dialog.h
-include/libgnomedb/gnome-db-error.h
-include/libgnomedb/gnome-db-form.h
-include/libgnomedb/gnome-db-gray-bar.h
-include/libgnomedb/gnome-db-grid.h
-include/libgnomedb/gnome-db-i18n.h
-include/libgnomedb/gnome-db-icon-list.h
-include/libgnomedb/gnome-db-list.h
-include/libgnomedb/gnome-db-login-dialog.h
-include/libgnomedb/gnome-db-login.h
-include/libgnomedb/gnome-db-model.h
-include/libgnomedb/gnome-db-provider-selector.h
-include/libgnomedb/gnome-db-query-builder.h
-include/libgnomedb/gnome-db-report-editor.h
-include/libgnomedb/gnome-db-stock.h
-include/libgnomedb/gnome-db-table-editor.h
-include/libgnomedb/gnome-db-util.h
-include/libgnomedb/libgnomedb.h
-lib/bonobo/monikers/libmoniker_database.la
-lib/bonobo/servers/GNOME_Database_Components.server
-lib/bonobo/servers/GNOME_Database_Monikers.server
+include/libgnomedb-1.2/libgnomedb/gnome-db-browser.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-combo.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-config.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-connection-properties.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-connection-selector.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-control-widget.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-control.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-data-source-selector.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-dsn-config-druid.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-dsn-config.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-editor.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-error-dialog.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-error.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-find-dialog.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-form.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-gray-bar.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-grid.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-i18n.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-icon-list.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-list.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-login-dialog.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-login.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-model.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-provider-selector.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-query-builder.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-report-editor.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-stock.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-table-editor.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-util.h
+include/libgnomedb-1.2/libgnomedb/libgnomedb.h
 lib/libglade/2.0/libgnomedb.la
 lib/libgnomedb-2.la
 lib/pkgconfig/libgnomedb.pc
-libexec/gnome-database-components
 share/control-center-2.0/capplets/database-properties.desktop
 share/doc/html/libgnomedb/fdl-section1.html
 share/doc/html/libgnomedb/fdl-section10.html
@@ -49,41 +46,47 @@ share/doc/html/libgnomedb/fdl-section8.html
 share/doc/html/libgnomedb/fdl-section9.html
 share/doc/html/libgnomedb/fdl-using.html
 share/doc/html/libgnomedb/fdl.html
+share/doc/html/libgnomedb/home.png
 share/doc/html/libgnomedb/index.html
 share/doc/html/libgnomedb/index.sgml
+share/doc/html/libgnomedb/left.png
+share/doc/html/libgnomedb/libgnomedb-GnomeDbBrowser.html
+share/doc/html/libgnomedb/libgnomedb-GnomeDbCombo.html
+share/doc/html/libgnomedb/libgnomedb-GnomeDbConnectionProperties.html
+share/doc/html/libgnomedb/libgnomedb-GnomeDbConnectionSelector.html
+share/doc/html/libgnomedb/libgnomedb-GnomeDbControl.html
+share/doc/html/libgnomedb/libgnomedb-GnomeDbControlWidget.html
+share/doc/html/libgnomedb/libgnomedb-GnomeDbDataSourceSelector.html
+share/doc/html/libgnomedb/libgnomedb-GnomeDbDsnConfig.html
+share/doc/html/libgnomedb/libgnomedb-GnomeDbDsnConfigDruid.html
+share/doc/html/libgnomedb/libgnomedb-GnomeDbEditor.html
+share/doc/html/libgnomedb/libgnomedb-GnomeDbError.html
+share/doc/html/libgnomedb/libgnomedb-GnomeDbErrorDialog.html
+share/doc/html/libgnomedb/libgnomedb-GnomeDbFindDialog.html
+share/doc/html/libgnomedb/libgnomedb-GnomeDbForm.html
+share/doc/html/libgnomedb/libgnomedb-GnomeDbGrayBar.html
+share/doc/html/libgnomedb/libgnomedb-GnomeDbGrid.html
+share/doc/html/libgnomedb/libgnomedb-GnomeDbIconList.html
+share/doc/html/libgnomedb/libgnomedb-GnomeDbList.html
+share/doc/html/libgnomedb/libgnomedb-GnomeDbLogin.html
+share/doc/html/libgnomedb/libgnomedb-GnomeDbLoginDialog.html
+share/doc/html/libgnomedb/libgnomedb-GnomeDbProviderSelector.html
+share/doc/html/libgnomedb/libgnomedb-GnomeDbQueryBuilder.html
+share/doc/html/libgnomedb/libgnomedb-GnomeDbReportEditor.html
+share/doc/html/libgnomedb/libgnomedb-GnomeDbTableEditor.html
+share/doc/html/libgnomedb/libgnomedb-GnomeDbWindow.html
 share/doc/html/libgnomedb/libgnomedb-basic.html
 share/doc/html/libgnomedb/libgnomedb-bonobo.html
 share/doc/html/libgnomedb/libgnomedb-gnome-db-config.html
 share/doc/html/libgnomedb/libgnomedb-gnome-db-model.html
 share/doc/html/libgnomedb/libgnomedb-gnome-db-stock.html
 share/doc/html/libgnomedb/libgnomedb-gnome-db-util.html
-share/doc/html/libgnomedb/libgnomedb-gnomedbbrowser.html
-share/doc/html/libgnomedb/libgnomedb-gnomedbcombo.html
-share/doc/html/libgnomedb/libgnomedb-gnomedbconnectionproperties.html
-share/doc/html/libgnomedb/libgnomedb-gnomedbconnectionselector.html
-share/doc/html/libgnomedb/libgnomedb-gnomedbcontrol.html
-share/doc/html/libgnomedb/libgnomedb-gnomedbcontrolwidget.html
-share/doc/html/libgnomedb/libgnomedb-gnomedbdatasourceselector.html
-share/doc/html/libgnomedb/libgnomedb-gnomedbdsnconfig.html
-share/doc/html/libgnomedb/libgnomedb-gnomedbdsnconfigdruid.html
-share/doc/html/libgnomedb/libgnomedb-gnomedbeditor.html
-share/doc/html/libgnomedb/libgnomedb-gnomedberror.html
-share/doc/html/libgnomedb/libgnomedb-gnomedberrordialog.html
-share/doc/html/libgnomedb/libgnomedb-gnomedbform.html
-share/doc/html/libgnomedb/libgnomedb-gnomedbgraybar.html
-share/doc/html/libgnomedb/libgnomedb-gnomedbgrid.html
-share/doc/html/libgnomedb/libgnomedb-gnomedbiconlist.html
-share/doc/html/libgnomedb/libgnomedb-gnomedblist.html
-share/doc/html/libgnomedb/libgnomedb-gnomedblogin.html
-share/doc/html/libgnomedb/libgnomedb-gnomedblogindialog.html
-share/doc/html/libgnomedb/libgnomedb-gnomedbproviderselector.html
-share/doc/html/libgnomedb/libgnomedb-gnomedbquerybuilder.html
-share/doc/html/libgnomedb/libgnomedb-gnomedbreporteditor.html
-share/doc/html/libgnomedb/libgnomedb-gnomedbtableeditor.html
-share/doc/html/libgnomedb/libgnomedb-gnomedbwindow.html
 share/doc/html/libgnomedb/libgnomedb-introduction.html
 share/doc/html/libgnomedb/libgnomedb-libgnomedb.html
 share/doc/html/libgnomedb/libgnomedb-widgets.html
+share/doc/html/libgnomedb/libgnomedb.devhelp
+share/doc/html/libgnomedb/right.png
+share/doc/html/libgnomedb/up.png
 share/gconf/schemas/libgnomedb.schemas
 share/gnome-db/ui/db-shell.xml
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/libgnomedb-2.mo
@@ -103,12 +106,13 @@ ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/libgnomedb-2.mo
 ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/libgnomedb-2.mo
 ${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/libgnomedb-2.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/libgnomedb-2.mo
-${PKGLOCALEDIR}/locale/id/LC_MESSAGES/libgnomedb-2.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/libgnomedb-2.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/libgnomedb-2.mo
+${PKGLOCALEDIR}/locale/ka/LC_MESSAGES/libgnomedb-2.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/libgnomedb-2.mo
 ${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/libgnomedb-2.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/libgnomedb-2.mo
+${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/libgnomedb-2.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/libgnomedb-2.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/libgnomedb-2.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/libgnomedb-2.mo
@@ -117,6 +121,7 @@ ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/libgnomedb-2.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/libgnomedb-2.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/libgnomedb-2.mo
 ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/libgnomedb-2.mo
+${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/libgnomedb-2.mo
 ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/libgnomedb-2.mo
 ${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/libgnomedb-2.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/libgnomedb-2.mo
@@ -139,12 +144,15 @@ share/pixmaps/libgnomedb/gnome-db-database_24x24.png
 share/pixmaps/libgnomedb/gnome-db-database_48x48.png
 share/pixmaps/libgnomedb/gnome-db-designer_24x24.png
 share/pixmaps/libgnomedb/gnome-db-disconnect_24x24.png
+share/pixmaps/libgnomedb/gnome-db-field_16x16.png
 share/pixmaps/libgnomedb/gnome-db-indexes_16x16.png
 share/pixmaps/libgnomedb/gnome-db-no-transaction_24x24.png
 share/pixmaps/libgnomedb/gnome-db-procedures_16x16.png
 share/pixmaps/libgnomedb/gnome-db-procedures_24x24.png
 share/pixmaps/libgnomedb/gnome-db-query_16x16.png
 share/pixmaps/libgnomedb/gnome-db-query_24x24.png
+share/pixmaps/libgnomedb/gnome-db-relations_16x16.png
+share/pixmaps/libgnomedb/gnome-db-relations_24x24.png
 share/pixmaps/libgnomedb/gnome-db-rollback_24x24.png
 share/pixmaps/libgnomedb/gnome-db-sequences_16x16.png
 share/pixmaps/libgnomedb/gnome-db-sequences_24x24.png
@@ -160,7 +168,6 @@ share/pixmaps/libgnomedb/gnome-db-views_16x16.png
 share/pixmaps/libgnomedb/gnome-db-within-transaction_24x24.png
 share/pixmaps/libgnomedb/gnome-db.png
 @dirrm share/pixmaps/libgnomedb
-@comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/omf/libgnomedb
 @comment in scrollkeeper: @dirrm share/omf
 @comment in xdg-dirs: @dirrm share/mime-info
@@ -170,6 +177,4 @@ share/pixmaps/libgnomedb/gnome-db.png
 @dirrm share/doc/html/libgnomedb
 @comment in gnome2-dirs: @dirrm share/control-center-2.0/capplets
 @comment in libglade2: @dirrm lib/libglade/2.0
-@comment in libbonobo: @dirrm lib/bonobo/servers
-@comment in libbonobo: @dirrm lib/bonobo/monikers
-@dirrm include/libgnomedb
+@dirrm include/libgnomedb-1.2/libgnomedb
diff --git a/databases/libgnomedb/distinfo b/databases/libgnomedb/distinfo
index f0f7ced6562..42c897482a6 100644
--- a/databases/libgnomedb/distinfo
+++ b/databases/libgnomedb/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.11 2005/02/23 16:33:06 agc Exp $
+$NetBSD: distinfo,v 1.12 2005/02/24 19:17:10 drochner Exp $
 
-SHA1 (libgnomedb-1.0.4.tar.bz2) = 9c50cbe53d554c4b1581035681932f2f6b46d40b
-RMD160 (libgnomedb-1.0.4.tar.bz2) = b694cb3fe19f36e99553173c9a969b725e95564d
-Size (libgnomedb-1.0.4.tar.bz2) = 621983 bytes
-SHA1 (patch-aa) = c2b274299c89f66925d67cd1c49bacbe8d1f529b
-SHA1 (patch-ab) = ee7da278677dcc63f21edd994b52b62577ce5058
+SHA1 (libgnomedb-1.2.0.tar.bz2) = 6f5a59bd09fae98fed69f0961a8ac5ef2173786b
+RMD160 (libgnomedb-1.2.0.tar.bz2) = 5808ddb919f18c4243ca2ef27a7f97cea79019d8
+Size (libgnomedb-1.2.0.tar.bz2) = 649272 bytes
+SHA1 (patch-ab) = 6b8ae19bb5876532cab5b1441cf24cce92ca57f1
+SHA1 (patch-ad) = 008d949f0e0debda852f07c3a2eaac2462c37f50
diff --git a/databases/libgnomedb/patches/patch-aa b/databases/libgnomedb/patches/patch-aa
deleted file mode 100644
index 4e7443e2d85..00000000000
--- a/databases/libgnomedb/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2004/12/17 18:22:44 reed Exp $
-
---- configure.orig	Fri Dec 17 11:57:56 2004
-+++ configure	Fri Dec 17 11:57:04 2004
-@@ -2038,7 +2038,7 @@
- echo "$as_me: error: perl 5.x required for intltool" >&2;}
-    { (exit 1); exit 1; }; }
- fi
--if `perl -e "require XML::Parser" 2>/dev/null`; then
-+if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
- :
- else
-    { { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
diff --git a/databases/libgnomedb/patches/patch-ab b/databases/libgnomedb/patches/patch-ab
index e000d89c137..bdac8e6ed44 100644
--- a/databases/libgnomedb/patches/patch-ab
+++ b/databases/libgnomedb/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.5 2004/04/20 16:26:01 jmmv Exp $
+$NetBSD: patch-ab,v 1.6 2005/02/24 19:17:10 drochner Exp $
 
---- Makefile.in.orig	2004-04-18 21:19:38.000000000 +0200
+--- Makefile.in.orig	2004-12-28 14:29:27.000000000 +0100
 +++ Makefile.in
-@@ -213,7 +213,7 @@ target_alias = @target_alias@
- @BUILD_WITH_GNOME_TRUE@GNOME_DIRECTORY = control-center components monikers
- 
- @ENABLE_GTK_DOC_TRUE@DOC_DIRECTORY = doc
+@@ -261,7 +261,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk
+ @HAVE_LIBGLADE_TRUE@LIBGLADE_DIRECTORY = glade
+ @BUILD_WITH_GNOME_FALSE@GNOME_DIRECTORY = 
+ @BUILD_WITH_GNOME_TRUE@GNOME_DIRECTORY = control-center
 -@ENABLE_GTK_DOC_FALSE@DOC_DIRECTORY = 
 +@ENABLE_GTK_DOC_FALSE@DOC_DIRECTORY = doc
- 
+ @ENABLE_GTK_DOC_TRUE@DOC_DIRECTORY = doc
  SUBDIRS = \
  	po \