[pkgsrc/trunk]: pkgsrc/print/glabels update to 2.0.4

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2f3c3eb10b10
branches:  trunk
changeset: 521576:2f3c3eb10b10
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Tue Nov 14 16:54:29 2006 +0000

description:
update to 2.0.4
changes:
-Use filechooser for GnomeFileEntrys in merge properties dialog and
 object editor image page.
-New configure option to disable update-mime-database and
 update-desktop-database
-Minor cleanup.
-New templates and fixes

diffstat:

 print/glabels/Makefile         |   6 +++---
 print/glabels/PLIST            |  10 +++++++++-
 print/glabels/distinfo         |   9 ++++-----
 print/glabels/patches/patch-aa |  13 -------------
 4 files changed, 16 insertions(+), 22 deletions(-)

diffs (75 lines):

diff -r 6f8fd621ea14 -r 2f3c3eb10b10 print/glabels/Makefile
--- a/print/glabels/Makefile    Tue Nov 14 16:51:22 2006 +0000
+++ b/print/glabels/Makefile    Tue Nov 14 16:54:29 2006 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2006/09/16 12:20:39 jmmv Exp $
+# $NetBSD: Makefile,v 1.21 2006/11/14 16:54:29 drochner Exp $
 #
 
-DISTNAME=              glabels-2.0.2
-PKGREVISION=           7
+DISTNAME=              glabels-2.0.4
 CATEGORIES=            print
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=glabels/}
 
@@ -25,4 +24,5 @@
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 6f8fd621ea14 -r 2f3c3eb10b10 print/glabels/PLIST
--- a/print/glabels/PLIST       Tue Nov 14 16:51:22 2006 +0000
+++ b/print/glabels/PLIST       Tue Nov 14 16:54:29 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2006/04/17 07:07:32 jlam Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/11/14 16:54:29 drochner Exp $
 bin/glabels
 bin/glabels-batch
 include/libglabels/libglabels.h
@@ -28,6 +28,14 @@
 share/gnome/help/glabels/C/figures/glabels-template-label.png
 share/gnome/help/glabels/C/figures/glabels-template-layout.png
 share/gnome/help/glabels/C/figures/main-window-empty.png
+share/gnome/help/glabels/C/figures/merge-ex1-1.png
+share/gnome/help/glabels/C/figures/merge-ex1-2.png
+share/gnome/help/glabels/C/figures/merge-ex1-3.png
+share/gnome/help/glabels/C/figures/merge-ex1-4.png
+share/gnome/help/glabels/C/figures/merge-ex2-1.png
+share/gnome/help/glabels/C/figures/merge-ex2-2.png
+share/gnome/help/glabels/C/figures/merge-ex2-3.png
+share/gnome/help/glabels/C/figures/merge-ex2-4.png
 share/gnome/help/glabels/C/figures/object-editor-sidebar.png
 share/gnome/help/glabels/C/figures/print-copies.png
 share/gnome/help/glabels/C/figures/print-merge.png
diff -r 6f8fd621ea14 -r 2f3c3eb10b10 print/glabels/distinfo
--- a/print/glabels/distinfo    Tue Nov 14 16:51:22 2006 +0000
+++ b/print/glabels/distinfo    Tue Nov 14 16:54:29 2006 +0000
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.4 2005/04/29 12:39:25 agc Exp $
+$NetBSD: distinfo,v 1.5 2006/11/14 16:54:29 drochner Exp $
 
-SHA1 (glabels-2.0.2.tar.gz) = d579d2bf8187316ec3f846d4eea2b8ab448dca60
-RMD160 (glabels-2.0.2.tar.gz) = 0950e410e1f590869cfdd5b336b51b443b5d6742
-Size (glabels-2.0.2.tar.gz) = 1614927 bytes
-SHA1 (patch-aa) = e1363080ce671e56611da755b6dcc73ee88f93a1
+SHA1 (glabels-2.0.4.tar.gz) = 3794028a978e6976ea230b191a28746d3a9bb4a7
+RMD160 (glabels-2.0.4.tar.gz) = 9ed141bc23c085d0f5131192463421e07f13945a
+Size (glabels-2.0.4.tar.gz) = 1920095 bytes
diff -r 6f8fd621ea14 -r 2f3c3eb10b10 print/glabels/patches/patch-aa
--- a/print/glabels/patches/patch-aa    Tue Nov 14 16:51:22 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2005/04/29 12:39:25 agc Exp $
-
---- data/mime/Makefile.in      2005/04/29 12:25:17     1.1
-+++ data/mime/Makefile.in      2005/04/29 12:26:29
-@@ -469,7 +469,7 @@
- 
- install-data-hook:
- @HAVE_NEW_MIME_TRUE@  $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime"
--@HAVE_NEWER_MIME_TRUE@        $(UPDATE_DESKTOP_DATABASE) 
-+@HAVE_NEWER_MIME_TRUE@        -$(UPDATE_DESKTOP_DATABASE) 
- 
- uninstall-hook:
- @HAVE_NEW_MIME_TRUE@  $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime"