13 files changed, 22 insertions, 10 deletions

diff --git a/astro/Makefile b/astro/Makefile
index 3dcf68249659..93decd0bd49a 100644
--- a/astro/Makefile
+++ b/astro/Makefile
@@ -7,7 +7,7 @@
     SUBDIR += accrete
     SUBDIR += astrometry
     SUBDIR += boinc-astropulse
-    SUBDIR += boinc-setiathome-v8
+    SUBDIR += boinc-setiathome
     SUBDIR += celestia
     SUBDIR += celestia-gnome
     SUBDIR += celestia-gtk
diff --git a/astro/boinc-astropulse/Makefile b/astro/boinc-astropulse/Makefile
index cc465e78b947..57e0fa07f04a 100644
--- a/astro/boinc-astropulse/Makefile
+++ b/astro/boinc-astropulse/Makefile
@@ -15,7 +15,7 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:math/fftw3 \
-		${NONEXISTENT}:astro/boinc-setiathome-v8:patch
+		${NONEXISTENT}:astro/boinc-setiathome:patch
 RUN_DEPENDS=	boinc_client:net/boinc-client
 LIB_DEPENDS=	libfftw3f.so:math/fftw3-float
 
@@ -26,14 +26,14 @@ USES=		autoreconf gmake libtool pkgconfig tar:xz
 WRKSRC_SUBDIR=		client
 
 CPPFLAGS+=	-I${LOCALBASE}/include/boinc -I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib -lexecinfo
 
 # these must match settings in ${PORTSDIR}/net/boinc-client/Makefile
 BOINC_CLIENT_USER?=	boinc
 BOINC_CLIENT_GROUP?=	boinc
 BOINC_CLIENT_HOME?=	/var/db/boinc
 
-SETI_WORK!=	cd ${.CURDIR}/../boinc-setiathome-v8 && ${MAKE} -V WRKSRC
+SETI_WORK!=	cd ${.CURDIR}/../boinc-setiathome && ${MAKE} -V WRKSRC
 CONFIGURE_ENV=	BOINCDIR="${NONEXISTENT}" \
 		BOINC_DIR="${NONEXISTENT}" \
 		SETI_BOINC_DIR="${SETI_WORK}"
diff --git a/astro/boinc-setiathome-v8/distinfo b/astro/boinc-setiathome-v8/distinfo
deleted file mode 100644
index 3faee7c21c5f..000000000000
--- a/astro/boinc-setiathome-v8/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1515965298
-SHA256 (setiathome-svn-3725.tar.xz) = 78747ec516b122c681024d668a113e3bc72b2c0033b9de39c4933423f0821c57
-SIZE (setiathome-svn-3725.tar.xz) = 12548856
diff --git a/astro/boinc-setiathome-v8/Makefile b/astro/boinc-setiathome/Makefile
index e6e146599996..df06c05fb3b2 100644
--- a/astro/boinc-setiathome-v8/Makefile
+++ b/astro/boinc-setiathome/Makefile
@@ -3,9 +3,10 @@
 
 PORTNAME=	boinc-setiathome-v8
 PORTVERSION=	8.00
+PORTREVISION=	1
 CATEGORIES=	astro
 MASTER_SITES=	LOCAL/ler/setiathome
-DISTNAME=	setiathome-svn-3725  # no releases available, snapshot
+DISTNAME=	setiathome-svn-3727  # no releases available, snapshot
 
 MAINTAINER=	ler@FreeBSD.org
 COMMENT=	Setiathome Enhanced for BOINC
diff --git a/astro/boinc-setiathome/distinfo b/astro/boinc-setiathome/distinfo
new file mode 100644
index 000000000000..6cb15d1c991c
--- /dev/null
+++ b/astro/boinc-setiathome/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1515972172
+SHA256 (setiathome-svn-3727.tar.xz) = 81a49b8ca14286aa3822dcf47bf3fb82f679c0363e06c5e42b77f84056b671b0
+SIZE (setiathome-svn-3727.tar.xz) = 7234424
diff --git a/astro/boinc-setiathome-v8/files/patch-client_vector_hires__timer.cpp b/astro/boinc-setiathome/files/patch-client_vector_hires__timer.cpp
index aa82e831fb89..649f0d9b2841 100644
--- a/astro/boinc-setiathome-v8/files/patch-client_vector_hires__timer.cpp
+++ b/astro/boinc-setiathome/files/patch-client_vector_hires__timer.cpp
@@ -1,4 +1,4 @@
---- client/vector/hires_timer.cpp.orig	2018-01-14 21:26:29 UTC
+--- client/vector/hires_timer.cpp.orig	2018-01-14 23:02:12 UTC
 +++ client/vector/hires_timer.cpp
 @@ -267,7 +267,7 @@ hires_timer::hires_timer() : rollover(0),last_ticks(0)
  #endif
diff --git a/astro/boinc-setiathome-v8/files/patch-client_vector_sighandler.h b/astro/boinc-setiathome/files/patch-client_vector_sighandler.h
index 742230dd48fb..eab1affbb579 100644
--- a/astro/boinc-setiathome-v8/files/patch-client_vector_sighandler.h
+++ b/astro/boinc-setiathome/files/patch-client_vector_sighandler.h
@@ -1,4 +1,4 @@
---- client/vector/sighandler.h.orig	2018-01-14 21:49:26 UTC
+--- client/vector/sighandler.h.orig	2018-01-14 23:02:12 UTC
 +++ client/vector/sighandler.h
 @@ -44,6 +44,7 @@
  #define SIGHANDLER_H
diff --git a/astro/boinc-setiathome/files/patch-sah__config.h b/astro/boinc-setiathome/files/patch-sah__config.h
new file mode 100644
index 000000000000..1cdb029c4141
--- /dev/null
+++ b/astro/boinc-setiathome/files/patch-sah__config.h
@@ -0,0 +1,11 @@
+--- sah_config.h.orig	2018-01-14 23:23:42 UTC
++++ sah_config.h
+@@ -774,7 +774,7 @@
+ #endif
+ 
+ #if !defined(CUSTOM_STRING) && defined(COMPILER_STRING)
+-#define CUSTOM_STRING PACKAGE_STRING" "SVN_REV" "COMPILER_STRING
++#define CUSTOM_STRING PACKAGE_STRING" " SVN_REV" " COMPILER_STRING
+ #endif
+ 
+ #include "std_fixes.h"
diff --git a/astro/boinc-setiathome-v8/files/pkg-deinstall.in b/astro/boinc-setiathome/files/pkg-deinstall.in
index c2b6d27a0ca7..c2b6d27a0ca7 100644
--- a/astro/boinc-setiathome-v8/files/pkg-deinstall.in
+++ b/astro/boinc-setiathome/files/pkg-deinstall.in
diff --git a/astro/boinc-setiathome-v8/files/pkg-install.in b/astro/boinc-setiathome/files/pkg-install.in
index b2b6d8566951..b2b6d8566951 100644
--- a/astro/boinc-setiathome-v8/files/pkg-install.in
+++ b/astro/boinc-setiathome/files/pkg-install.in
diff --git a/astro/boinc-setiathome-v8/files/pkg-message.in b/astro/boinc-setiathome/files/pkg-message.in
index ef9093d931f6..ef9093d931f6 100644
--- a/astro/boinc-setiathome-v8/files/pkg-message.in
+++ b/astro/boinc-setiathome/files/pkg-message.in
diff --git a/astro/boinc-setiathome-v8/pkg-descr b/astro/boinc-setiathome/pkg-descr
index f80ebcb83b31..f80ebcb83b31 100644
--- a/astro/boinc-setiathome-v8/pkg-descr
+++ b/astro/boinc-setiathome/pkg-descr
diff --git a/astro/boinc-setiathome-v8/pkg-plist b/astro/boinc-setiathome/pkg-plist
index 7d92c1fa29a9..7d92c1fa29a9 100644
--- a/astro/boinc-setiathome-v8/pkg-plist
+++ b/astro/boinc-setiathome/pkg-plist