maintenance update to 5.0.6

This commit is contained in:
naddy 2014-09-19 20:58:39 +00:00
parent c66d468eac
commit f7137a89d7
6 changed files with 52 additions and 18 deletions

View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.21 2013/08/07 15:37:07 naddy Exp $
# $OpenBSD: Makefile,v 1.22 2014/09/19 20:58:39 naddy Exp $
COMMENT= LZMA compression and decompression tools
DISTNAME= xz-5.0.5
SHARED_LIBS= lzma 1.0 # .5.5
DISTNAME= xz-5.0.6
SHARED_LIBS= lzma 1.0 # .5.6
CATEGORIES= archivers
REVISION = 0
DPB_PROPERTIES= parallel
HOMEPAGE= http://tukaani.org/xz/

View File

@ -1,2 +1,2 @@
SHA256 (xz-5.0.5.tar.gz) = Xc/+ajcm0j0XEaZSiN4uIVtJYNpQkiSM5jyZ1QCTuTo=
SIZE (xz-5.0.5.tar.gz) = 1305685
SHA256 (xz-5.0.6.tar.gz) = ts9M3BMTVWoAhI5yJiW85A0s1VLAUrBGV5HGTJICw/E=
SIZE (xz-5.0.6.tar.gz) = 1317873

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-config_h_in,v 1.3 2013/07/04 18:37:32 naddy Exp $
--- config.h.in.orig Sun Jun 30 15:17:55 2013
+++ config.h.in Thu Jul 4 17:48:22 2013
@@ -289,7 +289,11 @@
$OpenBSD: patch-config_h_in,v 1.4 2014/09/19 20:58:39 naddy Exp $
--- config.h.in.orig Sun Sep 14 18:40:20 2014
+++ config.h.in Thu Sep 18 18:02:46 2014
@@ -288,7 +288,11 @@
/* Define to 1 if the system supports fast unaligned access to 16-bit and
32-bit integers. */

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_liblzma_Makefile_in,v 1.1 2014/09/19 20:58:39 naddy Exp $
--- src/liblzma/Makefile.in.orig Sun Sep 14 18:40:22 2014
+++ src/liblzma/Makefile.in Thu Sep 18 21:13:34 2014
@@ -1799,7 +1799,7 @@ liblzma.pc: $(srcdir)/liblzma.pc.in
-e 's,@PACKAGE_VERSION[@],$(PACKAGE_VERSION),g' \
-e 's,@PTHREAD_CFLAGS[@],$(PTHREAD_CFLAGS),g' \
-e 's,@LIBS[@],$(LIBS),g' \
- < $< > $@ || { rm -f $@; exit 1; }
+ < $(srcdir)/liblzma.pc.in > $@ || { rm -f $@; exit 1; }
clean-local:
rm -f liblzma.pc

View File

@ -0,0 +1,24 @@
$OpenBSD: patch-tests_xzgrep_expected_output,v 1.1 2014/09/19 20:58:39 naddy Exp $
OpenBSD grep and GNU grep interpret the combination -l -q differently.
--- tests/xzgrep_expected_output.orig Sun Sep 14 18:17:20 2014
+++ tests/xzgrep_expected_output Fri Sep 19 21:34:41 2014
@@ -4,7 +4,9 @@ xzgrep_test_1.xz:in voluptate velit esse cillum dolore
xzgrep_test_2.xz:Hello
retval 0
=> xzgrep -l el <=
+(standard input)
xzgrep_test_1.xz
+(standard input)
xzgrep_test_2.xz
retval 0
=> xzgrep -h el <=
@@ -21,6 +23,7 @@ retval 0
xzgrep_test_2.xz:Hello
retval 0
=> xzgrep -l Hello <=
+(standard input)
xzgrep_test_2.xz
retval 0
=> xzgrep -h Hello <=

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.8 2013/08/07 11:50:27 espie Exp $
@comment $OpenBSD: PLIST,v 1.9 2014/09/19 20:58:39 naddy Exp $
@conflict lzma-*
@pkgpath archivers/lzma
bin/lzcat
@ -43,7 +43,6 @@ include/lzma/vli.h
lib/liblzma.a
lib/liblzma.la
@lib lib/liblzma.so.${LIBlzma_VERSION}
lib/pkgconfig/
lib/pkgconfig/liblzma.pc
@man man/man1/lzcat.1
@man man/man1/lzcmp.1
@ -69,13 +68,13 @@ lib/pkgconfig/liblzma.pc
@man man/man1/xzless.1
@man man/man1/xzmore.1
share/doc/xz/
@comment share/doc/xz/AUTHORS
share/doc/xz/AUTHORS
share/doc/xz/COPYING
@comment share/doc/xz/COPYING.GPLv2
@comment share/doc/xz/NEWS
@comment share/doc/xz/README
@comment share/doc/xz/THANKS
@comment share/doc/xz/TODO
share/doc/xz/COPYING.GPLv2
share/doc/xz/NEWS
share/doc/xz/README
share/doc/xz/THANKS
share/doc/xz/TODO
share/doc/xz/examples/
share/doc/xz/examples/00_README.txt
share/doc/xz/examples/01_compress_easy.c