Module Name: src
Committed By: joerg
Date: Tue Nov 2 19:12:48 UTC 2010
Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/comp: mi
src/etc/mtree: NetBSD.dist.base
src/external/public-domain/xz/lib: Makefile
Log Message:
Install XZ's header files.
To generate a diff of this commit:
cvs rdiff -u -r1.885 -r1.886 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.1519 -r1.1520 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.54 -r1.55 src/etc/mtree/NetBSD.dist.base
cvs rdiff -u -r1.1 -r1.2 src/external/public-domain/xz/lib/Makefile
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/base/mi
diff -u src/distrib/sets/lists/base/mi:1.885 src/distrib/sets/lists/base/mi:1.886
--- src/distrib/sets/lists/base/mi:1.885 Tue Nov 2 16:34:33 2010
+++ src/distrib/sets/lists/base/mi Tue Nov 2 19:12:46 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.885 2010/11/02 16:34:33 joerg Exp $
+# $NetBSD: mi,v 1.886 2010/11/02 19:12:46 joerg Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -775,6 +775,7 @@
./usr/include/kerberosIV base-obsolete obsolete
./usr/include/krb5 base-c-usr
./usr/include/libmilter base-obsolete obsolete
+./usr/include/lzma base-c-usr
./usr/include/machine base-c-usr
./usr/include/milter base-obsolete obsolete
./usr/include/miscfs base-c-usr
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1519 src/distrib/sets/lists/comp/mi:1.1520
--- src/distrib/sets/lists/comp/mi:1.1519 Tue Nov 2 16:34:34 2010
+++ src/distrib/sets/lists/comp/mi Tue Nov 2 19:12:47 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1519 2010/11/02 16:34:34 joerg Exp $
+# $NetBSD: mi,v 1.1520 2010/11/02 19:12:47 joerg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1406,6 +1406,21 @@
./usr/include/lwp.h comp-c-include
./usr/include/lzf.h comp-c-include
./usr/include/lzfP.h comp-c-include
+./usr/include/lzma.h comp-c-include
+./usr/include/lzma/base.h comp-c-include
+./usr/include/lzma/bcj.h comp-c-include
+./usr/include/lzma/block.h comp-c-include
+./usr/include/lzma/check.h comp-c-include
+./usr/include/lzma/container.h comp-c-include
+./usr/include/lzma/delta.h comp-c-include
+./usr/include/lzma/filter.h comp-c-include
+./usr/include/lzma/hardware.h comp-c-include
+./usr/include/lzma/index.h comp-c-include
+./usr/include/lzma/index_hash.h comp-c-include
+./usr/include/lzma/lzma.h comp-c-include
+./usr/include/lzma/stream_flags.h comp-c-include
+./usr/include/lzma/version.h comp-c-include
+./usr/include/lzma/vli.h comp-c-include
./usr/include/magic.h comp-c-include
./usr/include/malloc.h comp-c-include
./usr/include/math.h comp-c-include
Index: src/etc/mtree/NetBSD.dist.base
diff -u src/etc/mtree/NetBSD.dist.base:1.54 src/etc/mtree/NetBSD.dist.base:1.55
--- src/etc/mtree/NetBSD.dist.base:1.54 Sun Oct 31 11:52:53 2010
+++ src/etc/mtree/NetBSD.dist.base Tue Nov 2 19:12:48 2010
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.base,v 1.54 2010/10/31 11:52:53 mbalmer Exp $
+# $NetBSD: NetBSD.dist.base,v 1.55 2010/11/02 19:12:48 joerg Exp $
# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
# Do not customize this file as it may be overwritten on upgrades.
@@ -125,6 +125,7 @@
./usr/include/isofs/cd9660
./usr/include/kadm5
./usr/include/krb5
+./usr/include/lzma
./usr/include/miscfs
./usr/include/miscfs/fdesc
./usr/include/miscfs/fifofs
Index: src/external/public-domain/xz/lib/Makefile
diff -u src/external/public-domain/xz/lib/Makefile:1.1 src/external/public-domain/xz/lib/Makefile:1.2
--- src/external/public-domain/xz/lib/Makefile:1.1 Tue Nov 2 16:34:36 2010
+++ src/external/public-domain/xz/lib/Makefile Tue Nov 2 19:12:48 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/11/02 16:34:36 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2010/11/02 19:12:48 joerg Exp $
LIB= lzma
USE_SHLIBDIR= yes
@@ -6,6 +6,24 @@
.include <bsd.init.mk>
+# There are two different lzma.h files.
+# Copy public version to distinguish them.
+pub-lzma.h: ${XZSRCDIR}/src/liblzma/api/lzma.h
+ ${_MKTARGET_CREATE}
+ rm -f ${.TARGET}
+ ${TOOL_CAT} ${XZSRCDIR}/src/liblzma/api/lzma.h > ${.TARGET}
+CLEANFILES+= pub-lzma.h
+INCS= pub-lzma.h
+INCSDIR_pub-lzma.h= /usr/include
+INCSNAME_pub-lzma.h= lzma.h
+
+.PATH: ${XZSRCDIR}/src/liblzma/api/lzma
+INCS+= base.h bcj.h block.h check.h container.h delta.h \
+ filter.h hardware.h index.h index_hash.h lzma.h stream_flags.h \
+ version.h vli.h
+
+INCSDIR= /usr/include/lzma
+
LDFLAGS+= -Wl,-z,defs
CPPFLAGS+= -I${XZSRCDIR}/src/liblzma/check
