update gnomedb to 1.2

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

5 files changed, 84 insertions, 93 deletions

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 \