svn commit: r429586 - in head/astro/boinc-astropulse: . files

[Dmitry Marakasov]

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 <bsd.port.mk>

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.
                 */