Date: Sun, 10 Mar 2013 09:02:47 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r313818 - in head/sysutils/moreutils: . files Message-ID: <201303100902.r2A92lLm029924@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Sun Mar 10 09:02:47 2013 New Revision: 313818 URL: http://svnweb.freebsd.org/changeset/ports/313818 Log: - Update to 0.47 - Convert to new options framework - Update WWW Changes: http://joeyh.name/code/moreutils/news/version_0.47/ Added: head/sysutils/moreutils/files/errno.1 (contents, props changed) Modified: head/sysutils/moreutils/Makefile (contents, props changed) head/sysutils/moreutils/distinfo (contents, props changed) head/sysutils/moreutils/files/lckdo.1 (contents, props changed) head/sysutils/moreutils/files/patch-Makefile (contents, props changed) head/sysutils/moreutils/files/sponge.1 (contents, props changed) head/sysutils/moreutils/pkg-descr (contents, props changed) Modified: head/sysutils/moreutils/Makefile ============================================================================== --- head/sysutils/moreutils/Makefile Sun Mar 10 08:51:21 2013 (r313817) +++ head/sysutils/moreutils/Makefile Sun Mar 10 09:02:47 2013 (r313818) @@ -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> Modified: head/sysutils/moreutils/distinfo ============================================================================== --- head/sysutils/moreutils/distinfo Sun Mar 10 08:51:21 2013 (r313817) +++ head/sysutils/moreutils/distinfo Sun Mar 10 09:02:47 2013 (r313818) @@ -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 Added: head/sysutils/moreutils/files/errno.1 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/moreutils/files/errno.1 Sun Mar 10 09:02:47 2013 (r313818) @@ -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) Modified: head/sysutils/moreutils/files/lckdo.1 ============================================================================== --- head/sysutils/moreutils/files/lckdo.1 Sun Mar 10 08:51:21 2013 (r313817) +++ head/sysutils/moreutils/files/lckdo.1 Sun Mar 10 09:02:47 2013 (r313818) @@ -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> Modified: head/sysutils/moreutils/files/patch-Makefile ============================================================================== --- head/sysutils/moreutils/files/patch-Makefile Sun Mar 10 08:51:21 2013 (r313817) +++ head/sysutils/moreutils/files/patch-Makefile Sun Mar 10 09:02:47 2013 (r313818) @@ -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 Modified: head/sysutils/moreutils/files/sponge.1 ============================================================================== --- head/sysutils/moreutils/files/sponge.1 Sun Mar 10 08:51:21 2013 (r313817) +++ head/sysutils/moreutils/files/sponge.1 Sun Mar 10 09:02:47 2013 (r313818) @@ -22,7 +22,7 @@ sponge \- soak up standard input and wri \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 Modified: head/sysutils/moreutils/pkg-descr ============================================================================== --- head/sysutils/moreutils/pkg-descr Sun Mar 10 08:51:21 2013 (r313817) +++ head/sysutils/moreutils/pkg-descr Sun Mar 10 09:02:47 2013 (r313818) @@ -17,4 +17,4 @@ So far, it includes the following utilit 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/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303100902.r2A92lLm029924>