7 files changed, 127 insertions, 37 deletions

diff --git a/sysutils/moreutils/Makefile b/sysutils/moreutils/Makefile
index debc714f4149..a0033bc607ea 100644
--- a/sysutils/moreutils/Makefile
+++ b/sysutils/moreutils/Makefile
@@ -1,12 +1,8 @@
-# Ports collection makefile for:	moreutils
-# Date created:	16 June 2009
-# Whom:		Charlie Kester <corky1951@comcast.net>
-#
+# Created by: Charlie Kester <corky1951@comcast.net>
 # $FreeBSD$
-#
 
 PORTNAME=	moreutils
-PORTVERSION=	0.46
+PORTVERSION=	0.47
 CATEGORIES=	sysutils
 MASTER_SITES=	DEBIAN_POOL
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -16,12 +12,17 @@ COMMENT=	Additional Unix utilities
 
 RUN_DEPENDS=	p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run
 
+OPTIONS_DEFINE=	MANPAGES
+OPTIONS_DEFAULT=MANPAGES
+
 ALL_TARGET=	bins
 USE_PERL5=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
+MANCOMPRESSED=	no
 PLIST_FILES=	bin/chronic \
 		bin/combine \
+		bin/errno \
 		bin/ifne \
 		bin/isutf8 \
 		bin/lckdo \
@@ -33,10 +34,12 @@ PLIST_FILES=	bin/chronic \
 		bin/vipe \
 		bin/zrun
 
-.if !defined(NO_INSTALL_MANPAGES)
-ALL_TARGET+=	mans extraman
+.include <bsd.port.options.mk>
 
-CANNED_MAN=	ifne.1 \
+.if ${PORT_OPTIONS:MMANPAGES}
+ALL_TARGET+=	mans
+CANNED_MAN1=	errno.1 \
+		ifne.1 \
 		isutf8.1 \
 		lckdo.1 \
 		mispipe.1 \
@@ -48,14 +51,16 @@ MAN1=		chronic.1 \
 		vidir.1 \
 		vipe.1 \
 		zrun.1 \
-		${CANNED_MAN}
-MANCOMPRESSED=	no
+		${CANNED_MAN1}
+.endif
 
 post-patch:
-	cd ${FILESDIR} && ${CP} ${CANNED_MAN} ${WRKSRC}/
+	@${REINPLACE_CMD} -e 's|share/xml/docbook/schema/dtd/|local/share/xml/docbook/|' ${WRKSRC}/*.docbook
+	@cd ${FILESDIR}/ && ${CP} ${CANNED_MAN1} ${WRKSRC}/
 
 post-install:
-	cd ${WRKSRC} && ${INSTALL_MAN} ${MAN1} ${MANPREFIX}/man/man1/
+.if ${PORT_OPTIONS:MMANPAGES}
+	cd ${WRKSRC}/ && ${INSTALL_MAN} ${MAN1} ${MANPREFIX}/man/man1/
 .endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/moreutils/distinfo b/sysutils/moreutils/distinfo
index 77c7761d0bef..090bf09ff6f4 100644
--- a/sysutils/moreutils/distinfo
+++ b/sysutils/moreutils/distinfo
@@ -1,2 +1,2 @@
-SHA256 (moreutils_0.46.tar.gz) = c46c60567964ca91238409a1793e9cae4bf31de08f57bfe2b99c40de1eecdcbe
-SIZE (moreutils_0.46.tar.gz) = 44132
+SHA256 (moreutils_0.47.tar.gz) = 277058c99d76c58f850f48dfbc1ad4a7a384f5b95f3569842ec4ce1c9f077266
+SIZE (moreutils_0.47.tar.gz) = 46115
diff --git a/sysutils/moreutils/files/errno.1 b/sysutils/moreutils/files/errno.1
new file mode 100644
index 000000000000..85b2a946ba2b
--- /dev/null
+++ b/sysutils/moreutils/files/errno.1
@@ -0,0 +1,75 @@
+.\" -*- coding: us-ascii -*-
+.if \n(.g .ds T< \\FC
+.if \n(.g .ds T> \\F[\n[.fam]]
+.de URL
+\\$2 \(la\\$1\(ra\\$3
+..
+.if \n(.g .mso www.tmac
+.TH errno 1 2012-06-05 "" ""
+.SH NAME
+errno \- look up errno names and descriptions
+.SH SYNOPSIS
+'nh
+.fi
+.ad l
+\fBerrno\fR \kx
+.if (\nx>(\n(.l/2)) .nr x (\n(.l/5)
+'in \n(.iu+\nxu
+{\fIname-or-code\fR}
+'in \n(.iu-\nxu
+.ad b
+'hy
+'nh
+.fi
+.ad l
+\fBerrno\fR \kx
+.if (\nx>(\n(.l/2)) .nr x (\n(.l/5)
+'in \n(.iu+\nxu
+[-ls] [--list]
+'in \n(.iu-\nxu
+.ad b
+'hy
+'nh
+.fi
+.ad l
+\fBerrno\fR \kx
+.if (\nx>(\n(.l/2)) .nr x (\n(.l/5)
+'in \n(.iu+\nxu
+[-s] [--search] {\fIword\fR}
+'in \n(.iu-\nxu
+.ad b
+'hy
+'nh
+.fi
+.ad l
+\fBerrno\fR \kx
+.if (\nx>(\n(.l/2)) .nr x (\n(.l/5)
+'in \n(.iu+\nxu
+[-S] [--search-all-locales] {\fIword\fR}
+'in \n(.iu-\nxu
+.ad b
+'hy
+.SH DESCRIPTION
+\fBerrno\fR looks up errno macro names,
+errno codes, and the corresponding descriptions. For example,
+if given \*(T<ENOENT\*(T> on a Linux system, it
+prints out the code 2 and the description "No such file or directory".
+If given the code 2, it printes \*(T<ENOENT\*(T>
+and the same description.
+.SH OPTIONS
+.TP 
+\*(T<\fB\-l\fR\*(T>, \*(T<\fB\-\-list\fR\*(T>
+List all errno values.
+.TP 
+\*(T<\fB\-s\fR\*(T>, \*(T<\fB\-\-search\fR\*(T>
+Search for errors whose description contains
+all the given words (case-insensitive).
+.TP 
+\*(T<\fB\-S\fR\*(T>, \*(T<\fB\-\-search\-all\-locales\fR\*(T>
+Like \*(T<\fB\-\-search\fR\*(T>, but searches all
+installed locales.
+.SH AUTHOR
+Lars Wirzenius
+
+.SH "SEE ALSO"
+\fBerrno\fR(3)
diff --git a/sysutils/moreutils/files/lckdo.1 b/sysutils/moreutils/files/lckdo.1
index e3804b278477..d3dc928a37ca 100644
--- a/sysutils/moreutils/files/lckdo.1
+++ b/sysutils/moreutils/files/lckdo.1
@@ -24,6 +24,10 @@ lckdo \- run a program with a lock held
 held, in order to prevent multiple processes from running in
 parallel. Use just like \fBnice\fR or
 \fBnohup\fR.
+.PP
+Now that util-linux contains a similar command
+named \fBflock\fR, lckdo is deprecated,
+and will be removed from some future version of moreutils.
 .SH OPTIONS
 .TP 
 \*(T<\fB\-w\fR\*(T>
diff --git a/sysutils/moreutils/files/patch-Makefile b/sysutils/moreutils/files/patch-Makefile
index 07f9b25835fa..eaf9bbc2eb9f 100644
--- a/sysutils/moreutils/files/patch-Makefile
+++ b/sysutils/moreutils/files/patch-Makefile
@@ -1,30 +1,27 @@
---- ./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
+--- Makefile.orig	2012-06-06 01:55:53.000000000 +0800
++++ Makefile	2013-02-24 13:23:52.068205829 +0800
+@@ -1,60 +1,38 @@
+-BINS=isutf8 ifdata ifne pee sponge mispipe lckdo parallel errno
++BINS=isutf8 ifne pee sponge mispipe lckdo errno
  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
+-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 errno.1
 -CFLAGS=-O2 -g -Wall
-+MANS=sponge.1 isutf8.1 ifne.1 pee.1 mispipe.1 lckdo.1
-+CFLAGS+= -Wall
++MANS=sponge.1 isutf8.1 ifne.1 pee.1 mispipe.1 lckdo.1 errno.1
++CFLAGS+=-Wall
  INSTALL_BIN?=install -s
 -PREFIX=/usr
  
 -DOCBOOK2XMAN=docbook2x-man
-+
 +.SUFFIXES: .1 .docbook
 +
-+DOCBOOK2XMAN= ${LOCALBASE}/bin/xsltproc ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl
++DOCBOOK2XMAN=${LOCALBASE}/bin/docbook2man
  
  all: $(BINS) $(MANS)
-+ 
-+bins: ${BINS}
-+
-+mans: ${MANS}
  
++bins: errnos.h ${BINS}
++
  clean:
- 	rm -f $(BINS) $(MANS)
+ 	rm -f $(BINS) $(MANS) dump.c errnos.h errno.o
  
  install:
 -	mkdir -p $(DESTDIR)$(PREFIX)/bin
@@ -51,7 +48,9 @@
 -
 -pee.1: pee.docbook
 -	$(DOCBOOK2XMAN) $<
--
++.docbook.1:
++	$(DOCBOOK2XMAN) ${.IMPSRC}
+ 
 -sponge.1: sponge.docbook
 -	$(DOCBOOK2XMAN) $<
 -
@@ -63,12 +62,19 @@
 -
 -parallel.1: parallel.docbook
 -	$(DOCBOOK2XMAN) $<
-+.docbook.1:
-+	$(DOCBOOK2XMAN) ${.IMPSRC}
- 
+-	
+ errno.o: errnos.h
+ errnos.h:
+ 	echo '#include <errno.h>' > dump.c
+ 	$(CC) -E -dD dump.c | awk '/^#define E/ { printf "{\"%s\",%s},\n", $$2, $$2 }' > errnos.h
+ 	rm -f dump.c
+ 	
+-errno.1: errno.docbook
+-	$(DOCBOOK2XMAN) $<
+-
 -%.1: %
 -	pod2man --center=" " --release="moreutils" $< > $@;
-+extraman: ${PERLSCRIPTS}
++mans: ${PERLSCRIPTS}
 +.for i in ${PERLSCRIPTS}
 +	pod2man --center=" " --release="moreutils" ${i} > ${i:S@$@.1$@};
 +.endfor
diff --git a/sysutils/moreutils/files/sponge.1 b/sysutils/moreutils/files/sponge.1
index 2690b763b8f4..75e31d474d96 100644
--- a/sysutils/moreutils/files/sponge.1
+++ b/sysutils/moreutils/files/sponge.1
@@ -22,7 +22,7 @@ sponge \- soak up standard input and write to a file
 \fBsponge\fR reads standard input and
 writes it out to the specified file. Unlike a shell
 redirect, sponge soaks up all its input before
-opening the output file. This allows constricting
+opening the output file. This allows constructing
 pipelines that read from and write to
 the same file.
 .PP
diff --git a/sysutils/moreutils/pkg-descr b/sysutils/moreutils/pkg-descr
index eba7500165da..0d0da88d1a58 100644
--- a/sysutils/moreutils/pkg-descr
+++ b/sysutils/moreutils/pkg-descr
@@ -17,4 +17,4 @@ So far, it includes the following utilities:
 
 The Linux-specific 'ifdata' utility is not included in this FreeBSD port.
 
-WWW: http://kitenet.net/~joey/code/moreutils/
+WWW: http://joeyh.name/code/moreutils/