diff options
| author | edwin <edwin@FreeBSD.org> | 2002-10-29 01:36:44 +0000 |
|---|---|---|
| committer | edwin <edwin@FreeBSD.org> | 2002-10-29 01:36:44 +0000 |
| commit | 4fea9b8ee8d9113f84f80d6e4d6c53fc54ebd709 (patch) | |
| tree | ff44fc3f29941e2b7b9ae2111f0136138a877473 /news/nn/files | |
| parent | d7913786158a10f5ecb9418cbe70fec57799c675 (diff) | |
| download | FreeBSD-ports-4fea9b8ee8d9113f84f80d6e4d6c53fc54ebd709.zip FreeBSD-ports-4fea9b8ee8d9113f84f80d6e4d6c53fc54ebd709.tar.gz | |
Unbreak news/nn on -current. From patch-submission:
news/nn doesn't build on -CURRENT because 'cc -E' now emits
blanks instead of keeping the tabs when generating the intermediate
makefile, so some unexpansion is called for. Fix $CC & $MAKE
while we're at it. Patch works on -STABLE, too.
PR: ports/44530
Submitted by: Volker Stolz <vs@foldr.org>
Approved by: Jasper O'Malley <jooji@cornflake.nickelkid.com> (maintainer)
Diffstat (limited to 'news/nn/files')
| -rw-r--r-- | news/nn/files/patch-ag | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/news/nn/files/patch-ag b/news/nn/files/patch-ag index e70892a..c462683 100644 --- a/news/nn/files/patch-ag +++ b/news/nn/files/patch-ag @@ -1,6 +1,11 @@ ---- Makefile.orig Thu Dec 6 19:56:18 2001 -+++ Makefile Thu Dec 6 19:57:58 2001 -@@ -22,12 +22,12 @@ +--- Makefile.orig Mon Jul 2 06:54:34 2001 ++++ Makefile Sun Oct 27 16:54:54 2002 +@@ -18,17 +18,16 @@ + # + # Use /lib/cpp or /usr/ccs/lib/cpp for CPP on Solaris or SVR4 machines. + +-CC = gcc ++CC ?= gcc CPP = $(CC) -E #CPP = /lib/cpp #CFLAGS = -O2 # -g # -I/usr/local/lib/malloc-debug -DMALLOC_FUNC_CHECK @@ -11,10 +16,19 @@ #-Wpointer-arith -Wcast-qual -Wcast-align -Wconversion \ #-Waggregate-return -Wmissing-prototypes -Wnested-externs -#LDFLAGS = -s # -lmalloc # /usr/local/lib/malloc-debug/libmalloc.a +-MAKE = make +LDFLAGS = -s # -lmalloc # /usr/local/lib/malloc-debug/libmalloc.a - MAKE = make + SHELL = /bin/sh +@@ -63,6 +62,7 @@ + -e '/^#/d' \ + -e '/^[ \f ]$$/d' \ + -e '/^[ \/]*[*]/d' | \ ++ unexpand | \ + sed -n -e '/^..*$$/p' > ymakefile + rm -f MF.c + @@ -97,3 +97,5 @@ man/nn.1.D: man/nn.1 sh SPLITNN1 |
