Index: java/javavmwrapper/Makefile
===================================================================
--- java/javavmwrapper/Makefile	(revision 306819)
+++ java/javavmwrapper/Makefile	(working copy)
@@ -5,7 +5,7 @@
 
 PORTNAME=	javavmwrapper
 PORTVERSION=	2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java
 MASTER_SITES=	# none
 DISTFILES=	# none
Index: java/javavmwrapper/pkg-deinstall
===================================================================
--- java/javavmwrapper/pkg-deinstall	(revision 306819)
+++ java/javavmwrapper/pkg-deinstall	(working copy)
@@ -22,9 +22,17 @@ if [ -f "${OPTION_CONF}" -a -f "${OPTION_CONF}.dis
 fi
 
 # Destroy the symbolic links that were created for every executable for a VM.
-find -L ${PKG_PREFIX}/bin -samefile ${PKG_PREFIX}/bin/javavm \
-    \! -name checkvms \! -name javavm \! -name manvm \
-    \! -name registervm \! -name unregistervm | xargs rm -f
+_excl_files='checkvms manvm registervm unregistervm'
+_find_expr='-depth 1 -type l'
+for i in ${_excl_files}; do
+	_find_expr="${_find_expr} ! -name ${i}"
+done
+_javavm_path=`realpath ${PKG_PREFIX}/bin/javavm`
+for i in `find ${PKG_PREFIX}/bin ${_find_expr}`; do
+	if [ "${_javavm_path}" = `realpath ${i}` ]; then
+		rm -f "${i}"
+	fi
+done
 
 # The configuration file
 CONF="${PKG_PREFIX}/etc/javavms"