From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Aug 19 01:30:03 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D334A106567B for ; Tue, 19 Aug 2008 01:30:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id A79038FC1F for ; Tue, 19 Aug 2008 01:30:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m7J1U3H7066330 for ; Tue, 19 Aug 2008 01:30:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m7J1U3Y4066327; Tue, 19 Aug 2008 01:30:03 GMT (envelope-from gnats) Resent-Date: Tue, 19 Aug 2008 01:30:03 GMT Resent-Message-Id: <200808190130.m7J1U3Y4066327@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Dima Panov" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0DEAC106568D for ; Tue, 19 Aug 2008 01:23:44 +0000 (UTC) (envelope-from fluffy@fluffy.khv.ru) Received: from ns.ael.RU (ns.ael.ru [62.76.207.226]) by mx1.freebsd.org (Postfix) with ESMTP id 153558FC2A for ; Tue, 19 Aug 2008 01:23:42 +0000 (UTC) (envelope-from fluffy@fluffy.khv.ru) Received: from Fluffy.Khv.RU ([10.0.3.30]) by ns.ael.RU (8.14.2/8.14.2/Fluffy/5.2) with ESMTP id m7J1MlqX077732 for ; Tue, 19 Aug 2008 12:22:54 +1100 (VLAST) (envelope-from fluffy@fluffy.khv.ru) Received: from Fluffy.Khv.RU (localhost [127.0.0.1]) by Fluffy.Khv.RU (8.14.2/8.14.2/Fluffy/5.4) with ESMTP id m7J1MW85057594 for ; Tue, 19 Aug 2008 12:22:32 +1100 (VLAST) (envelope-from fluffy@fluffy.khv.ru) Message-Id: <1219108952.45311@Fluffy.Khv.RU> Date: Tue, 19 Aug 2008 12:22:32 +1100 From: "Dima Panov" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.9 Cc: Subject: ports/126643: x11-themes/kdeartwork4: resolve conflicts X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Aug 2008 01:30:03 -0000 >Number: 126643 >Category: ports >Synopsis: x11-themes/kdeartwork4: resolve conflicts >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Aug 19 01:30:03 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Dima Panov >Release: FreeBSD 8.0-800043-CURRENT i386 >Organization: >Environment: System: FreeBSD 8.0-800043-CURRENT #0: Sat Aug 16 19:27:03 VLAST 2008 root@Fluffy.Khv.RU:/usr/obj/usr/src/sys/Spot >Description: x11-themes/kdeartwork4 don't check which variant of xscreensaver we are hale installed => leads to conflict >How-To-Repeat: install x11/xscreensaver-gnome try to install kdeartwork4 >Fix: resolve conflict as it done for kde3. --- x11-themes::kdeartwork4.diff begins here --- Index: x11-themes/kdeartwork4/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-themes/kdeartwork4/Makefile,v retrieving revision 1.55 diff -u -r1.55 Makefile --- x11-themes/kdeartwork4/Makefile 9 Aug 2008 16:52:28 -0000 1.55 +++ x11-themes/kdeartwork4/Makefile 19 Aug 2008 01:07:33 -0000 @@ -14,9 +14,6 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE Artworks Themes -BUILD_DEPENDS= xscreensaver:${PORTSDIR}/x11/xscreensaver -RUN_DEPENDS= xscreensaver:${PORTSDIR}/x11/xscreensaver - LATEST_LINK= ${PORTNAME}4 USE_BZIP2= yes @@ -25,6 +22,26 @@ KDE4_BUILDENV= yes QT_COMPONENTS= opengl gui moc rcc uic svg qt3support +.include + +.if exists(${LOCALBASE}/share/applications/xscreensaver-properties.desktop) +WITH_XSGNOME= yes +.elif exists(${LOCALBASE}/bin/screensaver) +WITH_XSGNOME= yes +.else +WITH_XS= yes +.endif + +.if defined(WITH_XS) && !defined(WITH_XSGNOME) +BUILD_DEPENDS+= xscreensaver:${PORTSDIR}/x11/xscreensaver +RUN_DEPENDS+= xscreensaver:${PORTSDIR}/x11/xscreensaver +.endif # defined(WITH_XS) + +.if defined(WITH_XSGNOME) +BUILD_DEPENDS+= ${LOCALBASE}/share/applications/xscreensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome +RUN_DEPENDS+= ${LOCALBASE}/share/applications/xscreensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome +.endif # defined(WITH_XSGNOME) + post-extract: ${MKDIR} ${WRKSRC} @@ -57,4 +74,4 @@ ${WRKSRC}/../${item} .endfor -.include +.include --- x11-themes::kdeartwork4.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: