Date: Mon, 23 Sep 2013 21:23:29 +0000 (UTC) From: Rene Ladan <rene@FreeBSD.org> 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 Message-ID: <201309232123.r8NLNTVU077394@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309232123.r8NLNTVU077394>