[pkgsrc/trunk]: pkgsrc/archivers/libarchive Recognize newer libarchive versions.

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/13c48bae440c
branches:  trunk
changeset: 359135:13c48bae440c
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Feb 28 14:58:09 2017 +0000

description:
Recognize newer libarchive versions.

diffstat:

 archivers/libarchive/builtin.mk |  13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r 0f6065c2189d -r 13c48bae440c archivers/libarchive/builtin.mk
--- a/archivers/libarchive/builtin.mk   Tue Feb 28 14:41:36 2017 +0000
+++ b/archivers/libarchive/builtin.mk   Tue Feb 28 14:58:09 2017 +0000
@@ -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 @@
                        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;                                  \