CVS commit: pkgsrc/archivers/libarchive

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Tue Feb 28 14:58:09 UTC 2017

Modified Files:
        pkgsrc/archivers/libarchive: builtin.mk

Log Message:
Recognize newer libarchive versions.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/archivers/libarchive/builtin.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/archivers/libarchive/builtin.mk
diff -u pkgsrc/archivers/libarchive/builtin.mk:1.5 pkgsrc/archivers/libarchive/builtin.mk:1.6
--- pkgsrc/archivers/libarchive/builtin.mk:1.5  Sat Nov 23 10:51:09 2013
+++ pkgsrc/archivers/libarchive/builtin.mk      Tue Feb 28 14:58:09 2017
@@ -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;                                  \