aboutsummaryrefslogtreecommitdiffstats
path: root/ports-mgmt
diff options
context:
space:
mode:
Diffstat (limited to 'ports-mgmt')
-rw-r--r--ports-mgmt/pkg-devel/Makefile3
-rw-r--r--ports-mgmt/pkg-devel/distinfo4
-rw-r--r--ports-mgmt/pkg-devel/files/patch-libpkg__pkg_elf.c25
3 files changed, 3 insertions, 29 deletions
diff --git a/ports-mgmt/pkg-devel/Makefile b/ports-mgmt/pkg-devel/Makefile
index 0750f95300c5..418cf5fc1fc4 100644
--- a/ports-mgmt/pkg-devel/Makefile
+++ b/ports-mgmt/pkg-devel/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= pkg
-DISTVERSION= 1.3.0.a7
-PORTREVISION= 1
+DISTVERSION= 1.3.0.a8
CATEGORIES= ports-mgmt
MASTER_SITES= \
http://files.etoilebsd.net/pkg/ \
diff --git a/ports-mgmt/pkg-devel/distinfo b/ports-mgmt/pkg-devel/distinfo
index ea3b0e1cf9e9..3233ca48a6c5 100644
--- a/ports-mgmt/pkg-devel/distinfo
+++ b/ports-mgmt/pkg-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pkg-1.3.0.a7.tar.xz) = 4d37890d17c902f21ee4cf0729e6d97cf69ae3aaabf91084b08059dc9abcb777
-SIZE (pkg-1.3.0.a7.tar.xz) = 1646552
+SHA256 (pkg-1.3.0.a8.tar.xz) = bf47424579f3247f5e212eb799f37eeaaeca14d6a9ef85cf7aee3730e1ef144e
+SIZE (pkg-1.3.0.a8.tar.xz) = 1678324
diff --git a/ports-mgmt/pkg-devel/files/patch-libpkg__pkg_elf.c b/ports-mgmt/pkg-devel/files/patch-libpkg__pkg_elf.c
deleted file mode 100644
index 587a06b94fb2..000000000000
--- a/ports-mgmt/pkg-devel/files/patch-libpkg__pkg_elf.c
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/libpkg/pkg_elf.c b/libpkg/pkg_elf.c
-index 507e09d..b404cc0 100644
---- libpkg/pkg_elf.c
-+++ libpkg/pkg_elf.c
-@@ -640,6 +640,11 @@
- int ret = EPKG_OK;
- int i;
- const char *arch, *abi, *endian_corres_str, *wordsize_corres_str, *fpu;
-+ const char *path;
-+
-+ path = getenv("ABI_FILE");
-+ if (path == NULL)
-+ path = _PATH_BSHELL;
-
- if (elf_version(EV_CURRENT) == EV_NONE) {
- pkg_emit_error("ELF library initialization failed: %s",
-@@ -647,7 +652,7 @@
- return (EPKG_FATAL);
- }
-
-- if ((fd = open(_PATH_BSHELL, O_RDONLY)) < 0) {
-+ if ((fd = open(path, O_RDONLY)) < 0) {
- pkg_emit_errno("open", _PATH_BSHELL);
- snprintf(dest, sz, "%s", "unknown");
- return (EPKG_FATAL);