Update to cparser-0.9.7:

* lots of bugfixes
* add/correct semantic checks
* more/improved warnings
* internal cleanups (introduce entity_t types)
* support more GCC extensions
* improved error recovery
* support more switches for GCC compatibility
* support for libc builtins
* add a manpage

6 files changed, 37 insertions, 38 deletions

diff --git a/lang/cparser/Makefile b/lang/cparser/Makefile
index 7fa9f07c24d..618c91bcfef 100644
--- a/lang/cparser/Makefile
+++ b/lang/cparser/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2008/11/28 01:20:06 bjs Exp $
+# $NetBSD: Makefile,v 1.3 2008/12/17 16:59:19 joerg Exp $
 #
 
-DISTNAME=	cparser-0.9.5
+DISTNAME=	cparser-0.9.7
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=cparser/}
 EXTRACT_SUFX=	.tar.bz2
@@ -18,7 +18,6 @@ USE_LANGUAGES=	c99
 USE_LIBTOOL=	yes
 USE_TOOLS+=	gmake pkg-config
 
-AUTO_MKDIRS=	yes
 COPTS?=		-O2
 
 #DBG?=		-g3	# XXX debugging option (install without strip)
@@ -28,10 +27,13 @@ MAKE_ENV+=	COPTS=${COPTS:Q}
 
 BUILDLINK_TRANSFORM+=	rm:-Werror
 
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
+
 do-install:
 	${LIBTOOL} --mode=install \
 		${INSTALL_PROGRAM} ${WRKSRC}/build/cparser \
 		${DESTDIR}${PREFIX}/bin/cparser
+	${INSTALL_MAN} ${WRKSRC}/cparser.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../devel/libfirm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/cparser/PLIST b/lang/cparser/PLIST
index ba51e630428..d69c6d94257 100644
--- a/lang/cparser/PLIST
+++ b/lang/cparser/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/11/28 01:17:47 bjs Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/12/17 16:59:19 joerg Exp $
 bin/cparser
+man/man1/cparser.1
diff --git a/lang/cparser/distinfo b/lang/cparser/distinfo
index 956bc4089b1..10b7d920606 100644
--- a/lang/cparser/distinfo
+++ b/lang/cparser/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/11/28 01:17:47 bjs Exp $
+$NetBSD: distinfo,v 1.2 2008/12/17 16:59:19 joerg Exp $
 
-SHA1 (cparser-0.9.5.tar.bz2) = 50665cc78f4722a9aca38c2d2d07e4ef7b816f1b
-RMD160 (cparser-0.9.5.tar.bz2) = 3e2b95f8bda16ce2d6f569a5d1e94673e0536545
-Size (cparser-0.9.5.tar.bz2) = 151405 bytes
-SHA1 (patch-aa) = fa9cbb571ca87c8dafe84fcbdb7699491dd450f3
-SHA1 (patch-ab) = 3f373e0fd25d8d8632434d0425368e3e02583a90
+SHA1 (cparser-0.9.7.tar.bz2) = 2a34788f5233f8ebe8cb226eea2e1a12a0eaf72b
+RMD160 (cparser-0.9.7.tar.bz2) = 540281d2d01a3fd9bd9422c783ee36f97de8830c
+Size (cparser-0.9.7.tar.bz2) = 187966 bytes
+SHA1 (patch-aa) = 169811b929b3e129882e4befb6eaf136a96a1107
+SHA1 (patch-ac) = 8565aae449d78bb8e2f1fbc7f265c462d4fc2138
diff --git a/lang/cparser/patches/patch-aa b/lang/cparser/patches/patch-aa
index 3484b2b65c7..4c9114b6739 100644
--- a/lang/cparser/patches/patch-aa
+++ b/lang/cparser/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/11/28 01:17:47 bjs Exp $
+$NetBSD: patch-aa,v 1.2 2008/12/17 16:59:19 joerg Exp $
 
---- Makefile.orig	2008-11-27 19:36:46.000000000 -0500
+--- Makefile.orig	2008-12-01 18:57:31.000000000 +0100
 +++ Makefile
 @@ -8,18 +8,18 @@ BUILDDIR ?= build
  FIRM_CFLAGS ?= `pkg-config --cflags libfirm`
@@ -26,9 +26,9 @@ $NetBSD: patch-aa,v 1.1.1.1 2008/11/28 01:17:47 bjs Exp $
  
  LFLAGS += $(FIRM_LIBS)
  
-@@ -51,13 +51,13 @@ SOURCES := \
- 	driver/firm_opt.c \
+@@ -55,13 +55,13 @@ SOURCES := \
  	driver/gen_firm_asm.c \
+ 	preprocessor.c
  
 -OBJECTS = $(SOURCES:%.c=build/%.o)
 +OBJECTS = $(SOURCES:%.c=build/%.lo)
@@ -44,9 +44,9 @@ $NetBSD: patch-aa,v 1.1.1.1 2008/11/28 01:17:47 bjs Exp $
  
  Q = @
  
-@@ -93,7 +93,8 @@ UNUSED := $(shell mkdir -p $(DIRS))
+@@ -97,7 +97,8 @@ UNUSED := $(shell mkdir -p $(DIRS))
  
- $(GOAL): $(OBJECTS)
+ $(GOAL): $(OBJECTS) $(LIBFIRM_FILE)
  	@echo "===> LD $@"
 -	$(Q)$(CC) $(OBJECTS) $(LFLAGS) -o $(GOAL)
 +	$(Q)$(LIBTOOL) --mode=link --tag=CC \
@@ -54,7 +54,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2008/11/28 01:17:47 bjs Exp $
  
  splint: $(SPLINTS)
  
-@@ -123,36 +124,40 @@ builtins.h: builtins/builtins.c
+@@ -127,35 +128,42 @@ builtins.h: builtins/builtins.c create_b
  
  main.c: builtins.h
  
@@ -89,7 +89,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2008/11/28 01:17:47 bjs Exp $
  	@echo "===> LD $@"
 -	$(Q)gcc $(CPARSEROS_E) $(LFLAGS) -o $@
 +	$(Q)$(LIBTOOL) --mode=link \
-+		$(CC) $(CPARSEROS_E) $(LFLAGS) -o $@
++		gcc $(CPARSEROS_E) $(LFLAGS) -o $@
  
  cparser.bootstrap2: $(CPARSEROS2)
  	@echo "===> LD $@"
@@ -100,12 +100,11 @@ $NetBSD: patch-aa,v 1.1.1.1 2008/11/28 01:17:47 bjs Exp $
 -build/%.o: %.c
 +build/%.lo: %.c
  	@echo '===> CC $<'
--	$(Q)$(ICC) $(CPPFLAGS) $(ICC_CFLAGS) -c $< -o $@
--	$(Q)$(GCCO1) $(CPPFLAGS) $(CFLAGS) -O1 -c $< -o $@
+ #$(Q)$(ICC) $(CPPFLAGS) $(ICC_CFLAGS) -c $< -o $@
+ #$(Q)$(GCCO1) $(CPPFLAGS) $(CFLAGS) -O1 -c $< -o $@
 -	$(Q)$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
--
 +	$(Q)$(LIBTOOL) --mode=compile --tag=CC \
 +		$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
+ 
  clean:
  	@echo '===> CLEAN'
- 	$(Q)rm -rf build/* $(GOAL) .depend
diff --git a/lang/cparser/patches/patch-ab b/lang/cparser/patches/patch-ab
deleted file mode 100644
index d726c7d12f5..00000000000
--- a/lang/cparser/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2008/11/28 01:17:47 bjs Exp $
-
-Quell warning about possible uninitialized use;
-someone may wish to look into this further.
-
---- parser.c.orig	2008-08-01 05:01:24.000000000 -0400
-+++ parser.c
-@@ -2402,7 +2402,7 @@ static initializer_t *parse_initializer(
- {
- 	type_t        *type   = skip_typeref(env->type);
- 	initializer_t *result = NULL;
--	size_t         max_index;
-+	size_t         max_index = 0;
- 
- 	if(is_type_scalar(type)) {
- 		result = parse_scalar_initializer(type, env->must_be_constant);
diff --git a/lang/cparser/patches/patch-ac b/lang/cparser/patches/patch-ac
new file mode 100644
index 00000000000..f23d196ef5e
--- /dev/null
+++ b/lang/cparser/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2008/12/17 16:59:19 joerg Exp $
+
+--- ast.c.orig	2008-12-05 20:43:03.000000000 +0100
++++ ast.c
+@@ -206,7 +206,7 @@ static void print_const(const const_expr
+ #else
+ 		fprintf(out, "%.20Lg", val);
+ #endif
+-		if (isfinite(val) && truncl(val) == val)
++		if (isfinite(val) && trunc(val) == val)
+ 			fputs(".0", out);
+ 	} else {
+ 		panic("unknown constant");