- Update to version 1.93.1

PR:		60560
Submitted by:	Ports Fury

4 files changed, 28 insertions, 8 deletions

diff --git a/deskutils/glabels/Makefile b/deskutils/glabels/Makefile
index e0c11de6b22f..22e46d048c55 100644
--- a/deskutils/glabels/Makefile
+++ b/deskutils/glabels/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	glabels
-PORTVERSION=	1.93.0
+PORTVERSION=	1.93.1
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,6 +14,8 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A programm to create labels and business cards
 
+LIB_DEPENDS=	paper.2:${PORTSDIR}/print/libpaper
+
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix gnometarget libgnomeui libgnomeprintui
 USE_GETOPT_LONG=	yes
diff --git a/deskutils/glabels/distinfo b/deskutils/glabels/distinfo
index 4a02600b1370..9a54c70a8ed8 100644
--- a/deskutils/glabels/distinfo
+++ b/deskutils/glabels/distinfo
@@ -1 +1 @@
-MD5 (glabels-1.93.0.tar.gz) = e6cd052cdb50e17f2e6c47d3fea54fa8
+MD5 (glabels-1.93.1.tar.gz) = aefbfabda808c145e306c385a110cb93
diff --git a/deskutils/glabels/files/patch-barcode-0.98_Makefile.in b/deskutils/glabels/files/patch-barcode-0.98_Makefile.in
index 4841a1c34f45..d1f5a29a98bf 100644
--- a/deskutils/glabels/files/patch-barcode-0.98_Makefile.in
+++ b/deskutils/glabels/files/patch-barcode-0.98_Makefile.in
@@ -1,11 +1,17 @@
---- barcode-0.98/Makefile.in.bak	Tue Aug 27 12:23:41 2002
-+++ barcode-0.98/Makefile.in	Mon Jul  7 06:37:34 2003
-@@ -3,7 +3,7 @@
+--- barcode-0.98/Makefile.in.orig	Wed Dec 24 10:39:07 2003
++++ barcode-0.98/Makefile.in	Wed Dec 24 10:49:04 2003
+@@ -3,12 +3,12 @@
  #
  
  CC = @CC@
 -CFLAGS = @CFLAGS@ @DEFS@ @NO_GETOPT@ @NO_LIBPAPER@ @NO_STRERROR@
-+CFLAGS = @CPPFLAGS@ @CFLAGS@ @DEFS@ @NO_GETOPT@ @NO_LIBPAPER@ @NO_STRERROR@
++CFLAGS = @CFLAGS@ @DEFS@ @NO_GETOPT@ @NO_LIBPAPER@ @NO_STRERROR@ @CPPFLAGS@
  RANLIB = @RANLIB@
  
  INSTALL = @INSTALL@
+ 
+-LDFLAGS = -L. -l$(TARGET) @LIBPAPER@
++LDFLAGS = -L. -l$(TARGET) @LIBPAPER@ @LDFLAGS@
+ 
+ prefix = @prefix@
+ BINDIR = $(prefix)/bin
diff --git a/deskutils/glabels/pkg-plist b/deskutils/glabels/pkg-plist
index 7a93533610f9..03d70adf2c5c 100644
--- a/deskutils/glabels/pkg-plist
+++ b/deskutils/glabels/pkg-plist
@@ -12,10 +12,20 @@ share/gnome/glabels/misc-us-templates.xml
 share/gnome/glabels/paper-sizes.xml
 share/gnome/glabels/ui/glabels-ui.xml
 share/gnome/glabels/zweckform-iso-templates.xml
-share/gnome/help/glabels/C/index.html
-share/gnome/help/glabels/C/topic.dat
+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
+share/gnome/help/glabels/C/figures/main-window-empty.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/mime-info/glabels.keys
 share/gnome/mime-info/glabels.mime
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/glabels/glabels-C.omf 2>/dev/null || true
+share/gnome/omf/glabels/glabels-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/glabels/glabels-C.omf 2>/dev/null || true
 share/gnome/pixmaps/glabels/glabels-about-logo.png
 share/gnome/pixmaps/glabels/glabels-icon.png
 share/gnome/pixmaps/glabels/glabels-logo.png
@@ -31,6 +41,8 @@ share/locale/pt_BR/LC_MESSAGES/glabels.mo
 share/locale/ru/LC_MESSAGES/glabels.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/glabels.mo
 @dirrm share/gnome/pixmaps/glabels
+@dirrm share/gnome/omf/glabels
+@dirrm share/gnome/help/glabels/C/figures
 @dirrm share/gnome/help/glabels/C
 @dirrm share/gnome/help/glabels
 @dirrm share/gnome/glabels/ui