From 3c0da30d471ea3258c9f68efa4b38ed6c9ed223f Mon Sep 17 00:00:00 2001 From: lioux Date: Sun, 14 Nov 2004 23:59:23 +0000 Subject: Update to 1.9.4b --- net/xmule/Makefile | 18 ++++++++++++------ net/xmule/distinfo | 4 ++-- net/xmule/files/patch-Makefile.in | 11 ++++++----- net/xmule/files/patch-src::ServerSocket.cpp | 10 ++++++++++ net/xmule/files/patch-src::SysTray.h | 10 ++++++++++ net/xmule/files/patch-src::xmule.cpp | 10 ++++++++++ net/xmule/pkg-plist | 19 ++++++++++--------- 7 files changed, 60 insertions(+), 22 deletions(-) create mode 100644 net/xmule/files/patch-src::ServerSocket.cpp create mode 100644 net/xmule/files/patch-src::SysTray.h create mode 100644 net/xmule/files/patch-src::xmule.cpp (limited to 'net/xmule') diff --git a/net/xmule/Makefile b/net/xmule/Makefile index 8f7d9c1..1db99d7 100644 --- a/net/xmule/Makefile +++ b/net/xmule/Makefile @@ -6,11 +6,12 @@ # PORTNAME= xmule -PORTVERSION= 1.8.2 -PORTREVISION= 1 +PORTVERSION= 1.9.4.b CATEGORIES= net -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +#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 @@ -34,7 +35,7 @@ CONFIGURE_ARGS= --without-included-gettext \ --with-libintl-prefix=${LOCALBASE} \ --enable-debug \ --with-wx-config=${WX_CONFIG} -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS}" \ +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" MAKE_ENV= CC="${CC}" CXX="${CXX}" @@ -74,14 +75,19 @@ pre-configure: ${XARGS} -x -n 10 \ ${REINPLACE_CMD} -E \ -e 's!^(AUTOCONF|AUTOHEADER|AUTOMAKE|ACLOCAL).*$$!\1=${TRUE}!' + @${REINPLACE_CMD} -E \ + -e 's|^(CXXFLAGS.*)$$|\1 -I${LOCALBASE}/include|' \ + ${WRKSRC}/xLibs/xrc/xrc.make.in post-install: # install xmule binary - @${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} \ + @${INSTALL_PROGRAM} \ + ${WRKSRC}/${PORTNAME} \ ${PREFIX}/bin # do not install a generic named ed2k binary # install it under a more specific name - @${INSTALL_PROGRAM} ${WRKSRC}/src/ed2k \ + @${INSTALL_PROGRAM} \ + ${WRKSRC}/ed2k \ ${PREFIX}/bin/${PORTNAME}-ed2k-handler .include diff --git a/net/xmule/distinfo b/net/xmule/distinfo index 3ab85ca..ac5010f8 100644 --- a/net/xmule/distinfo +++ b/net/xmule/distinfo @@ -1,2 +1,2 @@ -MD5 (xmule-1.8.2.tar.bz2) = 4d87272ba1a224e78a9368986bb4510e -SIZE (xmule-1.8.2.tar.bz2) = 1177837 +MD5 (xmule-1.9.4b.tar.bz2) = 467512b482feb308e376ff16ac4de649 +SIZE (xmule-1.9.4b.tar.bz2) = 1395296 diff --git a/net/xmule/files/patch-Makefile.in b/net/xmule/files/patch-Makefile.in index 9eee2c1..0b26965 100644 --- a/net/xmule/files/patch-Makefile.in +++ b/net/xmule/files/patch-Makefile.in @@ -1,11 +1,12 @@ ---- Makefile.in.orig Tue Mar 9 23:59:49 2004 -+++ Makefile.in Tue Mar 9 23:59:54 2004 -@@ -55,8 +55,9 @@ +--- Makefile.in.orig Sun Nov 14 20:51:28 2004 ++++ Makefile.in Sun Nov 14 20:52:07 2004 +@@ -268,9 +268,9 @@ + @rm -rf Compilation.flags Makefile aclocal.m4 autom4te.cache config.h* config.l* config.st* config.rp* configure depcomp intl install: all - @mkdir -p @bindir@ +- @mkdir -p @bindir@ - @mkdir -p @datadir@/{applications,locale,pixmaps} -- @cp -f src/{ed2k,xmule} @bindir@ +- @cp -f ed2k xmule @bindir@ + @mkdir -p @datadir@/applications + @mkdir -p @datadir@/locale + @mkdir -p @datadir@/pixmaps diff --git a/net/xmule/files/patch-src::ServerSocket.cpp b/net/xmule/files/patch-src::ServerSocket.cpp new file mode 100644 index 0000000..b3e1a7f --- /dev/null +++ b/net/xmule/files/patch-src::ServerSocket.cpp @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 0000000..55da4e3 --- /dev/null +++ b/net/xmule/files/patch-src::SysTray.h @@ -0,0 +1,10 @@ +--- 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::xmule.cpp b/net/xmule/files/patch-src::xmule.cpp new file mode 100644 index 0000000..559592e --- /dev/null +++ b/net/xmule/files/patch-src::xmule.cpp @@ -0,0 +1,10 @@ +--- 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 49eb513..d10e42e 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 @@ -32,3 +32,4 @@ share/locale/tr/LC_MESSAGES/xmule.mo @unexec rmdir %D/share/gnome/pixmaps 2>/dev/null || true @unexec rmdir %D/share/gnome/locale 2>/dev/null || true @unexec rmdir %D/share/gnome/applications 2>/dev/null || true +@unexec rmdir %D/share/gnome 2>/dev/null || true -- cgit v1.1