svn commit: r306872 - head/java/javavmwrapper
Jung-uk Kim
jkim at FreeBSD.org
Fri Nov 2 17:12:09 UTC 2012
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"
More information about the svn-ports-head
mailing list