2 files changed, 26 insertions, 11 deletions

diff --git a/x11-themes/linux-gtk-bluecurve-theme/Makefile b/x11-themes/linux-gtk-bluecurve-theme/Makefile
index dcc073889f1a..70bc0f050728 100644
--- a/x11-themes/linux-gtk-bluecurve-theme/Makefile
+++ b/x11-themes/linux-gtk-bluecurve-theme/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		linux-gtk-bluecurve-theme
 PORTVERSION=		0.73
+PORTREVISION=		1
 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
@@ -17,26 +18,29 @@ COMMENT=		Bluecurve theme for GTK1 and GTK2 from RedHat 8.0 (Linux version)
 
 EXTRACT_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
 
-BROKEN=			Incomplete pkg-plist
-
 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
+
 do-install:
-	@${MKDIR} ${PREFIX}/usr/share/themes/Bluecurve && ${CHMOD} a+rx ${PREFIX}/usr/share/themes/Bluecurve
-	@${MKDIR} ${PREFIX}/usr/lib/gtk-2.0/2.2.0/engines && ${CHMOD} a+rx ${PREFIX}/usr/lib/gtk-2.0/2.2.0/engines
-	@${MKDIR} ${PREFIX}/usr/share/themes/Bluecurve/gtk-2.0 && ${CHMOD} a+rx ${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 && ${CHMOD} a+rx ${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 && ${CHMOD} a+rx ${PREFIX}/usr/share/themes/Bluecurve/gtk
-	@${INSTALL_DATA} ${WRKSRC}/usr/share/themes/Bluecurve/gtk/gtkrc ${PREFIX}/usr/share/themes/Bluecurve/gtk
+	${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>
diff --git a/x11-themes/linux-gtk-bluecurve-theme/pkg-plist b/x11-themes/linux-gtk-bluecurve-theme/pkg-plist
index ba234ce46b4d..b9d312f332d5 100644
--- a/x11-themes/linux-gtk-bluecurve-theme/pkg-plist
+++ b/x11-themes/linux-gtk-bluecurve-theme/pkg-plist
@@ -2,6 +2,17 @@ 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