diff --git a/net-p2p/mldonkey-sancho/Makefile b/net-p2p/mldonkey-sancho/Makefile
index 027999a8f33e..1188836c6c70 100644
--- a/net-p2p/mldonkey-sancho/Makefile
+++ b/net-p2p/mldonkey-sancho/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sancho
 DISTVERSION=	0.9.4-23
+PORTREVISION=	1
 CATEGORIES=	net java
 MASTER_SITES=	http://sancho-gui.sourceforge.net/%SUBDIR%/
 MASTER_SITE_SUBDIR=	dl/tmp94
@@ -17,23 +18,21 @@ MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	A Java GUI for the MLDonkey core
 
 BUILD_DEPENDS=	\
-	${LOCALBASE}/eclipse/plugins/org.eclipse.jface_3.0.0/jface.jar:${PORTSDIR}/java/eclipse \
-	${LOCALBASE}/eclipse/plugins/org.eclipse.swt.gtk_${ECLIPSE_VERSION}/ws/gtk/swt.jar:${PORTSDIR}/java/eclipse \
-	${JAVAJARDIR:S!^${PREFIX}/!${LOCALBASE}/!}/gnu-regexp.jar:${PORTSDIR}/java/gnu-regexp \
-	${JAVAJARDIR:S!^${PREFIX}/!${LOCALBASE}/!}/trove.jar:${PORTSDIR}/java/trove4j \
-	${JAVAJARDIR:S!^${PREFIX}/!${LOCALBASE}/!}/jsch.jar:${PORTSDIR}/net/jsch
+	${LOCALBASE}/eclipse/plugins/org.eclipse.jface_${ECLIPSE_VERSION}.0.jar:${PORTSDIR}/java/eclipse \
+	${LOCALBASE}/eclipse/plugins/org.eclipse.swt.gtk.freebsd.x86_${ECLIPSE_VERSION}.0.jar:${PORTSDIR}/java/eclipse \
+	${JAVALIBDIR}/gnu-regexp.jar:${PORTSDIR}/java/gnu-regexp \
+	${JAVALIBDIR}/trove.jar:${PORTSDIR}/java/trove4j \
+	${JAVALIBDIR}/jsch.jar:${PORTSDIR}/net/jsch
 RUN_DEPENDS=	\
-	${LOCALBASE}/eclipse/plugins/org.eclipse.core.runtime_${ECLIPSE_VERSION}/runtime.jar:${PORTSDIR}/java/eclipse \
-	${LOCALBASE}/eclipse/plugins/org.eclipse.jface_3.0.0/jface.jar:${PORTSDIR}/java/eclipse \
-	${LOCALBASE}/eclipse/plugins/org.eclipse.osgi_${ECLIPSE_VERSION}/osgi.jar:${PORTSDIR}/java/eclipse \
-	${LOCALBASE}/eclipse/plugins/org.eclipse.swt.gtk_${ECLIPSE_VERSION}/ws/gtk/swt-pi.jar:${PORTSDIR}/java/eclipse \
-	${LOCALBASE}/eclipse/plugins/org.eclipse.swt.gtk_${ECLIPSE_VERSION}/ws/gtk/swt.jar:${PORTSDIR}/java/eclipse \
+	${LOCALBASE}/eclipse/plugins/org.eclipse.core.runtime_${ECLIPSE_VERSION}.0.jar:${PORTSDIR}/java/eclipse \
+	${LOCALBASE}/eclipse/plugins/org.eclipse.osgi_${ECLIPSE_VERSION}.0.jar:${PORTSDIR}/java/eclipse \
+	${LOCALBASE}/eclipse/plugins/org.eclipse.jface_${ECLIPSE_VERSION}.0.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}.0.jar:${PORTSDIR}/java/eclipse \
 	${LOCALBASE}/eclipse/startup.jar:${PORTSDIR}/java/eclipse \
-	${JAVAJARDIR:S!^${PREFIX}/!${LOCALBASE}/!}/gnu-regexp.jar:${PORTSDIR}/java/gnu-regexp \
-	${JAVAJARDIR:S!^${PREFIX}/!${LOCALBASE}/!}/trove.jar:${PORTSDIR}/java/trove4j \
-	${JAVAJARDIR:S!^${PREFIX}/!${LOCALBASE}/!}/jsch.jar:${PORTSDIR}/net/jsch
-
-BROKEN=		Broken dependency
+	${JAVALIBDIR}/gnu-regexp.jar:${PORTSDIR}/java/gnu-regexp \
+	${JAVALIBDIR}/trove.jar:${PORTSDIR}/java/trove4j \
+	${JAVALIBDIR}/jsch.jar:${PORTSDIR}/net/jsch
 
 ONLY_FOR_ARCHS=	i386
 
@@ -52,13 +51,24 @@ JARFILE=	${PORTNAME}.jar
 BUILD_CLASSPATH_JARS=	${BUILD_DEPENDS:C/:.+$//:M*.jar}
 RUN_CLASSPATH_JARS=	${RUN_DEPENDS:C/:.+$//:M*.jar}
 
-# eclipse libs
-JAVALIBPATH=	${LOCALBASE}/eclipse/plugins/org.eclipse.swt.gtk_${ECLIPSE_VERSION}/os/freebsd/x86
-
 PLIST_FILES=	\
 		bin/${PKGNAMEPREFIX}${PORTNAME} \
 		%%JAVAJARDIR%%/${JARFILE}
 
+# 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-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-install:
 # wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh \
@@ -66,6 +76,9 @@ 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>
 
@@ -97,7 +110,13 @@ post-patch:
 		-e "s|%%JAVA_OS%%|${JAVA_OS}|" \
 		-e "s|%%JAVAJARDIR%%|${JAVAJARDIR:S,^${PREFIX}/,,}|" \
 		-e "s|%%CLASSPATH%%|${RUN_CLASSPATH}|" \
-		-e "s|%%JAVALIBPATH%%|${JAVALIBPATH}|" \
+		-e "s|%%JAVALIBPATH%%|${DATADIR}|" \
 		${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
diff --git a/net/mldonkey-sancho/Makefile b/net/mldonkey-sancho/Makefile
index 027999a8f33e..1188836c6c70 100644
--- a/net/mldonkey-sancho/Makefile
+++ b/net/mldonkey-sancho/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sancho
 DISTVERSION=	0.9.4-23
+PORTREVISION=	1
 CATEGORIES=	net java
 MASTER_SITES=	http://sancho-gui.sourceforge.net/%SUBDIR%/
 MASTER_SITE_SUBDIR=	dl/tmp94
@@ -17,23 +18,21 @@ MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	A Java GUI for the MLDonkey core
 
 BUILD_DEPENDS=	\
-	${LOCALBASE}/eclipse/plugins/org.eclipse.jface_3.0.0/jface.jar:${PORTSDIR}/java/eclipse \
-	${LOCALBASE}/eclipse/plugins/org.eclipse.swt.gtk_${ECLIPSE_VERSION}/ws/gtk/swt.jar:${PORTSDIR}/java/eclipse \
-	${JAVAJARDIR:S!^${PREFIX}/!${LOCALBASE}/!}/gnu-regexp.jar:${PORTSDIR}/java/gnu-regexp \
-	${JAVAJARDIR:S!^${PREFIX}/!${LOCALBASE}/!}/trove.jar:${PORTSDIR}/java/trove4j \
-	${JAVAJARDIR:S!^${PREFIX}/!${LOCALBASE}/!}/jsch.jar:${PORTSDIR}/net/jsch
+	${LOCALBASE}/eclipse/plugins/org.eclipse.jface_${ECLIPSE_VERSION}.0.jar:${PORTSDIR}/java/eclipse \
+	${LOCALBASE}/eclipse/plugins/org.eclipse.swt.gtk.freebsd.x86_${ECLIPSE_VERSION}.0.jar:${PORTSDIR}/java/eclipse \
+	${JAVALIBDIR}/gnu-regexp.jar:${PORTSDIR}/java/gnu-regexp \
+	${JAVALIBDIR}/trove.jar:${PORTSDIR}/java/trove4j \
+	${JAVALIBDIR}/jsch.jar:${PORTSDIR}/net/jsch
 RUN_DEPENDS=	\
-	${LOCALBASE}/eclipse/plugins/org.eclipse.core.runtime_${ECLIPSE_VERSION}/runtime.jar:${PORTSDIR}/java/eclipse \
-	${LOCALBASE}/eclipse/plugins/org.eclipse.jface_3.0.0/jface.jar:${PORTSDIR}/java/eclipse \
-	${LOCALBASE}/eclipse/plugins/org.eclipse.osgi_${ECLIPSE_VERSION}/osgi.jar:${PORTSDIR}/java/eclipse \
-	${LOCALBASE}/eclipse/plugins/org.eclipse.swt.gtk_${ECLIPSE_VERSION}/ws/gtk/swt-pi.jar:${PORTSDIR}/java/eclipse \
-	${LOCALBASE}/eclipse/plugins/org.eclipse.swt.gtk_${ECLIPSE_VERSION}/ws/gtk/swt.jar:${PORTSDIR}/java/eclipse \
+	${LOCALBASE}/eclipse/plugins/org.eclipse.core.runtime_${ECLIPSE_VERSION}.0.jar:${PORTSDIR}/java/eclipse \
+	${LOCALBASE}/eclipse/plugins/org.eclipse.osgi_${ECLIPSE_VERSION}.0.jar:${PORTSDIR}/java/eclipse \
+	${LOCALBASE}/eclipse/plugins/org.eclipse.jface_${ECLIPSE_VERSION}.0.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}.0.jar:${PORTSDIR}/java/eclipse \
 	${LOCALBASE}/eclipse/startup.jar:${PORTSDIR}/java/eclipse \
-	${JAVAJARDIR:S!^${PREFIX}/!${LOCALBASE}/!}/gnu-regexp.jar:${PORTSDIR}/java/gnu-regexp \
-	${JAVAJARDIR:S!^${PREFIX}/!${LOCALBASE}/!}/trove.jar:${PORTSDIR}/java/trove4j \
-	${JAVAJARDIR:S!^${PREFIX}/!${LOCALBASE}/!}/jsch.jar:${PORTSDIR}/net/jsch
-
-BROKEN=		Broken dependency
+	${JAVALIBDIR}/gnu-regexp.jar:${PORTSDIR}/java/gnu-regexp \
+	${JAVALIBDIR}/trove.jar:${PORTSDIR}/java/trove4j \
+	${JAVALIBDIR}/jsch.jar:${PORTSDIR}/net/jsch
 
 ONLY_FOR_ARCHS=	i386
 
@@ -52,13 +51,24 @@ JARFILE=	${PORTNAME}.jar
 BUILD_CLASSPATH_JARS=	${BUILD_DEPENDS:C/:.+$//:M*.jar}
 RUN_CLASSPATH_JARS=	${RUN_DEPENDS:C/:.+$//:M*.jar}
 
-# eclipse libs
-JAVALIBPATH=	${LOCALBASE}/eclipse/plugins/org.eclipse.swt.gtk_${ECLIPSE_VERSION}/os/freebsd/x86
-
 PLIST_FILES=	\
 		bin/${PKGNAMEPREFIX}${PORTNAME} \
 		%%JAVAJARDIR%%/${JARFILE}
 
+# 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-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-install:
 # wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh \
@@ -66,6 +76,9 @@ 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>
 
@@ -97,7 +110,13 @@ post-patch:
 		-e "s|%%JAVA_OS%%|${JAVA_OS}|" \
 		-e "s|%%JAVAJARDIR%%|${JAVAJARDIR:S,^${PREFIX}/,,}|" \
 		-e "s|%%CLASSPATH%%|${RUN_CLASSPATH}|" \
-		-e "s|%%JAVALIBPATH%%|${JAVALIBPATH}|" \
+		-e "s|%%JAVALIBPATH%%|${DATADIR}|" \
 		${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