CVS commit: pkgsrc/misc/moreutils

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Thu Sep  7 08:18:45 UTC 2017

Modified Files:
        pkgsrc/misc/moreutils: Makefile PLIST distinfo
        pkgsrc/misc/moreutils/patches: patch-Makefile

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/misc/moreutils/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/misc/moreutils/PLIST \
    pkgsrc/misc/moreutils/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/misc/moreutils/patches/patch-Makefile

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

Modified files:

Index: pkgsrc/misc/moreutils/Makefile
diff -u pkgsrc/misc/moreutils/Makefile:1.2 pkgsrc/misc/moreutils/Makefile:1.3
--- pkgsrc/misc/moreutils/Makefile:1.2  Wed Sep  6 12:38:32 2017
+++ pkgsrc/misc/moreutils/Makefile      Thu Sep  7 08:18:44 2017
@@ -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 \

Index: pkgsrc/misc/moreutils/PLIST
diff -u pkgsrc/misc/moreutils/PLIST:1.1 pkgsrc/misc/moreutils/PLIST:1.2
--- pkgsrc/misc/moreutils/PLIST:1.1     Mon Sep  4 09:44:41 2017
+++ pkgsrc/misc/moreutils/PLIST Thu Sep  7 08:18:44 2017
@@ -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
Index: pkgsrc/misc/moreutils/distinfo
diff -u pkgsrc/misc/moreutils/distinfo:1.1 pkgsrc/misc/moreutils/distinfo:1.2
--- pkgsrc/misc/moreutils/distinfo:1.1  Mon Sep  4 09:44:41 2017
+++ pkgsrc/misc/moreutils/distinfo      Thu Sep  7 08:18:44 2017
@@ -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

Index: pkgsrc/misc/moreutils/patches/patch-Makefile
diff -u pkgsrc/misc/moreutils/patches/patch-Makefile:1.1 pkgsrc/misc/moreutils/patches/patch-Makefile:1.2
--- pkgsrc/misc/moreutils/patches/patch-Makefile:1.1    Mon Sep  4 09:44:41 2017
+++ pkgsrc/misc/moreutils/patches/patch-Makefile        Thu Sep  7 08:18:44 2017
@@ -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 
  
 -      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