- Update to 0.88 (the most recent version which can be used with

  x11-toolkits/linux-gtk2)
- Use EXTRACT_* variables rather than a do-extract target

3 files changed, 13 insertions, 14 deletions

diff --git a/x11-themes/linux-gtk-bluecurve-theme/Makefile b/x11-themes/linux-gtk-bluecurve-theme/Makefile
index 70bc0f0..697d487 100644
--- a/x11-themes/linux-gtk-bluecurve-theme/Makefile
+++ b/x11-themes/linux-gtk-bluecurve-theme/Makefile
@@ -6,28 +6,28 @@
 #
 
 PORTNAME=		linux-gtk-bluecurve-theme
-PORTVERSION=		0.73
-PORTREVISION=		1
+PORTVERSION=		0.88
 CATEGORIES=		x11-themes
-MASTER_SITES=		ftp://fr.rpmfind.net/linux/redhat/9/en/os/${MACHINE_ARCH}/RedHat/RPMS/
-DISTFILES=		redhat-artwork-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
+MASTER_SITES=		${MASTER_SITE_FEDORA_LINUX}
+MASTER_SITE_SUBDIR=	1/${ARCH}/os/Fedora/RPMS
+DISTFILES=		redhat-artwork-${PORTVERSION}-1.${ARCH}.rpm
 DIST_SUBDIR=		rpm
 
 MAINTAINER=		jylefort@FreeBSD.org
-COMMENT=		Bluecurve theme for GTK1 and GTK2 from RedHat 8.0 (Linux version)
+COMMENT=		Bluecurve theme for GTK1 and GTK2 from Fedora Core (Linux version)
 
 EXTRACT_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
 
+EXTRACT_CMD=		rpm2cpio.pl
+EXTRACT_BEFORE_ARGS=
+EXTRACT_AFTER_ARGS=	| ${CPIO} -id --quiet
+
 NO_WRKSUBDIR=		yes
 USE_LINUX_PREFIX=	yes
 NO_BUILD=		yes
 USE_REINPLACE=		yes
 ONLY_FOR_ARCHS=		i386
 
-do-extract:
-	@${MKDIR} ${WRKDIR}
-	@cd ${WRKDIR}; rpm2cpio.pl ${_DISTDIR}/${DISTFILES} | ${CPIO} -id --quiet
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|include "iconrc"||' \
 		${WRKSRC}/usr/share/themes/Bluecurve/gtk-2.0/gtkrc
diff --git a/x11-themes/linux-gtk-bluecurve-theme/distinfo b/x11-themes/linux-gtk-bluecurve-theme/distinfo
index 9be5ddd..3086669 100644
--- a/x11-themes/linux-gtk-bluecurve-theme/distinfo
+++ b/x11-themes/linux-gtk-bluecurve-theme/distinfo
@@ -1,2 +1,2 @@
-MD5 (rpm/redhat-artwork-0.73-1.i386.rpm) = c2ad53b9aea12f2b70d995e5e330ce32
-SIZE (rpm/redhat-artwork-0.73-1.i386.rpm) = 7939141
+MD5 (rpm/redhat-artwork-0.88-1.i386.rpm) = ac1cf87dacc478d6f90f6f056c1c3806
+SIZE (rpm/redhat-artwork-0.88-1.i386.rpm) = 4164330
diff --git a/x11-themes/linux-gtk-bluecurve-theme/pkg-descr b/x11-themes/linux-gtk-bluecurve-theme/pkg-descr
index 37751e2..a8211cf 100644
--- a/x11-themes/linux-gtk-bluecurve-theme/pkg-descr
+++ b/x11-themes/linux-gtk-bluecurve-theme/pkg-descr
@@ -1,6 +1,5 @@
-This is a port of RedHat 8.0 "Bluecurve" theme for GTK/GNOME.
-It won't install RedHat logos and pixmaps, but only the required
-theme engines.
+This is a port of Fedora Core "Bluecurve" theme for GTK/GNOME. It will not
+install RedHat logos and pixmaps, but only the required theme engines.
 
 This is the Linux version, for use with x11-toolkits/linux-gtk and
 x11-toolkits/linux-gtk2.