[pkgsrc/trunk]: pkgsrc/archivers/libarchive Fix builtin.mk for libarchive-2.5...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c5c59700f77e
branches:  trunk
changeset: 540955:c5c59700f77e
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Apr 11 20:37:06 2008 +0000

description:
Fix builtin.mk for libarchive-2.5.0 and newer.

diffstat:

 archivers/libarchive/builtin.mk |  19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diffs (37 lines):

diff -r a4ed8fd8949d -r c5c59700f77e archivers/libarchive/builtin.mk
--- a/archivers/libarchive/builtin.mk   Fri Apr 11 20:16:23 2008 +0000
+++ b/archivers/libarchive/builtin.mk   Fri Apr 11 20:37:06 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1 2007/08/03 11:18:33 joerg Exp $
+# $NetBSD: builtin.mk,v 1.2 2008/04/11 20:37:06 joerg Exp $
 
 BUILTIN_PKG:=  libarchive
 
@@ -28,14 +28,23 @@
     empty(H_ARCHIVE:M__nonexistent__)
 BUILTIN_VERSION.libarchive!=                                           \
        ${AWK} '/\#define[      ]*ARCHIVE_LIBRARY_VERSION/ {            \
-                       vers = $$4;                                     \
-                       gsub("\"", "", vers);                           \
-                       print vers;                                     \
-                       found=1;                                        \
+                       lib_vers = $$4;                                 \
+                       gsub("\"", "", lib_vers);                       \
+                       if (found == 0)                                 \
+                           found=1;                                    \
+               }                                                       \
+               /\#define[      ]*ARCHIVE_VERSION_STRING/ {             \
+                       vers_str = $$4;                                 \
+                       gsub("\"", "", vers_str);                       \
+                       found=2;                                        \
                }                                                       \
                END {                                                   \
                        if (!found)                                     \
                                print;                                  \
+                       else if (found == 1)                            \
+                               print lib_vers;                         \
+                       else if (found == 2)                            \
+                               print vers_str;                         \
                }                                                       \
        ' ${H_ARCHIVE:Q}
 .  if !empty(BUILTIN_VERSION.libarchive)