Index: head/sysutils/moreutils/Makefile =================================================================== --- head/sysutils/moreutils/Makefile (revision 439804) +++ head/sysutils/moreutils/Makefile (revision 439805) @@ -1,75 +1,75 @@ # Created by: Charlie Kester # $FreeBSD$ PORTNAME= moreutils -PORTVERSION= 0.59 -DISTVERSIONSUFFIX= .orig +PORTVERSION= 0.61 CATEGORIES= sysutils -MASTER_SITES= DEBIAN_POOL -DISTNAME= ${PORTNAME}_${DISTVERSIONFULL} +MASTER_SITES= https://git.joeyh.name/index.cgi/moreutils.git/snapshot/ \ + LOCAL/sunpoet MAINTAINER= sunpoet@FreeBSD.org COMMENT= Additional Unix utilities LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= p5-IPC-Run>=0:devel/p5-IPC-Run OPTIONS_DEFINE= MANPAGES OPTIONS_DEFAULT=MANPAGES OPTIONS_SUB= yes ALL_TARGET= errnos.h ${CANNED_MANPAGES:R} MAKE_JOBS_UNSAFE= yes -USES= perl5 shebangfix -WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSIONFULL} +USES= gmake perl5 shebangfix CANNED_MANPAGES=errno.1 \ ifdata.1 \ ifne.1 \ isutf8.1 \ lckdo.1 \ mispipe.1 \ moreutils-parallel.1 \ pee.1 \ sponge.1 PERL_MANPAGES= chronic.1 \ combine.1 \ moreutils-ts.1 \ vidir.1 \ vipe.1 \ zrun.1 SHEBANG_FILES= ${PERL_MANPAGES:R} post-extract: .for file in parallel.c parallel.docbook ts @${MV} ${WRKSRC}/${file} ${WRKSRC}/moreutils-${file} .endfor post-patch: @${REINPLACE_CMD} -e 's|parallel|moreutils-&|g' ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's|__APPLE__|__${OPSYS}__|' ${WRKSRC}/ifdata.c + @${REINPLACE_CMD} -e '/^CC = gcc/d' ${WRKSRC}/is_utf8/Makefile @cd ${FILESDIR}/ && ${CP} ${CANNED_MANPAGES} ${WRKSRC}/ post-build: .for man in ${PERL_MANPAGES:R} ${LOCALBASE}/bin/pod2man --center=" " --release="${PORTNAME}" ${WRKSRC}/${man} > ${WRKSRC}/${man}.1 .endfor do-install: cd ${WRKSRC}/ && ${INSTALL_PROGRAM} ${CANNED_MANPAGES:R} ${STAGEDIR}${PREFIX}/bin/ cd ${WRKSRC}/ && ${INSTALL_SCRIPT} ${PERL_MANPAGES:R} ${STAGEDIR}${PREFIX}/bin/ cd ${WRKSRC}/ && ${INSTALL_MAN} ${CANNED_MANPAGES} ${PERL_MANPAGES} ${STAGEDIR}${PREFIX}/man/man1/ # maintainer section: # require: docbook-xsl, libxml2, libxslt updateman: do-clean extract .for man in ${CANNED_MANPAGES:R} ${LOCALBASE}/bin/xmllint --noout --valid ${WRKSRC}/${man}.docbook && \ ${LOCALBASE}/bin/xsltproc --output ${FILESDIR}/${man}.1 --param man.authors.section.enabled 0 ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl ${WRKSRC}/${man}.docbook .endfor ${MV} ${FILESDIR}/parallel.1 ${FILESDIR}/moreutils-parallel.1 .include Index: head/sysutils/moreutils/distinfo =================================================================== --- head/sysutils/moreutils/distinfo (revision 439804) +++ head/sysutils/moreutils/distinfo (revision 439805) @@ -1,3 +1,3 @@ -TIMESTAMP = 1466837939 -SHA256 (moreutils_0.59.orig.tar.gz) = a48e11c3197bf79a7bfaa121423e64626e3381d9fedc91d606e9724ae498d1b4 -SIZE (moreutils_0.59.orig.tar.gz) = 47248 +TIMESTAMP = 1493551321 +SHA256 (moreutils-0.61.tar.gz) = eb47d33251715a8638c2309ab69b23e9023f7fd2fe2c101c9574230e91ff308b +SIZE (moreutils-0.61.tar.gz) = 91205 Index: head/sysutils/moreutils/files/isutf8.1 =================================================================== --- head/sysutils/moreutils/files/isutf8.1 (revision 439804) +++ head/sysutils/moreutils/files/isutf8.1 (revision 439805) @@ -1,59 +1,74 @@ '\" t .\" Title: isutf8 -.\" Author: Lars Wirzenius +.\" Author: Lars Wirzenius .\" Generator: DocBook XSL Stylesheets v1.76.1 -.\" Date: 2006-02-19 +.\" Date: 04/30/2017 .\" Manual: moreutils .\" Source: moreutils .\" Language: English .\" -.TH "ISUTF8" "1" "2006\-02\-19" "moreutils" "moreutils" +.TH "ISUTF8" "1" "04/30/2017" "moreutils" "moreutils" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ .\" http://bugs.debian.org/507673 .\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ .ie \n(.g .ds Aq \(aq .el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) .ad l .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- .SH "NAME" isutf8 \- check whether files are valid UTF\-8 .SH "SYNOPSIS" .HP \w'\fBisutf8\fR\ 'u -\fBisutf8\fR [\fB\-hq\fR] [\fB\-\-help\fR] [\fB\-\-quiet\fR] [[\fIfile\fR...]] +\fBisutf8\fR [\fB\-hqliv\fR] [\fB\-\-help\fR] [\fB\-\-quiet\fR] [\fB\-\-list\fR] [\fB\-\-invert\fR] [\fB\-\-verbose\fR] [[\fIfile\fR...]] .SH "DESCRIPTION" .PP \fBisutf8\fR checks whether files are syntactically valid UTF\-8\&. Input is either files named on the command line, or the standard input\&. Notices about files with invalid UTF\-8 are printed to standard output\&. .SH "OPTIONS" .PP \fB\-h\fR, \fB\-\-help\fR .RS 4 Print out a help summary\&. .RE .PP \fB\-q\fR, \fB\-\-quiet\fR .RS 4 Don\*(Aqt print messages telling which files are invalid UTF\-8, merely indicate it with the exit status\&. .RE +.PP +\fB\-l\fR, \fB\-\-list\fR +.RS 4 +Print only the names of files containing invalid UTF\-8\&. +.RE +.PP +\fB\-i\fR, \fB\-\-invert\fR +.RS 4 +Invert the selection: list UTF\-8 compatible files\&. +.RE +.PP +\fB\-v\fR, \fB\-\-verbose\fR +.RS 4 +Also print an hexdump\-like view of the error and some context\&. +.RE .SH "EXIT STATUS" .PP If the file is valid UTF\-8, the exit status is zero\&. If the file is not valid UTF\-8, or there is some error, the exit status is non\-zero\&. .SH "AUTHOR" .PP -Lars Wirzenius +Lars Wirzenius, Julien Palard .SH "SEE ALSO" .PP \fButf8\fR(7)