From d892695f2b9616f4c00de5f475b701cd826eac54 Mon Sep 17 00:00:00 2001
From: rillig <rillig>
Date: Sun, 17 Sep 2006 13:18:59 +0000
Subject: The preprocessor of gcc 4 converts tabs into spaces, which must be
 restored before the resulting output can be used as a Makefile.

This fixes PR 34543.
---
 news/nn/distinfo         |  4 ++--
 news/nn/patches/patch-aa | 15 ++++++++++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

(limited to 'news/nn')

diff --git a/news/nn/distinfo b/news/nn/distinfo
index f81753df415..425e2708cc7 100644
--- a/news/nn/distinfo
+++ b/news/nn/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.10 2006/06/01 23:11:29 joerg Exp $
+$NetBSD: distinfo,v 1.11 2006/09/17 13:18:59 rillig Exp $
 
 SHA1 (nn-6.6.5.tar.Z) = 7f96de47dd96862fc9eb9b29a251964a01b63b1b
 RMD160 (nn-6.6.5.tar.Z) = 460592974b953ba0d6cb5a7234e6e4d688051090
 Size (nn-6.6.5.tar.Z) = 826135 bytes
-SHA1 (patch-aa) = e82b641d3f67cbf57cfb92dc469e1509c2205286
+SHA1 (patch-aa) = 4db396e04494940d01ddbb17b6f8df1629267a5e
 SHA1 (patch-ab) = 262d50b08031187e2fc99bf49f547fbcf21a2f39
 SHA1 (patch-ac) = 0388486772d5c8f57438a70b8d3bcfe55be5473d
 SHA1 (patch-ad) = 30f6a683b9d6f6b347822589b72baf8c00ac5c2d
diff --git a/news/nn/patches/patch-aa b/news/nn/patches/patch-aa
index aa3e83771f5..034c557466c 100644
--- a/news/nn/patches/patch-aa
+++ b/news/nn/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.10 2006/06/01 23:11:29 joerg Exp $
+$NetBSD: patch-aa,v 1.11 2006/09/17 13:18:59 rillig Exp $
 
---- Makefile.orig	2002-02-08 04:14:41.000000000 +0000
-+++ Makefile
+--- Makefile.orig	2002-02-08 05:14:41.000000000 +0100
++++ Makefile	2006-09-17 15:17:04.000000000 +0200
 @@ -18,16 +18,16 @@
  #
  # Use /lib/cpp or /usr/ccs/lib/cpp for CPP on Solaris or SVR4 machines.
@@ -23,6 +23,15 @@ $NetBSD: patch-aa,v 1.10 2006/06/01 23:11:29 joerg Exp $
  
  
  SHELL = /bin/sh
+@@ -60,7 +60,7 @@ ymakefile: Makefile xmakefile config.h
+ 	       -DCDEBUG="$(CFLAGS)" -Iconf MF.c | \
+ 	sed -e '1,/MAKE WILL CUT HERE/d' \
+ 	    -e '/^#/d' \
+-	    -e 's/^        /	/' \
++	    -e 's/^  */	/' \
+ 	    -e '/^[ \f	]$$/d' \
+ 	    -e '/^[ \/]*[*]/d' | \
+ 	sed -n -e '/^..*$$/p' > ymakefile
 @@ -97,3 +97,5 @@ split: tar
  man/nn.1.D: man/nn.1
  	sh SPLITNN1
-- 
cgit v1.2.3