summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorleot <leot@pkgsrc.org>2018-03-14 20:35:23 +0000
committerleot <leot@pkgsrc.org>2018-03-14 20:35:23 +0000
commit8d7d606d31a8c1d894ac737339f34f8b547d70da (patch)
tree2a87bfd9c9441bfa1a74044df573683a38a5d7dc /misc
parentd8daa4a5948d5d40ff4873aa0ae0114470260c02 (diff)
downloadpkgsrc-8d7d606d31a8c1d894ac737339f34f8b547d70da.tar.gz
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@.
Diffstat (limited to 'misc')
-rw-r--r--misc/moreutils/Makefile10
-rw-r--r--misc/moreutils/PLIST6
2 files changed, 12 insertions, 4 deletions
diff --git a/misc/moreutils/Makefile b/misc/moreutils/Makefile
index fe04fe09df6..9e55df22996 100644
--- a/misc/moreutils/Makefile
+++ b/misc/moreutils/Makefile
@@ -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"
diff --git a/misc/moreutils/PLIST b/misc/moreutils/PLIST
index b1131bc5f47..4e4394522a2 100644
--- a/misc/moreutils/PLIST
+++ b/misc/moreutils/PLIST
@@ -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