pkgsrc-WIP-changes archive

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

0ad: Use gmake on NetBSD



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sat Jul 30 12:10:57 2016 +0200
Changeset:	c4311e279635df38643aec5a652c567c186374bf

Modified Files:
	0ad/distinfo
	0ad/patches/patch-build_workspaces_update-workspaces.sh

Log Message:
0ad: Use gmake on NetBSD

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

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

diffstat:
 0ad/distinfo                                            |  2 +-
 0ad/patches/patch-build_workspaces_update-workspaces.sh | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diffs:
diff --git a/0ad/distinfo b/0ad/distinfo
index 4923e67..48f8e4f 100644
--- a/0ad/distinfo
+++ b/0ad/distinfo
@@ -6,7 +6,7 @@ SHA512 (0ad-0.0.20-alpha-unix-build.tar.xz) = 786f92b74c2e0c64c07ef2f5578dcb5c75
 Size (0ad-0.0.20-alpha-unix-build.tar.xz) = 25610932 bytes
 SHA1 (patch-build_premake_extern__libs4.lua) = dfdbce501c9506ebfe9be2a5bdf30f5f7cdbb86b
 SHA1 (patch-build_workspaces_clean-workspaces.sh) = fed7e867eb8e24e37860599269f9feb4d30c5a43
-SHA1 (patch-build_workspaces_update-workspaces.sh) = 26093813799b24ec86e91b1d51e8a6d1c9922087
+SHA1 (patch-build_workspaces_update-workspaces.sh) = 3e92f823e3204451522055a5f4cd2ee1d5819b2f
 SHA1 (patch-libraries_source_fcollada_include_FCDocument_FCDocument.h) = 9f60871e9f05784b10ba97efffe756ece473f9b2
 SHA1 (patch-libraries_source_fcollada_include_FUtils_FUCriticalSection.h) = 1ece7ae54c07515fdbca12f71c97add7c9e496e1
 SHA1 (patch-libraries_source_fcollada_include_FUtils_Platforms.h) = 32308e3fe673903b4b1a17c364840818136411b9
diff --git a/0ad/patches/patch-build_workspaces_update-workspaces.sh b/0ad/patches/patch-build_workspaces_update-workspaces.sh
index fa50ea6..5c0f201 100644
--- a/0ad/patches/patch-build_workspaces_update-workspaces.sh
+++ b/0ad/patches/patch-build_workspaces_update-workspaces.sh
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- build/workspaces/update-workspaces.sh.orig	2016-07-29 19:33:02.688237533 +0000
+--- build/workspaces/update-workspaces.sh.orig	2015-06-14 20:43:12.000000000 +0000
 +++ build/workspaces/update-workspaces.sh
 @@ -1,10 +1,5 @@
  #!/bin/sh
@@ -13,3 +13,12 @@ $NetBSD$
  die()
  {
    echo ERROR: $*
+@@ -26,7 +21,7 @@ JOBS=${JOBS:="-j2"}
+ # Some of our makefiles depend on GNU make, so we set some sane defaults if MAKE
+ # is not set.
+ case "`uname -s`" in
+-  "FreeBSD" | "OpenBSD" )
++  "FreeBSD" | "NetBSD" | "OpenBSD" )
+     MAKE=${MAKE:="gmake"}
+     ;;
+   * )


Home | Main Index | Thread Index | Old Index