[src/trunk]: src/external/public-domain/xz/lib there is no more lzma/lzma.h; ...

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

details:   https://anonhg.NetBSD.org/src/rev/5da6d596706a
branches:  trunk
changeset: 337515:5da6d596706a
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Apr 17 20:12:45 2015 +0000

description:
there is no more lzma/lzma.h; it has been renamed to lzma/lzma12.h

diffstat:

 external/public-domain/xz/lib/Makefile |  22 ++++++----------------
 1 files changed, 6 insertions(+), 16 deletions(-)

diffs (37 lines):

diff -r 96183bd69147 -r 5da6d596706a external/public-domain/xz/lib/Makefile
--- a/external/public-domain/xz/lib/Makefile    Fri Apr 17 19:35:25 2015 +0000
+++ b/external/public-domain/xz/lib/Makefile    Fri Apr 17 20:12:45 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2015/04/17 18:49:23 christos Exp $
+# $NetBSD: Makefile,v 1.5 2015/04/17 20:12:45 christos Exp $
 
 LIB=           lzma
 USE_SHLIBDIR=  yes
@@ -6,22 +6,12 @@
 
 .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 ${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 lzma12.h \
+       stream_flags.h version.h vli.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_lzma.h=        /usr/include
 INCSDIR=       /usr/include/lzma
 
 LDFLAGS+=      -Wl,-z,defs