From 58e95f8719b2f5f37511bffb3592206b2967ee5f Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Tue, 10 Apr 2007 19:44:27 +0000
Subject: Kill a completely bogus fragment of configure (also dead upstream)
 and fix the issue in po/Makefile.in.in directly.

---
 textproc/gsed/distinfo         |  5 +++--
 textproc/gsed/patches/patch-aa | 22 ++++++++++++++++++++++
 textproc/gsed/patches/patch-ad | 11 ++++++++---
 3 files changed, 33 insertions(+), 5 deletions(-)
 create mode 100644 textproc/gsed/patches/patch-aa

(limited to 'textproc/gsed')

diff --git a/textproc/gsed/distinfo b/textproc/gsed/distinfo
index aa13a44b97f..aa0c0d2cee6 100644
--- a/textproc/gsed/distinfo
+++ b/textproc/gsed/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.12 2007/03/08 18:53:57 wiz Exp $
+$NetBSD: distinfo,v 1.13 2007/04/10 19:44:27 joerg Exp $
 
 SHA1 (sed-4.1.5.tar.gz) = 8e575e8a44568392d5b6e089eab5da5cdbd45885
 RMD160 (sed-4.1.5.tar.gz) = 49b12e99a55c6d2e78ad236f0205e63e46444173
 Size (sed-4.1.5.tar.gz) = 799584 bytes
-SHA1 (patch-ad) = e2b22a19f65d2fc3cb676c787479b15db131f896
+SHA1 (patch-aa) = fa00264254c527a08bce1b60090fc05ebe2fbd37
+SHA1 (patch-ad) = 95e210098db1ba9d28623acfa1e4d838e5d94cfa
 SHA1 (patch-ae) = 2091cccb70a8017d8e6fd356874681b51f366890
diff --git a/textproc/gsed/patches/patch-aa b/textproc/gsed/patches/patch-aa
new file mode 100644
index 00000000000..0fd81cff195
--- /dev/null
+++ b/textproc/gsed/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.4 2007/04/10 19:44:27 joerg Exp $
+
+--- configure.orig	2007-04-10 19:12:05.000000000 +0000
++++ configure
+@@ -11266,17 +11266,6 @@ done
+         ;;
+       esac
+     done ;;
+-    gettext-fix )
+-  sed -e '/^mkinstalldirs *=/a\' \
+-      -e "install_sh=$install_sh" \
+-      -e 's/^mkinstalldirs *=.*/mkinstalldirs=$(MKINSTALLDIRS)/' \
+-      intl/Makefile > intl/Makefile.tmp
+-  mv intl/Makefile.tmp intl/Makefile
+-  sed -e '/^mkinstalldirs *=/a\' \
+-      -e "install_sh=$install_sh" \
+-      -e 's/^mkinstalldirs *=.*/mkinstalldirs=$(MKINSTALLDIRS)/' \
+-      po/Makefile > po/Makefile.tmp
+-  mv po/Makefile.tmp po/Makefile ;;
+   esac
+ done
+ _ACEOF
diff --git a/textproc/gsed/patches/patch-ad b/textproc/gsed/patches/patch-ad
index 3b6f279f8d5..4c7dbb3367e 100644
--- a/textproc/gsed/patches/patch-ad
+++ b/textproc/gsed/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.4 2007/03/08 18:53:57 wiz Exp $
+$NetBSD: patch-ad,v 1.5 2007/04/10 19:44:27 joerg Exp $
 
---- po/Makefile.in.in.orig	2004-11-09 18:04:18.000000000 +0000
+--- po/Makefile.in.in.orig	2005-06-21 14:09:42.000000000 +0000
 +++ po/Makefile.in.in
-@@ -24,6 +24,7 @@ datadir = @datadir@
+@@ -24,10 +24,11 @@ datadir = @datadir@
  localedir = $(datadir)/locale
  gettextsrcdir = $(datadir)/gettext/po
  
@@ -10,3 +10,8 @@ $NetBSD: patch-ad,v 1.4 2007/03/08 18:53:57 wiz Exp $
  INSTALL = @INSTALL@
  INSTALL_DATA = @INSTALL_DATA@
  MKINSTALLDIRS = @MKINSTALLDIRS@
+-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
++mkinstalldirs = ${BSD_INSTALL_DATA_DIR}
+ 
+ GMSGFMT = @GMSGFMT@
+ MSGFMT = @MSGFMT@
-- 
cgit v1.2.3