From 2ea511dba22a47dc70d61d94e9e9a0048708c2c3 Mon Sep 17 00:00:00 2001 From: Mario Sergio Fujikawa Ferreira Date: Fri, 18 Nov 2005 07:01:51 +0000 Subject: o Update to 1.12.0 o Switch from depending on x11-toolkits/wxgtk24 to x11-toolkits/wxgtk26 o Remove patches which incorporated in the distribution PR: 88176 Submitted by: Frerich Raabe --- net-p2p/xmule/Makefile | 16 +++++---- net-p2p/xmule/distinfo | 6 ++-- net-p2p/xmule/files/patch-ED2K-Links.HOWTO | 44 ------------------------ net-p2p/xmule/files/patch-configure | 21 +++++++++++ net-p2p/xmule/files/patch-docs::ED2K-Links.HOWTO | 44 ++++++++++++++++++++++++ net-p2p/xmule/files/patch-src::ServerSocket.cpp | 10 ------ net-p2p/xmule/files/patch-src::SysTray.h | 10 ------ net-p2p/xmule/files/patch-src::WebServer.cpp | 13 ------- net-p2p/xmule/files/patch-src::xmule.cpp | 10 ------ net-p2p/xmule/pkg-plist | 18 +++++----- net/xmule/Makefile | 16 +++++---- net/xmule/distinfo | 6 ++-- net/xmule/files/patch-ED2K-Links.HOWTO | 44 ------------------------ net/xmule/files/patch-configure | 21 +++++++++++ net/xmule/files/patch-docs::ED2K-Links.HOWTO | 44 ++++++++++++++++++++++++ net/xmule/files/patch-src::ServerSocket.cpp | 10 ------ net/xmule/files/patch-src::SysTray.h | 10 ------ net/xmule/files/patch-src::WebServer.cpp | 13 ------- net/xmule/files/patch-src::xmule.cpp | 10 ------ net/xmule/pkg-plist | 18 +++++----- 20 files changed, 172 insertions(+), 212 deletions(-) delete mode 100644 net-p2p/xmule/files/patch-ED2K-Links.HOWTO create mode 100644 net-p2p/xmule/files/patch-configure create mode 100644 net-p2p/xmule/files/patch-docs::ED2K-Links.HOWTO delete mode 100644 net-p2p/xmule/files/patch-src::ServerSocket.cpp delete mode 100644 net-p2p/xmule/files/patch-src::SysTray.h delete mode 100644 net-p2p/xmule/files/patch-src::WebServer.cpp delete mode 100644 net-p2p/xmule/files/patch-src::xmule.cpp delete mode 100644 net/xmule/files/patch-ED2K-Links.HOWTO create mode 100644 net/xmule/files/patch-configure create mode 100644 net/xmule/files/patch-docs::ED2K-Links.HOWTO delete mode 100644 net/xmule/files/patch-src::ServerSocket.cpp delete mode 100644 net/xmule/files/patch-src::SysTray.h delete mode 100644 net/xmule/files/patch-src::WebServer.cpp delete mode 100644 net/xmule/files/patch-src::xmule.cpp diff --git a/net-p2p/xmule/Makefile b/net-p2p/xmule/Makefile index 0c3fd9156b56..2e0f9d35a59c 100644 --- a/net-p2p/xmule/Makefile +++ b/net-p2p/xmule/Makefile @@ -6,19 +6,18 @@ # 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_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 BUILD_DEPENDS= ${LOCALBASE}/lib/libcryptopp.a:${PORTSDIR}/security/cryptopp LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2 \ - wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 + wx_gtk2_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26 RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget USE_GETTEXT= yes @@ -44,7 +43,7 @@ MAKE_ENV= CC="${CC}" CXX="${CXX}" # for debugging purposes STRIP= -WX_CONFIG?= ${X11BASE}/bin/wxgtk2-2.4-config +WX_CONFIG?= ${X11BASE}/bin/wxgtk2-2.6-config FILES_ATOLL_PATCH= src/Preferences.cpp \ src/otherfunctions.cpp @@ -71,7 +70,7 @@ post-patch: # 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}|' \ @@ -109,6 +108,9 @@ pre-configure: -e 's|^(CXXFLAGS.*)$$|\1 -I${LOCALBASE}/include|' \ ${WRKSRC}/xLibs/xrc/xrc.make.in +pre-install: + @${CHMOD} a=rx ${WRKSRC}/mkinstalldirs + post-install: # install xmule binary @${INSTALL_PROGRAM} \ diff --git a/net-p2p/xmule/distinfo b/net-p2p/xmule/distinfo index e20a3a7592c8..9b5a83ad0322 100644 --- a/net-p2p/xmule/distinfo +++ b/net-p2p/xmule/distinfo @@ -1,3 +1,3 @@ -MD5 (xmule-1.10.0a.tar.bz2) = 44935bc3ae712bca8aa78451b514feb3 -SHA256 (xmule-1.10.0a.tar.bz2) = c6628f526b7cf0d95a91833110c2c9939a81b8af415d8265753dc8d9e713cb49 -SIZE (xmule-1.10.0a.tar.bz2) = 1253524 +MD5 (xmule-1.12.0.tar.bz2) = 822cc602a9b6072b307577873bf0ecd2 +SHA256 (xmule-1.12.0.tar.bz2) = aecf268bb9bc1b12b5ce02ec14c62deb5ec662337ce23db7b39b5d82bee9c9bc +SIZE (xmule-1.12.0.tar.bz2) = 1286122 diff --git a/net-p2p/xmule/files/patch-ED2K-Links.HOWTO b/net-p2p/xmule/files/patch-ED2K-Links.HOWTO deleted file mode 100644 index 3780a708b5d1..000000000000 --- a/net-p2p/xmule/files/patch-ED2K-Links.HOWTO +++ /dev/null @@ -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 --git a/net-p2p/xmule/files/patch-configure b/net-p2p/xmule/files/patch-configure new file mode 100644 index 000000000000..1f41d2c4af25 --- /dev/null +++ b/net-p2p/xmule/files/patch-configure @@ -0,0 +1,21 @@ +--- configure.orig Thu Oct 27 17:47:55 2005 ++++ configure Fri Nov 18 04:36:06 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 [ ${have_crypto} -eq 1 ]; then + echo "Cryp name: -$cryp_name-" + + cat >>confdefs.h <<_ACEOF diff --git a/net-p2p/xmule/files/patch-docs::ED2K-Links.HOWTO b/net-p2p/xmule/files/patch-docs::ED2K-Links.HOWTO new file mode 100644 index 000000000000..0bc6dcc5be15 --- /dev/null +++ b/net-p2p/xmule/files/patch-docs::ED2K-Links.HOWTO @@ -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 --git a/net-p2p/xmule/files/patch-src::ServerSocket.cpp b/net-p2p/xmule/files/patch-src::ServerSocket.cpp deleted file mode 100644 index b3e1a7f2fb43..000000000000 --- a/net-p2p/xmule/files/patch-src::ServerSocket.cpp +++ /dev/null @@ -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 --git a/net-p2p/xmule/files/patch-src::SysTray.h b/net-p2p/xmule/files/patch-src::SysTray.h deleted file mode 100644 index 55da4e3d176e..000000000000 --- a/net-p2p/xmule/files/patch-src::SysTray.h +++ /dev/null @@ -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 --git a/net-p2p/xmule/files/patch-src::WebServer.cpp b/net-p2p/xmule/files/patch-src::WebServer.cpp deleted file mode 100644 index 4087253695dd..000000000000 --- a/net-p2p/xmule/files/patch-src::WebServer.cpp +++ /dev/null @@ -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 --git a/net-p2p/xmule/files/patch-src::xmule.cpp b/net-p2p/xmule/files/patch-src::xmule.cpp deleted file mode 100644 index 559592e23866..000000000000 --- a/net-p2p/xmule/files/patch-src::xmule.cpp +++ /dev/null @@ -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 --git a/net-p2p/xmule/pkg-plist b/net-p2p/xmule/pkg-plist index fa920da99a26..36670a8a5535 100644 --- a/net-p2p/xmule/pkg-plist +++ b/net-p2p/xmule/pkg-plist @@ -2,15 +2,15 @@ bin/xmule 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 diff --git a/net/xmule/Makefile b/net/xmule/Makefile index 0c3fd9156b56..2e0f9d35a59c 100644 --- a/net/xmule/Makefile +++ b/net/xmule/Makefile @@ -6,19 +6,18 @@ # 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_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 BUILD_DEPENDS= ${LOCALBASE}/lib/libcryptopp.a:${PORTSDIR}/security/cryptopp LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2 \ - wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 + wx_gtk2_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26 RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget USE_GETTEXT= yes @@ -44,7 +43,7 @@ MAKE_ENV= CC="${CC}" CXX="${CXX}" # for debugging purposes STRIP= -WX_CONFIG?= ${X11BASE}/bin/wxgtk2-2.4-config +WX_CONFIG?= ${X11BASE}/bin/wxgtk2-2.6-config FILES_ATOLL_PATCH= src/Preferences.cpp \ src/otherfunctions.cpp @@ -71,7 +70,7 @@ post-patch: # 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}|' \ @@ -109,6 +108,9 @@ pre-configure: -e 's|^(CXXFLAGS.*)$$|\1 -I${LOCALBASE}/include|' \ ${WRKSRC}/xLibs/xrc/xrc.make.in +pre-install: + @${CHMOD} a=rx ${WRKSRC}/mkinstalldirs + post-install: # install xmule binary @${INSTALL_PROGRAM} \ diff --git a/net/xmule/distinfo b/net/xmule/distinfo index e20a3a7592c8..9b5a83ad0322 100644 --- a/net/xmule/distinfo +++ b/net/xmule/distinfo @@ -1,3 +1,3 @@ -MD5 (xmule-1.10.0a.tar.bz2) = 44935bc3ae712bca8aa78451b514feb3 -SHA256 (xmule-1.10.0a.tar.bz2) = c6628f526b7cf0d95a91833110c2c9939a81b8af415d8265753dc8d9e713cb49 -SIZE (xmule-1.10.0a.tar.bz2) = 1253524 +MD5 (xmule-1.12.0.tar.bz2) = 822cc602a9b6072b307577873bf0ecd2 +SHA256 (xmule-1.12.0.tar.bz2) = aecf268bb9bc1b12b5ce02ec14c62deb5ec662337ce23db7b39b5d82bee9c9bc +SIZE (xmule-1.12.0.tar.bz2) = 1286122 diff --git a/net/xmule/files/patch-ED2K-Links.HOWTO b/net/xmule/files/patch-ED2K-Links.HOWTO deleted file mode 100644 index 3780a708b5d1..000000000000 --- a/net/xmule/files/patch-ED2K-Links.HOWTO +++ /dev/null @@ -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 --git a/net/xmule/files/patch-configure b/net/xmule/files/patch-configure new file mode 100644 index 000000000000..1f41d2c4af25 --- /dev/null +++ b/net/xmule/files/patch-configure @@ -0,0 +1,21 @@ +--- configure.orig Thu Oct 27 17:47:55 2005 ++++ configure Fri Nov 18 04:36:06 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 [ ${have_crypto} -eq 1 ]; then + echo "Cryp name: -$cryp_name-" + + cat >>confdefs.h <<_ACEOF diff --git a/net/xmule/files/patch-docs::ED2K-Links.HOWTO b/net/xmule/files/patch-docs::ED2K-Links.HOWTO new file mode 100644 index 000000000000..0bc6dcc5be15 --- /dev/null +++ b/net/xmule/files/patch-docs::ED2K-Links.HOWTO @@ -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 --git a/net/xmule/files/patch-src::ServerSocket.cpp b/net/xmule/files/patch-src::ServerSocket.cpp deleted file mode 100644 index b3e1a7f2fb43..000000000000 --- a/net/xmule/files/patch-src::ServerSocket.cpp +++ /dev/null @@ -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 --git a/net/xmule/files/patch-src::SysTray.h b/net/xmule/files/patch-src::SysTray.h deleted file mode 100644 index 55da4e3d176e..000000000000 --- a/net/xmule/files/patch-src::SysTray.h +++ /dev/null @@ -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 --git a/net/xmule/files/patch-src::WebServer.cpp b/net/xmule/files/patch-src::WebServer.cpp deleted file mode 100644 index 4087253695dd..000000000000 --- a/net/xmule/files/patch-src::WebServer.cpp +++ /dev/null @@ -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 --git a/net/xmule/files/patch-src::xmule.cpp b/net/xmule/files/patch-src::xmule.cpp deleted file mode 100644 index 559592e23866..000000000000 --- a/net/xmule/files/patch-src::xmule.cpp +++ /dev/null @@ -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 --git a/net/xmule/pkg-plist b/net/xmule/pkg-plist index fa920da99a26..36670a8a5535 100644 --- a/net/xmule/pkg-plist +++ b/net/xmule/pkg-plist @@ -2,15 +2,15 @@ bin/xmule 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 -- cgit v1.2.3