From ba9d5cb9fd1685cbf55c35c0bfdb4ed80647e44a Mon Sep 17 00:00:00 2001
From: rillig <rillig@pkgsrc.org>
Date: Fri, 9 Mar 2007 15:38:32 +0000
Subject: Don't use "restrict" as an identifier in C code; it is reserved since
 C99.

Fixed PKGMANDIR.
---
 devel/cdecl/Makefile         |  3 ++-
 devel/cdecl/distinfo         |  4 ++--
 devel/cdecl/patches/patch-aa | 57 +++++++++++++++++++++++++++++++++++++++++---
 3 files changed, 58 insertions(+), 6 deletions(-)

diff --git a/devel/cdecl/Makefile b/devel/cdecl/Makefile
index be254862617..30e03da0893 100644
--- a/devel/cdecl/Makefile
+++ b/devel/cdecl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2007/02/22 19:26:21 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2007/03/09 15:38:32 rillig Exp $
 #
 
 DISTNAME=	cdecl-2.5
@@ -16,6 +16,7 @@ BUILD_TARGET=		cdecl
 # missing rl_completion_matches
 USE_GNU_READLINE=	yes
 USE_TOOLS+=		lex yacc
+INSTALL_MAKE_FLAGS=	MANDIR=${PREFIX}/${PKGMANDIR}/man1
 
 EGDIR=			${PREFIX}/share/examples/cdecl
 
diff --git a/devel/cdecl/distinfo b/devel/cdecl/distinfo
index c2aca71935e..e2e3b6abc09 100644
--- a/devel/cdecl/distinfo
+++ b/devel/cdecl/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.9 2006/01/08 20:16:27 joerg Exp $
+$NetBSD: distinfo,v 1.10 2007/03/09 15:38:32 rillig Exp $
 
 SHA1 (cdecl-2.5.tar.gz) = b955a0b95b635090360b19de888cb29d5c005296
 RMD160 (cdecl-2.5.tar.gz) = 351c36dcc7f18e4d143f2559460025d2de9a83c4
 Size (cdecl-2.5.tar.gz) = 21435 bytes
-SHA1 (patch-aa) = 2f78a0b77fb2625a1693776bf92ba8d5412bab5a
+SHA1 (patch-aa) = 4d2d8c2bd163b37f5ea2f6d397de6367dbcf5b3e
 SHA1 (patch-ab) = e8c9f70894ed5613234ed17b8c1c95c9b12afd7b
diff --git a/devel/cdecl/patches/patch-aa b/devel/cdecl/patches/patch-aa
index a5dcd1f3781..dbcd37a7bc8 100644
--- a/devel/cdecl/patches/patch-aa
+++ b/devel/cdecl/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.8 2006/01/08 20:16:27 joerg Exp $
+$NetBSD: patch-aa,v 1.9 2007/03/09 15:38:32 rillig Exp $
 
---- cdecl.c.orig	1996-01-16 03:54:46.000000000 +0000
-+++ cdecl.c
+--- cdecl.c.orig	1996-01-16 04:54:46.000000000 +0100
++++ cdecl.c	2007-03-09 16:36:18.000000000 +0100
 @@ -59,7 +59,9 @@
   */
  
@@ -74,6 +74,57 @@ $NetBSD: patch-aa,v 1.8 2006/01/08 20:16:27 joerg Exp $
    int dotmpfile(), dofileargs();
  #endif /* __STDC__ */
    FILE *tmpfile();
+@@ -241,7 +247,7 @@ struct
+ /* for unsupported combinations of types. */
+ void mbcheck()
+ {
+-    register int i, j, restrict;
++    register int i, j, xrestrict;
+     char *t1, *t2;
+ 
+     /* Loop through the types */
+@@ -258,26 +264,26 @@ void mbcheck()
+ 		if (!(modbits & crosstypes[j].bit))
+ 		    continue;
+ 		/* check the type of restriction */
+-		restrict = crosscheck[i][j];
+-		if (restrict == ALWAYS)
++		xrestrict = crosscheck[i][j];
++		if (xrestrict == ALWAYS)
+ 		    continue;
+ 		t1 = crosstypes[i].name;
+ 		t2 = crosstypes[j].name;
+-		if (restrict == NEVER)
++		if (xrestrict == NEVER)
+ 		    {
+ 		    notsupported("", t1, t2);
+ 		    }
+-		else if (restrict == RITCHIE)
++		else if (xrestrict == RITCHIE)
+ 		    {
+ 		    if (RitchieFlag)
+ 			notsupported(" (Ritchie Compiler)", t1, t2);
+ 		    }
+-		else if (restrict == PREANSI)
++		else if (xrestrict == PREANSI)
+ 		    {
+ 		    if (PreANSIFlag || RitchieFlag)
+ 			notsupported(" (Pre-ANSI Compiler)", t1, t2);
+ 		    }
+-		else if (restrict == ANSI)
++		else if (xrestrict == ANSI)
+ 		    {
+ 		    if (!RitchieFlag && !PreANSIFlag)
+ 			notsupported(" (ANSI Compiler)", t1, t2);
+@@ -286,7 +292,7 @@ void mbcheck()
+ 		    {
+ 		    (void) fprintf (stderr,
+ 			"%s: Internal error in crosscheck[%d,%d]=%d!\n",
+-			progname, i, j, restrict);
++			progname, i, j, xrestrict);
+ 		    exit(1); /* NOTREACHED */
+ 		    }
+ 		}
 @@ -399,12 +405,12 @@ char ** attempt_completion(char *text, i
  {
    char **matches = NULL;
-- 
cgit v1.2.3