From 04f9e2c2a9e4350988cec8a501c287456851b225 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 14 Jun 2018 11:54:47 +0200
Subject: [PATCH] boinc: update to 7.10.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>
---
 .../patches/fix-etc_default_config.patch      | 21 -------------------
 srcpkgs/boinc/patches/musl-no_xlocale_h.patch | 11 ----------
 srcpkgs/boinc/template                        | 17 ++++++++++-----
 3 files changed, 12 insertions(+), 37 deletions(-)
 delete mode 100644 srcpkgs/boinc/patches/fix-etc_default_config.patch
 delete mode 100644 srcpkgs/boinc/patches/musl-no_xlocale_h.patch

diff --git a/srcpkgs/boinc/patches/fix-etc_default_config.patch b/srcpkgs/boinc/patches/fix-etc_default_config.patch
deleted file mode 100644
index e11ab78352..0000000000
--- a/srcpkgs/boinc/patches/fix-etc_default_config.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- client/scripts/Makefile.am	2017-08-28 22:29:59.000000000 +0200
-+++ client/scripts/Makefile.am	2017-09-21 15:09:23.328014033 +0200
-@@ -2,16 +2,5 @@
- 
- install-exec-hook:
- 	chmod +x boinc-client
--	$(INSTALL) -d $(DESTDIR)$(sysconfdir)/init.d
--	$(INSTALL) -b boinc-client $(DESTDIR)$(sysconfdir)/init.d/boinc-client
--	if [ -d /etc/sysconfig ] ; then \
--	  $(INSTALL) -d $(DESTDIR)$(sysconfdir)/sysconfig ; \
--	  $(INSTALL) $(srcdir)/boinc-client.conf $(DESTDIR)$(sysconfdir)/sysconfig/boinc-client ; \
--	elif [ -d /etc/default ] ; then \
--	  $(INSTALL) -d $(DESTDIR)$(sysconfdir)/default ; \
--	  $(INSTALL) $(srcdir)/boinc-client.conf $(DESTDIR)$(sysconfdir)/default/boinc-client ; \
--	else \
--	  $(INSTALL) -d $(DESTDIR)$(sysconfdir) ; \
--	  $(INSTALL) $(srcdir)/boinc-client.conf $(DESTDIR)$(sysconfdir)/boinc-client.conf ; \
--	fi
--
-+	$(INSTALL) -d $(DESTDIR)$(sysconfdir)/default
-+	$(INSTALL) $(srcdir)/boinc-client.conf $(DESTDIR)$(sysconfdir)/default/boinc-client
diff --git a/srcpkgs/boinc/patches/musl-no_xlocale_h.patch b/srcpkgs/boinc/patches/musl-no_xlocale_h.patch
deleted file mode 100644
index b4e16f5c03..0000000000
--- a/srcpkgs/boinc/patches/musl-no_xlocale_h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- clientgui/AsyncRPC.cpp	2015-09-29 11:16:41.000000000 +0200
-+++ clientgui/AsyncRPC.cpp	2015-10-13 16:17:54.313343388 +0200
-@@ -19,7 +19,7 @@
- #pragma implementation "AsyncRPC.h"
- #endif
- 
--#if !(defined(_WIN32) || (defined(__WXMAC__) && (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_4)))
-+#if !(defined(_WIN32) || (defined(__WXMAC__) && (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_4))) && defined(__GLIBC__)
- #include <xlocale.h>
- #endif
- 
diff --git a/srcpkgs/boinc/template b/srcpkgs/boinc/template
index 0e25ece959..43a898e1d5 100644
--- a/srcpkgs/boinc/template
+++ b/srcpkgs/boinc/template
@@ -1,8 +1,9 @@
 # Template file for 'boinc'
 pkgname=boinc
-version=7.8.6
-revision=3
-wrksrc=boinc-client_release-${version%.*}-${version}
+version=7.10.3
+revision=1
+_majorver=${version%.*.*}
+wrksrc=boinc-client_release-${_majorver}-${version}
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config python xorgproto"
 makedepends="glu-devel libfreeglut-devel libcurl-devel
@@ -17,8 +18,8 @@ short_desc="Berkely Infrastructure for Network Computing"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-3.0"
 homepage="https://boinc.berkeley.edu/"
-distfiles="https://github.com/BOINC/boinc/archive/client_release/${version%.*}/${version}.tar.gz>boinc-${version}.tar.gz"
-checksum=ed5f3dcdc8d1cc5277529afb701377e77d1ff89711368a7456553bf249940bad
+distfiles="https://github.com/BOINC/boinc/archive/client_release/${_majorver}/${version}.tar.gz>boinc-${version}.tar.gz"
+checksum=0dd5bafb9e6eced2695c2f47a93d9165643d9132a1cf58fef0e733c4a70ea22c
 conflicts="boinc-nox>=0"
 
 CXXFLAGS="-Wno-redundant-decls"
@@ -93,6 +94,9 @@ do_install() {
 	cd ${wrksrc}/x11
 	make ${makejobs} DESTDIR="${DESTDIR}" install
 
+	vmkdir etc/default
+	mv "${DESTDIR}"/etc/boinc-client.conf "${DESTDIR}"/etc/default/boinc-client
+
 	# Bash completion
 	vinstall ${FILESDIR}/boinc.bash 644 usr/share/bash-completion/completions boinc
 
@@ -122,6 +126,9 @@ boinc-nox_package() {
 		cd ${wrksrc}/nox
 		make ${makejobs} DESTDIR=${PKGDESTDIR} install
 
+		vmkdir etc/default
+		mv "${PKGDESTDIR}"/etc/boinc-client.conf "${PKGDESTDIR}"/etc/default/boinc-client
+
 		# no devel package - no includes, *.a and *.so
 		rm -rf ${PKGDESTDIR}/usr/include
 		rm -f ${PKGDESTDIR}/usr/lib/*.a