cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sysutils/moreutils: there is a cygwin codepath to implement waitid() as needed

Browse Source 
by moreutils' "parallel" tool that we can also use, so enable it. install the
binary as "parallel.moreutils" to avoid conflicting with GNU parallel
This commit is contained in:
sthen 2020-03-02 19:44:34 +00:00
parent e2e7880f68
commit c9c532b303
3 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sysutils/moreutils/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.19 2019/06/03 16:06:57 sthen Exp $
# $OpenBSD: Makefile,v 1.20 2020/03/02 19:44:34 sthen Exp $
COMMENT = miscellaneous unix tools
V = 0.63
REVISION = 0
DISTNAME = moreutils_$V.orig
PKGNAME = moreutils-$V
WRKDIST = ${WRKDIR}/moreutils-$V
@ -31,4 +32,8 @@ FAKE_FLAGS = PREFIX=${PREFIX}
USE_GMAKE = Yes
NO_TEST = Yes
post-install:
mv ${PREFIX}/bin/parallel{,.moreutils}
mv ${PREFIX}/man/man1/parallel{,.moreutils}.1
.include <bsd.port.mk>

16
sysutils/moreutils/patches/patch-Makefile
View File

@ -1,19 +1,9 @@
$OpenBSD: patch-Makefile,v 1.7 2018/04/11 13:31:08 sthen Exp $
# XXX N.B. if we get waitid() and want to enable parallel,
# it conflicts with sysutils/parallel
$OpenBSD: patch-Makefile,v 1.8 2020/03/02 19:44:34 sthen Exp $
Index: Makefile
--- Makefile.orig
+++ Makefile
@@ -1,4 +1,5 @@
-BINS=isutf8 ifdata ifne pee sponge mispipe lckdo parallel errno
+BINS=isutf8 ifdata ifne pee sponge mispipe lckdo errno
+#parallel - wants waitid()
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
@@ -20,7 +21,7 @@ clean:
@@ -20,7 +20,7 @@ clean:
is_utf8/*.o is_utf8/isutf8
isutf8: is_utf8/*.c is_utf8/*.h
@ -22,7 +12,7 @@ Index: Makefile
cp is_utf8/isutf8 .
install:
@@ -28,8 +29,8 @@ install:
@@ -28,8 +28,8 @@ install:
$(INSTALL_BIN) $(BINS) $(DESTDIR)$(PREFIX)/bin
install $(PERLSCRIPTS) $(DESTDIR)$(PREFIX)/bin

5
sysutils/moreutils/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2012/06/26 13:38:25 sthen Exp $
@comment $OpenBSD: PLIST,v 1.3 2020/03/02 19:44:34 sthen Exp $
bin/chronic
bin/combine
@bin bin/errno
@ -7,6 +7,7 @@ bin/combine
@bin bin/isutf8
@bin bin/lckdo
@bin bin/mispipe
@bin bin/parallel.moreutils
@bin bin/pee
@bin bin/sponge
bin/ts
@ -21,7 +22,7 @@ bin/zrun
@man man/man1/isutf8.1
@man man/man1/lckdo.1
@man man/man1/mispipe.1
@comment @man man/man1/parallel.1
@man man/man1/parallel.moreutils.1
@man man/man1/pee.1
@man man/man1/sponge.1
@man man/man1/ts.1