Update to 2.3.0.4:

- Unpack some shared libraries from eclipse's jars
- Depend on jdk 1.4 which may result on a memory leak due to the
  usage of jnio API. jdk 1.5 should fix this issue but our current
  version does not work with azureus 2.3.0.x series

Reviewed by:	freebsd-ports (silence)

4 files changed, 37 insertions, 16 deletions

diff --git a/net-p2p/azureus2/Makefile b/net-p2p/azureus2/Makefile
index 4e8a94de163f..d36930e0f7f1 100644
--- a/net-p2p/azureus2/Makefile
+++ b/net-p2p/azureus2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	azureus
-PORTVERSION=	2.2.0.2
-PORTREVISION=	6
+PORTVERSION=	2.3.0.4
 CATEGORIES=	net java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,17 +16,19 @@ MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	A BitTorrent client written in Java
 
 BUILD_DEPENDS=	\
-		${LOCALBASE}/eclipse/plugins/org.eclipse.swt.gtk_${ECLIPSE_VERSION}/ws/gtk/swt.jar:${PORTSDIR}/java/eclipse
+		${JAVALIBDIR}/log4j.jar:${PORTSDIR}/devel/log4j \
+		${LOCALBASE}/eclipse/plugins/org.eclipse.swt_${ECLIPSE_VERSION}.0.jar:${PORTSDIR}/java/eclipse \
+		${LOCALBASE}/eclipse/plugins/org.eclipse.swt.gtk.freebsd.x86_${ECLIPSE_VERSION}.0.jar:${PORTSDIR}/java/eclipse \
+		${JAVALIBDIR}/commons-cli.jar:${PORTSDIR}/java/jakarta-commons-cli \
+		${JAVALIBDIR}/seda.jar:${PORTSDIR}/net/seda
 RUN_DEPENDS=	\
-		${LOCALBASE}/eclipse/plugins/org.eclipse.swt.gtk_${ECLIPSE_VERSION}/ws/gtk/swt-pi.jar:${PORTSDIR}/java/eclipse \
-		${BUILD_DEPENDS}
-
-BROKEN=		Broken dependency
+		${LOCALBASE}/eclipse/plugins/org.eclipse.swt_${ECLIPSE_VERSION}.0.jar:${PORTSDIR}/java/eclipse \
+		${LOCALBASE}/eclipse/plugins/org.eclipse.swt.gtk.freebsd.x86_${ECLIPSE_VERSION}.0.jar:${PORTSDIR}/java/eclipse
 
 ONLY_FOR_ARCHS=	i386
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.4
 JAVA_OS=	native
 USE_ANT=	yes
 USE_JIKES=	no
@@ -43,8 +44,23 @@ CLASSPATH_JARS=	${BUILD_DEPENDS:C/:.+$//:M*.jar}
 
 PLIST_FILES=	%%JAVAJARDIR%%/${JARFILE} bin/${PORTNAME}
 
+# hack for eclipse 3.1
+PLIST_DIRS=	%%DATADIR%%
+PLIST_FILES+=	\
+		%%DATADIR%%/libswt-atk-gtk-3138.so \
+		%%DATADIR%%/libswt-awt-gtk-3138.so \
+		%%DATADIR%%/libswt-cairo-gtk-3138.so \
+		%%DATADIR%%/libswt-gnome-gtk-3138.so \
+		%%DATADIR%%/libswt-gtk-3138.so \
+		%%DATADIR%%/libswt-mozilla-gtk-3138.so \
+		%%DATADIR%%/libswt-pi-gtk-3138.so
+
+post-extract:
+	@${MKDIR} ${WRKDIR}/eclipse && cd ${WRKDIR}/eclipse && ${JAR} -xf ${LOCALBASE}/eclipse/plugins/org.eclipse.swt.gtk.freebsd.x86_${ECLIPSE_VERSION}.0.jar
+		
 do-configure:
 	${SED} -e "s+%%PREFIX%%+${PREFIX}+" -e "s+%%LOCALBASE%%+${LOCALBASE}+" \
+		-e "s|%%DATADIR%%|${DATADIR}|" \
 		-e "s|%%JAVAJARDIR%%|${JAVAJARDIR}|" \
 		-e "s|%%JAVA%%|${LOCALBASE}/bin/java|" \
 		-e "s|%%JAVA_VERSION%%|${JAVA_VERSION}|" \
@@ -57,6 +73,9 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/dist/lib/${JARFILE} \
 		${JAVAJARDIR}/
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}
+# hack for eclipse 3.1
+	@${MKDIR} ${DATADIR}
+	@${INSTALL_DATA} ${WRKDIR}/eclipse/*so ${DATADIR}
 
 .include <bsd.port.pre.mk>
 
diff --git a/net-p2p/azureus2/distinfo b/net-p2p/azureus2/distinfo
index 637f181436b5..f7997d866457 100644
--- a/net-p2p/azureus2/distinfo
+++ b/net-p2p/azureus2/distinfo
@@ -1,2 +1,2 @@
-MD5 (Azureus_2.2.0.2_source.zip) = aa8d7cc80af517363b911876615960ed
-SIZE (Azureus_2.2.0.2_source.zip) = 3318102
+MD5 (Azureus_2.3.0.4_source.zip) = 7ffa5f844f7fdef28e3663d5cdee312b
+SIZE (Azureus_2.3.0.4_source.zip) = 4537695
diff --git a/net-p2p/azureus2/files/azureus b/net-p2p/azureus2/files/azureus
index 2505948011a1..b84fb3e5162f 100644
--- a/net-p2p/azureus2/files/azureus
+++ b/net-p2p/azureus2/files/azureus
@@ -10,12 +10,10 @@ JAVA_VERSION="%%JAVA_VERSION%%"
 JAVA_OS="%%JAVA_OS%%"
 
 ECLIPSE_BASE=%%LOCALBASE%%/eclipse
-ECLIPSE_SWT=`find "${ECLIPSE_BASE}" -name '*swt.*' -type d | grep -e "plugins/org.eclipse.swt.[motif|gtk]" | head -n 1`
-ECLIPSE_WS=`echo "${ECLIPSE_SWT}" | sed -e "s+^${ECLIPSE_BASE}/plugins/org.eclipse.swt.++" -e "s+_.*$++"`
-ECLIPSE_SWT_JAR=${ECLIPSE_SWT}/ws/${ECLIPSE_WS}
-LIB_PATH=${ECLIPSE_SWT}/os/freebsd/x86/
+ECLIPSE_SWT_JAR=`find ${ECLIPSE_BASE} -name "org.eclipse.swt*jar" | tr "\n" ":"`
+LIB_PATH=%%DATADIR%%
 
-CLASS_PATH=:%%JAVAJARDIR%%/%%JARFILE%%:${ECLIPSE_SWT_JAR}/swt-pi.jar:${ECLIPSE_SWT_JAR}/swt.jar
+CLASS_PATH=:%%JAVAJARDIR%%/%%JARFILE%%:${ECLIPSE_SWT_JAR}
 
 if [ "${DEBUG}" ]
 then
diff --git a/net-p2p/azureus2/files/build.xml b/net-p2p/azureus2/files/build.xml
index fc1523321b80..21ac16c59937 100644
--- a/net-p2p/azureus2/files/build.xml
+++ b/net-p2p/azureus2/files/build.xml
@@ -19,10 +19,11 @@
 
    <target name="compile" depends="init" description="compile the source " >
      <!-- Compile the java code from ${src} into ${build} -->
-     <javac srcdir="." destdir="${build}">
+     <javac srcdir="." destdir="${build}" fork="yes" memoryMaximumSize="64m">
        <include name="**/*.java"/>
        <exclude name="**/Win32*.java"/>
        <exclude name="**/swt/osx/**"/>
+       <exclude name="**/macosx/**"/>
        <classpath path="%%CLASSPATH%%"/>
      </javac>
    </target>
@@ -33,6 +34,9 @@
 
      <copy todir="${build}">
        <fileset dir="." includes="**/*.gif **/*.jpg, **/*.png **/*.properties" />
+       <fileset dir="." includes="**/*.dat **/*.stf **/*.xsd" />
+       <fileset dir="." includes="**/*.css **/*.html **/*.js **/*.php **/*.tmpl **/*.txt" />
+       <fileset dir="." includes="**/*.ico **/*.wav" />
      </copy>
      <!-- Put everything in ${build} into the azureus.jar file -->
      <jar jarfile="${dist}/lib/azureus.jar" basedir="${build}"/>