(pkgsrc)

 - removing two patches
 - Using CONF_FILES
 - Added LICENSE = gnu-gpl-v2

(upstream)
 - Updated time/gnotime to 2.4.0
------------------------------
2012-11-29  Linas Vepstas <linasvepstas@gmail.com>

	* configure.in: Bump version number to 2.3.1
	* configure.in: Enable non-verbose build by default.
	* fix assorted compiler warnings.
	* timer.c: fix crash because timer was not initialized!
	* Updated Czech translation from Petr Gajdusek <gajdusek.petr@centrum.cz>
	* Updated Danish translation from Joe Hansen <joedalton2@yahoo.dk>
	* ghtml.c: Port to guile-2.0

2011-11-30  Goedson Teixeira Paixao  <goedson@debian.org>

	* src/Makefile.am: Use detected X11 configurations

	* configure.in: Check for presence of X11

2011-10-24  Goedson Teixeira Paixao  <goedson@debian.org>

	* Fixed bug #3372762

	* src/props-invl.c (edit_interval_set_close_callback): Added
	function to set the close dialog callback

	* src/journal.c (edit_interval_close_cb): Added callback to handle
	the destruction of interval editing dialog
	(interval_new_clicked_cb,interval_edit_clicked_cb): set the close
	callback in the edit interval dialog

2011-10-04  Goedson Teixeira Paixao  <goedson@debian.org>

	* src/dialog.c (gtt_help_popup): Added format string to
	call to gtk_message_dialog_new

	* src/export.c (export_show_error_message): Added format string to
	call to gtk_message_dialog_format_secondary_text

	* src/main.c (try_restoring_backup): Added format string to
	call to gtk_message_dialog_new

	* src/menucmd.c (menu_howto_edit_times): Added format string to
	call to gtk_message_dialog_new

2011-06-28  Goedson Teixeira Paixao  <goedson@debian.org>

	* configure.in: Updated GTK_REQUIRED to 2.12, which is the minimum
	version containing the gtk_tree_view_set_show_expanders method.

2011-06-25  Goedson Teixeira Paixao  <goedson@debian.org>

	* src/notes-area.c (notes_area_new): added custom cell renderer in
	order to ellipsize long entries (Fixes #3310918). Thanks Petr
	Gajdusek for the patch.

2011-03-20  Goedson Teixeira Paixao  <goedson@debian.org>

	* src/Makefile.am (gnotime_LDADD): Added -lX11, fixing build with
	binutils-gold.

2010-11-27  Goedson Teixeira Paixao  <goedson@debian.org>

	* src/main.c (backups_exist): Added function to check if there are
	backup files in the data directory.
	(try_restoring_backup): check if there are backups in the data dir
	before offering to load a backup file.

2010-11-25  Goedson Teixeira Paixao  <goedson@debian.org>

	* src/main.c (try_restoring_backup): Display error message when
	it's not possible to copy backup file.

2010-10-12  Goedson Teixeira Paixao  <goedson@debian.org>

	* src/main.c (try_restoring_backup): do the interaction with the
	user for backup restoring outside of the read_data function.

2010-09-25  Goedson Teixeira Paixao  <goedson@debian.org>

	* glade/journal.glade: Fixed button tooltips

2010-05-05  Goedson Teixeira Paixao  <goedson@debian.org>

	* src/main.c (choose_backup_file): Added function to choose one of
	the backups to load.
	(read_data): Offer the user a chance to load a previous backup
	when reading the data file fails.

2010-01-23  Goedson Teixeira Paixao  <goedson@debian.org>

	* website/example-invoice.html: Applied patch #2937959, fixing a
	typo in the report. Thanks Christos Kontas for the patch.

2010-01-04  Goedson Teixeira Paixao  <goedson@debian.org>

	* src/ghtml.c: Added missing include of math.h for functions
	lround and round.

2009-11-24  Goedson Teixeira Paixao  <goedson@debian.org>

	* src/proj.c (gtt_project_get_secs_current): return the time for
	the currently selected diary entry instead of the head of the task
	list.

2009-11-20  Goedson Teixeira Paixao  <goedson@debian.org>

	* src/status-icon.c (status_icon_popup_menu): Change the hide
	window menu text.

	* src/log.c (printf_project): Added option to log the current
	diary entry (Patch #1984744). Thanks Matt Simmons for the patch.

2009-11-19  Goedson Teixeira Paixao  <goedson@debian.org>

	* configure.in: Fix LIBGNOMEUI related variable substitution. Make
	it buildable with recent versions of libgnomeui.

2009-11-15  Goedson Teixeira Paixao  <goedson@debian.org>

	* src/status-icon.c, src/menucmd.c: Add ability to hide main
	window by right clicking the status icon. Thanks Kip Warner for
	the patch.

2009-09-17  Goedson Teixeira Paixao  <goedson@debian.org>

	* src/projects-tree.c (gtt_projects_tree_set_visible_columns):
	Check that the column_references tree is not NULL before calling
	g_tree_destroy.

2009-09-14  Goedson Teixeira Paixao  <goedson@debian.org>

	* src/projects-tree.c (gtt_projects_tree_set_expander_state):
	return without any further processing if states is NULL.

	* src/file-io.c (gtt_post_ctree_config): don't call
	gtt_projects_tree_set_expander_state when the expander state is
	NULL.

2009-06-29  Goedson Teixeira Paixao  <goedson@debian.org>

	* ghtml/C/gtt.scm: Set unlimited guile stack (Fixes #1402562)

	* src/ghtml.c (gtt_ghtml_new): properly initialize guile
	environment.

2009-06-14  Goedson Teixeira Paixao  <goedson@debian.org>

	* glade/Makefile.am: Removed task_select.glade from the data files
	list.

	* src/notes-area.c (struct NotesArea_s): Made the task entry a
	combobox and added an "edit task" button.
	(new_task_cb): show the task properties dialog when adding new
	task, so user can edit the task memo.
	(tasks_model_get_task): utility function to retrieve the task
	corresponding to a given position in the combobox.
	(edit_task_cb): added function to handle the Edit Task button
	(task_selected_cb): added function to handle the selection of a
	task through the task combobox
	(notes_area_new): build the dialog structure with the new fields
	and callbacks
	(notes_area_choose_task): added function to mark a given task as
	active in the combobox.
	(build_task_combo_model): added function to build the combobox
	model with the list of tasks of a project.
	(notes_area_do_set_project): populate the combobox with the list
	of task of the selected project.

	* glade/notes.glade: Made the task entry a combobox.

2009-05-31  Goedson Teixeira Paixao  <goedson@debian.org>

	* src/ghtml.c (task_get_blocktime_str_scm): substitute the usage
	of the deprecated qof_print_hors_elapsed_buff by our copy of it.

2009-05-09  Goedson Teixeira Paixao  <goedson@debian.org>

	* configure.in: Look for qof.pc (libqof2) instead of
	qof-1.pc.

2009-01-02  Goedson Teixeira Paixao  <goedson@debian.org>

	* glade/interval_edit.glade: add the DISPLAY_SECONDS flag to the
	start_date field.

2008-11-28  Goedson Teixeira Paixao  <goedson@debian.org>

	* src/idle-dialog.c (show_idle_dialog): mark the idle dialog as
       visible before stopping the project timer so we don't start the no
       project timeout timer when it's not needed.


2008-11-27  Goedson Teixeira Paixao  <goedson@debian.org>

	* src/timer.c (start_no_project_timer): Fixed the condition in which
	the "No project" timer is started.

2008-11-25  Goedson Teixeira Paixao  <goedson@debian.org>

	* glade/prefs.glade: Fixed tooltip for the "No Project Timeout" option.

2008-03-21  Goedson Teixeira Paixao  <goedson@debian.org>

	* configure.in, po/LINGUAS: use po/LINGUAS to list the available
	translations.

2008-03-10  Goedson Teixeira Paixao  <goedson@debian.org>

	* src/projects-tree.c (gtt_projects_tree_init): Fixed display of
	the description column (Fixes #1911087)

2008-02-27  Goedson Teixeira Paixao  <goedson@debian.org>

	* src/menucmd.c (about_box): Use GtkAboutDialog instead of the
	deprecated GnomeAbout.

	* doc/C/man/gnotime.1: Fixed the manpage's text

	* src/notes-area.c: include menus.h for prototype of the
	menus_get_popup function.

5 files changed, 21 insertions, 83 deletions

diff --git a/time/gnotime/Makefile b/time/gnotime/Makefile
index d5989475414..627b9c15cd1 100644
--- a/time/gnotime/Makefile
+++ b/time/gnotime/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.71 2016/03/05 11:29:33 jperkin Exp $
+# $NetBSD: Makefile,v 1.72 2016/07/30 02:56:34 mef Exp $
 
-DISTNAME=	gnotime-2.3.0
-PKGREVISION=	37
+DISTNAME=	gnotime-2.4.0
 CATEGORIES=	time gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gttr/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://gttr.sourceforge.net/
 COMMENT=	Time tracker for GNOME2
+LICENSE=	gnu-gpl-v2
 
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
@@ -17,6 +17,15 @@ USE_PKGLOCALEDIR=	yes
 GCONF_SCHEMAS=		gnotime.schemas
 MAKE_ENV+=		GCONF_SCHEMAS_DIR=${GCONF_SCHEMAS_DIR:Q}
 
+EGDIR=			share/gconf
+CONF_FILES+=		${EGDIR}/schemas/${GCONF_SCHEMAS}  etc/gconf/schemas/${GCONF_SCHEMAS}
+
+post-install:
+	cd ${DESTDIR}${PREFIX}; \
+	${MKDIR}                                etc/gconf/schemas ;\
+	${MKDIR}                                 ${EGDIR}/schemas ;\
+	${MV} etc/gconf/schemas/${GCONF_SCHEMAS} ${EGDIR}/schemas
+
 .include "../../devel/GConf/schemas.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
@@ -25,7 +34,7 @@ MAKE_ENV+=		GCONF_SCHEMAS_DIR=${GCONF_SCHEMAS_DIR:Q}
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../devel/qof/buildlink3.mk"
-.include "../../lang/guile/buildlink3.mk"
+.include "../../lang/guile20/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
@@ -34,4 +43,5 @@ MAKE_ENV+=		GCONF_SCHEMAS_DIR=${GCONF_SCHEMAS_DIR:Q}
 .include "../../x11/libXScrnSaver/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/gnotime/PLIST b/time/gnotime/PLIST
index e9f13a4d036..5f602f7998e 100644
--- a/time/gnotime/PLIST
+++ b/time/gnotime/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 18:17:58 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2016/07/30 02:56:34 mef Exp $
 bin/gnotime
 bin/gnotime-remote
 man/man1/gnotime-remote.1
@@ -104,3 +104,4 @@ share/locale/wa/LC_MESSAGES/gnotime-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnotime-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnotime-2.0.mo
 share/omf/gnotime/gnotime-C.omf
+@pkgdir etc/gconf/schemas
diff --git a/time/gnotime/distinfo b/time/gnotime/distinfo
index 78e6cec6534..c04b626a296 100644
--- a/time/gnotime/distinfo
+++ b/time/gnotime/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.11 2015/11/02 23:31:36 agc Exp $
+$NetBSD: distinfo,v 1.12 2016/07/30 02:56:34 mef Exp $
 
-SHA1 (gnotime-2.3.0.tar.gz) = 1cd38b5a3d3548d19543f0aea421152367523a90
-RMD160 (gnotime-2.3.0.tar.gz) = 361e45d82997cbac691751b830a2279e6ed74134
-SHA512 (gnotime-2.3.0.tar.gz) = 650442494c4c32b934c5f46d368b67f0a65592f4c0f3a953fb1925f3289dec4a692eb3eadc13d7b0e08fcb76247af759b24a822fb02b09c8e61cf83e3641fbda
-Size (gnotime-2.3.0.tar.gz) = 1987788 bytes
-SHA1 (patch-aa) = 48add73db83f4bee002c12833fd756b0eaef7eec
-SHA1 (patch-ab) = c78194b5eb8caef9d118246c0da1c923a32a2e8c
+SHA1 (gnotime-2.4.0.tar.gz) = 2f7bd2ec0287bc0631f5d6e9aabf0a4e2279277a
+RMD160 (gnotime-2.4.0.tar.gz) = a0963cad9547c9b25f2ee6280c211a7fcb87e4d2
+SHA512 (gnotime-2.4.0.tar.gz) = d2b6e7e401dfaa7331e11074d09af7f21ac66d759050d780f5ea3165664a9a9a8e9c6181e4f5e54e9dc6789d947d730f6113a1b32c5aca776eeada454040c3f9
+Size (gnotime-2.4.0.tar.gz) = 1767510 bytes
diff --git a/time/gnotime/patches/patch-aa b/time/gnotime/patches/patch-aa
deleted file mode 100644
index e48bb256457..00000000000
--- a/time/gnotime/patches/patch-aa
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2009/12/21 19:55:01 joerg Exp $
-
-Makefiles use LIBGNOMEUI_CFLAGS etc, so make sure that the values are
-added to the right variable.
-
---- configure.orig	2009-12-21 19:47:53.000000000 +0000
-+++ configure
-@@ -24931,8 +24931,8 @@ pkg_failed=no
- echo $ECHO_N "checking for GNOMEUI... $ECHO_C" >&6; }
- 
- if test -n "$PKG_CONFIG"; then
--    if test -n "$GNOMEUI_CFLAGS"; then
--        pkg_cv_GNOMEUI_CFLAGS="$GNOMEUI_CFLAGS"
-+    if test -n "$LIBGNOMEUI_CFLAGS"; then
-+        pkg_cv_LIBGNOMEUI_CFLAGS="$LIBGNOMEUI_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
-     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED\"") >&5
-@@ -24940,7 +24940,7 @@ if test -n "$PKG_CONFIG"; then
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_GNOMEUI_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED" 2>/dev/null`
-+  pkg_cv_LIBGNOMEUI_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -24949,8 +24949,8 @@ else
- 	pkg_failed=untried
- fi
- if test -n "$PKG_CONFIG"; then
--    if test -n "$GNOMEUI_LIBS"; then
--        pkg_cv_GNOMEUI_LIBS="$GNOMEUI_LIBS"
-+    if test -n "$LIBGNOMEUI_LIBS"; then
-+        pkg_cv_LIBGNOMEUI_LIBS="$LIBGNOMEUI_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
-     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED\"") >&5
-@@ -24958,7 +24958,7 @@ if test -n "$PKG_CONFIG"; then
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_GNOMEUI_LIBS=`$PKG_CONFIG --libs "libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED" 2>/dev/null`
-+  pkg_cv_LIBGNOMEUI_LIBS=`$PKG_CONFIG --libs "libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -25030,8 +25030,8 @@ To get pkg-config, see <http://pkg-confi
- See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }
- else
--	GNOMEUI_CFLAGS=$pkg_cv_GNOMEUI_CFLAGS
--	GNOMEUI_LIBS=$pkg_cv_GNOMEUI_LIBS
-+	LIBGNOMEUI_CFLAGS=$pkg_cv_LIBGNOMEUI_CFLAGS
-+	LIBGNOMEUI_LIBS=$pkg_cv_LIBGNOMEUI_LIBS
-         { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
- 	:
diff --git a/time/gnotime/patches/patch-ab b/time/gnotime/patches/patch-ab
deleted file mode 100644
index 5d57146eec7..00000000000
--- a/time/gnotime/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2008/10/28 23:38:33 wiz Exp $
-
---- gconf/Makefile.in.orig	2008-02-15 20:11:59.000000000 +0000
-+++ gconf/Makefile.in
-@@ -259,7 +259,7 @@ top_srcdir = @top_srcdir@
- EXTRA_DIST = \
- 	gnotime.schemas.in
- 
--schemasdir = $(sysconfdir)/gconf/schemas
-+schemasdir = $(GCONF_SCHEMAS_DIR)
- schemas_in_files = gnotime.schemas.in
- schemas_DATA = gnotime.schemas
- all: all-am