Date: Sun, 27 Oct 2002 17:01:37 +0100 (CET) From: Volker Stolz <vs@foldr.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: jooji@nickelkid.com Subject: ports/44530: [patch] Unbreak news/nn on -CURRENT Message-ID: <200210271601.g9RG1bwN043027@monster.ikea.net>
next in thread | raw e-mail | index | archive | help
>Number: 44530 >Category: ports >Synopsis: [patch] Unbreak news/nn on -CURRENT >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sun Oct 27 07:10:01 PST 2002 >Closed-Date: >Last-Modified: >Originator: Volker Stolz >Release: FreeBSD 5.0-CURRENT i386 >Organization: Lambda Core Research Facility >Environment: System: FreeBSD monster.ikea.net 5.0-CURRENT FreeBSD 5.0-CURRENT #0: Sat Oct 26 17:47:39 CEST 2002 root@monster.ikea.net:/usr/obj/usr/src/sys/MONSTER i386 >Description: 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. >How-To-Repeat: >Fix: diff -ruN ofiles/patch-ag files/patch-ag --- ofiles/patch-ag Fri Dec 14 22:20:40 2001 +++ files/patch-ag Sun Oct 27 16:55:55 2002 @@ -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,9 +16,18 @@ #-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 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200210271601.g9RG1bwN043027>