pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

boinc-git: Avoid depending on bash.



Module Name:	pkgsrc-wip
Committed By:	Mateusz Poszwa <old4%o2.pl@localhost>
Pushed By:	f8l
Date:		Sun Feb 28 19:29:37 2016 +0100
Changeset:	5528c1f2d401130b4ba7bd1e9c08d3c7e2f77fb2

Modified Files:
	boinc-git/TODO
	boinc-git/distinfo
Added Files:
	boinc-git/patches/patch-__autosetup

Log Message:
boinc-git: Avoid depending on bash.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5528c1f2d401130b4ba7bd1e9c08d3c7e2f77fb2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 boinc-git/TODO                      |  1 +
 boinc-git/distinfo                  |  1 +
 boinc-git/patches/patch-__autosetup | 72 +++++++++++++++++++++++++++++++++++++
 3 files changed, 74 insertions(+)

diffs:
diff --git a/boinc-git/TODO b/boinc-git/TODO
index 54abaff..0825217 100644
--- a/boinc-git/TODO
+++ b/boinc-git/TODO
@@ -1,2 +1,3 @@
 Read _autosetup and add version checks.
 Build GUI client, possibly as a separate package.
+ Make sure wxGTK30 is compiled with wxWebView.
diff --git a/boinc-git/distinfo b/boinc-git/distinfo
index 8299823..4152171 100644
--- a/boinc-git/distinfo
+++ b/boinc-git/distinfo
@@ -1,5 +1,6 @@
 $NetBSD$
 
+SHA1 (patch-__autosetup) = 5622141a87696d5d48bf6c011206c84a7f43afa1
 SHA1 (patch-client_scripts_boinc-client.in) = f8adeab7c51783106e8784e4712b20aa5d1fcfae
 SHA1 (patch-configure.ac) = 9173c44906200c0e0a48b7193f0acb5640ca998c
 SHA1 (patch-lib_diagnostics.cpp) = 512ec177f6dce8785ba9c4061ac74a6edd1fa3d7
diff --git a/boinc-git/patches/patch-__autosetup b/boinc-git/patches/patch-__autosetup
new file mode 100644
index 0000000..edd3795
--- /dev/null
+++ b/boinc-git/patches/patch-__autosetup
@@ -0,0 +1,72 @@
+$NetBSD$
+
+Avoid using bash when unnecessary. See: https://github.com/BOINC/boinc/pull/1498
+
+--- _autosetup.orig	2016-02-28 18:46:38.000000000 +0100
++++ _autosetup	2016-02-28 19:08:31.606647270 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ ## $Id$
+ 
+ ## ---------- some portability checks/adjustments [stolen from configure] ----------
+@@ -12,7 +12,8 @@ esac
+ ##----------
+ 
+ ## ----------------------------------------------------------------------
+-## Check that given command $1 has version >= $2.$3
++## Check that given command $1 has version >= $2
++## Full path $3 may be specified in order to skip command search.
+ ## return 0 if ok, 1 too old or not found  (-> shell conventions).
+ ## ----------------------------------------------------------------------
+ check_version()
+@@ -24,12 +25,7 @@ check_version()
+     desired=`echo $2 | awk -F. '{print $1*100+$2}'`
+     echo $ECHO_N "Checking version of '$1' >= $desired... $ECHO_C"
+     name=$1
+-    app_var_name=`echo $name | tr '[:lower:]-' '[:upper:]_'`
+-    if [ ! -z ${!app_var_name+x} ]; then
+-        name=${!app_var_name}
+-    fi
+-
+-    fullpath=`type $name | awk '{ print $(NF) }'`;
++    fullpath=${3:-`command -v "$name"`};
+     if [ -x "$fullpath" ]; then
+         foundit=yes;
+     fi
+@@ -78,7 +74,7 @@ check_version()
+   if check_version make 3.79; then
+       echo >/dev/null
+   else
+-      if check_version gmake 3.79; then
++      if check_version gmake 3.79 "$MAKE"; then
+           have_gmake=yes;
+       else
+         echo "Couldn't find a new-enough version of GNU 'make', please install one!";
+@@ -95,7 +91,7 @@ check_version()
+       if test -f /usr/ccs/bin/m4
+       then
+          echo >/dev/null
+-      elif check_version gm4 1.4; then
++      elif check_version gm4 1.4 "$M4"; then
+          have_gm4=yes;
+       else
+          echo "Couldn't find a new-enough version of 'm4', please install one!";
+@@ -120,7 +116,7 @@ check_version()
+       exit 1;
+       # build_lsc_aux "autoconf-2.59"
+   fi
+-  if check_version automake 1.8; then
++  if check_version automake 1.8 "$AUTOMAKE"; then
+       echo >/dev/null
+   else
+       echo "Couldn't find a new-enough version of 'automake', please install one!";
+@@ -128,7 +124,7 @@ check_version()
+       exit 1;
+       # build_lsc_aux "automake-1.8.5"
+   fi
+-  if check_version libtoolize 1.5; then
++  if check_version libtoolize 1.5 "$LIBTOOLIZE"; then
+       echo >/dev/null
+   else
+       echo "Couldn't find a new-enough version of 'libtoolize', please install one!";


Home | Main Index | Thread Index | Old Index