From ccd6b03f420e1eaff2358eeb5b953ac2c6a85228 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Thu, 8 Aug 2013 11:55:30 +0200 Subject: [PATCH] Fix path to 'env' in help2man script of sed's build system. --- sys-apps/sed/patches/sed-4.2.1.patch | 12 ------- sys-apps/sed/patches/sed-4.2.1.patchset | 42 +++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 12 deletions(-) delete mode 100644 sys-apps/sed/patches/sed-4.2.1.patch create mode 100644 sys-apps/sed/patches/sed-4.2.1.patchset diff --git a/sys-apps/sed/patches/sed-4.2.1.patch b/sys-apps/sed/patches/sed-4.2.1.patch deleted file mode 100644 index a4b6c52f0..000000000 --- a/sys-apps/sed/patches/sed-4.2.1.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN sed-4.2.1.orig/lib/regexec.c sed-4.2.1/lib/regexec.c ---- sed-4.2.1.orig/lib/regexec.c 2008-06-04 18:23:17.189401740 +0000 -+++ sed-4.2.1/lib/regexec.c 2008-06-04 18:26:00.994736475 +0000 -@@ -20,6 +20,8 @@ - with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - -+#include "stdbool.h" -+ - static reg_errcode_t match_ctx_init (re_match_context_t *cache, int eflags, - Idx n) internal_function; - static void match_ctx_clean (re_match_context_t *mctx) internal_function; diff --git a/sys-apps/sed/patches/sed-4.2.1.patchset b/sys-apps/sed/patches/sed-4.2.1.patchset new file mode 100644 index 000000000..243da1404 --- /dev/null +++ b/sys-apps/sed/patches/sed-4.2.1.patchset @@ -0,0 +1,42 @@ +From 5eb924fdedd1daece9dad63c4f6d65fbfc476c54 Mon Sep 17 00:00:00 2001 +From: Oliver Tappe +Date: Thu, 8 Aug 2013 11:44:47 +0200 +Subject: applying patch sed-4.2.1.patch + + +diff --git a/lib/regexec.c b/lib/regexec.c +index 4853551..47cccca 100644 +--- a/lib/regexec.c ++++ b/lib/regexec.c +@@ -20,6 +20,8 @@ + with this program; if not, write to the Free Software Foundation, + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + ++#include "stdbool.h" ++ + static reg_errcode_t match_ctx_init (re_match_context_t *cache, int eflags, + Idx n) internal_function; + static void match_ctx_clean (re_match_context_t *mctx) internal_function; +-- +1.7.10.2 + + +From b9af23f6ce44497d53c5ea4668096bbadd1c9d62 Mon Sep 17 00:00:00 2001 +From: Oliver Tappe +Date: Thu, 8 Aug 2013 11:50:12 +0200 +Subject: Fix path to 'env' in help2man + + +diff --git a/build-aux/help2man b/build-aux/help2man +index af57f41..89638a0 100755 +--- a/build-aux/help2man ++++ b/build-aux/help2man +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/bin/env perl + + # Generate a short man page from --help and --version output. + # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Free Software +-- +1.7.10.2 +