3 files changed, 11 insertions, 63 deletions

diff --git a/net/azureus/Makefile b/net/azureus/Makefile
index c12a0ffbb8e7..43f9a7032344 100644
--- a/net/azureus/Makefile
+++ b/net/azureus/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	azureus
 PORTVERSION=	2.3.0.6
+PORTREVISION=	1
 CATEGORIES=	net java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,23 +16,18 @@ DISTNAME=	Azureus_${PORTVERSION}_source
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	A BitTorrent client written in Java
 
-EXTRACT_DEPENDS= \
-		${LOCALBASE}/eclipse/plugins/org.eclipse.swt.gtk.freebsd.x86_${ECLIPSE_VERSION}.1.jar:${PORTSDIR}/java/eclipse
 BUILD_DEPENDS=	\
 		${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}.1.jar:${PORTSDIR}/java/eclipse \
 		${JAVALIBDIR}/commons-cli.jar:${PORTSDIR}/java/jakarta-commons-cli \
 		${LOCALBASE}/eclipse/plugins/org.junit_3.8.1/junit.jar:${PORTSDIR}/java/junit \
+		${JAVALIBDIR}/swt.jar:${PORTSDIR}/java/swt31 \
 		${JAVALIBDIR}/seda.jar:${PORTSDIR}/net/seda
 RUN_DEPENDS=	\
-		${LOCALBASE}/eclipse/plugins/org.eclipse.swt_${ECLIPSE_VERSION}.0.jar:${PORTSDIR}/java/eclipse \
-		${LOCALBASE}/eclipse/plugins/org.eclipse.swt.gtk.freebsd.x86_${ECLIPSE_VERSION}.1.jar:${PORTSDIR}/java/eclipse
+		${JAVALIBDIR}/swt.jar:${PORTSDIR}/java/swt31 \
 
 ONLY_FOR_ARCHS=	i386
 
 USE_JAVA=	yes
-JAVA_EXTRACT=	yes
 JAVA_BUILD=	jdk
 JAVA_RUN=	jdk
 JAVA_VERSION=	1.4
@@ -50,27 +46,15 @@ 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-3139.so \
-		%%DATADIR%%/libswt-awt-gtk-3139.so \
-		%%DATADIR%%/libswt-cairo-gtk-3139.so \
-		%%DATADIR%%/libswt-gnome-gtk-3139.so \
-		%%DATADIR%%/libswt-gtk-3139.so \
-		%%DATADIR%%/libswt-pi-gtk-3139.so
-
-post-extract:
-	@${MKDIR} ${WRKDIR}/eclipse && cd ${WRKDIR}/eclipse && ${JAR} -xf ${LOCALBASE}/eclipse/plugins/org.eclipse.swt.gtk.freebsd.x86_${ECLIPSE_VERSION}.1.jar
-		
 do-configure:
 	${SED} -e "s+%%PREFIX%%+${PREFIX}+" -e "s+%%LOCALBASE%%+${LOCALBASE}+" \
-		-e "s|%%DATADIR%%|${DATADIR}|" \
+		-e "s|%%LIBDIR%%|${LOCALBASE}/lib|" \
 		-e "s|%%JAVAJARDIR%%|${JAVAJARDIR}|" \
 		-e "s|%%JAVA%%|${LOCALBASE}/bin/java|" \
 		-e "s|%%JAVA_VERSION%%|${JAVA_VERSION}|" \
 		-e "s|%%JAVA_OS%%|${JAVA_OS}|" \
 		-e "s|%%JARFILE%%|${JARFILE}|" \
+		-e "s|%%SWTJAR%%|${JAVALIBDIR}/swt.jar|" \
 		${FILESDIR}/${PORTNAME} > ${WRKDIR}/${PORTNAME}
 
 do-install:
@@ -78,19 +62,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>
 
-#.if exists(${PORTSDIR}/java/eclipse)
-#ECLIPSE_PORT=		${PORTSDIR}/java/eclipse
-#ECLIPSE_VERSION!=	cd ${ECLIPSE_PORT} && ${MAKE} -V PORTVERSION
-#.else
-ECLIPSE_VERSION=	3.1
-#.endif
-
 CLASSPATH=.
 .for jar in ${CLASSPATH_JARS}
 CLASSPATH:=${CLASSPATH}:${jar}
diff --git a/net/azureus/files/azureus b/net/azureus/files/azureus
index b84fb3e5162f..ae536948e69a 100644
--- a/net/azureus/files/azureus
+++ b/net/azureus/files/azureus
@@ -10,8 +10,8 @@ JAVA_VERSION="%%JAVA_VERSION%%"
 JAVA_OS="%%JAVA_OS%%"
 
 ECLIPSE_BASE=%%LOCALBASE%%/eclipse
-ECLIPSE_SWT_JAR=`find ${ECLIPSE_BASE} -name "org.eclipse.swt*jar" | tr "\n" ":"`
-LIB_PATH=%%DATADIR%%
+ECLIPSE_SWT_JAR=%%SWTJAR%%
+LIB_PATH=%%LIBDIR%%
 
 CLASS_PATH=:%%JAVAJARDIR%%/%%JARFILE%%:${ECLIPSE_SWT_JAR}
 
diff --git a/net/mldonkey-sancho/Makefile b/net/mldonkey-sancho/Makefile
index c4ed840a018c..5bd3e235ad55 100644
--- a/net/mldonkey-sancho/Makefile
+++ b/net/mldonkey-sancho/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sancho
 DISTVERSION=	0.9.4-23
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net java
 MASTER_SITES=	http://sancho-gui.sourceforge.net/%SUBDIR%/
 MASTER_SITE_SUBDIR=	dl/tmp94
@@ -17,21 +17,18 @@ DISTNAME=	${PORTNAME}-src
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	A Java GUI for the MLDonkey core
 
-EXTRACT_DEPENDS= \
-	${LOCALBASE}/eclipse/plugins/org.eclipse.swt.gtk.freebsd.x86_${ECLIPSE_VERSION}.1.jar:${PORTSDIR}/java/eclipse
 BUILD_DEPENDS=	\
 	${LOCALBASE}/eclipse/plugins/org.eclipse.jface_${ECLIPSE_VERSION}.1.jar:${PORTSDIR}/java/eclipse \
-	${LOCALBASE}/eclipse/plugins/org.eclipse.swt.gtk.freebsd.x86_${ECLIPSE_VERSION}.1.jar:${PORTSDIR}/java/eclipse \
 	${JAVALIBDIR}/gnu-regexp.jar:${PORTSDIR}/java/gnu-regexp \
+	${JAVALIBDIR}/swt.jar:${PORTSDIR}/java/swt31 \
 	${JAVALIBDIR}/trove.jar:${PORTSDIR}/java/trove4j \
 	${JAVALIBDIR}/jsch.jar:${PORTSDIR}/net/jsch
 RUN_DEPENDS=	\
 	${LOCALBASE}/eclipse/plugins/org.eclipse.core.runtime_${ECLIPSE_VERSION}.1.jar:${PORTSDIR}/java/eclipse \
 	${LOCALBASE}/eclipse/plugins/org.eclipse.osgi_${ECLIPSE_VERSION}.1.jar:${PORTSDIR}/java/eclipse \
 	${LOCALBASE}/eclipse/plugins/org.eclipse.jface_${ECLIPSE_VERSION}.1.jar:${PORTSDIR}/java/eclipse \
-	${LOCALBASE}/eclipse/plugins/org.eclipse.swt_${ECLIPSE_VERSION}.0.jar:${PORTSDIR}/java/eclipse \
-	${LOCALBASE}/eclipse/plugins/org.eclipse.swt.gtk.freebsd.x86_${ECLIPSE_VERSION}.1.jar:${PORTSDIR}/java/eclipse \
 	${LOCALBASE}/eclipse/startup.jar:${PORTSDIR}/java/eclipse \
+	${JAVALIBDIR}/swt.jar:${PORTSDIR}/java/swt31 \
 	${JAVALIBDIR}/gnu-regexp.jar:${PORTSDIR}/java/gnu-regexp \
 	${JAVALIBDIR}/trove.jar:${PORTSDIR}/java/trove4j \
 	${JAVALIBDIR}/jsch.jar:${PORTSDIR}/net/jsch
@@ -39,7 +36,6 @@ RUN_DEPENDS=	\
 ONLY_FOR_ARCHS=	i386
 
 USE_JAVA=	yes
-JAVA_EXTRACT=	yes
 JAVA_BUILD=	jdk
 JAVA_RUN=	jre
 JAVA_VERSION=	1.4+
@@ -60,19 +56,6 @@ PLIST_FILES=	\
 		bin/${PKGNAMEPREFIX}${PORTNAME} \
 		%%JAVAJARDIR%%/${JARFILE}
 
-# hack for eclipse 3.1
-PLIST_DIRS+=	%%DATADIR%%
-PLIST_FILES+=	\
-		%%DATADIR%%/libswt-atk-gtk-3139.so \
-		%%DATADIR%%/libswt-awt-gtk-3139.so \
-		%%DATADIR%%/libswt-cairo-gtk-3139.so \
-		%%DATADIR%%/libswt-gnome-gtk-3139.so \
-		%%DATADIR%%/libswt-gtk-3139.so \
-		%%DATADIR%%/libswt-pi-gtk-3139.so
-
-post-extract:
-	@${MKDIR} ${WRKDIR}/eclipse && cd ${WRKDIR}/eclipse && ${JAR} -xf ${LOCALBASE}/eclipse/plugins/org.eclipse.swt.gtk.freebsd.x86_${ECLIPSE_VERSION}.1.jar
-
 do-install:
 # wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh \
@@ -80,9 +63,6 @@ do-install:
 # jar
 	@${MKDIR} ${JAVAJARDIR}
 	@${INSTALL_DATA} ${WRKSRC}/dist/${JARFILE} ${JAVAJARDIR}/${JARFILE}
-# hack for eclipse 3.1
-	@${MKDIR} ${DATADIR}
-	@${INSTALL_DATA} ${WRKDIR}/eclipse/*so ${DATADIR}
 
 .include <bsd.port.pre.mk>
 
@@ -118,13 +98,7 @@ post-patch:
 		-e "s|%%JAVA_OS%%|${JAVA_OS}|" \
 		-e "s|%%JAVAJARDIR%%|${JAVAJARDIR:S,^${PREFIX}/,,}|" \
 		-e "s|%%CLASSPATH%%|${RUN_CLASSPATH}|" \
-		-e "s|%%JAVALIBPATH%%|${DATADIR}|" \
+		-e "s|%%JAVALIBPATH%%|${LOCALBASE}/lib|" \
 		${FILESDIR}/wrapper.sh > ${WRKDIR}/wrapper.sh
 
 .include <bsd.port.post.mk>
-
-# hack to protect against eclipse + mozilla
-.if exists(${WRKDIR}/eclipse/libswt-mozilla-gtk-3138.so)
-PLIST_FILES+=	\
-		%%DATADIR%%/libswt-mozilla-gtk-3138.so
-.endif