CVS commit: pkgsrc/misc/moreutils

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

Module Name:    pkgsrc
Committed By:   leot
Date:           Wed Mar 14 20:35:23 UTC 2018

Modified Files:
        pkgsrc/misc/moreutils: Makefile PLIST

Log Message:
moreutils: Install `parallel' and its man page to `moreutils-parallel'

This avoid a possible conflict with `parallel' provided by
parallel/parallel package.

PKGREVISION++

Pointed out by Dr. Thomas Orgis via tech-pkg@.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/misc/moreutils/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/misc/moreutils/PLIST

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.3 pkgsrc/misc/moreutils/Makefile:1.4
--- pkgsrc/misc/moreutils/Makefile:1.3  Thu Sep  7 08:18:44 2017
+++ pkgsrc/misc/moreutils/Makefile      Wed Mar 14 20:35:23 2018
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2017/09/07 08:18:44 leot Exp $
+# $NetBSD: Makefile,v 1.4 2018/03/14 20:35:23 leot Exp $
 
 DISTNAME=      moreutils_0.60.orig
 PKGNAME=       ${DISTNAME:S/_/-/:S/.orig//}
+PKGREVISION=   1
 CATEGORIES=    misc
 MASTER_SITES=  ${MASTER_SITE_DEBIAN:=pool/main/m/moreutils/}
 EXTRACT_SUFX=  .tar.xz
@@ -39,4 +40,11 @@ MAKE_ENV+=   \
        INSTALL_MAN=${INSTALL_MAN:Q} \
        INSTALL_SCRIPT=${INSTALL_SCRIPT:Q}
 
+# Avoid possible conflicts with `parallel' of parallel/parallel
+post-install:
+       ${MV} ${DESTDIR}${PREFIX}/bin/parallel \
+           ${DESTDIR}${PREFIX}/bin/moreutils-parallel
+       ${MV} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/parallel.1 \
+           ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/moreutils-parallel.1
+
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/misc/moreutils/PLIST
diff -u pkgsrc/misc/moreutils/PLIST:1.2 pkgsrc/misc/moreutils/PLIST:1.3
--- pkgsrc/misc/moreutils/PLIST:1.2     Thu Sep  7 08:18:44 2017
+++ pkgsrc/misc/moreutils/PLIST Wed Mar 14 20:35:23 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2017/09/07 08:18:44 leot Exp $
+@comment $NetBSD: PLIST,v 1.3 2018/03/14 20:35:23 leot Exp $
 bin/chronic
 bin/combine
 bin/errno
@@ -7,7 +7,7 @@ bin/ifne
 bin/isutf8
 bin/lckdo
 bin/mispipe
-bin/parallel
+bin/moreutils-parallel
 bin/pee
 bin/sponge
 bin/ts
@@ -22,7 +22,7 @@ man/man1/ifne.1
 man/man1/isutf8.1
 man/man1/lckdo.1
 man/man1/mispipe.1
-man/man1/parallel.1
+man/man1/moreutils-parallel.1
 man/man1/pee.1
 man/man1/sponge.1
 man/man1/ts.1