3 files changed, 44 insertions, 33 deletions

diff --git a/net/boinc-client/Makefile b/net/boinc-client/Makefile
index a80735c2f564..733ae39e4dcb 100644
--- a/net/boinc-client/Makefile
+++ b/net/boinc-client/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	boinc-client
-PORTVERSION=	6.2.14
+PORTVERSION=	6.4.5
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	pav
@@ -65,18 +65,23 @@ USE_LINUX=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|gui_rpc_auth.cfg|${BOINC_HOME}/gui_rpc_auth.cfg|g' \
-		${WRKSRC}/client/file_names.h ${WRKSRC}/lib/boinc_cmd.C \
+		${WRKSRC}/client/file_names.h ${WRKSRC}/lib/boinc_cmd.cpp \
 		${WRKSRC}/clientgui/MainDocument.cpp
 	@${REINPLACE_CMD} -e 's|../curl/ca-bundle.crt||' ${WRKSRC}/client/Makefile.in
-	@${REINPLACE_CMD} -e 's|ca-bundle.crt|${LOCALBASE}/share/curl/curl-ca-bundle.crt|' ${WRKSRC}/client/http_curl.C
+	@${REINPLACE_CMD} -e 's|ca-bundle.crt|${LOCALBASE}/share/curl/curl-ca-bundle.crt|' ${WRKSRC}/client/file_names.h
 	@${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|' ${WRKSRC}/clientgui/stdwx.h
+	@${REINPLACE_CMD} -e 's| install-dist_pkgdataDATA||' ${WRKSRC}/clientgui/res/Makefile.in
+	@${REINPLACE_CMD} -e 's|boincmgr.16x16.png boincmgr.32x32.png boincmgr.48x48.png||' ${WRKSRC}/clientgui/res/Makefile.in
+	@${REINPLACE_CMD} -e 's|client/scripts||' ${WRKSRC}/Makefile.in
 
 # kill -O3 from clientgui build, it triggers some optimization bug and segfaults on runtime with -O3
 post-configure:
 	@${REINPLACE_CMD} -e 's|-O3 ||' ${WRKSRC}/clientgui/Makefile
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/version.h ${PREFIX}/include/BOINC
+.for file in boinc_gl graphics_api graphics_data reduce
+	${INSTALL_DATA} ${WRKSRC}/api/${file}.h ${PREFIX}/include/boinc/
+.endfor
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.post.mk>
diff --git a/net/boinc-client/distinfo b/net/boinc-client/distinfo
index 7f48e5577ac1..bd93e8e99e08 100644
--- a/net/boinc-client/distinfo
+++ b/net/boinc-client/distinfo
@@ -1,3 +1,3 @@
-MD5 (boinc-client-6.2.14.tar.bz2) = 547b704a2f393b4d75277270975bf322
-SHA256 (boinc-client-6.2.14.tar.bz2) = 20639ebaf4173d0fe7fa988fea368e540a0b4c7dd2ee25a46f36de6ce112008e
-SIZE (boinc-client-6.2.14.tar.bz2) = 4246362
+MD5 (boinc-client-6.4.5.tar.bz2) = 326899f3a09c019f1b4820de174220b8
+SHA256 (boinc-client-6.4.5.tar.bz2) = 057307b0ffbc0ce35c4240271e912b513fa0edfb4928d83038b30d8402f9b1f4
+SIZE (boinc-client-6.4.5.tar.bz2) = 4448407
diff --git a/net/boinc-client/pkg-plist b/net/boinc-client/pkg-plist
index adb0c31b7170..d0499175f882 100644
--- a/net/boinc-client/pkg-plist
+++ b/net/boinc-client/pkg-plist
@@ -3,36 +3,42 @@ bin/boinc_cmd
 bin/crypt_prog
 bin/switcher
 %%BOINC_GUI%%bin/boinc_gui
-include/BOINC/app_ipc.h
-include/BOINC/boinc_api.h
-include/BOINC/boinc_win.h
-include/BOINC/boinc_zip.h
-include/BOINC/common_defs.h
-include/BOINC/config.h
-include/BOINC/coproc.h
-include/BOINC/crypt.h
-include/BOINC/diagnostics.h
-include/BOINC/error_numbers.h
-include/BOINC/filesys.h
-include/BOINC/graphics2.h
-include/BOINC/gui_rpc_client.h
-include/BOINC/gutil.h
-include/BOINC/hostinfo.h
-include/BOINC/mfile.h
-include/BOINC/miofile.h
-include/BOINC/msg_log.h
-include/BOINC/parse.h
-include/BOINC/prefs.h
-include/BOINC/proxy_info.h
-include/BOINC/std_fixes.h
-include/BOINC/str_util.h
-include/BOINC/version.h
-include/BOINC/util.h
+include/boinc/app_ipc.h
+include/boinc/boinc_api.h
+include/boinc/boinc_fcgi.h
+include/boinc/boinc_gl.h
+include/boinc/boinc_win.h
+include/boinc/boinc_zip.h
+include/boinc/common_defs.h
+include/boinc/config.h
+include/boinc/coproc.h
+include/boinc/crypt.h
+include/boinc/diagnostics.h
+include/boinc/error_numbers.h
+include/boinc/filesys.h
+include/boinc/graphics2.h
+include/boinc/graphics_api.h
+include/boinc/graphics_data.h
+include/boinc/gui_rpc_client.h
+include/boinc/gutil.h
+include/boinc/hostinfo.h
+include/boinc/mac_address.h
+include/boinc/mfile.h
+include/boinc/miofile.h
+include/boinc/msg_log.h
+include/boinc/parse.h
+include/boinc/prefs.h
+include/boinc/proxy_info.h
+include/boinc/reduce.h
+include/boinc/std_fixes.h
+include/boinc/str_util.h
+include/boinc/version.h
+include/boinc/util.h
 lib/libboinc.a
 lib/libboinc_api.a
 %%BOINC_GUI%%lib/libboinc_graphics2.a
 lib/libboinc_zip.a
-@dirrm include/BOINC
+@dirrm include/boinc
 @unexec if [ -d %%BOINC_HOME%% ]; then echo "If you are deinstalling boinc completely, remove the %%BOINC_HOME%% directory."; fi
 @unexec if [ -d %%BOINC_HOME%% ]; then echo -n "Also, d"; else echo -n "D"; fi
 @unexec echo "on't forget to remove the \"%%BOINC_USER%%\" user."