From da5c89950e5065e1e7c0b3cdaf0df3370d16965f Mon Sep 17 00:00:00 2001 From: skrll Date: Wed, 4 Apr 2001 16:26:12 +0000 Subject: Change ignore message slightly. One patch per file. MD5 -> SHA1 --- devel/libg++/Makefile | 4 +-- devel/libg++/files/md5 | 4 +-- devel/libg++/files/patch-sum | 6 ++-- devel/libg++/patches/patch-aa | 70 ++++++++----------------------------------- devel/libg++/patches/patch-ab | 13 ++++++++ devel/libg++/patches/patch-ac | 13 ++++++++ 6 files changed, 46 insertions(+), 64 deletions(-) create mode 100644 devel/libg++/patches/patch-ab create mode 100644 devel/libg++/patches/patch-ac (limited to 'devel/libg++') diff --git a/devel/libg++/Makefile b/devel/libg++/Makefile index bab8b684d1a..b9a3d21fddf 100644 --- a/devel/libg++/Makefile +++ b/devel/libg++/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2001/03/08 10:19:20 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2001/04/04 16:26:12 skrll Exp $ # DISTNAME= libg++-${GXXVERSION} @@ -9,7 +9,7 @@ MAINTAINER= tv@netbsd.org COMMENT= The GNU C++ Class Library .if !exists(/usr/lib/libstdc++.so.2.0) -IGNORE= '${PKGNAME} is designed for NetBSD 1.4 - 1.3(.x) comes with this in-tree' +IGNORE= '${PKGNAME} is designed for NetBSD>=1.4. NetBSD 1.3(.x) comes with this in-tree' .endif # used by internal Makefile diff --git a/devel/libg++/files/md5 b/devel/libg++/files/md5 index 4bd9c35b644..63ba2d8e5cd 100644 --- a/devel/libg++/files/md5 +++ b/devel/libg++/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.3 1998/08/07 13:21:24 agc Exp $ +$NetBSD: md5,v 1.4 2001/04/04 16:26:12 skrll Exp $ -MD5 (libg++-2.8.1.1a.tar.gz) = 36241ad044c515d200e6e0274a3fb26e +SHA1 (libg++-2.8.1.1a.tar.gz) = 9b205ff12d81ebb45845a36f264bd84c408d6dcc diff --git a/devel/libg++/files/patch-sum b/devel/libg++/files/patch-sum index 1e5b35d664c..5282c5882b4 100644 --- a/devel/libg++/files/patch-sum +++ b/devel/libg++/files/patch-sum @@ -1,3 +1,5 @@ -$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:36 agc Exp $ +$NetBSD: patch-sum,v 1.2 2001/04/04 16:26:12 skrll Exp $ -MD5 (patch-aa) = 19b2c43b91467ef9415b44079768614e +SHA1 (patch-aa) = 4750e57b84b740ce14f27053c635d042657f9b17 +SHA1 (patch-ab) = 6f8347d8a8a3904902ba55f1411b7a4df2cf51f2 +SHA1 (patch-ac) = 8c6ac4baf367442c6c42c35e2153be168ffbb518 diff --git a/devel/libg++/patches/patch-aa b/devel/libg++/patches/patch-aa index 0ac82e2af1d..9a1ac07eb3a 100644 --- a/devel/libg++/patches/patch-aa +++ b/devel/libg++/patches/patch-aa @@ -1,59 +1,13 @@ -$NetBSD: patch-aa,v 1.2 1998/08/07 10:40:25 agc Exp $ +$NetBSD: patch-aa,v 1.3 2001/04/04 16:26:12 skrll Exp $ -*** libg++/src/ACG.cc.orig Sat Jun 24 17:40:39 1995 ---- libg++/src/ACG.cc Thu Apr 9 07:34:24 1998 -*************** -*** 172,178 **** - // - - static const _G_uint32_t LC_A = 66049; -! static const _G_uint32_t LC_C = 3907864577; - static inline _G_uint32_t LCG(_G_uint32_t x) - { - return( x * LC_A + LC_C ); ---- 172,178 ---- - // - - static const _G_uint32_t LC_A = 66049; -! static const _G_uint32_t LC_C = 3907864577U; - static inline _G_uint32_t LCG(_G_uint32_t x) - { - return( x * LC_A + LC_C ); -*** libg++/src/hash.cc.orig Sat Jun 24 12:45:40 1995 ---- libg++/src/hash.cc Thu Apr 9 07:34:51 1998 -*************** -*** 41,47 **** - unsigned int multiplicativehash(int x) - { - // uses a const close to golden ratio * pow(2,32) -! return ((unsigned)x) * 2654435767; - } - - ---- 41,47 ---- - unsigned int multiplicativehash(int x) - { - // uses a const close to golden ratio * pow(2,32) -! return ((unsigned)x) * 2654435767U; - } - - -*** libg++/src/timer.c.orig Sat Jun 24 12:45:41 1995 ---- libg++/src/timer.c Thu Apr 9 08:51:48 1998 -*************** -*** 29,35 **** - - #if 1 - -! #include <_G_config.h> - #include - #if _G_HAVE_SYS_RESOURCE - #include ---- 29,35 ---- - - #if 1 - -! #include - #include - #if _G_HAVE_SYS_RESOURCE - #include +--- libg++/src/ACG.cc.orig Sat Jun 24 22:40:39 1995 ++++ libg++/src/ACG.cc +@@ -172,7 +172,7 @@ + // + + static const _G_uint32_t LC_A = 66049; +-static const _G_uint32_t LC_C = 3907864577; ++static const _G_uint32_t LC_C = 3907864577U; + static inline _G_uint32_t LCG(_G_uint32_t x) + { + return( x * LC_A + LC_C ); diff --git a/devel/libg++/patches/patch-ab b/devel/libg++/patches/patch-ab new file mode 100644 index 00000000000..3181ecc28ce --- /dev/null +++ b/devel/libg++/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1 2001/04/04 16:26:12 skrll Exp $ + +--- libg++/src/hash.cc.orig Sat Jun 24 17:45:40 1995 ++++ libg++/src/hash.cc +@@ -41,7 +41,7 @@ + unsigned int multiplicativehash(int x) + { + // uses a const close to golden ratio * pow(2,32) +- return ((unsigned)x) * 2654435767; ++ return ((unsigned)x) * 2654435767U; + } + + diff --git a/devel/libg++/patches/patch-ac b/devel/libg++/patches/patch-ac new file mode 100644 index 00000000000..8a66e82c11b --- /dev/null +++ b/devel/libg++/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.1 2001/04/04 16:26:12 skrll Exp $ + +--- libg++/src/timer.c.orig Sat Jun 24 17:45:41 1995 ++++ libg++/src/timer.c +@@ -29,7 +29,7 @@ + + #if 1 + +-#include <_G_config.h> ++#include + #include + #if _G_HAVE_SYS_RESOURCE + #include -- cgit v1.2.3