diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2011-01-31 22:38:34 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2011-01-31 22:38:34 +0000 |
| commit | f946b44d8a5e42723846558c2a86ba3f54a95535 (patch) | |
| tree | 057f77351946bda52999aac8d43850da1e048d85 /astro | |
| parent | abf15194c47dd9bb6a1ce60c09076f9552ca176c (diff) | |
| download | ports-f946b44d8a5e42723846558c2a86ba3f54a95535.tar.gz ports-f946b44d8a5e42723846558c2a86ba3f54a95535.zip | |
- Improve Makefile logic: instead of breaking the port when
libboinc_graphics2.a is not found and the X11 option is selected, include
it as a build dependency (which had a hardcoded trigger before).
- Move astro/boinc-setiathome-enhanced (which this port borrows sources from)
to the build dependencies to please Tinderbox, however it fails.
Feature safe: yes
Notes
Notes:
svn path=/head/; revision=268508
Diffstat (limited to 'astro')
| -rw-r--r-- | astro/boinc-astropulse/Makefile | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/astro/boinc-astropulse/Makefile b/astro/boinc-astropulse/Makefile index 338a41c77370..a0983cd4be95 100644 --- a/astro/boinc-astropulse/Makefile +++ b/astro/boinc-astropulse/Makefile @@ -16,10 +16,9 @@ COMMENT= Astropulse for BOINC LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -EXTRACT_DEPENDS=${NONEXISTENT}:${PORTSDIR}/astro/boinc-setiathome-enhanced:patch BUILD_DEPENDS= ${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3 \ - ${LOCALBASE}/include/boinc/std_fixes.h:${PORTSDIR}/net/boinc-client \ - ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash + ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash \ + ${NONEXISTENT}:${PORTSDIR}/astro/boinc-setiathome-enhanced:patch RUN_DEPENDS= boinc_client:${PORTSDIR}/net/boinc-client LIB_DEPENDS= fftw3f:${PORTSDIR}/math/fftw3-float @@ -41,9 +40,7 @@ BOINC_USER?= boinc BOINC_GROUP?= nobody BOINC_HOME?= /var/db/boinc -#.include <bsd.port.options.mk> - -#OPTIONS= X11 "Build screensaver" on +#OPTIONS= X11 "Build screensaver (requires net/boinc-client with X11)" on .include <bsd.port.pre.mk> @@ -53,15 +50,14 @@ BROKEN=Currently Astropulse requires X11 to build .endif .if !defined(WITHOUT_X11) -.if !exists(${LOCALBASE}/lib/libboinc_graphics2.a) -BROKEN=Reinstall net/boinc-client with X11 enabled for screensavers -.endif LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \ xcb.2:${PORTSDIR}/x11/libxcb USE_GL= gl glu glut USE_XORG= ice sm x11 xau xext xi xdamage xdmcp xfixes xmu xt xxf86vm +BUILD_DEPENDS+= ${LOCALBASE}/lib/libboinc_graphics2.a:${PORTSDIR}/net/boinc-client PLIST_SUB+= X11="" .else +BUILD_DEPENDS+= ${LOCALBASE}/include/boinc/std_fixes.h:${PORTSDIR}/net/boinc-client CONFIGURE_ARGS+= --disable-graphics PLIST_SUB+= X11="@comment " .endif |