Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 28 Mar 2013 23:43:25 +0000 (UTC)
From:      Eitan Adler <eadler@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r315507 - in head/sysutils/moreutils-parallel: . files
Message-ID:  <201303282343.r2SNhPFZ050840@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: eadler
Date: Thu Mar 28 23:43:25 2013
New Revision: 315507
URL: http://svnweb.freebsd.org/changeset/ports/315507

Log:
  Update to 0.47
  
  PR:		ports/176850
  Submitted by:	sunpoet

Modified:
  head/sysutils/moreutils-parallel/Makefile
  head/sysutils/moreutils-parallel/distinfo
  head/sysutils/moreutils-parallel/files/parallel.1
  head/sysutils/moreutils-parallel/files/patch-Makefile

Modified: head/sysutils/moreutils-parallel/Makefile
==============================================================================
--- head/sysutils/moreutils-parallel/Makefile	Thu Mar 28 22:58:55 2013	(r315506)
+++ head/sysutils/moreutils-parallel/Makefile	Thu Mar 28 23:43:25 2013	(r315507)
@@ -2,9 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	moreutils-parallel
-PORTVERSION=	0.44
+PORTVERSION=	0.47
 CATEGORIES=	sysutils
-MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
+MASTER_SITES=	DEBIAN
+MASTER_SITE_SUBDIR=	pool/main/m/moreutils
 DISTNAME=	moreutils_${PORTVERSION}
 
 MAINTAINER=	eadler@FreeBSD.org
@@ -12,7 +13,6 @@ COMMENT=	Run programs in parallel
 
 CONFLICTS=	parallel-[0-9]*
 
-ALL_TARGET=	bins
 WRKSRC=		${WRKDIR}/moreutils
 
 MAN1=		parallel.1
@@ -22,7 +22,7 @@ PLIST_FILES=	bin/parallel
 MAKE_JOBS_SAFE=	yes
 
 post-patch:
-	cd ${FILESDIR} && ${CP} ${MAN1} ${WRKSRC}/
+	${CP} ${FILESDIR}/parallel.1 ${WRKSRC}/
 
 post-install:
 	cd ${WRKSRC} && ${INSTALL_MAN} ${MAN1} ${MANPREFIX}/man/man1/

Modified: head/sysutils/moreutils-parallel/distinfo
==============================================================================
--- head/sysutils/moreutils-parallel/distinfo	Thu Mar 28 22:58:55 2013	(r315506)
+++ head/sysutils/moreutils-parallel/distinfo	Thu Mar 28 23:43:25 2013	(r315507)
@@ -1,2 +1,2 @@
-SHA256 (moreutils_0.44.tar.gz) = 53ec2a967b4ab39cd29e5f9116b6f7b75eefdb97e768fe7b1b04fb688d236604
-SIZE (moreutils_0.44.tar.gz) = 44685
+SHA256 (moreutils_0.47.tar.gz) = 277058c99d76c58f850f48dfbc1ad4a7a384f5b95f3569842ec4ce1c9f077266
+SIZE (moreutils_0.47.tar.gz) = 46115

Modified: head/sysutils/moreutils-parallel/files/parallel.1
==============================================================================
--- head/sysutils/moreutils-parallel/files/parallel.1	Thu Mar 28 22:58:55 2013	(r315506)
+++ head/sysutils/moreutils-parallel/files/parallel.1	Thu Mar 28 23:43:25 2013	(r315507)
@@ -44,15 +44,15 @@ Use to limit the number of jobs
 that are run at the same time.
 .TP 
 \*(T<\fB\-l maxload\fR\*(T>
-Avoid starting new jobs when
-the system's load average is not below
-the specified limit.
+Wait as needed to avoid starting
+new jobs when the system's load average
+is not below the specified limit.
 .TP 
 \*(T<\fB\-i\fR\*(T>
 Normally the command is passed the
 argument at the end of its command line. With
-this option, the first instance of "{}" in
-the command is replaced with the argument.
+this option, any instances of "{}" in
+the command are replaced with the argument.
 .TP 
 \*(T<\fB\-n\fR\*(T>
 Number of arguments to pass to a
@@ -103,3 +103,5 @@ This runs three independent commands in 
 Its exit status is the combination of the exit statuses of each
 command ran, ORed together. (Thus, if any one command
 exits nonzero, \fBparallel\fR as a whole will exit nonzero.)
+.SH AUTHOR
+Tollef Fog Heen

Modified: head/sysutils/moreutils-parallel/files/patch-Makefile
==============================================================================
--- head/sysutils/moreutils-parallel/files/patch-Makefile	Thu Mar 28 22:58:55 2013	(r315506)
+++ head/sysutils/moreutils-parallel/files/patch-Makefile	Thu Mar 28 23:43:25 2013	(r315507)
@@ -1,40 +1,38 @@
---- ./Makefile.orig	2010-10-29 12:47:09.000000000 -0700
-+++ ./Makefile	2010-12-09 13:08:46.000000000 -0800
-@@ -1,51 +1,18 @@
--BINS=isutf8 ifdata ifne pee sponge mispipe lckdo parallel
+--- Makefile.orig	2012-06-06 01:55:53.000000000 +0800
++++ Makefile	2013-03-11 14:38:14.415417395 +0800
+@@ -1,60 +1,21 @@
+-BINS=isutf8 ifdata ifne pee sponge mispipe lckdo parallel 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
 +BINS=parallel
 +MANS=parallel.1
-+CFLAGS+= -Wall
++CFLAGS+=-Wall
  INSTALL_BIN?=install -s
 -PREFIX=/usr
--
+ 
 -DOCBOOK2XMAN=docbook2x-man
++.SUFFIXES: .1 .docbook
  
- all: $(BINS) $(MANS)
-+ 
-+bins: ${BINS}
-+
-+mans: ${MANS}
+-all: $(BINS) $(MANS)
++all: $(BINS)
  
  clean:
- 	rm -f $(BINS) $(MANS)
+ 	rm -f $(BINS) $(MANS) dump.c errnos.h errno.o
  
  install:
 -	mkdir -p $(DESTDIR)$(PREFIX)/bin
 -	$(INSTALL_BIN) $(BINS) $(DESTDIR)$(PREFIX)/bin
 -	install $(PERLSCRIPTS) $(DESTDIR)$(PREFIX)/bin
-+	mkdir -p $(PREFIX)/bin
-+	$(INSTALL_BIN) $(BINS) $(PREFIX)/bin
- 	
+-	
 -	mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1
 -	install $(MANS) $(DESTDIR)$(PREFIX)/share/man/man1
--
--check: isutf8
--	./check-isutf8
--
++	mkdir -p $(PREFIX)/bin
++	$(INSTALL_BIN) $(BINS) $(PREFIX)/bin
+ 
+ check: isutf8
+ 	./check-isutf8
+ 
 -isutf8.1: isutf8.docbook
 -	$(DOCBOOK2XMAN) $<
 -
@@ -58,6 +56,17 @@
 -
 -parallel.1: parallel.docbook
 -	$(DOCBOOK2XMAN) $<
+-	
+-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" $< > $@;
++.docbook.1:
++	$(DOCBOOK2XMAN) ${.IMPSRC}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303282343.r2SNhPFZ050840>