i3-git: Update a patch

[Mateusz Poszwa <old4%o2.pl@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Mateusz Poszwa <old4%o2.pl@localhost>
Pushed By:	f8l
Date:		Sun Apr 10 22:23:26 2016 +0200
Changeset:	e67aef65c75eed36cb594c77b17411f1c44094bb

Modified Files:
	i3-git/distinfo
	i3-git/patches/patch-common.mk

Log Message:
i3-git: Update a patch

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

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

diffstat:
 i3-git/distinfo                |  2 +-
 i3-git/patches/patch-common.mk | 21 ++++++++-------------
 2 files changed, 9 insertions(+), 14 deletions(-)

diffs:
diff --git a/i3-git/distinfo b/i3-git/distinfo
index dc44c30..4db0872 100644
--- a/i3-git/distinfo
+++ b/i3-git/distinfo
@@ -1,4 +1,4 @@
 $NetBSD: distinfo,v 1.9 2015/11/09 11:05:44 nros Exp $
 
-SHA1 (patch-common.mk) = a9d3fc1a6f242f2ec98b81b8bfdd748925aa4c14
+SHA1 (patch-common.mk) = 219f43cf29b19d43885c17e7b6e203ce05afc2e0
 SHA1 (patch-src_log.c) = 3b70d5be029936e02bb2e5beddf2cd7d6adc7328
diff --git a/i3-git/patches/patch-common.mk b/i3-git/patches/patch-common.mk
index 23ed758..31dd80c 100644
--- a/i3-git/patches/patch-common.mk
+++ b/i3-git/patches/patch-common.mk
@@ -2,19 +2,14 @@ $NetBSD$
 
 Allow setting VERSION and prevent overwriting it.
 
---- common.mk.orig	2016-01-11 23:36:55.000000000 +0000
+--- common.mk.orig	2016-04-10 15:36:19.000000000 +0000
 +++ common.mk
-@@ -20,9 +20,11 @@ endif
- 
- # In dist tarballs, the version is stored in the I3_VERSION and VERSION files.
- I3_VERSION := '$(shell [ -f $(TOPDIR)/I3_VERSION ] && cat $(TOPDIR)/I3_VERSION)'
--VERSION := '$(shell [ -f $(TOPDIR)/VERSION ] && cat $(TOPDIR)/VERSION)'
--ifeq ('',$(I3_VERSION))
-+VERSION ?= '$(shell [ -f $(TOPDIR)/VERSION ] && cat $(TOPDIR)/VERSION)'
-+ifeq ('',$(VERSION))
- VERSION := $(shell git describe --tags --abbrev=0)
-+endif
-+ifeq ('',$(I3_VERSION))
- I3_VERSION := '$(shell git describe --tags --always) ($(shell git log --pretty=format:%cd --date=short -n1), branch \"$(shell git describe --tags --always --all | sed s:heads/::)\")'
+@@ -24,7 +24,7 @@ ifeq ($(wildcard .git),)
+   VERSION := '$(shell [ -f $(TOPDIR)/VERSION ] && cat $(TOPDIR)/VERSION)'
+   I3_VERSION := '$(shell [ -f $(TOPDIR)/I3_VERSION ] && cat $(TOPDIR)/I3_VERSION)'
+ else
+-  VERSION := $(shell git describe --tags --abbrev=0)
++  VERSION ?= $(shell git describe --tags --abbrev=0)
+   I3_VERSION := '$(shell git describe --tags --always) ($(shell git log --pretty=format:%cd --date=short -n1), branch \"$(shell git describe --tags --always --all | sed s:heads/::)\")'
  endif