From owner-svn-ports-head@FreeBSD.ORG Mon Sep 23 21:23:30 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 32C9AB95; Mon, 23 Sep 2013 21:23:30 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 05F902AC5; Mon, 23 Sep 2013 21:23:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8NLNTgA077396; Mon, 23 Sep 2013 21:23:29 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8NLNTVU077394; Mon, 23 Sep 2013 21:23:29 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201309232123.r8NLNTVU077394@svn.freebsd.org> From: Rene Ladan Date: Mon, 23 Sep 2013 21:23:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r328055 - in head/astro: boinc-setiathome-enhanced boinc-setiathome-v7 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Sep 2013 21:23:30 -0000 Author: rene Date: Mon Sep 23 21:23:29 2013 New Revision: 328055 URL: http://svnweb.freebsd.org/changeset/ports/328055 Log: Oops, these two ports only conflict if they install the screen saver. Modified: head/astro/boinc-setiathome-enhanced/Makefile head/astro/boinc-setiathome-v7/Makefile Modified: head/astro/boinc-setiathome-enhanced/Makefile ============================================================================== --- head/astro/boinc-setiathome-enhanced/Makefile Mon Sep 23 21:21:05 2013 (r328054) +++ head/astro/boinc-setiathome-enhanced/Makefile Mon Sep 23 21:23:29 2013 (r328055) @@ -16,8 +16,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING DEPRECATED= Project is switching, use astro/boinc-setiathome-v7 instead -CONFLICTS= boinc-setiathome-v7-[0-9]* - BUILD_DEPENDS= ${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3 RUN_DEPENDS= boinc_client:${PORTSDIR}/net/boinc-client LIB_DEPENDS= libfftw3f.so:${PORTSDIR}/math/fftw3-float @@ -51,6 +49,7 @@ USE_GL= gl glu glut USE_XORG= ice sm x11 xau xcb xext xi xdamage xdmcp xfixes xmu xt xxf86vm BUILD_DEPENDS+= ${LOCALBASE}/lib/libboinc_graphics2.a:${PORTSDIR}/net/boinc-client PLIST_SUB+= X11="" +CONFLICTS= boinc-setiathome-v7-[0-9]* .else BUILD_DEPENDS+= ${LOCALBASE}/include/boinc/std_fixes.h:${PORTSDIR}/net/boinc-client CONFIGURE_ARGS+= --disable-graphics Modified: head/astro/boinc-setiathome-v7/Makefile ============================================================================== --- head/astro/boinc-setiathome-v7/Makefile Mon Sep 23 21:21:05 2013 (r328054) +++ head/astro/boinc-setiathome-v7/Makefile Mon Sep 23 21:23:29 2013 (r328055) @@ -14,8 +14,6 @@ COMMENT= Setiathome Enhanced for BOINC LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -CONFLICTS= boinc-setiathome-enhanced-[0-9]* - BUILD_DEPENDS= ${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3 RUN_DEPENDS= boinc_client:${PORTSDIR}/net/boinc-client LIB_DEPENDS= libfftw3f.so:${PORTSDIR}/math/fftw3-float @@ -48,6 +46,7 @@ USE_GL= gl glu glut USE_XORG= ice sm x11 xau xcb xext xi xdamage xdmcp xfixes xmu xt xxf86vm BUILD_DEPENDS+= ${LOCALBASE}/lib/libboinc_graphics2.a:${PORTSDIR}/net/boinc-client PLIST_SUB+= X11="" +CONFLICTS= boinc-setiathome-enhanced-[0-9]* .else BUILD_DEPENDS+= ${LOCALBASE}/include/boinc/std_fixes.h:${PORTSDIR}/net/boinc-client CONFIGURE_ARGS+= --disable-graphics