- Chase the linux-gtk2 update by updating to 0.117-1 [1]

- Simplify the port by using audio/linux-openal/bsd.linux.mk
- Add amd64 to ONLY_FOR_ARCHS
- Relayout the Makefile (one tab less between variables and values)

Reported by:	daichi [1]

5 files changed, 53 insertions, 67 deletions

diff --git a/x11-themes/linux-gtk-bluecurve-theme/Makefile b/x11-themes/linux-gtk-bluecurve-theme/Makefile
index 697d48732331..d0ed4d5b425c 100644
--- a/x11-themes/linux-gtk-bluecurve-theme/Makefile
+++ b/x11-themes/linux-gtk-bluecurve-theme/Makefile
@@ -5,42 +5,55 @@
 # $FreeBSD$
 #
 
-PORTNAME=		linux-gtk-bluecurve-theme
-PORTVERSION=		0.88
-CATEGORIES=		x11-themes
-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 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
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|include "iconrc"||' \
-		${WRKSRC}/usr/share/themes/Bluecurve/gtk-2.0/gtkrc
+PORTNAME=	gtk-bluecurve-theme
+DISTVERSION=	0.117-1
+CATEGORIES=	x11-themes linux
+MASTER_SITE_SUBDIR=	3/${LINUX_ARCH}/os/Fedora/RPMS/
+DISTNAME=	redhat-artwork-${DISTVERSION}
+
+MAINTAINER=	jylefort@FreeBSD.org
+COMMENT=	The Bluecurve GTK+ 1.x and 2.x themes (Linux version)
+
+ONLY_FOR_ARCHS=	i386 amd64
+
+# GTK+ 1.x theme engine
+GTK1_RCDIR=	gtk
+GTK1_ENGINEDIR=	usr/lib/gtk/themes/engines
+GTK1_ENGINEDIRS=${GTK1_ENGINEDIR} usr/lib/gtk/themes usr/lib/gtk
+
+# GTK+ 2.x theme engine
+GTK2_RCDIR=	gtk-2.0
+GTK2_ENGINEDIR=	usr/lib/gtk-2.0/2.4.0/engines
+GTK2_ENGINEDIRS=${GTK2_ENGINEDIR} usr/lib/gtk-2.0/2.4.0 usr/lib/gtk-2.0
+
+EXTRA_STYLES=	BerriesAndCream Gnome Grape Lime Slate Strawberry Tangerine
+THEMES=		Bluecurve ${EXTRA_STYLES:S|^|Bluecurve-|}
+
+pre-install:
+	@${RM} -f ${PLIST}
+.for v in 1 2
+	@${ECHO_CMD} '${GTK${v}_ENGINEDIR}/libbluecurve.so' >> ${PLIST}
+.  for d in ${GTK${v}_ENGINEDIRS}
+	@${ECHO_CMD} '@unexec rmdir %D/${d} 2>/dev/null || true' >> ${PLIST}
+.  endfor
+.  for t in ${THEMES}
+	@${ECHO_CMD} 'usr/share/themes/${t}/${GTK${v}_RCDIR}/gtkrc' >> ${PLIST}
+	@${ECHO_CMD} '@dirrm usr/share/themes/${t}/${GTK${v}_RCDIR}' >> ${PLIST}
+.  endfor
+.endfor
+.for t in ${THEMES}
+	@${ECHO_CMD} '@dirrm usr/share/themes/${t}' >> ${PLIST}
+.endfor
+	@${ECHO_CMD} '@unexec rmdir %D/usr/share/themes 2>/dev/null || true' >> ${PLIST}
 
 do-install:
-	${MKDIR} ${PREFIX}/usr/share/themes/Bluecurve
-	${MKDIR} ${PREFIX}/usr/lib/gtk-2.0/2.2.0/engines
-	${MKDIR} ${PREFIX}/usr/share/themes/Bluecurve/gtk-2.0
-	${INSTALL_DATA} ${WRKSRC}/usr/lib/gtk-2.0/2.2.0/engines/libbluecurve.so ${PREFIX}/usr/lib/gtk-2.0/2.2.0/engines
-	${INSTALL_DATA} ${WRKSRC}/usr/share/themes/Bluecurve/gtk-2.0/gtkrc ${PREFIX}/usr/share/themes/Bluecurve/gtk-2.0
-	${MKDIR} ${PREFIX}/usr/lib/gtk/themes/engines
-	${INSTALL_DATA} ${WRKSRC}/usr/lib/gtk/themes/engines/libbluecurve.so ${PREFIX}/usr/lib/gtk/themes/engines
-	${MKDIR} ${PREFIX}/usr/share/themes/Bluecurve/gtk
-	${INSTALL_DATA} ${WRKSRC}/usr/share/themes/Bluecurve/gtk/gtkrc ${PREFIX}/usr/share/themes/Bluecurve/gtk
-
-.include <bsd.port.mk>
+.for v in 1 2
+	${MKDIR} ${PREFIX}/${GTK${v}_ENGINEDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/${GTK${v}_ENGINEDIR}/libbluecurve.so ${PREFIX}/${GTK${v}_ENGINEDIR}
+.  for t in ${THEMES}
+	${MKDIR} ${PREFIX}/usr/share/themes/${t}/${GTK${v}_RCDIR}
+	${INSTALL_DATA} ${WRKSRC}/usr/share/themes/${t}/${GTK${v}_RCDIR}/gtkrc ${PREFIX}/usr/share/themes/${t}/${GTK${v}_RCDIR}
+.  endfor
+.endfor
+
+.include "${.CURDIR}/../../audio/linux-openal/bsd.linux.mk"
diff --git a/x11-themes/linux-gtk-bluecurve-theme/distinfo b/x11-themes/linux-gtk-bluecurve-theme/distinfo
deleted file mode 100644
index 30866699b687..000000000000
--- a/x11-themes/linux-gtk-bluecurve-theme/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-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/distinfo.i386 b/x11-themes/linux-gtk-bluecurve-theme/distinfo.i386
new file mode 100644
index 000000000000..3ec0c9990bc9
--- /dev/null
+++ b/x11-themes/linux-gtk-bluecurve-theme/distinfo.i386
@@ -0,0 +1,3 @@
+MD5 (redhat-artwork-0.117-1.i386.rpm) = a1cc4cac4fcf2cff9256ab26a6b47a34
+SHA256 (redhat-artwork-0.117-1.i386.rpm) = 8bced4d34ec57725fcacb090f837ac85511fc449e0da6dacf296c1b2ef834482
+SIZE (redhat-artwork-0.117-1.i386.rpm) = 4922403
diff --git a/x11-themes/linux-gtk-bluecurve-theme/pkg-descr b/x11-themes/linux-gtk-bluecurve-theme/pkg-descr
deleted file mode 100644
index b9c5a9e3dd53..000000000000
--- a/x11-themes/linux-gtk-bluecurve-theme/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-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.
-
-WWW: http://fedora.redhat.com/projects/artwork/
-
-- Jean-Yves Lefort
-jylefort@FreeBSD.org
diff --git a/x11-themes/linux-gtk-bluecurve-theme/pkg-plist b/x11-themes/linux-gtk-bluecurve-theme/pkg-plist
deleted file mode 100644
index b9d312f332d5..000000000000
--- a/x11-themes/linux-gtk-bluecurve-theme/pkg-plist
+++ /dev/null
@@ -1,18 +0,0 @@
-usr/lib/gtk/themes/engines/libbluecurve.so
-usr/lib/gtk-2.0/2.2.0/engines/libbluecurve.so
-usr/share/themes/Bluecurve/gtk/gtkrc
-usr/share/themes/Bluecurve/gtk-2.0/gtkrc
-@unexec rmdir %D/usr/lib/gtk/themes/engines 2>/dev/null || true
-@unexec rmdir %D/usr/lib/gtk/themes 2>/dev/null || true
-@unexec rmdir %D/usr/lib/gtk 2>/dev/null || true
-@unexec rmdir %D/usr/lib/gtk-2.0/2.2.0/engines 2>/dev/null || true
-@unexec rmdir %D/usr/lib/gtk-2.0/2.2.0 2>/dev/null || true
-@unexec rmdir %D/usr/lib/gtk-2.0 2>/dev/null || true
-@unexec rmdir %D/usr/lib 2>/dev/null || true
-@dirrm usr/share/themes/Bluecurve/gtk
-@dirrm usr/share/themes/Bluecurve/gtk-2.0
-@dirrm usr/share/themes/Bluecurve
-@unexec rmdir %D/usr/share/themes 2>/dev/null || true
-@unexec rmdir %D/usr/share 2>/dev/null || true
-@unexec rmdir %D/usr 2>/dev/null || true
-@unexec rmdir %D 2>/dev/null || true