svn commit: r419365 - in branches/2016Q3/java/javavmwrapper: . files

[Baptiste Daroussin]

Author: bapt
Date: Sun Jul 31 12:31:52 2016
New Revision: 419365
URL: https://svnweb.freebsd.org/changeset/ports/419365

Log:
  MFH: r419364
  
  Remove the deinstall script that appears to be deleting all the temporary files
  created by pkg(8) during upgrades
  
  It happens because the deinstall script tries to clean up the potential manual
  VM registration by cleaning out all symlinks to bin/javavm
  
  Given all VM are registring/unregistering themselves this part is not needed
  
  The other thing the script was doing handling the configuration which has been
  replaced by @sample.
  
  pkg-install has been modified to drop the handling of the configuration file but
  keep the auto registration if all VM found. While this part is not necessary as
  well, we keep it because otherwise anyone doing delete/install on javavmwapper
  version 2.5 being the installed version would end up with all VM unregistered.
  
  The pkg-install should be removed after EOL of FreeBSD 10.3
  
  PR:		210313

Modified:
  branches/2016Q3/java/javavmwrapper/Makefile
  branches/2016Q3/java/javavmwrapper/files/pkg-install.in
  branches/2016Q3/java/javavmwrapper/pkg-plist
Directory Properties:
  branches/2016Q3/   (props changed)

Modified: branches/2016Q3/java/javavmwrapper/Makefile
==============================================================================
--- branches/2016Q3/java/javavmwrapper/Makefile	Sun Jul 31 12:30:24 2016	(r419364)
+++ branches/2016Q3/java/javavmwrapper/Makefile	Sun Jul 31 12:31:52 2016	(r419365)
@@ -3,6 +3,7 @@
 
 PORTNAME=	javavmwrapper
 PORTVERSION=	2.5
+PORTREVISION=	1
 CATEGORIES=	java
 MASTER_SITES=	# none
 DISTFILES=	# none

Modified: branches/2016Q3/java/javavmwrapper/files/pkg-install.in
==============================================================================
--- branches/2016Q3/java/javavmwrapper/files/pkg-install.in	Sun Jul 31 12:30:24 2016	(r419364)
+++ branches/2016Q3/java/javavmwrapper/files/pkg-install.in	Sun Jul 31 12:31:52 2016	(r419365)
@@ -9,17 +9,6 @@ if [ "x${2}" != "xPOST-INSTALL" ]; then
     exit 0
 fi
 
-# The option configuration file
-OPTION_CONF="${PKG_PREFIX}/etc/javavm_opts.conf"
-
-# Install default javavm options configuration
-if [ ! -e "${OPTION_CONF}" ]; then
-    cp "${OPTION_CONF}.dist" "${OPTION_CONF}"
-else
-    echo "${OPTION_CONF} already exists - not installing."
-    echo "You may need to hand merge changes."
-fi
-
 # Ensure all JDKs and JREs are installed
 _excl_dirs='bootstrap-openjdk'
 _find_expr='-depth 2 -regex .*/bin/java'

Modified: branches/2016Q3/java/javavmwrapper/pkg-plist
==============================================================================
--- branches/2016Q3/java/javavmwrapper/pkg-plist	Sun Jul 31 12:30:24 2016	(r419364)
+++ branches/2016Q3/java/javavmwrapper/pkg-plist	Sun Jul 31 12:31:52 2016	(r419365)
@@ -4,7 +4,7 @@ bin/javavm
 bin/manvm
 bin/registervm
 bin/unregistervm
-etc/javavm_opts.conf.dist
+ at sample etc/javavm_opts.conf.dist etc/javavm_opts.conf
 man/man1/checkvms.1.gz
 man/man1/javavm.1.gz
 man/man1/manvm.1.gz