enable on all archs and honor CC/CFLAGS; ok jasper@

This commit is contained in:
naddy 2011-08-24 20:57:24 +00:00
parent 0577e53453
commit 1fbfa5d176
3 changed files with 17 additions and 25 deletions

View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.6 2010/11/20 09:48:38 espie Exp $
NOT_FOR_ARCHS = arm hppa hp300
# $OpenBSD: Makefile,v 1.7 2011/08/24 20:57:24 naddy Exp $
COMMENT = No News is Good News (Fast CLI Point & Read Newsreader)
DISTNAME = nn-6.7.3
REVISION = 0
CATEGORIES = news
HOMEPAGE = http://www.nndev.org
@ -24,9 +23,12 @@ EXTRACT_SUFX = .tar.Z
USE_GROFF = Yes
NO_REGRESS = Yes
MAKE_ENV = CC="${CC}"
.if "${MACHINE_ARCH}" == "alpha"
MFILE = m-alpha.h
.elif "${MACHINE_ARCH}" == "hppa"
MFILE = m-hp9000.h
.elif "${MACHINE_ARCH}" == "m68k"
MFILE = m-m680x0.h
.elif "${MACHINE_ARCH}" == "m88k"

View File

@ -1,12 +1,19 @@
$OpenBSD: patch-Makefile,v 1.1.1.1 2008/11/17 08:42:13 jasper Exp $
--- Makefile.orig Mon Nov 17 09:35:23 2008
+++ Makefile Mon Nov 17 09:35:32 2008
@@ -18,7 +18,7 @@
$OpenBSD: patch-Makefile,v 1.2 2011/08/24 20:57:24 naddy Exp $
--- Makefile.orig Wed Oct 26 06:08:03 2005
+++ Makefile Wed Aug 24 21:13:18 2011
@@ -18,13 +18,13 @@
#
# Use /lib/cpp or /usr/ccs/lib/cpp for CPP on Solaris or SVR4 machines.
-CC = cc
+CC ?= cc
+#CC = cc
CPP = $(CC) -E
#CPP = /lib/cpp
#CPP = /usr/bin/cpp -no-cpp-precomp # for MacOS X
-CFLAGS = -O # -g -Wall -ansi -pedantic
+#CFLAGS = -O # -g -Wall -ansi -pedantic
#CFLAGS = -O # -w0 -g3 # for DEC
MAKE = make

View File

@ -1,17 +0,0 @@
$OpenBSD: patch-xmakefile,v 1.1.1.1 2008/11/17 08:42:13 jasper Exp $
--- xmakefile.orig Thu Mar 31 09:47:29 2005
+++ xmakefile Wed Sep 24 18:45:31 2008
@@ -51,10 +51,9 @@
* Notice: ymakefile is made from xmakefile by the Makefile.
*
-CC = COMPILER
-CPP = PREPROC
-LDFLAGS = LDEBUG LOADER_FLAGS EXTRA_LIB
-CFLAGS = -Iconf COMPILER_FLAGS CDEBUG
+CPP ?= PREPROC
+LDFLAGS += LDEBUG LOADER_FLAGS EXTRA_LIB
+CFLAGS += -Iconf COMPILER_FLAGS CDEBUG
*
* Resulting programs