summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2015-10-21 03:45:44 -0400
committerMichael Sterrett <mr_bones_@gentoo.org>2015-10-21 03:46:18 -0400
commitcdaf165f0d6d197d8327e05cd97a70f8d135f68f (patch)
treedbcf16f136946874ee8fb40b536827ee726a28f0 /games-misc/opengfx/files
parentapp-emacs/dash: initial import. (diff)
downloadgentoo-cdaf165f0d6d197d8327e05cd97a70f8d135f68f.tar.gz
gentoo-cdaf165f0d6d197d8327e05cd97a70f8d135f68f.tar.bz2
gentoo-cdaf165f0d6d197d8327e05cd97a70f8d135f68f.zip
version bump with Makefile patch update by Lars Wendler (bug #563634)
Package-Manager: portage-2.2.20.1
Diffstat (limited to 'games-misc/opengfx/files')
-rw-r--r--games-misc/opengfx/files/opengfx-0.5.2-Makefile.patch5
-rw-r--r--games-misc/opengfx/files/opengfx-0.5.3-Makefile.patch31
2 files changed, 33 insertions, 3 deletions
diff --git a/games-misc/opengfx/files/opengfx-0.5.2-Makefile.patch b/games-misc/opengfx/files/opengfx-0.5.2-Makefile.patch
index ee301b8190f4..b683500124c3 100644
--- a/games-misc/opengfx/files/opengfx-0.5.2-Makefile.patch
+++ b/games-misc/opengfx/files/opengfx-0.5.2-Makefile.patch
@@ -1,6 +1,5 @@
-diff -ru opengfx-0.5.2-source.orig/Makefile opengfx-0.5.2-source/Makefile
---- opengfx-0.5.2-source.orig/Makefile 2015-04-12 12:57:17.000000000 -0400
-+++ opengfx-0.5.2-source/Makefile 2015-07-28 21:13:46.496708233 -0400
+--- opengfx-0.5.2-source.orig/Makefile
++++ opengfx-0.5.2-source/Makefile
@@ -99,8 +99,8 @@
AWK ?= awk
GREP ?= grep
diff --git a/games-misc/opengfx/files/opengfx-0.5.3-Makefile.patch b/games-misc/opengfx/files/opengfx-0.5.3-Makefile.patch
new file mode 100644
index 000000000000..169df96684ce
--- /dev/null
+++ b/games-misc/opengfx/files/opengfx-0.5.3-Makefile.patch
@@ -0,0 +1,31 @@
+--- opengfx-0.5.3-source/Makefile
++++ opengfx-0.5.3-source/Makefile
+@@ -99,8 +99,8 @@
+ AWK ?= awk
+ GREP ?= grep
+ PYTHON ?= python
+-UNIX2DOS ?= $(shell which unix2dos)
+-UNIX2DOS_FLAGS ?= $(shell [ -n $(UNIX2DOS) ] && $(UNIX2DOS) -q --version 2>/dev/null && echo "-q" || echo "")
++UNIX2DOS ?= $(shell which unix2dos 2>/dev/null)
++UNIX2DOS_FLAGS ?= $(shell [ -n $(UNIX2DOS) ] && $(UNIX2DOS) -q --version 2>/dev/null >&2 && echo "-q" || echo "")
+
+ # Graphics processing
+ GIMP ?= gimp
+@@ -196,7 +196,7 @@
+ endif
+
+ # Days of commit since 2000-1-1 00-00
+-REPO_DAYS_SINCE_2000 ?= $(shell $(PYTHON) -c "from datetime import date; print (date(`echo "$(REPO_DATE)" | sed s/-/,/g | sed s/,0/,/g`)-date(2000,1,1)).days")
++REPO_DAYS_SINCE_2000 ?= $(shell $(PYTHON) -c "from datetime import date; print ((date(`echo "$(REPO_DATE)" | sed s/-/,/g | sed s/,0/,/g`)-date(2000,1,1)).days)")
+
+ # Filename addition, if we're not building the default branch
+ REPO_BRANCH_STRING ?= $(shell if [ "$(REPO_BRANCH)" = "$(DEFAULT_BRANCH_NAME)" ]; then echo ""; else echo "-$(REPO_BRANCH)"; fi)
+@@ -719,7 +719,7 @@
+ $(_E)
+ endif
+ $(_E) "Release:"
+- $(_E) "bananas: Upload bundle to BaNaNaS
++ $(_E) "bananas: Upload bundle to BaNaNaS"
+ $(_E)
+ $(_E) "Valid command line variables are:"
+ $(_E) "Helper programmes:"