Update to 2.2.0nb1:

- Capitalize comment and s/gnome/GNOME/.
- Sort USE_* section alphabetically.
- Register gnotime.schemas into GConf2's database.
- Register documentation into scrollkeeper's database.
- Add explicit run dependencies on everything used by this package directly.
- Also add some missing build dependencies: intltool and pkgconfig.
- Drop dependency on guile-gtk: it's used nowhere.
- Add missing files to PLIST.

4 files changed, 85 insertions, 25 deletions

diff --git a/time/gnotime/Makefile b/time/gnotime/Makefile
index 93b39881f7d..3d75ba28526 100644
--- a/time/gnotime/Makefile
+++ b/time/gnotime/Makefile
@@ -1,25 +1,37 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/23 06:51:00 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/23 13:54:46 jmmv Exp $
 
 DISTNAME=	gnotime-2.2.0
-PKGREVISION=	# empty
+PKGREVISION=	1
 CATEGORIES=	time gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gttr/}
 
 MAINTAINER=	jdolecek@NetBSD.org
 HOMEPAGE=	http://gttr.sourceforge.net/
-COMMENT=	time tracker for gnome2
+COMMENT=	Time tracker for GNOME2
 
-USE_X11=		yes
-USE_GNU_TOOLS+=		make
-USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-USE_LIBTOOL=		yes
 USE_BUILDLINK3=		yes
 USE_DIRS+=		gnome2-1.5
+USE_GNU_TOOLS+=		make
+USE_LIBTOOL=		yes
+USE_PKGLOCALEDIR=	yes
+USE_X11=		yes
+
+GCONF2_SCHEMAS=		gnotime.schemas
 
+.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../www/gtkhtml3/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/popt/buildlink3.mk"
 .include "../../lang/guile/buildlink3.mk"
-.include "../../devel/guile-gtk/buildlink3.mk"
+.include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.include "../../textproc/intltool/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../www/gtkhtml3/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/gnotime/PLIST b/time/gnotime/PLIST
index c787e2e105b..8a5f62a04ca 100644
--- a/time/gnotime/PLIST
+++ b/time/gnotime/PLIST
@@ -1,14 +1,48 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/10/23 06:51:00 jdolecek Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/10/23 13:54:46 jmmv Exp $
 bin/gnotime
+include/gnotime/gnc-date.h
+include/gnotime/gnc-engine-util.h
+include/gnotime/gnc-event.h
+include/gnotime/gnc-numeric.h
+include/gnotime/gnc-trace.h
+include/gnotime/guid.h
+include/gnotime/kvp-util.h
+include/gnotime/kvp_frame.h
+include/gnotime/qof.h
+include/gnotime/qofbackend.h
+include/gnotime/qofbook.h
+include/gnotime/qofclass.h
+include/gnotime/qofgobj.h
+include/gnotime/qofid.h
+include/gnotime/qofinstance.h
+include/gnotime/qofobject.h
+include/gnotime/qofquery.h
+include/gnotime/qofquerycore.h
+include/gnotime/qofsession.h
+include/gnotime/qofsql.h
+include/gnotime/sql_parser.h
+lib/libqof.la
+lib/libqofsql.la
+man/man1/gnotime.1
 share/applications/gnotime.desktop
+share/gconf/schemas/gnotime.schemas
+share/gnome/help/gnotime/C/figures/gtt_mainwin.png
+share/gnome/help/gnotime/C/figures/gtt_prefswin.png
+share/gnome/help/gnotime/C/gnotime.xml
+share/gnome/help/gnotime/es/figures/gtt_mainwin.png
+share/gnome/help/gnotime/es/figures/gtt_prefswin.png
+share/gnome/help/gnotime/es/gnotime.xml
+share/gnome/help/gnotime/eu/figures/gtt_mainwin.png
+share/gnome/help/gnotime/eu/figures/gtt_prefswin.png
+share/gnome/help/gnotime/eu/gnotime.xml
 share/gnotime/ghtml/C/basic-daily.ghtml
 share/gnotime/ghtml/C/basic-invoice.ghtml
 share/gnotime/ghtml/C/basic-journal.ghtml
 share/gnotime/ghtml/C/basic-todo.ghtml
 share/gnotime/ghtml/C/daily.ghtml
 share/gnotime/ghtml/C/gnotime-logo.png
-share/gnotime/ghtml/C/gtt.scm
 share/gnotime/ghtml/C/gtt-style.css
+share/gnotime/ghtml/C/gtt.scm
 share/gnotime/ghtml/C/invoice.ghtml
 share/gnotime/ghtml/C/journal.ghtml
 share/gnotime/ghtml/C/noproject.ghtml
@@ -32,15 +66,6 @@ share/gnotime/glade/prefs.glade
 share/gnotime/glade/project_properties.glade
 share/gnotime/glade/task_popup.glade
 share/gnotime/glade/task_properties.glade
-share/gnome/help/gnotime/C/figures/gtt_mainwin.png
-share/gnome/help/gnotime/C/figures/gtt_prefswin.png
-share/gnome/help/gnotime/C/gnotime.xml
-share/gnome/help/gnotime/es/figures/gtt_mainwin.png
-share/gnome/help/gnotime/es/figures/gtt_prefswin.png
-share/gnome/help/gnotime/es/gnotime.xml
-share/gnome/help/gnotime/eu/figures/gtt_mainwin.png
-share/gnome/help/gnotime/eu/figures/gtt_prefswin.png
-share/gnome/help/gnotime/eu/gnotime.xml
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gnotime-2.0.mo
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/gnotime-2.0.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gnotime-2.0.mo
@@ -81,6 +106,15 @@ ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gnotime-2.0.mo
 ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/gnotime-2.0.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gnotime-2.0.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gnotime-2.0.mo
+share/omf/gnotime/gnotime-C.omf
+share/omf/gnotime/gnotime-es.omf
+share/omf/gnotime/gnotime-eu.omf
+@dirrm share/omf/gnotime
+@comment in scrollkeeper: @dirrm share/omf
+@dirrm share/gnotime/glade
+@dirrm share/gnotime/ghtml/C
+@dirrm share/gnotime/ghtml
+@dirrm share/gnotime
 @dirrm share/gnome/help/gnotime/eu/figures
 @dirrm share/gnome/help/gnotime/eu
 @dirrm share/gnome/help/gnotime/es/figures
@@ -88,7 +122,7 @@ ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gnotime-2.0.mo
 @dirrm share/gnome/help/gnotime/C/figures
 @dirrm share/gnome/help/gnotime/C
 @dirrm share/gnome/help/gnotime
-@dirrm share/gnotime/glade
-@dirrm share/gnotime/ghtml/C
-@dirrm share/gnotime/ghtml
-@dirrm share/gnotime
+@comment in gnome2-dirs: @dirrm share/gnome/help
+@comment in GConf2: @dirrm share/gconf/schemas
+@comment in xdg-dirs: @dirrm share/applications
+@dirrm include/gnotime
diff --git a/time/gnotime/distinfo b/time/gnotime/distinfo
index 81fb59b4434..6b1a0b1486f 100644
--- a/time/gnotime/distinfo
+++ b/time/gnotime/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/10/23 06:51:00 jdolecek Exp $
+$NetBSD: distinfo,v 1.2 2004/10/23 13:54:46 jmmv Exp $
 
 SHA1 (gnotime-2.2.0.tar.gz) = 895a516a52b0cc7745183c0c8c909896dbda60ab
 Size (gnotime-2.2.0.tar.gz) = 1197945 bytes
 SHA1 (patch-aa) = e54c704d3089587e4dd6a6f474088b22c809ffe4
+SHA1 (patch-ab) = 8ce9db0b1059ac45aab9681116ac86c331818847
diff --git a/time/gnotime/patches/patch-ab b/time/gnotime/patches/patch-ab
new file mode 100644
index 00000000000..50e55aea195
--- /dev/null
+++ b/time/gnotime/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2004/10/23 13:54:46 jmmv Exp $
+
+--- gconf/Makefile.in.orig	2004-04-25 06:51:13.000000000 +0200
++++ gconf/Makefile.in
+@@ -205,7 +205,7 @@ EXTRA_DIST = \
+ 	gnotime.schemas.in
+ 
+ 
+-schemasdir = $(sysconfdir)/gconf/schemas
++schemasdir = $(GCONF_SCHEMA_FILE_DIR)
+ schemas_in_files = gnotime.schemas.in
+ schemas_DATA = gnotime.schemas
+ subdir = gconf