Instead of (wrongly) use the SUBST framework just patch Makefile (that is

already patched!) introducing a MANDIR variable instead of hardcoding
`share/man' and pass PKGMANDIR via MAKE_ENV.

No PKGREVISION bump since it should fix the build on platforms where moreutils
was already broken.

Pointed out by Joyent's Darwin bulk build.

4 files changed, 15 insertions, 17 deletions

diff --git a/misc/moreutils/Makefile b/misc/moreutils/Makefile
index 857ee73130e..fe04fe09df6 100644
--- a/misc/moreutils/Makefile
+++ b/misc/moreutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2017/09/06 12:38:32 leot Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/07 08:18:44 leot Exp $
 
 DISTNAME=	moreutils_0.60.orig
 PKGNAME=	${DISTNAME:S/_/-/:S/.orig//}
@@ -29,14 +29,9 @@ REPLACE_PERL+=	vidir
 REPLACE_PERL+=	vipe
 REPLACE_PERL+=	zrun
 
-SUBST_CLASSES+=			pkgmandir
-SUBST_STAGE.pkgmandir=		pre-configure
-SUBST_FILES.pkgmandir=		Makefile
-SUBST_MESSAGE.pkgmandir=	Fixing man page installation.
-SUBST_SED.pkgmandir=		-e 's,share/man,${PKGMANDIR},'
-
 MAKE_ENV+=	\
 	PREFIX=${PREFIX} \
+	MANDIR=${PREFIX}/${PKGMANDIR} \
 	CFLAGS=${CFLAGS:Q} \
 	LDFLAGS=${LDFLAGS:Q} \
 	DOCBOOKXSL=${PREFIX}/share/xsl/docbook \
diff --git a/misc/moreutils/PLIST b/misc/moreutils/PLIST
index d7b32d3e7f5..b1131bc5f47 100644
--- a/misc/moreutils/PLIST
+++ b/misc/moreutils/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2017/09/04 09:44:41 leot Exp $
+@comment $NetBSD: PLIST,v 1.2 2017/09/07 08:18:44 leot Exp $
 bin/chronic
 bin/combine
 bin/errno
diff --git a/misc/moreutils/distinfo b/misc/moreutils/distinfo
index 1f1ba82a7a1..002db03953f 100644
--- a/misc/moreutils/distinfo
+++ b/misc/moreutils/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.1 2017/09/04 09:44:41 leot Exp $
+$NetBSD: distinfo,v 1.2 2017/09/07 08:18:44 leot Exp $
 
 SHA1 (moreutils_0.60.orig.tar.xz) = 3af60490f763ece48b2fcba968903673c3e63495
 RMD160 (moreutils_0.60.orig.tar.xz) = aa3700e114f51513bf52123eae19d3f9625d7052
 SHA512 (moreutils_0.60.orig.tar.xz) = 3fb5d8e140a90d805c4cd0de74248a5ea830ba8f90c56afdeb537391c32984cbb9701d4d9caf187a5f9284dfe791d1f7a333af3aac2a4860e2041c414e5cb788
 Size (moreutils_0.60.orig.tar.xz) = 79360 bytes
-SHA1 (patch-Makefile) = 757f0d98eaa43537dfaadcda87346562e3a2137c
+SHA1 (patch-Makefile) = 80fb38e584db12f344ed66da76c8bee0127d17cc
 SHA1 (patch-ifdata.c) = 5c0d9737657354ad1877f2efc6ff08e76ca7bc62
 SHA1 (patch-is__utf8_Makefile) = 8feacdc8a0a0939aefd7f647be8196bdfdbda66c
diff --git a/misc/moreutils/patches/patch-Makefile b/misc/moreutils/patches/patch-Makefile
index b8930fddffc..64cf10fbbb5 100644
--- a/misc/moreutils/patches/patch-Makefile
+++ b/misc/moreutils/patches/patch-Makefile
@@ -1,20 +1,23 @@
-$NetBSD: patch-Makefile,v 1.1 2017/09/04 09:44:41 leot Exp $
+$NetBSD: patch-Makefile,v 1.2 2017/09/07 08:18:44 leot Exp $
 
-Instruct Makefile to properly handle also man pages and scripts via
-corresponding INSTALL_{MAN,SCRIPT} in a similar vein of INSTALL_BIN.
+- Instruct Makefile to properly handle also man pages and scripts via
+  corresponding INSTALL_{MAN,SCRIPT} in a similar vein of INSTALL_BIN.
+- Introduce MANDIR in order to ease the installation of man pages
 
 --- Makefile.orig	2016-08-13 13:58:21.000000000 +0000
 +++ Makefile
-@@ -3,6 +3,8 @@ PERLSCRIPTS=vidir vipe ts combine zrun c
+@@ -3,7 +3,10 @@ PERLSCRIPTS=vidir vipe ts combine zrun c
  MANS=sponge.1 vidir.1 vipe.1 isutf8.1 ts.1 combine.1 ifdata.1 ifne.1 pee.1 zrun.1 chronic.1 mispipe.1 lckdo.1 parallel.1 errno.1
  CFLAGS?=-O2 -g -Wall
  INSTALL_BIN?=install -s
 +INSTALL_MAN?=install
 +INSTALL_SCRIPT?=install
  PREFIX?=/usr
++MANDIR?=$(PREFIX)/man
  
  ifneq (,$(findstring CYGWIN,$(shell uname)))
-@@ -25,10 +27,10 @@ isutf8: is_utf8/*.c is_utf8/*.h
+ 	DOCBOOKXSL?=/usr/share/sgml/docbook/xsl-stylesheets
+@@ -25,10 +28,10 @@ isutf8: is_utf8/*.c is_utf8/*.h
  install:
  	mkdir -p $(DESTDIR)$(PREFIX)/bin
  	$(INSTALL_BIN) $(BINS) $(DESTDIR)$(PREFIX)/bin
@@ -23,8 +26,8 @@ corresponding INSTALL_{MAN,SCRIPT} in a similar vein of INSTALL_BIN.
  
 -	mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1
 -	install $(MANS) $(DESTDIR)$(PREFIX)/share/man/man1
-+	mkdir -p $(DESTDIR)$(PREFIX)/man/man1
-+	$(INSTALL_MAN) $(MANS) $(DESTDIR)$(PREFIX)/man/man1
++	mkdir -p $(DESTDIR)$(MANDIR)/man1
++	$(INSTALL_MAN) $(MANS) $(DESTDIR)$(MANDIR)/man1
  
  check: isutf8
  	./is_utf8/test.sh