diff options
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/pkg-devel/Makefile | 3 | ||||
| -rw-r--r-- | ports-mgmt/pkg-devel/distinfo | 4 | ||||
| -rw-r--r-- | ports-mgmt/pkg-devel/files/patch-libpkg_pkg_config | 28 | ||||
| -rw-r--r-- | ports-mgmt/pkg/Makefile | 3 | ||||
| -rw-r--r-- | ports-mgmt/pkg/distinfo | 4 | ||||
| -rw-r--r-- | ports-mgmt/pkg/files/patch-libpkg_pkg_config | 28 |
6 files changed, 6 insertions, 64 deletions
diff --git a/ports-mgmt/pkg-devel/Makefile b/ports-mgmt/pkg-devel/Makefile index d172d25e6b65..4fcb46a40875 100644 --- a/ports-mgmt/pkg-devel/Makefile +++ b/ports-mgmt/pkg-devel/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= pkg -DISTVERSION= 1.2.4 -PORTREVISION= 1 +DISTVERSION= 1.2.5 CATEGORIES= ports-mgmt MASTER_SITES= http://files.etoilebsd.net/pkg/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ diff --git a/ports-mgmt/pkg-devel/distinfo b/ports-mgmt/pkg-devel/distinfo index 4a47bfcce5ab..3cc2e6bb179b 100644 --- a/ports-mgmt/pkg-devel/distinfo +++ b/ports-mgmt/pkg-devel/distinfo @@ -1,2 +1,2 @@ -SHA256 (pkg-1.2.4.tar.xz) = d6f838f94912893be9ea6e61d72515b7c7e63d5cd4a3084bfe7cbc2e909876cb -SIZE (pkg-1.2.4.tar.xz) = 1808120 +SHA256 (pkg-1.2.5.tar.xz) = ea6f1c95b8fcc1a017979949fc8f06f218f4412c5ec1ddcc4858d0b751759d6c +SIZE (pkg-1.2.5.tar.xz) = 1808040 diff --git a/ports-mgmt/pkg-devel/files/patch-libpkg_pkg_config b/ports-mgmt/pkg-devel/files/patch-libpkg_pkg_config deleted file mode 100644 index 208477937f38..000000000000 --- a/ports-mgmt/pkg-devel/files/patch-libpkg_pkg_config +++ /dev/null @@ -1,28 +0,0 @@ ---- libpkg/pkg_config.c.orig 2013-12-16 08:52:39.000000000 +0100 -+++ libpkg/pkg_config.c 2013-12-16 12:09:13.093549000 +0100 -@@ -293,6 +293,7 @@ - static size_t c_size = sizeof(c) / sizeof(struct config_entry); - - static void pkg_config_kv_free(struct pkg_config_kv *); -+static void pkg_config_value_free(struct pkg_config_value *); - static void pkg_config_free(struct pkg_config *conf); - static struct pkg_repo *pkg_repo_new(const char *name, const char *url); - -@@ -440,7 +441,7 @@ - continue; - } - if (!conf->fromenv) { -- pkg_config_free(conf); -+ HASH_FREE(conf->list, pkg_config_value, pkg_config_value_free); - conf->list = NULL; - obj_walk_array(cur, conf); - } -@@ -452,7 +453,7 @@ - continue; - } - if (!conf->fromenv) { -- pkg_config_free(conf); -+ HASH_FREE(conf->kvlist, pkg_config_kv, pkg_config_kv_free); - conf->kvlist = NULL; - obj_walk_object(cur, conf); - } diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile index d73eebac927f..1a3f27b0fca4 100644 --- a/ports-mgmt/pkg/Makefile +++ b/ports-mgmt/pkg/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= pkg -DISTVERSION= 1.2.4 -PORTREVISION= 1 +DISTVERSION= 1.2.5 CATEGORIES= ports-mgmt MASTER_SITES= http://files.etoilebsd.net/pkg/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ diff --git a/ports-mgmt/pkg/distinfo b/ports-mgmt/pkg/distinfo index 4a47bfcce5ab..3cc2e6bb179b 100644 --- a/ports-mgmt/pkg/distinfo +++ b/ports-mgmt/pkg/distinfo @@ -1,2 +1,2 @@ -SHA256 (pkg-1.2.4.tar.xz) = d6f838f94912893be9ea6e61d72515b7c7e63d5cd4a3084bfe7cbc2e909876cb -SIZE (pkg-1.2.4.tar.xz) = 1808120 +SHA256 (pkg-1.2.5.tar.xz) = ea6f1c95b8fcc1a017979949fc8f06f218f4412c5ec1ddcc4858d0b751759d6c +SIZE (pkg-1.2.5.tar.xz) = 1808040 diff --git a/ports-mgmt/pkg/files/patch-libpkg_pkg_config b/ports-mgmt/pkg/files/patch-libpkg_pkg_config deleted file mode 100644 index 208477937f38..000000000000 --- a/ports-mgmt/pkg/files/patch-libpkg_pkg_config +++ /dev/null @@ -1,28 +0,0 @@ ---- libpkg/pkg_config.c.orig 2013-12-16 08:52:39.000000000 +0100 -+++ libpkg/pkg_config.c 2013-12-16 12:09:13.093549000 +0100 -@@ -293,6 +293,7 @@ - static size_t c_size = sizeof(c) / sizeof(struct config_entry); - - static void pkg_config_kv_free(struct pkg_config_kv *); -+static void pkg_config_value_free(struct pkg_config_value *); - static void pkg_config_free(struct pkg_config *conf); - static struct pkg_repo *pkg_repo_new(const char *name, const char *url); - -@@ -440,7 +441,7 @@ - continue; - } - if (!conf->fromenv) { -- pkg_config_free(conf); -+ HASH_FREE(conf->list, pkg_config_value, pkg_config_value_free); - conf->list = NULL; - obj_walk_array(cur, conf); - } -@@ -452,7 +453,7 @@ - continue; - } - if (!conf->fromenv) { -- pkg_config_free(conf); -+ HASH_FREE(conf->kvlist, pkg_config_kv, pkg_config_kv_free); - conf->kvlist = NULL; - obj_walk_object(cur, conf); - } |