Update libgnomeprint to 1.116.0. Changes include bugfixes and additional

language support.
Provided by Julio Merino <jmmv@hispabsd.org>.  This closes PR pkg/18203.

4 files changed, 53 insertions, 16 deletions

diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 8ee565c7ad0..481dfc10bc8 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2002/09/10 16:06:48 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2002/09/12 04:19:50 rh Exp $
 #
 
-DISTNAME=		libgnomeprint-1.115.0
-PKGREVISION=		1
+DISTNAME=		libgnomeprint-1.116.0
 CATEGORIES=		print gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=2.0.0/sources/libgnomeprint/}
 
@@ -10,19 +9,24 @@ MAINTAINER=		jmmv@hispabsd.org
 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"
diff --git a/print/libgnomeprint/PLIST b/print/libgnomeprint/PLIST
index 0dc6c8f5fc8..feb3b7b0e36 100644
--- a/print/libgnomeprint/PLIST
+++ b/print/libgnomeprint/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/07/12 17:15:54 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/09/12 04:19:50 rh Exp $
 bin/libgnomeprint-2.0-font-install
+etc/gnome/libgnomeprint-2.0/fonts/gnome-print.fontmap
 include/libgnomeprint-2.0/libgnomeprint/gnome-font-face.h
 include/libgnomeprint-2.0/libgnomeprint/gnome-font.h
 include/libgnomeprint-2.0/libgnomeprint/gnome-glyphlist.h
@@ -71,6 +72,7 @@ share/gtk-doc/html/libgnomeprint/libgnomeprint-resources.html
 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 +80,7 @@ ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/libgnomeprint-2.0.mo
 ${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 +99,8 @@ ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/libgnomeprint-2.0.mo
 ${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
diff --git a/print/libgnomeprint/buildlink2.mk b/print/libgnomeprint/buildlink2.mk
new file mode 100644
index 00000000000..998d6212d72
--- /dev/null
+++ b/print/libgnomeprint/buildlink2.mk
@@ -0,0 +1,30 @@
+# $NetBSD: buildlink2.mk,v 1.1 2002/09/12 04:19:51 rh Exp $
+
+.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
diff --git a/print/libgnomeprint/distinfo b/print/libgnomeprint/distinfo
index a904ff66135..afd3face1ac 100644
--- a/print/libgnomeprint/distinfo
+++ b/print/libgnomeprint/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/07/12 17:15:54 wiz Exp $
+$NetBSD: distinfo,v 1.2 2002/09/12 04:19:51 rh 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