From 8f7c2fde6a558c1366b1e747c2e42c29114456ff Mon Sep 17 00:00:00 2001 From: jasper Date: Tue, 5 Jul 2011 08:18:29 +0000 Subject: [PATCH] - adjust after recent curl update ok landry@ --- audio/gimmix/patches/patch-src_gimmix-covers_c | 11 +++++++++++ audio/gimmix/patches/patch-src_gimmix-lyrics_c | 11 +++++++++++ audio/libofa/patches/patch-examples_protocol_cpp | 11 +++++++++++ .../patches/patch-common_metaserver_c | 11 +++++++++++ games/f1spirit/patches/patch-sources_F1Shttp_cpp | 11 +++++++++++ geo/osm2go/patches/patch-src_net_io_c | 11 +++++++++++ geo/osm2go/patches/patch-src_osm_api_c | 11 +++++++++++ geo/tangogps/patches/patch-src_friends_c | 11 +++++++++++ geo/tangogps/patches/patch-src_tile_management_c | 11 +++++++++++ geo/tangogps/patches/patch-src_util_h | 11 +++++++++++ geo/viking/patches/patch-src_osm-traces_c | 11 +++++++++++ .../patches/patch-src_DLD-FUNCTIONS_urlwrite_cc | 11 +++++++++++ net/dysnomia/patches/patch-deezer_hpp | 11 +++++++++++ net/gnaughty/patches/patch-src_http_c | 11 +++++++++++ .../patch-modules_download-curl_download-curl_hpp | 11 +++++++++++ .../patches/patch-modules_submit-http_HTTPSession_cpp | 11 +++++++++++ .../patches/patch-modules_submit-http_HTTPSession_hpp | 11 +++++++++++ .../patches/patch-modules_submit-http_submit-http_hpp | 11 +++++++++++ .../patch-modules_submit-mwserv_TransferSession_hpp | 11 +++++++++++ .../patch-modules_submit-mwserv_submit-mwserv_hpp | 11 +++++++++++ .../patch-modules_submit-norman_submit-norman_hpp | 11 +++++++++++ net/tclcurl/patches/patch-generic_tclcurl_h | 11 +++++++++++ .../patch-lib_curl_transport_xmlrpc_curl_transport_c | 11 +++++++++++ sysutils/conky/patches/patch-src_ccurl_thread_c | 11 +++++++++++ sysutils/conky/patches/patch-src_eve_c | 11 +++++++++++ textproc/raptor/patches/patch-src_raptor_internal_h | 11 +++++++++++ 26 files changed, 286 insertions(+) create mode 100644 audio/gimmix/patches/patch-src_gimmix-covers_c create mode 100644 audio/gimmix/patches/patch-src_gimmix-lyrics_c create mode 100644 audio/libofa/patches/patch-examples_protocol_cpp create mode 100644 games/crossfire-client/patches/patch-common_metaserver_c create mode 100644 games/f1spirit/patches/patch-sources_F1Shttp_cpp create mode 100644 geo/osm2go/patches/patch-src_net_io_c create mode 100644 geo/osm2go/patches/patch-src_osm_api_c create mode 100644 geo/tangogps/patches/patch-src_friends_c create mode 100644 geo/tangogps/patches/patch-src_tile_management_c create mode 100644 geo/tangogps/patches/patch-src_util_h create mode 100644 geo/viking/patches/patch-src_osm-traces_c create mode 100644 math/octave/patches/patch-src_DLD-FUNCTIONS_urlwrite_cc create mode 100644 net/dysnomia/patches/patch-deezer_hpp create mode 100644 net/gnaughty/patches/patch-src_http_c create mode 100644 net/nepenthes/patches/patch-modules_download-curl_download-curl_hpp create mode 100644 net/nepenthes/patches/patch-modules_submit-http_HTTPSession_cpp create mode 100644 net/nepenthes/patches/patch-modules_submit-http_HTTPSession_hpp create mode 100644 net/nepenthes/patches/patch-modules_submit-http_submit-http_hpp create mode 100644 net/nepenthes/patches/patch-modules_submit-mwserv_TransferSession_hpp create mode 100644 net/nepenthes/patches/patch-modules_submit-mwserv_submit-mwserv_hpp create mode 100644 net/nepenthes/patches/patch-modules_submit-norman_submit-norman_hpp create mode 100644 net/tclcurl/patches/patch-generic_tclcurl_h create mode 100644 net/xmlrpc-c/patches/patch-lib_curl_transport_xmlrpc_curl_transport_c create mode 100644 sysutils/conky/patches/patch-src_ccurl_thread_c create mode 100644 sysutils/conky/patches/patch-src_eve_c create mode 100644 textproc/raptor/patches/patch-src_raptor_internal_h diff --git a/audio/gimmix/patches/patch-src_gimmix-covers_c b/audio/gimmix/patches/patch-src_gimmix-covers_c new file mode 100644 index 00000000000..90e64c6267b --- /dev/null +++ b/audio/gimmix/patches/patch-src_gimmix-covers_c @@ -0,0 +1,11 @@ +$OpenBSD: patch-src_gimmix-covers_c,v 1.1 2011/07/05 08:18:29 jasper Exp $ +--- src/gimmix-covers.c.orig Tue Jul 5 08:45:56 2011 ++++ src/gimmix-covers.c Tue Jul 5 08:46:37 2011 +@@ -29,7 +29,6 @@ + #include + #include + #include +-#include + #include + #include + #include diff --git a/audio/gimmix/patches/patch-src_gimmix-lyrics_c b/audio/gimmix/patches/patch-src_gimmix-lyrics_c new file mode 100644 index 00000000000..90cebc4b248 --- /dev/null +++ b/audio/gimmix/patches/patch-src_gimmix-lyrics_c @@ -0,0 +1,11 @@ +$OpenBSD: patch-src_gimmix-lyrics_c,v 1.1 2011/07/05 08:18:29 jasper Exp $ +--- src/gimmix-lyrics.c.orig Tue Jul 5 08:46:03 2011 ++++ src/gimmix-lyrics.c Tue Jul 5 08:46:52 2011 +@@ -30,7 +30,6 @@ + #include + #include + #include +-#include + #include + #include + #include "gimmix-lyrics.h" diff --git a/audio/libofa/patches/patch-examples_protocol_cpp b/audio/libofa/patches/patch-examples_protocol_cpp new file mode 100644 index 00000000000..9cd3aea0b88 --- /dev/null +++ b/audio/libofa/patches/patch-examples_protocol_cpp @@ -0,0 +1,11 @@ +$OpenBSD: patch-examples_protocol_cpp,v 1.1 2011/07/05 08:18:29 jasper Exp $ +--- examples/protocol.cpp.orig Tue Jul 5 09:15:33 2011 ++++ examples/protocol.cpp Tue Jul 5 09:15:38 2011 +@@ -12,7 +12,6 @@ + #include + #include + #include +-#include + #include + + using namespace std; diff --git a/games/crossfire-client/patches/patch-common_metaserver_c b/games/crossfire-client/patches/patch-common_metaserver_c new file mode 100644 index 00000000000..52c22315b90 --- /dev/null +++ b/games/crossfire-client/patches/patch-common_metaserver_c @@ -0,0 +1,11 @@ +$OpenBSD: patch-common_metaserver_c,v 1.1 2011/07/05 08:18:29 jasper Exp $ +--- common/metaserver.c.orig Tue Jul 5 09:16:14 2011 ++++ common/metaserver.c Tue Jul 5 09:16:22 2011 +@@ -47,7 +47,6 @@ const char *rcsid_common_metaserver_c = + + #ifdef HAVE_CURL_CURL_H + #include +-#include + #include + #endif + diff --git a/games/f1spirit/patches/patch-sources_F1Shttp_cpp b/games/f1spirit/patches/patch-sources_F1Shttp_cpp new file mode 100644 index 00000000000..b2ce3471396 --- /dev/null +++ b/games/f1spirit/patches/patch-sources_F1Shttp_cpp @@ -0,0 +1,11 @@ +$OpenBSD: patch-sources_F1Shttp_cpp,v 1.1 2011/07/05 08:18:29 jasper Exp $ +--- sources/F1Shttp.cpp.orig Tue Jul 5 09:17:36 2011 ++++ sources/F1Shttp.cpp Tue Jul 5 09:17:42 2011 +@@ -3,7 +3,6 @@ + #include "string.h" + + #include +-#include + #include + + #include "F1Shttp.h" diff --git a/geo/osm2go/patches/patch-src_net_io_c b/geo/osm2go/patches/patch-src_net_io_c new file mode 100644 index 00000000000..a91a8b7bc47 --- /dev/null +++ b/geo/osm2go/patches/patch-src_net_io_c @@ -0,0 +1,11 @@ +$OpenBSD: patch-src_net_io_c,v 1.1 2011/07/05 08:18:30 jasper Exp $ +--- src/net_io.c.orig Tue Jul 5 09:21:09 2011 ++++ src/net_io.c Tue Jul 5 09:21:14 2011 +@@ -20,7 +20,6 @@ + #include "appdata.h" + + #include +-#include /* new for v7 */ + #include /* new for v7 */ + #include + diff --git a/geo/osm2go/patches/patch-src_osm_api_c b/geo/osm2go/patches/patch-src_osm_api_c new file mode 100644 index 00000000000..bc4d71b5b75 --- /dev/null +++ b/geo/osm2go/patches/patch-src_osm_api_c @@ -0,0 +1,11 @@ +$OpenBSD: patch-src_osm_api_c,v 1.1 2011/07/05 08:18:30 jasper Exp $ +--- src/osm_api.c.orig Tue Jul 5 09:20:21 2011 ++++ src/osm_api.c Tue Jul 5 09:20:28 2011 +@@ -20,7 +20,6 @@ + #include "appdata.h" + + #include +-#include /* new for v7 */ + #include /* new for v7 */ + #include + diff --git a/geo/tangogps/patches/patch-src_friends_c b/geo/tangogps/patches/patch-src_friends_c new file mode 100644 index 00000000000..43a25a87fa5 --- /dev/null +++ b/geo/tangogps/patches/patch-src_friends_c @@ -0,0 +1,11 @@ +$OpenBSD: patch-src_friends_c,v 1.1 2011/07/05 08:18:30 jasper Exp $ +--- src/friends.c.orig Tue Jul 5 09:19:54 2011 ++++ src/friends.c Tue Jul 5 09:19:59 2011 +@@ -17,7 +17,6 @@ + #include + + #include +-#include + #include + + diff --git a/geo/tangogps/patches/patch-src_tile_management_c b/geo/tangogps/patches/patch-src_tile_management_c new file mode 100644 index 00000000000..134b0cb02f5 --- /dev/null +++ b/geo/tangogps/patches/patch-src_tile_management_c @@ -0,0 +1,11 @@ +$OpenBSD: patch-src_tile_management_c,v 1.1 2011/07/05 08:18:30 jasper Exp $ +--- src/tile_management.c.orig Tue Jul 5 09:18:51 2011 ++++ src/tile_management.c Tue Jul 5 09:18:58 2011 +@@ -5,7 +5,6 @@ + #include + #include + #include +-#include + #include + #include + #include "globals.h" diff --git a/geo/tangogps/patches/patch-src_util_h b/geo/tangogps/patches/patch-src_util_h new file mode 100644 index 00000000000..bb5e58c027d --- /dev/null +++ b/geo/tangogps/patches/patch-src_util_h @@ -0,0 +1,11 @@ +$OpenBSD: patch-src_util_h,v 1.1 2011/07/05 08:18:30 jasper Exp $ +--- src/util.h.orig Tue Jul 5 09:19:32 2011 ++++ src/util.h Tue Jul 5 09:19:35 2011 +@@ -2,7 +2,6 @@ + #include + + #include +-#include + #include + int + sql_execute(char *db_name, char *sql, int (*cb_func)(void*,int,char**,char**)); diff --git a/geo/viking/patches/patch-src_osm-traces_c b/geo/viking/patches/patch-src_osm-traces_c new file mode 100644 index 00000000000..dc1f0120a25 --- /dev/null +++ b/geo/viking/patches/patch-src_osm-traces_c @@ -0,0 +1,11 @@ +$OpenBSD: patch-src_osm-traces_c,v 1.1 2011/07/05 08:18:30 jasper Exp $ +--- src/osm-traces.c.orig Tue Jul 5 09:23:05 2011 ++++ src/osm-traces.c Tue Jul 5 09:23:11 2011 +@@ -27,7 +27,6 @@ + #include + + #include +-#include + #include + + #include diff --git a/math/octave/patches/patch-src_DLD-FUNCTIONS_urlwrite_cc b/math/octave/patches/patch-src_DLD-FUNCTIONS_urlwrite_cc new file mode 100644 index 00000000000..ba22d27674e --- /dev/null +++ b/math/octave/patches/patch-src_DLD-FUNCTIONS_urlwrite_cc @@ -0,0 +1,11 @@ +$OpenBSD: patch-src_DLD-FUNCTIONS_urlwrite_cc,v 1.1 2011/07/05 08:18:30 jasper Exp $ +--- src/DLD-FUNCTIONS/urlwrite.cc.orig Tue Jul 5 09:23:47 2011 ++++ src/DLD-FUNCTIONS/urlwrite.cc Tue Jul 5 09:23:51 2011 +@@ -43,7 +43,6 @@ along with Octave; see the file COPYING. If not, see + #if defined (HAVE_CURL) + + #include +-#include + #include + + // Write callback function for curl. diff --git a/net/dysnomia/patches/patch-deezer_hpp b/net/dysnomia/patches/patch-deezer_hpp new file mode 100644 index 00000000000..b3ed752c0bf --- /dev/null +++ b/net/dysnomia/patches/patch-deezer_hpp @@ -0,0 +1,11 @@ +$OpenBSD: patch-deezer_hpp,v 1.1 2011/07/05 08:18:30 jasper Exp $ +--- deezer.hpp.orig Tue Jul 5 09:24:40 2011 ++++ deezer.hpp Tue Jul 5 09:24:45 2011 +@@ -41,7 +41,6 @@ + #include + #include + #include +-#include + #include + using namespace std; + diff --git a/net/gnaughty/patches/patch-src_http_c b/net/gnaughty/patches/patch-src_http_c new file mode 100644 index 00000000000..e246256846a --- /dev/null +++ b/net/gnaughty/patches/patch-src_http_c @@ -0,0 +1,11 @@ +$OpenBSD: patch-src_http_c,v 1.1 2011/07/05 08:18:30 jasper Exp $ +--- src/http.c.orig Tue Jul 5 09:25:32 2011 ++++ src/http.c Tue Jul 5 09:25:36 2011 +@@ -21,7 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, + #include + #include + #include +-#include + #include + #include "http.h" + #include "callbacks.h" diff --git a/net/nepenthes/patches/patch-modules_download-curl_download-curl_hpp b/net/nepenthes/patches/patch-modules_download-curl_download-curl_hpp new file mode 100644 index 00000000000..28d0082f2a6 --- /dev/null +++ b/net/nepenthes/patches/patch-modules_download-curl_download-curl_hpp @@ -0,0 +1,11 @@ +$OpenBSD: patch-modules_download-curl_download-curl_hpp,v 1.1 2011/07/05 08:18:30 jasper Exp $ +--- modules/download-curl/download-curl.hpp.orig Tue Jul 5 09:28:17 2011 ++++ modules/download-curl/download-curl.hpp Tue Jul 5 09:28:22 2011 +@@ -28,7 +28,6 @@ + /* $Id: patch-modules_download-curl_download-curl_hpp,v 1.1 2011/07/05 08:18:30 jasper Exp $ */ + + #include +-#include /* new for v7 */ + #include /* new for v7 */ + + #include "Module.hpp" diff --git a/net/nepenthes/patches/patch-modules_submit-http_HTTPSession_cpp b/net/nepenthes/patches/patch-modules_submit-http_HTTPSession_cpp new file mode 100644 index 00000000000..d8eb5a46a3b --- /dev/null +++ b/net/nepenthes/patches/patch-modules_submit-http_HTTPSession_cpp @@ -0,0 +1,11 @@ +$OpenBSD: patch-modules_submit-http_HTTPSession_cpp,v 1.1 2011/07/05 08:18:30 jasper Exp $ +--- modules/submit-http/HTTPSession.cpp.orig Tue Jul 5 09:29:55 2011 ++++ modules/submit-http/HTTPSession.cpp Tue Jul 5 09:29:58 2011 +@@ -28,7 +28,6 @@ + + + #include +-#include /* new for v7 */ + #include /* new for v7 */ + #include + #include diff --git a/net/nepenthes/patches/patch-modules_submit-http_HTTPSession_hpp b/net/nepenthes/patches/patch-modules_submit-http_HTTPSession_hpp new file mode 100644 index 00000000000..881d79f6120 --- /dev/null +++ b/net/nepenthes/patches/patch-modules_submit-http_HTTPSession_hpp @@ -0,0 +1,11 @@ +$OpenBSD: patch-modules_submit-http_HTTPSession_hpp,v 1.1 2011/07/05 08:18:30 jasper Exp $ +--- modules/submit-http/HTTPSession.hpp.orig Tue Jul 5 09:29:28 2011 ++++ modules/submit-http/HTTPSession.hpp Tue Jul 5 09:29:35 2011 +@@ -29,7 +29,6 @@ + /* $Id: patch-modules_submit-http_HTTPSession_hpp,v 1.1 2011/07/05 08:18:30 jasper Exp $ */ + + #include +-#include + + #include "Download.hpp" + diff --git a/net/nepenthes/patches/patch-modules_submit-http_submit-http_hpp b/net/nepenthes/patches/patch-modules_submit-http_submit-http_hpp new file mode 100644 index 00000000000..1bbbfbc70ac --- /dev/null +++ b/net/nepenthes/patches/patch-modules_submit-http_submit-http_hpp @@ -0,0 +1,11 @@ +$OpenBSD: patch-modules_submit-http_submit-http_hpp,v 1.1 2011/07/05 08:18:30 jasper Exp $ +--- modules/submit-http/submit-http.hpp.orig Tue Jul 5 09:29:15 2011 ++++ modules/submit-http/submit-http.hpp Tue Jul 5 09:29:19 2011 +@@ -29,7 +29,6 @@ + /* $Id: patch-modules_submit-http_submit-http_hpp,v 1.1 2011/07/05 08:18:30 jasper Exp $ */ + + #include +-#include /* new for v7 */ + #include /* new for v7 */ + + #include "Nepenthes.hpp" diff --git a/net/nepenthes/patches/patch-modules_submit-mwserv_TransferSession_hpp b/net/nepenthes/patches/patch-modules_submit-mwserv_TransferSession_hpp new file mode 100644 index 00000000000..442ed26188b --- /dev/null +++ b/net/nepenthes/patches/patch-modules_submit-mwserv_TransferSession_hpp @@ -0,0 +1,11 @@ +$OpenBSD: patch-modules_submit-mwserv_TransferSession_hpp,v 1.1 2011/07/05 08:18:30 jasper Exp $ +--- modules/submit-mwserv/TransferSession.hpp.orig Tue Jul 5 09:31:01 2011 ++++ modules/submit-mwserv/TransferSession.hpp Tue Jul 5 09:31:07 2011 +@@ -27,7 +27,6 @@ + *******************************************************************************/ + + #include +-#include + #include + + #include diff --git a/net/nepenthes/patches/patch-modules_submit-mwserv_submit-mwserv_hpp b/net/nepenthes/patches/patch-modules_submit-mwserv_submit-mwserv_hpp new file mode 100644 index 00000000000..bb44989037b --- /dev/null +++ b/net/nepenthes/patches/patch-modules_submit-mwserv_submit-mwserv_hpp @@ -0,0 +1,11 @@ +$OpenBSD: patch-modules_submit-mwserv_submit-mwserv_hpp,v 1.1 2011/07/05 08:18:30 jasper Exp $ +--- modules/submit-mwserv/submit-mwserv.hpp.orig Tue Jul 5 09:30:50 2011 ++++ modules/submit-mwserv/submit-mwserv.hpp Tue Jul 5 09:30:54 2011 +@@ -27,7 +27,6 @@ + *******************************************************************************/ + + #include +-#include + #include + + #include "Nepenthes.hpp" diff --git a/net/nepenthes/patches/patch-modules_submit-norman_submit-norman_hpp b/net/nepenthes/patches/patch-modules_submit-norman_submit-norman_hpp new file mode 100644 index 00000000000..bc73649bb9d --- /dev/null +++ b/net/nepenthes/patches/patch-modules_submit-norman_submit-norman_hpp @@ -0,0 +1,11 @@ +$OpenBSD: patch-modules_submit-norman_submit-norman_hpp,v 1.1 2011/07/05 08:18:30 jasper Exp $ +--- modules/submit-norman/submit-norman.hpp.orig Tue Jul 5 09:28:56 2011 ++++ modules/submit-norman/submit-norman.hpp Tue Jul 5 09:29:00 2011 +@@ -29,7 +29,6 @@ + + + #include +-#include /* new for v7 */ + #include /* new for v7 */ + + #include "Module.hpp" diff --git a/net/tclcurl/patches/patch-generic_tclcurl_h b/net/tclcurl/patches/patch-generic_tclcurl_h new file mode 100644 index 00000000000..6def3cb6cd8 --- /dev/null +++ b/net/tclcurl/patches/patch-generic_tclcurl_h @@ -0,0 +1,11 @@ +$OpenBSD: patch-generic_tclcurl_h,v 1.1 2011/07/05 08:18:30 jasper Exp $ +--- generic/tclcurl.h.orig Tue Jul 5 09:27:08 2011 ++++ generic/tclcurl.h Tue Jul 5 09:27:13 2011 +@@ -16,7 +16,6 @@ + #endif + + #include +-#include + #include + #include + #include diff --git a/net/xmlrpc-c/patches/patch-lib_curl_transport_xmlrpc_curl_transport_c b/net/xmlrpc-c/patches/patch-lib_curl_transport_xmlrpc_curl_transport_c new file mode 100644 index 00000000000..2627a542e05 --- /dev/null +++ b/net/xmlrpc-c/patches/patch-lib_curl_transport_xmlrpc_curl_transport_c @@ -0,0 +1,11 @@ +$OpenBSD: patch-lib_curl_transport_xmlrpc_curl_transport_c,v 1.3 2011/07/05 08:18:30 jasper Exp $ +--- lib/curl_transport/xmlrpc_curl_transport.c.orig Tue Jul 5 09:40:16 2011 ++++ lib/curl_transport/xmlrpc_curl_transport.c Tue Jul 5 09:40:20 2011 +@@ -76,7 +76,6 @@ + #include "version.h" + + #include +-#include + #include + #include + diff --git a/sysutils/conky/patches/patch-src_ccurl_thread_c b/sysutils/conky/patches/patch-src_ccurl_thread_c new file mode 100644 index 00000000000..3e102474d05 --- /dev/null +++ b/sysutils/conky/patches/patch-src_ccurl_thread_c @@ -0,0 +1,11 @@ +$OpenBSD: patch-src_ccurl_thread_c,v 1.1 2011/07/05 08:18:30 jasper Exp $ +--- src/ccurl_thread.c.orig Tue Jul 5 09:35:29 2011 ++++ src/ccurl_thread.c Tue Jul 5 09:35:34 2011 +@@ -33,7 +33,6 @@ + #endif /* DEBUG */ + + #include +-#include + #include + + /* diff --git a/sysutils/conky/patches/patch-src_eve_c b/sysutils/conky/patches/patch-src_eve_c new file mode 100644 index 00000000000..8d36dbaeaf9 --- /dev/null +++ b/sysutils/conky/patches/patch-src_eve_c @@ -0,0 +1,11 @@ +$OpenBSD: patch-src_eve_c,v 1.1 2011/07/05 08:18:30 jasper Exp $ +--- src/eve.c.orig Tue Jul 5 09:35:16 2011 ++++ src/eve.c Tue Jul 5 09:35:24 2011 +@@ -37,7 +37,6 @@ + #include + + #include +-#include + #include + + #include diff --git a/textproc/raptor/patches/patch-src_raptor_internal_h b/textproc/raptor/patches/patch-src_raptor_internal_h new file mode 100644 index 00000000000..658fa6f8d9f --- /dev/null +++ b/textproc/raptor/patches/patch-src_raptor_internal_h @@ -0,0 +1,11 @@ +$OpenBSD: patch-src_raptor_internal_h,v 1.1 2011/07/05 08:18:30 jasper Exp $ +--- src/raptor_internal.h.orig Tue Jul 5 09:31:34 2011 ++++ src/raptor_internal.h Tue Jul 5 09:31:42 2011 +@@ -786,7 +786,6 @@ int raptor_utf8_is_nfc(const unsigned char *input, siz + + #ifdef RAPTOR_WWW_LIBCURL + #include +-#include + #include + #endif +