Ticket #39491: 0001-moreutils-New-parallel-variant.patch

File 0001-moreutils-New-parallel-variant.patch, 3.9 KB (added by david@…, 11 years ago)

  • dports/sysutils/moreutils/Portfile 

    From fcc7bc64ea6c40701e8cffc444cb7ea31414d390 Mon Sep 17 00:00:00 2001
From: David Rothlisberger <david@rothlis.net>
Date: Sun, 23 Jun 2013 11:56:10 +0100
Subject: [PATCH v2] moreutils: New "parallel" variant

The "moreutils" and "parallel" ports both install a utility named
"parallel" (with incompatible command-line interfaces).

This commit allows installing the other moreutils utilities without
conflicting with the "parallel" port. I've chosen to *not* make
+parallel the default, because GNU parallel is more featureful and more
like xargs. This follows the example of Fedora, whose moreutils package
doesn't contain "parallel" at all.
---
 dports/sysutils/moreutils/Portfile                  |  6 +++++-
 dports/sysutils/moreutils/files/patch-Makefile.diff |  4 ++--
 dports/sysutils/moreutils/files/patch-parallel.diff | 11 +++++++++++
 dports/sysutils/parallel/Portfile                   |  2 --
 4 files changed, 18 insertions(+), 5 deletions(-)
 create mode 100644 dports/sysutils/moreutils/files/patch-parallel.diff

diff --git a/dports/sysutils/moreutils/Portfile b/dports/sysutils/moreutils/Portfile
index 3a707da..8b62c4f 100644
    a b  
    44PortSystem              1.0
    55
    66name                    moreutils
    7 conflicts               parallel
    87version                 0.48
    98categories              sysutils
    109platforms               darwin
    … … variant doc description {Install man pages} { 
    7473    }
    7574}
    7675
     76variant parallel description {Install the "parallel" utility} {
     77    conflicts-append    parallel
     78    patchfiles-append   patch-parallel.diff
     79}
     80
    7781platform darwin 8 {
    7882    # ticket #24279
    7983    pre-fetch {

  • dports/sysutils/moreutils/files/patch-Makefile.diff 

    diff --git a/dports/sysutils/moreutils/files/patch-Makefile.diff b/dports/sysutils/moreutils/files/patch-Makefile.diff
index 2c7db81..82a20e1 100644
    a b  
    22+++ Makefile    2013-06-21 17:34:18.000000000 -0500
    33@@ -1,13 +1,14 @@
    44-BINS=isutf8 ifdata ifne pee sponge mispipe lckdo parallel errno
    5 +BINS=isutf8 ifne pee sponge mispipe lckdo parallel errno
     5+BINS=isutf8 ifne pee sponge mispipe lckdo errno
    66 PERLSCRIPTS=vidir vipe ts combine zrun chronic
    77-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
    8 +MANS=sponge.1 vidir.1 vipe.1 isutf8.1 ts.1 combine.1 ifne.1 pee.1 zrun.1 chronic.1 mispipe.1 lckdo.1 parallel.1 errno.1
     8+MANS=sponge.1 vidir.1 vipe.1 isutf8.1 ts.1 combine.1 ifne.1 pee.1 zrun.1 chronic.1 mispipe.1 lckdo.1 errno.1
    99 CFLAGS?=-O2 -g -Wall
    1010 INSTALL_BIN?=install -s
    1111 PREFIX?=/usr

  • new file dports/sysutils/moreutils/files/patch-parallel.diff 

    diff --git a/dports/sysutils/moreutils/files/patch-parallel.diff b/dports/sysutils/moreutils/files/patch-parallel.diff
new file mode 100644
index 0000000..b8cf6ee
    - +  
     1--- Makefile.orig       2013-06-22 15:38:22.000000000 +0100
     2+++ Makefile    2013-06-22 15:38:58.000000000 +0100
     3@@ -1,6 +1,6 @@
     4-BINS=isutf8 ifne pee sponge mispipe lckdo errno
     5+BINS=isutf8 ifne pee sponge mispipe lckdo parallel errno
     6 PERLSCRIPTS=vidir vipe ts combine zrun chronic
     7-MANS=sponge.1 vidir.1 vipe.1 isutf8.1 ts.1 combine.1 ifne.1 pee.1 zrun.1 chronic.1 mispipe.1 lckdo.1 errno.1
     8+MANS=sponge.1 vidir.1 vipe.1 isutf8.1 ts.1 combine.1 ifne.1 pee.1 zrun.1 chronic.1 mispipe.1 parallel.1 lckdo.1 errno.1
     9 CFLAGS?=-O2 -g -Wall
     10 INSTALL_BIN?=install -s
     11 PREFIX?=/usr

  • dports/sysutils/parallel/Portfile 

    diff --git a/dports/sysutils/parallel/Portfile b/dports/sysutils/parallel/Portfile
index 929efcb..5e52697 100644
    a b homepage http://savannah.gnu.org/projects/parallel 
    1919master_sites        gnu
    2020use_bzip2           yes
    2121
    22 conflicts           moreutils
    23 
    2422depends_lib         port:perl5
    2523
    2624checksums           rmd160  5e248a772814f96cf09527f790d381fc17c5a0a9 \