Changes: see libgnomeprint-2.4.2

4 files changed, 28 insertions, 35 deletions

diff --git a/print/libgnomeprintui/Makefile b/print/libgnomeprintui/Makefile
index e27009678d6..7e90fb2a692 100644
--- a/print/libgnomeprintui/Makefile
+++ b/print/libgnomeprintui/Makefile
@@ -1,23 +1,23 @@
-# $NetBSD: Makefile,v 1.16 2003/12/14 19:51:29 jmmv Exp $
+# $NetBSD: Makefile,v 1.17 2003/12/18 11:05:25 adam Exp $
 #
 
-DISTNAME=		libgnomeprintui-2.4.0
-CATEGORIES=		print gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgnomeprintui/2.4/}
-EXTRACT_SUFX=		.tar.bz2
+DISTNAME=	libgnomeprintui-2.4.2
+CATEGORIES=	print gnome
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnomeprintui/2.4/}
+EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=		jmmv@NetBSD.org
-HOMEPAGE=		http://www.levien.com/gnome/print-arch.html
-COMMENT=		Graphical library for the GNOME2 Printing Architecture
+MAINTAINER=	jmmv@NetBSD.org
+HOMEPAGE=	http://www.levien.com/gnome/print-arch.html
+COMMENT=	Graphical library for the GNOME2 Printing Architecture
 
-BUILD_USES_MSGFMT=	yes
+BUILD_USES_MSGFMT=	YES
 
-GNU_CONFIGURE=		yes
-USE_BUILDLINK2=		yes
-USE_PKGLOCALEDIR=	yes
-USE_GMAKE=		yes
-USE_X11=		yes
-USE_LIBTOOL=		yes
+GNU_CONFIGURE=		YES
+USE_BUILDLINK2=		YES
+USE_PKGLOCALEDIR=	YES
+USE_GMAKE=		YES
+USE_X11=		YES
+USE_LIBTOOL=		YES
 
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE=	ibgnomeprintui/libgnomeprintui-2.2.pc.in
diff --git a/print/libgnomeprintui/PLIST b/print/libgnomeprintui/PLIST
index d73b7987de0..397070dd242 100644
--- a/print/libgnomeprintui/PLIST
+++ b/print/libgnomeprintui/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/12/14 19:51:29 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/12/18 11:05:25 adam Exp $
 include/libgnomeprintui-2.2/libgnomeprintui/gnome-font-dialog.h
 include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-dialog.h
 include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-job-preview.h
@@ -16,13 +16,6 @@ share/doc/html/libgnomeprintui/home.png
 share/doc/html/libgnomeprintui/index.html
 share/doc/html/libgnomeprintui/index.sgml
 share/doc/html/libgnomeprintui/left.png
-share/doc/html/libgnomeprintui/libgnomeprintui-gnome-font-dialog.html
-share/doc/html/libgnomeprintui/libgnomeprintui-gnome-print-copies.html
-share/doc/html/libgnomeprintui/libgnomeprintui-gnome-print-dialog.html
-share/doc/html/libgnomeprintui/libgnomeprintui-gnome-print-job-preview.html
-share/doc/html/libgnomeprintui/libgnomeprintui-gnome-print-paper-selector.html
-share/doc/html/libgnomeprintui/libgnomeprintui-gnome-print-preview.html
-share/doc/html/libgnomeprintui/libgnomeprintui-gnome-printer-selector.html
 share/doc/html/libgnomeprintui/libgnomeprintui.html
 share/doc/html/libgnomeprintui/right.png
 share/doc/html/libgnomeprintui/up.png
diff --git a/print/libgnomeprintui/distinfo b/print/libgnomeprintui/distinfo
index 70ddc57a809..0efd5e38172 100644
--- a/print/libgnomeprintui/distinfo
+++ b/print/libgnomeprintui/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2003/12/14 19:51:29 jmmv Exp $
+$NetBSD: distinfo,v 1.6 2003/12/18 11:05:25 adam Exp $
 
-SHA1 (libgnomeprintui-2.4.0.tar.bz2) = 33d69b77c11424b9284a12e2aaff286e64a60ca3
-Size (libgnomeprintui-2.4.0.tar.bz2) = 508030 bytes
-SHA1 (patch-aa) = 2c703fde1db7bc3450aeeeed3da935454ad23a0b
+SHA1 (libgnomeprintui-2.4.2.tar.bz2) = acb256ac0ad4ad5d064cdc5ea2e23c3aae4746a0
+Size (libgnomeprintui-2.4.2.tar.bz2) = 509655 bytes
+SHA1 (patch-aa) = 08d8651239974915cb515ac94e13d7705295f367
diff --git a/print/libgnomeprintui/patches/patch-aa b/print/libgnomeprintui/patches/patch-aa
index 154fcbddf72..f4e51afcd07 100644
--- a/print/libgnomeprintui/patches/patch-aa
+++ b/print/libgnomeprintui/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2003/12/14 19:51:29 jmmv Exp $
+$NetBSD: patch-aa,v 1.3 2003/12/18 11:05:25 adam Exp $
 
---- libgnomeprintui/gpaui/Makefile.in.orig	2003-09-26 16:15:14.000000000 +0200
+--- libgnomeprintui/gpaui/Makefile.in.orig	2003-11-26 20:41:53.000000000 +0000
 +++ libgnomeprintui/gpaui/Makefile.in
 @@ -54,11 +54,6 @@ CCDEPMODE = @CCDEPMODE@
  CFLAGS = @CFLAGS@
@@ -14,13 +14,13 @@ $NetBSD: patch-aa,v 1.2 2003/12/14 19:51:29 jmmv Exp $
  CXX = @CXX@
  CXXCPP = @CXXCPP@
  CXXDEPMODE = @CXXDEPMODE@
-@@ -193,6 +188,9 @@ INCLUDES = \
+@@ -192,6 +187,9 @@ INCLUDES = \
+ 	-I$(top_srcdir)/libgnomeprintui \
  	-DWE_ARE_LIBGNOMEPRINT_INTERNALS \
  	$(LIBGNOMEPRINTUI_CFLAGS) \
- 	\
-+	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-+	-DBINDIR=\""$(bindir)"\" \
-+	-DDATADIR=\""$(datadir)"\" \
++	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
++	-DBINDIR=\""$(bindir)"\"			\
++	-DDATADIR=\""$(datadir)"\"			\
  	-DG_DISABLE_DEPRECATED				\
  	-DGDK_DISABLE_DEPRECATED				\
- 	-DGTK_DISABLE_DEPRECATED				\
+ 	-DGDK_PIXBUF_DISABLE_DEPRECATED