Module Name: src
Committed By: wiz
Date: Thu Jan 30 06:49:16 UTC 2014
Modified Files:
src/distrib/sets/lists/comp: mi
src/lib/libz: Makefile
Added Files:
src/lib/libz: zlib.pc
Log Message:
Install a pkg-config file for zlib.
To generate a diff of this commit:
cvs rdiff -u -r1.1876 -r1.1877 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.21 -r1.22 src/lib/libz/Makefile
cvs rdiff -u -r0 -r1.1 src/lib/libz/zlib.pc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1876 src/distrib/sets/lists/comp/mi:1.1877
--- src/distrib/sets/lists/comp/mi:1.1876 Sun Jan 26 21:33:54 2014
+++ src/distrib/sets/lists/comp/mi Thu Jan 30 06:49:16 2014
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1876 2014/01/26 21:33:54 joerg Exp $
+# $NetBSD: mi,v 1.1877 2014/01/30 06:49:16 wiz Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -3959,6 +3959,7 @@
./usr/lib/pkgconfig/lutok.pc comp-crypto-lib kyua,share
./usr/lib/pkgconfig/openssl.pc comp-crypto-lib crypto,share
./usr/lib/pkgconfig/sqlite3.pc comp-c-lib
+./usr/lib/pkgconfig/zlib.pc comp-c-lib
./usr/libdata/ldscripts/kmodule comp-util-share binutils,kmod
./usr/libdata/lint/llib-larchive.ln comp-c-lintlib lint
./usr/libdata/lint/llib-lasn1.ln comp-krb5-lintlib lint,kerberos
Index: src/lib/libz/Makefile
diff -u src/lib/libz/Makefile:1.21 src/lib/libz/Makefile:1.22
--- src/lib/libz/Makefile:1.21 Wed Mar 21 10:08:31 2012
+++ src/lib/libz/Makefile Thu Jan 30 06:49:16 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2012/03/21 10:08:31 matt Exp $
+# $NetBSD: Makefile,v 1.22 2014/01/30 06:49:16 wiz Exp $
WARNS= 3
@@ -22,6 +22,12 @@ CLEANFILES+= minigzip
INCS= zconf.h zlib.h
INCSDIR= /usr/include
+FILES+= zlib.pc
+FILESOWN_zlib.pc= ${BINOWN}
+FILESGRP_zlib.pc= ${BINGRP}
+FILESMODE_zlib.pc= ${NONBINMODE}
+FILESDIR_zlib.pc= /usr/lib/pkgconfig
+
.include <bsd.lib.mk>
test: minigzip
Added files:
Index: src/lib/libz/zlib.pc
diff -u /dev/null src/lib/libz/zlib.pc:1.1
--- /dev/null Thu Jan 30 06:49:16 2014
+++ src/lib/libz/zlib.pc Thu Jan 30 06:49:16 2014
@@ -0,0 +1,13 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+sharedlibdir=${libdir}
+includedir=${prefix}/include
+
+Name: zlib
+Description: zlib compression library
+Version: 1.2.3
+
+Requires:
+Libs: -L${libdir} -L${sharedlibdir} -lz
+Cflags: -I${includedir}
