i3-git: Fix most problems from TODO list

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

Module Name:	pkgsrc-wip
Committed By:	Mateusz Poszwa <old4%o2.pl@localhost>
Pushed By:	f8l
Date:		Mon Nov 7 22:27:03 2016 +0100
Changeset:	59134b726003c4a6bbf428531088c056b020ac01

Modified Files:
	i3-git/Makefile
	i3-git/PLIST
	i3-git/TODO
	i3-git/distinfo
Added Files:
	i3-git/patches/patch-configure.ac

Log Message:
i3-git: Fix most problems from TODO list

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

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

diffstat:
 i3-git/Makefile                   | 24 ++++++------------------
 i3-git/PLIST                      | 11 +++++++++++
 i3-git/TODO                       |  6 +-----
 i3-git/distinfo                   |  2 +-
 i3-git/patches/patch-configure.ac | 17 +++++++++++++++++
 5 files changed, 36 insertions(+), 24 deletions(-)

diffs:
diff --git a/i3-git/Makefile b/i3-git/Makefile
index 32a951b..2b43709 100644
--- a/i3-git/Makefile
+++ b/i3-git/Makefile
@@ -1,8 +1,7 @@
 # $NetBSD: Makefile,v 1.13 2015/11/09 11:05:44 nros Exp $
 #
 
-DISTNAME=	i3-${VERSION}
-VERSION=	4.12
+DISTNAME=	i3-4.12
 CATEGORIES=	wm
 MASTER_SITES=	http://i3wm.org/downloads/
 EXTRACT_SUFX=	.tar.bz2
@@ -21,9 +20,8 @@ GNU_CONFIGURE=	yes
 USE_TOOLS+=	gmake bison lex yacc pkg-config perl
 USE_TOOLS+=	autoconf autoreconf automake
 USE_LANGUAGES=	c99
-#BUILD_TARGET=	all mans
-# XXX put a real compiler triple here
-BUILD_DIRS+=	x86_64--netbsd
+
+BUILD_DIRS+=	${MACHINE_GNU_PLATFORM}
 
 PKG_SYSCONFSUBDIR=	i3
 INSTALLATION_DIRS=	${PKGMANDIR}/man1 share/doc/${PKGBASE}
@@ -32,21 +30,12 @@ EGDIR=		${PREFIX}/share/examples/i3
 CONF_FILES=	${EGDIR}/config ${PKG_SYSCONFDIR}/config
 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}
+MAKE_FLAGS+=	i3confdir=${EGDIR}
 
 REPLACE_PERL+=	i3-dmenu-desktop
 REPLACE_PERL+=	i3-migrate-config-to-v4
 REPLACE_PERL+=	i3-save-tree
 
-SUBST_CLASSES+=		conf
-SUBST_STAGE.conf=	pre-install
-SUBST_MESSAGE.conf=	Change src/i3.mk to install conf files in share/examples
-SUBST_FILES.conf=	src/i3.mk
-SUBST_SED.conf=		-e s,$$\(SYSCONFDIR\),$$\(PREFIX\)/share/examples,g
-
 SUBST_CLASSES+=			fix-paths
 SUBST_STAGE.fix-paths=		pre-install
 SUBST_MESSAGE.fix-paths=	Fixing absolute paths.
@@ -60,9 +49,8 @@ DEPENDS+=	p5-AnyEvent-I3-[0-9]*:../../wip/p5-AnyEvent-I3
 pre-configure:
 	cd ${WRKSRC} && autoreconf -i
 
-#post-install:
-#	${INSTALL_MAN} ${WRKSRC}/man/*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
-#	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 
 .include "../../devel/libev/buildlink3.mk"
 .include "../../devel/yajl/buildlink3.mk"
diff --git a/i3-git/PLIST b/i3-git/PLIST
index b8701fd..021be1c 100644
--- a/i3-git/PLIST
+++ b/i3-git/PLIST
@@ -29,6 +29,17 @@ man/man1/i3.1
 man/man1/i3bar.1
 share/applications/i3.desktop
 share/doc/i3/LICENSE
+share/doc/i3/debugging.html
+share/doc/i3/hacking-howto.html
+share/doc/i3/i3bar-protocol.html
+share/doc/i3/ipc.html
+share/doc/i3/layout-saving.html
+share/doc/i3/lib-i3test-test.html
+share/doc/i3/lib-i3test.html
+share/doc/i3/multi-monitor.html
+share/doc/i3/testsuite.html
+share/doc/i3/userguide.html
+share/doc/i3/wsbar.html
 share/examples/i3/config
 share/examples/i3/config.keycodes
 share/xsessions/i3-with-shmlog.desktop
diff --git a/i3-git/TODO b/i3-git/TODO
index aed2f2d..b536279 100644
--- a/i3-git/TODO
+++ b/i3-git/TODO
@@ -1,5 +1 @@
-Put a real compiler triple into BUILD_DIRS instead of a hardcoded one.
-Resolve the __VA_ARGS__ macro problem.
-Make sure manuals and other auxiliary files are installed.
-Mark the version as non-release properly.
-Clean the makefile. Some parts are no longer needed after move to autotools.
+Make sure i3 reads system-wide configuration from the proper directory
diff --git a/i3-git/distinfo b/i3-git/distinfo
index 80659c1..195a5e6 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) = 2591b31f59b018d0aa65a0ff969a8f47eaaf7664
+SHA1 (patch-configure.ac) = b8b2aa6ce49880d30acaf219050f4e6763b42b96
 SHA1 (patch-src_log.c) = bdcb87df351ad9f4c3346726da8de18732813b8f
diff --git a/i3-git/patches/patch-configure.ac b/i3-git/patches/patch-configure.ac
new file mode 100644
index 0000000..59a981e
--- /dev/null
+++ b/i3-git/patches/patch-configure.ac
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Get the version from autoconf configuration instead of from git
+
+--- configure.ac.orig	2016-11-07 19:55:04.000000000 +0000
++++ configure.ac
+@@ -25,8 +25,8 @@ AX_EXTEND_SRCDIR
+ 
+ AS_IF([test -d ${srcdir}/.git],
+       [
+-        VERSION="$(git describe --tags --abbrev=0)"
+-        I3_VERSION="$(git describe --tags --always) ($(git log --pretty=format:%cd --date=short -n1), branch \\\"$(git describe --tags --always --all | sed s:heads/::)\\\")"
++        VERSION=${PACKAGE_VERSION}
++        I3_VERSION="${PACKAGE_VERSION}-$(git describe --tags --always) ($(git log --pretty=format:%cd --date=short -n1), branch \\\"$(git describe --tags --always --all | sed s:heads/::)\\\")"
+         # Mirrors what libi3/is_debug_build.c does:
+         is_release=$(test $(echo "${I3_VERSION}" | cut -d '(' -f 1 | wc -m) -lt 10 && echo yes || echo no)
+       ],