diff options
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/libgnomedb/Makefile | 25 | ||||
| -rw-r--r-- | databases/libgnomedb/PLIST | 126 | ||||
| -rw-r--r-- | databases/libgnomedb/buildlink2.mk | 4 | ||||
| -rw-r--r-- | databases/libgnomedb/distinfo | 11 | ||||
| -rw-r--r-- | databases/libgnomedb/patches/patch-aa | 47 | ||||
| -rw-r--r-- | databases/libgnomedb/patches/patch-ab | 22 | ||||
| -rw-r--r-- | databases/libgnomedb/patches/patch-ac | 13 |
7 files changed, 137 insertions, 111 deletions
diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile index 75b641684ab..8b136b7a340 100644 --- a/databases/libgnomedb/Makefile +++ b/databases/libgnomedb/Makefile @@ -1,28 +1,45 @@ -# $NetBSD: Makefile,v 1.3 2002/12/24 06:09:48 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2003/02/14 20:18:03 jmmv Exp $ # -DISTNAME= libgnomedb-0.8.199 -PKGREVISION= 1 +DISTNAME= libgnomedb-0.10.0 CATEGORIES= databases gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomedb/0.8/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomedb/0.10/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= sab@posix.org.uk HOMEPAGE= http://www.gnome-db.org/ COMMENT= GNOME2 database library +DEPENDS= gnome2-dirs>=1.0:../../misc/gnome2-dirs + USE_X11= YES USE_GMAKE= YES USE_LIBTOOL= YES USE_BUILDLINK2= YES USE_PKGLOCALEDIR= YES +USE_PKGINSTALL= YES GNU_CONFIGURE= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE= ${WRKSRC}/libgnomedb.pc.in +CONFIGURE_ARGS+= --enable-gtk-doc=no +CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html + +EGDIR= ${PREFIX}/share/examples/libgnomedb +.if defined(PKG_SYSCONFDIR.gnome-vfs2) +CONF_FILES= ${EGDIR}/database-module.conf \ + ${PKG_SYSCONFBASE.gnome-vfs2}/gnome-vfs-2.0/modules/database-module.conf +.else +CONF_FILES= ${EGDIR}/database-module.conf \ + ${PKG_SYSCONFBASE}/gnome-vfs-2.0/modules/database-module.conf +.endif + +GCONF2_SCHEMAS= libgnomedb.schemas + .include "../../databases/libgda/buildlink2.mk" .include "../../sysutils/gnome-vfs2/buildlink2.mk" +.include "../../devel/GConf2/schemas.mk" .include "../../devel/bonobo-activation/buildlink2.mk" .include "../../devel/libbonoboui/buildlink2.mk" .include "../../devel/libgnomeui/buildlink2.mk" diff --git a/databases/libgnomedb/PLIST b/databases/libgnomedb/PLIST index 7d97a9177f8..7f5862e75c2 100644 --- a/databases/libgnomedb/PLIST +++ b/databases/libgnomedb/PLIST @@ -1,13 +1,5 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/10/30 05:09:08 rh Exp $ +@comment $NetBSD: PLIST,v 1.2 2003/02/14 20:18:03 jmmv Exp $ bin/gnome-database-properties -etc/gconf/gconf.xml.defaults/apps/gnome-db/%gconf.xml -etc/gconf/gconf.xml.defaults/apps/gnome-db/Shell/%gconf.xml -etc/gconf/gconf.xml.defaults/apps/gnome-db/UI/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/gnome-db/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/gnome-db/Shell/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/gnome-db/UI/%gconf.xml -etc/gconf/schemas/libgnomedb.schemas -etc/gnome-vfs-2.0/modules/database-module.conf include/libgnomedb/gnome-db-browser.h include/libgnomedb/gnome-db-combo.h include/libgnomedb/gnome-db-config.h @@ -18,24 +10,24 @@ 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-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-report-editor.h -include/libgnomedb/gnome-db-sql-editor.h include/libgnomedb/gnome-db-stock.h include/libgnomedb/gnome-db-table-editor.h include/libgnomedb/gnome-db-util.h include/libgnomedb/gnome-db-window.h include/libgnomedb/libgnomedb.h -libexec/gnome-database-components lib/bonobo/monikers/libmoniker_database.a lib/bonobo/monikers/libmoniker_database.la lib/bonobo/monikers/libmoniker_database.so @@ -53,52 +45,59 @@ lib/libgnomedb-2.so lib/libgnomedb-2.so.1 lib/libgnomedb-2.so.1.0 lib/pkgconfig/libgnomedb.pc +libexec/gnome-database-components share/control-center-2.0/capplets/database-properties.desktop -share/gtk-doc/html/libgnomedb/fdl-section1.html -share/gtk-doc/html/libgnomedb/fdl-section10.html -share/gtk-doc/html/libgnomedb/fdl-section2.html -share/gtk-doc/html/libgnomedb/fdl-section3.html -share/gtk-doc/html/libgnomedb/fdl-section4.html -share/gtk-doc/html/libgnomedb/fdl-section5.html -share/gtk-doc/html/libgnomedb/fdl-section6.html -share/gtk-doc/html/libgnomedb/fdl-section7.html -share/gtk-doc/html/libgnomedb/fdl-section8.html -share/gtk-doc/html/libgnomedb/fdl-section9.html -share/gtk-doc/html/libgnomedb/fdl-using.html -share/gtk-doc/html/libgnomedb/fdl.html -share/gtk-doc/html/libgnomedb/index.html -share/gtk-doc/html/libgnomedb/libgnomedb-basic.html -share/gtk-doc/html/libgnomedb/libgnomedb-bonobo.html -share/gtk-doc/html/libgnomedb/libgnomedb-gnome-db-config.html -share/gtk-doc/html/libgnomedb/libgnomedb-gnome-db-model.html -share/gtk-doc/html/libgnomedb/libgnomedb-gnome-db-stock.html -share/gtk-doc/html/libgnomedb/libgnomedb-gnome-db-util.html -share/gtk-doc/html/libgnomedb/libgnomedb-gnomedbbrowser.html -share/gtk-doc/html/libgnomedb/libgnomedb-gnomedbcombo.html -share/gtk-doc/html/libgnomedb/libgnomedb-gnomedbconnectionproperties.html -share/gtk-doc/html/libgnomedb/libgnomedb-gnomedbconnectionselector.html -share/gtk-doc/html/libgnomedb/libgnomedb-gnomedbcontrol.html -share/gtk-doc/html/libgnomedb/libgnomedb-gnomedbcontrolwidget.html -share/gtk-doc/html/libgnomedb/libgnomedb-gnomedbdatasourceselector.html -share/gtk-doc/html/libgnomedb/libgnomedb-gnomedbdsnconfig.html -share/gtk-doc/html/libgnomedb/libgnomedb-gnomedbdsnconfigdruid.html -share/gtk-doc/html/libgnomedb/libgnomedb-gnomedberror.html -share/gtk-doc/html/libgnomedb/libgnomedb-gnomedberrordialog.html -share/gtk-doc/html/libgnomedb/libgnomedb-gnomedbform.html -share/gtk-doc/html/libgnomedb/libgnomedb-gnomedbgraybar.html -share/gtk-doc/html/libgnomedb/libgnomedb-gnomedbgrid.html -share/gtk-doc/html/libgnomedb/libgnomedb-gnomedblist.html -share/gtk-doc/html/libgnomedb/libgnomedb-gnomedblogin.html -share/gtk-doc/html/libgnomedb/libgnomedb-gnomedblogindialog.html -share/gtk-doc/html/libgnomedb/libgnomedb-gnomedbproviderselector.html -share/gtk-doc/html/libgnomedb/libgnomedb-gnomedbreporteditor.html -share/gtk-doc/html/libgnomedb/libgnomedb-gnomedbsqleditor.html -share/gtk-doc/html/libgnomedb/libgnomedb-gnomedbtableeditor.html -share/gtk-doc/html/libgnomedb/libgnomedb-gnomedbwindow.html -share/gtk-doc/html/libgnomedb/libgnomedb-introduction.html -share/gtk-doc/html/libgnomedb/libgnomedb-libgnomedb.html -share/gtk-doc/html/libgnomedb/libgnomedb-widgets.html +share/doc/html/libgnomedb/fdl-section1.html +share/doc/html/libgnomedb/fdl-section10.html +share/doc/html/libgnomedb/fdl-section2.html +share/doc/html/libgnomedb/fdl-section3.html +share/doc/html/libgnomedb/fdl-section4.html +share/doc/html/libgnomedb/fdl-section5.html +share/doc/html/libgnomedb/fdl-section6.html +share/doc/html/libgnomedb/fdl-section7.html +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/index.html +share/doc/html/libgnomedb/index.sgml +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-gnomedbreporteditor.html +share/doc/html/libgnomedb/libgnomedb-gnomedbsqleditor.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/examples/libgnomedb/database-module.conf +share/gconf/schemas/libgnomedb.schemas ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/libgnomedb-2.mo +${PKGLOCALEDIR}/locale/be/LC_MESSAGES/libgnomedb-2.mo ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/libgnomedb-2.mo ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/libgnomedb-2.mo ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/libgnomedb-2.mo @@ -140,6 +139,7 @@ share/pixmaps/libgnomedb/gnome-db-database_24x24.png share/pixmaps/libgnomedb/gnome-db-designer_24x24.png share/pixmaps/libgnomedb/gnome-db-disconnect_24x24.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 @@ -155,14 +155,16 @@ share/pixmaps/libgnomedb/gnome-db-triggers_16x16.png share/pixmaps/libgnomedb/gnome-db-types_16x16.png share/pixmaps/libgnomedb/gnome-db-types_24x24.png 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 @dirrm share/omf/libgnomedb -@dirrm share/gtk-doc/html/libgnomedb +@comment in GConf2: @dirrm share/gconf/schemas +@dirrm share/examples/libgnomedb +@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 gnome-vfs2: @dirrm lib/gnome-vfs-2.0/modules +@comment in bonobo-activation: @dirrm lib/bonobo/servers +@comment in bonobo-activation: @dirrm lib/bonobo/monikers @dirrm include/libgnomedb -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-db/UI -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-db/Shell -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-db -@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-db/UI -@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-db/Shell -@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-db diff --git a/databases/libgnomedb/buildlink2.mk b/databases/libgnomedb/buildlink2.mk index 36c7f6fed2b..aa6e6852a1e 100644 --- a/databases/libgnomedb/buildlink2.mk +++ b/databases/libgnomedb/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.2 2002/12/24 06:09:48 wiz Exp $ +# $NetBSD: buildlink2.mk,v 1.3 2003/02/14 20:18:03 jmmv Exp $ # # This Makefile fragment is included by packages that use libgnomedb. # @@ -9,7 +9,7 @@ LIBGNOMEDB_BUILDLINK2_MK= # defined BUILDLINK_PACKAGES+= libgnomedb -BUILDLINK_DEPENDS.libgnomedb?= libgnomedb>=0.8.199nb1 +BUILDLINK_DEPENDS.libgnomedb?= libgnomedb>=0.10.0 BUILDLINK_PKGSRCDIR.libgnomedb?= ../../databases/libgnomedb EVAL_PREFIX+= BUILDLINK_PREFIX.libgnomedb=libgnomedb diff --git a/databases/libgnomedb/distinfo b/databases/libgnomedb/distinfo index e7c64a5eb17..300bbee7534 100644 --- a/databases/libgnomedb/distinfo +++ b/databases/libgnomedb/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/10/30 05:09:08 rh Exp $ +$NetBSD: distinfo,v 1.2 2003/02/14 20:18:04 jmmv Exp $ -SHA1 (libgnomedb-0.8.199.tar.bz2) = 93de2407d14b368f7bf7f127fbd63c74df030a22 -Size (libgnomedb-0.8.199.tar.bz2) = 437550 bytes -SHA1 (patch-aa) = 4cdd200837de8ad859fb3b2fcebd867278b6df63 -SHA1 (patch-ab) = 3b3c200a95bf9f37ad3edf2f4ca86b0ca690f0ec +SHA1 (libgnomedb-0.10.0.tar.bz2) = 93a13e22d8dec53463871bb9e4b1795bd1b7490d +Size (libgnomedb-0.10.0.tar.bz2) = 450273 bytes +SHA1 (patch-aa) = 019cb8036ebd1d97a8739a094aa970d903580c61 +SHA1 (patch-ab) = b1b1203f2dfadf4138b65d4eb4a1ea22a905ac75 +SHA1 (patch-ac) = 3cf595c0a49189f15eba1a6a3a846700ed8ec31d diff --git a/databases/libgnomedb/patches/patch-aa b/databases/libgnomedb/patches/patch-aa index 38b65cf63b2..3c258fdc2b5 100644 --- a/databases/libgnomedb/patches/patch-aa +++ b/databases/libgnomedb/patches/patch-aa @@ -1,28 +1,21 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/10/30 05:09:08 rh Exp $ +$NetBSD: patch-aa,v 1.2 2003/02/14 20:18:05 jmmv Exp $ ---- /dev/null Sat Jul 13 01:28:16 2002 -+++ monikers/GNOME_Database_Monikers.server -@@ -0,0 +1,23 @@ -+<oaf_info> -+ -+<oaf_server iid="OAFIID:GNOME_Database_MonikerFactory" -+ type="shlib" location="/usr/pkg/lib/bonobo/monikers/libmoniker_database.so"> -+ <oaf_attribute name="repo_ids" type="stringv"> -+ <item value="IDL:Bonobo/GenericFactory:1.0"/> -+ </oaf_attribute> -+ <oaf_attribute name="name" type="string" _value="Database Moniker factory"/> -+</oaf_server> -+ -+<oaf_server iid="OAFIID:GNOME_Database_Moniker" type="factory" -+ location="OAFIID:GNOME_Database_MonikerFactory"> -+ <oaf_attribute name="repo_ids" type="stringv"> -+ <item value="IDL:Bonobo/Moniker:1.0"/> -+ <item value="IDL:Bonobo/Unknown:1.0"/> -+ </oaf_attribute> -+ <oaf_attribute name="name" type="string" _value="database: moniker"/> -+ <oaf_attribute name="bonobo:moniker" type="stringv"> -+ <item value="database"/> -+ </oaf_attribute> -+</oaf_server> -+ -+</oaf_info> +--- data/Makefile.in.orig 2003-01-28 02:41:30.000000000 +0100 ++++ data/Makefile.in +@@ -136,7 +136,7 @@ VFSMODULE_LIBS = @VFSMODULE_LIBS@ + WARN_CFLAGS = @WARN_CFLAGS@ + cxxflags_set = @cxxflags_set@ + +-schemadir = $(sysconfdir)/gconf/schemas ++schemadir = $(datadir)/gconf/schemas + schema_DATA = libgnomedb.schemas + + # Pixmaps +@@ -320,7 +320,6 @@ maintainer-clean + @INTLTOOL_SCHEMAS_RULE@ + + install-data-local: +- -GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA) + @INTLTOOL_KEYS_RULE@ + + # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/databases/libgnomedb/patches/patch-ab b/databases/libgnomedb/patches/patch-ab index cb944837c6b..60fd7701ddf 100644 --- a/databases/libgnomedb/patches/patch-ab +++ b/databases/libgnomedb/patches/patch-ab @@ -1,13 +1,13 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/10/30 05:09:08 rh Exp $ +$NetBSD: patch-ab,v 1.2 2003/02/14 20:18:05 jmmv Exp $ ---- doc/C/Makefile.in.orig Sat Jul 13 01:35:02 2002 -+++ doc/C/Makefile.in -@@ -366,8 +366,6 @@ install-data-local: - echo '-- Installing '$$i ; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ - done; \ -- echo '-- Installing $(srcdir)/html/index.sgml' ; \ -- $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \ - fi) +--- vfs/Makefile.in.orig 2003-01-28 02:41:29.000000000 +0100 ++++ vfs/Makefile.in +@@ -139,7 +139,7 @@ INCLUDES = -I$(top_srcdir) -I$(top_bu - # + EXTRA_DIST = database-module.conf + +-modulesconfdir = $(sysconfdir)/gnome-vfs-2.0/modules ++modulesconfdir = $(datadir)/examples/libgnomedb + modulesconf_DATA = database-module.conf + + modulesdir = $(libdir)/gnome-vfs-2.0/modules diff --git a/databases/libgnomedb/patches/patch-ac b/databases/libgnomedb/patches/patch-ac new file mode 100644 index 00000000000..d9681398bef --- /dev/null +++ b/databases/libgnomedb/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.1 2003/02/14 20:18:05 jmmv Exp $ + +--- doc/C/Makefile.in.orig 2003-01-28 02:41:31.000000000 +0100 ++++ doc/C/Makefile.in +@@ -137,7 +137,7 @@ WARN_CFLAGS = @WARN_CFLAGS@ + cxxflags_set = @cxxflags_set@ + + DOC_MODULE = libgnomedb +-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 |