Update to 0.112.1 and bl3ify:

* Fix build for gtk+ 2.2. (Frederic Crozat)
* Fix build for libgnomeprint 2.6. (Martin)

3 files changed, 15 insertions, 37 deletions

diff --git a/print/gpdf/Makefile b/print/gpdf/Makefile
index 88ecf43c455..5f006217bc0 100644
--- a/print/gpdf/Makefile
+++ b/print/gpdf/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2004/02/14 17:21:50 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2004/02/19 13:22:43 jmmv Exp $
 #
 
-DISTNAME=	gpdf-0.112
-PKGREVISION=	1
+DISTNAME=	gpdf-0.112.1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gpdf/0.112/}
 EXTRACT_SUFX=	.tar.bz2
@@ -14,7 +13,7 @@ COMMENT=	GNOME 2 version of xpdf
 DEPENDS=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
 BUILD_USES_MSGFMT=	yes
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 USE_PKGLOCALEDIR=	yes
 USE_LANGUAGES=		c c++
@@ -22,13 +21,13 @@ USE_LIBTOOL=		yes
 USE_X11=		yes
 GNU_CONFIGURE=		yes
 
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/libbonobo/buildlink2.mk"
-.include "../../devel/libbonoboui/buildlink2.mk"
-.include "../../devel/libglade2/buildlink2.mk"
-.include "../../devel/libgnomeui/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../print/libgnomeprint/buildlink2.mk"
-.include "../../print/libgnomeprintui/buildlink2.mk"
-.include "../../sysutils/gnome-vfs2/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/libbonobo/buildlink3.mk"
+.include "../../devel/libbonoboui/buildlink3.mk"
+.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libgnomeui/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../print/libgnomeprint/buildlink3.mk"
+.include "../../print/libgnomeprintui/buildlink3.mk"
+.include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/gpdf/distinfo b/print/gpdf/distinfo
index 6a50db69224..550ff94268f 100644
--- a/print/gpdf/distinfo
+++ b/print/gpdf/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.2 2004/02/06 19:43:53 jmmv Exp $
+$NetBSD: distinfo,v 1.3 2004/02/19 13:22:43 jmmv Exp $
 
-SHA1 (gpdf-0.112.tar.bz2) = 0ef7d87f4154bdd9f9174c02f2e29a78a23a7007
-Size (gpdf-0.112.tar.bz2) = 841415 bytes
-SHA1 (patch-aa) = 114ff377d88b3696e2ee4da9881a698f215b4223
+SHA1 (gpdf-0.112.1.tar.bz2) = 3278402013f2f56c934d7aeee9ec242750a26e1f
+Size (gpdf-0.112.1.tar.bz2) = 839517 bytes
diff --git a/print/gpdf/patches/patch-aa b/print/gpdf/patches/patch-aa
deleted file mode 100644
index 00abbb3d534..00000000000
--- a/print/gpdf/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2004/02/06 19:43:53 jmmv Exp $
-
---- shell/gpdf.c.orig	2004-01-17 22:09:01.000000000 +0100
-+++ shell/gpdf.c
-@@ -121,6 +121,7 @@ open_request_logger (GPdfURIInput *in, c
- static void
- set_window_icon_default (void)
- {
-+/* *** REQUIRES DEVELOPMENT BRANCH OF GTK2 (2.3.X) ***
- 	GdkPixbuf *pixbuf;
- 
- 	pixbuf = gdk_pixbuf_new_from_file (GNOMEICONDIR "/gnome-pdf.png", NULL);
-@@ -131,6 +132,7 @@ set_window_icon_default (void)
- 	gtk_window_set_default_icon (pixbuf);
- 
- 	g_object_unref (pixbuf);
-+*/
- }
- 
- int