From 656e8a201ba6e2c26e3cd20d0a4b7c6700037aad Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 11 Jan 2016 10:40:31 +0100 Subject: [PATCH] boinc: remove service/conf; those shouldn't be handled by xbps. --- srcpkgs/boinc/files/boinc/conf | 5 ----- srcpkgs/boinc/files/boinc/run | 4 ++++ srcpkgs/boinc/template | 3 ++- 3 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 srcpkgs/boinc/files/boinc/conf diff --git a/srcpkgs/boinc/files/boinc/conf b/srcpkgs/boinc/files/boinc/conf deleted file mode 100644 index 7a6ad535c70..00000000000 --- a/srcpkgs/boinc/files/boinc/conf +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -# Read default configuration -[ -f /etc/default/boinc-client ] && . /etc/default/boinc-client -# Override with global configuration -[ -f /etc/boinc-client.conf ] && . /etc/boinc-client.conf diff --git a/srcpkgs/boinc/files/boinc/run b/srcpkgs/boinc/files/boinc/run index d6d42393cc7..1e744a818f8 100644 --- a/srcpkgs/boinc/files/boinc/run +++ b/srcpkgs/boinc/files/boinc/run @@ -1,5 +1,9 @@ #!/bin/sh [ -r conf ] && . ./conf +# Read default configuration +[ -f /etc/default/boinc-client ] && . /etc/default/boinc-client +# Override with global configuration +[ -f /etc/boinc-client.conf ] && . /etc/boinc-client.conf BOINCEXE_NAME=${BOINCEXE_NAME:-boinc_client} BOINCCMD_NAME=${BOINCCMD_NAME:-boinccmd} BOINCUSER=${BOINCUSER:-boinc} diff --git a/srcpkgs/boinc/template b/srcpkgs/boinc/template index 6ccebf83994..4132038c76d 100644 --- a/srcpkgs/boinc/template +++ b/srcpkgs/boinc/template @@ -1,7 +1,7 @@ # Template file for 'boinc' pkgname=boinc version=7.6.22 -revision=1 +revision=2 wrksrc=boinc-client_release-${version%.*}-${version} build_style=gnu-configure hostmakedepends="automake libtool pkg-config python" @@ -21,6 +21,7 @@ checksum=b5b2b211725bc46399d3504bd6b0b60a9f9506d9f6b5a04d524991f239c16585 conflicts="boinc-nox>=0" CXXFLAGS="-Wno-redundant-decls" + pre_configure() { autoreconf -if }