Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 4560A7A27F for ; Tue, 28 Feb 2017 14:58:11 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id E4270855FB; Tue, 28 Feb 2017 14:58:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 7322D855DA for ; Tue, 28 Feb 2017 14:58:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 2xamL64fJbpN for ; Tue, 28 Feb 2017 14:58:10 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id CDDA8855A8 for ; Tue, 28 Feb 2017 14:58:09 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id C926FFBE4; Tue, 28 Feb 2017 14:58:09 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1488293889120760" MIME-Version: 1.0 Date: Tue, 28 Feb 2017 14:58:09 +0000 From: "Joerg Sonnenberger" Subject: CVS commit: pkgsrc/archivers/libarchive To: pkgsrc-changes@NetBSD.org Reply-To: joerg@netbsd.org X-Mailer: log_accum Message-Id: <20170228145809.C926FFBE4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1488293889120760 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. --_----------=_1488293889120760 Content-Disposition: inline Content-Length: 1034 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii 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; \ --_----------=_1488293889120760--