From freebsd-ports-bugs Sat Oct 29 12:41:35 2005 From: Frerich Raabe Date: Sat, 29 Oct 2005 12:41:35 +0000 To: freebsd-ports-bugs Subject: ports/88176: Update port: net/xmule to version 1.12.0 Message-Id: <200510291241.j9TCfZco035376 () hex ! athame ! co ! uk> X-MARC-Message: https://marc.info/?l=freebsd-ports-bugs&m=113059023311570 >Number: 88176 >Category: ports >Synopsis: Update port: net/xmule to version 1.12.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Oct 29 12:50:05 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Frerich Raabe >Release: FreeBSD 5.4-STABLE i386 >Organization: >Environment: System: FreeBSD icarus.lan 5.4-STABLE FreeBSD 5.4-STABLE #6: Mon Oct 10 14:47:27 UTC 2005 frerich@icarus.lan:/usr/obj/usr/src/sys/IBMTPR51 i386 >Description: The accompanying patch attempts to update the net/xmule port to honour the recent xmule 1.12.0 release. >How-To-Repeat: >Fix: diff -ruN /usr/ports/net/xmule/Makefile net/xmule/Makefile --- /usr/ports/net/xmule/Makefile Mon Sep 5 21:15:27 2005 +++ net/xmule/Makefile Sat Oct 29 14:27:45 2005 @@ -6,12 +6,11 @@ # PORTNAME= xmule -DISTVERSION= 1.10.0a +DISTVERSION= 1.12.0 CATEGORIES= net #MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITES= http://download.berlios.de/%SUBDIR%/ MASTER_SITE_SUBDIR= xmule -DISTNAME= ${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E} MAINTAINER= lioux@FreeBSD.org COMMENT= Port of eMule eDonkey P2P client using wxWindows class library @@ -63,6 +62,9 @@ BROKEN= "Does not compile on sparc64" .endif +post-extract: + @${CHMOD} a+x ${WRKSRC}/mkinstalldirs + post-patch: # it works for FreeBSD as well @${REINPLACE_CMD} -E \ @@ -71,7 +73,7 @@ # update documentation with correct prefix @${REINPLACE_CMD} -E \ -e 's|/usr/X11R6/(bin/${PORTNAME}-ed2k-handler)|${PREFIX}/\1|' \ - ${WRKSRC}/ED2K-Links.HOWTO + ${WRKSRC}/docs/ED2K-Links.HOWTO # use BSD_INSTALL_* macros @${REINPLACE_CMD} -E \ -e 's|cp -f|${INSTALL_DATA}|' \ diff -ruN /usr/ports/net/xmule/distinfo net/xmule/distinfo --- /usr/ports/net/xmule/distinfo Thu Apr 7 19:20:08 2005 +++ net/xmule/distinfo Sat Oct 29 14:03:10 2005 @@ -1,2 +1,2 @@ -MD5 (xmule-1.10.0a.tar.bz2) = 44935bc3ae712bca8aa78451b514feb3 -SIZE (xmule-1.10.0a.tar.bz2) = 1253524 +MD5 (xmule-1.12.0.tar.bz2) = 822cc602a9b6072b307577873bf0ecd2 +SIZE (xmule-1.12.0.tar.bz2) = 1286122 diff -ruN /usr/ports/net/xmule/files/patch-ED2K-Links.HOWTO net/xmule/files/patch-ED2K-Links.HOWTO --- /usr/ports/net/xmule/files/patch-ED2K-Links.HOWTO Wed Mar 10 03:10:26 2004 +++ net/xmule/files/patch-ED2K-Links.HOWTO Thu Jan 1 00:00:00 1970 @@ -1,44 +0,0 @@ ---- ED2K-Links.HOWTO.orig Thu Mar 4 12:46:20 2004 -+++ ED2K-Links.HOWTO Tue Mar 9 21:21:16 2004 -@@ -14,7 +14,7 @@ - the mentioned directory: - - [Protocol] -- exec=/usr/local/bin/ed2k "%u" -+ exec=/usr/X11R6/bin/xmule-ed2k-handler "%u" - protocol=ed2k - input=none - output=none -@@ -39,12 +39,12 @@ - create xmule_submit.sh with this content: - - #!/bin/sh -- /usr/local/bin/ed2k "ed2k://$1"; -+ xmule-ed2k-handler "ed2k://$1"; - - now edit (as root) /etc/opera6rc or as non-root ~/.opera/opera6.ini: - - [Trusted Applications] -- ed2k=/usr/local/bin/xmule_submit.sh -+ ed2k=/usr/X11R6/bin/xmule_submit.sh - - [User Prefs] - TrustedExternalURLProtocols=ed2k -@@ -59,7 +59,7 @@ - TrustedExternalURLProtocols=ed2k - - in [Trusted Applications] -- ed2k=/path/to/ed2k ed2k://%u -+ ed2k=/usr/X11R6/bin/xmule-ed2k-handler ed2k://%u - - (Credits: ender) - -@@ -96,7 +96,7 @@ - - -create a file called "ed2k.cmd" with the following content: - -- ed2k ed2k:$URI_DATA -+ xmule-ed2k-handler ed2k:$URI_DATA - - [do this with your favorite text-editor, the file doesn't have to be executable] - diff -ruN /usr/ports/net/xmule/files/patch-configure net/xmule/files/patch-configure --- /usr/ports/net/xmule/files/patch-configure Thu Jan 1 00:00:00 1970 +++ net/xmule/files/patch-configure Sat Oct 29 14:30:48 2005 @@ -0,0 +1,21 @@ +--- configure.orig Thu Oct 27 19:48:17 2005 ++++ configure Sat Oct 29 14:30:38 2005 +@@ -9070,15 +9070,15 @@ + + if test x"$have_cryptopp" = x"yes"; then + cryp_name="cryptopp"; +- have_crypto = 1 ++ have_crypto=1 + fi + + if test x"$have_cryptopp2" = x"yes"; then + cryp_name="crypto++" +- have_crypto = 1 ++ have_crypto=1 + fi + +-if have_crypto -eq 1; then ++if test $have_crypto -eq 1; then + echo "Cryp name: -$cryp_name-" + + cat >>confdefs.h <<_ACEOF diff -ruN /usr/ports/net/xmule/files/patch-docs::ED2K-Links.HOWTO net/xmule/files/patch-docs::ED2K-Links.HOWTO --- /usr/ports/net/xmule/files/patch-docs::ED2K-Links.HOWTO Thu Jan 1 00:00:00 1970 +++ net/xmule/files/patch-docs::ED2K-Links.HOWTO Sat Oct 29 14:04:25 2005 @@ -0,0 +1,44 @@ +--- docs/ED2K-Links.HOWTO.orig Thu Mar 4 12:46:20 2004 ++++ docs/ED2K-Links.HOWTO Tue Mar 9 21:21:16 2004 +@@ -14,7 +14,7 @@ + the mentioned directory: + + [Protocol] +- exec=/usr/local/bin/ed2k "%u" ++ exec=/usr/X11R6/bin/xmule-ed2k-handler "%u" + protocol=ed2k + input=none + output=none +@@ -39,12 +39,12 @@ + create xmule_submit.sh with this content: + + #!/bin/sh +- /usr/local/bin/ed2k "ed2k://$1"; ++ xmule-ed2k-handler "ed2k://$1"; + + now edit (as root) /etc/opera6rc or as non-root ~/.opera/opera6.ini: + + [Trusted Applications] +- ed2k=/usr/local/bin/xmule_submit.sh ++ ed2k=/usr/X11R6/bin/xmule_submit.sh + + [User Prefs] + TrustedExternalURLProtocols=ed2k +@@ -59,7 +59,7 @@ + TrustedExternalURLProtocols=ed2k + + in [Trusted Applications] +- ed2k=/path/to/ed2k ed2k://%u ++ ed2k=/usr/X11R6/bin/xmule-ed2k-handler ed2k://%u + + (Credits: ender) + +@@ -96,7 +96,7 @@ + + -create a file called "ed2k.cmd" with the following content: + +- ed2k ed2k:$URI_DATA ++ xmule-ed2k-handler ed2k:$URI_DATA + + [do this with your favorite text-editor, the file doesn't have to be executable] + diff -ruN /usr/ports/net/xmule/files/patch-src::ServerSocket.cpp net/xmule/files/patch-src::ServerSocket.cpp --- /usr/ports/net/xmule/files/patch-src::ServerSocket.cpp Sun Nov 14 23:59:23 2004 +++ net/xmule/files/patch-src::ServerSocket.cpp Thu Jan 1 00:00:00 1970 @@ -1,10 +0,0 @@ ---- src/ServerSocket.cpp.orig Sun Nov 14 19:41:57 2004 -+++ src/ServerSocket.cpp Sun Nov 14 19:42:03 2004 -@@ -44,6 +44,7 @@ - - #include "DynPrefs/DynPrefs.h" // Needed for DynamicPreferences - -+#include - #include // Needed for sockaddr_in - - class ServerSocketEvt: public wxEvtHandler diff -ruN /usr/ports/net/xmule/files/patch-src::SysTray.h net/xmule/files/patch-src::SysTray.h --- /usr/ports/net/xmule/files/patch-src::SysTray.h Sun Nov 14 23:59:23 2004 +++ net/xmule/files/patch-src::SysTray.h Thu Jan 1 00:00:00 1970 @@ -1,10 +0,0 @@ ---- src/SysTray.h.orig Sun Nov 14 19:45:30 2004 -+++ src/SysTray.h Sun Nov 14 19:45:00 2004 -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff -ruN /usr/ports/net/xmule/files/patch-src::WebServer.cpp net/xmule/files/patch-src::WebServer.cpp --- /usr/ports/net/xmule/files/patch-src::WebServer.cpp Wed Jun 11 22:29:38 2003 +++ net/xmule/files/patch-src::WebServer.cpp Thu Jan 1 00:00:00 1970 @@ -1,13 +0,0 @@ ---- src/WebServer.cpp.orig Tue May 20 20:42:30 2003 -+++ src/WebServer.cpp Tue May 20 21:06:14 2003 -@@ -9,6 +9,10 @@ - #include - #include - -+#ifdef __FreeBSD__ -+extern long long atoll(const char *s); -+#endif /* __FreeBSD__ */ -+ - #ifdef _DEBUG - #undef THIS_FILE - static char THIS_FILE[]=__FILE__; diff -ruN /usr/ports/net/xmule/files/patch-src::xmule.cpp net/xmule/files/patch-src::xmule.cpp --- /usr/ports/net/xmule/files/patch-src::xmule.cpp Sun Nov 14 23:59:23 2004 +++ net/xmule/files/patch-src::xmule.cpp Thu Jan 1 00:00:00 1970 @@ -1,10 +0,0 @@ ---- src/xmule.cpp.orig Sun Nov 14 20:25:21 2004 -+++ src/xmule.cpp Sun Nov 14 20:32:50 2004 -@@ -65,7 +65,6 @@ - - #include // Needed for std::cout - #include // Needed for GTK_WINDOW_TOPLEVEL --#include - - #include // Needed for wxTheClipboard - #include // Needed for wxMessageBox diff -ruN /usr/ports/net/xmule/pkg-plist net/xmule/pkg-plist --- /usr/ports/net/xmule/pkg-plist Mon Sep 5 21:15:27 2005 +++ net/xmule/pkg-plist Sat Oct 29 14:19:41 2005 @@ -2,15 +2,15 @@ bin/xmule-ed2k-handler share/gnome/applications/xmule.desktop share/gnome/pixmaps/xmule.xpm -share/locale/de/LC_MESSAGES/xMule.mo -share/locale/ee/LC_MESSAGES/xMule.mo -share/locale/es/LC_MESSAGES/xMule.mo -share/locale/es_MX/LC_MESSAGES/xMule.mo -share/locale/fr/LC_MESSAGES/xMule.mo -share/locale/it/LC_MESSAGES/xMule.mo -share/locale/ko/LC_MESSAGES/xMule.mo -share/locale/pl/LC_MESSAGES/xMule.mo -share/locale/tr/LC_MESSAGES/xMule.mo +share/locale/de/LC_MESSAGES/xmule.mo +share/locale/ee/LC_MESSAGES/xmule.mo +share/locale/es/LC_MESSAGES/xmule.mo +share/locale/es_MX/LC_MESSAGES/xmule.mo +share/locale/fr/LC_MESSAGES/xmule.mo +share/locale/it/LC_MESSAGES/xmule.mo +share/locale/ko/LC_MESSAGES/xmule.mo +share/locale/pl/LC_MESSAGES/xmule.mo +share/locale/tr/LC_MESSAGES/xmule.mo @unexec rmdir %D/share/locale/tr/LC_MESSAGES 2>/dev/null || true @unexec rmdir %D/share/locale/tr 2>/dev/null || true @unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true >Release-Note: >Audit-Trail: >Unformatted: _______________________________________________ freebsd-ports-bugs@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs To unsubscribe, send any mail to "freebsd-ports-bugs-unsubscribe@freebsd.org"