cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add javavmwrapper 2.5_1 to the list of buggy scripts

Browse Source
This commit is contained in:
Baptiste Daroussin 2016-09-13 20:29:54 +00:00
parent e2fcb8e689
commit e7badd6689
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=422083
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports-mgmt/pkg/Makefile
View File

@ -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}/ \

5
ports-mgmt/pkg/files/patch-javavmwrapper
View File

@ -2,7 +2,7 @@ diff --git libpkg/pkg_add.c libpkg/pkg_add.c
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)