4 files changed, 103 insertions, 7 deletions

diff --git a/net-p2p/vuze/Makefile b/net-p2p/vuze/Makefile
index a8488083f4ad..a83ea3aaceab 100644
--- a/net-p2p/vuze/Makefile
+++ b/net-p2p/vuze/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	azureus
-PORTVERSION=	2.3.0.6
-PORTREVISION=	1
+PORTVERSION=	2.4.0.2
 CATEGORIES=	net-p2p java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -30,13 +29,17 @@ ONLY_FOR_ARCHS=	i386 amd64
 USE_JAVA=	yes
 JAVA_BUILD=	jdk
 JAVA_RUN=	jdk
-JAVA_VERSION=	1.4
+JAVA_VERSION=	1.4+
 JAVA_OS=	native
 USE_ANT=	yes
 USE_JIKES=	no
 
 USE_ZIP=	yes
-USE_DOS2UNIX=	org/gudy/azureus2/ui/swt/test/PrintTransferTypes.java
+USE_DOS2UNIX=	org/gudy/azureus2/ui/swt/test/PrintTransferTypes.java \
+		org/gudy/azureus2/ui/swt/Messages.java \
+		org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionPlugins.java \
+		org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java \
+		org/gudy/azureus2/ui/swt/views/TableView.java
 NO_WRKSUBDIR=	yes
 
 JARFILE=	${PORTNAME}.jar
@@ -64,6 +67,9 @@ do-install:
 		${JAVAJARDIR}/
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}
 
+post-install:
+	@${CAT} ${PKGMESSAGE}
+
 .include <bsd.port.pre.mk>
 
 CLASSPATH=.
diff --git a/net-p2p/vuze/distinfo b/net-p2p/vuze/distinfo
index 6049092fef21..b281d6f1ef2f 100644
--- a/net-p2p/vuze/distinfo
+++ b/net-p2p/vuze/distinfo
@@ -1,3 +1,3 @@
-MD5 (Azureus_2.3.0.6_source.zip) = d02357ee2917482fee1174a0dc549c5e
-SHA256 (Azureus_2.3.0.6_source.zip) = 7244b8b379f6254d0adf3f43da240b415f982c496d63529a86eaf8e231ef120a
-SIZE (Azureus_2.3.0.6_source.zip) = 4773566
+MD5 (Azureus_2.4.0.2_source.zip) = f79a2c3664fe26a21d208551bfac4b6f
+SHA256 (Azureus_2.4.0.2_source.zip) = 3c25d6560110b64acf7b395950f1b9b2553a365215a0e3fb6bce3d2414147099
+SIZE (Azureus_2.4.0.2_source.zip) = 5188679
diff --git a/net-p2p/vuze/files/patch-swt31 b/net-p2p/vuze/files/patch-swt31
new file mode 100644
index 000000000000..20cf8cbdd5bf
--- /dev/null
+++ b/net-p2p/vuze/files/patch-swt31
@@ -0,0 +1,76 @@
+This set of patches allows Azureus to build against the 3.1.x version
+of SWT. When the 3.2.x is _released_ by Eclipse, and our x11-toolkits/swt31
+port is updated, this file can be removed from the Azureus port.
+
+	-mi
+
+--- org/gudy/azureus2/ui/swt/Messages.java	Fri Feb 10 00:08:06 2006
++++ org/gudy/azureus2/ui/swt/Messages.java	Tue Mar 14 11:00:05 2006
+@@ -218,5 +218,5 @@
+         }
+       }
+-    } else if (widget instanceof TableColumn) {
++    } /* else if (widget instanceof TableColumn) {
+       String key = (String) widget.getData();
+ 			if (key != null) {
+@@ -236,4 +236,5 @@
+ 			}
+     }
++*/
+   }
+   
+--- org/gudy/azureus2/ui/swt/views/TableView.java	Fri Feb 10 00:07:52 2006
++++ org/gudy/azureus2/ui/swt/views/TableView.java	Tue Mar 14 11:03:38 2006
+@@ -2714,5 +2714,5 @@
+ 		if (table == null || table.isDisposed())
+ 			return;
+-
++/*
+ 		try {
+ 			// can't use TableColumnCore.getPosition, because user may have moved
+@@ -2733,4 +2733,5 @@
+ 			// sWT < 3.2 doesn't have column indicaters
+ 		}
++*/
+ 	}
+ 
+--- org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionPlugins.java	Fri Feb 10 00:08:06 2006
++++ org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionPlugins.java	Tue Mar 14 11:06:20 2006
+@@ -374,4 +374,5 @@
+ 				public void widgetSelected(SelectionEvent e) {
+ 					boolean ascending = comparator.setField(table.indexOf(tc));
++/*
+ 					try {
+ 						table.setSortColumn(tc);
+@@ -380,4 +381,5 @@
+ 						// Ignore Pre 3.0
+ 					}
++*/
+ 					Collections.sort(pluginIFs, comparator);
+ 					table.clearAll();
+--- org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java	Thu Mar 16 14:04:50 2006
++++ org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java	Fri Mar 17 08:16:49 2006
+@@ -208,4 +208,5 @@
+ 		// Create shell & widgets
+ 		shell = new Shell(display, SWT.ON_TOP);
++/*
+ 		if (USE_SWT32_BG_SET) {
+ 			try {
+@@ -215,4 +216,5 @@
+ 			}
+ 		}
++*/
+ 		Utils.setShellIcon(shell);
+ 
+@@ -435,4 +437,5 @@
+ 
+ 			boolean bAlternateDrawing = true;
++/*
+ 			if (USE_SWT32_BG_SET) {
+ 				try {
+@@ -442,4 +445,5 @@
+ 				}
+ 			}
++*/
+ 
+ 			if (bAlternateDrawing) {
diff --git a/net-p2p/vuze/pkg-message b/net-p2p/vuze/pkg-message
new file mode 100644
index 000000000000..efdf17d4c8ce
--- /dev/null
+++ b/net-p2p/vuze/pkg-message
@@ -0,0 +1,14 @@
+====================================
+============ ATTENTION =============
+====================================
+
+If you have problems running
+Azureus, make sure you have the
+latest version of all your installed
+packages.
+
+For instance, make sure the swt31
+package is of version 3.1.1 or
+later.
+
+====================================