diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2016-09-13 20:29:54 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2016-09-13 20:29:54 +0000 |
| commit | e7badd6689ca38822327cd03ba29284bbb94e8dc (patch) | |
| tree | af22d4127cb741bc662b6fddf94ef313324e8d62 /ports-mgmt/pkg | |
| parent | e2fcb8e689c2b8d9f96a2b29e8fe67fc6df209ea (diff) | |
| download | ports-e7badd6689ca38822327cd03ba29284bbb94e8dc.tar.gz ports-e7badd6689ca38822327cd03ba29284bbb94e8dc.zip | |
Notes
Diffstat (limited to 'ports-mgmt/pkg')
| -rw-r--r-- | ports-mgmt/pkg/Makefile | 2 | ||||
| -rw-r--r-- | ports-mgmt/pkg/files/patch-javavmwrapper | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile index 888d5f3e7e4b..9d7822010815 100644 --- a/ports-mgmt/pkg/Makefile +++ b/ports-mgmt/pkg/Makefile @@ -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}/ \ diff --git a/ports-mgmt/pkg/files/patch-javavmwrapper b/ports-mgmt/pkg/files/patch-javavmwrapper index b09773acb892..1d3c37c0c041 100644 --- a/ports-mgmt/pkg/files/patch-javavmwrapper +++ b/ports-mgmt/pkg/files/patch-javavmwrapper @@ -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) |