From owner-svn-ports-all@freebsd.org Tue Sep 13 20:29:56 2016 Return-Path: Delivered-To: svn-ports-all@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 1F4D2BD9AA1; Tue, 13 Sep 2016 20:29:56 +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 E451DB62; Tue, 13 Sep 2016 20:29:55 +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 u8DKTt1k044522; Tue, 13 Sep 2016 20:29:55 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8DKTtYb044520; Tue, 13 Sep 2016 20:29:55 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201609132029.u8DKTtYb044520@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Tue, 13 Sep 2016 20:29:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r422083 - in head/ports-mgmt/pkg: . 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-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Sep 2016 20:29:56 -0000 Author: bapt Date: Tue Sep 13 20:29:54 2016 New Revision: 422083 URL: https://svnweb.freebsd.org/changeset/ports/422083 Log: Add javavmwrapper 2.5_1 to the list of buggy scripts Modified: head/ports-mgmt/pkg/Makefile head/ports-mgmt/pkg/files/patch-javavmwrapper Modified: head/ports-mgmt/pkg/Makefile ============================================================================== --- head/ports-mgmt/pkg/Makefile Tue Sep 13 20:28:17 2016 (r422082) +++ head/ports-mgmt/pkg/Makefile Tue Sep 13 20:29:54 2016 (r422083) @@ -3,7 +3,7 @@ PORTNAME= pkg DISTVERSION= 1.8.7 _PKG_VERSION= ${DISTVERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= ports-mgmt MASTER_SITES= \ http://files.etoilebsd.net/${PORTNAME}/ \ Modified: head/ports-mgmt/pkg/files/patch-javavmwrapper ============================================================================== --- head/ports-mgmt/pkg/files/patch-javavmwrapper Tue Sep 13 20:28:17 2016 (r422082) +++ head/ports-mgmt/pkg/files/patch-javavmwrapper Tue Sep 13 20:29:54 2016 (r422083) @@ -2,7 +2,7 @@ diff --git libpkg/pkg_add.c libpkg/pkg_a index 87fb248..778336c 100644 --- libpkg/pkg_add.c +++ libpkg/pkg_add.c -@@ -859,14 +859,20 @@ pkg_add_cleanup_old(struct pkgdb *db, struct pkg *old, struct pkg *new, int flag +@@ -859,14 +859,21 @@ pkg_add_cleanup_old(struct pkgdb *db, struct pkg *old, struct pkg *new, int flag * Execute pre deinstall scripts */ if ((flags & PKG_ADD_NOSCRIPT) == 0) { @@ -16,7 +16,8 @@ index 87fb248..778336c 100644 - ret = EPKG_OK; + bool buggydeinstall = false; + if (strcmp(old->name, "javavmwrapper") == 0 && -+ strcmp(old->version, "2.5") == 0) ++ (strcmp(old->version, "2.5") == 0 || ++ strcmp(old->version, "2.5_1") == 0)) + buggydeinstall = true; + if (!buggydeinstall) { + if ((flags & PKG_ADD_USE_UPGRADE_SCRIPTS) == PKG_ADD_USE_UPGRADE_SCRIPTS)