diff options
author | dogcow <dogcow> | 2005-09-05 10:45:19 +0000 |
---|---|---|
committer | dogcow <dogcow> | 2005-09-05 10:45:19 +0000 |
commit | 1deb7fb0acbe23aed65a0754c15e565faf534ff7 (patch) | |
tree | 2c7b1d8e39b5e756f2f129bd289f8204bb7732df /net/amule/patches | |
parent | aac877cbab6afd7f35852af3a3defb9c99589085 (diff) | |
download | pkgsrc-1deb7fb0acbe23aed65a0754c15e565faf534ff7.tar.gz |
Update to aMule 2.0.3.
http://www.amule.org/wiki/index.php/ has the full list of changes; in brief,
the CPU and memory usage has been vastly improved, the network code has been
substantially rewritten, amule now works with wxGTK 2.6, and several hundred
bugs have been fixed.
Diffstat (limited to 'net/amule/patches')
-rw-r--r-- | net/amule/patches/patch-aa | 26 | ||||
-rw-r--r-- | net/amule/patches/patch-ab | 33 |
2 files changed, 11 insertions, 48 deletions
diff --git a/net/amule/patches/patch-aa b/net/amule/patches/patch-aa index 9f4773d0771..69f126eeaa5 100644 --- a/net/amule/patches/patch-aa +++ b/net/amule/patches/patch-aa @@ -1,16 +1,12 @@ -$NetBSD: patch-aa,v 1.3 2005/03/16 19:06:10 rillig Exp $ +$NetBSD: patch-aa,v 1.4 2005/09/05 10:45:19 dogcow Exp $ -<net/if.h> requires <sys/socket.h> - ---- src/SysTray.cpp.orig Tue Mar 15 19:02:17 2005 -+++ src/SysTray.cpp Tue Mar 15 19:01:55 2005 -@@ -23,6 +23,9 @@ - #include "sys.h" - #include <libintl.h> - #include <clocale> // Needed for setlocale(3) -+#ifdef __NetBSD__ -+# include <sys/socket.h> -+#endif - #include <net/if.h> // Needed for struct ifreq - #include <sys/socket.h> // - #include <netinet/in.h> // Needed for inet_ntoa +--- /tmp/configure.orig 2005-09-05 03:12:12.000000000 -0700 ++++ configure 2005-09-05 03:05:31.000000000 -0700 +@@ -7711,6 +7711,7 @@ if test x$autopoint_version != x; then + else + result="no" + fi ++result="yes" + HAVE_GETTEXT=$result + echo "$as_me:$LINENO: result: $result ($autopoint_version)" >&5 + echo "${ECHO_T}$result ($autopoint_version)" >&6 diff --git a/net/amule/patches/patch-ab b/net/amule/patches/patch-ab deleted file mode 100644 index e2cb47b88a1..00000000000 --- a/net/amule/patches/patch-ab +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-ab,v 1.4 2005/04/13 18:12:55 rillig Exp $ - -The C++ standard library headers shipped with gcc-2.95 sometimes include -<_G_config.h>, which undefines the NULL macro and then includes -<stddef.h> afterwards. Currently the situation is: - - #include <stddef.h> /* defines NULL */ - #include <_G_config.h> /* undefines NULL */ - # include <stddef.h> /* is skipped (guarded) */ - => NULL is undefined. - -So we need to include <_G_config.h> at the very beginning. Then the -sequence is: - - #include <_G_config.h> /* undefines NULL */ - # include <stddef.h> /* defines NULL */ - #include <_G_config.h> /* is skipped (guarded) */ - => NULL is defined. - ---- src/sys.h.in.orig Sun Jun 13 16:50:10 2004 -+++ src/sys.h.in Tue Apr 12 11:53:19 2005 -@@ -40,6 +40,11 @@ - #define _THREAD_SAFE - #endif - -+/* This is needed to have a NULL macro */ -+#if defined(__NetBSD__) && defined(__GNUC__) && ((__GNUC__) < 3) -+# include <stl_config.h> -+#endif -+ - #ifndef __linux__ - #include <sys/types.h> - #endif |