From 0f0ea9f05db99077ae5cfc35c8dc6dc0691dc4a3 Mon Sep 17 00:00:00 2001
From: eadler <eadler@FreeBSD.org>
Date: Sun, 2 Mar 2014 19:51:41 +0000
Subject: moreutils-parallel: update port to 0.51

Update the port to 0.51 and in doing so simplify it: remove the Makefile patch
and pass MAKE_ARGS instead.
---
 sysutils/moreutils-parallel/Makefile             |  5 +-
 sysutils/moreutils-parallel/distinfo             |  4 +-
 sysutils/moreutils-parallel/files/patch-Makefile | 72 ------------------------
 3 files changed, 5 insertions(+), 76 deletions(-)
 delete mode 100644 sysutils/moreutils-parallel/files/patch-Makefile

(limited to 'sysutils')

diff --git a/sysutils/moreutils-parallel/Makefile b/sysutils/moreutils-parallel/Makefile
index a5cd9de335d8..4c6710312de0 100644
--- a/sysutils/moreutils-parallel/Makefile
+++ b/sysutils/moreutils-parallel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	moreutils-parallel
-PORTVERSION=	0.50
+PORTVERSION=	0.51
 CATEGORIES=	sysutils
 MASTER_SITES=	DEBIAN
 MASTER_SITE_SUBDIR=	pool/main/m/moreutils
@@ -17,6 +17,8 @@ CONFLICTS=	parallel-[0-9]*
 
 WRKSRC=		${WRKDIR}/moreutils
 
+MAKE_ARGS=	BINS=parallel  MANS=parallel.1
+
 PLIST_FILES=	bin/parallel man/man1/parallel.1.gz
 
 post-patch:
@@ -26,5 +28,4 @@ do-install:
 	${CP} ${WRKSRC}/parallel ${STAGEDIR}${PREFIX}/bin/parallel
 	cd ${WRKSRC} && ${INSTALL_MAN} parallel.1 ${STAGEDIR}${MANPREFIX}/man/man1/
 
-
 .include <bsd.port.mk>
diff --git a/sysutils/moreutils-parallel/distinfo b/sysutils/moreutils-parallel/distinfo
index 825d23c48f82..5906aae83f89 100644
--- a/sysutils/moreutils-parallel/distinfo
+++ b/sysutils/moreutils-parallel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (moreutils_0.50.tar.gz) = 4df833f17c2c6781c1d500ac51455af1929db5aeb96d06e45b00489393b37714
-SIZE (moreutils_0.50.tar.gz) = 46952
+SHA256 (moreutils_0.51.tar.gz) = 579e1e61f874d105ec3b6cf898a3ce7e487a58773a44769ce34c2fc7315cb141
+SIZE (moreutils_0.51.tar.gz) = 47404
diff --git a/sysutils/moreutils-parallel/files/patch-Makefile b/sysutils/moreutils-parallel/files/patch-Makefile
deleted file mode 100644
index 933ac056ee01..000000000000
--- a/sysutils/moreutils-parallel/files/patch-Makefile
+++ /dev/null
@@ -1,72 +0,0 @@
---- 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 errno.1
--CFLAGS?=-O2 -g -Wall
-+BINS=parallel
-+MANS=parallel.1
-+CFLAGS+=-Wall
- INSTALL_BIN?=install -s
--PREFIX?=/usr
- 
--DOCBOOK2XMAN=docbook2x-man
-+.SUFFIXES: .1 .docbook
- 
--all: $(BINS) $(MANS)
-+all: $(BINS)
- 
- clean:
- 	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 $(DESTDIR)$(PREFIX)/share/man/man1
--	install $(MANS) $(DESTDIR)$(PREFIX)/share/man/man1
-+	mkdir -p $(PREFIX)/bin
-+	$(INSTALL_BIN) $(BINS) $(PREFIX)/bin
- 
- check: isutf8
- 	./check-isutf8
- 
--isutf8.1: isutf8.docbook
--	$(DOCBOOK2XMAN) $<
--
--ifdata.1: ifdata.docbook
--	$(DOCBOOK2XMAN) $<
--
--ifne.1: ifne.docbook
--	$(DOCBOOK2XMAN) $<
--
--pee.1: pee.docbook
--	$(DOCBOOK2XMAN) $<
--
--sponge.1: sponge.docbook
--	$(DOCBOOK2XMAN) $<
--
--mispipe.1: mispipe.docbook
--	$(DOCBOOK2XMAN) $<
--
--lckdo.1: lckdo.docbook
--	$(DOCBOOK2XMAN) $<
--
--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}
-- 
cgit