diff options
| -rw-r--r-- | astro/boinc-astropulse/Makefile | 40 | ||||
| -rw-r--r-- | astro/boinc-astropulse/files/patch-ap__client__main.cpp | 11 |
2 files changed, 30 insertions, 21 deletions
diff --git a/astro/boinc-astropulse/Makefile b/astro/boinc-astropulse/Makefile index 2771a86a4226..a3e26a0a0cea 100644 --- a/astro/boinc-astropulse/Makefile +++ b/astro/boinc-astropulse/Makefile @@ -31,25 +31,12 @@ BOINC_CLIENT_USER?= boinc BOINC_CLIENT_GROUP?= boinc BOINC_CLIENT_HOME?= /var/db/boinc -OPTIONS_DEFINE= X11 -X11_DESC= Build screensaver (requires net/boinc-client with X11) - -OPTIONS_SUB= yes - -X11_BUILD_DEPENDS= ${LOCALBASE}/lib/libboinc_graphics2.a:net/boinc-client -X11_USES= jpeg -X11_USE= GL=gl,glu,glut \ - XORG=ice,sm,x11,xau,xcb,xext,xi,xdamage,xdmcp,xfixes,xmu,xt,xxf86vm -X11_CONFIGURE_ENABLE= graphics - -X11_BUILD_DEPENDS_OFF= ${LOCALBASE}/include/boinc/std_fixes.h:net/boinc-client - SETI_WORK!= cd ${.CURDIR}/../boinc-setiathome-v7 && ${MAKE} -V WRKSRC -CONFIGURE_ENV+= BOINCDIR="${NONEXISTENT}" \ +CONFIGURE_ENV= BOINCDIR="${NONEXISTENT}" \ BOINC_DIR="${NONEXISTENT}" \ SETI_BOINC_DIR="${SETI_WORK}" -CONFIGURE_ARGS+= --disable-static-client \ - --with-boinc-platform=${ARCH}-portbld-freebsd +CONFIGURE_ARGS= --disable-static-client \ + --with-boinc-platform=${ARCH}-portbld-freebsd SETI_SITE= setiathome.berkeley.edu AP_BINARY= astropulse-${PORTVERSION:S/.0/./}.${ARCH}-portbld-freebsd @@ -61,19 +48,30 @@ SUB_LIST= AP_BINARY=${AP_BINARY} \ BOINC_CLIENT_HOME=${BOINC_CLIENT_HOME} \ BOINC_CLIENT_USER=${BOINC_CLIENT_USER} \ BOINC_CLIENT_GROUP=${BOINC_CLIENT_GROUP} -PLIST_SUB+= AP_BINARY=${AP_BINARY} \ +PLIST_SUB= AP_BINARY=${AP_BINARY} \ SETI_SITE=${SETI_SITE} \ BOINC_CLIENT_HOME=${BOINC_CLIENT_HOME} \ BOINC_CLIENT_USER=${BOINC_CLIENT_USER} \ BOINC_CLIENT_GROUP=${BOINC_CLIENT_GROUP} +OPTIONS_DEFINE= X11 +OPTIONS_SUB= yes + +X11_DESC= Build screensaver (requires net/boinc-client with X11) +X11_BUILD_DEPENDS= ${LOCALBASE}/lib/libboinc_graphics2.a:net/boinc-client +X11_USES= jpeg +X11_USE= GL=gl,glu,glut \ + XORG=ice,sm,x11,xau,xcb,xext,xi,xdamage,xdmcp,xfixes,xmu,xt,xxf86vm +X11_CONFIGURE_ENABLE= graphics +X11_BUILD_DEPENDS_OFF= ${LOCALBASE}/include/boinc/std_fixes.h:net/boinc-client + do-install: - ${INSTALL} -d ${STAGEDIR}${BOINC_CLIENT_HOME}/projects - ${INSTALL} -d ${STAGEDIR}${BOINC_CLIENT_HOME}/projects/${SETI_SITE} + @${MKDIR} ${STAGEDIR}${BOINC_CLIENT_HOME}/projects/${SETI_SITE} ${INSTALL_PROGRAM} ${WRKSRC}/${AP_BINARY} \ - ${STAGEDIR}${BOINC_CLIENT_HOME}/projects/${SETI_SITE}/ + ${STAGEDIR}${BOINC_CLIENT_HOME}/projects/${SETI_SITE}/ + do-install-X11-on: ${INSTALL_PROGRAM} ${WRKSRC}/ap_graphics \ - ${STAGEDIR}${BOINC_CLIENT_HOME}/projects/${SETI_SITE}/ + ${STAGEDIR}${BOINC_CLIENT_HOME}/projects/${SETI_SITE}/ .include <bsd.port.mk> diff --git a/astro/boinc-astropulse/files/patch-ap__client__main.cpp b/astro/boinc-astropulse/files/patch-ap__client__main.cpp index 8c8b3d28a70f..f9910dfc1202 100644 --- a/astro/boinc-astropulse/files/patch-ap__client__main.cpp +++ b/astro/boinc-astropulse/files/patch-ap__client__main.cpp @@ -1,5 +1,16 @@ --- ap_client_main.cpp.orig 2012-08-14 00:07:20 UTC +++ ap_client_main.cpp +@@ -241,7 +241,7 @@ int detect_hit(float *arr, float& total) + * calls to this function. + */ + void updatecputime() { +- int cputicksinterval = abs(clock() - lastcputicks); ++ int cputicksinterval = abs((long)clock() - (long)lastcputicks); + lastcputicks = clock(); + maxcputicksinterval = (maxcputicksinterval > cputicksinterval)?maxcputicksinterval:cputicksinterval; + cputime += ((float)cputicksinterval / (float)CLOCKS_PER_SEC); +--- ap_client_main.cpp.orig 2012-08-14 00:07:20 UTC ++++ ap_client_main.cpp @@ -1288,7 +1288,6 @@ void Science::mainloop() { * used to inform the core client GUI of the % complete. */ |