Date: Fri, 29 Apr 2005 09:37:42 -0400 (EDT) From: "J.R. Oldroyd" <fbsd@opal.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/80456: astro/boinc-setiathome add additional patch to support non-GUI compilation Message-ID: <200504291337.j3TDbgtn013825@linwhf.opal.com> Resent-Message-ID: <200504291340.j3TDe2e5017904@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 80456 >Category: ports >Synopsis: astro/boinc-setiathome add additional patch to support non-GUI compilation >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Apr 29 13:40:02 GMT 2005 >Closed-Date: >Last-Modified: >Originator: J.R. Oldroyd >Release: FreeBSD 6.0-CURRENT i386 >Organization: >Environment: System: FreeBSD linwhf.opal.com 6.0-CURRENT FreeBSD 6.0-CURRENT #79: Wed Apr 13 19:11:55 EDT 2005 jr@linwhf.opal.com:/usr/src-current/sys/i386/compile/LINWHF i386 >Description: When compiling without GUI (using -DWITHOUT_X11), the jpeg library is still required when it isn't actually needed. This patch removes the check that the configure script is making. Notes to committer, this adds "files/patch-configure.ac". >How-To-Repeat: >Fix: diff -ruN /usr/ports/astro/boinc-setiathome/Makefile astro/boinc-setiathome/Makefile --- /usr/ports/astro/boinc-setiathome/Makefile Fri Apr 29 09:23:17 2005 +++ astro/boinc-setiathome/Makefile Fri Apr 29 09:26:01 2005 @@ -7,6 +7,7 @@ PORTNAME= boinc-setiathome PORTVERSION= 4.07.20050218 +PORTREVISION= 1 CATEGORIES= astro MASTER_SITES= http://setiweb.ssl.berkeley.edu/sah/seti_source/nightly/ \ ${MASTER_SITE_LOCAL} @@ -18,13 +19,6 @@ .include <bsd.port.pre.mk> -# Disable GUI on FreeBSD 4.x until -# undefined reference to `boinc_init_graphics' -# is fixed -.if ${OSVERSION} < 500000 -WITHOUT_X11= yes -.endif - # Build with "make -DWITHOUT_X11" if you don't want the boincmgr # GUI management interface or the "screensaver" status displays # from any of the client applications. @@ -32,6 +26,13 @@ # Defining WITHOUT_X11 removes the dependencies on the X11 libs # and the glut and jpeg graphics libs. +# Disable GUI on FreeBSD 4.x until +# undefined reference to `boinc_init_graphics' +# is fixed +.if ${OSVERSION} < 500000 +WITHOUT_X11= yes +.endif + BUILD_DEPENDS+= ${LOCALBASE}/lib/boinc/boinc-client:${PORTSDIR}/net/boinc-client RUN_DEPENDS+= boinc:${PORTSDIR}/net/boinc-client LIB_DEPENDS+= fftw.2:${PORTSDIR}/math/fftw @@ -83,12 +84,12 @@ post-build: ${SED} -e "s:%%SETI_BINARY%%:${SETI_BINARY}:g" \ - < ${FILESDIR}/app_info.xml > ${WRKDIR}/app_info.xml + < ${FILESDIR}/app_info.xml > ${WRKDIR}/app_info.xml ${SED} -e "s:%%SETI_SITE%%:${SETI_SITE}:g" \ - -e "s:%%BOINC_HOME%%:${BOINC_HOME}:g" \ - -e "s:%%BOINC_USER%%:${BOINC_USER}:g" \ - -e "s:%%BOINC_GROUP%%:${BOINC_GROUP}:g" \ - < pkg-install > ${WRKDIR}/pkg-install + -e "s:%%BOINC_HOME%%:${BOINC_HOME}:g" \ + -e "s:%%BOINC_USER%%:${BOINC_USER}:g" \ + -e "s:%%BOINC_GROUP%%:${BOINC_GROUP}:g" \ + < pkg-install > ${WRKDIR}/pkg-install do-install: ${INSTALL_PROGRAM} ${WRKSRC}/client/`${FIND_SETI_BINARY}` ${PREFIX}/lib/boinc/${SETI_BINARY} diff -ruN /usr/ports/astro/boinc-setiathome/files/patch-configure.ac astro/boinc-setiathome/files/patch-configure.ac --- /usr/ports/astro/boinc-setiathome/files/patch-configure.ac Wed Dec 31 19:00:00 1969 +++ astro/boinc-setiathome/files/patch-configure.ac Thu Apr 28 10:48:52 2005 @@ -0,0 +1,11 @@ +--- configure.ac.orig Fri Feb 18 03:00:30 2005 ++++ configure.ac Thu Apr 28 10:47:23 2005 +@@ -154,7 +154,7 @@ + AC_CHECK_LIB([jpeg], [jpeg_start_decompress]) + SAH_CHECK_SETILIB + +-AM_CONDITIONAL(USE_MY_LIBJPEG, [test "${ac_cv_lib_jpeg_jpeg_start_decompress}" != yes]) ++AM_CONDITIONAL(USE_MY_LIBJPEG, [test "${enable_gui}" = yes -a "${ac_cv_lib_jpeg_jpeg_start_decompress}" != yes]) + dnl AC_CHECK_LIB([stdc++], [main]) + + SAH_REQUIRES([boinc],[SAH_CHECK_BOINC],["${no_boinc}" = yes], >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200504291337.j3TDbgtn013825>