update to 2.2.0

changes:
-migrated from libgnomeprint/gnomecanvas to gtk/cairo
-UI improvements
-support more barcodes
-Added shadow attribute to label objects
-New merge backend for evolution data server
-Various bug fixes
-New templates

pkgsrc note: I've made evolution-data-server support an option as done
at other places. Default to "on" as elsewhere -- I'm not so sure about this
because glabels doesn't depend on other gnome-desktop features, but
I didn't want to introduce another inconsistency.

3 files changed, 55 insertions, 16 deletions

diff --git a/print/glabels/Makefile b/print/glabels/Makefile
index cdeadc2f553..26fc438086b 100644
--- a/print/glabels/Makefile
+++ b/print/glabels/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2007/09/21 13:04:14 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2008/01/11 17:31:46 drochner Exp $
 #
 
-DISTNAME=		glabels-2.0.4
-PKGREVISION=		4
+DISTNAME=		glabels-2.2.0
 CATEGORIES=		print
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=glabels/}
 
@@ -16,14 +15,19 @@ USE_DIRS+=		gnome2-1.5
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
 
+PKG_OPTIONS_VAR=        PKG_OPTIONS.glabels
+PKG_SUPPORTED_OPTIONS=  evolution
+PKG_SUGGESTED_OPTIONS=  evolution
+.include "../../mk/bsd.options.mk"
+.if !empty(PKG_OPTIONS:Mevolution)
+.include "../../mail/evolution-data-server/buildlink3.mk"
+.endif
+
 .include "../../databases/shared-mime-info/mimedb.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libglade/buildlink3.mk"
-.include "../../graphics/libgnomecanvas/buildlink3.mk"
-.include "../../print/libgnomeprint/buildlink3.mk"
-.include "../../print/libgnomeprintui/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../mk/omf-scrollkeeper.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/glabels/PLIST b/print/glabels/PLIST
index dad606396ed..83690e27867 100644
--- a/print/glabels/PLIST
+++ b/print/glabels/PLIST
@@ -1,29 +1,41 @@
-@comment $NetBSD: PLIST,v 1.7 2006/11/14 16:54:29 drochner Exp $
+@comment $NetBSD: PLIST,v 1.8 2008/01/11 17:31:46 drochner Exp $
 bin/glabels
 bin/glabels-batch
+include/libglabels/category.h
+include/libglabels/db.h
+include/libglabels/enums.h
 include/libglabels/libglabels.h
 include/libglabels/paper.h
+include/libglabels/str.h
 include/libglabels/template.h
+include/libglabels/xml-category.h
 include/libglabels/xml-paper.h
 include/libglabels/xml-template.h
 include/libglabels/xml.h
 lib/libglabels.la
+lib/pkgconfig/libglabels.pc
 man/man1/glabels.1
 share/application-registry/glabels.applications
 share/applications/glabels.desktop
-share/glabels/dtd/glabels-2.0.dtd
+share/glabels/dtd/glabels-2.2.dtd
+share/glabels/glade/merge-properties-dialog.glade
+share/glabels/glade/new-label-dialog.glade
 share/glabels/glade/object-editor.glade
 share/glabels/glade/prefs-dialog.glade
+share/glabels/glade/print-custom-widget.glade
+share/glabels/glade/property-bar.glade
 share/glabels/glade/template-designer.glade
+share/glabels/glade/wdgt-media-select.glade
+share/glabels/glade/wdgt-rotate-label.glade
 share/glabels/templates/avery-iso-templates.xml
 share/glabels/templates/avery-other-templates.xml
 share/glabels/templates/avery-us-templates.xml
+share/glabels/templates/categories.xml
 share/glabels/templates/misc-iso-templates.xml
 share/glabels/templates/misc-other-templates.xml
 share/glabels/templates/misc-us-templates.xml
 share/glabels/templates/paper-sizes.xml
 share/glabels/templates/zweckform-iso-templates.xml
-share/glabels/ui/glabels-ui.xml
 share/gnome/help/glabels/C/figures/glabels-template-cd.png
 share/gnome/help/glabels/C/figures/glabels-template-label.png
 share/gnome/help/glabels/C/figures/glabels-template-layout.png
@@ -41,8 +53,31 @@ share/gnome/help/glabels/C/figures/print-copies.png
 share/gnome/help/glabels/C/figures/print-merge.png
 share/gnome/help/glabels/C/glabels.xml
 share/gnome/help/glabels/C/legal.xml
+share/gtk-doc/html/libglabels/ch01.html
+share/gtk-doc/html/libglabels/ch02.html
+share/gtk-doc/html/libglabels/ch03.html
+share/gtk-doc/html/libglabels/home.png
+share/gtk-doc/html/libglabels/index.html
+share/gtk-doc/html/libglabels/index.sgml
+share/gtk-doc/html/libglabels/left.png
+share/gtk-doc/html/libglabels/libglabels-category.html
+share/gtk-doc/html/libglabels/libglabels-db.html
+share/gtk-doc/html/libglabels/libglabels-enums.html
+share/gtk-doc/html/libglabels/libglabels-paper.html
+share/gtk-doc/html/libglabels/libglabels-str.html
+share/gtk-doc/html/libglabels/libglabels-template.html
+share/gtk-doc/html/libglabels/libglabels-xml-category.html
+share/gtk-doc/html/libglabels/libglabels-xml-paper.html
+share/gtk-doc/html/libglabels/libglabels-xml-template.html
+share/gtk-doc/html/libglabels/libglabels-xml.html
+share/gtk-doc/html/libglabels/libglabels.devhelp
+share/gtk-doc/html/libglabels/libglabels.devhelp2
+share/gtk-doc/html/libglabels/right.png
+share/gtk-doc/html/libglabels/style.css
+share/gtk-doc/html/libglabels/up.png
 share/locale/cs/LC_MESSAGES/glabels.mo
 share/locale/de/LC_MESSAGES/glabels.mo
+share/locale/eo/LC_MESSAGES/glabels.mo
 share/locale/es/LC_MESSAGES/glabels.mo
 share/locale/fr/LC_MESSAGES/glabels.mo
 share/locale/it/LC_MESSAGES/glabels.mo
@@ -67,14 +102,14 @@ share/pixmaps/glabels/glabels-splash.png
 @dirrm share/pixmaps/glabels
 @comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/omf/glabels
-@comment in scrollkeeper: @dirrm share/omf
+@comment in rarian: @dirrm share/omf
 @comment in shared-mime-info: @dirrm share/mime/packages
 @comment in xdg-dirs: @dirrm share/mime-info
+@dirrm share/gtk-doc/html/libglabels
 @dirrm share/gnome/help/glabels/C/figures
 @dirrm share/gnome/help/glabels/C
 @dirrm share/gnome/help/glabels
 @comment in gnome2-dirs: @dirrm share/gnome/help
-@dirrm share/glabels/ui
 @dirrm share/glabels/templates
 @dirrm share/glabels/glade
 @dirrm share/glabels/dtd
diff --git a/print/glabels/distinfo b/print/glabels/distinfo
index f916ce219d4..05b3c9fb269 100644
--- a/print/glabels/distinfo
+++ b/print/glabels/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2006/11/14 16:54:29 drochner Exp $
+$NetBSD: distinfo,v 1.6 2008/01/11 17:31:46 drochner Exp $
 
-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
+SHA1 (glabels-2.2.0.tar.gz) = 19bffa3059e2297702ac4c05e8bfd48ec1fddcef
+RMD160 (glabels-2.2.0.tar.gz) = 8edf20742846d59010afa8139fe9cee57dbd2fcd
+Size (glabels-2.2.0.tar.gz) = 1987772 bytes