Date: Thu, 20 Jan 2005 14:25:57 +0500 From: Boris Kovalenko <boris@tagnet.ru> To: FreeBSD-gnats-submit@FreeBSD.org Cc: lioux@FreeBSD.org Subject: ports/76493: [PATCH] net/xmule: update to 1.9.5 Message-ID: <E1CrYZh-000CZw-VM@boris.nikom.ru> Resent-Message-ID: <200501200930.j0K9UZkH086580@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 76493
>Category: ports
>Synopsis: [PATCH] net/xmule: update to 1.9.5
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Jan 20 09:30:33 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Boris Kovalenko
>Release: FreeBSD 5.3-STABLE i386
>Organization:
JSC "TAGNet"
>Environment:
System: FreeBSD boris.nikom.ru 5.3-STABLE FreeBSD 5.3-STABLE #1: Tue Jan 11 15:17:02 YEKT 2005
>Description:
- Update to 1.9.5
Removed file(s):
- README.html
Port maintainer (lioux@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
--- xmule-1.9.5.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net/xmule/Makefile /usr/ports/net/xmule.new/Makefile
--- /usr/ports/net/xmule/Makefile Tue Jan 11 08:12:40 2005
+++ /usr/ports/net/xmule.new/Makefile Thu Jan 20 14:20:45 2005
@@ -6,19 +6,19 @@
#
PORTNAME= xmule
-PORTVERSION= 1.9.4.b
-PORTREVISION= 1
+PORTVERSION= 1.9.5
+PORTREVISION= 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}
+DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= lioux@FreeBSD.org
COMMENT= Port of eMule eDonkey P2P client using wxWindows class library
LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2 \
wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2
+BUILD_DEPENDS= cryptest:${PORTSDIR}/security/cryptopp
RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget
USE_GETTEXT= yes
@@ -34,10 +34,12 @@
--with-gtk-prefix=${X11BASE} \
--with-libiconv-prefix=${LOCALBASE} \
--with-libintl-prefix=${LOCALBASE} \
- --enable-debug \
- --with-wx-config=${WX_CONFIG}
+ --with-wx-config=${WX_CONFIG} \
+ --with-cryptopp-prefix=${LOCALBASE} \
+ --disable-debug \
+ --disable-debug-syms
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
+ LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib"
MAKE_ENV= CC="${CC}" CXX="${CXX}"
# for debugging purposes
@@ -102,13 +104,13 @@
post-install:
# install xmule binary
- @${INSTALL_PROGRAM} \
+ @${INSTALL_PROGRAM} -s \
${WRKSRC}/${PORTNAME} \
${PREFIX}/bin
# do not install a generic named ed2k binary
# install it under a more specific name
@${INSTALL_PROGRAM} \
- ${WRKSRC}/ed2k \
+ ${WRKSRC}/ed2k.xmule-2.0 \
${PREFIX}/bin/${PORTNAME}-ed2k-handler
.include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/net/xmule/README.html /usr/ports/net/xmule.new/README.html
--- /usr/ports/net/xmule/README.html Tue Feb 24 00:32:19 2004
+++ /usr/ports/net/xmule.new/README.html Thu Jan 1 05:00:00 1970
@@ -1,43 +0,0 @@
-<!DOCTYPE html PUBLIC "-//IETF//DTD HTML 2.0//EN">
-
-<html>
- <head>
- <title>The FreeBSD Ports Collection (net/xmule)</title>
- </head>
-
- <body>
- <h1>The FreeBSD Ports Collection (net/xmule)</h1>
- <hr>
-
- <p>You are now in the directory for the port "net/xmule".</p>
-
- <p>The package name of this port is "xmule-1.6.1".</p>
-
- <p>This is the one-line description for this port:</p>
- <hr>
-
- <p>
-Port of eMule eDonkey P2P client using wxWindows class library
- </p>
- <hr>
-
- <p>Please read the "<a href="pkg-descr">description file</a>" for a
- longer description and/or visit the <a href="http://www.xmule.org/">web site</a> for futher informations.</p>
-
- <p>If needed, you may contact the <a href=
- "mailto:lioux@FreeBSD.org">maintainer</a> of this port or the port <a href=
- "mailto:ports@FreeBSD.org">mailing-list</a>.</p>
-
- <p>This port requires package(s) "XFree86-fontEncodings-4.3.0 XFree86-fontScalable-4.3.0 XFree86-libraries-4.3.0_6 Xft-2.1.2 atk-1.4.1_1 expat-1.95.6_1 fontconfig-2.2.90_3 freetype2-2.1.5_1 gettext-0.12.1 glib-1.2.10_10 glib-2.2.3 gmake-3.80_1 gtk-1.2.10_10 gtk-2.2.4_1 imake-4.3.0_1 jpeg-6b_1 libiconv-1.9.1_3 pango-1.2.5 perl-5.6.1_15 pkgconfig-0.15.0 png-1.2.5_2 tiff-3.6.0 wxgtk-common-2.4.2 wxgtk2-2.4.2_1" to build.</p>
-
- <p>This port requires package(s) "XFree86-fontEncodings-4.3.0 XFree86-fontScalable-4.3.0 XFree86-libraries-4.3.0_6 Xft-2.1.2 atk-1.4.1_1 expat-1.95.6_1 fontconfig-2.2.90_3 freetype2-2.1.5_1 gettext-0.12.1 glib-1.2.10_10 glib-2.2.3 gnomehier-1.0_10 gtk-1.2.10_10 gtk-2.2.4_1 imake-4.3.0_1 jpeg-6b_1 libiconv-1.9.1_3 pango-1.2.5 perl-5.6.1_15 pkgconfig-0.15.0 png-1.2.5_2 tiff-3.6.0 wget-1.8.2_5 wxgtk-common-2.4.2 wxgtk2-2.4.2_1" to run.</p>
-
- <p>Go to the <a href="../../README.html">top of the ports tree</a> for
- a summary on how to use the ports collection.</p>
- <hr>
-
- <p><a href="../README.html">Go up one level</a> | <a href=
- "../../README.html">Go to top of ports tree</a></p>
- </body>
-</html>
-
diff -ruN --exclude=CVS /usr/ports/net/xmule/distinfo /usr/ports/net/xmule.new/distinfo
--- /usr/ports/net/xmule/distinfo Mon Nov 15 08:18:32 2004
+++ /usr/ports/net/xmule.new/distinfo Mon Jan 17 13:16:22 2005
@@ -1,2 +1,2 @@
-MD5 (xmule-1.9.4b.tar.bz2) = 467512b482feb308e376ff16ac4de649
-SIZE (xmule-1.9.4b.tar.bz2) = 1395296
+MD5 (xmule-1.9.5.tar.bz2) = 32bbe12ea1c9ea65253e50eefc330e07
+SIZE (xmule-1.9.5.tar.bz2) = 1244704
diff -ruN --exclude=CVS /usr/ports/net/xmule/files/patch-ED2K-Links.HOWTO /usr/ports/net/xmule.new/files/patch-ED2K-Links.HOWTO
--- /usr/ports/net/xmule/files/patch-ED2K-Links.HOWTO Wed Mar 10 08:10:26 2004
+++ /usr/ports/net/xmule.new/files/patch-ED2K-Links.HOWTO Mon Jan 17 13:34:29 2005
@@ -1,5 +1,5 @@
---- ED2K-Links.HOWTO.orig Thu Mar 4 12:46:20 2004
-+++ ED2K-Links.HOWTO Tue Mar 9 21:21:16 2004
+--- ED2K-Links.HOWTO.orig Mon Jan 17 13:23:59 2005
++++ ED2K-Links.HOWTO Mon Jan 17 13:26:18 2005
@@ -14,7 +14,7 @@
the mentioned directory:
@@ -14,7 +14,7 @@
#!/bin/sh
- /usr/local/bin/ed2k "ed2k://$1";
-+ xmule-ed2k-handler "ed2k://$1";
++ /usr/X11R6/bin/xmule-ed2k-handler "ed2k://$1";
now edit (as root) /etc/opera6rc or as non-root ~/.opera/opera6.ini:
diff -ruN --exclude=CVS /usr/ports/net/xmule/files/patch-Makefile.in /usr/ports/net/xmule.new/files/patch-Makefile.in
--- /usr/ports/net/xmule/files/patch-Makefile.in Mon Nov 15 08:18:32 2004
+++ /usr/ports/net/xmule.new/files/patch-Makefile.in Mon Jan 17 13:22:33 2005
@@ -1,15 +1,15 @@
---- Makefile.in.orig Sun Nov 14 20:51:28 2004
-+++ Makefile.in Sun Nov 14 20:52:07 2004
+--- Makefile.in.orig Mon Jan 17 13:18:50 2005
++++ Makefile.in Mon Jan 17 13:21:20 2005
@@ -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 @datadir@/{applications,locale,pixmaps}
-- @cp -f ed2k xmule @bindir@
+- @cp -f ed2k.xmule-2.0 xmule @bindir@
+ @mkdir -p @datadir@/applications
+ @mkdir -p @datadir@/locale
+ @mkdir -p @datadir@/pixmaps
+ @cp -f ed2k.xmule-2.0 @bindir@/ed2k
@cd po && $(MAKE) install
@cp -f xmule.desktop @datadir@/applications
- @cp -f xmule.xpm @datadir@/pixmaps
diff -ruN --exclude=CVS /usr/ports/net/xmule/files/patch-src::ServerSocket.cpp /usr/ports/net/xmule.new/files/patch-src::ServerSocket.cpp
--- /usr/ports/net/xmule/files/patch-src::ServerSocket.cpp Mon Nov 15 04:59:23 2004
+++ /usr/ports/net/xmule.new/files/patch-src::ServerSocket.cpp Mon Jan 17 13:34:34 2005
@@ -1,5 +1,5 @@
---- src/ServerSocket.cpp.orig Sun Nov 14 19:41:57 2004
-+++ src/ServerSocket.cpp Sun Nov 14 19:42:03 2004
+--- src/ServerSocket.cpp.orig Mon Jan 17 13:27:49 2005
++++ src/ServerSocket.cpp Mon Jan 17 13:27:31 2005
@@ -44,6 +44,7 @@
#include "DynPrefs/DynPrefs.h" // Needed for DynamicPreferences
diff -ruN --exclude=CVS /usr/ports/net/xmule/files/patch-src::SysTray.h /usr/ports/net/xmule.new/files/patch-src::SysTray.h
--- /usr/ports/net/xmule/files/patch-src::SysTray.h Mon Nov 15 04:59:23 2004
+++ /usr/ports/net/xmule.new/files/patch-src::SysTray.h Mon Jan 17 13:34:40 2005
@@ -1,5 +1,5 @@
---- src/SysTray.h.orig Sun Nov 14 19:45:30 2004
-+++ src/SysTray.h Sun Nov 14 19:45:00 2004
+--- src/SysTray.h.orig Fri Jan 7 08:35:45 2005
++++ src/SysTray.h Mon Jan 17 13:28:50 2005
@@ -31,6 +31,7 @@
#include <locale.h>
#include <config.h>
diff -ruN --exclude=CVS /usr/ports/net/xmule/files/patch-src::WebServer.cpp /usr/ports/net/xmule.new/files/patch-src::WebServer.cpp
--- /usr/ports/net/xmule/files/patch-src::WebServer.cpp Thu Jun 12 04:29:38 2003
+++ /usr/ports/net/xmule.new/files/patch-src::WebServer.cpp Mon Jan 17 13:34:44 2005
@@ -1,8 +1,8 @@
---- 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 <wx/wfstream.h>
+--- src/WebServer.cpp.orig Fri Jan 7 08:35:44 2005
++++ src/WebServer.cpp Mon Jan 17 13:29:59 2005
+@@ -45,6 +45,10 @@
#include <wx/txtstrm.h>
+ #include <wx/wfstream.h>
+#ifdef __FreeBSD__
+extern long long atoll(const char *s);
@@ -10,4 +10,4 @@
+
#ifdef _DEBUG
#undef THIS_FILE
- static char THIS_FILE[]=__FILE__;
+ static char THIS_FILE[] = __FILE__;
diff -ruN --exclude=CVS /usr/ports/net/xmule/files/patch-src::xmule.cpp /usr/ports/net/xmule.new/files/patch-src::xmule.cpp
--- /usr/ports/net/xmule/files/patch-src::xmule.cpp Mon Nov 15 04:59:23 2004
+++ /usr/ports/net/xmule.new/files/patch-src::xmule.cpp Mon Jan 17 13:34:50 2005
@@ -1,6 +1,6 @@
---- 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 @@
+--- src/xmule.cpp.orig Fri Jan 7 08:35:44 2005
++++ src/xmule.cpp Mon Jan 17 13:30:43 2005
+@@ -66,7 +66,6 @@
#include <iostream> // Needed for std::cout
#include <gtk/gtk.h> // Needed for GTK_WINDOW_TOPLEVEL
--- xmule-1.9.5.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?E1CrYZh-000CZw-VM>