3 files changed, 78 insertions, 32 deletions

diff --git a/deskutils/glabels/Makefile b/deskutils/glabels/Makefile
index ca82486cab28..323d52f78c5c 100644
--- a/deskutils/glabels/Makefile
+++ b/deskutils/glabels/Makefile
@@ -7,27 +7,38 @@
 #
 
 PORTNAME=	glabels
-PORTVERSION=	2.0.4
-PORTREVISION=	3
+PORTVERSION=	2.2.2
 CATEGORIES=	deskutils
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A program to create labels and business cards
 
-USE_AUTOTOOLS=	libtool:15
-USE_X_PREFIX=	yes
-USE_GNOME=	gnomehack gnomeprefix gnometarget libgnomeui libgnomeprintui \
-		desktopfileutils intlhack
 USE_GMAKE=	yes
+USE_GNOME=	gnomehack gnomeprefix gnometarget libgnomeui \
+		desktopfileutils intlhack ltverhack
+WANT_GNOME=	yes
 USE_GETTEXT=	yes
-GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib" \
+		PKG_CONFIG="${LOCALBASE}/bin/pkg-config"
 
 MAN1=		glabels.1
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${HAVE_GNOME:Mevolutiondataserver}!=""
+USE_GNOME+=		evolutiondataserver
+CONFIGURE_ARGS+=	--with-libebook
+.else
+CONFIGURE_ARGS+=	--without-libebook
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|malloc\.h|stdlib\.h|g' \
+		${WRKSRC}/iec16022-0.2.1/*.c
+
+.include <bsd.port.post.mk>
diff --git a/deskutils/glabels/distinfo b/deskutils/glabels/distinfo
index a41943185edf..ae201f9df68f 100644
--- a/deskutils/glabels/distinfo
+++ b/deskutils/glabels/distinfo
@@ -1,3 +1,3 @@
-MD5 (glabels-2.0.4.tar.gz) = 76a6f1f8055f75ab4204fdca79627006
-SHA256 (glabels-2.0.4.tar.gz) = 8e3eefb2d560b870e44d3dbbc5e73c0e519f6df1caa4e7eb1bf012709c454dd2
-SIZE (glabels-2.0.4.tar.gz) = 1920095
+MD5 (glabels-2.2.2.tar.gz) = ee9f8687904b070715dac59efe7a7dc5
+SHA256 (glabels-2.2.2.tar.gz) = f457ef164f7db57fc4f4abdc8458e0be633a01d91690376c50d3732f94301eb8
+SIZE (glabels-2.2.2.tar.gz) = 1990436
diff --git a/deskutils/glabels/pkg-plist b/deskutils/glabels/pkg-plist
index 176e12808560..1e0a5fb2e3f4 100644
--- a/deskutils/glabels/pkg-plist
+++ b/deskutils/glabels/pkg-plist
@@ -1,31 +1,64 @@
 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.a
 lib/libglabels.la
 lib/libglabels.so
-lib/libglabels.so.1
+lib/libglabels.so.5
+libdata/pkgconfig/libglabels.pc
 share/application-registry/glabels.applications
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 share/applications/glabels.desktop
-share/glabels/dtd/glabels-2.0.dtd
+share/doc/libglabels/ch01.html
+share/doc/libglabels/ch02.html
+share/doc/libglabels/ch03.html
+share/doc/libglabels/home.png
+share/doc/libglabels/index.html
+share/doc/libglabels/index.sgml
+share/doc/libglabels/left.png
+share/doc/libglabels/libglabels-category.html
+share/doc/libglabels/libglabels-db.html
+share/doc/libglabels/libglabels-enums.html
+share/doc/libglabels/libglabels-paper.html
+share/doc/libglabels/libglabels-str.html
+share/doc/libglabels/libglabels-template.html
+share/doc/libglabels/libglabels-xml-category.html
+share/doc/libglabels/libglabels-xml-paper.html
+share/doc/libglabels/libglabels-xml-template.html
+share/doc/libglabels/libglabels-xml.html
+share/doc/libglabels/libglabels.devhelp
+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/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
@@ -43,20 +76,9 @@ 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/mime-info/glabels.keys
-share/mime-info/glabels.mime
-share/omf/glabels/glabels-C.omf
-share/pixmaps/glabels/ex-1layout.png
-share/pixmaps/glabels/ex-2layouts.png
-share/pixmaps/glabels/ex-cd-size.png
-share/pixmaps/glabels/ex-rect-size.png
-share/pixmaps/glabels/ex-round-size.png
-share/pixmaps/glabels/glabels-about-logo.png
-share/pixmaps/glabels/glabels-splash.png
-share/pixmaps/glabels-application-x-glabels.png
-share/pixmaps/glabels.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
@@ -65,20 +87,33 @@ 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/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/pixmaps/glabels-application-x-glabels.png
+share/pixmaps/glabels.png
+share/pixmaps/glabels/ex-1layout.png
+share/pixmaps/glabels/ex-2layouts.png
+share/pixmaps/glabels/ex-cd-size.png
+share/pixmaps/glabels/ex-rect-size.png
+share/pixmaps/glabels/ex-round-size.png
+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/C/figures
 @dirrm share/gnome/help/glabels/C
 @dirrm share/gnome/help/glabels
-@dirrm share/glabels/ui
 @dirrm share/glabels/templates
 @dirrm share/glabels/glade
 @dirrm share/glabels/dtd
 @dirrm share/glabels
+@dirrm share/doc/libglabels
+@dirrmtry share/applications
 @dirrm include/libglabels
 @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
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@dirrmtry share/applications