Update to 4.0.0.4

Note that this may co-exist with 3.x versions of azureus

Approved by:	garga (mentor)

8 files changed, 42 insertions, 35 deletions

diff --git a/net-p2p/vuze/Makefile b/net-p2p/vuze/Makefile
index 5df070f83acd..7abd0cf2642b 100644
--- a/net-p2p/vuze/Makefile
+++ b/net-p2p/vuze/Makefile
@@ -5,11 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	azureus
-PORTVERSION=	3.1.1.0
+PORTNAME=	vuze
+PORTVERSION=	4.0.0.4
 #PORTREVISION=	1
 CATEGORIES=	net-p2p java
 MASTER_SITES=	SF
+MASTER_SITE_SUBDIR=	azureus
 DISTNAME=	Vuze_${PORTVERSION}_source
 
 MAINTAINER=	rnoland@FreeBSD.org
@@ -29,6 +30,7 @@ USE_ZIP=	yes
 USE_DOS2UNIX=	\
 org/gudy/azureus2/platform/macosx/access/jnilib/OSXAccess.java \
 org/gudy/azureus2/platform/unix/ScriptBeforeStartup.java \
+org/gudy/azureus2/platform/PlatformManagerFactory.java \
 com/aelitis/azureus/core/networkmanager/impl/TransportHelperFilterStream.java \
 com/aelitis/azureus/core/networkmanager/impl/TransportHelperFilterTransparent.java
 
@@ -47,14 +49,13 @@ PLIST_FILES=	%%JAVAJARDIR%%/${JARFILE} \
 		bin/${PORTNAME} \
 		share/icons/hicolor/16x16/apps/${PORTNAME}.png \
 		share/icons/hicolor/32x32/apps/${PORTNAME}.png \
-		share/icons/hicolor/64x64/apps/${PORTNAME}.png \
-		share/icons/hicolor/128x128/apps/${PORTNAME}.png
+		share/icons/hicolor/64x64/apps/${PORTNAME}.png
 
 SUB_FILES=	${PORTNAME}
 SUB_LIST=	LIBDIR="${LOCALBASE}/lib" JARFILE="${JARFILE}" \
 		SWTJAR="${JAVALIBDIR}/${SWT}.jar" JAVA="${LOCALBASE}/bin/java"
 
-DESKTOP_ENTRIES=	"Azureus" \
+DESKTOP_ENTRIES=	"Vuze" \
 			"A full feature BitTorrent client" \
 			"${PORTNAME}.png" \
 			"${PORTNAME}" \
@@ -108,9 +109,6 @@ do-install:
 	${MKDIR} ${PREFIX}/share/icons/hicolor/64x64/apps
 	${INSTALL_DATA} ${WRKDIR}/org/gudy/azureus2/ui/icons/a64.png \
 		${PREFIX}/share/icons/hicolor/64x64/apps/${PORTNAME}.png
-	${MKDIR} ${PREFIX}/share/icons/hicolor/128x128/apps
-	${INSTALL_DATA} ${WRKDIR}/org/gudy/azureus2/ui/icons/a128.png \
-		${PREFIX}/share/icons/hicolor/128x128/apps/${PORTNAME}.png
 
 post-install:
 	@${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}
diff --git a/net-p2p/vuze/distinfo b/net-p2p/vuze/distinfo
index 4e47a7463533..58d8251369e7 100644
--- a/net-p2p/vuze/distinfo
+++ b/net-p2p/vuze/distinfo
@@ -1,3 +1,3 @@
-MD5 (Vuze_3.1.1.0_source.zip) = 6b9f5f8b0067e5ebf273e19f59d5f1d9
-SHA256 (Vuze_3.1.1.0_source.zip) = 5349c419bedcd7acebbc3d9692af96e697b6d7b741d4b7ecc5b7f1376208299f
-SIZE (Vuze_3.1.1.0_source.zip) = 8688884
+MD5 (Vuze_4.0.0.4_source.zip) = 3f521ec1f74d5b1a78921db4174858a6
+SHA256 (Vuze_4.0.0.4_source.zip) = a7fc791e3839c04967b7ba940399e1c5a02f045e47a0a93c97a758c76f09a8de
+SIZE (Vuze_4.0.0.4_source.zip) = 8255486
diff --git a/net-p2p/vuze/files/build.xml b/net-p2p/vuze/files/build.xml
index 4555797a810c..40f8c19cfe10 100644
--- a/net-p2p/vuze/files/build.xml
+++ b/net-p2p/vuze/files/build.xml
@@ -39,7 +39,7 @@
        <fileset dir="." includes="**/*.ico **/*.wav" />
      </copy>
      <!-- Put everything in ${build} into the azureus.jar file -->
-     <jar jarfile="${dist}/lib/azureus.jar" basedir="${build}"/>
+     <jar jarfile="${dist}/lib/vuze.jar" basedir="${build}"/>
    </target>
 
    <target name="clean" description="clean up" >
diff --git a/net-p2p/vuze/files/patch-TransferTypes b/net-p2p/vuze/files/patch-TransferTypes
deleted file mode 100644
index 2c13840c877e..000000000000
--- a/net-p2p/vuze/files/patch-TransferTypes
+++ /dev/null
@@ -1,17 +0,0 @@
---- org/gudy/azureus2/ui/swt/test/PrintTransferTypes.java	Fri Dec 12 09:56:48 2003
-+++ org/gudy/azureus2/ui/swt/test/PrintTransferTypes.java	Sat Jun 11 16:06:40 2005
-@@ -41,5 +41,5 @@
-         TransferData[] data = event.dataTypes;
-         for (int i = 0; i < data.length; i++) {
--          int id = data[i].type;
-+          long id = data[i].type;
-           String name = getNameFromId(id);
-           System.out.println("Data type is " + id + " " + name);
-@@ -97,5 +97,5 @@
-     return ids;
-   }
--  static String getNameFromId(int id) {
-+  static String getNameFromId(long id) {
--    switch (id) {
-+    switch ((int)id) {
-       case 1 :
diff --git a/net-p2p/vuze/files/patch-org__gudy__azureus2__platform__PlatformManagerFactory.java b/net-p2p/vuze/files/patch-org__gudy__azureus2__platform__PlatformManagerFactory.java
new file mode 100644
index 000000000000..d6373550ea6f
--- /dev/null
+++ b/net-p2p/vuze/files/patch-org__gudy__azureus2__platform__PlatformManagerFactory.java
@@ -0,0 +1,26 @@
+--- org/gudy/azureus2/platform/PlatformManagerFactory.java.orig	2008-10-22 19:53:40.000000000 -0400
++++ org/gudy/azureus2/platform/PlatformManagerFactory.java	2008-10-22 19:53:58.000000000 -0400
+@@ -48,21 +48,17 @@
+ 				try{
+ 					if ( getPlatformType() == PlatformManager.PT_WINDOWS ){
+ 						
+-						platform_manager = org.gudy.azureus2.platform.win32.PlatformManagerImpl.getSingleton();
++						platform_manager = null;
+ 						
+ 					}else if( getPlatformType() == PlatformManager.PT_MACOSX ){
+ 						
+-	                    platform_manager = org.gudy.azureus2.platform.macosx.PlatformManagerImpl.getSingleton();
++	                    platform_manager = null;
+ 	                    
+ 					}else if( getPlatformType() == PlatformManager.PT_UNIX ){
+ 						
+             platform_manager = org.gudy.azureus2.platform.unix.PlatformManagerImpl.getSingleton();
+ 
+ 					}
+-				}catch( PlatformManagerException e ){
+-					
+-						// exception will already have been logged
+-					
+ 				}catch( Throwable e ){
+ 					
+ 					Debug.printStackTrace(e);
diff --git a/net-p2p/vuze/files/azureus.in b/net-p2p/vuze/files/vuze.in
index 88bb7ccd9b73..160d5cf1b635 100644
--- a/net-p2p/vuze/files/azureus.in
+++ b/net-p2p/vuze/files/vuze.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/net-p2p/vuze/files/Attic/azureus.in,v 1.3 2008-12-22 17:43:24 rnoland Exp $
+# $FreeBSD: /tmp/pcvs/ports/net-p2p/vuze/files/vuze.in,v 1.1 2008-12-22 18:27:01 rnoland Exp $
 
 # java
 export JAVA_VERSION="%%JAVA_VERSION%%"
@@ -12,7 +12,7 @@ LIB_PATH=%%LIBDIR%%
 
 CLASS_PATH=:%%JAVAJARDIR%%/%%JARFILE%%:${ECLIPSE_SWT_JAR}
 
-BROWSERS="xulrunner firefox seamonkey mozilla"
+BROWSERS="firefox xulrunner seamonkey mozilla"
 
 if [ ! "${MOZILLA_FIVE_HOME}" ]; then
 	for browser in ${BROWSERS}; do
diff --git a/net-p2p/vuze/pkg-descr b/net-p2p/vuze/pkg-descr
index b63cc7c3410c..76b04ef543dd 100644
--- a/net-p2p/vuze/pkg-descr
+++ b/net-p2p/vuze/pkg-descr
@@ -1,5 +1,5 @@
-Azureus is a java bittorrent client. Azureus offers multiple
-torrent downloads, queuing/priority systems (on torrents and
+Vuze is a java bittorrent client. Vuze (formerly Azureus) offers
+multiple torrent downloads, queuing/priority systems (on torrents and
 files), start/stop seeding options and instant access to
 numerous pieces of information about your torrents. Azureus
 now features an embedded tracker easily setup and ready to use.
diff --git a/net-p2p/vuze/pkg-message b/net-p2p/vuze/pkg-message
index ff1fda328e1e..1842e9988326 100644
--- a/net-p2p/vuze/pkg-message
+++ b/net-p2p/vuze/pkg-message
@@ -3,12 +3,12 @@
 ====================================
 
 If you have problems running
-Azureus, make sure you have the
+Vuze, make sure you have the
 latest version of all your installed
 packages.
 
 For instance, make sure the swt
-package is of version 3.3 or
+package is of version 3.4 or
 later.
 
 ====================================