Presenting GNOME 2.30.1 for FreeBSD. The offical release notes for this

release can be found at http://library.gnome.org/misc/release-notes/2.30/ .

This release brings initial PackageKit support, Upower (replaces power
management part of hal), cuse4bsd integration with HAL and cheese, and a
faster Evolution.

Sadly GNOME 2.30.x will be the last release with FreeBSD 6.X support. This
will also be the last of the 2.x releases. The next release will be the
highly-anticipated GNOME 3.0 which will bring with it a new UI experience.

Currently, there are a few bugs with GNOME 2.30 that may be of note for our
users. Be sure to consult the UPGRADING note or the 2.30 upgrade FAQ at
http://www.freebsd.org/gnome/docs/faq230.html for specific upgrading
instructions, and the up-to-date list of known issues.

This release features commits by avl, ahze, bland, marcus, mezz, and myself.

The FreeBSD GNOME Team would like to thank Anders F Bjorklund for doing the
initual packagekit porting.

And the following contributors & testers for there help with this release:
Eric L. Chen
Vladimir Grebenschikov
Sergio de Almeida Lenzi
DomiX
walder
crsd
Kevin Oberman
Michal Varga
Pavel Plesov
Bapt
kevin

and ITetcu for two exp-run

PR:	ports/143852
	ports/145347
	ports/144980
	ports/145830
	ports/145511

3 files changed, 124 insertions, 35 deletions

diff --git a/deskutils/glabels/Makefile b/deskutils/glabels/Makefile
index 47253825a844..077ee90b2c0a 100644
--- a/deskutils/glabels/Makefile
+++ b/deskutils/glabels/Makefile
@@ -3,14 +3,13 @@
 # Whom:			Martin Klaffenboeck <martin.klaffenboeck@gmx.at>
 #
 # $FreeBSD$
-#   $MCom: ports/deskutils/glabels/Makefile,v 1.7 2007/05/19 21:36:02 marcus Exp $
+#   $MCom: ports/deskutils/glabels/Makefile,v 1.10 2010/04/03 19:25:49 kwm Exp $
 #
 
 PORTNAME=	glabels
-PORTVERSION=	2.2.5
-PORTREVISION=	3
+PORTVERSION=	2.2.7
 CATEGORIES=	deskutils
-MASTER_SITES=	SF
+MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A program to create labels and business cards
diff --git a/deskutils/glabels/distinfo b/deskutils/glabels/distinfo
index c009458e8771..c2077c207dde 100644
--- a/deskutils/glabels/distinfo
+++ b/deskutils/glabels/distinfo
@@ -1,3 +1,3 @@
-MD5 (glabels-2.2.5.tar.gz) = a98932cce677f72af8cba2add00adfe3
-SHA256 (glabels-2.2.5.tar.gz) = 9b9a1ce1262de99a12cc2a07bf89840fd3b950778e3269ae0d30e14ce58d91bc
-SIZE (glabels-2.2.5.tar.gz) = 2043669
+MD5 (glabels-2.2.7.tar.gz) = 0830d3734b74e79946af59747ac097a5
+SHA256 (glabels-2.2.7.tar.gz) = 7ea7ea9f265aca8689a6bf1951650b25c0ac20148dfc535dc7ac37c01eb81b53
+SIZE (glabels-2.2.7.tar.gz) = 3808294
diff --git a/deskutils/glabels/pkg-plist b/deskutils/glabels/pkg-plist
index 00f25a9d327d..8ac833822ec0 100644
--- a/deskutils/glabels/pkg-plist
+++ b/deskutils/glabels/pkg-plist
@@ -40,27 +40,28 @@ share/doc/libglabels/libglabels.devhelp2
 share/doc/libglabels/right.png
 share/doc/libglabels/style.css
 share/doc/libglabels/up.png
-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/brother-other-templates.xml
-share/glabels/templates/categories.xml
-share/glabels/templates/dymo-other-templates.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
+%%DATADIR%%/dtd/glabels-2.2.dtd
+%%DATADIR%%/glade/merge-properties-dialog.glade
+%%DATADIR%%/glade/new-label-dialog.glade
+%%DATADIR%%/glade/object-editor.glade
+%%DATADIR%%/glade/prefs-dialog.glade
+%%DATADIR%%/glade/print-custom-widget.glade
+%%DATADIR%%/glade/property-bar.glade
+%%DATADIR%%/glade/template-designer.glade
+%%DATADIR%%/glade/wdgt-media-select.glade
+%%DATADIR%%/glade/wdgt-rotate-label.glade
+%%DATADIR%%/templates/avery-iso-templates.xml
+%%DATADIR%%/templates/avery-other-templates.xml
+%%DATADIR%%/templates/avery-us-templates.xml
+%%DATADIR%%/templates/brother-other-templates.xml
+%%DATADIR%%/templates/categories.xml
+%%DATADIR%%/templates/dymo-other-templates.xml
+%%DATADIR%%/templates/misc-iso-templates.xml
+%%DATADIR%%/templates/misc-other-templates.xml
+%%DATADIR%%/templates/misc-us-templates.xml
+%%DATADIR%%/templates/paper-sizes.xml
+%%DATADIR%%/templates/pearl-templates.xml
+%%DATADIR%%/templates/zweckform-iso-templates.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
@@ -73,12 +74,88 @@ 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/merge-ex3-1.png
+share/gnome/help/glabels/C/figures/merge-ex3-2.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
 share/gnome/help/glabels/C/glabels.xml
 share/gnome/help/glabels/C/legal.xml
+share/gnome/help/glabels/cs/figures/glabels-template-cd.png
+share/gnome/help/glabels/cs/figures/glabels-template-label.png
+share/gnome/help/glabels/cs/figures/glabels-template-layout.png
+share/gnome/help/glabels/cs/figures/main-window-empty.png
+share/gnome/help/glabels/cs/figures/merge-ex1-1.png
+share/gnome/help/glabels/cs/figures/merge-ex1-2.png
+share/gnome/help/glabels/cs/figures/merge-ex1-3.png
+share/gnome/help/glabels/cs/figures/merge-ex1-4.png
+share/gnome/help/glabels/cs/figures/merge-ex2-1.png
+share/gnome/help/glabels/cs/figures/merge-ex2-2.png
+share/gnome/help/glabels/cs/figures/merge-ex2-3.png
+share/gnome/help/glabels/cs/figures/merge-ex2-4.png
+share/gnome/help/glabels/cs/figures/merge-ex3-1.png
+share/gnome/help/glabels/cs/figures/merge-ex3-2.png
+share/gnome/help/glabels/cs/figures/object-editor-sidebar.png
+share/gnome/help/glabels/cs/figures/print-copies.png
+share/gnome/help/glabels/cs/figures/print-merge.png
+share/gnome/help/glabels/cs/glabels.xml
+share/gnome/help/glabels/de/figures/glabels-template-cd.png
+share/gnome/help/glabels/de/figures/glabels-template-label.png
+share/gnome/help/glabels/de/figures/glabels-template-layout.png
+share/gnome/help/glabels/de/figures/main-window-empty.png
+share/gnome/help/glabels/de/figures/merge-ex1-1.png
+share/gnome/help/glabels/de/figures/merge-ex1-2.png
+share/gnome/help/glabels/de/figures/merge-ex1-3.png
+share/gnome/help/glabels/de/figures/merge-ex1-4.png
+share/gnome/help/glabels/de/figures/merge-ex2-1.png
+share/gnome/help/glabels/de/figures/merge-ex2-2.png
+share/gnome/help/glabels/de/figures/merge-ex2-3.png
+share/gnome/help/glabels/de/figures/merge-ex2-4.png
+share/gnome/help/glabels/de/figures/merge-ex3-1.png
+share/gnome/help/glabels/de/figures/merge-ex3-2.png
+share/gnome/help/glabels/de/figures/object-editor-sidebar.png
+share/gnome/help/glabels/de/figures/print-copies.png
+share/gnome/help/glabels/de/figures/print-merge.png
+share/gnome/help/glabels/de/glabels.xml
+share/gnome/help/glabels/es/figures/glabels-template-cd.png
+share/gnome/help/glabels/es/figures/glabels-template-label.png
+share/gnome/help/glabels/es/figures/glabels-template-layout.png
+share/gnome/help/glabels/es/figures/main-window-empty.png
+share/gnome/help/glabels/es/figures/merge-ex1-1.png
+share/gnome/help/glabels/es/figures/merge-ex1-2.png
+share/gnome/help/glabels/es/figures/merge-ex1-3.png
+share/gnome/help/glabels/es/figures/merge-ex1-4.png
+share/gnome/help/glabels/es/figures/merge-ex2-1.png
+share/gnome/help/glabels/es/figures/merge-ex2-2.png
+share/gnome/help/glabels/es/figures/merge-ex2-3.png
+share/gnome/help/glabels/es/figures/merge-ex2-4.png
+share/gnome/help/glabels/es/figures/merge-ex3-1.png
+share/gnome/help/glabels/es/figures/merge-ex3-2.png
+share/gnome/help/glabels/es/figures/object-editor-sidebar.png
+share/gnome/help/glabels/es/figures/print-copies.png
+share/gnome/help/glabels/es/figures/print-merge.png
+share/gnome/help/glabels/es/glabels.xml
+share/gnome/help/glabels/fr/figures/glabels-template-cd.png
+share/gnome/help/glabels/fr/figures/glabels-template-label.png
+share/gnome/help/glabels/fr/figures/glabels-template-layout.png
+share/gnome/help/glabels/fr/figures/main-window-empty.png
+share/gnome/help/glabels/fr/figures/merge-ex1-1.png
+share/gnome/help/glabels/fr/figures/merge-ex1-2.png
+share/gnome/help/glabels/fr/figures/merge-ex1-3.png
+share/gnome/help/glabels/fr/figures/merge-ex1-4.png
+share/gnome/help/glabels/fr/figures/merge-ex2-1.png
+share/gnome/help/glabels/fr/figures/merge-ex2-2.png
+share/gnome/help/glabels/fr/figures/merge-ex2-3.png
+share/gnome/help/glabels/fr/figures/merge-ex2-4.png
+share/gnome/help/glabels/fr/figures/merge-ex3-1.png
+share/gnome/help/glabels/fr/figures/merge-ex3-2.png
+share/gnome/help/glabels/fr/figures/object-editor-sidebar.png
+share/gnome/help/glabels/fr/figures/print-copies.png
+share/gnome/help/glabels/fr/figures/print-merge.png
+share/gnome/help/glabels/fr/glabels.xml
+share/locale/ca/LC_MESSAGES/glabels.mo
 share/locale/cs/LC_MESSAGES/glabels.mo
+share/locale/da/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
@@ -89,12 +166,19 @@ share/locale/ko/LC_MESSAGES/glabels.mo
 share/locale/pl/LC_MESSAGES/glabels.mo
 share/locale/pt_BR/LC_MESSAGES/glabels.mo
 share/locale/ru/LC_MESSAGES/glabels.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/glabels.mo
+share/locale/sl/LC_MESSAGES/glabels.mo
+share/locale/sv/LC_MESSAGES/glabels.mo
+share/locale/zh_CN/LC_MESSAGES/glabels.mo
+share/locale/zh_TW/LC_MESSAGES/glabels.mo
 share/mime-info/glabels.keys
 share/mime-info/glabels.mime
 share/mime/application/x-glabels.xml
 share/mime/packages/glabels.xml
 share/omf/glabels/glabels-C.omf
+share/omf/glabels/glabels-cs.omf
+share/omf/glabels/glabels-de.omf
+share/omf/glabels/glabels-es.omf
+share/omf/glabels/glabels-fr.omf
 share/pixmaps/glabels-application-x-glabels.png
 share/pixmaps/glabels.png
 share/pixmaps/glabels/ex-1layout.png
@@ -106,18 +190,24 @@ share/pixmaps/glabels/glabels-about-logo.png
 share/pixmaps/glabels/glabels-splash.png
 @dirrm share/pixmaps/glabels
 @dirrm share/omf/glabels
+@dirrm share/gnome/help/glabels/fr/figures
+@dirrm share/gnome/help/glabels/fr
+@dirrm share/gnome/help/glabels/es/figures
+@dirrm share/gnome/help/glabels/es
+@dirrm share/gnome/help/glabels/de/figures
+@dirrm share/gnome/help/glabels/de
+@dirrm share/gnome/help/glabels/cs/figures
+@dirrm share/gnome/help/glabels/cs
 @dirrm share/gnome/help/glabels/C/figures
 @dirrm share/gnome/help/glabels/C
 @dirrm share/gnome/help/glabels
-@dirrm share/glabels/templates
-@dirrm share/glabels/glade
-@dirrm share/glabels/dtd
-@dirrm share/glabels
+@dirrm %%DATADIR%%/templates
+@dirrm %%DATADIR%%/glade
+@dirrm %%DATADIR%%/dtd
+@dirrm %%DATADIR%%
 @dirrm share/doc/libglabels
 @dirrmtry share/applications
 @dirrm include/libglabels
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true