- adjust after recent curl update

ok landry@

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 <glib.h>
+ #include <glib/gstdio.h>
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ #include <nxml.h>
+ #include <libxml/xmlreader.h>

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 <nxml.h>
+ #include <glib/gstdio.h>
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ #include <libxml/xmlreader.h>
+ #include "gimmix-lyrics.h"

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 <map>
+ #include <expat.h>
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ using namespace std;

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 <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ #endif
+ 

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 <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ #include "F1Shttp.h"

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 <curl/curl.h>
+-#include <curl/types.h> /* new for v7 */
+ #include <curl/easy.h>  /* new for v7 */
+ #include <unistd.h>
+ 

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 <curl/curl.h>
+-#include <curl/types.h> /* new for v7 */
+ #include <curl/easy.h> /* new for v7 */
+ #include <unistd.h>
+ 

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 <gtk/gtk.h>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ 

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 <glib/gprintf.h>
+ #include <string.h>
+ #include <curl/curl.h>
+-#include <curl/types.h> 
+ #include <curl/easy.h> 
+ #include <math.h>
+ #include "globals.h"

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 <gtk/gtk.h>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ int
+ sql_execute(char *db_name, char *sql, int (*cb_func)(void*,int,char**,char**));

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 <errno.h>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ #include <glib.h>

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 <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ // Write callback function for curl.

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 <cstdlib>
+ #include <cstring>
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ using namespace std;
+ 

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 <string.h>
+ #include <gtk/gtk.h>
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ #include "http.h"
+ #include "callbacks.h"

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 <curl/curl.h>
+-#include <curl/types.h> /* new for v7 */
+ #include <curl/easy.h> /* new for v7 */
+ 
+ #include "Module.hpp"

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 <curl/curl.h>
+-#include <curl/types.h> /* new for v7 */
+ #include <curl/easy.h> /* new for v7 */
+ #include <sstream>
+ #include <netinet/in.h>

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 <curl/curl.h>
+-#include <curl/types.h>
+ 
+ #include "Download.hpp"
+ 

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 <curl/curl.h>
+-#include <curl/types.h> /* new for v7 */
+ #include <curl/easy.h> /* new for v7 */
+ 
+ #include "Nepenthes.hpp"

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 <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ #include <string>

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 <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ #include "Nepenthes.hpp"

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 <curl/curl.h>
+-#include <curl/types.h> /* new for v7 */
+ #include <curl/easy.h> /* new for v7 */
+ 
+ #include "Module.hpp"

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 <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ #include <tcl.h>
+ #include <tclDecls.h>

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 <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ #include <curl/multi.h>
+ 

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 <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ /*

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 <libxml/xmlwriter.h>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ #include <time.h>

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 <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ #endif
+