Updated splint to 3.1.2.

Changes since 3.1.1:

Declarations of intptr_t and uintptr_t

    The standard library declares the intptr_t and uintptr_t types
    incorrectly. They are declared as int * and unsigned int *,
    but should be integral types (large enough to hold a pointer)
    instead.

    (Reported by David Sanderson, 25 Sep 2004. Fixed in development
    standard.h.)

Mode help

    Splint crashes when run with -help weak or another mode flag.

    (Reported by Clive Bach, 27 July 2004. Fixed in CVS 28 July 2004.)

Missing va_copy

    The standard library is missing va_copy.

    (Reported by Roland Illig, 21 May 2004. Fixed in CVS, 21 May 2004.)

Shifting in pre-processor expressions

    Splint will report an internal error for a preprocessor expression
    that shifts a negative value. This should produce a warning message
    instead.

    (Reported by Dirk Herrmann, 10 Nov 2003. Fixed in CVS, 18 May 2004,
    but no warning message added yet.)

gmtime and localtime

    The return type is incorrectly specified as /*@null@*/ in the
    standard library. gmtime and localtime are guaranteed to return
    non-null values.

    (Reported by Terry Colligan, 30 Oct 2003. Fixed in CVS, 2 Nov 2003.)

Redefining __func__

    Splint will report an internal bug if built in special definitions
    like __func__ are redefined.

    (Reported by Terry Colligan, 28 Oct 2003. Fixed in CVS, 28 Oct 2003.)

Pragma Line Numbers

    Splint does not count

    #pragma ...

    lines in the line number.

    (Reported by Scott Frazer, 27 Oct 2003. Fixed in CVS, 27 Oct 2003.)

Files Unclosed in Win32

    Options that involve writing messages to files do not work in Win32.
    The check that all files are closed was somehow copied to a location
    it shouldn't be (llmain:830).

    (Fixed in CVS 18 Sept 2003.)

Multi-dimensional Arrays

    Splint does not interpret declarations of multidimensional arrays
    correctly. A declaration like int a[][10] is misinterpreted as
    int a[10][].

    (Reported by Bill Leahy, 15 Sept 2003. Fixed in CVS 15 Sept 2003.)

&& and || guards

    Splint does not correctly interpret guards for non-boolean
    expressions in && and || clauses (e.g., if (s && t)).

    (Reported by Andrew Bishop. Fixed in CVS 13 August 2003.)

scanf %x

    Splint interprets %x in a scanf format string as an int *, but it
    should be an unsigned int *.

    (Reported by Andrew Bishop. Fixed in CVS 13 August 2003.)

+matchanyintegral and unsignedintegrals

    When +matchanyintegral is set, splint should allow any int type to
    match an aribtrary unsigned integral.

    (Reported by John Makecki. Fixed in CVS 18 July 2003.)

Shadow updates

    When a variable declaration is shadowed, the sRef_updateSref
    function will find the inner reference when there is an alias
    to the outer reference.

    (Reported by John Makecki. Fixed in CVS 18 July 2003.)

Internal assertion fails for unconventional bounds

    An internal assertion will fail for strange array indexes like,
    i["]<i;++i){--i;}"].

    (Reported by Xose Vazquez Perez. Fixed in CVS 12 July 2003.)

Assignments with global structs

    Splint does not correctly update state when the rhs of an assignment
    is a struct with global scope.

    (Reported by Steve Brooke. Fixed in CVS, 10 July 2003.)

Defining __STDC__

    Splint should define __STDC__. See http://bugs.debian.org/cgi-bin/
    bugreport.cgi?bug=171437&msg=7 for details.

    (Reported by Vincent Lefevre. Fixed in CVS, 10 July 2003)

Missing signal.h definitions

    The posix library is missing some definitions from signal.h.

    (Reported by Jerry James. Fixed in CVS, 13 June 2003)

Pre-processing ISO8859-1 characters

    Splint does not process ISO8859-1 characters correctly since it is
    building on a pre-ISO8859-1 version of gcc's pre-processor, and
    character \377 is indistinguishable from EOF.

    (Reported by Kai Hofmann. Fixed in CVS, 6 June 2003)

Printing lltok

    Splint prints -> tokens in specifications incorrectly as ".".
    Reported and fixed by Psanzani.

    (Fixed in CVS, 6 June 2003)

4 files changed, 16 insertions, 38 deletions

diff --git a/devel/splint/Makefile b/devel/splint/Makefile
index 9d472336cb1..c0c201d55d7 100644
--- a/devel/splint/Makefile
+++ b/devel/splint/Makefile
@@ -1,19 +1,16 @@
-# $NetBSD: Makefile,v 1.13 2007/02/22 19:26:25 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2009/03/03 08:58:23 rillig Exp $
 #
 
-VERSION=	3.1.1
-DISTNAME=	splint-${VERSION}.src
-PKGNAME=	splint-${VERSION}
-PKGREVISION=	1
+DISTNAME=	splint-3.1.2
+VERSION=	3.1.2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.splint.org/downloads/
-EXTRACT_SUFX= .tgz
+DISTFILES=	${DISTNAME}.src.tgz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://lclint.cs.virginia.edu/
 COMMENT=	Statically check C programs
 
-WRKSRC=		${WRKDIR}/splint-${VERSION}
 USE_TOOLS+=	gmake lex
 GNU_CONFIGURE=	YES
 
diff --git a/devel/splint/distinfo b/devel/splint/distinfo
index d42ead43da8..d1db39b073b 100644
--- a/devel/splint/distinfo
+++ b/devel/splint/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.6 2006/09/16 11:44:26 rillig Exp $
+$NetBSD: distinfo,v 1.7 2009/03/03 08:58:23 rillig Exp $
 
-SHA1 (splint-3.1.1.src.tgz) = 1192e8f18e8ef63fdc7a0b0fa26c35b46d59e4e6
-RMD160 (splint-3.1.1.src.tgz) = 8a0d04b20ccdfd50f99e3ef6abd59e7b25814912
-Size (splint-3.1.1.src.tgz) = 2425108 bytes
-SHA1 (patch-aa) = 12641b1d57a1e78fae19e81c53ac27f268bca498
-SHA1 (patch-ab) = 96c5f10adce1cc1442a55aa4aa9769ca1b0b285e
+SHA1 (splint-3.1.2.src.tgz) = 0df489cb228dcfffb149b38c57614c2c3e200501
+RMD160 (splint-3.1.2.src.tgz) = 52e9786d3cbeaa437877a33b18e42b32dff3b96b
+Size (splint-3.1.2.src.tgz) = 2284033 bytes
+SHA1 (patch-aa) = 3324bff7178957f25bab17cb8ab4d3d25a2d0397
diff --git a/devel/splint/patches/patch-aa b/devel/splint/patches/patch-aa
index 675626fb537..42a4cf2d7a7 100644
--- a/devel/splint/patches/patch-aa
+++ b/devel/splint/patches/patch-aa
@@ -1,20 +1,15 @@
-$NetBSD: patch-aa,v 1.2 2006/09/16 11:44:26 rillig Exp $
+$NetBSD: patch-aa,v 1.3 2009/03/03 08:58:23 rillig Exp $
 
 Some systems don't have <stdbool.h>.
 
---- src/Headers/basic.h.orig	2003-04-21 00:45:26.000000000 +0200
-+++ src/Headers/basic.h	2006-09-16 13:26:56.805383344 +0200
-@@ -22,8 +22,11 @@
+--- src/Headers/basic.h.orig	2003-11-02 21:55:03.000000000 +0100
++++ src/Headers/basic.h	2009-03-03 09:43:05.000000000 +0100
+@@ -26,7 +26,7 @@
  # include <stdlib.h>
  # include <stdio.h>
  
--# ifndef WIN32
--/* Microsoft VC++ still doesn't support ISO C99... */
-+# if defined(WIN32) || (defined(__GNUC__) && (__GNUC__ == 2)) || (defined(__sun) && !(__STDC_VERSION__ >= 199901L))
-+#define bool int
-+#define false 0
-+#define true 1
-+# else
+-# if !defined (WIN32) &&  !(defined (OS2) && defined (__IBMC__))
++# if !defined (WIN32) &&  !(defined (OS2) && defined (__IBMC__)) && !(defined(__GNUC__) && (__GNUC__ == 2)) && !(defined(__sun) && !(__STDC_VERSION__ >= 199901L))
+ /* Microsoft VC++ still doesn't support ISO C99... */
  # include <stdbool.h>
  # endif
- 
diff --git a/devel/splint/patches/patch-ab b/devel/splint/patches/patch-ab
deleted file mode 100644
index 4aeb5cae11d..00000000000
--- a/devel/splint/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2005/08/31 19:08:21 jschauma Exp $
-
---- src/cpplib.c.orig	2005-08-31 15:04:07.000000000 -0400
-+++ src/cpplib.c	2005-08-31 15:04:30.000000000 -0400
-@@ -2828,7 +2828,7 @@
-       else if (hp->type == T_CONST)
- 	ok = !CPPOPTIONS (pfile)->done_initializing;
-       else {
--	BADBRANCH;
-+	ok = FALSE; /* Redefining anything else is bad. */
-       }
- 
-       /* Print the warning if it's not ok.  */