Hello,

Attached please find a patch to add xz, the successor to lzma.  Please
note that xz is still in _beta_.  This patch will not install the lz*
binaries that come with xz but are also supplied by lzma.  If you wish
to dice with death then remove
package/archiver/xz/xz-noclobber-lzma.patch before installing.

Cheers,
Roger

diff -Nur /root/archiver.orig//xz/xz.cache package/archiver//xz/xz.cache
--- /root/archiver.orig//xz/xz.cache	1969-12-31 20:30:00.000000000 -0330
+++ package/archiver//xz/xz.cache	2010-08-22 07:11:13.000000000 -0230
@@ -0,0 +1,30 @@
+
+[TIMESTAMP] 1282424033 Sat Aug 21 18:23:53 2010
+[BUILDTIME] 100 (9)
+[SIZE] 0.84 MB, 51 files
+
+[DEP] 00-dirtree
+[DEP] autoconf
+[DEP] automake
+[DEP] bash
+[DEP] binutils
+[DEP] bzip2
+[DEP] coreutils
+[DEP] diffutils
+[DEP] findutils
+[DEP] gawk
+[DEP] gcc
+[DEP] gettext
+[DEP] glibc
+[DEP] grep
+[DEP] linux-header
+[DEP] m4
+[DEP] make
+[DEP] mktemp
+[DEP] net-tools
+[DEP] patch
+[DEP] perl
+[DEP] sed
+[DEP] sysfiles
+[DEP] tar
+[DEP] udev
diff -Nur /root/archiver.orig//xz/xz.desc package/archiver//xz/xz.desc
--- /root/archiver.orig//xz/xz.desc	1969-12-31 20:30:00.000000000 -0330
+++ package/archiver//xz/xz.desc	2010-08-22 07:30:27.000000000 -0230
@@ -0,0 +1,42 @@
+[COPY] --- T2-COPYRIGHT-NOTE-BEGIN ---
+[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+[COPY] 
+[COPY] T2 SDE: package/.../fwbuilder/fwbuilder.desc
+[COPY] Copyright (C) 2010 The T2 SDE Project
+[COPY] 
+[COPY] More information can be found in the files COPYING and README.
+[COPY] 
+[COPY] This program is free software; you can redistribute it and/or modify
+[COPY] it under the terms of the GNU General Public License as published by
+[COPY] the Free Software Foundation; version 2 of the License. A copy of the
+[COPY] GNU General Public License can be found in the file COPYING.
+[COPY] --- T2-COPYRIGHT-NOTE-END ---
+
+[I] XZ Utils
+
+[T] A free general-purpose data compression software with high
+[T] compression ratio. XZ Utils were written for POSIX-like systems
+[T] (GNU/Linux, *BSDs, etc.), but also work on some not-so-POSIX systems
+[T] like Windows. XZ Utils are the successor to LZMA Utils.
+[T] 
+[T] The core of the XZ Utils compression code is based on LZMA SDK, but it
+[T] has been modified quite a lot to be suitable for XZ Utils. The primary
+[T] compression algorithm is currently LZMA2, which is used inside the .xz
+[T] container format. With typical files, XZ Utils create 30 % smaller
+[T] output than gzip and 15 % smaller output than bzip2.
+
+[U] http://tukaani.org/xz/
+
+[A] Lasse Collin.  See http://tukaani.org/about.html
+[M] Roger Mason <[email protected]>
+
+[C] base/tool
+#[F] CROSS
+[O] var_append GCC_WRAPPER_APPEND ' ' '-std=gnu99'
+
+[L] OpenSource
+[S] Beta
+[V] 4.999.9beta
+[P] X -----5---9 108.600
+
+[D] 2627443022 xz-4.999.9beta.tar.bz2 http://tukaani.org/xz/
diff -Nur /root/archiver.orig//xz/xz-noclobber-lzma.patch package/archiver//xz/xz-noclobber-lzma.patch
--- /root/archiver.orig//xz/xz-noclobber-lzma.patch	1969-12-31 20:30:00.000000000 -0330
+++ package/archiver//xz/xz-noclobber-lzma.patch	2010-08-21 18:20:14.000000000 -0230
@@ -0,0 +1,139 @@
+diff -Nur xz-4.999.9beta.orig//src/lzmainfo/Makefile.am xz-4.999.9beta//src/lzmainfo/Makefile.am
+--- xz-4.999.9beta.orig//src/lzmainfo/Makefile.am	2009-08-27 13:07:12.000000000 -0230
++++ xz-4.999.9beta//src/lzmainfo/Makefile.am	2010-08-21 15:51:09.000000000 -0230
+@@ -5,25 +5,25 @@
+ ## You can do whatever you want with this file.
+ ##
+ 
+-bin_PROGRAMS = lzmainfo
++# bin_PROGRAMS = lzmainfo
+ 
+-lzmainfo_SOURCES = lzmainfo.c
++# lzmainfo_SOURCES = lzmainfo.c
+ 
+-lzmainfo_CPPFLAGS = \
++# lzmainfo_CPPFLAGS = \
+ 	-DLOCALEDIR=\"$(localedir)\" \
+ 	-I$(top_srcdir)/src/common \
+ 	-I$(top_srcdir)/src/liblzma/api \
+ 	-I$(top_builddir)/lib \
+ 	$(DYNAMIC_CPPFLAGS)
+ 
+-lzmainfo_LDFLAGS = $(DYNAMIC_LDFLAGS)
+-lzmainfo_LDADD = $(top_builddir)/src/liblzma/liblzma.la
++# lzmainfo_LDFLAGS = $(DYNAMIC_LDFLAGS)
++# lzmainfo_LDADD = $(top_builddir)/src/liblzma/liblzma.la
+ 
+-if COND_GNULIB
+-lzmainfo_LDADD += $(top_builddir)/lib/libgnu.a
+-endif
++# if COND_GNULIB
++# lzmainfo_LDADD += $(top_builddir)/lib/libgnu.a
++# endif
+ 
+-lzmainfo_LDADD += $(LTLIBINTL)
++# lzmainfo_LDADD += $(LTLIBINTL)
+ 
+ 
+-dist_man_MANS = lzmainfo.1
++# dist_man_MANS = lzmainfo.1
+diff -Nur xz-4.999.9beta.orig//src/scripts/Makefile.am xz-4.999.9beta//src/scripts/Makefile.am
+--- xz-4.999.9beta.orig//src/scripts/Makefile.am	2009-08-27 13:07:12.000000000 -0230
++++ xz-4.999.9beta//src/scripts/Makefile.am	2010-08-21 15:46:18.000000000 -0230
+@@ -9,46 +9,8 @@
+ dist_man_MANS = xzdiff.1 xzgrep.1 xzmore.1 xzless.1
+ 
+ install-exec-hook:
+-	cd $(DESTDIR)$(bindir) && \
+-	target=`echo xzdiff | sed '$(transform)'` && \
+-	for name in xzcmp lzdiff lzcmp; do \
+-		link=`echo $$name | sed '$(transform)'` && \
+-		rm -f $$link && \
+-		$(LN_S) $$target $$link; \
+-	done && \
+-	target=`echo xzgrep | sed '$(transform)'` && \
+-	for name in xzegrep xzfgrep lzgrep lzegrep lzfgrep; do \
+-		link=`echo $$name | sed '$(transform)'` && \
+-		rm -f $$link && \
+-		$(LN_S) $$target $$link; \
+-	done && \
+-	for name in xzmore xzless; do \
+-		target=`echo $$name | sed '$(transform)'` && \
+-		link=`echo $$name | sed 's/xz/lz/;$(transform)'` && \
+-		rm -f $$link && \
+-		$(LN_S) $$target $$link; \
+-	done
+ 
+ install-data-hook:
+-	cd $(DESTDIR)$(mandir)/man1 && \
+-	target=`echo xzdiff | sed '$(transform)'` && \
+-	for name in xzcmp lzdiff lzcmp; do \
+-		link=`echo $$name | sed '$(transform)'` && \
+-		rm -f $$link.1 && \
+-		$(LN_S) $$target.1 $$link.1; \
+-	done && \
+-	target=`echo xzgrep | sed '$(transform)'` && \
+-	for name in xzegrep xzfgrep lzgrep lzegrep lzfgrep; do \
+-		link=`echo $$name | sed '$(transform)'` && \
+-		rm -f $$link.1 && \
+-		$(LN_S) $$target.1 $$link.1; \
+-	done && \
+-	for name in xzmore xzless; do \
+-		target=`echo $$name | sed '$(transform)'` && \
+-		link=`echo $$name | sed 's/xz/lz/;$(transform)'` && \
+-		rm -f $$link.1 && \
+-		$(LN_S) $$target.1 $$link.1; \
+-	done
+ 
+ uninstall-hook:
+ 	cd $(DESTDIR)$(bindir) && \
+diff -Nur xz-4.999.9beta.orig//src/xz/Makefile.am xz-4.999.9beta//src/xz/Makefile.am
+--- xz-4.999.9beta.orig//src/xz/Makefile.am	2009-08-27 13:07:12.000000000 -0230
++++ xz-4.999.9beta//src/xz/Makefile.am	2010-08-21 15:47:40.000000000 -0230
+@@ -66,22 +66,8 @@
+ xzlinks = unxz xzcat lzma unlzma lzcat
+ 
+ install-exec-hook:
+-	cd $(DESTDIR)$(bindir) && \
+-	target=`echo xz | sed '$(transform)'`$(EXEEXT) && \
+-	for name in $(xzlinks); do \
+-		link=`echo $$name | sed '$(transform)'` && \
+-		rm -f $$link && \
+-		$(LN_S) $$target $$link; \
+-	done
+ 
+ install-data-hook:
+-	cd $(DESTDIR)$(mandir)/man1 && \
+-	target=`echo xz | sed '$(transform)'` && \
+-	for name in $(xzlinks); do \
+-		link=`echo $$name | sed '$(transform)'` && \
+-		rm -f $$link.1 && \
+-		$(LN_S) $$target.1 $$link.1; \
+-	done
+ 
+ uninstall-hook:
+ 	cd $(DESTDIR)$(bindir) && \
+diff -Nur xz-4.999.9beta.orig//src/xzdec/Makefile.am xz-4.999.9beta//src/xzdec/Makefile.am
+--- xz-4.999.9beta.orig//src/xzdec/Makefile.am	2009-08-27 13:07:12.000000000 -0230
++++ xz-4.999.9beta//src/xzdec/Makefile.am	2010-08-21 15:48:58.000000000 -0230
+@@ -12,7 +12,7 @@
+ 		$(xzdec_CPPFLAGS) $(CPPFLAGS) $(RCFLAGS) -i $< -o $@
+ 
+ 
+-bin_PROGRAMS = xzdec lzmadec
++bin_PROGRAMS = xzdec
+ 
+ xzdec_SOURCES = xzdec.c
+ 
+@@ -49,11 +49,6 @@
+ dist_man_MANS = xzdec.1
+ 
+ install-data-hook:
+-	cd $(DESTDIR)$(mandir)/man1 && \
+-	target=`echo xzdec | sed '$(transform)'` && \
+-	link=`echo lzmadec | sed '$(transform)'` && \
+-	rm -f $$link.1 && \
+-	$(LN_S) $$target.1 $$link.1
+ 
+ uninstall-hook:
+ 	cd $(DESTDIR)$(mandir)/man1 && \
----------------------------------------------------------- 
If you wish to unsubscribe from this mailing, send mail to
[email protected] with a subject of: unsubscribe t2

Reply via email to