summaryrefslogtreecommitdiff
path: root/net/amule
diff options
context:
space:
mode:
authordogcow <dogcow@pkgsrc.org>2005-09-05 10:45:19 +0000
committerdogcow <dogcow@pkgsrc.org>2005-09-05 10:45:19 +0000
commit889f318e35b06f0a4354c9c24bce7fc01a1007dd (patch)
tree2c7b1d8e39b5e756f2f129bd289f8204bb7732df /net/amule
parenta76a1736b80c0c575574790359bcba27cb4f36b3 (diff)
downloadpkgsrc-889f318e35b06f0a4354c9c24bce7fc01a1007dd.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')
-rw-r--r--net/amule/Makefile15
-rw-r--r--net/amule/PLIST92
-rw-r--r--net/amule/distinfo11
-rw-r--r--net/amule/patches/patch-aa26
-rw-r--r--net/amule/patches/patch-ab33
5 files changed, 62 insertions, 115 deletions
diff --git a/net/amule/Makefile b/net/amule/Makefile
index 5151d86a293..949a4825d51 100644
--- a/net/amule/Makefile
+++ b/net/amule/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.26 2005/08/10 20:56:21 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2005/09/05 10:45:19 dogcow Exp $
#
-DISTNAME= aMule-1.2.8
+DISTNAME= aMule-2.0.3
PKGNAME= ${DISTNAME:S/aMule/amule/}
-PKGREVISION= 4
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=amule/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= tripledes@eslack.org
-HOMEPAGE= http://amule.sourceforge.net/
+HOMEPAGE= http://www.amule.org/
COMMENT= Another Emule P2P client
BUILD_USES_MSGFMT= yes
@@ -21,7 +20,8 @@ USE_TOOLS+= gmake pkg-config
USE_LANGUAGES= c c++
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-wx-config=${LOCALBASE}/bin/wx24-config
+CONFIGURE_ARGS+= --with-wx-config=${LOCALBASE}/bin/wx-config
+CONFIGURE_ENV+= gt_cv_func_gnugettext1_libintl=yes
LIBS+= -lm
@@ -29,9 +29,8 @@ UNLIMIT_RESOURCES+= datasize
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
-.include "../../www/curl/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/wxGTK24/buildlink3.mk"
-
+.include "../../x11/wxGTK/buildlink3.mk"
+.include "../../textproc/intltool/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/amule/PLIST b/net/amule/PLIST
index 945e6d329a6..3d917601c04 100644
--- a/net/amule/PLIST
+++ b/net/amule/PLIST
@@ -1,81 +1,67 @@
-@comment $NetBSD: PLIST,v 1.5 2004/07/25 14:00:21 minskim Exp $
+@comment $NetBSD: PLIST,v 1.6 2005/09/05 10:45:19 dogcow Exp $
bin/amule
-bin/amulecmd
-bin/amulecmdDLG
-bin/amuleweb
-bin/amulewebDLG
bin/ed2k
-share/amuleweb/aMule.tmpl
-share/amuleweb/webserver/GraphCon.gif
-share/amuleweb/webserver/GraphDL.gif
-share/amuleweb/webserver/GraphUL.gif
-share/amuleweb/webserver/add_server.gif
-share/amuleweb/webserver/arrow_down.gif
-share/amuleweb/webserver/arrow_right.gif
-share/amuleweb/webserver/arrow_up.gif
-share/amuleweb/webserver/black.gif
-share/amuleweb/webserver/blue.gif
-share/amuleweb/webserver/blue1.gif
-share/amuleweb/webserver/blue2.gif
-share/amuleweb/webserver/blue3.gif
-share/amuleweb/webserver/blue4.gif
-share/amuleweb/webserver/blue5.gif
-share/amuleweb/webserver/blue6.gif
-share/amuleweb/webserver/cp_download.gif
-share/amuleweb/webserver/cp_kad.gif
-share/amuleweb/webserver/cp_search.gif
-share/amuleweb/webserver/cp_servers.gif
-share/amuleweb/webserver/cp_settings.gif
-share/amuleweb/webserver/cp_shared.gif
-share/amuleweb/webserver/cp_stats.gif
-share/amuleweb/webserver/emule.gif
-share/amuleweb/webserver/green.gif
-share/amuleweb/webserver/greenpercent.gif
-share/amuleweb/webserver/l_cancel.gif
-share/amuleweb/webserver/l_connect.gif
-share/amuleweb/webserver/l_down.gif
-share/amuleweb/webserver/l_ed2klink.gif
-share/amuleweb/webserver/l_info.gif
-share/amuleweb/webserver/l_pause.gif
-share/amuleweb/webserver/l_resume.gif
-share/amuleweb/webserver/l_up.gif
-share/amuleweb/webserver/log.gif
-share/amuleweb/webserver/main_bg.gif
-share/amuleweb/webserver/main_top_bg.gif
-share/amuleweb/webserver/red.gif
-share/amuleweb/webserver/top_bar_bg.gif
-share/amuleweb/webserver/top_bar_bg2.gif
-share/amuleweb/webserver/transparent.gif
-share/amuleweb/webserver/yellow.gif
+lib/xchat/plugins/xas.pl
+man/de/man1/amule.1
+man/de/man1/ed2k.1
+man/de/man1/xas.1
+man/es/man1/amule.1
+man/es/man1/ed2k.1
+man/es/man1/xas.1
+man/fr/man1/amule.1
+man/fr/man1/ed2k.1
+man/hu/man1/amule.1
+man/hu/man1/ed2k.1
+man/hu/man1/xas.1
+man/man1/amule.1
+man/man1/ed2k.1
+man/man1/xas.1
share/applications/amule.desktop
share/doc/aMule-${PKGVERSION}/ABOUT-NLS
-share/doc/aMule-${PKGVERSION}/AUTHORS
share/doc/aMule-${PKGVERSION}/Changelog
+share/doc/aMule-${PKGVERSION}/Doxyfile
+share/doc/aMule-${PKGVERSION}/EC_Protocol.txt
share/doc/aMule-${PKGVERSION}/ED2K-Links.HOWTO
share/doc/aMule-${PKGVERSION}/INSTALL
share/doc/aMule-${PKGVERSION}/README
share/doc/aMule-${PKGVERSION}/TODO
+share/doc/aMule-${PKGVERSION}/amule-win32.HOWTO.txt
share/doc/aMule-${PKGVERSION}/amulesig.txt
-share/doc/aMule-${PKGVERSION}/eMule-Imports-Status
share/doc/aMule-${PKGVERSION}/license.txt
+share/doc/aMule-${PKGVERSION}/socks4.protocol
+${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/amule.mo
${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/amule.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/amule.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/amule.mo
${PKGLOCALEDIR}/locale/de/LC_MESSAGES/amule.mo
-${PKGLOCALEDIR}/locale/ee/LC_MESSAGES/amule.mo
-${PKGLOCALEDIR}/locale/en/LC_MESSAGES/amule.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/amule.mo
+${PKGLOCALEDIR}/locale/en_US/LC_MESSAGES/amule.mo
${PKGLOCALEDIR}/locale/es/LC_MESSAGES/amule.mo
${PKGLOCALEDIR}/locale/es_MX/LC_MESSAGES/amule.mo
+${PKGLOCALEDIR}/locale/et_EE/LC_MESSAGES/amule.mo
${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/amule.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/amule.mo
${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/amule.mo
${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/amule.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/amule.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/amule.mo
${PKGLOCALEDIR}/locale/it/LC_MESSAGES/amule.mo
+${PKGLOCALEDIR}/locale/it_CH/LC_MESSAGES/amule.mo
${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/amule.mo
${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/amule.mo
${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/amule.mo
${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/amule.mo
+${PKGLOCALEDIR}/locale/pt_PT/LC_MESSAGES/amule.mo
${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/amule.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/amule.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/amule.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/amule.mo
share/pixmaps/amule.xpm
@comment in xdg-dirs: @dirrm share/pixmaps
+@dirrm ${PKGLOCALEDIR}/locale/it_CH/LC_MESSAGES
@dirrm share/doc/aMule-${PKGVERSION}
@comment in xdg-dirs: @dirrm share/applications
-@dirrm share/amuleweb/webserver
-@dirrm share/amuleweb
+@dirrm man/hu/man1
+@dirrm man/hu
+@dirrm lib/xchat/plugins
+@dirrm lib/xchat
diff --git a/net/amule/distinfo b/net/amule/distinfo
index fb1bfae060f..87bb5874af6 100644
--- a/net/amule/distinfo
+++ b/net/amule/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.8 2005/04/13 18:12:55 rillig Exp $
+$NetBSD: distinfo,v 1.9 2005/09/05 10:45:19 dogcow Exp $
-SHA1 (aMule-1.2.8.tar.bz2) = fac6f73f5068b326f45e08cded3b81af329c4226
-RMD160 (aMule-1.2.8.tar.bz2) = 2cc882013f88f35f8f925fa8423ea9e2d8b33ac1
-Size (aMule-1.2.8.tar.bz2) = 2039251 bytes
-SHA1 (patch-aa) = eba9455414a26dcd3cc81c6d7847d86e02dc9eb3
-SHA1 (patch-ab) = 72d0129b5962f0793c2f2a25a092a8bcb2191128
+SHA1 (aMule-2.0.3.tar.bz2) = f4e0fb5d45e09fc81ac795f1360ed32af50605ff
+RMD160 (aMule-2.0.3.tar.bz2) = 22d5c25fccd2346a7299c71ba8ad4c175a36db2d
+Size (aMule-2.0.3.tar.bz2) = 2154288 bytes
+SHA1 (patch-aa) = 3f68d0e3c613f1e5833e1bfd1b8fabfbab5653f8
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