5 files changed, 15 insertions, 61 deletions

diff --git a/net-p2p/vuze/Makefile b/net-p2p/vuze/Makefile
index ce7e5c369a66..db1f26a91e45 100644
--- a/net-p2p/vuze/Makefile
+++ b/net-p2p/vuze/Makefile
@@ -2,14 +2,14 @@
 # $FreeBSD$
 
 PORTNAME=	vuze
-PORTVERSION=	4.7.2.0
+PORTVERSION=	4.8.0.0
 CATEGORIES=	net-p2p java
 # Moved to x-obsolete, could do with an update
 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
+MAINTAINER=	pawel@FreeBSD.org
+COMMENT=	BitTorrent client written in Java
 
 BUILD_DEPENDS=	${JAVALIBDIR}/log4j.jar:${PORTSDIR}/devel/log4j \
 		${JAVALIBDIR}/commons-cli.jar:${PORTSDIR}/java/jakarta-commons-cli \
@@ -19,19 +19,9 @@ USE_JAVA=	yes
 JAVA_VERSION=	1.5+
 JAVA_OS=	native
 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
-
 NO_WRKSUBDIR=	yes
+INSTALLS_ICONS=	yes
 
 JARFILE=	${PORTNAME}.jar
 
@@ -41,7 +31,7 @@ SWTDEVEL_DESC=	Use SWT Development port
 
 # build classpath from BUILD_DEPENDS
 MAKE_ENV=	LANG=C
-CLASSPATH_JARS=	${BUILD_DEPENDS:C/:.+$//:M*.jar}
+CLASSPATH_JARS=	${BUILD_DEPENDS:C/:.+$//:M*.jar:T}
 
 PLIST_FILES=	%%JAVAJARDIR%%/${JARFILE} \
 		bin/${PORTNAME} \
@@ -51,8 +41,7 @@ PLIST_FILES=	%%JAVAJARDIR%%/${JARFILE} \
 
 SUB_FILES=	${PORTNAME}
 SUB_LIST=	LIBDIR="${LOCALBASE}/lib" JARFILE="${JARFILE}" \
-		SWTJAR="${JAVALIBDIR}/${SWT}.jar" JAVA="${LOCALBASE}/bin/java" \
-		GECKO="${GECKO:S/19//}"
+		SWTJAR="${JAVALIBDIR}/${SWT}.jar" JAVA="${LOCALBASE}/bin/java"
 
 DESKTOP_ENTRIES=	"Vuze" \
 			"A full feature BitTorrent client" \
@@ -61,8 +50,6 @@ DESKTOP_ENTRIES=	"Vuze" \
 			"Application;Network;P2P;" \
 			true
 
-INSTALLS_ICONS=		yes
-
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSWTDEVEL}
@@ -77,7 +64,7 @@ RUN_DEPENDS+=	${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt
 
 CLASSPATH=.
 .for jar in ${CLASSPATH_JARS}
-CLASSPATH:=${CLASSPATH}:${jar}
+CLASSPATH:=${CLASSPATH}:${JAVALIBDIR}/${jar}
 .endfor
 
 post-patch:
@@ -92,17 +79,10 @@ do-install:
 	${MKDIR} ${JAVAJARDIR}
 	${INSTALL_DATA} ${WRKSRC}/dist/lib/${JARFILE} ${JAVAJARDIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}
-	${MKDIR} ${PREFIX}/share/icons/hicolor/16x16/apps
-	${INSTALL_DATA} ${WRKDIR}/org/gudy/azureus2/ui/icons/a16.png \
-		${PREFIX}/share/icons/hicolor/16x16/apps/${PORTNAME}.png
-	${MKDIR} ${PREFIX}/share/icons/hicolor/32x32/apps
-	${INSTALL_DATA} ${WRKDIR}/org/gudy/azureus2/ui/icons/a32.png \
-		${PREFIX}/share/icons/hicolor/32x32/apps/${PORTNAME}.png
-	${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
-
-post-install:
-	@${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}
+.for s in 16 32 64
+	${MKDIR} ${PREFIX}/share/icons/hicolor/${s}x${s}/apps
+	${INSTALL_DATA} ${WRKDIR}/org/gudy/azureus2/ui/icons/a${s}.png \
+		${PREFIX}/share/icons/hicolor/${s}x${s}/apps/${PORTNAME}.png
+.endfor
 
 .include <bsd.port.mk>
diff --git a/net-p2p/vuze/distinfo b/net-p2p/vuze/distinfo
index 013cf9fc9757..db2c1ed1c5dd 100644
--- a/net-p2p/vuze/distinfo
+++ b/net-p2p/vuze/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Vuze_4720_source.zip) = 853198ee09393afc1f2ba5e8e1cb1a10e564e3c42f885d0c658d947fa94a4494
-SIZE (Vuze_4720_source.zip) = 9384895
+SHA256 (Vuze_4800_source.zip) = 889d8524d162d18c1116a6b5bea74470ab8ded4f3931f7abd3a09c87c17d5776
+SIZE (Vuze_4800_source.zip) = 9441347
diff --git a/net-p2p/vuze/files/vuze.in b/net-p2p/vuze/files/vuze.in
index ea54f166463b..e2c7d24875dd 100644
--- a/net-p2p/vuze/files/vuze.in
+++ b/net-p2p/vuze/files/vuze.in
@@ -12,18 +12,6 @@ LIB_PATH=%%LIBDIR%%
 
 CLASS_PATH=:%%JAVAJARDIR%%/%%JARFILE%%:${ECLIPSE_SWT_JAR}
 
-#if [ ! "${MOZILLA_FIVE_HOME}" ]; then
-#	if [ -d "%%LOCALBASE%%/lib/%%GECKO%%" ]; then
-#		MOZILLA_FIVE_HOME="%%LOCALBASE%%/lib/%%GECKO%%"
-#	fi
-#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}"
diff --git a/net-p2p/vuze/pkg-descr b/net-p2p/vuze/pkg-descr
index 76b04ef543dd..7a371b2fb143 100644
--- a/net-p2p/vuze/pkg-descr
+++ b/net-p2p/vuze/pkg-descr
@@ -4,4 +4,4 @@ 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.
 
-WWW: http://azureus.sourceforge.net/
+WWW: http://www.vuze.com
diff --git a/net-p2p/vuze/pkg-message b/net-p2p/vuze/pkg-message
deleted file mode 100644
index 7efbaa51bb37..000000000000
--- a/net-p2p/vuze/pkg-message
+++ /dev/null
@@ -1,14 +0,0 @@
-====================================
-============ ATTENTION =============
-====================================
-
-If you have problems running
-Vuze, make sure you have the
-latest version of all your installed
-packages.
-
-For instance, make sure the swt
-package is of version 3.5 or
-later.
-
-====================================