summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net/amule/Makefile27
-rw-r--r--net/amule/PLIST354
-rw-r--r--net/amule/distinfo11
-rw-r--r--net/amule/options.mk156
-rw-r--r--net/amule/patches/patch-aa141
-rw-r--r--net/amule/patches/patch-ab12
6 files changed, 626 insertions, 75 deletions
diff --git a/net/amule/Makefile b/net/amule/Makefile
index 6b58eee2a48..942c65ab7e3 100644
--- a/net/amule/Makefile
+++ b/net/amule/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.37 2008/09/22 20:21:04 joerg Exp $
+# $NetBSD: Makefile,v 1.38 2009/06/06 13:08:27 obache Exp $
-DISTNAME= aMule-2.1.3
+DISTNAME= aMule-2.2.5
PKGNAME= ${DISTNAME:S/aMule/amule/}
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=amule/}
@@ -9,6 +9,7 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= tripledes@eslack.org
HOMEPAGE= http://www.amule.org/
COMMENT= Another Emule P2P client
+LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
@@ -17,17 +18,29 @@ CONFLICTS= xmule-[0-9]*
USE_DIRS+= xdg-1.1
USE_LANGUAGES= c c++
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake intltool msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config perl:run
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-wx-config=${LOCALBASE}/bin/wx-config
-CONFIGURE_ENV+= gt_cv_func_gnugettext1_libintl=yes
+CONFIGURE_ARGS+= --with-wx-config=${BUILDLINK_PREFIX.wxGTK28}/bin/wx-config
+CONFIGURE_ARGS+= --with-crypto-prefix=${BUILDLINK_PREFIX.cryptopp}
+CONFIGURE_ARGS+= --with-language=all
-LIBS+= -lm
+.include "options.mk"
+
+REPLACE_PERL= src/libs/ec/file_generator.pl \
+ src/utils/scripts/kadnodescreate.pl \
+ src/utils/scripts/stats.pl \
+ src/utils/scripts/mldonkey_importer.pl \
+ src/utils/xas/xas.pl
+
+LIBS+= -lm # for pow(3)
UNLIMIT_RESOURCES+= datasize
+TEST_TARGET= check
+
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
-.include "../../x11/wxGTK26/buildlink3.mk"
+.include "../../security/crypto++/buildlink3.mk"
+.include "../../x11/wxGTK28/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/amule/PLIST b/net/amule/PLIST
index 8a7b3c6af01..2a55b3f2e87 100644
--- a/net/amule/PLIST
+++ b/net/amule/PLIST
@@ -1,25 +1,316 @@
-@comment $NetBSD: PLIST,v 1.8 2006/04/17 07:07:30 jlam Exp $
-bin/amule
-bin/ed2k
+@comment $NetBSD: PLIST,v 1.9 2009/06/06 13:08:27 obache Exp $
+${PLIST.alc}bin/alc
+${PLIST.alcc}bin/alcc
+${PLIST.amule}bin/amule
+${PLIST.cmd}bin/amulecmd
+${PLIST.daemon}bin/amuled
+${PLIST.gui}bin/amulegui
+${PLIST.web}bin/amuleweb
+${PLIST.cas}bin/cas
+${PLIST.wxcas}bin/wxcas
+bin/autostart-xas
+${PLIST.ed2k}bin/ed2k
lib/xchat/plugins/xas.pl
-man/de/man1/amule.1
-man/de/man1/ed2k.1
+${PLIST.alc}man/de/man1/alc.1
+${PLIST.alcc}man/de/man1/alcc.1
+${PLIST.amule}man/de/man1/amule.1
+${PLIST.cmd}man/de/man1/amulecmd.1
+${PLIST.daemon}man/de/man1/amuled.1
+${PLIST.gui}man/de/man1/amulegui.1
+${PLIST.web}man/de/man1/amuleweb.1
+${PLIST.cas}man/de/man1/cas.1
+${PLIST.ed2k}man/de/man1/ed2k.1
+${PLIST.wxcas}man/de/man1/wxcas.1
man/de/man1/xas.1
-man/es/man1/amule.1
-man/es/man1/ed2k.1
+${PLIST.alc}man/es/man1/alc.1
+${PLIST.alcc}man/es/man1/alcc.1
+${PLIST.amule}man/es/man1/amule.1
+${PLIST.cmd}man/es/man1/amulecmd.1
+${PLIST.daemon}man/es/man1/amuled.1
+${PLIST.web}man/es/man1/amuleweb.1
+${PLIST.cas}man/es/man1/cas.1
+${PLIST.ed2k}man/es/man1/ed2k.1
+${PLIST.wxcas}man/es/man1/wxcas.1
+${PLIST.ed2k}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
+${PLIST.alc}man/eu/man1/alc.1
+${PLIST.alcc}man/eu/man1/alcc.1
+${PLIST.amule}man/eu/man1/amule.1
+${PLIST.cmd}man/eu/man1/amulecmd.1
+${PLIST.daemon}man/eu/man1/amuled.1
+${PLIST.web}man/eu/man1/amuleweb.1
+${PLIST.cas}man/eu/man1/cas.1
+${PLIST.ed2k}man/eu/man1/ed2k.1
+${PLIST.wxcas}man/eu/man1/wxcas.1
+man/eu/man1/xas.1
+${PLIST.alcc}man/fr/man1/alcc.1
+${PLIST.amule}man/fr/man1/amule.1
+${PLIST.cmd}man/fr/man1/amulecmd.1
+${PLIST.daemon}man/fr/man1/amuled.1
+${PLIST.web}man/fr/man1/amuleweb.1
+${PLIST.ed2k}man/fr/man1/ed2k.1
+${PLIST.alc}man/hu/man1/alc.1
+${PLIST.alcc}man/hu/man1/alcc.1
+${PLIST.amule}man/hu/man1/amule.1
+${PLIST.cmd}man/hu/man1/amulecmd.1
+${PLIST.daemon}man/hu/man1/amuled.1
+${PLIST.web}man/hu/man1/amuleweb.1
+${PLIST.cas}man/hu/man1/cas.1
+${PLIST.ed2k}man/hu/man1/ed2k.1
+${PLIST.wxcas}man/hu/man1/wxcas.1
man/hu/man1/xas.1
-man/man1/amule.1
-man/man1/ed2k.1
+${PLIST.alc}man/man1/alc.1
+${PLIST.alcc}man/man1/alcc.1
+${PLIST.amule}man/man1/amule.1
+${PLIST.cmd}man/man1/amulecmd.1
+${PLIST.daemon}man/man1/amuled.1
+${PLIST.gui}man/man1/amulegui.1
+${PLIST.web}man/man1/amuleweb.1
+${PLIST.cas}man/man1/cas.1
+${PLIST.wxcas}man/man1/wxcas.1
+${PLIST.ed2k}man/man1/ed2k.1
man/man1/xas.1
-share/applications/amule.desktop
+${PLIST.skins}share/amule/skins/gnome.zip
+${PLIST.skins}share/amule/skins/kde4.zip
+${PLIST.skins}share/amule/skins/tango.zip
+${PLIST.skins}share/amule/skins/xfce.zip
+${PLIST.web}share/amule/webserver/chicane/aMule.tmpl
+${PLIST.web}share/amule/webserver/chicane/add_server.gif
+${PLIST.web}share/amule/webserver/chicane/arrow_down.gif
+${PLIST.web}share/amule/webserver/chicane/arrow_down_logout.gif
+${PLIST.web}share/amule/webserver/chicane/arrow_right.gif
+${PLIST.web}share/amule/webserver/chicane/arrow_up.gif
+${PLIST.web}share/amule/webserver/chicane/back.gif
+${PLIST.web}share/amule/webserver/chicane/black.gif
+${PLIST.web}share/amule/webserver/chicane/blank1x1.gif
+${PLIST.web}share/amule/webserver/chicane/blue1.gif
+${PLIST.web}share/amule/webserver/chicane/blue2.gif
+${PLIST.web}share/amule/webserver/chicane/blue3.gif
+${PLIST.web}share/amule/webserver/chicane/blue4.gif
+${PLIST.web}share/amule/webserver/chicane/blue5.gif
+${PLIST.web}share/amule/webserver/chicane/blue6.gif
+${PLIST.web}share/amule/webserver/chicane/cp_download.gif
+${PLIST.web}share/amule/webserver/chicane/cp_kad.gif
+${PLIST.web}share/amule/webserver/chicane/cp_search.gif
+${PLIST.web}share/amule/webserver/chicane/cp_servers.gif
+${PLIST.web}share/amule/webserver/chicane/cp_settings.gif
+${PLIST.web}share/amule/webserver/chicane/cp_shared.gif
+${PLIST.web}share/amule/webserver/chicane/cp_stats.gif
+${PLIST.web}share/amule/webserver/chicane/downloads.php
+${PLIST.web}share/amule/webserver/chicane/emule.gif
+${PLIST.web}share/amule/webserver/chicane/favicon.ico
+${PLIST.web}share/amule/webserver/chicane/green.gif
+${PLIST.web}share/amule/webserver/chicane/greenpercent.gif
+${PLIST.web}share/amule/webserver/chicane/index.php
+${PLIST.web}share/amule/webserver/chicane/l_cancel.gif
+${PLIST.web}share/amule/webserver/chicane/l_connect.gif
+${PLIST.web}share/amule/webserver/chicane/l_down.gif
+${PLIST.web}share/amule/webserver/chicane/l_ed2klink.gif
+${PLIST.web}share/amule/webserver/chicane/l_info.gif
+${PLIST.web}share/amule/webserver/chicane/l_pause.gif
+${PLIST.web}share/amule/webserver/chicane/l_resume.gif
+${PLIST.web}share/amule/webserver/chicane/l_up.gif
+${PLIST.web}share/amule/webserver/chicane/log.gif
+${PLIST.web}share/amule/webserver/chicane/login.php
+${PLIST.web}share/amule/webserver/chicane/login_bottom.gif
+${PLIST.web}share/amule/webserver/chicane/login_downmain.gif
+${PLIST.web}share/amule/webserver/chicane/login_lefttop.gif
+${PLIST.web}share/amule/webserver/chicane/login_righttop.gif
+${PLIST.web}share/amule/webserver/chicane/login_top.gif
+${PLIST.web}share/amule/webserver/chicane/login_topdown.gif
+${PLIST.web}share/amule/webserver/chicane/login_topseperator.gif
+${PLIST.web}share/amule/webserver/chicane/logo.jpg
+${PLIST.web}share/amule/webserver/chicane/main_bg.gif
+${PLIST.web}share/amule/webserver/chicane/main_top_bg.gif
+${PLIST.web}share/amule/webserver/chicane/main_topbar.gif
+${PLIST.web}share/amule/webserver/chicane/main_topbardarker.gif
+${PLIST.web}share/amule/webserver/chicane/main_topbarseperator.gif
+${PLIST.web}share/amule/webserver/chicane/phpamule.png
+${PLIST.web}share/amule/webserver/chicane/preferences.php
+${PLIST.web}share/amule/webserver/chicane/red.gif
+${PLIST.web}share/amule/webserver/chicane/search.php
+${PLIST.web}share/amule/webserver/chicane/servers.php
+${PLIST.web}share/amule/webserver/chicane/shared.php
+${PLIST.web}share/amule/webserver/chicane/stat_graphs.php
+${PLIST.web}share/amule/webserver/chicane/stat_tree.php
+${PLIST.web}share/amule/webserver/chicane/transparent.gif
+${PLIST.web}share/amule/webserver/chicane/tree-closed.gif
+${PLIST.web}share/amule/webserver/chicane/tree-leaf.gif
+${PLIST.web}share/amule/webserver/chicane/tree-open.gif
+${PLIST.web}share/amule/webserver/chicane/yellow.gif
+${PLIST.web}share/amule/webserver/default/aMule.tmpl
+${PLIST.web}share/amule/webserver/default/add_server.gif
+${PLIST.web}share/amule/webserver/default/arrow_down.gif
+${PLIST.web}share/amule/webserver/default/arrow_right.gif
+${PLIST.web}share/amule/webserver/default/arrow_up.gif
+${PLIST.web}share/amule/webserver/default/back.gif
+${PLIST.web}share/amule/webserver/default/black.gif
+${PLIST.web}share/amule/webserver/default/blue1.gif
+${PLIST.web}share/amule/webserver/default/blue2.gif
+${PLIST.web}share/amule/webserver/default/blue3.gif
+${PLIST.web}share/amule/webserver/default/blue4.gif
+${PLIST.web}share/amule/webserver/default/blue5.gif
+${PLIST.web}share/amule/webserver/default/blue6.gif
+${PLIST.web}share/amule/webserver/default/cp_download.gif
+${PLIST.web}share/amule/webserver/default/cp_kad.gif
+${PLIST.web}share/amule/webserver/default/cp_search.gif
+${PLIST.web}share/amule/webserver/default/cp_servers.gif
+${PLIST.web}share/amule/webserver/default/cp_settings.gif
+${PLIST.web}share/amule/webserver/default/cp_shared.gif
+${PLIST.web}share/amule/webserver/default/cp_stats.gif
+${PLIST.web}share/amule/webserver/default/downloads.php
+${PLIST.web}share/amule/webserver/default/emule.gif
+${PLIST.web}share/amule/webserver/default/favicon.ico
+${PLIST.web}share/amule/webserver/default/green.gif
+${PLIST.web}share/amule/webserver/default/greenpercent.gif
+${PLIST.web}share/amule/webserver/default/index.php
+${PLIST.web}share/amule/webserver/default/l_cancel.gif
+${PLIST.web}share/amule/webserver/default/l_connect.gif
+${PLIST.web}share/amule/webserver/default/l_down.gif
+${PLIST.web}share/amule/webserver/default/l_ed2klink.gif
+${PLIST.web}share/amule/webserver/default/l_info.gif
+${PLIST.web}share/amule/webserver/default/l_pause.gif
+${PLIST.web}share/amule/webserver/default/l_resume.gif
+${PLIST.web}share/amule/webserver/default/l_up.gif
+${PLIST.web}share/amule/webserver/default/log.gif
+${PLIST.web}share/amule/webserver/default/login.php
+${PLIST.web}share/amule/webserver/default/logo.jpg
+${PLIST.web}share/amule/webserver/default/phpamule.png
+${PLIST.web}share/amule/webserver/default/preferences.php
+${PLIST.web}share/amule/webserver/default/red.gif
+${PLIST.web}share/amule/webserver/default/search.php
+${PLIST.web}share/amule/webserver/default/servers.php
+${PLIST.web}share/amule/webserver/default/shared.php
+${PLIST.web}share/amule/webserver/default/stat_graphs.php
+${PLIST.web}share/amule/webserver/default/stat_tree.php
+${PLIST.web}share/amule/webserver/default/transparent.gif
+${PLIST.web}share/amule/webserver/default/tree-closed.gif
+${PLIST.web}share/amule/webserver/default/tree-leaf.gif
+${PLIST.web}share/amule/webserver/default/tree-open.gif
+${PLIST.web}share/amule/webserver/default/yellow.gif
+${PLIST.web}share/amule/webserver/litoral/amuleweb-main-dload.php
+${PLIST.web}share/amule/webserver/litoral/amuleweb-main-kad.php
+${PLIST.web}share/amule/webserver/litoral/amuleweb-main-log.php
+${PLIST.web}share/amule/webserver/litoral/amuleweb-main-prefs.php
+${PLIST.web}share/amule/webserver/litoral/amuleweb-main-search.php
+${PLIST.web}share/amule/webserver/litoral/amuleweb-main-servers.php
+${PLIST.web}share/amule/webserver/litoral/amuleweb-main-shared.php
+${PLIST.web}share/amule/webserver/litoral/amuleweb-main-stats.php
+${PLIST.web}share/amule/webserver/litoral/black.gif
+${PLIST.web}share/amule/webserver/litoral/blank1x1.gif
+${PLIST.web}share/amule/webserver/litoral/blue1.gif
+${PLIST.web}share/amule/webserver/litoral/blue2.gif
+${PLIST.web}share/amule/webserver/litoral/blue3.gif
+${PLIST.web}share/amule/webserver/litoral/blue4.gif
+${PLIST.web}share/amule/webserver/litoral/blue5.gif
+${PLIST.web}share/amule/webserver/litoral/blue6.gif
+${PLIST.web}share/amule/webserver/litoral/cancel.gif
+${PLIST.web}share/amule/webserver/litoral/close.png
+${PLIST.web}share/amule/webserver/litoral/col.png
+${PLIST.web}share/amule/webserver/litoral/connect.gif
+${PLIST.web}share/amule/webserver/litoral/down.png
+${PLIST.web}share/amule/webserver/litoral/edkserv_0.png
+${PLIST.web}share/amule/webserver/litoral/edkserv_1.png
+${PLIST.web}share/amule/webserver/litoral/favicon.ico
+${PLIST.web}share/amule/webserver/litoral/filter.png
+${PLIST.web}share/amule/webserver/litoral/fond.gif
+${PLIST.web}share/amule/webserver/litoral/fond_haut.png
+${PLIST.web}share/amule/webserver/litoral/footer.php
+${PLIST.web}share/amule/webserver/litoral/index.html
+${PLIST.web}share/amule/webserver/litoral/kitty.gif
+${PLIST.web}share/amule/webserver/litoral/log.php
+${PLIST.web}share/amule/webserver/litoral/login.php
+${PLIST.web}share/amule/webserver/litoral/loginfond.gif
+${PLIST.web}share/amule/webserver/litoral/loginfond_haut.png
+${PLIST.web}share/amule/webserver/litoral/loginlogo.jpg
+${PLIST.web}share/amule/webserver/litoral/loginlogo.png
+${PLIST.web}share/amule/webserver/litoral/logo.png
+${PLIST.web}share/amule/webserver/litoral/maquette.dwt
+${PLIST.web}share/amule/webserver/litoral/ok.png
+${PLIST.web}share/amule/webserver/litoral/pause.png
+${PLIST.web}share/amule/webserver/litoral/play.png
+${PLIST.web}share/amule/webserver/litoral/red.gif
+${PLIST.web}share/amule/webserver/litoral/refresh.png
+${PLIST.web}share/amule/webserver/litoral/search_0.png
+${PLIST.web}share/amule/webserver/litoral/search_1.png
+${PLIST.web}share/amule/webserver/litoral/shared_0.png
+${PLIST.web}share/amule/webserver/litoral/shared_1.png
+${PLIST.web}share/amule/webserver/litoral/sheserv_0.png
+${PLIST.web}share/amule/webserver/litoral/sheserv_1.png
+${PLIST.web}share/amule/webserver/litoral/stats.php
+${PLIST.web}share/amule/webserver/litoral/stats_0.png
+${PLIST.web}share/amule/webserver/litoral/stats_1.png
+${PLIST.web}share/amule/webserver/litoral/stats_tree.php
+${PLIST.web}share/amule/webserver/litoral/style.css
+${PLIST.web}share/amule/webserver/litoral/tab_bottom.png
+${PLIST.web}share/amule/webserver/litoral/tab_bottom_left.png
+${PLIST.web}share/amule/webserver/litoral/tab_bottom_right.png
+${PLIST.web}share/amule/webserver/litoral/tab_left.png
+${PLIST.web}share/amule/webserver/litoral/tab_right.png
+${PLIST.web}share/amule/webserver/litoral/tab_top.png
+${PLIST.web}share/amule/webserver/litoral/tab_top_left.png
+${PLIST.web}share/amule/webserver/litoral/tab_top_right.png
+${PLIST.web}share/amule/webserver/litoral/transf_0.png
+${PLIST.web}share/amule/webserver/litoral/transf_1.png
+${PLIST.web}share/amule/webserver/litoral/tree-closed.gif
+${PLIST.web}share/amule/webserver/litoral/tree-leaf.gif
+${PLIST.web}share/amule/webserver/litoral/tree-open.gif
+${PLIST.web}share/amule/webserver/litoral/up.png
+${PLIST.web}share/amule/webserver/litoral/yellow.gif
+${PLIST.web}share/amule/webserver/php-default/amuleweb-main-dload.php
+${PLIST.web}share/amule/webserver/php-default/amuleweb-main-kad.php
+${PLIST.web}share/amule/webserver/php-default/amuleweb-main-prefs.php
+${PLIST.web}share/amule/webserver/php-default/amuleweb-main-search.php
+${PLIST.web}share/amule/webserver/php-default/amuleweb-main-servers.php
+${PLIST.web}share/amule/webserver/php-default/amuleweb-main-shared.php
+${PLIST.web}share/amule/webserver/php-default/amuleweb-main-stats.php
+${PLIST.web}share/amule/webserver/php-default/apply.jpeg
+${PLIST.web}share/amule/webserver/php-default/arrow-r.png
+${PLIST.web}share/amule/webserver/php-default/cancel.gif
+${PLIST.web}share/amule/webserver/php-default/connect.gif
+${PLIST.web}share/amule/webserver/php-default/delete.jpeg
+${PLIST.web}share/amule/webserver/php-default/down.jpeg
+${PLIST.web}share/amule/webserver/php-default/favicon.ico
+${PLIST.web}share/amule/webserver/php-default/footer.php
+${PLIST.web}share/amule/webserver/php-default/index.html
+${PLIST.web}share/amule/webserver/php-default/login.php
+${PLIST.web}share/amule/webserver/php-default/pause.jpeg
+${PLIST.web}share/amule/webserver/php-default/phpamule.png
+${PLIST.web}share/amule/webserver/php-default/resume.jpeg
+${PLIST.web}share/amule/webserver/php-default/stats.php
+${PLIST.web}share/amule/webserver/php-default/stats_tree.php
+${PLIST.web}share/amule/webserver/php-default/toolbutton-connect.jpeg
+${PLIST.web}share/amule/webserver/php-default/toolbutton-download-pressed.jpeg
+${PLIST.web}share/amule/webserver/php-default/toolbutton-download.jpeg
+${PLIST.web}share/amule/webserver/php-default/toolbutton-filter.jpeg
+${PLIST.web}share/amule/webserver/php-default/toolbutton-kad-pressed.jpeg
+${PLIST.web}share/amule/webserver/php-default/toolbutton-kad.jpeg
+${PLIST.web}share/amule/webserver/php-default/toolbutton-logout-pressed.jpeg
+${PLIST.web}share/amule/webserver/php-default/toolbutton-logout.jpeg
+${PLIST.web}share/amule/webserver/php-default/toolbutton-reload.jpeg
+${PLIST.web}share/amule/webserver/php-default/toolbutton-search-pressed.jpeg
+${PLIST.web}share/amule/webserver/php-default/toolbutton-search.jpeg
+${PLIST.web}share/amule/webserver/php-default/toolbutton-servers-pressed.jpeg
+${PLIST.web}share/amule/webserver/php-default/toolbutton-servers.jpeg
+${PLIST.web}share/amule/webserver/php-default/toolbutton-settings-pressed.jpeg
+${PLIST.web}share/amule/webserver/php-default/toolbutton-settings.jpeg
+${PLIST.web}share/amule/webserver/php-default/toolbutton-shared-pressed.jpeg
+${PLIST.web}share/amule/webserver/php-default/toolbutton-shared.jpeg
+${PLIST.web}share/amule/webserver/php-default/toolbutton-stats-pressed.jpeg
+${PLIST.web}share/amule/webserver/php-default/toolbutton-stats.jpeg
+${PLIST.web}share/amule/webserver/php-default/top.html
+${PLIST.web}share/amule/webserver/php-default/tree-closed.gif
+${PLIST.web}share/amule/webserver/php-default/tree-leaf.gif
+${PLIST.web}share/amule/webserver/php-default/tree-open.gif
+${PLIST.web}share/amule/webserver/php-default/up.jpeg
+${PLIST.alc}share/applications/alc.desktop
+${PLIST.amule}share/applications/amule.desktop
+${PLIST.gui}share/applications/amulegui.desktop
+${PLIST.wxcas}share/applications/wxcas.desktop
+${PLIST.cas}share/cas/stat.png
+${PLIST.cas}share/cas/tmp.html
share/doc/aMule-${PKGVERSION}/ABOUT-NLS
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
@@ -30,38 +321,55 @@ share/doc/aMule-${PKGVERSION}/amulesig.txt
share/doc/aMule-${PKGVERSION}/license.txt
share/doc/aMule-${PKGVERSION}/socks4.protocol
share/locale/ar/LC_MESSAGES/amule.mo
+share/locale/ast/LC_MESSAGES/amule.mo
share/locale/bg/LC_MESSAGES/amule.mo
share/locale/ca/LC_MESSAGES/amule.mo
+share/locale/cs/LC_MESSAGES/amule.mo
share/locale/da/LC_MESSAGES/amule.mo
share/locale/de/LC_MESSAGES/amule.mo
+share/locale/el/LC_MESSAGES/amule.mo
share/locale/en_GB/LC_MESSAGES/amule.mo
-share/locale/en_US/LC_MESSAGES/amule.mo
share/locale/es/LC_MESSAGES/amule.mo
-share/locale/es_MX/LC_MESSAGES/amule.mo
share/locale/et_EE/LC_MESSAGES/amule.mo
share/locale/eu/LC_MESSAGES/amule.mo
share/locale/fi/LC_MESSAGES/amule.mo
share/locale/fr/LC_MESSAGES/amule.mo
share/locale/gl/LC_MESSAGES/amule.mo
+share/locale/he/LC_MESSAGES/amule.mo
share/locale/hr/LC_MESSAGES/amule.mo
share/locale/hu/LC_MESSAGES/amule.mo
share/locale/it/LC_MESSAGES/amule.mo
share/locale/it_CH/LC_MESSAGES/amule.mo
+share/locale/ja/LC_MESSAGES/amule.mo
share/locale/ko_KR/LC_MESSAGES/amule.mo
+share/locale/lt/LC_MESSAGES/amule.mo
share/locale/nl/LC_MESSAGES/amule.mo
+share/locale/nn/LC_MESSAGES/amule.mo
share/locale/pl/LC_MESSAGES/amule.mo
share/locale/pt_BR/LC_MESSAGES/amule.mo
share/locale/pt_PT/LC_MESSAGES/amule.mo
share/locale/ru/LC_MESSAGES/amule.mo
share/locale/sl/LC_MESSAGES/amule.mo
+share/locale/sq/LC_MESSAGES/amule.mo
+share/locale/sv/LC_MESSAGES/amule.mo
+share/locale/tr/LC_MESSAGES/amule.mo
+share/locale/uk/LC_MESSAGES/amule.mo
share/locale/zh_CN/LC_MESSAGES/amule.mo
share/locale/zh_TW/LC_MESSAGES/amule.mo
-share/pixmaps/amule.xpm
+${PLIST.alc}share/pixmaps/alc.xpm
+${PLIST.amule}share/pixmaps/amule.xpm
+${PLIST.gui}share/pixmaps/amulegui.xpm
+${PLIST.wxcas}share/pixmaps/wxcas.xpm
@comment in xdg-dirs: @dirrm share/pixmaps
-@dirrm share/locale/it_CH/LC_MESSAGES
@dirrm share/doc/aMule-${PKGVERSION}
+${PLIST.cas}@dirrm share/cas
@comment in xdg-dirs: @dirrm share/applications
-@dirrm man/hu/man1
-@dirrm man/hu
-@dirrm lib/xchat/plugins
-@dirrm lib/xchat
+${PLIST.web}@dirrm share/amule/webserver/php-default
+${PLIST.web}@dirrm share/amule/webserver/litoral
+${PLIST.web}@dirrm share/amule/webserver/default
+${PLIST.web}@dirrm share/amule/webserver/chicane
+${PLIST.web}@dirrm share/amule/webserver
+${PLIST.skins}@dirrm share/amule/skins
+${PLIST.share}@dirrm share/amule
+@unexec ${RMDIR} %D/lib/xchat/plugins 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/lib/xchat 2>/dev/null || ${TRUE}
diff --git a/net/amule/distinfo b/net/amule/distinfo
index c4f9e41589e..d84d5b6b5b9 100644
--- a/net/amule/distinfo
+++ b/net/amule/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.14 2006/10/14 01:14:15 rillig Exp $
+$NetBSD: distinfo,v 1.15 2009/06/06 13:08:27 obache Exp $
-SHA1 (aMule-2.1.3.tar.bz2) = dd47deb38e7a5b823550b85150f5a814c597b273
-RMD160 (aMule-2.1.3.tar.bz2) = fcc345000e5ad0a221d1e96d0d514f3be36428c3
-Size (aMule-2.1.3.tar.bz2) = 3248530 bytes
-SHA1 (patch-aa) = 7475073572410b0368ae34d26208eab243652488
-SHA1 (patch-ab) = df17202991dc5477feca2a0129d9703a71665869
+SHA1 (aMule-2.2.5.tar.bz2) = 2e58fdeffe65cd036467b1c62ba95d791fba9a11
+RMD160 (aMule-2.2.5.tar.bz2) = cef2ea2248b877c75dce6a8f4c32c7585c5f64b8
+Size (aMule-2.2.5.tar.bz2) = 4715858 bytes
+SHA1 (patch-aa) = 64b0812f361cfda37c19849b428b6ce1e31ca885
diff --git a/net/amule/options.mk b/net/amule/options.mk
new file mode 100644
index 00000000000..8d31f5e48ca
--- /dev/null
+++ b/net/amule/options.mk
@@ -0,0 +1,156 @@
+# $NetBSD: options.mk,v 1.1 2009/06/06 13:08:27 obache Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.amule
+PKG_SUPPORTED_OPTIONS= amule-monolithic
+PKG_SUPPORTED_OPTIONS+= amule-gui amule-daemon amule-cmd amule-webserver
+PKG_SUPPORTED_OPTIONS+= amule-cas amule-wxcas amule-ed2k amule-alc amule-alcc
+PKG_SUPPORTED_OPTIONS+= debug geoip upnp
+PKG_SUGGESTED_OPTIONS= amule-monolithic amule-ed2k upnp
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+= share skins alc alcc amule ed2k daemon gui cmd web cas wxcas
+
+###
+### monolithic aMule app
+###
+.if !empty(PKG_OPTIONS:Mamule-monolithic)
+CONFIGURE_ARGS+= --enable-monolithic
+PLIST.amule= yes
+PLIST.share= yes
+PLIST.skins= yes
+.else
+CONFIGURE_ARGS+= --disable-monolithic
+.endif
+
+###
+### aMule daemon version
+###
+.if !empty(PKG_OPTIONS:Mamule-daemon)
+CONFIGURE_ARGS+= --enable-amule-daemon
+PLIST.daemon= yes
+.else
+CONFIGURE_ARGS+= --disable-amule-daemon
+.endif
+
+###
+### aMule remote GUI
+###
+.if !empty(PKG_OPTIONS:Mamule-gui)
+CONFIGURE_ARGS+= --enable-amule-gui
+PLIST.gui= yes
+PLIST.skins= yes
+.else
+CONFIGURE_ARGS+= --disable-amule-gui
+.endif
+
+###
+### aMule command line client
+###
+.if !empty(PKG_OPTIONS:Mamule-cmd)
+CONFIGURE_ARGS+= --enable-amulecmd
+PLIST.cmd= yes
+.else
+CONFIGURE_ARGS+= --disable-amulecmd
+.endif
+
+###
+### aMule WebServer
+###
+.if !empty(PKG_OPTIONS:Mamule-webserver)
+CONFIGURE_ARGS+= --enable-webserver
+PLIST.web= yes
+PLIST.share= yes
+.else
+CONFIGURE_ARGS+= --disable-webserver
+.endif
+
+###
+### C aMule Statistics
+###
+.if !empty(PKG_OPTIONS:Mamule-cas)
+.include "../../graphics/gd/buildlink3.mk"
+CONFIGURE_ARGS+= --enable-cas
+CONFIGURE_ARGS+= --with-gdlib-config=${BUILDLINK_PREFIX.gd}/bin/gdlib-config
+PLIST.cas= yes
+.else
+CONFIGURE_ARGS+= --disable-cas
+.endif
+
+###
+### aMule GUI Statistics
+###
+.if !empty(PKG_OPTIONS:Mamule-wxcas)
+CONFIGURE_ARGS+= --enable-wxcas
+PLIST.wxcas= yes
+.else
+CONFIGURE_ARGS+= --disable-wxcas
+.endif
+
+###
+### aMule ed2k links handler
+###
+.if !empty(PKG_OPTIONS:Mamule-ed2k)
+CONFIGURE_ARGS+= --enable-ed2k
+PLIST.ed2k= yes
+.else
+CONFIGURE_ARGS+= --disable-ed2k
+.endif
+
+###
+### aMule LinkCreator GUI version
+###
+.if !empty(PKG_OPTIONS:Mamule-alc)
+CONFIGURE_ARGS+= --enable-alc
+PLIST.alc= yes
+.else
+CONFIGURE_ARGS+= --disable-alc
+.endif
+
+###
+### aMule LinkCreator for console
+###
+.if !empty(PKG_OPTIONS:Mamule-alcc)
+CONFIGURE_ARGS+= --enable-alcc
+PLIST.alcc= yes
+.else
+CONFIGURE_ARGS+= --disable-alcc
+.endif
+
+###
+### Additional debugging output
+###
+.if !empty(PKG_OPTIONS:Mdebug)
+CONFIGURE_ARGS+= --enable-debug
+.else
+CONFIGURE_ARGS+= --disable-debug
+.endif
+
+###
+### GeoIP IP2Country support
+###
+.if !empty(PKG_OPTIONS:Mgeoip)
+.include "../../net/GeoIP/buildlink3.mk"
+CONFIGURE_ARGS+= --enable-geoip
+.else
+CONFIGURE_ARGS+= --disable-geoip
+.endif
+
+###
+### UPnP support
+###
+.if !empty(PKG_OPTIONS:Mupnp)
+BUILDLINK_API_DEPENDS.libupnp+= libupnp>=1.6.6
+.include "../../net/libupnp/buildlink3.mk"
+CONFIGURE_ARGS+= --enable-upnp
+CONFIGURE_ARGS+= --with-libupnp-prefix=${BUILDLINK_PREFIX.libupnp}
+.else
+CONFIGURE_ARGS+= --disable-upnp
+.endif
+
+.if !empty(PKG_OPTIONS:Mamule-alc) || \
+ !empty(PKG_OPTIONS:Mamule-monolithic) || \
+ !empty(amule-wxcas) || \
+ !empty(amule-gui)
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.endif
diff --git a/net/amule/patches/patch-aa b/net/amule/patches/patch-aa
index 8181d47007c..a7452059945 100644
--- a/net/amule/patches/patch-aa
+++ b/net/amule/patches/patch-aa
@@ -1,30 +1,117 @@
-$NetBSD: patch-aa,v 1.8 2006/10/14 01:14:15 rillig Exp $
+$NetBSD: patch-aa,v 1.9 2009/06/06 13:08:27 obache Exp $
---- configure.orig 2006-06-11 17:08:53.000000000 +0200
-+++ configure 2006-10-14 03:13:01.000000000 +0200
-@@ -8227,6 +8227,7 @@ else
- result="no"
+* pthread flags portabilities
+* avoid check for gettext>=0.11.5
+* fixes to install all supported L10N man pages
+
+--- configure.orig 2009-05-16 07:38:31.000000000 +0000
++++ configure
+@@ -1998,7 +1998,8 @@ echo "${ECHO_T}yes" >&6
+
+ else
+
+- MULELDFLAGS="$MULELDFLAGS -lpthread"
++ MULELDFLAGS="$MULELDFLAGS ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
++ MULECFLAGS="$MULECFLAGS ${PTHREAD_CFLAGS}"
+ echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+
+@@ -18080,7 +18081,7 @@ _ACEOF
fi
-+result="yes"
- HAVE_GETTEXT=$result
-
- { echo "$as_me:$LINENO: result: $result ($autopoint_version)" >&5
-@@ -18234,7 +18235,7 @@ echo $ECHO_N "checking if this is a Free
- { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
- else
-- LDFLAGS="$LDFLAGS -lpthread"
-+ LDFLAGS="$LDFLAGS ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
- fi
-@@ -18962,7 +18963,7 @@ case "$ccache" in
-
- yes)
-
-- if test x$ccache_prefix == x ; then
-+ if test x$ccache_prefix = x ; then
- ccache_full=$(which ccache)
- ccache_prefix=$(dirname ${ccache_full})
- fi
+
+- if test x$USE_NLS = xyes; then
++ if test xno = xyes; then
+
+ echo "$as_me:$LINENO: checking for autopoint" >&5
+ echo $ECHO_N "checking for autopoint... $ECHO_C" >&6
+@@ -18116,7 +18117,7 @@ echo $ECHO_N "checking for requested lan
+
+ if test "$AMULE_DAEMON" = "yes"; then
+
+- if test -z "$LINGUAS"; then
++ if test -z "$LINGUAS" -o "$LINGUAS" = "%UNSET%"; then
+ AMULE_DAEMON_MANPAGES=`ls -1 ${srcdir}/docs/man/amuled.* | sed -e 's:.*/::g'`
+ else
+
+@@ -18136,7 +18137,7 @@ fi
+
+ if test "$AMULECMD" = "yes"; then
+
+- if test -z "$LINGUAS"; then
++ if test -z "$LINGUAS" -o "$LINGUAS" = "%UNSET%"; then
+ AMULECMD_MANPAGES=`ls -1 ${srcdir}/docs/man/amulecmd.* | sed -e 's:.*/::g'`
+ else
+
+@@ -18156,7 +18157,7 @@ fi
+
+ if test "$WEB" = "yes"; then
+
+- if test -z "$LINGUAS"; then
++ if test -z "$LINGUAS" -o "$LINGUAS" = "%UNSET%"; then
+ WEB_MANPAGES=`ls -1 ${srcdir}/docs/man/amuleweb.* | sed -e 's:.*/::g'`
+ else
+
+@@ -18176,7 +18177,7 @@ fi
+
+ if test "$AMULE_GUI" = "yes"; then
+
+- if test -z "$LINGUAS"; then
++ if test -z "$LINGUAS" -o "$LINGUAS" = "%UNSET%"; then
+ AMULE_GUI_MANPAGES=`ls -1 ${srcdir}/docs/man/amulegui.* | sed -e 's:.*/::g'`
+ else
+
+@@ -18196,7 +18197,7 @@ fi
+
+ if test "$CAS" = "yes"; then
+
+- if test -z "$LINGUAS"; then
++ if test -z "$LINGUAS" -o "$LINGUAS" = "%UNSET%"; then
+ CAS_MANPAGES=`ls -1 ${srcdir}/src/utils/cas/docs/cas.* | sed -e 's:.*/::g'`
+ else
+
+@@ -18216,7 +18217,7 @@ fi
+
+ if test "$WXCAS" = "yes"; then
+
+- if test -z "$LINGUAS"; then
++ if test -z "$LINGUAS" -o "$LINGUAS" = "%UNSET%"; then
+ WXCAS_MANPAGES=`ls -1 ${srcdir}/src/utils/wxCas/docs/wxcas.* | sed -e 's:.*/::g'`
+ else
+
+@@ -18236,7 +18237,7 @@ fi
+
+ if test "$ED2K" = "yes"; then
+
+- if test -z "$LINGUAS"; then
++ if test -z "$LINGUAS" -o "$LINGUAS" = "%UNSET%"; then
+ ED2K_MANPAGES=`ls -1 ${srcdir}/docs/man/ed2k.* | sed -e 's:.*/::g'`
+ else
+
+@@ -18256,7 +18257,7 @@ fi
+
+ if test "$ALC" = "yes"; then
+
+- if test -z "$LINGUAS"; then
++ if test -z "$LINGUAS" -o "$LINGUAS" = "%UNSET%"; then
+ ALC_MANPAGES=`ls -1 ${srcdir}/src/utils/aLinkCreator/docs/alc.* | sed -e 's:.*/::g'`
+ else
+
+@@ -18276,7 +18277,7 @@ fi
+
+ if test "$ALCC" = "yes"; then
+
+- if test -z "$LINGUAS"; then
++ if test -z "$LINGUAS" -o "$LINGUAS" = "%UNSET%"; then
+ ALCC_MANPAGES=`ls -1 ${srcdir}/src/utils/aLinkCreator/docs/alcc.* | sed -e 's:.*/::g'`
+ else
+
+@@ -18296,7 +18297,7 @@ fi
+
+ if test "$MONOLITHIC" = "yes"; then
+
+- if test -z "$LINGUAS"; then
++ if test -z "$LINGUAS" -o "$LINGUAS" = "%UNSET%"; then
+ MONOLITHIC_MANPAGES=`ls -1 ${srcdir}/docs/man/amule.* | sed -e 's:.*/::g'`
+ else
+
diff --git a/net/amule/patches/patch-ab b/net/amule/patches/patch-ab
deleted file mode 100644
index 5247d5b9c8b..00000000000
--- a/net/amule/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2006/04/28 20:43:42 joerg Exp $
-
---- src/FileLock.h.orig 2006-04-28 19:12:49.000000000 +0000
-+++ src/FileLock.h
-@@ -30,6 +30,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-+#include <unistd.h>
- #include <cerrno>
-
-