From owner-svn-src-all@freebsd.org  Tue May 12 01:47:34 2020
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2C0112DE640;
 Tue, 12 May 2020 01:47:34 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 49LgfZ0S9Rz4WqC;
 Tue, 12 May 2020 01:47:34 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0ADE5A8;
 Tue, 12 May 2020 01:47:34 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04C1lX8V004311;
 Tue, 12 May 2020 01:47:33 GMT (envelope-from delphij@FreeBSD.org)
Received: (from delphij@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04C1lXdV004310;
 Tue, 12 May 2020 01:47:33 GMT (envelope-from delphij@FreeBSD.org)
Message-Id: <202005120147.04C1lXdV004310@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: delphij set sender to
 delphij@FreeBSD.org using -f
From: Xin LI <delphij@FreeBSD.org>
Date: Tue, 12 May 2020 01:47:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r360952 - head/lib/libz
X-SVN-Group: head
X-SVN-Commit-Author: delphij
X-SVN-Commit-Paths: head/lib/libz
X-SVN-Commit-Revision: 360952
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 12 May 2020 01:47:34 -0000

Author: delphij
Date: Tue May 12 01:47:33 2020
New Revision: 360952
URL: https://svnweb.freebsd.org/changeset/base/360952

Log:
  Generate zlib.pc from source.
  
  Reviewed by:		bapt
  MFC after:		3 days
  Differential Revision:	https://reviews.freebsd.org/D24806

Deleted:
  head/lib/libz/zlib.pc
Modified:
  head/lib/libz/Makefile

Modified: head/lib/libz/Makefile
==============================================================================
--- head/lib/libz/Makefile	Tue May 12 01:40:48 2020	(r360951)
+++ head/lib/libz/Makefile	Tue May 12 01:47:33 2020	(r360952)
@@ -53,6 +53,17 @@ INCS=		zconf.h zlib.h
 
 .PATH:		${ZLIBSRC}/test
 
+ZLIB_VERSION!=	sed -n '/define.*ZLIB_VERSION/{s,[^0-9.],,gp;q;}' ${ZLIBSRC}/zlib.h
+
+zlib.pc: zlib.pc.in
+	sed -e 's,@prefix@,/usr,g ; \
+		s,@exec_prefix@,$${prefix},g ; \
+		s,@libdir@,$${exec_prefix}/lib,g ; \
+		s,@sharedlibdir@,$${libdir},g ; \
+		s,@includedir@,$${prefix}/include,g ; \
+		s,@VERSION@,${ZLIB_VERSION},g ;' \
+		${.ALLSRC} > ${.TARGET}
+
 minigzip:	all minigzip.o
 	$(CC) -o minigzip minigzip.o -L. -lz