From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jan 3 19:00:25 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6847516A41F for ; Tue, 3 Jan 2006 19:00:25 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 201E943D75 for ; Tue, 3 Jan 2006 19:00:22 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k03J0LMm047871 for ; Tue, 3 Jan 2006 19:00:21 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k03J0Lia047868; Tue, 3 Jan 2006 19:00:21 GMT (envelope-from gnats) Resent-Date: Tue, 3 Jan 2006 19:00:21 GMT Resent-Message-Id: <200601031900.k03J0Lia047868@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Ganael LAPLANCHE Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6457016A420 for ; Tue, 3 Jan 2006 18:52:14 +0000 (GMT) (envelope-from martymac@martymac.com) Received: from martymac.com (home.martymac.com [82.224.94.101]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3C86443D6D for ; Tue, 3 Jan 2006 18:52:09 +0000 (GMT) (envelope-from martymac@martymac.com) Received: from martymac.com (localhost.martymac.com [127.0.0.1]) by martymac.com (8.13.4/8.13.4) with ESMTP id k03IqTX4000881 for ; Tue, 3 Jan 2006 19:52:30 +0100 (CET) (envelope-from martymac@martymac.com) Received: (from martymac@localhost) by martymac.com (8.13.4/8.13.1/Submit) id k03IqTUF000880; Tue, 3 Jan 2006 19:52:29 +0100 (CET) (envelope-from martymac) Message-Id: <200601031852.k03IqTUF000880@martymac.com> Date: Tue, 3 Jan 2006 19:52:29 +0100 (CET) From: Ganael LAPLANCHE To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/91277: [PORT UPDATE] net/amule2 v2.1.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Ganael LAPLANCHE List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Jan 2006 19:00:25 -0000 >Number: 91277 >Category: ports >Synopsis: [PORT UPDATE] net/amule2 v2.1.0 >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: Tue Jan 03 19:00:20 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Ganael LAPLANCHE >Release: FreeBSD 5.4-STABLE amd64 >Organization: http://contribs.martymac.com >Environment: System: FreeBSD www.martymac.com FreeBSD 5.4-STABLE >Description: This patch updates aMule2 port to v2.1.0 >How-To-Repeat: >Fix: --------------- Patch starts here --------------- diff -aur amule2.orig/Makefile amule2/Makefile --- amule2.orig/Makefile Sat Nov 5 06:19:19 2005 +++ amule2/Makefile Tue Jan 3 10:07:16 2006 @@ -6,8 +6,7 @@ # PORTNAME= aMule -PORTVERSION= 2.0.3 -PORTREVISION= 1 +PORTVERSION= 2.1.0 CATEGORIES= net MASTER_SITES= http://download.berlios.de/amule/ @@ -32,10 +31,8 @@ --with-libintl-prefix=${LOCALBASE} \ --with-libiconv-prefix=${LOCALBASE} \ --with-wx-config=${WX_CONFIG} \ - --with-wxbase-config=${WX_CONFIG} \ --with-curl-config=${CURL_CONFIG} \ --enable-embedded_crypto \ - --enable-utf8-systray \ --enable-monolithic # --with-gdlib-prefix=${LOCALBASE} \ # --with-libpng-prefix=${LOCALBASE} @@ -45,8 +42,8 @@ OPTIONS= OPTIMIZE "Build with optimization" on \ ED2K "Compile aMule ed2k links handler" on \ - AMULECMD "Compile aMule command line client (+GUI)" on \ - AMULEWEBSRV "Compile aMule WebServer (+GUI)" on \ + AMULECMD "Compile aMule command line client" on \ + AMULEWEBSRV "Compile aMule WebServer" on \ CAS "Compile C aMule Statistics (+GUI)" on \ ALC "Compile aMule Link Creator (+GUI)" on \ AMULEDAEMON "Compile aMule daemon version - EXPERIMENTAL" off @@ -76,18 +73,18 @@ .endif .if defined(WITH_AMULECMD) -CONFIGURE_ARGS+= --enable-amulecmd --enable-amulecmdgui +CONFIGURE_ARGS+= --enable-amulecmd PLIST_SUB+= PL_AMULECMD="" .else -CONFIGURE_ARGS+= --disable-amulecmd --disable-amulecmdgui +CONFIGURE_ARGS+= --disable-amulecmd PLIST_SUB+= PL_AMULECMD="@comment " .endif .if defined(WITH_AMULEWEBSRV) -CONFIGURE_ARGS+= --enable-webserver --enable-webservergui +CONFIGURE_ARGS+= --enable-webserver PLIST_SUB+= PL_AMULEWEBSRV="" .else -CONFIGURE_ARGS+= --disable-webserver --disable-webservergui +CONFIGURE_ARGS+= --disable-webserver PLIST_SUB+= PL_AMULEWEBSRV="@comment " .endif @@ -144,14 +141,6 @@ .endif .if defined(WITH_ALC) ${GZIP_CMD} ${PREFIX}/man/fr/man1/alcc.1 -.endif -.if defined(WITH_AMULECMD) - ${RM} ${PREFIX}/man/fr/man1/amulecmdDLG.1 - ${LN} ${PREFIX}/man/fr/man1/amulecmd.1.gz ${PREFIX}/man/fr/man1/amulecmdDLG.1.gz -.endif -.if defined(WITH_AMULEWEBSRV) - ${RM} ${PREFIX}/man/fr/man1/amulewebDLG.1 - ${LN} ${PREFIX}/man/fr/man1/amuleweb.1.gz ${PREFIX}/man/fr/man1/amulewebDLG.1.gz .endif .include diff -aur amule2.orig/Makefile.man amule2/Makefile.man --- amule2.orig/Makefile.man Tue May 17 12:40:09 2005 +++ amule2/Makefile.man Tue Jan 3 10:07:55 2006 @@ -11,11 +11,9 @@ .endif .if defined(WITH_AMULEWEBSRV) MAN1+= amuleweb.1 -MLINKS+= amuleweb.1 amulewebDLG.1 .endif .if defined(WITH_AMULECMD) MAN1+= amulecmd.1 -MLINKS+= amulecmd.1 amulecmdDLG.1 .endif .if defined(WITH_ED2K) MAN1+= ed2k.1 diff -aur amule2.orig/distinfo amule2/distinfo --- amule2.orig/distinfo Fri Jun 17 07:51:47 2005 +++ amule2/distinfo Tue Jan 3 11:43:54 2006 @@ -1,2 +1,2 @@ -MD5 (aMule-2.0.3.tar.gz) = 529e6286087d22c1bec63d0757f9cfae -SIZE (aMule-2.0.3.tar.gz) = 2870070 +MD5 (aMule-2.1.0.tar.gz) = f2582a1d51766927386592d07dee85be +SIZE (aMule-2.1.0.tar.gz) = 4092686 diff -aur amule2.orig/files/patch-amuleDlg.cpp amule2/files/patch-amuleDlg.cpp --- amule2.orig/files/patch-amuleDlg.cpp Tue May 17 12:40:09 2005 +++ amule2/files/patch-amuleDlg.cpp Tue Jan 3 19:13:24 2006 @@ -1,6 +1,6 @@ ---- src/amuleDlg.cpp.orig Tue May 3 20:37:09 2005 -+++ src/amuleDlg.cpp Tue May 3 20:39:53 2005 -@@ -502,9 +502,9 @@ +--- src/amuleDlg.cpp.orig Sun Jan 1 06:17:25 2006 ++++ src/amuleDlg.cpp Tue Jan 3 19:12:04 2006 +@@ -413,9 +413,9 @@ { wxString msg = wxT(" "); #ifdef CLIENT_GUI @@ -12,7 +12,7 @@ #endif msg << wxT(" "); #ifdef CVSDATE -@@ -514,7 +514,8 @@ +@@ -425,7 +425,8 @@ " 'All-Platform' p2p client based on eMule \n\n" " Website: http://www.amule.org \n" " Forum: http://forum.amule.org \n" @@ -20,5 +20,5 @@ + " FAQ: http://wiki.amule.org \n" + " FreeBSD port: http://contribs.martymac.com \n\n" " Contact: admin@amule.org (administrative issues) \n" - " Copyright (C) 2003-2005 aMule Team \n"); - if (is_safe_state) { + " Copyright (C) 2003-2006 aMule Team \n\n" + " Part of aMule is based on \n" diff -aur amule2.orig/pkg-plist amule2/pkg-plist --- amule2.orig/pkg-plist Fri Jun 17 07:51:47 2005 +++ amule2/pkg-plist Tue Jan 3 11:42:03 2006 @@ -2,9 +2,7 @@ %%PL_AMULEDAEMON%%etc/rc.d/amuled.sh %%PL_ALC%%man/fr/man1/alcc.1.gz %%PL_AMULEWEBSRV%%man/fr/man1/amuleweb.1.gz -%%PL_AMULEWEBSRV%%man/fr/man1/amulewebDLG.1.gz %%PL_AMULECMD%%man/fr/man1/amulecmd.1.gz -%%PL_AMULECMD%%man/fr/man1/amulecmdDLG.1.gz %%PL_ED2K%%man/fr/man1/ed2k.1.gz %%PL_AMULEDAEMON%%man/fr/man1/amuled.1.gz man/fr/man1/amule.1.gz @@ -14,7 +12,7 @@ share/locale/de/LC_MESSAGES/amule.mo share/locale/fr/LC_MESSAGES/amule.mo share/locale/it/LC_MESSAGES/amule.mo -share/locale/ko/LC_MESSAGES/amule.mo +share/locale/ko_KR/LC_MESSAGES/amule.mo share/locale/pl/LC_MESSAGES/amule.mo share/locale/et_EE/LC_MESSAGES/amule.mo share/locale/ru/LC_MESSAGES/amule.mo @@ -41,19 +39,19 @@ @unexec rmdir %D/share/locale/et_EE 2>/dev/null || true @unexec rmdir %D/share/locale/it_CH/LC_MESSAGES 2>/dev/null || true @unexec rmdir %D/share/locale/it_CH 2>/dev/null || true -share/gnome/doc/aMule-2.0.3/ABOUT-NLS -share/gnome/doc/aMule-2.0.3/amulesig.txt -share/gnome/doc/aMule-2.0.3/amule-win32.HOWTO.txt -share/gnome/doc/aMule-2.0.3/Changelog -share/gnome/doc/aMule-2.0.3/Doxyfile -share/gnome/doc/aMule-2.0.3/ED2K-Links.HOWTO -share/gnome/doc/aMule-2.0.3/INSTALL -share/gnome/doc/aMule-2.0.3/license.txt -share/gnome/doc/aMule-2.0.3/README -share/gnome/doc/aMule-2.0.3/TODO -share/gnome/doc/aMule-2.0.3/EC_Protocol.txt -share/gnome/doc/aMule-2.0.3/socks4.protocol -@unexec rmdir %D/share/gnome/doc/aMule-2.0.3 2>/dev/null || true +share/gnome/doc/aMule-2.1.0/ABOUT-NLS +share/gnome/doc/aMule-2.1.0/amulesig.txt +share/gnome/doc/aMule-2.1.0/amule-win32.HOWTO.txt +share/gnome/doc/aMule-2.1.0/Changelog +share/gnome/doc/aMule-2.1.0/Doxyfile +share/gnome/doc/aMule-2.1.0/ED2K-Links.HOWTO +share/gnome/doc/aMule-2.1.0/INSTALL +share/gnome/doc/aMule-2.1.0/license.txt +share/gnome/doc/aMule-2.1.0/README +share/gnome/doc/aMule-2.1.0/TODO +share/gnome/doc/aMule-2.1.0/EC_Protocol.txt +share/gnome/doc/aMule-2.1.0/socks4.protocol +@unexec rmdir %D/share/gnome/doc/aMule-2.1.0 2>/dev/null || true @unexec rmdir %D/share/gnome/doc 2>/dev/null || true %%PL_CAS%%share/gnome/cas/tmp.html %%PL_CAS%%share/gnome/cas/stat.png @@ -101,7 +99,66 @@ %%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/red.gif %%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/transparent.gif %%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/yellow.gif -%%PL_AMULEWEBSRV%%@unexec rmdir %D/share/gnome/amule/webserver/default 2>/dev/null || true +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/phpamule.png +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/tree-leaf.gif +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/tree-open.gif +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/tree-closed.gif +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/favicon.ico +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/downloads.php +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/preferences.php +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/search.php +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/servers.php +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/shared.php +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/stat_graphs.php +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/stat_tree.php +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/login.html +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/default/index.php +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/amuleweb-main-dload.php +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/amuleweb-main-search.php +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/amuleweb-main-servers.php +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/amuleweb-main-shared.php +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/amuleweb-main-stats.php +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/amuleweb-main-prefs.php +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/amuleweb-main-kad.php +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/stats.php +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/stats_tree.php +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/top.html +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/footer.php +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/login.html +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/tree-open.gif +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/tree-closed.gif +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/tree-leaf.gif +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-reload.jpeg +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-search.jpeg +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-search-pressed.jpeg +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-servers.jpeg +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-servers-pressed.jpeg +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-settings.jpeg +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-settings-pressed.jpeg +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-shared.jpeg +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-shared-pressed.jpeg +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-download.jpeg +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-download-pressed.jpeg +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-kad.jpeg +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-kad-pressed.jpeg +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-stats.jpeg +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-stats-pressed.jpeg +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-connect.jpeg +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-logout.jpeg +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-logout-pressed.jpeg +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/toolbutton-filter.jpeg +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/connect.gif +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/cancel.gif +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/arrow-r.png +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/up.jpeg +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/down.jpeg +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/pause.jpeg +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/resume.jpeg +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/apply.jpeg +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/delete.jpeg +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/phpamule.png +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/favicon.ico +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/php-default/index.html %%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/aMule.tmpl %%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/add_server.gif %%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/arrow_down.gif @@ -152,6 +209,22 @@ %%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/red.gif %%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/transparent.gif %%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/yellow.gif +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/phpamule.png +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/tree-leaf.gif +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/tree-open.gif +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/tree-closed.gif +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/favicon.ico +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/downloads.php +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/preferences.php +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/search.php +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/servers.php +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/shared.php +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/stat_graphs.php +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/stat_tree.php +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login.html +%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/index.php +%%PL_AMULEWEBSRV%%@unexec rmdir %D/share/gnome/amule/webserver/default 2>/dev/null || true +%%PL_AMULEWEBSRV%%@unexec rmdir %D/share/gnome/amule/webserver/php-default 2>/dev/null || true %%PL_AMULEWEBSRV%%@unexec rmdir %D/share/gnome/amule/webserver/chicane 2>/dev/null || true %%PL_AMULEWEBSRV%%@unexec rmdir %D/share/gnome/amule/webserver 2>/dev/null || true %%PL_AMULEWEBSRV%%@unexec rmdir %D/share/gnome/amule 2>/dev/null || true @@ -163,9 +236,7 @@ %%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/ed2k %%PL_AMULEDAEMON%%bin/amulegui %%PL_AMULEDAEMON%%bin/amuled --------------- Patch ends here --------------- >Release-Note: >Audit-Trail: >Unformatted: