svn commit: r380613 - head/sysutils/moreutils

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Fri Mar  6 16:36:05 2015
New Revision: 380613
URL: https://svnweb.freebsd.org/changeset/ports/380613
QAT: https://qat.redports.org/buildarchive/r380613/

Log:
  - Install ts as moreutils-ts to avoid CONFLICTS with security/openssl
  - Bump PORTREVISION for package change
  
  PR:		198321
  Reported by:	Santiago Pastorino <spastorino at gmail.com>

Modified:
  head/sysutils/moreutils/Makefile
  head/sysutils/moreutils/pkg-descr
  head/sysutils/moreutils/pkg-plist

Modified: head/sysutils/moreutils/Makefile
==============================================================================
--- head/sysutils/moreutils/Makefile	Fri Mar  6 16:33:53 2015	(r380612)
+++ head/sysutils/moreutils/Makefile	Fri Mar  6 16:36:05 2015	(r380613)
@@ -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

Modified: head/sysutils/moreutils/pkg-descr
==============================================================================
--- head/sysutils/moreutils/pkg-descr	Fri Mar  6 16:33:53 2015	(r380612)
+++ head/sysutils/moreutils/pkg-descr	Fri Mar  6 16:36:05 2015	(r380613)
@@ -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/

Modified: head/sysutils/moreutils/pkg-plist
==============================================================================
--- head/sysutils/moreutils/pkg-plist	Fri Mar  6 16:33:53 2015	(r380612)
+++ head/sysutils/moreutils/pkg-plist	Fri Mar  6 16:36:05 2015	(r380613)
@@ -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