From 1db4805bb98b0cb7f4285cab64aad880f4a9c4fd Mon Sep 17 00:00:00 2001
From: martynas <martynas@openbsd.org>
Date: Thu, 24 Jul 2008 10:02:57 +0000
Subject: [PATCH] remove bogus patch.  atof("Infinity") actually produces zero,
 and then no wonder the patch removes further regression tests... this is not
 needed now that that archs have proper INFINITY and NAN definitions ok
 phessler@

---
 devel/glib2/Makefile                          |  6 ++--
 devel/glib2/patches/patch-tests_strtod-test_c | 29 -------------------
 2 files changed, 3 insertions(+), 32 deletions(-)
 delete mode 100644 devel/glib2/patches/patch-tests_strtod-test_c

diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index 49e036aae5a..b93124e380b 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.47 2008/07/08 08:38:26 brad Exp $
+# $OpenBSD: Makefile,v 1.48 2008/07/24 10:02:57 martynas Exp $
 
 COMMENT-main=		general-purpose utility library
 COMMENT-docs=		glib2 documentation
 
 VERSION=		2.16.4
 DISTNAME=		glib-${VERSION}
-PKGNAME-main=		glib2-${VERSION}
-PKGNAME-docs=		glib2-docs-${VERSION}
+PKGNAME-main=		glib2-${VERSION}p0
+PKGNAME-docs=		glib2-docs-${VERSION}p0
 CATEGORIES=		devel
 
 HOMEPAGE=		http://www.gtk.org/
diff --git a/devel/glib2/patches/patch-tests_strtod-test_c b/devel/glib2/patches/patch-tests_strtod-test_c
deleted file mode 100644
index c8fa0454343..00000000000
--- a/devel/glib2/patches/patch-tests_strtod-test_c
+++ /dev/null
@@ -1,29 +0,0 @@
-$OpenBSD: patch-tests_strtod-test_c,v 1.2 2007/04/23 16:22:07 jasper Exp $
---- tests/strtod-test.c.orig	Fri Mar  9 05:01:32 2007
-+++ tests/strtod-test.c	Fri Apr 20 19:02:41 2007
-@@ -85,14 +85,12 @@ main ()
-   /* Do this before any call to setlocale.  */
-   our_nan = atof ("NaN");
- #endif
--  g_assert (isnan (our_nan));
- 
- #ifdef INFINITY
-   our_inf = INFINITY;
- #else
-   our_inf = atof ("Infinity");
- #endif
--  g_assert (our_inf > 1 && our_inf == our_inf / 2);
- 
-   test_string ("123.123", 123.123, FALSE, 0);
-   test_string ("123.123e2", 123.123e2, FALSE, 0);
-@@ -105,10 +103,6 @@ main ()
-   test_string ("5,4", 5.0, TRUE, 1);
-   /* the following are for #156421 */
-   test_string ("1e1", 1e1, FALSE, 0); 
--  test_string ("NAN", our_nan, FALSE, 0);
--  test_string ("-nan", -our_nan, FALSE, 0);
--  test_string ("INF", our_inf, FALSE, 0);
--  test_string ("-infinity", -our_inf, FALSE, 0);
-   test_string ("-.75,0", -0.75, TRUE, 4);
-   
-   d = 179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.0;