i3-git: Convert to git-package.

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

Module Name:	pkgsrc-wip
Committed By:	Mateusz Poszwa <old4%o2.pl@localhost>
Pushed By:	f8l
Date:		Tue Feb 9 16:56:04 2016 +0100
Changeset:	11d0fa84bfd0605ef22429db47164b92fac9549b

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

Log Message:
i3-git: Convert to git-package.

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

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

diffstat:
 i3-git/Makefile                | 11 ++++++++++-
 i3-git/distinfo                |  5 +----
 i3-git/patches/patch-common.mk | 20 ++++++++++++++++++++
 3 files changed, 31 insertions(+), 5 deletions(-)

diffs:
diff --git a/i3-git/Makefile b/i3-git/Makefile
index fcaac4f..c547f5a 100644
--- a/i3-git/Makefile
+++ b/i3-git/Makefile
@@ -1,11 +1,17 @@
 # $NetBSD: Makefile,v 1.13 2015/11/09 11:05:44 nros Exp $
 #
 
-DISTNAME=	i3-4.11
+DISTNAME=	i3-${VERSION}
+VERSION=	4.11
 CATEGORIES=	wm
 MASTER_SITES=	http://i3wm.org/downloads/
 EXTRACT_SUFX=	.tar.bz2
 
+GIT_REPOSITORIES=	i3
+GIT_REPO.i3=	https://github.com/i3/i3.git
+GIT_BRANCH.i3=	next
+WRKSRC= ${WRKDIR}/i3
+
 MAINTAINER=	tonnerre%NetBSD.org@localhost
 HOMEPAGE=	http://i3wm.org/
 COMMENT=	Improved dynamic tiling window manager
@@ -25,6 +31,7 @@ CONF_FILES+=	${EGDIR}/config.keycodes ${PKG_SYSCONFDIR}/config.keycodes
 MAKE_ENV+=	SYSCONFDIR=${PKG_SYSCONFDIR:C/\/i3//}
 MAKE_ENV+=	DEBUG=0
 MAKE_ENV+=	SHM_SUPPORT=0
+MAKE_ENV+=	VERSION=${VERSION}
 
 REPLACE_PERL+=	i3-dmenu-desktop
 REPLACE_PERL+=	i3-migrate-config-to-v4 
@@ -55,4 +62,6 @@ post-install:
 .include "../../x11/libXcursor/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../wip/mk/git-package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/i3-git/distinfo b/i3-git/distinfo
index 7f165f4..af99f3f 100644
--- a/i3-git/distinfo
+++ b/i3-git/distinfo
@@ -1,9 +1,6 @@
 $NetBSD: distinfo,v 1.9 2015/11/09 11:05:44 nros Exp $
 
-SHA1 (i3-4.11.tar.bz2) = 85d04492214bd26c2804dfa83c979fda54b51c08
-RMD160 (i3-4.11.tar.bz2) = afdc6ef9708e797870b4c6c4dedc3b289a7b7d9c
-SHA512 (i3-4.11.tar.bz2) = 76d45be9006973dd4093fd21ea1c83742b7977c7698e133ce8f9e7826d97d1631fbe6c3ea4a7eb3d989027f98e12738158e72ec450b0df3dddd28f912ff49a4f
-Size (i3-4.11.tar.bz2) = 972929 bytes
 SHA1 (patch-Makefile) = 919f0e87efa951bde531b9172b74589d3e1c474a
 SHA1 (patch-src_log.c) = 75ac4d0681d114e0343ddb015292c6c8ee81c1ae
 SHA1 (patch-src_main.c) = c03fcb12d404fcdfd14c1892b771ee0c7a86b39d
+SHA1 (patch-common.mk) = a9d3fc1a6f242f2ec98b81b8bfdd748925aa4c14
diff --git a/i3-git/patches/patch-common.mk b/i3-git/patches/patch-common.mk
new file mode 100644
index 0000000..23ed758
--- /dev/null
+++ b/i3-git/patches/patch-common.mk
@@ -0,0 +1,20 @@
+$NetBSD$
+
+Allow setting VERSION and prevent overwriting it.
+
+--- common.mk.orig	2016-01-11 23:36:55.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/::)\")'
+ endif
+