Date: Sat, 23 Oct 2004 18:13:43 +0200 (CEST) From: Ganael LAPLANCHE <ganael.laplanche@martymac.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/73044: [PORT UPDATE] net/amule 2.0.0rc7 Message-ID: <20041023161343.A0654255@mail.martymac.com> Resent-Message-ID: <200410231610.i9NGASFE039786@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 73044 >Category: ports >Synopsis: [PORT UPDATE] net/amule 2.0.0rc7 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Oct 23 16:10:28 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Ganael LAPLANCHE >Release: FreeBSD 5.2.1-RELEASE i386 >Organization: http://www.martymac.com >Environment: System: FreeBSD www.martymac.com 5.2.1-RELEASE FreeBSD 5.2.1-RELEASE >Description: Update to aMule 2.0.0rc7 >How-To-Repeat: >Fix: --------------- Patch starts here --------------- diff -aur amule.orig/Makefile amule/Makefile --- amule.orig/Makefile Sat Jul 17 15:34:53 2004 +++ amule/Makefile Sat Oct 23 16:37:46 2004 @@ -2,11 +2,11 @@ # Date created: Wed Nov 05 09:30:00 UTC 2003 # Whom: Ganael LAPLANCHE <ganael.laplanche@martymac.com> # -# $FreeBSD: ports/net/amule/Makefile,v 1.8 2004/07/17 15:34:53 pav Exp $ +# $FreeBSD: ports/net/amule/Makefile,v 1.2 2004/03/03 09:40:47 pav Exp $ # PORTNAME= aMule -PORTVERSION= 1.2.8 +PORTVERSION= 2.0.0rc7 CATEGORIES= net MASTER_SITES= http://download.berlios.de/amule/ @@ -14,25 +14,37 @@ COMMENT= Just another eMule P2P Client LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 \ - curl.3:${PORTSDIR}/ftp/curl + curl.3:${PORTSDIR}/ftp/curl \ + execinfo.1:${PORTSDIR}/devel/libexecinfo +# gd.4:${PORTSDIR}/graphics/gd USE_X_PREFIX= yes USE_GNOME= gnomehier gnomehack gnomeprefix USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --without-included-gettext \ +CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_ARGS= --disable-debug \ + --without-included-gettext \ --with-libintl-prefix=${LOCALBASE} \ --with-libiconv-prefix=${LOCALBASE} \ --with-wx-config=${WX_CONFIG} \ --with-wxbase-config=${WX_CONFIG} \ --with-curl-config=${CURL_CONFIG} \ - --program-transform-name="s/ed2k/amule-ed2k-handler/" + --enable-embedded_crypto \ + --enable-utf8-systray +# --with-gdlib-prefix=${LOCALBASE} \ +# --with-gdlib-exec-prefix=${LOCALBASE} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" OPTIONS= OPTIMIZE "Build with optimization" on \ - STATIC "Enable static linking" off + ED2K "Compile aMule ed2k links handler" on \ + AMULECMD "Compile aMule command line client (+GUI)" on \ + AMULEWEBSRV "Compile aMule WebServer (+GUI)" on \ + CAS "Compile C aMule Statistics (+GUI)" on \ + ALC "Compile aMule Link Creator (+GUI)" on +# AMULEDAEMON "Compile aMule daemon version (+GUI) - unsupported yet : needs wxGtk >= 2.5.1" on WX_CONFIG?= ${X11BASE}/bin/wxgtk2-2.4-config CURL_CONFIG?= ${LOCALBASE}/bin/curl-config @@ -40,12 +52,58 @@ .include <bsd.port.pre.mk> # Configure options -.if !defined(WITHOUT_OPTIMIZE) -CONFIGURE_ARGS+= --enable-optimise +.if defined(WITH_OPTIMIZE) +CONFIGURE_ARGS+= --enable-optimize +.else +CONFIGURE_ARGS+= --disable-optimize .endif -.if defined(WITH_STATIC) -CONFIGURE_ARGS+= --enable-static +.if defined(WITH_ED2K) +CONFIGURE_ARGS+= --enable-ed2k --program-transform-name="s/ed2k/amule-ed2k/" +PLIST_SUB+= PL_ED2K="" +.else +CONFIGURE_ARGS+= --disable-ed2k +PLIST_SUB+= PL_ED2K="@comment " .endif + +.if defined(WITH_AMULECMD) +CONFIGURE_ARGS+= --enable-amulecmd --enable-amulecmdgui +PLIST_SUB+= PL_AMULECMD="" +.else +CONFIGURE_ARGS+= --disable-amulecmd --disable-amulecmdgui +PLIST_SUB+= PL_AMULECMD="@comment " +.endif + +.if defined(WITH_AMULEWEBSRV) +CONFIGURE_ARGS+= --enable-webserver --enable-webservergui +PLIST_SUB+= PL_AMULEWEBSRV="" +.else +CONFIGURE_ARGS+= --disable-webserver --disable-webservergui +PLIST_SUB+= PL_AMULEWEBSRV="@comment " +.endif + +.if defined(WITH_CAS) +CONFIGURE_ARGS+= --enable-cas --enable-wxcas +PLIST_SUB+= PL_CAS="" +.else +CONFIGURE_ARGS+= --disable-cas --disable-wxcas +PLIST_SUB+= PL_CAS="@comment " +.endif + +.if defined(WITH_ALC) +CONFIGURE_ARGS+= --enable-alc --enable-alcc +PLIST_SUB+= PL_ALC="" +.else +CONFIGURE_ARGS+= --disable-alc --disable-alcc +PLIST_SUB+= PL_ALC="@comment " +.endif + +#.if defined(WITH_AMULEDAEMON) +#CONFIGURE_ARGS+= --enable-amule-daemon --enable-amule-gui +#PLIST_SUB+= PL_AMULEDAEMON="" +#.else +#CONFIGURE_ARGS+= --disable-amule-daemon --disable-amule-gui +#PLIST_SUB+= PL_AMULEDAEMON="@comment " +#.endif .include <bsd.port.post.mk> diff -aur amule.orig/distinfo amule/distinfo --- amule.orig/distinfo Sat Jul 17 15:34:53 2004 +++ amule/distinfo Wed Oct 20 19:28:58 2004 @@ -1,2 +1,2 @@ -MD5 (aMule-1.2.8.tar.gz) = c2594ab3f7a5cb6f0d2eb68c7b5f9135 -SIZE (aMule-1.2.8.tar.gz) = 2506663 +MD5 (aMule-2.0.0rc7.tar.gz) = b62106da3c38be29314a542aa3d20e95 +SIZE (aMule-2.0.0rc7.tar.gz) = 2491155 Only in amule/files: patch-ClientDetailDialog.cpp Only in amule/files: patch-DownloadQueue.cpp diff -aur amule.orig/files/patch-SysTray.cpp amule/files/patch-SysTray.cpp --- amule.orig/files/patch-SysTray.cpp Thu Jul 8 19:14:50 2004 +++ amule/files/patch-SysTray.cpp Sat Oct 23 03:56:27 2004 @@ -1,12 +1,15 @@ ---- src/SysTray.cpp.orig Tue Jul 6 07:32:56 2004 -+++ src/SysTray.cpp Tue Jul 6 07:33:44 2004 -@@ -23,8 +23,8 @@ - #include "sys.h" - #include <libintl.h> - #include <clocale> // Needed for setlocale(3) --#include <net/if.h> // Needed for struct ifreq - #include <sys/socket.h> // -+#include <net/if.h> // Needed for struct ifreq - #include <netinet/in.h> // Needed for inet_ntoa - #include <arpa/inet.h> // - #include <sys/ioctl.h> // Needed for SIOCGIFADDR +--- src/SysTray.cpp.orig Sat Oct 23 05:53:20 2004 ++++ src/SysTray.cpp Sat Oct 23 05:55:40 2004 +@@ -24,6 +24,12 @@ + #include <sys/types.h> + #endif /* __BSD__ */ + ++#if defined(__FreeBSD__) // for FreeBSD 4.x ++ #if __FreeBSD__ < 5 ++ #include <sys/types.h> ++ #endif ++#endif ++ + #include <cstddef> // Needed for NULL. Must be BEFORE gtk/gdk headers! + #include <sys/socket.h> // + #include <netinet/in.h> // Needed for inet_ntoa Only in amule/files: patch-UDPSocket.cpp Only in amule/files: patch-UploadQueue.cpp Only in amule/files: patch-bithelp.h Only in amule/files: patch-configure Only in amule/files: patch-eggtrayicon.c Only in amule/files: patch-gtkplugxembed.c Only in amule/files: patch-html.c Only in amule/files: patch-md4.h diff -aur amule.orig/pkg-descr amule/pkg-descr --- amule.orig/pkg-descr Thu Apr 8 08:07:54 2004 +++ amule/pkg-descr Thu Oct 21 20:02:03 2004 @@ -1,6 +1,6 @@ -aMule - aNOTHER eMule P2P Client +aMule, the all-platform eMule p2p client -This program is a multiplatform fork of - xMule client using wxWindows class library. +aMule is a multiplatform fork of xMule +client using wxWindows class library. WWW: http://www.amule.org diff -aur amule.orig/pkg-plist amule/pkg-plist --- amule.orig/pkg-plist Sat Jul 17 15:34:53 2004 +++ amule/pkg-plist Sat Oct 23 11:45:14 2004 @@ -1,78 +1,100 @@ -bin/amule -bin/amule-ed2k-handler -bin/amulecmd -bin/amulecmdDLG -bin/amuleweb -bin/amulewebDLG -share/gnome/pixmaps/amule.xpm -share/gnome/applications/amule.desktop -share/gnome/doc/aMule-1.2.8/ABOUT-NLS -share/gnome/doc/aMule-1.2.8/AUTHORS -share/gnome/doc/aMule-1.2.8/Changelog -share/gnome/doc/aMule-1.2.8/ED2K-Links.HOWTO -share/gnome/doc/aMule-1.2.8/INSTALL -share/gnome/doc/aMule-1.2.8/README -share/gnome/doc/aMule-1.2.8/TODO -share/gnome/doc/aMule-1.2.8/amulesig.txt -share/gnome/doc/aMule-1.2.8/eMule-Imports-Status -share/gnome/doc/aMule-1.2.8/license.txt -@dirrm share/gnome/doc/aMule-1.2.8 -share/locale/en/LC_MESSAGES/amule.mo -share/locale/es/LC_MESSAGES/amule.mo +share/locale/ar/LC_MESSAGES/amule.mo +share/locale/bg/LC_MESSAGES/amule.mo +share/locale/ca/LC_MESSAGES/amule.mo +share/locale/da/LC_MESSAGES/amule.mo share/locale/de/LC_MESSAGES/amule.mo +share/locale/en_GB/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/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/ko/LC_MESSAGES/amule.mo +share/locale/nl/LC_MESSAGES/amule.mo share/locale/pl/LC_MESSAGES/amule.mo -share/locale/ee/LC_MESSAGES/amule.mo -share/locale/ru/LC_MESSAGES/amule.mo -share/locale/bg/LC_MESSAGES/amule.mo -share/locale/es_MX/LC_MESSAGES/amule.mo share/locale/pt_BR/LC_MESSAGES/amule.mo -share/locale/gl/LC_MESSAGES/amule.mo -share/locale/eu/LC_MESSAGES/amule.mo -share/locale/nl/LC_MESSAGES/amule.mo -share/gnome/amuleweb/webserver/GraphCon.gif -share/gnome/amuleweb/webserver/GraphDL.gif -share/gnome/amuleweb/webserver/GraphUL.gif -share/gnome/amuleweb/webserver/add_server.gif -share/gnome/amuleweb/webserver/arrow_down.gif -share/gnome/amuleweb/webserver/arrow_right.gif -share/gnome/amuleweb/webserver/arrow_up.gif -share/gnome/amuleweb/webserver/black.gif -share/gnome/amuleweb/webserver/blue.gif -share/gnome/amuleweb/webserver/blue1.gif -share/gnome/amuleweb/webserver/blue2.gif -share/gnome/amuleweb/webserver/blue3.gif -share/gnome/amuleweb/webserver/blue4.gif -share/gnome/amuleweb/webserver/blue5.gif -share/gnome/amuleweb/webserver/blue6.gif -share/gnome/amuleweb/webserver/cp_download.gif -share/gnome/amuleweb/webserver/cp_kad.gif -share/gnome/amuleweb/webserver/cp_search.gif -share/gnome/amuleweb/webserver/cp_servers.gif -share/gnome/amuleweb/webserver/cp_settings.gif -share/gnome/amuleweb/webserver/cp_shared.gif -share/gnome/amuleweb/webserver/cp_stats.gif -share/gnome/amuleweb/webserver/emule.gif -share/gnome/amuleweb/webserver/green.gif -share/gnome/amuleweb/webserver/greenpercent.gif -share/gnome/amuleweb/webserver/l_cancel.gif -share/gnome/amuleweb/webserver/l_connect.gif -share/gnome/amuleweb/webserver/l_down.gif -share/gnome/amuleweb/webserver/l_ed2klink.gif -share/gnome/amuleweb/webserver/l_info.gif -share/gnome/amuleweb/webserver/l_pause.gif -share/gnome/amuleweb/webserver/l_resume.gif -share/gnome/amuleweb/webserver/l_up.gif -share/gnome/amuleweb/webserver/log.gif -share/gnome/amuleweb/webserver/main_bg.gif -share/gnome/amuleweb/webserver/main_top_bg.gif -share/gnome/amuleweb/webserver/red.gif -share/gnome/amuleweb/webserver/top_bar_bg.gif -share/gnome/amuleweb/webserver/top_bar_bg2.gif -share/gnome/amuleweb/webserver/transparent.gif -share/gnome/amuleweb/webserver/yellow.gif -share/gnome/amuleweb/aMule.tmpl -@dirrm share/gnome/amuleweb/webserver -@dirrm share/gnome/amuleweb +share/locale/pt_PT/LC_MESSAGES/amule.mo +share/locale/ru/LC_MESSAGES/amule.mo +share/locale/zh_CN/LC_MESSAGES/amule.mo +share/locale/zh_TW/LC_MESSAGES/amule.mo +share/gnome/doc/aMule-2.0.0rc7/ABOUT-NLS +share/gnome/doc/aMule-2.0.0rc7/Changelog +share/gnome/doc/aMule-2.0.0rc7/Doxyfile +share/gnome/doc/aMule-2.0.0rc7/ED2K-Links.HOWTO +share/gnome/doc/aMule-2.0.0rc7/INSTALL +share/gnome/doc/aMule-2.0.0rc7/README +share/gnome/doc/aMule-2.0.0rc7/TODO +share/gnome/doc/aMule-2.0.0rc7/amule-win32.HOWTO.txt +share/gnome/doc/aMule-2.0.0rc7/amulesig.txt +share/gnome/doc/aMule-2.0.0rc7/license.txt +@dirrm share/gnome/doc/aMule-2.0.0rc7 +share/gnome/pixmaps/amule.xpm +%%PL_ALC%%share/gnome/pixmaps/alc.xpm +%%PL_CAS%%share/gnome/pixmaps/wxcas.xpm +share/gnome/applications/amule.desktop +%%PL_ALC%%share/gnome/applications/alc.desktop +%%PL_CAS%%share/gnome/applications/wxcas.desktop +%%PL_AMULEWEBSRV%%share/gnome/amuleweb/webserver/GraphCon.gif +%%PL_AMULEWEBSRV%%share/gnome/amuleweb/webserver/GraphDL.gif +%%PL_AMULEWEBSRV%%share/gnome/amuleweb/webserver/GraphUL.gif +%%PL_AMULEWEBSRV%%share/gnome/amuleweb/webserver/add_server.gif +%%PL_AMULEWEBSRV%%share/gnome/amuleweb/webserver/arrow_down.gif +%%PL_AMULEWEBSRV%%share/gnome/amuleweb/webserver/arrow_right.gif +%%PL_AMULEWEBSRV%%share/gnome/amuleweb/webserver/arrow_up.gif +%%PL_AMULEWEBSRV%%share/gnome/amuleweb/webserver/black.gif +%%PL_AMULEWEBSRV%%share/gnome/amuleweb/webserver/blue.gif +%%PL_AMULEWEBSRV%%share/gnome/amuleweb/webserver/blue1.gif +%%PL_AMULEWEBSRV%%share/gnome/amuleweb/webserver/blue2.gif +%%PL_AMULEWEBSRV%%share/gnome/amuleweb/webserver/blue3.gif +%%PL_AMULEWEBSRV%%share/gnome/amuleweb/webserver/blue4.gif +%%PL_AMULEWEBSRV%%share/gnome/amuleweb/webserver/blue5.gif +%%PL_AMULEWEBSRV%%share/gnome/amuleweb/webserver/blue6.gif +%%PL_AMULEWEBSRV%%share/gnome/amuleweb/webserver/cp_download.gif +%%PL_AMULEWEBSRV%%share/gnome/amuleweb/webserver/cp_kad.gif +%%PL_AMULEWEBSRV%%share/gnome/amuleweb/webserver/cp_search.gif +%%PL_AMULEWEBSRV%%share/gnome/amuleweb/webserver/cp_servers.gif +%%PL_AMULEWEBSRV%%share/gnome/amuleweb/webserver/cp_settings.gif +%%PL_AMULEWEBSRV%%share/gnome/amuleweb/webserver/cp_shared.gif +%%PL_AMULEWEBSRV%%share/gnome/amuleweb/webserver/cp_stats.gif +%%PL_AMULEWEBSRV%%share/gnome/amuleweb/webserver/emule.gif +%%PL_AMULEWEBSRV%%share/gnome/amuleweb/webserver/green.gif +%%PL_AMULEWEBSRV%%share/gnome/amuleweb/webserver/greenpercent.gif +%%PL_AMULEWEBSRV%%share/gnome/amuleweb/webserver/l_cancel.gif +%%PL_AMULEWEBSRV%%share/gnome/amuleweb/webserver/l_connect.gif +%%PL_AMULEWEBSRV%%share/gnome/amuleweb/webserver/l_down.gif +%%PL_AMULEWEBSRV%%share/gnome/amuleweb/webserver/l_ed2klink.gif +%%PL_AMULEWEBSRV%%share/gnome/amuleweb/webserver/l_info.gif +%%PL_AMULEWEBSRV%%share/gnome/amuleweb/webserver/l_pause.gif +%%PL_AMULEWEBSRV%%share/gnome/amuleweb/webserver/l_resume.gif +%%PL_AMULEWEBSRV%%share/gnome/amuleweb/webserver/l_up.gif +%%PL_AMULEWEBSRV%%share/gnome/amuleweb/webserver/log.gif +%%PL_AMULEWEBSRV%%share/gnome/amuleweb/webserver/main_bg.gif +%%PL_AMULEWEBSRV%%share/gnome/amuleweb/webserver/main_top_bg.gif +%%PL_AMULEWEBSRV%%share/gnome/amuleweb/webserver/red.gif +%%PL_AMULEWEBSRV%%share/gnome/amuleweb/webserver/top_bar_bg.gif +%%PL_AMULEWEBSRV%%share/gnome/amuleweb/webserver/top_bar_bg2.gif +%%PL_AMULEWEBSRV%%share/gnome/amuleweb/webserver/transparent.gif +%%PL_AMULEWEBSRV%%share/gnome/amuleweb/webserver/yellow.gif +%%PL_AMULEWEBSRV%%share/gnome/amuleweb/aMule.tmpl +%%PL_AMULEWEBSRV%%@dirrm share/gnome/amuleweb/webserver +%%PL_AMULEWEBSRV%%@dirrm share/gnome/amuleweb +%%PL_CAS%%share/gnome/cas/stat.png +%%PL_CAS%%share/gnome/cas/tmp.html +%%PL_CAS%%@dirrm share/gnome/cas +lib/xchat/plugins/xas.pl +%%PL_CAS%%bin/cas +%%PL_CAS%%bin/wxcas +%%PL_ALC%%bin/alc +%%PL_ALC%%bin/alcc +%%PL_AMULEWEBSRV%%bin/amuleweb +%%PL_AMULEWEBSRV%%bin/amulewebDLG +%%PL_AMULECMD%%bin/amulecmd +%%PL_AMULECMD%%bin/amulecmdDLG +%%PL_ED2K%%bin/amule-ed2k +bin/amule --------------- Patch ends here --------------- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20041023161343.A0654255>