- Update to 0.43

- Sort utility list in pkg-descr

Changes:	http://kitenet.net/~joey/code/moreutils/news/version_0.43/
PR:		ports/152347
Submitted by:	Charlie Kester <corky1951@comcast.net> (maintainer)

5 files changed, 39 insertions, 42 deletions

diff --git a/sysutils/moreutils/Makefile b/sysutils/moreutils/Makefile
index 99e2ee481f52..075243bb3541 100644
--- a/sysutils/moreutils/Makefile
+++ b/sysutils/moreutils/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	moreutils
-PORTVERSION=	0.42
+PORTVERSION=	0.43
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -17,9 +17,12 @@ COMMENT=	Additional Unix utilities
 
 CONFLICTS=	parallel-[0-9]*
 
+RUN_DEPENDS=	${SITE_PERL}/IPC/Run.pm:${PORTSDIR}/devel/p5-IPC-Run
+
 USE_PERL5=	yes
 
-PLIST_FILES=	bin/combine \
+PLIST_FILES=	bin/chronic \
+		bin/combine \
 		bin/ifne \
 		bin/isutf8 \
 		bin/lckdo \
@@ -36,10 +39,9 @@ ALL_TARGET=	bins
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-.include <bsd.port.pre.mk>
-
 .if !defined(NO_INSTALL_MANPAGES)
-MAN1=		combine.1 \
+MAN1=		chronic.1 \
+		combine.1 \
 		ifne.1 \
 		isutf8.1 \
 		lckdo.1 \
@@ -64,15 +66,10 @@ CANNED_MAN=	ifne.1 \
 		sponge.1
 
 post-patch:
-.for f in ${CANNED_MAN}
-	${CP} ${FILESDIR}/${f} ${WRKSRC}
-.endfor
+	cd ${FILESDIR} && ${CP} ${CANNED_MAN} ${WRKSRC}/
 
 post-install:
-.for manpage in ${MAN1}
-	${INSTALL_MAN} ${WRKSRC}/${manpage} ${MANPREFIX}/man/man1
-.endfor
-
+	cd ${WRKSRC} && ${INSTALL_MAN} ${MAN1} ${MANPREFIX}/man/man1/
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/moreutils/distinfo b/sysutils/moreutils/distinfo
index e20091c37933..7ffe946af31b 100644
--- a/sysutils/moreutils/distinfo
+++ b/sysutils/moreutils/distinfo
@@ -1,3 +1,2 @@
-MD5 (moreutils_0.42.tar.gz) = 9bac64540b315e9008521a9fea19d9ab
-SHA256 (moreutils_0.42.tar.gz) = 71cf9b37dd5093d51c4c7bbebca786bee54806b13b9c6be683f486fc0d5b614f
-SIZE (moreutils_0.42.tar.gz) = 43296
+SHA256 (moreutils_0.43.tar.gz) = 09e31e4f308bb1e8f9ab4f7d57f9e3c8246e3e3824015534af59763114a85c7d
+SIZE (moreutils_0.43.tar.gz) = 44233
diff --git a/sysutils/moreutils/files/patch-Makefile b/sysutils/moreutils/files/patch-Makefile
index ae04c59a5631..695974329b22 100644
--- a/sysutils/moreutils/files/patch-Makefile
+++ b/sysutils/moreutils/files/patch-Makefile
@@ -1,10 +1,10 @@
---- Makefile.orig	2009-07-02 12:00:44.000000000 -0700
-+++ Makefile	2010-02-09 22:13:14.000000000 -0800
-@@ -1,51 +1,34 @@
+--- ./Makefile.orig	2010-10-29 12:47:09.000000000 -0700
++++ ./Makefile	2010-11-17 16:02:08.000000000 -0800
+@@ -1,51 +1,35 @@
 -BINS=isutf8 ifdata ifne pee sponge mispipe lckdo parallel
 +BINS=isutf8 ifne pee sponge mispipe lckdo parallel
- PERLSCRIPTS=vidir vipe ts combine zrun
--MANS=sponge.1 vidir.1 vipe.1 isutf8.1 ts.1 combine.1 ifdata.1 ifne.1 pee.1 zrun.1 mispipe.1 lckdo.1 parallel.1
+ PERLSCRIPTS=vidir vipe ts combine zrun chronic
+-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
 -CFLAGS=-O2 -g -Wall
 +MANS=sponge.1 isutf8.1 ifne.1 pee.1 mispipe.1 lckdo.1 parallel.1
 +CFLAGS+= -Wall
@@ -12,16 +12,17 @@
 -PREFIX=/usr
  
 -DOCBOOK2XMAN=docbook2x-man
++
 +.SUFFIXES: .1 .docbook
 +
 +DOCBOOK2XMAN= ${LOCALBASE}/bin/xsltproc ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl
  
  all: $(BINS) $(MANS)
- 
++ 
 +bins: ${BINS}
 +
 +mans: ${MANS}
-+
+ 
  clean:
  	rm -f $(BINS) $(MANS)
  
diff --git a/sysutils/moreutils/files/patch-parallel.c b/sysutils/moreutils/files/patch-parallel.c
index 55a1ae47e8de..5e096a506693 100644
--- a/sysutils/moreutils/files/patch-parallel.c
+++ b/sysutils/moreutils/files/patch-parallel.c
@@ -1,6 +1,6 @@
---- parallel.c.orig	2010-02-09 12:39:08.000000000 -0800
-+++ parallel.c	2010-02-09 22:27:25.000000000 -0800
-@@ -76,6 +76,7 @@
+--- ./parallel.c.orig	2010-07-06 12:06:47.000000000 -0700
++++ ./parallel.c	2010-11-17 15:49:57.000000000 -0800
+@@ -87,6 +87,7 @@
  	return;
  }
  
@@ -8,8 +8,8 @@
  int wait_for_child(int options) {
  	id_t id_ignored = 0;
  	siginfo_t infop;
-@@ -88,6 +89,18 @@
- 		return infop.si_status;
+@@ -101,6 +102,18 @@
+ 	}
  	return 1;
  }
 +#else
diff --git a/sysutils/moreutils/pkg-descr b/sysutils/moreutils/pkg-descr
index 558719dfa4df..0eb150255478 100644
--- a/sysutils/moreutils/pkg-descr
+++ b/sysutils/moreutils/pkg-descr
@@ -2,20 +2,20 @@ moreutils is a growing collection of the unix tools that nobody thought to
 write thirty years ago.
 
 So far, it includes the following utilities:
+- chronic: run a command quietly, unless it fails
+- combine: combine the lines in two files using boolean operations
+- ifne: run a program if the standard input is not empty
+- isutf8: check if a file or standard input is utf-8
+- lckdo: execute a program with a lock held
+- mispipe: pipe two commands, returning the exit status of the first
+- parallel: run multiple jobs at once
+- pee: tee standard input to pipes
+- sponge: soak up standard input and write to a file
+- ts: timestamp standard input
+- vidir: edit a directory in your text editor
+- vipe: insert a text editor into a pipe
+- zrun: automatically uncompress arguments to command
 
- - sponge: soak up standard input and write to a file
- - ifne: run a program if the standard input is not empty
- - vidir: edit a directory in your text editor
- - vipe: insert a text editor into a pipe
- - ts: timestamp standard input
- - combine: combine the lines in two files using boolean operations
- - pee: tee standard input to pipes
- - zrun: automatically uncompress arguments to command
- - mispipe: pipe two commands, returning the exit status of the first
- - isutf8: check if a file or standard input is utf-8
- - lckdo: execute a program with a lock held
- - parallel: run multiple jobs at once
-
-The 'ifdata' utility is not included in this FreeBSD port. 
+The Linux-specific 'ifdata' utility is not included in this FreeBSD port.
 
 WWW: http://kitenet.net/~joey/code/moreutils/