Skip site navigation (1)Skip section navigation (2)
Date:      Tue,  5 Apr 2005 17:59:47 +0200 (CEST)
From:      Jean-Yves Lefort <jylefort@brutele.be>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/79566: Update port: x11-themes/linux-gtk-bluecurve-theme (misc fixes)
Message-ID:  <20050405155947.663B2C408@jsite.lefort.net>
Resent-Message-ID: <200504051600.j35G0INq020470@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         79566
>Category:       ports
>Synopsis:       Update port: x11-themes/linux-gtk-bluecurve-theme (misc fixes)
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Apr 05 16:00:17 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Jean-Yves Lefort
>Release:        FreeBSD 5.3-RELEASE-p6 i386
>Organization:
>Environment:
System: FreeBSD jsite.lefort.net 5.3-RELEASE-p6 FreeBSD 5.3-RELEASE-p6 #0: Tue Apr 5 17:03:19 CEST 2005 jylefort@jsite.lefort.net:/usr/obj/usr/src/sys/JSITE i386
>Description:
* Fix plist and remove BROKEN
* Cleanup install and do not hide it anymore
* Fix iconrc-related warning
>How-To-Repeat:
>Fix:
diff -ruN /usr/ports/x11-themes/linux-gtk-bluecurve-theme/Makefile linux-gtk-bluecurve-theme/Makefile
--- /usr/ports/x11-themes/linux-gtk-bluecurve-theme/Makefile	Sun Mar 27 04:21:58 2005
+++ linux-gtk-bluecurve-theme/Makefile	Tue Apr  5 17:56:02 2005
@@ -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 @@
 
 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 -ruN /usr/ports/x11-themes/linux-gtk-bluecurve-theme/pkg-plist linux-gtk-bluecurve-theme/pkg-plist
--- /usr/ports/x11-themes/linux-gtk-bluecurve-theme/pkg-plist	Thu Jan 20 07:23:13 2005
+++ linux-gtk-bluecurve-theme/pkg-plist	Tue Apr  5 17:40:31 2005
@@ -2,6 +2,17 @@
 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
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050405155947.663B2C408>