diff options
| author | jmmv <jmmv@pkgsrc.org> | 2003-11-05 15:27:41 +0000 |
|---|---|---|
| committer | jmmv <jmmv@pkgsrc.org> | 2003-11-05 15:27:41 +0000 |
| commit | dc1037e6d87281471628a188e5d27d92a8467add (patch) | |
| tree | effd46065fbc14dbaecd03107a8474be21d90a45 /devel | |
| parent | c20ee7f2b69397d7ab41f2275d6b36a34846972d (diff) | |
| download | pkgsrc-dc1037e6d87281471628a188e5d27d92a8467add.tar.gz | |
Fix build with gcc3.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/astyle/Makefile | 8 | ||||
| -rw-r--r-- | devel/astyle/distinfo | 5 | ||||
| -rw-r--r-- | devel/astyle/patches/patch-aa | 16 | ||||
| -rw-r--r-- | devel/astyle/patches/patch-ab | 13 |
4 files changed, 33 insertions, 9 deletions
diff --git a/devel/astyle/Makefile b/devel/astyle/Makefile index 4fc7e6f7153..40d665a4d7b 100644 --- a/devel/astyle/Makefile +++ b/devel/astyle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2003/07/21 16:43:15 martti Exp $ +# $NetBSD: Makefile,v 1.6 2003/11/05 15:27:41 jmmv Exp $ # DISTNAME= astyle_1.13.6.1 @@ -13,6 +13,12 @@ COMMENT= Reindenter and reformatter of C++, C and Java source code HTMLDIR= ${PREFIX}/share/doc/html/astyle +.include "../../mk/bsd.prefs.mk" + +.if !empty(CC_VERSION:Mgcc-2*) +CFLAGS+= -DASTYLE_GCC2 +.endif + post-extract: ${MV} -f ${WRKSRC}/makefile ${WRKSRC}/Makefile diff --git a/devel/astyle/distinfo b/devel/astyle/distinfo index 7a99d254f7e..8f7692fc522 100644 --- a/devel/astyle/distinfo +++ b/devel/astyle/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.2 2001/04/21 00:44:10 wiz Exp $ +$NetBSD: distinfo,v 1.3 2003/11/05 15:27:41 jmmv Exp $ SHA1 (astyle_1.13.6.1.zip) = 4e0172fe30986d68c61b4a7c1638a1fc42ea0675 Size (astyle_1.13.6.1.zip) = 61422 bytes -SHA1 (patch-aa) = 963338c21b5015fd7a5284a57419557026ee8093 +SHA1 (patch-aa) = 8dd8b4b7aebd70baecee4c060c977e8d150da471 +SHA1 (patch-ab) = c9b21d45f53331411425a734971f003d415b11e7 diff --git a/devel/astyle/patches/patch-aa b/devel/astyle/patches/patch-aa index cba7e4a494c..00ac03f7951 100644 --- a/devel/astyle/patches/patch-aa +++ b/devel/astyle/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/03/15 13:32:35 hubertf Exp $ +$NetBSD: patch-aa,v 1.2 2003/11/05 15:27:41 jmmv Exp $ ---- Makefile.orig Fri Feb 11 12:02:10 2000 -+++ Makefile Tue Mar 13 14:58:01 2001 -@@ -1,7 +1,12 @@ +--- Makefile.orig 2000-02-11 12:02:10.000000000 +0100 ++++ Makefile +@@ -1,14 +1,19 @@ # "Artistic Style" Makefile CPPFLAGS = -Wall -Wno-sign-compare -O2 @@ -15,8 +15,12 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/03/15 13:32:35 hubertf Exp $ + install -s -c astyle ${LOCALBASE}/bin/ astyle: $(OBJS) - g++ $(CPPFLAGS) -o astyle $(OBJS) -@@ -11,4 +16,4 @@ +- g++ $(CPPFLAGS) -o astyle $(OBJS) ++ g++ $(CPPFLAGS) $(LDFLAGS) -o astyle $(OBJS) + + .cpp.o: +- g++ $(CPPFLAGS) -c $< ++ g++ $(CPPFLAGS) $(CFLAGS) -c $< .SUFFIXES: .cpp .c .o clean: diff --git a/devel/astyle/patches/patch-ab b/devel/astyle/patches/patch-ab new file mode 100644 index 00000000000..228d695669b --- /dev/null +++ b/devel/astyle/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1 2003/11/05 15:27:41 jmmv Exp $ + +--- compiler_defines.h.orig 2003-11-05 16:09:42.000000000 +0100 ++++ compiler_defines.h +@@ -31,7 +31,7 @@ + #define USES_NAMESPACE + + +-#ifdef __GNUC__ ++#if defined(__GNUC__) && defined(ASTYLE_GCC2) + // for G++ implementation of string.compare: + #define COMPARE(place, length, str) compare((str), (place), (length)) + #else |