From owner-svn-ports-all@freebsd.org Tue Dec 27 09:25:31 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C2342C9262D; Tue, 27 Dec 2016 09:25:31 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9C907190C; Tue, 27 Dec 2016 09:25:31 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBR9PUnp005630; Tue, 27 Dec 2016 09:25:30 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBR9PUvp005628; Tue, 27 Dec 2016 09:25:30 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201612270925.uBR9PUvp005628@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 27 Dec 2016 09:25:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r429586 - in head/astro/boinc-astropulse: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Dec 2016 09:25:31 -0000 Author: amdmi3 Date: Tue Dec 27 09:25:30 2016 New Revision: 429586 URL: https://svnweb.freebsd.org/changeset/ports/429586 Log: - Fix build on 11+ - Cosmetic fixes Modified: head/astro/boinc-astropulse/Makefile head/astro/boinc-astropulse/files/patch-ap__client__main.cpp Modified: head/astro/boinc-astropulse/Makefile ============================================================================== --- head/astro/boinc-astropulse/Makefile Tue Dec 27 09:01:03 2016 (r429585) +++ head/astro/boinc-astropulse/Makefile Tue Dec 27 09:25:30 2016 (r429586) @@ -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 Modified: head/astro/boinc-astropulse/files/patch-ap__client__main.cpp ============================================================================== --- head/astro/boinc-astropulse/files/patch-ap__client__main.cpp Tue Dec 27 09:01:03 2016 (r429585) +++ head/astro/boinc-astropulse/files/patch-ap__client__main.cpp Tue Dec 27 09:25:30 2016 (r429586) @@ -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. */