take over amule as MAINTAINER, replaces mldonkey nicely for me

Activate a lot of useful stuff, like the amule daemon and the amulecmd line tool, which makes it possible to run amule mostly unattended. (you might need to run it with the gui to configure it at first). Even the experimental amulegui appears to be mostly functional. the webgui is included for reference, it works on i386, something fishy on sparc64... todo: figure out cross-platform issues. The people who write amule never thought that the client and the server could run on distinct architectures, and so they transfer binary data without even putting it in network format, leading to interesting transfer times and sizes...
2007-07-08 18:09:58 +00:00 · 2007-07-08 18:09:58 +00:00 · e32afdc2c6
commit e32afdc2c6
parent 43c841c254
9 changed files with 277 additions and 26 deletions
--- a/net/amule/Makefile
+++ b/net/amule/Makefile
@ -1,33 +1,52 @@
-# $OpenBSD: Makefile,v 1.9 2007/05/10 14:33:19 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.10 2007/07/08 18:09:58 espie Exp $

-COMMENT=	"another eMule p2p client"
+COMMENT-main =	another eMule p2p client
+COMMENT-web =	webserver interface to amuled
+COMMENT-daemon =stand-alone daemon/cmdline for amule

-DISTNAME=	aMule-2.1.3
-PKGNAME=	${DISTNAME:L}p0
-CATEGORIES=	net
+V =		2.1.3
+DISTNAME =	aMule-$V
+CATEGORIES =	net

-HOMEPAGE=	http://www.amule.org/
+HOMEPAGE =	http://www.amule.org/
+MULTI_PACKAGES =-main -web -daemon
+PKGNAME-main =	amule-$Vp1
+PKGNAME-daemon =amuled-$V
+PKGNAME-web =	amuleweb-$V

 # GPL
-PERMIT_PACKAGE_CDROM=   Yes
-PERMIT_PACKAGE_FTP=     Yes
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP=   Yes
+PERMIT_PACKAGE_CDROM =	Yes
+PERMIT_PACKAGE_FTP =	Yes
+PERMIT_DISTFILES_CDROM =Yes
+PERMIT_DISTFILES_FTP =	Yes

-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=amule/}
-EXTRACT_SUFX=	.tar.bz2
+MAINTAINER =	Marc Espie <espie@openbsd.org>
+MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=amule/}
+EXTRACT_SUFX =	.tar.bz2

-LIB_DEPENDS=	wx_gtk2_adv,wx_base_net,wx_base,wx_gtk2_core:wxWidgets-gtk2->=2.6.3:x11/wxWidgets
+LIB_DEPENDS =	wx_base_net,wx_base:wxWidgets-gtk2->=2.6.3:x11/wxWidgets
+WANTLIB =	c m pthread z stdc++

-USE_X11=	Yes
-USE_GMAKE=	Yes
+USE_X11 =	Yes
+USE_GMAKE =	Yes

-WANTLIB=	X11 c m pthread stdc++ z
+WANTLIB-main =	${WANTLIB} X11 wx_gtk2_adv wx_gtk2_core
+WANTLIB-daemon =${WANTLIB} readline termcap
+WANTLIB-web =	${WANTLIB} png readline termcap

-CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=	--disable-debug --with-x
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
+CONFIGURE_STYLE =	gnu
+CONFIGURE_ARGS =	--disable-debug \
+			--with-x \
+			--enable-amule-daemon \
+			--enable-amulecmd \
+			--enable-webserver \
+			--enable-amule-gui

-NO_REGRESS=	Yes
+CONFIGURE_ENV =		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
+
+post-install:
+	${INSTALL_SCRIPT} ${WKRDIST}/src/util/scripts/mldonkey_importer.pl ${PREFIX}/bin/mldonkey_importer
+
+NO_REGRESS =		Yes

 .include <bsd.port.mk>
--- a/net/amule/patches/patch-src_StatTree_h
+++ b/net/amule/patches/patch-src_StatTree_h
@ -0,0 +1,27 @@
+$OpenBSD: patch-src_StatTree_h,v 1.1 2007/07/08 18:09:58 espie Exp $
+--- src/StatTree.h.orig	Tue Jun 26 12:52:37 2007
+++ src/StatTree.h	Tue Jun 26 12:53:48 2007
+@@ -38,22 +38,7 @@
+ 
+ #ifndef EC_REMOTE	// CLIENT_GUI
+ 
+-// Try to determine sizeof(int)
+-#if defined(__INT_MAX__) && defined(__LONG_MAX__)
+-	#if __INT_MAX__ != __LONG_MAX__
+-		#define USE_64BIT_ARCH
+-	#endif
+-#else
+-	// #include <bits/wordsize.h> would be enough, but we shouldn't depend on
+-	// non-standard includes. However, we still do it :)
+-	#include <stdint.h>
+-	#ifdef __WORDSIZE
+-		#if __WORDSIZE == 64
+-			#define USE_64BIT_ARCH
+-		#endif
+-	#endif
+-#endif
+-// If we cannot determine wordsize, assume that we use 32bit arch.
+#define USE_64BIT_ARCH
+ 
+ #define VIRTUAL virtual
+ 
--- a/net/amule/pkg/DESCR
+++ b/net/amule/pkg/DESCR
@ -1,5 +0,0 @@
-aMule is a peer to peer file sharing client, based on the well known
-eMule.
-
-If you get `Bad file descriptor' errors, be sure to raise the file
-descriptor limits.
--- a/net/amule/pkg/DESCR-daemon
+++ b/net/amule/pkg/DESCR-daemon
@ -0,0 +1,4 @@
+aMule is a peer to peer file sharing software.
+
+This package contains the stand-alone server (amuled) and the
+command-line interface (amulecmd).
--- a/net/amule/pkg/DESCR-main
+++ b/net/amule/pkg/DESCR-main
@ -0,0 +1,13 @@
+aMule is a peer to peer file sharing client, based on the well known
+eMule.
+
+If you get `Bad file descriptor' errors, be sure to raise the file
+descriptor limits.
+
+This package includes amulegui, an experimental front-end which can connect
+to a distant amuled, and mldonkey_importer, to import your old mldonkey
+temporary files.
+
+Subpackages:
+* amuled: daemon version without graphical interface and command-line client.
+* amuleweb: web server control interface.
--- a/net/amule/pkg/DESCR-web
+++ b/net/amule/pkg/DESCR-web
@ -0,0 +1,6 @@
+aMule is a peer to peer file sharing software.
+
+This package contains the webserver control interface, which can be started
+up from either amuled or amule itself.
+
+This program contains a small, self-standing PHP interpreter.
--- a/net/amule/pkg/PLIST-daemon
+++ b/net/amule/pkg/PLIST-daemon
@ -0,0 +1,5 @@
+@comment $OpenBSD: PLIST-daemon,v 1.1 2007/07/08 18:09:58 espie Exp $
+bin/amulecmd
+bin/amuled
+@man man/man1/amulecmd.1
+@man man/man1/amuled.1
--- a/net/amule/pkg/PLIST-main
+++ b/net/amule/pkg/PLIST-main
@ -1,5 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.2 2006/10/12 14:18:53 alek Exp $
+@comment $OpenBSD: PLIST-main,v 1.1 2007/07/08 18:09:58 espie Exp $
+@pkgpath net/amule
 bin/amule
+bin/amulegui
 bin/ed2k
@comment lib/xchat/
@comment lib/xchat/plugins/
@ -7,20 +9,32 @@ bin/ed2k
@comment man/de/
@comment man/de/man1/
@comment @man man/de/man1/amule.1
+@comment @man man/de/man1/amulecmd.1
+@comment @man man/de/man1/amuled.1
+@comment @man man/de/man1/amuleweb.1
@comment @man man/de/man1/ed2k.1
@comment @man man/de/man1/xas.1
@comment man/es/
@comment man/es/man1/
@comment @man man/es/man1/amule.1
+@comment @man man/es/man1/amulecmd.1
+@comment @man man/es/man1/amuled.1
+@comment @man man/es/man1/amuleweb.1
@comment @man man/es/man1/ed2k.1
@comment @man man/es/man1/xas.1
@comment man/fr/
@comment man/fr/man1/
@comment @man man/fr/man1/amule.1
+@comment @man man/fr/man1/amulecmd.1
+@comment @man man/fr/man1/amuled.1
+@comment @man man/fr/man1/amuleweb.1
@comment @man man/fr/man1/ed2k.1
@comment man/hu/
@comment man/hu/man1/
@comment @man man/hu/man1/amule.1
+@comment @man man/hu/man1/amulecmd.1
+@comment @man man/hu/man1/amuled.1
+@comment @man man/hu/man1/amuleweb.1
@comment @man man/hu/man1/ed2k.1
@comment @man man/hu/man1/xas.1
@man man/man1/amule.1
--- a/net/amule/pkg/PLIST-web
+++ b/net/amule/pkg/PLIST-web
@ -0,0 +1,168 @@
+@comment $OpenBSD: PLIST-web,v 1.1 2007/07/08 18:09:58 espie Exp $
+bin/amuleweb
+@man man/man1/amuleweb.1
+share/amule/
+share/amule/webserver/
+share/amule/webserver/chicane/
+share/amule/webserver/chicane/aMule.tmpl
+share/amule/webserver/chicane/add_server.gif
+share/amule/webserver/chicane/arrow_down.gif
+share/amule/webserver/chicane/arrow_down_logout.gif
+share/amule/webserver/chicane/arrow_right.gif
+share/amule/webserver/chicane/arrow_up.gif
+share/amule/webserver/chicane/back.gif
+share/amule/webserver/chicane/black.gif
+share/amule/webserver/chicane/blank1x1.gif
+share/amule/webserver/chicane/blue1.gif
+share/amule/webserver/chicane/blue2.gif
+share/amule/webserver/chicane/blue3.gif
+share/amule/webserver/chicane/blue4.gif
+share/amule/webserver/chicane/blue5.gif
+share/amule/webserver/chicane/blue6.gif
+share/amule/webserver/chicane/cp_download.gif
+share/amule/webserver/chicane/cp_kad.gif
+share/amule/webserver/chicane/cp_search.gif
+share/amule/webserver/chicane/cp_servers.gif
+share/amule/webserver/chicane/cp_settings.gif
+share/amule/webserver/chicane/cp_shared.gif
+share/amule/webserver/chicane/cp_stats.gif
+share/amule/webserver/chicane/downloads.php
+share/amule/webserver/chicane/emule.gif
+share/amule/webserver/chicane/favicon.ico
+share/amule/webserver/chicane/green.gif
+share/amule/webserver/chicane/greenpercent.gif
+share/amule/webserver/chicane/index.php
+share/amule/webserver/chicane/l_cancel.gif
+share/amule/webserver/chicane/l_connect.gif
+share/amule/webserver/chicane/l_down.gif
+share/amule/webserver/chicane/l_ed2klink.gif
+share/amule/webserver/chicane/l_info.gif
+share/amule/webserver/chicane/l_pause.gif
+share/amule/webserver/chicane/l_resume.gif
+share/amule/webserver/chicane/l_up.gif
+share/amule/webserver/chicane/log.gif
+share/amule/webserver/chicane/login.php
+share/amule/webserver/chicane/login_bottom.gif
+share/amule/webserver/chicane/login_downmain.gif
+share/amule/webserver/chicane/login_lefttop.gif
+share/amule/webserver/chicane/login_righttop.gif
+share/amule/webserver/chicane/login_top.gif
+share/amule/webserver/chicane/login_topdown.gif
+share/amule/webserver/chicane/login_topseperator.gif
+share/amule/webserver/chicane/logo.jpg
+share/amule/webserver/chicane/main_bg.gif
+share/amule/webserver/chicane/main_top_bg.gif
+share/amule/webserver/chicane/main_topbar.gif
+share/amule/webserver/chicane/main_topbardarker.gif
+share/amule/webserver/chicane/main_topbarseperator.gif
+share/amule/webserver/chicane/phpamule.png
+share/amule/webserver/chicane/preferences.php
+share/amule/webserver/chicane/red.gif
+share/amule/webserver/chicane/search.php
+share/amule/webserver/chicane/servers.php
+share/amule/webserver/chicane/shared.php
+share/amule/webserver/chicane/stat_graphs.php
+share/amule/webserver/chicane/stat_tree.php
+share/amule/webserver/chicane/transparent.gif
+share/amule/webserver/chicane/tree-closed.gif
+share/amule/webserver/chicane/tree-leaf.gif
+share/amule/webserver/chicane/tree-open.gif
+share/amule/webserver/chicane/yellow.gif
+share/amule/webserver/default/
+share/amule/webserver/default/aMule.tmpl
+share/amule/webserver/default/add_server.gif
+share/amule/webserver/default/arrow_down.gif
+share/amule/webserver/default/arrow_right.gif
+share/amule/webserver/default/arrow_up.gif
+share/amule/webserver/default/back.gif
+share/amule/webserver/default/black.gif
+share/amule/webserver/default/blue1.gif
+share/amule/webserver/default/blue2.gif
+share/amule/webserver/default/blue3.gif
+share/amule/webserver/default/blue4.gif
+share/amule/webserver/default/blue5.gif
+share/amule/webserver/default/blue6.gif
+share/amule/webserver/default/cp_download.gif
+share/amule/webserver/default/cp_kad.gif
+share/amule/webserver/default/cp_search.gif
+share/amule/webserver/default/cp_servers.gif
+share/amule/webserver/default/cp_settings.gif
+share/amule/webserver/default/cp_shared.gif
+share/amule/webserver/default/cp_stats.gif
+share/amule/webserver/default/downloads.php
+share/amule/webserver/default/emule.gif
+share/amule/webserver/default/favicon.ico
+share/amule/webserver/default/green.gif
+share/amule/webserver/default/greenpercent.gif
+share/amule/webserver/default/index.php
+share/amule/webserver/default/l_cancel.gif
+share/amule/webserver/default/l_connect.gif
+share/amule/webserver/default/l_down.gif
+share/amule/webserver/default/l_ed2klink.gif
+share/amule/webserver/default/l_info.gif
+share/amule/webserver/default/l_pause.gif
+share/amule/webserver/default/l_resume.gif
+share/amule/webserver/default/l_up.gif
+share/amule/webserver/default/log.gif
+share/amule/webserver/default/login.php
+share/amule/webserver/default/logo.jpg
+share/amule/webserver/default/phpamule.png
+share/amule/webserver/default/preferences.php
+share/amule/webserver/default/red.gif
+share/amule/webserver/default/search.php
+share/amule/webserver/default/servers.php
+share/amule/webserver/default/shared.php
+share/amule/webserver/default/stat_graphs.php
+share/amule/webserver/default/stat_tree.php
+share/amule/webserver/default/transparent.gif
+share/amule/webserver/default/tree-closed.gif
+share/amule/webserver/default/tree-leaf.gif
+share/amule/webserver/default/tree-open.gif
+share/amule/webserver/default/yellow.gif
+share/amule/webserver/php-default/
+share/amule/webserver/php-default/amuleweb-main-dload.php
+share/amule/webserver/php-default/amuleweb-main-kad.php
+share/amule/webserver/php-default/amuleweb-main-prefs.php
+share/amule/webserver/php-default/amuleweb-main-search.php
+share/amule/webserver/php-default/amuleweb-main-servers.php
+share/amule/webserver/php-default/amuleweb-main-shared.php
+share/amule/webserver/php-default/amuleweb-main-stats.php
+share/amule/webserver/php-default/apply.jpeg
+share/amule/webserver/php-default/arrow-r.png
+share/amule/webserver/php-default/cancel.gif
+share/amule/webserver/php-default/connect.gif
+share/amule/webserver/php-default/delete.jpeg
+share/amule/webserver/php-default/down.jpeg
+share/amule/webserver/php-default/favicon.ico
+share/amule/webserver/php-default/footer.php
+share/amule/webserver/php-default/index.html
+share/amule/webserver/php-default/login.php
+share/amule/webserver/php-default/pause.jpeg
+share/amule/webserver/php-default/phpamule.png
+share/amule/webserver/php-default/resume.jpeg
+share/amule/webserver/php-default/stats.php
+share/amule/webserver/php-default/stats_tree.php
+share/amule/webserver/php-default/toolbutton-connect.jpeg
+share/amule/webserver/php-default/toolbutton-download-pressed.jpeg
+share/amule/webserver/php-default/toolbutton-download.jpeg
+share/amule/webserver/php-default/toolbutton-filter.jpeg
+share/amule/webserver/php-default/toolbutton-kad-pressed.jpeg
+share/amule/webserver/php-default/toolbutton-kad.jpeg
+share/amule/webserver/php-default/toolbutton-logout-pressed.jpeg
+share/amule/webserver/php-default/toolbutton-logout.jpeg
+share/amule/webserver/php-default/toolbutton-reload.jpeg
+share/amule/webserver/php-default/toolbutton-search-pressed.jpeg
+share/amule/webserver/php-default/toolbutton-search.jpeg
+share/amule/webserver/php-default/toolbutton-servers-pressed.jpeg
+share/amule/webserver/php-default/toolbutton-servers.jpeg
+share/amule/webserver/php-default/toolbutton-settings-pressed.jpeg
+share/amule/webserver/php-default/toolbutton-settings.jpeg
+share/amule/webserver/php-default/toolbutton-shared-pressed.jpeg
+share/amule/webserver/php-default/toolbutton-shared.jpeg
+share/amule/webserver/php-default/toolbutton-stats-pressed.jpeg
+share/amule/webserver/php-default/toolbutton-stats.jpeg
+share/amule/webserver/php-default/top.html
+share/amule/webserver/php-default/tree-closed.gif
+share/amule/webserver/php-default/tree-leaf.gif
+share/amule/webserver/php-default/tree-open.gif
+share/amule/webserver/php-default/up.jpeg