From owner-svn-src-all@FreeBSD.ORG Sat Jan 10 00:11:12 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5458CA3C; Sat, 10 Jan 2015 00:11:12 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 35B28271; Sat, 10 Jan 2015 00:11:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0A0BCHI072378; Sat, 10 Jan 2015 00:11:12 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0A0BBoj072372; Sat, 10 Jan 2015 00:11:11 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201501100011.t0A0BBoj072372@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 10 Jan 2015 00:11:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r276898 - in head: contrib/xz contrib/xz/src/liblzma lib/liblzma X-SVN-Group: head 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.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Jan 2015 00:11:12 -0000 Author: bapt Date: Sat Jan 10 00:11:10 2015 New Revision: 276898 URL: https://svnweb.freebsd.org/changeset/base/276898 Log: Install the liblzma pkg-config file MFC after: 1 week Added: head/contrib/xz/src/liblzma/liblzma.pc.in - copied unchanged from r276897, vendor/xz/dist/src/liblzma/liblzma.pc.in Modified: head/contrib/xz/FREEBSD-Xlist head/lib/liblzma/Makefile Directory Properties: head/contrib/xz/ (props changed) Modified: head/contrib/xz/FREEBSD-Xlist ============================================================================== --- head/contrib/xz/FREEBSD-Xlist Sat Jan 10 00:07:34 2015 (r276897) +++ head/contrib/xz/FREEBSD-Xlist Sat Jan 10 00:11:10 2015 (r276898) @@ -32,7 +32,6 @@ macosx/ makefile.am po/ src/*/*.rc -src/liblzma/liblzma.pc.in src/scripts/ tests/ version.sh Copied: head/contrib/xz/src/liblzma/liblzma.pc.in (from r276897, vendor/xz/dist/src/liblzma/liblzma.pc.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/contrib/xz/src/liblzma/liblzma.pc.in Sat Jan 10 00:11:10 2015 (r276898, copy of r276897, vendor/xz/dist/src/liblzma/liblzma.pc.in) @@ -0,0 +1,19 @@ +# +# Author: Lasse Collin +# +# This file has been put into the public domain. +# You can do whatever you want with this file. +# + +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: liblzma +Description: General purpose data compression library +URL: @PACKAGE_URL@ +Version: @PACKAGE_VERSION@ +Cflags: -I${includedir} +Libs: -L${libdir} -llzma +Libs.private: @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ Modified: head/lib/liblzma/Makefile ============================================================================== --- head/lib/liblzma/Makefile Sat Jan 10 00:07:34 2015 (r276897) +++ head/lib/liblzma/Makefile Sat Jan 10 00:11:10 2015 (r276898) @@ -117,7 +117,16 @@ SRCS+= simple_coder.c \ arm.c \ armthumb.c \ sparc.c - + +.PATH: ${LZMADIR} + +VERSION_MAJOR!= awk '$$1 == "\#define" && $$2 == "LZMA_VERSION_MAJOR" {print $$3 } ' \ + ${LZMADIR}/api/lzma/version.h +VERSION_MINOR!= awk '$$1 == "\#define" && $$2 == "LZMA_VERSION_MINOR" {print $$3 } ' \ + ${LZMADIR}/api/lzma/version.h +VERSION_PATCH!= awk '$$1 == "\#define" && $$2 == "LZMA_VERSION_PATCH" {print $$3 } ' \ + ${LZMADIR}/api/lzma/version.h + WARNS?= 3 CFLAGS+= -DHAVE_CONFIG_H \ @@ -137,4 +146,21 @@ VERSION_DEF= ${.CURDIR}/Versions.def SYMBOL_MAPS= ${.CURDIR}/Symbol.map CFLAGS+= -DSYMBOL_VERSIONING +CLEANFILES+= liblzma.pc + +all: liblzma.pc +liblzma.pc: liblzma.pc.in + @sed -e 's,@prefix@,/usr,g ; \ + s,@exec_prefix@,/usr,g ; \ + s,@libdir@,${LIBDIR},g ; \ + s,@includedir@,${INCLUDEDIR},g ; \ + s,@PACKAGE_URL@,http://tukaani.org/xz/,g ; \ + s,@PACKAGE_VERSION@,${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH},g ; \ + s,@PTHREAD_CFLAGS@,,g ; \ + s,@PTHREAD_LIBS@,,g' ${.ALLSRC} > ${.TARGET} + +beforeinstall: + @${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + liblzma.pc ${DESTDIR}${LIBDATADIR}/pkgconfig + .include