summaryrefslogtreecommitdiff
path: root/archivers
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2017-02-28 14:58:09 +0000
committerjoerg <joerg@pkgsrc.org>2017-02-28 14:58:09 +0000
commitf4aeece676e6eaf265d222a5325a5276dc5da30d (patch)
tree2fa70d9bd6fef270635378f7e9d44e056d3fa5c2 /archivers
parent73c669c4e41f48de4ed9ea2ea9d5bc4608b87238 (diff)
downloadpkgsrc-f4aeece676e6eaf265d222a5325a5276dc5da30d.tar.gz
Recognize newer libarchive versions.
Diffstat (limited to 'archivers')
-rw-r--r--archivers/libarchive/builtin.mk13
1 files changed, 10 insertions, 3 deletions
diff --git a/archivers/libarchive/builtin.mk b/archivers/libarchive/builtin.mk
index 7dc1547ef6b..0fb65dd85e5 100644
--- a/archivers/libarchive/builtin.mk
+++ b/archivers/libarchive/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.5 2013/11/23 10:51:09 obache Exp $
+# $NetBSD: builtin.mk,v 1.6 2017/02/28 14:58:09 joerg Exp $
BUILTIN_PKG:= libarchive
@@ -33,11 +33,18 @@ BUILTIN_VERSION.libarchive!= \
if (found == 0) \
found=1; \
} \
- /\#define[ ]*ARCHIVE_VERSION_STRING/ { \
- vers_str = $$4; \
+ /\#define[ ]*ARCHIVE_VERSION_ONLY_STRING/ { \
+ vers_str = $$3; \
gsub("\"", "", vers_str); \
found=2; \
} \
+ /\#define[ ]*ARCHIVE_VERSION_STRING/ { \
+ if (found == 0) { \
+ vers_str = $$4; \
+ gsub("\"", "", vers_str); \
+ found=2; \
+ } \
+ } \
END { \
if (!found) \
print; \