Update to lzo 2.05.

Add LICENSE.
Pass --docdir through CONFIGURE_ARGS to install into the right places.
Disable the libc malloc() alignment test according to consultation of the
upstream author, Marcus F. X. J. Oberhumer. He advised that the test were
too strict and would be changed for 2.06.
Refresh patches.

PR: ports/156931
This commit is contained in:
Matthias Andree 2011-05-10 20:10:21 +00:00
parent b064a43f06
commit a254d72056
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=273921
5 changed files with 48 additions and 33 deletions

View file

@ -6,7 +6,7 @@
#
PORTNAME= lzo2
PORTVERSION= 2.04
PORTVERSION= 2.05
CATEGORIES= archivers devel
MASTER_SITES= http://www.oberhumer.com/opensource/lzo/download/ \
http://ftp.uni-koeln.de/util/arc/
@ -16,9 +16,11 @@ DISTNAME= lzo-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
MAINTAINER= mandree@FreeBSD.org
COMMENT= Portable speedy, lossless data compression library
LICENSE= GPLv2
USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-shared
CONFIGURE_ARGS= --enable-shared --docdir=${DOCSDIR}
USE_LDCONFIG= yes
post-build:

View file

@ -1,2 +1,2 @@
SHA256 (lzo-2.04.tar.gz) = 4ee3a040facf39561f13e4ef2ab99a886fd68251a35d612486ed0625cc6ab428
SIZE (lzo-2.04.tar.gz) = 604424
SHA256 (lzo-2.05.tar.gz) = 449f98186d76ba252cd17ff1241ca2a96b7f62e0d3e4766f88730dab0ea5f333
SIZE (lzo-2.05.tar.gz) = 587694

View file

@ -0,0 +1,40 @@
--- ./lzotest/lzotest.c.orig 2011-04-23 12:55:35.000000000 +0200
+++ ./lzotest/lzotest.c 2011-05-10 21:47:16.000000000 +0200
@@ -234,7 +234,7 @@
// command line options
**************************************************************************/
-int opt_verbose = 2;
+int opt_verbose = 1;
long opt_c_loops = 0;
long opt_d_loops = 0;
@@ -380,10 +380,12 @@
fprintf(stderr, "%s: out of memory (wanted %lu bytes)\n", progname, (unsigned long)mb->alloc_len);
exit(EXIT_MEM);
}
+#if 0
if (__lzo_align_gap(mb->alloc_ptr, (lzo_uint) sizeof(lzo_align_t)) != 0) {
fprintf(stderr, "%s: C library problem: malloc() returned mis-aligned pointer!\n", progname);
exit(EXIT_MEM);
}
+#endif
mb->ptr = mb->alloc_ptr + extra_bottom;
mb->len = mb->saved_len = len;
@@ -1929,6 +1931,7 @@
if ((*s == '/' || *s == '\\') && s[1])
progname = s + 1;
+#if 0
#if defined(__LZO_PROFESSIONAL__)
printf("\nLZO Professional real-time data compression library (v%s, %s).\n",
lzo_version_string(), lzo_version_date());
@@ -1938,6 +1941,7 @@
lzo_version_string(), lzo_version_date());
printf("Copyright (C) 1996-2011 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n");
#endif
+#endif
/*

View file

@ -1,27 +0,0 @@
--- lzotest/lzotest.c.orig 2010-10-31 18:21:28.000000000 +0100
+++ lzotest/lzotest.c 2010-11-13 00:37:17.279807378 +0100
@@ -233,7 +233,7 @@
// command line options
**************************************************************************/
-int opt_verbose = 2;
+int opt_verbose = 1;
long opt_c_loops = 0;
long opt_d_loops = 0;
@@ -1928,6 +1928,7 @@
if ((*s == '/' || *s == '\\') && s[1])
progname = s + 1;
+#if 0
#if defined(__LZO_PROFESSIONAL__)
printf("\nLZO Professional real-time data compression library (v%s, %s).\n",
lzo_version_string(), lzo_version_date());
@@ -1937,6 +1938,7 @@
lzo_version_string(), lzo_version_date());
printf("Copyright (C) 1996-2010 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n");
#endif
+#endif
/*

View file

@ -1,5 +1,5 @@
--- ./util/check.sh~ 2008-04-30 14:51:49.000000000 +0200
+++ ./util/check.sh 2008-07-29 11:00:31.000000000 +0200
--- ./util/check.sh.orig 2011-04-23 12:55:35.000000000 +0200
+++ ./util/check.sh 2011-05-10 21:45:44.000000000 +0200
@@ -19,7 +19,7 @@
TMPFILE="/tmp/lzo_$$.tmp"