10 files changed, 88 insertions, 18 deletions

diff --git a/net-p2p/azureus/Makefile b/net-p2p/azureus/Makefile
index 7dfbbbb2f44b..1dba74e41d85 100644
--- a/net-p2p/azureus/Makefile
+++ b/net-p2p/azureus/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	azureus
-PORTVERSION=	3.0.1.6
+PORTVERSION=	3.0.3.0
 CATEGORIES=	net-p2p java
 MASTER_SITES=	SF
 DISTNAME=	Azureus_${PORTVERSION}_source
@@ -33,7 +33,8 @@ NO_WRKSUBDIR=	yes
 
 JARFILE=	${PORTNAME}.jar
 
-OPTIONS=	SWTDEVEL "Use SWT Development port" on
+OPTIONS=	SWTDEVEL "Use SWT Development port" on \
+		EXTRAHACK "Apply extra performance hack" off
 
 # build classpath from BUILD_DEPENDS
 MAKE_ENV=	LANG=C
@@ -52,7 +53,13 @@ SUB_LIST=	LIBDIR="${LOCALBASE}/lib" JARFILE="${JARFILE}" \
 SWT=		swt-devel
 .else
 SWT=		swt
-BROKEN=		swt-devel is currently required
+.endif
+
+# Ok, I'm not quite sure why this works, or if it is in any way a proper fix.
+# Use at your own risk, I've just had it around and decided to share.
+.if defined(WITH_EXTRAHACK)
+EXTRA_PATCHES+=	\
+	${PATCHDIR}/extra-patch-com__aelitis__azureus__core__networkmanager__impl__TransportHelperFilterStream.java
 .endif
 
 CLASSPATH=.
diff --git a/net-p2p/azureus/distinfo b/net-p2p/azureus/distinfo
index c5f9df4ffb07..f1f4efce87e2 100644
--- a/net-p2p/azureus/distinfo
+++ b/net-p2p/azureus/distinfo
@@ -1,3 +1,3 @@
-MD5 (Azureus_3.0.1.6_source.zip) = 1f077e3fa3962f6a1f9d3f531ddaea6c
-SHA256 (Azureus_3.0.1.6_source.zip) = 73026749f328cf3be790f4bc7c8945a83515312dc36c6ed6b6aa4de446dccda1
-SIZE (Azureus_3.0.1.6_source.zip) = 6620836
+MD5 (Azureus_3.0.3.0_source.zip) = c78f8415c7e3dfabca02107abb87cff7
+SHA256 (Azureus_3.0.3.0_source.zip) = 49e50a638f4ecd555c3a0c75a12a2739ffe654a0105973241965bc83a36791d8
+SIZE (Azureus_3.0.3.0_source.zip) = 7073364
diff --git a/net-p2p/azureus/files/azureus.in b/net-p2p/azureus/files/azureus.in
index dbc04f341588..604aa44a9d8b 100644
--- a/net-p2p/azureus/files/azureus.in
+++ b/net-p2p/azureus/files/azureus.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/net-p2p/azureus/files/Attic/azureus.in,v 1.1 2007-05-26 00:56:11 alepulver Exp $
+# $FreeBSD: /tmp/pcvs/ports/net-p2p/azureus/files/Attic/azureus.in,v 1.2 2007-10-03 03:55:33 edwin Exp $
 
 # java
 export JAVA_VERSION="%%JAVA_VERSION%%"
@@ -12,6 +12,23 @@ LIB_PATH=%%LIBDIR%%
 
 CLASS_PATH=:%%JAVAJARDIR%%/%%JARFILE%%:${ECLIPSE_SWT_JAR}
 
+BROWSERS="xulrunner firefox seamonkey mozilla"
+
+if [ ! "${MOZILLA_FIVE_HOME}" ]; then
+	for browser in ${BROWSERS}; do
+		if [ -d "%%LOCALBASE%%/lib/${browser}" ]; then
+			MOZILLA_FIVE_HOME="%%LOCALBASE%%/lib/${browser}"
+			break;
+		fi
+	done
+fi
+
+if [ "${MOZILLA_FIVE_HOME}" ];then
+	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${MOZILLA_FIVE_HOME}"
+	export MOZILLA_FIVE_HOME LD_LIBRARY_PATH
+	echo "MOZILLA_FIVE_HOME=${MOZILLA_FIVE_HOME}"
+fi
+
 if [ "${DEBUG}" ]
 then
 	echo "ECLIPSE_BASE = ${ECLIPSE_BASE}"
@@ -22,4 +39,4 @@ then
 	echo "LIB_PATH = ${LIB_PATH}"
 fi
 
-exec "%%JAVA%%" -cp "${CLASS_PATH}" "-Djava.library.path=${LIB_PATH}" "-Dos.name=FreeBSD" "-Dazureus.config.path=${HOME}/.Azureus" "-Duser.dir=${HOME}/.Azureus" org.gudy.azureus2.ui.swt.Main "${@}"
+exec "%%JAVA%%" -cp "${CLASS_PATH}" "-Djava.library.path=${LIB_PATH}" "-Dos.name=linux" "-Dazureus.config.path=${HOME}/.Azureus" "-Duser.dir=${HOME}/.Azureus" org.gudy.azureus2.ui.swt.Main "${@}"
diff --git a/net-p2p/azureus/files/extra-patch-com__aelitis__azureus__core__networkmanager__impl__TransportHelperFilterStream.java b/net-p2p/azureus/files/extra-patch-com__aelitis__azureus__core__networkmanager__impl__TransportHelperFilterStream.java
new file mode 100644
index 000000000000..9e42aaf42620
--- /dev/null
+++ b/net-p2p/azureus/files/extra-patch-com__aelitis__azureus__core__networkmanager__impl__TransportHelperFilterStream.java
@@ -0,0 +1,11 @@
+--- com/aelitis/azureus/core/networkmanager/impl/TransportHelperFilterStream.java.orig	Sat Feb  3 18:34:39 2007
++++ com/aelitis/azureus/core/networkmanager/impl/TransportHelperFilterStream.java	Sat Feb  3 18:37:03 2007
+@@ -55,7 +55,7 @@
+ 	public boolean 
+ 	hasBufferedRead() 
+ 	{
+-		return false;
++		return true;
+ 	}
+ 	
+ 	public TransportHelper
diff --git a/net-p2p/azureus/pkg-message b/net-p2p/azureus/pkg-message
index 5cb6f3adf3d8..ff1fda328e1e 100644
--- a/net-p2p/azureus/pkg-message
+++ b/net-p2p/azureus/pkg-message
@@ -8,7 +8,7 @@ latest version of all your installed
 packages.
 
 For instance, make sure the swt
-package is of version 3.2.1 or
+package is of version 3.3 or
 later.
 
 ====================================
diff --git a/net-p2p/vuze/Makefile b/net-p2p/vuze/Makefile
index 7dfbbbb2f44b..1dba74e41d85 100644
--- a/net-p2p/vuze/Makefile
+++ b/net-p2p/vuze/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	azureus
-PORTVERSION=	3.0.1.6
+PORTVERSION=	3.0.3.0
 CATEGORIES=	net-p2p java
 MASTER_SITES=	SF
 DISTNAME=	Azureus_${PORTVERSION}_source
@@ -33,7 +33,8 @@ NO_WRKSUBDIR=	yes
 
 JARFILE=	${PORTNAME}.jar
 
-OPTIONS=	SWTDEVEL "Use SWT Development port" on
+OPTIONS=	SWTDEVEL "Use SWT Development port" on \
+		EXTRAHACK "Apply extra performance hack" off
 
 # build classpath from BUILD_DEPENDS
 MAKE_ENV=	LANG=C
@@ -52,7 +53,13 @@ SUB_LIST=	LIBDIR="${LOCALBASE}/lib" JARFILE="${JARFILE}" \
 SWT=		swt-devel
 .else
 SWT=		swt
-BROKEN=		swt-devel is currently required
+.endif
+
+# Ok, I'm not quite sure why this works, or if it is in any way a proper fix.
+# Use at your own risk, I've just had it around and decided to share.
+.if defined(WITH_EXTRAHACK)
+EXTRA_PATCHES+=	\
+	${PATCHDIR}/extra-patch-com__aelitis__azureus__core__networkmanager__impl__TransportHelperFilterStream.java
 .endif
 
 CLASSPATH=.
diff --git a/net-p2p/vuze/distinfo b/net-p2p/vuze/distinfo
index c5f9df4ffb07..f1f4efce87e2 100644
--- a/net-p2p/vuze/distinfo
+++ b/net-p2p/vuze/distinfo
@@ -1,3 +1,3 @@
-MD5 (Azureus_3.0.1.6_source.zip) = 1f077e3fa3962f6a1f9d3f531ddaea6c
-SHA256 (Azureus_3.0.1.6_source.zip) = 73026749f328cf3be790f4bc7c8945a83515312dc36c6ed6b6aa4de446dccda1
-SIZE (Azureus_3.0.1.6_source.zip) = 6620836
+MD5 (Azureus_3.0.3.0_source.zip) = c78f8415c7e3dfabca02107abb87cff7
+SHA256 (Azureus_3.0.3.0_source.zip) = 49e50a638f4ecd555c3a0c75a12a2739ffe654a0105973241965bc83a36791d8
+SIZE (Azureus_3.0.3.0_source.zip) = 7073364
diff --git a/net-p2p/vuze/files/azureus.in b/net-p2p/vuze/files/azureus.in
index f933a7cbd926..963255083bc6 100644
--- a/net-p2p/vuze/files/azureus.in
+++ b/net-p2p/vuze/files/azureus.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/net-p2p/vuze/files/Attic/azureus.in,v 1.1 2007-05-26 00:56:11 alepulver Exp $
+# $FreeBSD: /tmp/pcvs/ports/net-p2p/vuze/files/Attic/azureus.in,v 1.2 2007-10-03 03:55:33 edwin Exp $
 
 # java
 export JAVA_VERSION="%%JAVA_VERSION%%"
@@ -12,6 +12,23 @@ LIB_PATH=%%LIBDIR%%
 
 CLASS_PATH=:%%JAVAJARDIR%%/%%JARFILE%%:${ECLIPSE_SWT_JAR}
 
+BROWSERS="xulrunner firefox seamonkey mozilla"
+
+if [ ! "${MOZILLA_FIVE_HOME}" ]; then
+	for browser in ${BROWSERS}; do
+		if [ -d "%%LOCALBASE%%/lib/${browser}" ]; then
+			MOZILLA_FIVE_HOME="%%LOCALBASE%%/lib/${browser}"
+			break;
+		fi
+	done
+fi
+
+if [ "${MOZILLA_FIVE_HOME}" ];then
+	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${MOZILLA_FIVE_HOME}"
+	export MOZILLA_FIVE_HOME LD_LIBRARY_PATH
+	echo "MOZILLA_FIVE_HOME=${MOZILLA_FIVE_HOME}"
+fi
+
 if [ "${DEBUG}" ]
 then
 	echo "ECLIPSE_BASE = ${ECLIPSE_BASE}"
@@ -22,4 +39,4 @@ then
 	echo "LIB_PATH = ${LIB_PATH}"
 fi
 
-exec "%%JAVA%%" -cp "${CLASS_PATH}" "-Djava.library.path=${LIB_PATH}" "-Dos.name=FreeBSD" "-Dazureus.config.path=${HOME}/.Azureus" "-Duser.dir=${HOME}/.Azureus" org.gudy.azureus2.ui.swt.Main "${@}"
+exec "%%JAVA%%" -cp "${CLASS_PATH}" "-Djava.library.path=${LIB_PATH}" "-Dos.name=linux" "-Dazureus.config.path=${HOME}/.Azureus" "-Duser.dir=${HOME}/.Azureus" org.gudy.azureus2.ui.swt.Main "${@}"
diff --git a/net-p2p/vuze/files/extra-patch-com__aelitis__azureus__core__networkmanager__impl__TransportHelperFilterStream.java b/net-p2p/vuze/files/extra-patch-com__aelitis__azureus__core__networkmanager__impl__TransportHelperFilterStream.java
new file mode 100644
index 000000000000..9e42aaf42620
--- /dev/null
+++ b/net-p2p/vuze/files/extra-patch-com__aelitis__azureus__core__networkmanager__impl__TransportHelperFilterStream.java
@@ -0,0 +1,11 @@
+--- com/aelitis/azureus/core/networkmanager/impl/TransportHelperFilterStream.java.orig	Sat Feb  3 18:34:39 2007
++++ com/aelitis/azureus/core/networkmanager/impl/TransportHelperFilterStream.java	Sat Feb  3 18:37:03 2007
+@@ -55,7 +55,7 @@
+ 	public boolean 
+ 	hasBufferedRead() 
+ 	{
+-		return false;
++		return true;
+ 	}
+ 	
+ 	public TransportHelper
diff --git a/net-p2p/vuze/pkg-message b/net-p2p/vuze/pkg-message
index 5cb6f3adf3d8..ff1fda328e1e 100644
--- a/net-p2p/vuze/pkg-message
+++ b/net-p2p/vuze/pkg-message
@@ -8,7 +8,7 @@ latest version of all your installed
 packages.
 
 For instance, make sure the swt
-package is of version 3.2.1 or
+package is of version 3.3 or
 later.
 
 ====================================