From fdb314980010ece9398fbdeafaa1ef3975cec00d Mon Sep 17 00:00:00 2001 From: jasper Date: Tue, 26 Jun 2012 13:41:12 +0000 Subject: [PATCH] - these patches (or chunks) are not needed anymore since arpa/inet.h -r1.12 --- .../patch-src_Core_Debug_OODebugTCPConsoleClient_m | 14 +------------- games/wordwarvi/patches/patch-wordwarvi_c | 10 +--------- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/games/oolite/patches/patch-src_Core_Debug_OODebugTCPConsoleClient_m b/games/oolite/patches/patch-src_Core_Debug_OODebugTCPConsoleClient_m index d9e80fbc5a2..bff6ed280b9 100644 --- a/games/oolite/patches/patch-src_Core_Debug_OODebugTCPConsoleClient_m +++ b/games/oolite/patches/patch-src_Core_Debug_OODebugTCPConsoleClient_m @@ -1,18 +1,6 @@ -$OpenBSD: patch-src_Core_Debug_OODebugTCPConsoleClient_m,v 1.2 2011/01/15 10:13:23 sebastia Exp $ - -fix: 'struct in_addr' declared inside parameter list - +$OpenBSD: patch-src_Core_Debug_OODebugTCPConsoleClient_m,v 1.3 2012/06/26 13:41:12 jasper Exp $ --- src/Core/Debug/OODebugTCPConsoleClient.m.orig Sun Aug 30 13:40:23 2009 +++ src/Core/Debug/OODebugTCPConsoleClient.m Fri Jan 14 13:22:16 2011 -@@ -40,6 +40,8 @@ SOFTWARE. - #if OOLITE_WINDOWS - #import - #else -+#include -+#include - #import // For htonl - #endif - @@ -157,7 +159,7 @@ OOINLINE BOOL StatusIsSendable(OOTCPClientConnectionSt // Attempt to connect parameters = [NSDictionary dictionaryWithObjectsAndKeys: diff --git a/games/wordwarvi/patches/patch-wordwarvi_c b/games/wordwarvi/patches/patch-wordwarvi_c index 8e33d99002a..b8695d60ec9 100644 --- a/games/wordwarvi/patches/patch-wordwarvi_c +++ b/games/wordwarvi/patches/patch-wordwarvi_c @@ -1,4 +1,4 @@ -$OpenBSD: patch-wordwarvi_c,v 1.1.1.1 2011/06/13 20:33:19 kili Exp $ +$OpenBSD: patch-wordwarvi_c,v 1.2 2012/06/26 13:41:12 jasper Exp $ --- wordwarvi.c.orig Tue May 24 23:48:26 2011 +++ wordwarvi.c Tue May 24 23:49:42 2011 @@ -18,9 +18,10 @@ @@ -13,11 +13,3 @@ $OpenBSD: patch-wordwarvi_c,v 1.1.1.1 2011/06/13 20:33:19 kili Exp $ /* Apple gets what it needs for malloc from stdlib.h, */ /* or so the internets would have me believe. I don't */ /* have a mac to test this, so if this doesn't work, */ -@@ -37,6 +38,7 @@ - #include - #include - #include -+#include - #include /* for htonl, etc. */ - - #include