Bug 176850 - [PATCH] sysutils/moreutils-parallel: update to 0.47
Summary: [PATCH] sysutils/moreutils-parallel: update to 0.47
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Eitan Adler
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-03-11 13:50 UTC by Po-Chuan Hsieh
Modified: 2013-03-28 23:50 UTC (History)
1 user (show)

See Also:


Attachments
moreutils-parallel-0.47.patch (4.34 KB, patch)
2013-03-11 13:50 UTC, Po-Chuan Hsieh
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Po-Chuan Hsieh freebsd_committer freebsd_triage 2013-03-11 13:50:00 UTC
- Update to 0.47

Port maintainer (eadler@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99_7 (mode: update, diff: SVN)
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-03-11 13:50:08 UTC
Responsible Changed
From-To: freebsd-ports-bugs->eadler

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 Eitan Adler freebsd_committer freebsd_triage 2013-03-11 18:47:46 UTC
On 11 March 2013 09:43, Sunpoet Po-Chuan Hsieh <sunpoet@freebsd.org> wrote:
> --- moreutils-parallel-0.47.patch begins here ---
> Index: Makefile
> ===================================================================
> --- Makefile    (revision 313896)
> +++ Makefile    (working copy)
> @@ -2,9 +2,9 @@
>  # $FreeBSD$
>
>  PORTNAME=      moreutils-parallel
> -PORTVERSION=   0.44
> +PORTVERSION=   0.47

This is unfetchable for me:


fetch: ftp://ftp.cz.debian.org/debian/pool/main/m/moreutils-parallel/moreutils_0.47.tar.gz:
File unavailable (e.g., file not found, no access)
=> Attempting to fetch
ftp://ftp.it.debian.org/debian/pool/main/m/moreutils-parallel/moreutils_0.47.tar.gz
fetch: ftp://ftp.it.debian.org/debian/pool/main/m/moreutils-parallel/moreutils_0.47.tar.gz:
File unavailable (e.g., file not found, no access)
=> Attempting to fetch
ftp://ftp.ie.debian.org/debian/pool/main/m/moreutils-parallel/moreutils_0.47.tar.gz
fetch: ftp://ftp.ie.debian.org/debian/pool/main/m/moreutils-parallel/moreutils_0.47.tar.gz:
File unavailable (e.g., file not found, no access)

....


> Index: files/parallel.1

Why the changes here?  Can you explain a bit.



-- 
Eitan Adler
Source, Ports, Doc committer
Bugmeister, Ports Security teams
Comment 3 Po-Chuan Hsieh freebsd_committer freebsd_triage 2013-03-11 19:24:45 UTC
On Tue, Mar 12, 2013 at 2:47 AM, Eitan Adler <eadler@freebsd.org> wrote:

> On 11 March 2013 09:43, Sunpoet Po-Chuan Hsieh <sunpoet@freebsd.org>
> wrote:
> > --- moreutils-parallel-0.47.patch begins here ---
> > Index: Makefile
> > ===================================================================
> > --- Makefile    (revision 313896)
> > +++ Makefile    (working copy)
> > @@ -2,9 +2,9 @@
> >  # $FreeBSD$
> >
> >  PORTNAME=      moreutils-parallel
> > -PORTVERSION=   0.44
> > +PORTVERSION=   0.47
>
> This is unfetchable for me:
>
>
> fetch:
> ftp://ftp.cz.debian.org/debian/pool/main/m/moreutils-parallel/moreutils_0.47.tar.gz
> :
> File unavailable (e.g., file not found, no access)
> => Attempting to fetch
>
> ftp://ftp.it.debian.org/debian/pool/main/m/moreutils-parallel/moreutils_0.47.tar.gz
> fetch:
> ftp://ftp.it.debian.org/debian/pool/main/m/moreutils-parallel/moreutils_0.47.tar.gz
> :
> File unavailable (e.g., file not found, no access)
> => Attempting to fetch
>
> ftp://ftp.ie.debian.org/debian/pool/main/m/moreutils-parallel/moreutils_0.47.tar.gz
> fetch:
> ftp://ftp.ie.debian.org/debian/pool/main/m/moreutils-parallel/moreutils_0.47.tar.gz
> :
> File unavailable (e.g., file not found, no access)
>
> ....
>
>
I just copied it from sysutils/moreutils. It has the same problem as 0.44
in ports tree.

% cd /usr/ports/sysutils/moreutils-parallel
% make fetch-urlall-list
ftp://ftp.us.debian.org/debian/pool/main/m/moreutils-parallel/moreutils_0.44.tar.gz
...

What do you think about the following patch? (Use PKGNAMESUFFIX)

-PORTNAME=      moreutils-parallel
-PORTVERSION=   0.44
+PORTNAME=      moreutils
+PORTVERSION=   0.47
 CATEGORIES=    sysutils
-MASTER_SITES=  ${MASTER_SITE_DEBIAN_POOL}
-DISTNAME=      moreutils_${PORTVERSION}
+MASTER_SITES=  DEBIAN_POOL
+PKGNAMESUFFIX= -parallel
+DISTNAME=      ${PORTNAME}_${PORTVERSION}


>
> > Index: files/parallel.1
>
> Why the changes here?  Can you explain a bit.
>

The new parallel.1 was generated from moreutils 0.47. You can do it by
yourself with textproc/docbook2X.


>
>
> --
> Eitan Adler
> Source, Ports, Doc committer
> Bugmeister, Ports Security teams
>
Comment 4 Eitan Adler freebsd_committer freebsd_triage 2013-03-28 23:42:26 UTC
State Changed
From-To: open->closed

Committed. Thanks!
Comment 5 dfilter service freebsd_committer freebsd_triage 2013-03-28 23:43:33 UTC
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}
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"