From 6d5be2c70d55fe86777d9eebe97aa390fb8f247f Mon Sep 17 00:00:00 2001 From: grant Date: Sat, 12 Jun 2004 02:30:35 +0000 Subject: don't pass gcc specific -W flags, call ${CXX} not "g++". --- devel/astyle/distinfo | 4 ++-- devel/astyle/patches/patch-aa | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) (limited to 'devel/astyle') diff --git a/devel/astyle/distinfo b/devel/astyle/distinfo index 8f7692fc522..790c4a7d25a 100644 --- a/devel/astyle/distinfo +++ b/devel/astyle/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.3 2003/11/05 15:27:41 jmmv Exp $ +$NetBSD: distinfo,v 1.4 2004/06/12 02:30:35 grant Exp $ SHA1 (astyle_1.13.6.1.zip) = 4e0172fe30986d68c61b4a7c1638a1fc42ea0675 Size (astyle_1.13.6.1.zip) = 61422 bytes -SHA1 (patch-aa) = 8dd8b4b7aebd70baecee4c060c977e8d150da471 +SHA1 (patch-aa) = 1bb6cb72145c52e548336d4d90020fa982d049e1 SHA1 (patch-ab) = c9b21d45f53331411425a734971f003d415b11e7 diff --git a/devel/astyle/patches/patch-aa b/devel/astyle/patches/patch-aa index 00ac03f7951..a3a62883d93 100644 --- a/devel/astyle/patches/patch-aa +++ b/devel/astyle/patches/patch-aa @@ -1,12 +1,13 @@ -$NetBSD: patch-aa,v 1.2 2003/11/05 15:27:41 jmmv Exp $ +$NetBSD: patch-aa,v 1.3 2004/06/12 02:30:35 grant Exp $ ---- Makefile.orig 2000-02-11 12:02:10.000000000 +0100 +--- Makefile.orig 2000-02-11 12:02:10.000000000 +1100 +++ Makefile @@ -1,14 +1,19 @@ # "Artistic Style" Makefile - CPPFLAGS = -Wall -Wno-sign-compare -O2 +-CPPFLAGS = -Wall -Wno-sign-compare -O2 -OBJS = ASResource.o ASBeautifier.o ASFormatter.o astyle_main.o ++#CPPFLAGS = -Wall -Wno-sign-compare -O2 +OBJS = asresource.o asbeautifier.o asformatter.o astyle_main.o + +all: astyle @@ -16,11 +17,11 @@ $NetBSD: patch-aa,v 1.2 2003/11/05 15:27:41 jmmv Exp $ astyle: $(OBJS) - g++ $(CPPFLAGS) -o astyle $(OBJS) -+ g++ $(CPPFLAGS) $(LDFLAGS) -o astyle $(OBJS) ++ $(CXX) $(CPPFLAGS) $(LDFLAGS) -o astyle $(OBJS) .cpp.o: - g++ $(CPPFLAGS) -c $< -+ g++ $(CPPFLAGS) $(CFLAGS) -c $< ++ $(CXX) $(CPPFLAGS) $(CFLAGS) -c $< .SUFFIXES: .cpp .c .o clean: -- cgit v1.2.3