diff options
author | joerg <joerg@pkgsrc.org> | 2017-02-28 14:58:09 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2017-02-28 14:58:09 +0000 |
commit | 79497711ad3eb604ad936708136e99087cead543 (patch) | |
tree | fbe35c266aa2701df1c15df121c6a486b2395c78 /archivers | |
parent | c08fd83ac2957610c5e38415c2ce52354cbba6f1 (diff) | |
download | pkgsrc-79497711ad3eb604ad936708136e99087cead543.tar.gz |
Recognize newer libarchive versions.
Diffstat (limited to 'archivers')
-rw-r--r-- | archivers/libarchive/builtin.mk | 13 |
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; \ |