From owner-svn-ports-head@freebsd.org Sun Jul 31 12:30:25 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E3A3DBA2DFB; Sun, 31 Jul 2016 12:30:25 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 92C3118AF; Sun, 31 Jul 2016 12:30:25 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6VCUOi5050363; Sun, 31 Jul 2016 12:30:24 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6VCUOXd050360; Sun, 31 Jul 2016 12:30:24 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201607311230.u6VCUOXd050360@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sun, 31 Jul 2016 12:30:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r419364 - in head/java/javavmwrapper: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 Jul 2016 12:30:26 -0000 Author: bapt Date: Sun Jul 31 12:30:24 2016 New Revision: 419364 URL: https://svnweb.freebsd.org/changeset/ports/419364 Log: 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 MFH: 2016Q3 Modified: head/java/javavmwrapper/Makefile head/java/javavmwrapper/files/pkg-install.in head/java/javavmwrapper/pkg-plist Modified: head/java/javavmwrapper/Makefile ============================================================================== --- head/java/javavmwrapper/Makefile Sun Jul 31 12:17:00 2016 (r419363) +++ head/java/javavmwrapper/Makefile Sun Jul 31 12:30:24 2016 (r419364) @@ -3,6 +3,7 @@ PORTNAME= javavmwrapper PORTVERSION= 2.5 +PORTREVISION= 1 CATEGORIES= java MASTER_SITES= # none DISTFILES= # none Modified: head/java/javavmwrapper/files/pkg-install.in ============================================================================== --- head/java/javavmwrapper/files/pkg-install.in Sun Jul 31 12:17:00 2016 (r419363) +++ head/java/javavmwrapper/files/pkg-install.in Sun Jul 31 12:30:24 2016 (r419364) @@ -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: head/java/javavmwrapper/pkg-plist ============================================================================== --- head/java/javavmwrapper/pkg-plist Sun Jul 31 12:17:00 2016 (r419363) +++ head/java/javavmwrapper/pkg-plist Sun Jul 31 12:30:24 2016 (r419364) @@ -4,7 +4,7 @@ bin/javavm bin/manvm bin/registervm bin/unregistervm -etc/javavm_opts.conf.dist +@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