Date: Tue, 13 Sep 2016 20:29:55 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> 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 Message-ID: <201609132029.u8DKTtYb044520@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609132029.u8DKTtYb044520>