From tkato@prontomail.com  Thu Dec 25 06:30:45 2003
Return-Path: <tkato@prontomail.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 568F816A4CE
	for <FreeBSD-gnats-submit@FreeBSD.org>; Thu, 25 Dec 2003 06:30:45 -0800 (PST)
Received: from hfep06.dion.ne.jp (hfep06.dion.ne.jp [203.181.105.72])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D989D43D39
	for <FreeBSD-gnats-submit@FreeBSD.org>; Thu, 25 Dec 2003 06:30:42 -0800 (PST)
	(envelope-from tkato@prontomail.com)
Received: from localhost ([211.126.70.71]) by hfep06.dion.ne.jp with SMTP
          id <20031225143037689.NNAR@hfep06.dion.ne.jp>
          for <FreeBSD-gnats-submit@FreeBSD.org>;
          Thu, 25 Dec 2003 23:30:37 +0900
Message-Id: <20031225233008.25290f8c.tkato@prontomail.com>
Date: Thu, 25 Dec 2003 23:30:08 +0900
From: KATO Tsuguru <tkato@prontomail.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: Update port: deskutils/glables to 1.93.1

>Number:         60560
>Category:       ports
>Synopsis:       Update port: deskutils/glables to 1.93.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    krion
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Dec 25 06:40:16 PST 2003
>Closed-Date:    Thu Dec 25 10:02:45 PST 2003
>Last-Modified:  Thu Dec 25 10:02:45 PST 2003
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.9-RELEASE-p1 i386
>Organization:
>Environment:
>Description:
- Update to version 1.93.1

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/deskutils/glabels/Makefile deskutils/glabels/Makefile
--- /usr/ports/deskutils/glabels/Makefile	Thu Dec  4 22:31:07 2003
+++ deskutils/glabels/Makefile	Wed Dec 24 10:36:08 2003
@@ -6,13 +6,15 @@
 #
 
 PORTNAME=	glabels
-PORTVERSION=	1.93.0
+PORTVERSION=	1.93.1
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 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
diff -urN /usr/ports/deskutils/glabels/distinfo deskutils/glabels/distinfo
--- /usr/ports/deskutils/glabels/distinfo	Thu Dec  4 22:31:07 2003
+++ deskutils/glabels/distinfo	Wed Dec 24 10:39:04 2003
@@ -1 +1 @@
-MD5 (glabels-1.93.0.tar.gz) = e6cd052cdb50e17f2e6c47d3fea54fa8
+MD5 (glabels-1.93.1.tar.gz) = aefbfabda808c145e306c385a110cb93
diff -urN /usr/ports/deskutils/glabels/files/patch-barcode-0.98_Makefile.in deskutils/glabels/files/patch-barcode-0.98_Makefile.in
--- /usr/ports/deskutils/glabels/files/patch-barcode-0.98_Makefile.in	Mon Jul 14 11:52:57 2003
+++ deskutils/glabels/files/patch-barcode-0.98_Makefile.in	Wed Dec 24 10:49:50 2003
@@ -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 -urN /usr/ports/deskutils/glabels/pkg-plist deskutils/glabels/pkg-plist
--- /usr/ports/deskutils/glabels/pkg-plist	Thu Dec  4 22:31:07 2003
+++ deskutils/glabels/pkg-plist	Wed Dec 24 11:03:38 2003
@@ -12,10 +12,20 @@
 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/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
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->krion 
Responsible-Changed-By: krion 
Responsible-Changed-When: Thu Dec 25 07:19:34 PST 2003 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=60560 
State-Changed-From-To: open->closed 
State-Changed-By: krion 
State-Changed-When: Thu Dec 25 10:02:40 PST 2003 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=60560 
>Unformatted:
