Tue Nov 2 19:12:48 2010 UTC ()
Install XZ's header files.


(joerg)
diff -r1.885 -r1.886 src/distrib/sets/lists/base/mi
diff -r1.1519 -r1.1520 src/distrib/sets/lists/comp/mi
diff -r1.54 -r1.55 src/etc/mtree/NetBSD.dist.base
diff -r1.1 -r1.2 src/external/public-domain/xz/lib/Makefile
cvs diff -r1.885 -r1.886 src/distrib/sets/lists/base/mi (expand / switch to unified diff)

--- src/distrib/sets/lists/base/mi 2010/11/02 16:34:33 1.885
+++ src/distrib/sets/lists/base/mi 2010/11/02 19:12:46 1.886
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mi,v 1.885 2010/11/02 16:34:33 joerg Exp $ 1# $NetBSD: mi,v 1.886 2010/11/02 19:12:46 joerg Exp $
2# 2#
3# Note: Don't delete entries from here - mark them as "obsolete" instead, 3# Note: Don't delete entries from here - mark them as "obsolete" instead,
4# unless otherwise stated below. 4# unless otherwise stated below.
5# 5#
6# Note: Do not mark "old" major and major.minor shared libraries as 6# Note: Do not mark "old" major and major.minor shared libraries as
7# "obsolete"; just remove the entry, as third-party applications 7# "obsolete"; just remove the entry, as third-party applications
8# may be linked against the old major shared library, and 8# may be linked against the old major shared library, and
9# that is a symlink to the old major.minor shared library. 9# that is a symlink to the old major.minor shared library.
10# e.g., "lib<name>.so.<N>" and "lib<name>.so.<N>.<M>" 10# e.g., "lib<name>.so.<N>" and "lib<name>.so.<N>.<M>"
11# Exceptions to this rule may include shared libraries that 11# Exceptions to this rule may include shared libraries that
12# are dlopen()ed at run-time, such as extra locales, etc. 12# are dlopen()ed at run-time, such as extra locales, etc.
13# 13#
14. base-sys-root 14. base-sys-root
@@ -765,26 +765,27 @@ @@ -765,26 +765,27 @@
765./usr/include/g++/ext base-cxx-usr 765./usr/include/g++/ext base-cxx-usr
766./usr/include/g++/gen base-obsolete obsolete 766./usr/include/g++/gen base-obsolete obsolete
767./usr/include/g++/std base-cxx-usr 767./usr/include/g++/std base-cxx-usr
768./usr/include/g++/tr1 base-cxx-usr 768./usr/include/g++/tr1 base-cxx-usr
769./usr/include/gssapi base-c-usr 769./usr/include/gssapi base-c-usr
770./usr/include/gssapi/rpc base-obsolete obsolete 770./usr/include/gssapi/rpc base-obsolete obsolete
771./usr/include/dev/pci/hdaudio base-c-usr 771./usr/include/dev/pci/hdaudio base-c-usr
772./usr/include/isofs base-c-usr 772./usr/include/isofs base-c-usr
773./usr/include/isofs/cd9660 base-c-usr 773./usr/include/isofs/cd9660 base-c-usr
774./usr/include/kadm5 base-c-usr 774./usr/include/kadm5 base-c-usr
775./usr/include/kerberosIV base-obsolete obsolete 775./usr/include/kerberosIV base-obsolete obsolete
776./usr/include/krb5 base-c-usr 776./usr/include/krb5 base-c-usr
777./usr/include/libmilter base-obsolete obsolete 777./usr/include/libmilter base-obsolete obsolete
 778./usr/include/lzma base-c-usr
778./usr/include/machine base-c-usr 779./usr/include/machine base-c-usr
779./usr/include/milter base-obsolete obsolete 780./usr/include/milter base-obsolete obsolete
780./usr/include/miscfs base-c-usr 781./usr/include/miscfs base-c-usr
781./usr/include/miscfs/fdesc base-c-usr 782./usr/include/miscfs/fdesc base-c-usr
782./usr/include/miscfs/fifofs base-c-usr 783./usr/include/miscfs/fifofs base-c-usr
783./usr/include/miscfs/genfs base-c-usr 784./usr/include/miscfs/genfs base-c-usr
784./usr/include/miscfs/kernfs base-c-usr 785./usr/include/miscfs/kernfs base-c-usr
785./usr/include/miscfs/nullfs base-c-usr 786./usr/include/miscfs/nullfs base-c-usr
786./usr/include/miscfs/overlay base-c-usr 787./usr/include/miscfs/overlay base-c-usr
787./usr/include/miscfs/portal base-obsolete obsolete 788./usr/include/miscfs/portal base-obsolete obsolete
788./usr/include/miscfs/procfs base-c-usr 789./usr/include/miscfs/procfs base-c-usr
789./usr/include/miscfs/ptyfs base-obsolete obsolete 790./usr/include/miscfs/ptyfs base-obsolete obsolete
790./usr/include/miscfs/specfs base-c-usr 791./usr/include/miscfs/specfs base-c-usr
cvs diff -r1.1519 -r1.1520 src/distrib/sets/lists/comp/mi (expand / switch to unified diff)

--- src/distrib/sets/lists/comp/mi 2010/11/02 16:34:34 1.1519
+++ src/distrib/sets/lists/comp/mi 2010/11/02 19:12:47 1.1520
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mi,v 1.1519 2010/11/02 16:34:34 joerg Exp $ 1# $NetBSD: mi,v 1.1520 2010/11/02 19:12:47 joerg Exp $
2# 2#
3# Note: don't delete entries from here - mark them as "obsolete" instead. 3# Note: don't delete entries from here - mark them as "obsolete" instead.
4# 4#
5./etc/mtree/set.comp comp-sys-root 5./etc/mtree/set.comp comp-sys-root
6./usr/bin/addr2line comp-debug-bin binutils 6./usr/bin/addr2line comp-debug-bin binutils
7./usr/bin/ar comp-util-bin binutils 7./usr/bin/ar comp-util-bin binutils
8./usr/bin/as comp-util-bin binutils 8./usr/bin/as comp-util-bin binutils
9./usr/bin/asa comp-fortran-bin 9./usr/bin/asa comp-fortran-bin
10./usr/bin/atf-compile comp-obsolete obsolete 10./usr/bin/atf-compile comp-obsolete obsolete
11./usr/bin/c++ comp-cxx-bin gcccmds 11./usr/bin/c++ comp-cxx-bin gcccmds
12./usr/bin/c++filt comp-cxx-bin binutils 12./usr/bin/c++filt comp-cxx-bin binutils
13./usr/bin/c89 comp-c-bin 13./usr/bin/c89 comp-c-bin
14./usr/bin/c99 comp-c-bin 14./usr/bin/c99 comp-c-bin
@@ -1396,26 +1396,41 @@ @@ -1396,26 +1396,41 @@
1396./usr/include/libmilter/mfdef.h comp-obsolete obsolete 1396./usr/include/libmilter/mfdef.h comp-obsolete obsolete
1397./usr/include/limits.h comp-c-include 1397./usr/include/limits.h comp-c-include
1398./usr/include/link.h comp-c-include 1398./usr/include/link.h comp-c-include
1399./usr/include/link_aout.h comp-c-include 1399./usr/include/link_aout.h comp-c-include
1400./usr/include/link_elf.h comp-c-include 1400./usr/include/link_elf.h comp-c-include
1401./usr/include/locale.h comp-c-include 1401./usr/include/locale.h comp-c-include
1402./usr/include/login_cap.h comp-c-include 1402./usr/include/login_cap.h comp-c-include
1403./usr/include/lua.h comp-c-include 1403./usr/include/lua.h comp-c-include
1404./usr/include/luaconf.h comp-c-include 1404./usr/include/luaconf.h comp-c-include
1405./usr/include/lualib.h comp-c-include 1405./usr/include/lualib.h comp-c-include
1406./usr/include/lwp.h comp-c-include 1406./usr/include/lwp.h comp-c-include
1407./usr/include/lzf.h comp-c-include 1407./usr/include/lzf.h comp-c-include
1408./usr/include/lzfP.h comp-c-include 1408./usr/include/lzfP.h comp-c-include
 1409./usr/include/lzma.h comp-c-include
 1410./usr/include/lzma/base.h comp-c-include
 1411./usr/include/lzma/bcj.h comp-c-include
 1412./usr/include/lzma/block.h comp-c-include
 1413./usr/include/lzma/check.h comp-c-include
 1414./usr/include/lzma/container.h comp-c-include
 1415./usr/include/lzma/delta.h comp-c-include
 1416./usr/include/lzma/filter.h comp-c-include
 1417./usr/include/lzma/hardware.h comp-c-include
 1418./usr/include/lzma/index.h comp-c-include
 1419./usr/include/lzma/index_hash.h comp-c-include
 1420./usr/include/lzma/lzma.h comp-c-include
 1421./usr/include/lzma/stream_flags.h comp-c-include
 1422./usr/include/lzma/version.h comp-c-include
 1423./usr/include/lzma/vli.h comp-c-include
1409./usr/include/magic.h comp-c-include 1424./usr/include/magic.h comp-c-include
1410./usr/include/malloc.h comp-c-include 1425./usr/include/malloc.h comp-c-include
1411./usr/include/math.h comp-c-include 1426./usr/include/math.h comp-c-include
1412./usr/include/md2.h comp-c-include 1427./usr/include/md2.h comp-c-include
1413./usr/include/md4.h comp-c-include 1428./usr/include/md4.h comp-c-include
1414./usr/include/md5.h comp-c-include 1429./usr/include/md5.h comp-c-include
1415./usr/include/memory.h comp-c-include 1430./usr/include/memory.h comp-c-include
1416./usr/include/menu.h comp-c-include 1431./usr/include/menu.h comp-c-include
1417./usr/include/milter/mfapi.h comp-obsolete obsolete 1432./usr/include/milter/mfapi.h comp-obsolete obsolete
1418./usr/include/milter/mfdef.h comp-obsolete obsolete 1433./usr/include/milter/mfdef.h comp-obsolete obsolete
1419./usr/include/miscfs/fdesc/fdesc.h comp-c-include 1434./usr/include/miscfs/fdesc/fdesc.h comp-c-include
1420./usr/include/miscfs/fifofs/fifo.h comp-c-include 1435./usr/include/miscfs/fifofs/fifo.h comp-c-include
1421./usr/include/miscfs/genfs/genfs.h comp-c-include 1436./usr/include/miscfs/genfs/genfs.h comp-c-include
cvs diff -r1.54 -r1.55 src/etc/mtree/NetBSD.dist.base (expand / switch to unified diff)

--- src/etc/mtree/NetBSD.dist.base 2010/10/31 11:52:53 1.54
+++ src/etc/mtree/NetBSD.dist.base 2010/11/02 19:12:48 1.55
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: NetBSD.dist.base,v 1.54 2010/10/31 11:52:53 mbalmer Exp $ 1# $NetBSD: NetBSD.dist.base,v 1.55 2010/11/02 19:12:48 joerg Exp $
2# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 2# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
3 3
4# Do not customize this file as it may be overwritten on upgrades. 4# Do not customize this file as it may be overwritten on upgrades.
5# Put your custom specifications in /etc/mtree/special.local. 5# Put your custom specifications in /etc/mtree/special.local.
6# See security.conf(5) for details. 6# See security.conf(5) for details.
7 7
8/set type=dir uname=root gname=wheel mode=0755 8/set type=dir uname=root gname=wheel mode=0755
9 9
10. 10.
11./altroot 11./altroot
12./bin 12./bin
13./dev 13./dev
14./dev/altq 14./dev/altq
@@ -115,26 +115,27 @@ @@ -115,26 +115,27 @@
115./usr/include/g++ 115./usr/include/g++
116# remove me when gcc3.3 upgrade is complete 116# remove me when gcc3.3 upgrade is complete
117./usr/include/g++/std 117./usr/include/g++/std
118./usr/include/g++/backward 118./usr/include/g++/backward
119./usr/include/g++/ext 119./usr/include/g++/ext
120./usr/include/g++/bits 120./usr/include/g++/bits
121./usr/include/g++/tr1 121./usr/include/g++/tr1
122./usr/include/g++/debug 122./usr/include/g++/debug
123./usr/include/gssapi 123./usr/include/gssapi
124./usr/include/isofs 124./usr/include/isofs
125./usr/include/isofs/cd9660 125./usr/include/isofs/cd9660
126./usr/include/kadm5 126./usr/include/kadm5
127./usr/include/krb5 127./usr/include/krb5
 128./usr/include/lzma
128./usr/include/miscfs 129./usr/include/miscfs
129./usr/include/miscfs/fdesc 130./usr/include/miscfs/fdesc
130./usr/include/miscfs/fifofs 131./usr/include/miscfs/fifofs
131./usr/include/miscfs/genfs 132./usr/include/miscfs/genfs
132./usr/include/miscfs/kernfs 133./usr/include/miscfs/kernfs
133./usr/include/miscfs/nullfs 134./usr/include/miscfs/nullfs
134./usr/include/miscfs/overlay 135./usr/include/miscfs/overlay
135./usr/include/miscfs/procfs 136./usr/include/miscfs/procfs
136./usr/include/miscfs/specfs 137./usr/include/miscfs/specfs
137./usr/include/miscfs/syncfs 138./usr/include/miscfs/syncfs
138./usr/include/miscfs/umapfs 139./usr/include/miscfs/umapfs
139./usr/include/miscfs/union 140./usr/include/miscfs/union
140./usr/include/msdosfs 141./usr/include/msdosfs
cvs diff -r1.1 -r1.2 src/external/public-domain/xz/lib/Makefile (expand / switch to unified diff)

--- src/external/public-domain/xz/lib/Makefile 2010/11/02 16:34:36 1.1
+++ src/external/public-domain/xz/lib/Makefile 2010/11/02 19:12:48 1.2
@@ -1,21 +1,39 @@ @@ -1,21 +1,39 @@
1# $NetBSD: Makefile,v 1.1 2010/11/02 16:34:36 joerg Exp $ 1# $NetBSD: Makefile,v 1.2 2010/11/02 19:12:48 joerg Exp $
2 2
3LIB= lzma 3LIB= lzma
4USE_SHLIBDIR= yes 4USE_SHLIBDIR= yes
5NOLINT= yes 5NOLINT= yes
6 6
7.include <bsd.init.mk> 7.include <bsd.init.mk>
8 8
 9# There are two different lzma.h files.
 10# Copy public version to distinguish them.
 11pub-lzma.h: ${XZSRCDIR}/src/liblzma/api/lzma.h
 12 ${_MKTARGET_CREATE}
 13 rm -f ${.TARGET}
 14 ${TOOL_CAT} ${XZSRCDIR}/src/liblzma/api/lzma.h > ${.TARGET}
 15CLEANFILES+= pub-lzma.h
 16INCS= pub-lzma.h
 17INCSDIR_pub-lzma.h= /usr/include
 18INCSNAME_pub-lzma.h= lzma.h
 19
 20.PATH: ${XZSRCDIR}/src/liblzma/api/lzma
 21INCS+= base.h bcj.h block.h check.h container.h delta.h \
 22 filter.h hardware.h index.h index_hash.h lzma.h stream_flags.h \
 23 version.h vli.h
 24
 25INCSDIR= /usr/include/lzma
 26
9LDFLAGS+= -Wl,-z,defs 27LDFLAGS+= -Wl,-z,defs
10 28
11CPPFLAGS+= -I${XZSRCDIR}/src/liblzma/check 29CPPFLAGS+= -I${XZSRCDIR}/src/liblzma/check
12CPPFLAGS+= -I${XZSRCDIR}/src/liblzma/common 30CPPFLAGS+= -I${XZSRCDIR}/src/liblzma/common
13CPPFLAGS+= -I${XZSRCDIR}/src/liblzma/delta 31CPPFLAGS+= -I${XZSRCDIR}/src/liblzma/delta
14CPPFLAGS+= -I${XZSRCDIR}/src/liblzma/lz 32CPPFLAGS+= -I${XZSRCDIR}/src/liblzma/lz
15CPPFLAGS+= -I${XZSRCDIR}/src/liblzma/lzma 33CPPFLAGS+= -I${XZSRCDIR}/src/liblzma/lzma
16CPPFLAGS+= -I${XZSRCDIR}/src/liblzma/rangecoder 34CPPFLAGS+= -I${XZSRCDIR}/src/liblzma/rangecoder
17CPPFLAGS+= -I${XZSRCDIR}/src/liblzma/simple 35CPPFLAGS+= -I${XZSRCDIR}/src/liblzma/simple
18CPPFLAGS+= -DTUKLIB_SYMBOL_PREFIX=lzma_ 36CPPFLAGS+= -DTUKLIB_SYMBOL_PREFIX=lzma_
19CPPFLAGS+= -DNETBSD_NATIVE_SHA256 37CPPFLAGS+= -DNETBSD_NATIVE_SHA256
20 38
21.PATH: ${XZSRCDIR}/src/common 39.PATH: ${XZSRCDIR}/src/common