Update from "obsolete" 4.3.1.4 to the currently-latest 4.7.0.0.

Feature safe:	yes
Approved by: 	portmgr (tabthorpe)

7 files changed, 14 insertions, 116 deletions

diff --git a/net-p2p/vuze/Makefile b/net-p2p/vuze/Makefile
index 8e45fc35babf..53e32141edd7 100644
--- a/net-p2p/vuze/Makefile
+++ b/net-p2p/vuze/Makefile
@@ -6,13 +6,11 @@
 #
 
 PORTNAME=	vuze
-PORTVERSION=	4.3.1.4
-PORTREVISION=	2
+PORTVERSION=	4.7.0.0
 CATEGORIES=	net-p2p java
 # Moved to x-obsolete, could do with an update
-#MASTER_SITES=	SF/azureus/${PORTNAME}/${PORTNAME}-${PORTVERSION}
-MASTER_SITES=	SF/azureus/x_obsolete/${PORTNAME}-${PORTVERSION}
-DISTNAME=	Vuze_${PORTVERSION}_source
+MASTER_SITES=	SF/azureus/vuze/Vuze_${PORTVERSION:S/.//g}
+DISTNAME=	Vuze_${PORTVERSION:S/.//g}_source
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A BitTorrent client written in Java
@@ -28,14 +26,14 @@ USE_ANT=	yes
 
 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 \
-org/gudy/azureus2/ui/swt/test/PrintTransferTypes.java \
-org/gudy/azureus2/ui/swt/views/table/impl/TableViewSWTImpl.java \
-com/aelitis/azureus/core/networkmanager/impl/TransportHelperFilterStream.java \
-com/aelitis/azureus/core/networkmanager/impl/TransportHelperFilterTransparent.java
+#USE_DOS2UNIX=	\
+#org/gudy/azureus2/platform/macosx/access/jnilib/OSXAccess.java \
+#org/gudy/azureus2/platform/unix/ScriptBeforeStartup.java \
+#org/gudy/azureus2/platform/PlatformManagerFactory.java \
+#org/gudy/azureus2/ui/swt/test/PrintTransferTypes.java \
+#org/gudy/azureus2/ui/swt/views/table/impl/TableViewSWTImpl.java \
+#com/aelitis/azureus/core/networkmanager/impl/TransportHelperFilterStream.java \
+#com/aelitis/azureus/core/networkmanager/impl/TransportHelperFilterTransparent.java
 
 USE_GECKO=	libxul
 
@@ -87,6 +85,7 @@ CLASSPATH:=${CLASSPATH}:${jar}
 .endfor
 
 post-patch:
+	${RM} -rf ${WRKSRC}/org/eclipse
 	@${SED} -E -e 's|%%CLASSPATH%%|${CLASSPATH}|' \
 		${FILESDIR}/build.xml > ${WRKSRC}/build.xml
 # bash -> sh
diff --git a/net-p2p/vuze/distinfo b/net-p2p/vuze/distinfo
index 7fd61d676438..92979e616d86 100644
--- a/net-p2p/vuze/distinfo
+++ b/net-p2p/vuze/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Vuze_4.3.1.4_source.zip) = 9522ec10bdef99306b96f340f4fa12daa1654a78a23689deb31e0fd8f0c09ef7
-SIZE (Vuze_4.3.1.4_source.zip) = 8980502
+SHA256 (Vuze_4700_source.zip) = 398338e2d1edad58b358717706ed9d6f49a98184860026a38c304b6364a687f6
+SIZE (Vuze_4700_source.zip) = 9201613
diff --git a/net-p2p/vuze/files/patch-com_aelitis_azureus_ui_swt_views_skin_sidebar_SideBar.java b/net-p2p/vuze/files/patch-com_aelitis_azureus_ui_swt_views_skin_sidebar_SideBar.java
deleted file mode 100644
index bc77df639fcf..000000000000
--- a/net-p2p/vuze/files/patch-com_aelitis_azureus_ui_swt_views_skin_sidebar_SideBar.java
+++ /dev/null
@@ -1,11 +0,0 @@
---- com/aelitis/azureus/ui/swt/views/skin/sidebar/SideBar.java.orig	2009-11-18 22:32:26.000000000 -0600
-+++ com/aelitis/azureus/ui/swt/views/skin/sidebar/SideBar.java	2009-12-01 11:56:03.000000000 -0600
-@@ -110,7 +110,7 @@
- 	extends SkinView
- 	implements UIUpdatable, ViewTitleInfoListener
- {
--	private static final boolean END_INDENT = Constants.isLinux || Constants.isWindows2000 || Constants.isWindows9598ME;
-+	private static final boolean END_INDENT = Constants.isLinux || Constants.isFreeBSD || Constants.isWindows2000 || Constants.isWindows9598ME;
- 	
- 	private static final boolean USE_PAINTITEM = Utils.isCocoa;
- 	
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
deleted file mode 100644
index 2b6713892d48..000000000000
--- a/net-p2p/vuze/files/patch-org__gudy__azureus2__platform__PlatformManagerFactory.java
+++ /dev/null
@@ -1,26 +0,0 @@
---- org/gudy/azureus2/platform/PlatformManagerFactory.java.orig	2009-07-10 06:30:32.000000000 -0500
-+++ org/gudy/azureus2/platform/PlatformManagerFactory.java	2009-07-10 06:36:34.000000000 -0500
-@@ -50,21 +50,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/patch-org__gudy__azureus2__platform__unix__ScriptBeforeStartup.java b/net-p2p/vuze/files/patch-org__gudy__azureus2__platform__unix__ScriptBeforeStartup.java
deleted file mode 100644
index 93902adf2237..000000000000
--- a/net-p2p/vuze/files/patch-org__gudy__azureus2__platform__unix__ScriptBeforeStartup.java
+++ /dev/null
@@ -1,15 +0,0 @@
---- org/gudy/azureus2/platform/unix/ScriptBeforeStartup.java.orig	2009-09-20 15:37:15.000000000 -0500
-+++ org/gudy/azureus2/platform/unix/ScriptBeforeStartup.java	2009-09-20 15:53:35.000000000 -0500
-@@ -141,10 +141,12 @@
- 						return false;
- 					}
- 				});
-+				possibleDirs.add(new File("/usr/local/lib"));
- 				possibleDirs.add(new File("/usr/local"));
- 				possibleDirs.add(new File("/opt"));
- 
- 				final String[] possibleDirNames = {
-+					"libxul",
- 					"mozilla",
- 					"firefox",
- 					"seamonkey",
diff --git a/net-p2p/vuze/files/patch-org__gudy__azureus2__ui__swt__test__PrintTransferTypes.java b/net-p2p/vuze/files/patch-org__gudy__azureus2__ui__swt__test__PrintTransferTypes.java
deleted file mode 100644
index 244b926e8418..000000000000
--- a/net-p2p/vuze/files/patch-org__gudy__azureus2__ui__swt__test__PrintTransferTypes.java
+++ /dev/null
@@ -1,20 +0,0 @@
---- org/gudy/azureus2/ui/swt/test/PrintTransferTypes.java.orig	2009-01-18 01:23:44.000000000 -0500
-+++ org/gudy/azureus2/ui/swt/test/PrintTransferTypes.java	2009-01-18 01:24:54.000000000 -0500
-@@ -40,7 +40,7 @@
- 
-         TransferData[] data = event.dataTypes;
-         for (int i = 0; i < data.length; i++) {
--          int id = data[i].type;
-+          int id = (int)data[i].type;
-           String name = getNameFromId(id);
-           System.out.println("Data type is " + id + " " + name);
-         }
-@@ -50,7 +50,7 @@
-       }
-       public void drop(DropTargetEvent event) {
-         System.out.println("URL dropped: " + event.data);
--        System.out.println("Data type is " + event.currentDataType.type + " " + getNameFromId(event.currentDataType.type));
-+        System.out.println("Data type is " + event.currentDataType.type + " " + getNameFromId((int)event.currentDataType.type));
-       }
-     });
- 
diff --git a/net-p2p/vuze/files/patch-org_gudy_azureus2_ui_swt_views_columnsetup_TableColumnSetupWindow.java b/net-p2p/vuze/files/patch-org_gudy_azureus2_ui_swt_views_columnsetup_TableColumnSetupWindow.java
deleted file mode 100644
index f914695759d3..000000000000
--- a/net-p2p/vuze/files/patch-org_gudy_azureus2_ui_swt_views_columnsetup_TableColumnSetupWindow.java
+++ /dev/null
@@ -1,29 +0,0 @@
---- org/gudy/azureus2/ui/swt/views/columnsetup/TableColumnSetupWindow.java.orig	2009-04-09 00:37:38.000000000 -0500
-+++ org/gudy/azureus2/ui/swt/views/columnsetup/TableColumnSetupWindow.java	2009-07-11 09:51:14.000000000 -0500
-@@ -137,7 +137,7 @@
- 
- 				tableColumn = (TableColumnCore) row.getDataSource();
- 
--				if (event.image != null && !Constants.isLinux) {
-+				if (event.image != null && (!Constants.isLinux || !Constants.isFreeBSD)) {
- 					try {
-   					GC gc = new GC(event.image);
-   					try {
-@@ -391,7 +391,7 @@
- 
- 		expandFilters.addListener(SWT.Expand, new Listener() {
- 			public void handleEvent(Event event) {
--				Utils.execSWTThreadLater(Constants.isLinux ? 250 : 0, new AERunnable() {
-+				Utils.execSWTThreadLater((Constants.isLinux || Constants.isFreeBSD) ? 250 : 0, new AERunnable() {
- 					public void runSupport() {
- 						shell.layout(true, true);
- 					}
-@@ -400,7 +400,7 @@
- 		});
- 		expandFilters.addListener(SWT.Collapse, new Listener() {
- 			public void handleEvent(Event event) {
--				Utils.execSWTThreadLater(Constants.isLinux ? 250 : 0, new AERunnable() {
-+				Utils.execSWTThreadLater((Constants.isLinux || Constants.isFreeBSD) ? 250 : 0, new AERunnable() {
- 					public void runSupport() {
- 						shell.layout(true, true);
- 					}