From 739db53be136868bf1281530f90547a3b25a8a52 Mon Sep 17 00:00:00 2001
From: marcus <marcus@FreeBSD.org>
Date: Tue, 9 Dec 2003 02:50:03 +0000
Subject: Update to 2.4.2.

---
 print/libgnomeprint/Makefile          | 28 +++-------------------------
 print/libgnomeprint/distinfo          |  3 +--
 x11-toolkits/libgnomeprintui/Makefile |  2 +-
 x11-toolkits/libgnomeprintui/distinfo |  2 +-
 4 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 2917417fe511..244255fdaac4 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -6,16 +6,10 @@
 #
 
 PORTNAME=	libgnomeprint
-PORTVERSION=	2.4.1
-PORTREVISION=	2
+PORTVERSION=	2.4.2
 CATEGORIES=	print gnome
-MASTER_SITES=	${MASTER_SITE_GNOME} \
-		${MASTER_SITE_LOCAL:S/$/:local/} \
-		http://people.FreeBSD.org/~marcus/:local
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.4 \
-			marcus/:local
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		gpa-xml-${PORTVERSION}${EXTRACT_SUFX}:local
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.4
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -33,10 +27,6 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
-GPA_XML=	globals.xml
-GPA_PRINTERS=	GENERIC.xml META.xml PDF-WRITER.xml
-GPA_MODELS=	GNOME-GENERIC-PS.xml GNOME-META.xml GNOME-PDF-WRITER.xml
-
 .include <bsd.port.pre.mk>
 
 .if exists(${LOCALBASE}/lib/libcups.so)
@@ -60,17 +50,5 @@ post-patch:
 post-install:
 	@${MKDIR} ${PREFIX}/etc/gnome/libgnomeprint-2.0/fonts
 	@${TOUCH} ${PREFIX}/etc/gnome/libgnomeprint-2.0/fonts/gnome-print.fontmap
-.for xml in ${GPA_XML}
-	${INSTALL_DATA} ${WRKDIR}/gpa-xml-${PORTVERSION}/${xml} \
-		${PREFIX}/share/gnome/${PORTNAME}/${PORTVERSION}
-.endfor
-.for printer in ${GPA_PRINTERS}
-	${INSTALL_DATA} ${WRKDIR}/gpa-xml-${PORTVERSION}/${printer} \
-		${PREFIX}/share/gnome/${PORTNAME}/${PORTVERSION}/printers
-.endfor
-.for model in ${GPA_MODELS}
-	${INSTALL_DATA} ${WRKDIR}/gpa-xml-${PORTVERSION}/${model} \
-		${PREFIX}/share/gnome/${PORTNAME}/${PORTVERSION}/models
-.endfor
 
 .include <bsd.port.post.mk>
diff --git a/print/libgnomeprint/distinfo b/print/libgnomeprint/distinfo
index 935528dc8463..da0efaf6385b 100644
--- a/print/libgnomeprint/distinfo
+++ b/print/libgnomeprint/distinfo
@@ -1,2 +1 @@
-MD5 (gnome2/libgnomeprint-2.4.1.tar.bz2) = ac7cbe45379b6bc14308cdcca8175757
-MD5 (gnome2/gpa-xml-2.4.1.tar.bz2) = 7128cbbb8a4fdc179c90dcc2a5b31e34
+MD5 (gnome2/libgnomeprint-2.4.2.tar.bz2) = d58534de6c0c6c953b42d82eec0ebfe8
diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile
index f6e4dec9163b..1d00ca821f28 100644
--- a/x11-toolkits/libgnomeprintui/Makefile
+++ b/x11-toolkits/libgnomeprintui/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libgnomeprintui
-PORTVERSION=	2.4.1
+PORTVERSION=	2.4.2
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.4
diff --git a/x11-toolkits/libgnomeprintui/distinfo b/x11-toolkits/libgnomeprintui/distinfo
index fb956ad6495d..5f837c7fb2d5 100644
--- a/x11-toolkits/libgnomeprintui/distinfo
+++ b/x11-toolkits/libgnomeprintui/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnomeprintui-2.4.1.tar.bz2) = b7ac0c6f612cf748905f1917f7de044b
+MD5 (gnome2/libgnomeprintui-2.4.2.tar.bz2) = 5a28283f32efaa6fa401c5e9385b9634
-- 
cgit