diff options
-rw-r--r-- | databases/libgnomedb/Makefile | 27 | ||||
-rw-r--r-- | databases/libgnomedb/PLIST | 15 | ||||
-rw-r--r-- | databases/libgnomedb/buildlink2.mk | 12 | ||||
-rw-r--r-- | databases/libgnomedb/distinfo | 8 | ||||
-rw-r--r-- | databases/libgnomedb/patches/patch-ab | 29 |
5 files changed, 45 insertions, 46 deletions
diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile index 1766cb69250..926e781ff65 100644 --- a/databases/libgnomedb/Makefile +++ b/databases/libgnomedb/Makefile @@ -1,51 +1,40 @@ -# $NetBSD: Makefile,v 1.11 2003/07/13 13:50:58 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2003/09/11 12:40:23 jmmv Exp $ # -DISTNAME= libgnomedb-0.12.2 -PKGREVISION= 1 +DISTNAME= libgnomedb-0.99.0 CATEGORIES= databases gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomedb/0.12/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomedb/0.99/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= sab@posix.org.uk HOMEPAGE= http://www.gnome-db.org/ COMMENT= GNOME2 database library -DEPENDS+= gnome2-dirs>=1.2:../../misc/gnome2-dirs - -BUILDLINK_DEPENDS.libgda= libgda>=0.11.2 +BUILD_USES_MSGFMT= yes +DEPENDS= gnome2-dirs>=1.2:../../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= --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/gettext-lib/buildlink2.mk" .include "../../devel/GConf2/schemas.mk" .include "../../devel/bonobo-activation/buildlink2.mk" .include "../../devel/libbonoboui/buildlink2.mk" .include "../../devel/libgnomeui/buildlink2.mk" .include "../../devel/libglade2/buildlink2.mk" .include "../../textproc/scrollkeeper/omf.mk" +.include "../../x11/gtk2/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/libgnomedb/PLIST b/databases/libgnomedb/PLIST index 9016dd07b9f..19268b75990 100644 --- a/databases/libgnomedb/PLIST +++ b/databases/libgnomedb/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2003/06/10 14:21:07 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.6 2003/09/11 12:40:23 jmmv Exp $ bin/gnome-database-properties include/libgnomedb/gnome-db-browser.h include/libgnomedb/gnome-db-combo.h @@ -23,20 +23,17 @@ 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/gnome-db-window.h include/libgnomedb/libgnomedb.h lib/bonobo/monikers/libmoniker_database.a lib/bonobo/monikers/libmoniker_database.la lib/bonobo/monikers/libmoniker_database.so lib/bonobo/servers/GNOME_Database_Components.server lib/bonobo/servers/GNOME_Database_Monikers.server -lib/gnome-vfs-2.0/modules/libdatabase.a -lib/gnome-vfs-2.0/modules/libdatabase.la -lib/gnome-vfs-2.0/modules/libdatabase.so lib/libglade/2.0/libgnomedb.a lib/libglade/2.0/libgnomedb.la lib/libglade/2.0/libgnomedb.so @@ -88,14 +85,15 @@ 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/examples/libgnomedb/database-module.conf share/gconf/schemas/libgnomedb.schemas +share/gnome-db/ui/db-shell.xml ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/libgnomedb-2.mo ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/libgnomedb-2.mo ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/libgnomedb-2.mo @@ -113,6 +111,7 @@ ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/libgnomedb-2.mo ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/libgnomedb-2.mo ${PKGLOCALEDIR}/locale/ja/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/nl/LC_MESSAGES/libgnomedb-2.mo ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/libgnomedb-2.mo @@ -168,12 +167,12 @@ share/pixmaps/libgnomedb/gnome-db.png @dirrm share/omf/libgnomedb @comment in scrollkeeper: @dirrm share/omf @comment in gnome-dirs: @dirrm share/mime-info +@dirrm share/gnome-db/ui +@dirrm share/gnome-db @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 diff --git a/databases/libgnomedb/buildlink2.mk b/databases/libgnomedb/buildlink2.mk index 316fd084727..1050c24212e 100644 --- a/databases/libgnomedb/buildlink2.mk +++ b/databases/libgnomedb/buildlink2.mk @@ -1,34 +1,34 @@ -# $NetBSD: buildlink2.mk,v 1.5 2003/07/13 13:50:58 wiz Exp $ +# $NetBSD: buildlink2.mk,v 1.6 2003/09/11 12:40:23 jmmv Exp $ # # This Makefile fragment is included by packages that use libgnomedb. # -# This file was created automatically using createbuildlink 2.2. +# This file was created automatically using createbuildlink 2.6. # .if !defined(LIBGNOMEDB_BUILDLINK2_MK) LIBGNOMEDB_BUILDLINK2_MK= # defined BUILDLINK_PACKAGES+= libgnomedb -BUILDLINK_DEPENDS.libgnomedb?= libgnomedb>=0.12.2nb1 +BUILDLINK_DEPENDS.libgnomedb?= libgnomedb>=0.99.0 BUILDLINK_PKGSRCDIR.libgnomedb?= ../../databases/libgnomedb EVAL_PREFIX+= BUILDLINK_PREFIX.libgnomedb=libgnomedb BUILDLINK_PREFIX.libgnomedb_DEFAULT= ${LOCALBASE} -BUILDLINK_FILES.libgnomedb+= include/libgnomedb/*.h +BUILDLINK_FILES.libgnomedb+= include/libgnomedb/* BUILDLINK_FILES.libgnomedb+= lib/bonobo/monikers/libmoniker_database.* BUILDLINK_FILES.libgnomedb+= lib/bonobo/servers/GNOME_Database_Components.server BUILDLINK_FILES.libgnomedb+= lib/bonobo/servers/GNOME_Database_Monikers.server -BUILDLINK_FILES.libgnomedb+= lib/gnome-vfs-2.0/modules/libdatabase.* BUILDLINK_FILES.libgnomedb+= lib/libglade/2.0/libgnomedb.* BUILDLINK_FILES.libgnomedb+= lib/libgnomedb-2.* BUILDLINK_FILES.libgnomedb+= lib/pkgconfig/libgnomedb.pc .include "../../databases/libgda/buildlink2.mk" -.include "../../sysutils/gnome-vfs2/buildlink2.mk" +.include "../../devel/gettext-lib/buildlink2.mk" .include "../../devel/bonobo-activation/buildlink2.mk" .include "../../devel/libbonoboui/buildlink2.mk" .include "../../devel/libgnomeui/buildlink2.mk" .include "../../devel/libglade2/buildlink2.mk" +.include "../../x11/gtk2/buildlink2.mk" BUILDLINK_TARGETS+= libgnomedb-buildlink diff --git a/databases/libgnomedb/distinfo b/databases/libgnomedb/distinfo index 7cdc6cdb7a9..b398ecda858 100644 --- a/databases/libgnomedb/distinfo +++ b/databases/libgnomedb/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.5 2003/06/13 14:17:52 jmmv Exp $ +$NetBSD: distinfo,v 1.6 2003/09/11 12:40:23 jmmv Exp $ -SHA1 (libgnomedb-0.12.2.tar.bz2) = 14450e45d6f0d41dea9af4bc77e23ea24a91721f -Size (libgnomedb-0.12.2.tar.bz2) = 482088 bytes -SHA1 (patch-ab) = b1b1203f2dfadf4138b65d4eb4a1ea22a905ac75 +SHA1 (libgnomedb-0.99.0.tar.bz2) = 42937134e804297ccbf6cfe1fc31b1730c542bf4 +Size (libgnomedb-0.99.0.tar.bz2) = 568356 bytes +SHA1 (patch-ab) = f00c14285e258fffbb08adf386c751cf94bb1cac diff --git a/databases/libgnomedb/patches/patch-ab b/databases/libgnomedb/patches/patch-ab index 60fd7701ddf..fe72743f5ba 100644 --- a/databases/libgnomedb/patches/patch-ab +++ b/databases/libgnomedb/patches/patch-ab @@ -1,13 +1,24 @@ -$NetBSD: patch-ab,v 1.2 2003/02/14 20:18:05 jmmv Exp $ +$NetBSD: patch-ab,v 1.3 2003/09/11 12:40:24 jmmv Exp $ ---- 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 +gtksourceview-0.6.0 (the one in pkgsrc) is not compatible with this version +of libgnomedb. + +--- configure.orig 2003-09-11 01:02:05.000000000 +0200 ++++ configure +@@ -21026,6 +21026,7 @@ fi + + + ++if false; then + succeeded=no + + if test -z "$PKG_CONFIG"; then +@@ -21120,6 +21121,8 @@ echo "${ECHO_T}$GTKSOURCEVIEW_LIBS" >&6 + else + have_gtksourceview=no + fi ++fi ++have_gtksourceview=no - 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 |