Module Name: src
Committed By: matt
Date: Thu Aug 4 03:38:06 UTC 2011
Modified Files:
src/external/public-domain/xz/bin: Makefile
Added Files:
src/external/public-domain/xz/bin: Makefile.inc
src/external/public-domain/xz/bin/lzmainfo: Makefile
src/external/public-domain/xz/bin/xz: Makefile
Log Message:
Build lzmainfo
Add links to xz (lzma, unxz, etc) that are in the manpage.
Add manpage links as well.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/public-domain/xz/bin/Makefile
cvs rdiff -u -r0 -r1.1 src/external/public-domain/xz/bin/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/external/public-domain/xz/bin/lzmainfo/Makefile
cvs rdiff -u -r0 -r1.1 src/external/public-domain/xz/bin/xz/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/public-domain/xz/bin/Makefile
diff -u src/external/public-domain/xz/bin/Makefile:1.2 src/external/public-domain/xz/bin/Makefile:1.3
--- src/external/public-domain/xz/bin/Makefile:1.2 Fri Mar 18 19:45:27 2011
+++ src/external/public-domain/xz/bin/Makefile Thu Aug 4 03:38:06 2011
@@ -1,34 +1,5 @@
-# $NetBSD: Makefile,v 1.2 2011/03/18 19:45:27 dyoung Exp $
+# $NetBSD: Makefile,v 1.3 2011/08/04 03:38:06 matt Exp $
-PROG= xz
-BINDIR= /usr/bin
-SRCS= args.c coder.c file_io.c hardware.c list.c main.c \
- message.c options.c signals.c suffix.c util.c \
- tuklib_exit.c tuklib_cpucores.c tuklib_open_stdxxx.c \
- tuklib_mbstr_fw.c tuklib_mbstr_width.c \
- tuklib_physmem.c tuklib_progname.c
+SUBDIR+= xz lzmainfo
-USETBL= yes
-
-.include <bsd.init.mk>
-
-CPPFLAGS+= -DPACKAGE=\"xz\"
-CPPFLAGS+= -DENABLE_NLS -DLOCALEDIR=\"/usr/share/locale\"
-
-DPADD+= ${LIBLZMA} ${LIBINTL}
-LDADD+= -llzma -lintl
-
-LINKS+= ${BINDIR}/xz ${BINDIR}/unxz \
- ${BINDIR}/xz ${BINDIR}/xzcat \
-
-.PATH: ${XZSRCDIR}/src/common ${XZSRCDIR}/src/xz
-
-.if ${MKNLS} != "no"
-.for lang in cs de it
-FILES+= ${XZSRCDIR}/po/${lang}.gmo
-FILESDIR_${XZSRCDIR}/po/${lang}.gmo= /usr/share/locale/${lang}/LC_MESSAGES
-FILESNAME_${XZSRCDIR}/po/${lang}.gmo= xz.mo
-.endfor
-.endif
-
-.include <bsd.prog.mk>
+.include <bsd.subdir.mk>
Added files:
Index: src/external/public-domain/xz/bin/Makefile.inc
diff -u /dev/null src/external/public-domain/xz/bin/Makefile.inc:1.1
--- /dev/null Thu Aug 4 03:38:06 2011
+++ src/external/public-domain/xz/bin/Makefile.inc Thu Aug 4 03:38:06 2011
@@ -0,0 +1 @@
+.include "../Makefile.inc"
Index: src/external/public-domain/xz/bin/lzmainfo/Makefile
diff -u /dev/null src/external/public-domain/xz/bin/lzmainfo/Makefile:1.1
--- /dev/null Thu Aug 4 03:38:06 2011
+++ src/external/public-domain/xz/bin/lzmainfo/Makefile Thu Aug 4 03:38:06 2011
@@ -0,0 +1,25 @@
+# $NetBSD: Makefile,v 1.1 2011/08/04 03:38:06 matt Exp $
+
+PROG= lzmainfo
+BINDIR= /usr/bin
+SRCS= lzmainfo.c
+
+#args.c coder.c file_io.c hardware.c list.c main.c \
+# message.c options.c signals.c suffix.c util.c
+SRCS+= tuklib_exit.c tuklib_cpucores.c tuklib_open_stdxxx.c \
+ tuklib_mbstr_fw.c tuklib_mbstr_width.c \
+ tuklib_physmem.c tuklib_progname.c
+
+#USETBL= yes
+
+.include <bsd.init.mk>
+
+CPPFLAGS+= -DPACKAGE=\"xz\"
+CPPFLAGS+= -DENABLE_NLS -DLOCALEDIR=\"/usr/share/locale\"
+
+DPADD+= ${LIBLZMA} ${LIBINTL}
+LDADD+= -llzma -lintl
+
+.PATH: ${XZSRCDIR}/src/common ${XZSRCDIR}/src/lzmainfo
+
+.include <bsd.prog.mk>
Index: src/external/public-domain/xz/bin/xz/Makefile
diff -u /dev/null src/external/public-domain/xz/bin/xz/Makefile:1.1
--- /dev/null Thu Aug 4 03:38:06 2011
+++ src/external/public-domain/xz/bin/xz/Makefile Thu Aug 4 03:38:06 2011
@@ -0,0 +1,43 @@
+# $NetBSD: Makefile,v 1.1 2011/08/04 03:38:06 matt Exp $
+
+PROG= xz
+BINDIR= /usr/bin
+SRCS= args.c coder.c file_io.c hardware.c list.c main.c \
+ message.c options.c signals.c suffix.c util.c \
+ tuklib_exit.c tuklib_cpucores.c tuklib_open_stdxxx.c \
+ tuklib_mbstr_fw.c tuklib_mbstr_width.c \
+ tuklib_physmem.c tuklib_progname.c
+
+USETBL= yes
+
+.include <bsd.init.mk>
+
+CPPFLAGS+= -DPACKAGE=\"xz\"
+CPPFLAGS+= -DENABLE_NLS -DLOCALEDIR=\"/usr/share/locale\"
+
+DPADD+= ${LIBLZMA} ${LIBINTL}
+LDADD+= -llzma -lintl
+
+LINKS+= ${BINDIR}/xz ${BINDIR}/lzcat
+LINKS+= ${BINDIR}/xz ${BINDIR}/lzma
+LINKS+= ${BINDIR}/xz ${BINDIR}/unlzma
+LINKS+= ${BINDIR}/xz ${BINDIR}/unxz
+LINKS+= ${BINDIR}/xz ${BINDIR}/xzcat
+
+MLINKS+= xz.1 lzcat.1
+MLINKS+= xz.1 lzma.1
+MLINKS+= xz.1 unlzma.1
+MLINKS+= xz.1 unxz.1
+MLINKS+= xz.1 xzcat.1
+
+.PATH: ${XZSRCDIR}/src/common ${XZSRCDIR}/src/xz
+
+.if ${MKNLS} != "no"
+.for lang in cs de it
+FILES+= ${XZSRCDIR}/po/${lang}.gmo
+FILESDIR_${XZSRCDIR}/po/${lang}.gmo= /usr/share/locale/${lang}/LC_MESSAGES
+FILESNAME_${XZSRCDIR}/po/${lang}.gmo= xz.mo
+.endfor
+.endif
+
+.include <bsd.prog.mk>
