aboutsummaryrefslogtreecommitdiffstats
path: root/sysutils
diff options
context:
space:
mode:
authorsunpoet <sunpoet@FreeBSD.org>2015-03-07 00:36:05 +0800
committersunpoet <sunpoet@FreeBSD.org>2015-03-07 00:36:05 +0800
commit172d65a82773670c701c27e65ff4ad965b61df8b (patch)
treef29963a2a179c219d2e417909067317b730f5970 /sysutils
parent44d6853e4adf4dfa4e1fe54b74653e4cb4330e42 (diff)
downloadfreebsd-ports-graphics-172d65a82773670c701c27e65ff4ad965b61df8b.tar.gz
freebsd-ports-graphics-172d65a82773670c701c27e65ff4ad965b61df8b.tar.zst
freebsd-ports-graphics-172d65a82773670c701c27e65ff4ad965b61df8b.zip
- Install ts as moreutils-ts to avoid CONFLICTS with security/openssl
- Bump PORTREVISION for package change PR: 198321 Reported by: Santiago Pastorino <spastorino@gmail.com>
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/moreutils/Makefile6
-rw-r--r--sysutils/moreutils/pkg-descr2
-rw-r--r--sysutils/moreutils/pkg-plist4
3 files changed, 8 insertions, 4 deletions
diff --git a/sysutils/moreutils/Makefile b/sysutils/moreutils/Makefile
index 1fa9b35f72b..5659ebbd67c 100644
--- a/sysutils/moreutils/Makefile
+++ b/sysutils/moreutils/Makefile
@@ -3,6 +3,7 @@
PORTNAME= moreutils
PORTVERSION= 0.53
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= DEBIAN_POOL
DISTNAME= ${PORTNAME}_${PORTVERSION}
@@ -33,13 +34,16 @@ CANNED_MANPAGES=errno.1 \
sponge.1
PERL_MANPAGES= chronic.1 \
combine.1 \
- ts.1 \
+ moreutils-ts.1 \
vidir.1 \
vipe.1 \
zrun.1
SHEBANG_FILES= ${PERL_MANPAGES:R}
+post-extract:
+ @${MV} ${WRKSRC}/ts ${WRKSRC}/moreutils-ts
+
post-patch:
@${REINPLACE_CMD} -e 's|parallel|moreutils-&|g' ${WRKSRC}/Makefile
@${REINPLACE_CMD} -e 's|__APPLE__|__${OPSYS}__|' ${WRKSRC}/ifdata.c
diff --git a/sysutils/moreutils/pkg-descr b/sysutils/moreutils/pkg-descr
index b9c1d3b12f1..82f95384a06 100644
--- a/sysutils/moreutils/pkg-descr
+++ b/sysutils/moreutils/pkg-descr
@@ -18,6 +18,6 @@ Currently it consists of these tools:
- vipe: insert a text editor into a pipe
- zrun: automatically uncompress arguments to command
-Note that the parallel utility is installed as moreutils-parallel.
+Note that parallel and ts utilities are installed with "moreutils-" prefix.
WWW: http://joeyh.name/code/moreutils/
diff --git a/sysutils/moreutils/pkg-plist b/sysutils/moreutils/pkg-plist
index 60718079a38..53c1748685b 100644
--- a/sysutils/moreutils/pkg-plist
+++ b/sysutils/moreutils/pkg-plist
@@ -9,7 +9,7 @@ bin/mispipe
bin/moreutils-parallel
bin/pee
bin/sponge
-bin/ts
+bin/moreutils-ts
bin/vidir
bin/vipe
bin/zrun
@@ -24,7 +24,7 @@ bin/zrun
%%MANPAGES%%man/man1/moreutils-parallel.1.gz
%%MANPAGES%%man/man1/pee.1.gz
%%MANPAGES%%man/man1/sponge.1.gz
-%%MANPAGES%%man/man1/ts.1.gz
+%%MANPAGES%%man/man1/moreutils-ts.1.gz
%%MANPAGES%%man/man1/vidir.1.gz
%%MANPAGES%%man/man1/vipe.1.gz
%%MANPAGES%%man/man1/zrun.1.gz