Date: Sat, 19 Jul 2008 16:43:58 +0900 (JST) From: Koji Yokota <yokota@res.otaru-uc.ac.jp> To: FreeBSD-gnats-submit@FreeBSD.org Cc: ahze@FreeBSD.org Subject: ports/125764: [PATCH] x11-themes/clearlooks: Makefile breaks clearlooks-themes Message-ID: <20080719074358.8F607B861@room520-1.yokota-s.otaru-uc.ac.jp> Resent-Message-ID: <200807190750.m6J7o6Ho086989@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 125764
>Category: ports
>Synopsis: [PATCH] x11-themes/clearlooks: Makefile breaks clearlooks-themes
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Jul 19 07:50:05 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Koji Yokota
>Release: FreeBSD 7.0-RELEASE-p1 i386
>Organization:
Otaru University of Commerce
>Environment:
System: FreeBSD hoge.otaru-uc.ac.jp 7.0-RELEASE-p1 FreeBSD 7.0-RELEASE-p1 #0: Thu May 29 23:57:30 JST 2008
>Description:
[DESCRIBE CHANGES]
Port maintainer (ahze@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
The line '.if ${PORTNAME}=="clearlooks"' mistakenly picks up dependent ports
such as x11-themes/clearlooks-themes. I don't completely comprehend whether
there are any other ports which depend on this, but for the clearlooks-themes
port, the attached patch remedies the brokenness.
--- clearlooks-0.6.2_7.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/x11-themes/clearlooks.orig/Makefile /usr/ports/x11-themes/clearlooks/Makefile
--- /usr/ports/x11-themes/clearlooks.orig/Makefile 2008-07-19 16:26:58.000000000 +0900
+++ /usr/ports/x11-themes/clearlooks/Makefile 2008-07-19 16:36:08.000000000 +0900
@@ -23,14 +23,14 @@
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-.if defined(PORTNAME) && ${PORTNAME} == "clearlooks"
+.if defined(PORTNAME) && !defined(PKGNAMESUFFIX)
OPTIONS+= ANIMATION "Enable experimental animated progressbars" Off \
METACITY "Depend on MetaCity Theme" On
.endif
.include <bsd.port.pre.mk>
-.if ${PORTNAME} == "clearlooks"
+.if !defined(PKGNAMESUFFIX)
CONFLICTS+= gtk-engines2-[0-9]* clearlooks-themes[0-9]*
PLIST_SUB+= ENGINE=""
.else
@@ -45,7 +45,7 @@
PLIST_SUB+= ENGINE="@comment "
.endif
-.if !defined(WITHOUT_METACITY) && ${PORTNAME}=="clearlooks"
+.if !defined(WITHOUT_METACITY) && !defined(PKGNAMESUFFIX)
RUN_DEPENDS+= ${LOCALBASE}/share/themes/Clearlooks/metacity-1/metacity-theme-1.xml:${PORTSDIR}/x11-themes/clearlooks-metacity
.endif
@@ -53,7 +53,7 @@
CONFIGURE_ARGS+= --enable-animation
.endif
-.if ${PORTNAME} == "clearlooks"
+.if !defined(PKGNAMESUFFIX)
pre-everything::
@if [ -n "`${PKG_INFO} -xI '^gtk-engines2*[0-9]*'`" ]; then \
${ECHO_MSG} ; \
--- clearlooks-0.6.2_7.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20080719074358.8F607B861>