>Number:         18203
>Category:       pkg
>Synopsis:       Update and fixes for print/libgnomeprint
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Fri Sep 06 10:42:00 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Julio Merino
>Release:        NetBSD 1.6G
>Organization:
HispaBSD
>Environment:
	
	
System: NetBSD darkstar 1.6G NetBSD 1.6G (DARKSTAR) #10: Wed Sep 4 15:25:12 CEST 2002 jmmv@darkstar:/var/build/kernel/DARKSTAR i386
Architecture: i386
Machine: i386
>Description:
	Our current print/libgnomeprint is version 1.115. This PR contains
	an update to 1.116. Additionally, it switches the package to
	use buildlink2 and provides a new buildlink2.mk file.

	The current buildlink.mk should be removed. If not, it must be
	fixed, as it contains an invalid package reference
	(graphics/libgnomeprint).
>How-To-Repeat:
	
>Fix:
	First, the buildlink2.mk file:

# $NetBSD$

.if !defined(LIBGNOMEPRINT_BUILDLINK2_MK)
LIBGNOMEPRINT_BUILDLINK2_MK=	# defined

BUILDLINK_PACKAGES+=			libgnomeprint
BUILDLINK_DEPENDS.libgnomeprint?=	libgnomeprint>=1.116.0
BUILDLINK_PKGSRCDIR.libgnomeprint?=	../../print/libgnomeprint

EVAL_PREFIX+=			BUILDLINK_PREFIX.libgnomeprint=libgnomeprint
BUILDLINK_PREFIX.libgnomeprint_DEFAULT=	${X11PREFIX}
BUILDLINK_FILES.libgnomeprint=	bin/libgnomeprint-2.0-font-install
BUILDLINK_FILES.libgnomeprint+=	include/libgnomeprint-2.0/libgnomeprint/*
BUILDLINK_FILES.libgnomeprint+=	include/libgnomeprint-2.0/libgnomeprint/private/*
BUILDLINK_FILES.libgnomeprint+=	lib/gnome-print-2.0/drivers/*
BUILDLINK_FILES.libgnomeprint+=	lib/gnome-print-2.0/transports/*
BUILDLINK_FILES.libgnomeprint+=	lib/libgnomeprint-2.*
BUILDLINK_FILES.libgnomeprint+=	lib/pkgconfig/libgnomeprint-2.0.pc

.include "../../devel/libbonobo/buildlink2.mk"
.include "../../devel/pango/buildlink2.mk"
.include "../../devel/ptl2/buildlink2.mk"
.include "../../graphics/freetype2/buildlink2.mk"
.include "../../graphics/libart2/buildlink2.mk"

BUILDLINK_TARGETS+=	libgnomeprint-buildlink

libgnomeprint-buildlink: _BUILDLINK_USE

.endif	# LIBGNOMEPRINT_BUILDLINK2_MK


	And now, the update patch:

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/print/libgnomeprint/Makefile,v
retrieving revision 1.1.1.1
diff -u -u -r1.1.1.1 Makefile
--- Makefile	2002/07/12 17:15:54	1.1.1.1
+++ Makefile	2002/09/06 17:39:25
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.1.1.1 2002/07/12 17:15:54 wiz Exp $
 #
 
-DISTNAME=		libgnomeprint-1.115.0
+DISTNAME=		libgnomeprint-1.116.0
 CATEGORIES=		print gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=2.0.0/sources/libgnomeprint/}
 
@@ -9,19 +9,24 @@
 HOMEPAGE=		http://www.levien.com/gnome/print-arch.html
 COMMENT=		Library for the GNOME2 Printing Architecture
 
-USE_BUILDLINK_ONLY=	YES
+BUILD_USES_MSGFMT=	YES
+
+GNU_CONFIGURE=		YES
+USE_BUILDLINK2=		YES
 USE_GMAKE=		YES
+USE_GNU_GETTEXT=	YES
+USE_X11BASE=		YES
+
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
-GNU_CONFIGURE=		YES
-
 pre-configure:
 	${MV} ${WRKSRC}/installer/README.installer ${WRKSRC}/installer/README.installer.2
 
-.include "../../devel/libbonobo/buildlink.mk"
-.include "../../devel/pango/buildlink.mk"
-.include "../../graphics/freetype2/buildlink.mk"
-.include "../../graphics/libart2/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/libbonobo/buildlink2.mk"
+.include "../../devel/pango/buildlink2.mk"
+.include "../../devel/ptl2/buildlink2.mk"
+.include "../../graphics/freetype2/buildlink2.mk"
+.include "../../graphics/libart2/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/print/libgnomeprint/PLIST,v
retrieving revision 1.1.1.1
diff -u -u -r1.1.1.1 PLIST
--- PLIST	2002/07/12 17:15:54	1.1.1.1
+++ PLIST	2002/09/06 17:39:26
@@ -71,6 +71,7 @@
 share/gtk-doc/html/libgnomeprint/libgnomeprint.html
 share/gtk-doc/html/libgnomeprint/libgnomeprintunsorted.html
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/libgnomeprint-2.0.mo
+${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/libgnomeprint-2.0.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/libgnomeprint-2.0.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/libgnomeprint-2.0.mo
 ${PKGLOCALEDIR}/locale/et/LC_MESSAGES/libgnomeprint-2.0.mo
@@ -78,6 +79,7 @@
 ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/libgnomeprint-2.0.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/libgnomeprint-2.0.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/libgnomeprint-2.0.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/libgnomeprint-2.0.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/libgnomeprint-2.0.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/libgnomeprint-2.0.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/libgnomeprint-2.0.mo
@@ -96,8 +98,8 @@
 ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/libgnomeprint-2.0.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/libgnomeprint-2.0.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/libgnomeprint-2.0.mo
-@unexec rm %D/etc/gnome/libgnomeprint-2.0/fonts/gnome-print.fontmap
 @dirrm share/gtk-doc/html/libgnomeprint
+@unexec ${RMDIR} -p %D/share/gtk-doc/html 2>/dev/null || true
 @dirrm share/gnome/libgnomeprint-2.0/fonts
 @dirrm share/gnome/libgnomeprint-2.0
 @dirrm share/gnome-print-2.0/vendors
@@ -111,5 +113,3 @@
 @dirrm include/libgnomeprint-2.0/libgnomeprint/private
 @dirrm include/libgnomeprint-2.0/libgnomeprint
 @dirrm include/libgnomeprint-2.0
-@dirrm etc/gnome/libgnomeprint-2.0/fonts
-@dirrm etc/gnome/libgnomeprint-2.0
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/print/libgnomeprint/distinfo,v
retrieving revision 1.1.1.1
diff -u -u -r1.1.1.1 distinfo
--- distinfo	2002/07/12 17:15:54	1.1.1.1
+++ distinfo	2002/09/06 17:39:26
@@ -1,6 +1,6 @@
 $NetBSD: distinfo,v 1.1.1.1 2002/07/12 17:15:54 wiz Exp $
 
-SHA1 (libgnomeprint-1.115.0.tar.gz) = ca1cf206e65648f5736e9fe88577a9fc6cbf401d
-Size (libgnomeprint-1.115.0.tar.gz) = 612681 bytes
+SHA1 (libgnomeprint-1.116.0.tar.gz) = 757072d083f8d55ec38dc45198535b0a642ae557
+Size (libgnomeprint-1.116.0.tar.gz) = 620778 bytes
 SHA1 (patch-aa) = bd6320841f82956a345c92158e8357037e53ff9e
 SHA1 (patch-ab) = ea5e0cb38bb0a939c6472fda4f60babf98fef16a
>Release-Note:
>Audit-Trail:
>Unformatted: