update to first non-beta release 5.0.0; mostly from steven@

This commit is contained in:
naddy 2010-11-08 20:11:13 +00:00
parent 65152cc6e2
commit 9ef62d28db
5 changed files with 13 additions and 35 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.3 2010/10/18 16:47:00 espie Exp $
# $OpenBSD: Makefile,v 1.4 2010/11/08 20:11:13 naddy Exp $
COMMENT= LZMA compression and decompression tools
DISTNAME= xz-4.999.9beta
SHARED_LIBS += lzma 0.0 # .0.0
DISTNAME= xz-5.0.0
SHARED_LIBS= lzma 1.0 # .5.0
CATEGORIES= archivers
HOMEPAGE= http://tukaani.org/xz/
@ -28,7 +28,6 @@ USE_GROFF = Yes
SEPARATE_BUILD= simple
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--enable-dynamic=yes \
--disable-threads
MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/build-aux

View File

@ -1,5 +1,5 @@
MD5 (xz-4.999.9beta.tar.gz) = 8gc1ebbaL+NdRTre4arxsg==
RMD160 (xz-4.999.9beta.tar.gz) = ElPOAXRsdIyFSe/6UEEiQESRnE4=
SHA1 (xz-4.999.9beta.tar.gz) = lifeOZfdzbAvjTJ+hLLPGUHs0jA=
SHA256 (xz-4.999.9beta.tar.gz) = +jkB0cA0hC2kf+waJKm1pb1DX17Pu0RMFoUS4trduG8=
SIZE (xz-4.999.9beta.tar.gz) = 1037541
MD5 (xz-5.0.0.tar.gz) = 88BwbRAK0rbWMydYTQJsUA==
RMD160 (xz-5.0.0.tar.gz) = wzawgb3QVikPGJA7Cww7ZXsUHVg=
SHA1 (xz-5.0.0.tar.gz) = vM5pfX8JWE8P6yHjWxOhW6dBeh8=
SHA256 (xz-5.0.0.tar.gz) = 66khGZCmQvwsNeoCYYtxDH+omNeMzKSLVGoHvd4DxE0=
SIZE (xz-5.0.0.tar.gz) = 1232154

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_common_cpucores_h,v 1.1.1.1 2009/09/10 15:27:26 naddy Exp $
--- src/common/cpucores.h.orig Tue Sep 8 17:08:04 2009
+++ src/common/cpucores.h Tue Sep 8 17:08:16 2009
@@ -40,7 +40,7 @@ cpucores(void)
int name[2] = { CTL_HW, HW_NCPU };
int cpus;
size_t cpus_size = sizeof(cpus);
- if (!sysctl(name, &cpus, &cpus_size, NULL, NULL)
+ if (!sysctl(name, 2, &cpus, &cpus_size, NULL, NULL)
&& cpus_size == sizeof(cpus) && cpus > 0)
ret = (uint32_t)(cpus);
#endif

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_xz_util_c,v 1.1.1.1 2009/09/10 15:27:26 naddy Exp $
--- src/xz/util.c.orig Tue Sep 8 18:58:46 2009
+++ src/xz/util.c Tue Sep 8 18:59:08 2009
@@ -15,7 +15,7 @@
// Thousand separator for format strings is not supported outside POSIX.
// This is used in uint64_to_str() and double_to_str().
-#ifdef DOSLIKE
+#if defined(DOSLIKE) || defined(__OpenBSD__)
# define THOUSAND ""
#else
# define THOUSAND "'"

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2009/09/10 15:27:26 naddy Exp $
@comment $OpenBSD: PLIST,v 1.2 2010/11/08 20:11:13 naddy Exp $
@conflict lzma-*
@pkgpath archivers/lzma
%%SHARED%%
@ -34,11 +34,11 @@ include/lzma/check.h
include/lzma/container.h
include/lzma/delta.h
include/lzma/filter.h
include/lzma/hardware.h
include/lzma/index.h
include/lzma/index_hash.h
include/lzma/lzma.h
include/lzma/stream_flags.h
include/lzma/subblock.h
include/lzma/version.h
include/lzma/vli.h
lib/liblzma.a
@ -80,3 +80,6 @@ share/doc/xz/faq.txt
share/doc/xz/history.txt
share/doc/xz/lzma-file-format.txt
share/doc/xz/xz-file-format.txt
share/locale/cs/LC_MESSAGES/xz.mo
share/locale/de/LC_MESSAGES/xz.mo
share/locale/it/LC_MESSAGES/xz.mo