[src/trunk]: src Install XZ's header files.

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/491be627e527
branches:  trunk
changeset: 758343:491be627e527
user:      joerg <joerg%NetBSD.org@localhost>
date:      Tue Nov 02 19:12:46 2010 +0000

description:
Install XZ's header files.

diffstat:

 distrib/sets/lists/base/mi             |   3 ++-
 distrib/sets/lists/comp/mi             |  17 ++++++++++++++++-
 etc/mtree/NetBSD.dist.base             |   3 ++-
 external/public-domain/xz/lib/Makefile |  20 +++++++++++++++++++-
 4 files changed, 39 insertions(+), 4 deletions(-)

diffs (99 lines):

diff -r 0f5500c1a1e7 -r 491be627e527 distrib/sets/lists/base/mi
--- a/distrib/sets/lists/base/mi        Tue Nov 02 18:18:07 2010 +0000
+++ b/distrib/sets/lists/base/mi        Tue Nov 02 19:12:46 2010 +0000
@@ -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
diff -r 0f5500c1a1e7 -r 491be627e527 distrib/sets/lists/comp/mi
--- a/distrib/sets/lists/comp/mi        Tue Nov 02 18:18:07 2010 +0000
+++ b/distrib/sets/lists/comp/mi        Tue Nov 02 19:12:46 2010 +0000
@@ -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
diff -r 0f5500c1a1e7 -r 491be627e527 etc/mtree/NetBSD.dist.base
--- a/etc/mtree/NetBSD.dist.base        Tue Nov 02 18:18:07 2010 +0000
+++ b/etc/mtree/NetBSD.dist.base        Tue Nov 02 19:12:46 2010 +0000
@@ -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
diff -r 0f5500c1a1e7 -r 491be627e527 external/public-domain/xz/lib/Makefile
--- a/external/public-domain/xz/lib/Makefile    Tue Nov 02 18:18:07 2010 +0000
+++ b/external/public-domain/xz/lib/Makefile    Tue Nov 02 19:12:46 2010 +0000
@@ -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