6 files changed, 82 insertions, 20 deletions

diff --git a/net-p2p/azureus/Makefile b/net-p2p/azureus/Makefile
index 1dba74e41d85..ba0e699367ef 100644
--- a/net-p2p/azureus/Makefile
+++ b/net-p2p/azureus/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	azureus
-PORTVERSION=	3.0.3.0
+PORTVERSION=	3.0.3.4
 CATEGORIES=	net-p2p java
 MASTER_SITES=	SF
 DISTNAME=	Azureus_${PORTVERSION}_source
@@ -16,9 +16,7 @@ COMMENT=	A BitTorrent client written in Java
 
 BUILD_DEPENDS=	${JAVALIBDIR}/log4j.jar:${PORTSDIR}/devel/log4j \
 		${JAVALIBDIR}/commons-cli.jar:${PORTSDIR}/java/jakarta-commons-cli \
-		${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit \
-		${JAVALIBDIR}/${SWT}.jar:${PORTSDIR}/x11-toolkits/${SWT}
-RUN_DEPENDS=	${JAVALIBDIR}/${SWT}.jar:${PORTSDIR}/x11-toolkits/${SWT}
+		${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.4+
@@ -26,8 +24,6 @@ JAVA_OS=	native
 USE_ANT=	yes
 
 USE_ZIP=	yes
-USE_DOS2UNIX=	org/gudy/azureus2/ui/swt/test/PrintTransferTypes.java \
-		org/gudy/azureus2/platform/macosx/access/jnilib/OSXAccess.java
 
 NO_WRKSUBDIR=	yes
 
@@ -41,18 +37,35 @@ MAKE_ENV=	LANG=C
 CLASSPATH_JARS=	${BUILD_DEPENDS:C/:.+$//:M*.jar}
 
 PLIST_FILES=	%%JAVAJARDIR%%/${JARFILE} \
-		bin/${PORTNAME}
+		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
 
 SUB_FILES=	${PORTNAME}
 SUB_LIST=	LIBDIR="${LOCALBASE}/lib" JARFILE="${JARFILE}" \
 		SWTJAR="${JAVALIBDIR}/${SWT}.jar" JAVA="${LOCALBASE}/bin/java"
 
+DESKTOP_ENTRIES=	"Azureus" \
+			"A full feature BitTorrent client" \
+			"${PORTNAME}.png" \
+			"${PORTNAME}" \
+			"" \
+			true
+
+INSTALLS_ICONS=		yes
+
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_SWTDEVEL)
 SWT=		swt-devel
+BUILD_DEPENDS+=	${JAVALIBDIR}/swt-devel.jar:${PORTSDIR}/x11-toolkits/swt-devel
+RUN_DEPENDS+=	${JAVALIBDIR}/swt-devel.jar:${PORTSDIR}/x11-toolkits/swt-devel
 .else
 SWT=		swt
+BUILD_DEPENDS+=	${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt
+RUN_DEPENDS+=	${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt
 .endif
 
 # Ok, I'm not quite sure why this works, or if it is in any way a proper fix.
@@ -78,6 +91,14 @@ do-install:
 	${MKDIR} ${JAVAJARDIR}
 	${INSTALL_DATA} ${WRKSRC}/dist/lib/${JARFILE} ${JAVAJARDIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}
+	${INSTALL_DATA} ${WRKDIR}/org/gudy/azureus2/ui/icons/a16.png \
+		${PREFIX}/share/icons/hicolor/16x16/apps/${PORTNAME}.png
+	${INSTALL_DATA} ${WRKDIR}/org/gudy/azureus2/ui/icons/a32.png \
+		${PREFIX}/share/icons/hicolor/32x32/apps/${PORTNAME}.png
+	${INSTALL_DATA} ${WRKDIR}/org/gudy/azureus2/ui/icons/a64.png \
+		${PREFIX}/share/icons/hicolor/64x64/apps/${PORTNAME}.png
+	${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/azureus/distinfo b/net-p2p/azureus/distinfo
index f1f4efce87e2..628484d7b53a 100644
--- a/net-p2p/azureus/distinfo
+++ b/net-p2p/azureus/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (Azureus_3.0.3.4_source.zip) = 1dd3f6cbf77ce90c1eb2f80d01c7e912
+SHA256 (Azureus_3.0.3.4_source.zip) = e413ce9908ba940345b26024e2daedb2dbf3274aeba3996b7ed7a9b287072f8d
+SIZE (Azureus_3.0.3.4_source.zip) = 6988737
diff --git a/net-p2p/azureus/files/patch-org__gudy__azureus2__platform__unix__ScriptBeforeStartup.java b/net-p2p/azureus/files/patch-org__gudy__azureus2__platform__unix__ScriptBeforeStartup.java
new file mode 100644
index 000000000000..006de6438076
--- /dev/null
+++ b/net-p2p/azureus/files/patch-org__gudy__azureus2__platform__unix__ScriptBeforeStartup.java
@@ -0,0 +1,10 @@
+--- org/gudy/azureus2/platform/unix/ScriptBeforeStartup.java.orig	2007-10-13 16:57:39.000000000 -0400
++++ org/gudy/azureus2/platform/unix/ScriptBeforeStartup.java	2007-10-13 16:58:03.000000000 -0400
+@@ -136,6 +136,7 @@
+ 						return false;
+ 					}
+ 				});
++				possibleDirs.add(new File("/usr/local/lib"));
+ 				possibleDirs.add(new File("/usr/local"));
+ 				possibleDirs.add(new File("/opt"));
+ 
diff --git a/net-p2p/vuze/Makefile b/net-p2p/vuze/Makefile
index 1dba74e41d85..ba0e699367ef 100644
--- a/net-p2p/vuze/Makefile
+++ b/net-p2p/vuze/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	azureus
-PORTVERSION=	3.0.3.0
+PORTVERSION=	3.0.3.4
 CATEGORIES=	net-p2p java
 MASTER_SITES=	SF
 DISTNAME=	Azureus_${PORTVERSION}_source
@@ -16,9 +16,7 @@ COMMENT=	A BitTorrent client written in Java
 
 BUILD_DEPENDS=	${JAVALIBDIR}/log4j.jar:${PORTSDIR}/devel/log4j \
 		${JAVALIBDIR}/commons-cli.jar:${PORTSDIR}/java/jakarta-commons-cli \
-		${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit \
-		${JAVALIBDIR}/${SWT}.jar:${PORTSDIR}/x11-toolkits/${SWT}
-RUN_DEPENDS=	${JAVALIBDIR}/${SWT}.jar:${PORTSDIR}/x11-toolkits/${SWT}
+		${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.4+
@@ -26,8 +24,6 @@ JAVA_OS=	native
 USE_ANT=	yes
 
 USE_ZIP=	yes
-USE_DOS2UNIX=	org/gudy/azureus2/ui/swt/test/PrintTransferTypes.java \
-		org/gudy/azureus2/platform/macosx/access/jnilib/OSXAccess.java
 
 NO_WRKSUBDIR=	yes
 
@@ -41,18 +37,35 @@ MAKE_ENV=	LANG=C
 CLASSPATH_JARS=	${BUILD_DEPENDS:C/:.+$//:M*.jar}
 
 PLIST_FILES=	%%JAVAJARDIR%%/${JARFILE} \
-		bin/${PORTNAME}
+		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
 
 SUB_FILES=	${PORTNAME}
 SUB_LIST=	LIBDIR="${LOCALBASE}/lib" JARFILE="${JARFILE}" \
 		SWTJAR="${JAVALIBDIR}/${SWT}.jar" JAVA="${LOCALBASE}/bin/java"
 
+DESKTOP_ENTRIES=	"Azureus" \
+			"A full feature BitTorrent client" \
+			"${PORTNAME}.png" \
+			"${PORTNAME}" \
+			"" \
+			true
+
+INSTALLS_ICONS=		yes
+
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_SWTDEVEL)
 SWT=		swt-devel
+BUILD_DEPENDS+=	${JAVALIBDIR}/swt-devel.jar:${PORTSDIR}/x11-toolkits/swt-devel
+RUN_DEPENDS+=	${JAVALIBDIR}/swt-devel.jar:${PORTSDIR}/x11-toolkits/swt-devel
 .else
 SWT=		swt
+BUILD_DEPENDS+=	${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt
+RUN_DEPENDS+=	${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt
 .endif
 
 # Ok, I'm not quite sure why this works, or if it is in any way a proper fix.
@@ -78,6 +91,14 @@ do-install:
 	${MKDIR} ${JAVAJARDIR}
 	${INSTALL_DATA} ${WRKSRC}/dist/lib/${JARFILE} ${JAVAJARDIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}
+	${INSTALL_DATA} ${WRKDIR}/org/gudy/azureus2/ui/icons/a16.png \
+		${PREFIX}/share/icons/hicolor/16x16/apps/${PORTNAME}.png
+	${INSTALL_DATA} ${WRKDIR}/org/gudy/azureus2/ui/icons/a32.png \
+		${PREFIX}/share/icons/hicolor/32x32/apps/${PORTNAME}.png
+	${INSTALL_DATA} ${WRKDIR}/org/gudy/azureus2/ui/icons/a64.png \
+		${PREFIX}/share/icons/hicolor/64x64/apps/${PORTNAME}.png
+	${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 f1f4efce87e2..628484d7b53a 100644
--- a/net-p2p/vuze/distinfo
+++ b/net-p2p/vuze/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (Azureus_3.0.3.4_source.zip) = 1dd3f6cbf77ce90c1eb2f80d01c7e912
+SHA256 (Azureus_3.0.3.4_source.zip) = e413ce9908ba940345b26024e2daedb2dbf3274aeba3996b7ed7a9b287072f8d
+SIZE (Azureus_3.0.3.4_source.zip) = 6988737
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
new file mode 100644
index 000000000000..006de6438076
--- /dev/null
+++ b/net-p2p/vuze/files/patch-org__gudy__azureus2__platform__unix__ScriptBeforeStartup.java
@@ -0,0 +1,10 @@
+--- org/gudy/azureus2/platform/unix/ScriptBeforeStartup.java.orig	2007-10-13 16:57:39.000000000 -0400
++++ org/gudy/azureus2/platform/unix/ScriptBeforeStartup.java	2007-10-13 16:58:03.000000000 -0400
+@@ -136,6 +136,7 @@
+ 						return false;
+ 					}
+ 				});
++				possibleDirs.add(new File("/usr/local/lib"));
+ 				possibleDirs.add(new File("/usr/local"));
+ 				possibleDirs.add(new File("/opt"));
+