From owner-svn-ports-all@FreeBSD.ORG  Fri Nov  2 17:12:09 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 7FD14679;
 Fri,  2 Nov 2012 17:12:09 +0000 (UTC)
 (envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 66A5C8FC08;
 Fri,  2 Nov 2012 17:12:09 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id qA2HC9Ut065989;
 Fri, 2 Nov 2012 17:12:09 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id qA2HC9mq065986;
 Fri, 2 Nov 2012 17:12:09 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201211021712.qA2HC9mq065986@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Fri, 2 Nov 2012 17:12:09 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r306872 - head/java/javavmwrapper
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Nov 2012 17:12:09 -0000

Author: jkim
Date: Fri Nov  2 17:12:08 2012
New Revision: 306872
URL: http://svn.freebsd.org/changeset/ports/306872

Log:
  Fix deinstallation script for 7.x.  -samefile option for find(1) does not
  exist there.
  
  Reviewed by:	glewis (maintainer)
  Feature safe:	yes

Modified:
  head/java/javavmwrapper/Makefile
  head/java/javavmwrapper/pkg-deinstall

Modified: head/java/javavmwrapper/Makefile
==============================================================================
--- head/java/javavmwrapper/Makefile	Fri Nov  2 17:10:39 2012	(r306871)
+++ head/java/javavmwrapper/Makefile	Fri Nov  2 17:12:08 2012	(r306872)
@@ -5,7 +5,7 @@
 
 PORTNAME=	javavmwrapper
 PORTVERSION=	2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java
 MASTER_SITES=	# none
 DISTFILES=	# none

Modified: head/java/javavmwrapper/pkg-deinstall
==============================================================================
--- head/java/javavmwrapper/pkg-deinstall	Fri Nov  2 17:10:39 2012	(r306871)
+++ head/java/javavmwrapper/pkg-deinstall	Fri Nov  2 17:12:08 2012	(r306872)
@@ -22,9 +22,17 @@ if [ -f "${OPTION_CONF}" -a -f "${OPTION
 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_links='checkvms manvm registervm unregistervm'
+_find_expr='-depth 1 -type l'
+for i in ${_excl_links}; 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"