i3status: Improve handling MANDIR

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Tue Jun 14 08:28:59 2016 +0200
Changeset:	fd6aa8e541c14e8be81a158cdb4784828bd5ab95

Modified Files:
	i3status/Makefile
	i3status/distinfo
	i3status/patches/patch-Makefile

Log Message:
i3status: Improve handling MANDIR

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

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

diffstat:
 i3status/Makefile               |  2 +-
 i3status/distinfo               |  2 +-
 i3status/patches/patch-Makefile | 16 +++++++++++++---
 3 files changed, 15 insertions(+), 5 deletions(-)

diffs:
diff --git a/i3status/Makefile b/i3status/Makefile
index 34cd924..fbc8d1e 100644
--- a/i3status/Makefile
+++ b/i3status/Makefile
@@ -15,7 +15,7 @@ USE_TOOLS+=	gmake
 
 CONF_FILES=	${PREFIX}/share/examples/${PKGBASE}/i3status.conf ${PKG_SYSCONFDIR}/i3status.conf
 
-MAKE_ENV+=	MANPREFIX=${PREFIX}/${PKGMANDIR}
+MAKE_ENV+=	MANDIR=${PKGMANDIR}
 MAKE_ENV+=	SYSCONFDIR=${PKG_SYSCONFDIR}
 MAKE_ENV+=	DEBUG=0
 
diff --git a/i3status/distinfo b/i3status/distinfo
index 21a1bad..2e18f48 100644
--- a/i3status/distinfo
+++ b/i3status/distinfo
@@ -4,6 +4,6 @@ SHA1 (i3status-2.10.tar.bz2) = b0bfcac24c9e57958eefd9c3b00aed4b73b2c708
 RMD160 (i3status-2.10.tar.bz2) = 78a2d26aea8d59e8b8e9f7a302e28688bd9ae516
 SHA512 (i3status-2.10.tar.bz2) = a514331d83458de15b548686d423b38a7a9198a7a31ca3001f3f136e4b873617c397a0073bb10b44fa8613bc12ed4fa4e384d099d31122a8afbd0df5de2e9c85
 Size (i3status-2.10.tar.bz2) = 53684 bytes
-SHA1 (patch-Makefile) = 606d4bb7a0b67ae8e225c606bd44299745dd33f8
+SHA1 (patch-Makefile) = 2ca0cf79670e189a7e70e14247b1cd4aafb81ffd
 SHA1 (patch-src_print__disk__info.c) = e0662f65b21402e60a643374898707f5807077f2
 SHA1 (patch-src_print__wireless__info.c) = 4632c9eabd5b5d73bc67e541bf7dc93e883339d1
diff --git a/i3status/patches/patch-Makefile b/i3status/patches/patch-Makefile
index 21820c9..6c23f90 100644
--- a/i3status/patches/patch-Makefile
+++ b/i3status/patches/patch-Makefile
@@ -4,7 +4,17 @@ Adjust paths and install LICENSE.
 
 --- Makefile.orig	2016-01-01 18:51:19.000000000 +0000
 +++ Makefile
-@@ -100,13 +100,15 @@ manpage:
+@@ -11,6 +11,9 @@ ifndef SYSCONFDIR
+     SYSCONFDIR=$(PREFIX)/etc
+   endif
+ endif
++ifndef MANDIR
++  MANDIR=$(MANDIR)
++endif
+ 
+ CFLAGS+=-Wall -Wshadow -Wpointer-arith -Wcast-qual -Wsign-compare
+ CFLAGS+=-g
+@@ -100,13 +103,15 @@ manpage:
  
  install:
  	install -m 755 -d $(DESTDIR)$(PREFIX)/bin
@@ -12,7 +22,7 @@ Adjust paths and install LICENSE.
 -	install -m 755 -d $(DESTDIR)$(MANPREFIX)/share/man/man1
 +	install -m 755 -d $(DESTDIR)$(PREFIX)/share/examples/i3status
 +	install -m 755 -d $(DESTDIR)$(PREFIX)/share/doc/i3status
-+	install -m 755 -d $(DESTDIR)$(MANPREFIX)/man/man1
++	install -m 755 -d $(DESTDIR)$(MANPREFIX)/$(MANDIR)/man1
  	install -m 755 i3status $(DESTDIR)$(PREFIX)/bin/i3status
  	# Allow network configuration for getting the link speed
  	(which setcap && setcap cap_net_admin=ep $(DESTDIR)$(PREFIX)/bin/i3status) || true
@@ -20,7 +30,7 @@ Adjust paths and install LICENSE.
 -	install -m 644 man/i3status.1 $(DESTDIR)$(MANPREFIX)/share/man/man1
 +	install -m 644 i3status.conf $(DESTDIR)$(PREFIX)/share/examples/i3status/i3status.conf
 +	install -m 644 LICENSE $(DESTDIR)$(PREFIX)/share/doc/i3status
-+	install -m 644 man/i3status.1 $(DESTDIR)$(MANPREFIX)/man/man1
++	install -m 644 man/i3status.1 $(DESTDIR)$(MANPREFIX)/$(MANDIR)/man1
  
  release:
  	[ -f i3status-${VERSION} ] || rm -rf i3status-${VERSION}