aboutsummaryrefslogtreecommitdiff
path: root/archivers/lzma
diff options
context:
space:
mode:
authorWen Heping <wen@FreeBSD.org>2010-04-29 06:32:50 +0000
committerWen Heping <wen@FreeBSD.org>2010-04-29 06:32:50 +0000
commit76909b2e9092c5836cff799dc74a96b8fe42e017 (patch)
treead31aa47f85314c6470f2cac508d87a480f2fec4 /archivers/lzma
parenteeca6517fad6ac8cc53fb36cc28a56f7baf64258 (diff)
downloadports-76909b2e9092c5836cff799dc74a96b8fe42e017.tar.gz
ports-76909b2e9092c5836cff799dc74a96b8fe42e017.zip
- Update to 9.12
PR: ports/146138 Submitted by: bf <bf1783@gmail.com> (maintainer)
Notes
Notes: svn path=/head/; revision=253410
Diffstat (limited to 'archivers/lzma')
-rw-r--r--archivers/lzma/Makefile7
-rw-r--r--archivers/lzma/distinfo6
-rw-r--r--archivers/lzma/files/patch-CPP_7zip_Common_CWrappers.cpp37
3 files changed, 43 insertions, 7 deletions
diff --git a/archivers/lzma/Makefile b/archivers/lzma/Makefile
index 0a685c6111d2..8e3d9fc4c84a 100644
--- a/archivers/lzma/Makefile
+++ b/archivers/lzma/Makefile
@@ -6,10 +6,9 @@
#
PORTNAME= lzma
-PORTVERSION= 9.07
-PORTREVISION= 1
+PORTVERSION= 9.12
CATEGORIES= archivers
-MASTER_SITES= SF/sevenzip/7-Zip/${PORTVERSION}%20beta/
+MASTER_SITES= SF/sevenzip/LZMA%20SDK/${PORTVERSION}/
DISTNAME= lzma${PORTVERSION:S/.//g}
MAINTAINER= bf1783@gmail.com
@@ -21,7 +20,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
NO_WRKSUBDIR= yes
USE_DOS2UNIX= yes
-BUILD_WRKSRC= ${WRKSRC}/CPP/7zip/Compress/LZMA_Alone
+BUILD_WRKSRC= ${WRKSRC}/CPP/7zip/Bundles/LzmaCon
MAKEFILE= makefile.gcc
PLIST_FILES= bin/${PORTNAME}
CFLAGS+= -D_LZMA_SYSTEM_SIZE_T
diff --git a/archivers/lzma/distinfo b/archivers/lzma/distinfo
index bc4f1af03c4a..5db6c0765fe0 100644
--- a/archivers/lzma/distinfo
+++ b/archivers/lzma/distinfo
@@ -1,3 +1,3 @@
-MD5 (lzma907.tar.bz2) = 33816ccc49fd6ff269c2c5e93740d082
-SHA256 (lzma907.tar.bz2) = 62b439d823a78a989280a91f0df3948d1390fcf8f38b71f845ddd544b47e1950
-SIZE (lzma907.tar.bz2) = 507947
+MD5 (lzma912.tar.bz2) = b226ad1eb8fe3e2f922b1b067566b4cf
+SHA256 (lzma912.tar.bz2) = dc79ae3226e7b93cdea80aa96917286b27eea50509ccf1fd071d38ec1d7f3d0a
+SIZE (lzma912.tar.bz2) = 528978
diff --git a/archivers/lzma/files/patch-CPP_7zip_Common_CWrappers.cpp b/archivers/lzma/files/patch-CPP_7zip_Common_CWrappers.cpp
new file mode 100644
index 000000000000..b861e1743faa
--- /dev/null
+++ b/archivers/lzma/files/patch-CPP_7zip_Common_CWrappers.cpp
@@ -0,0 +1,37 @@
+--- CPP/7zip/Common/CWrappers.cpp.orig 2010-04-28 22:07:56.000000000 -0400
++++ CPP/7zip/Common/CWrappers.cpp 2010-04-28 22:26:55.000000000 -0400
+@@ -164,13 +164,15 @@
+ return 0;
+ }
+
+-extern "C" static Byte Wrap_ReadByte(void *pp)
++extern "C" {
++static Byte Wrap_ReadByte(void *pp)
+ {
+ CByteInBufWrap *p = (CByteInBufWrap *)pp;
+ if (p->Cur != p->Lim)
+ return *p->Cur++;
+ return p->ReadByteFromNewBlock();
+ }
++}
+
+ CByteInBufWrap::CByteInBufWrap(): Buf(0)
+ {
+@@ -210,7 +212,8 @@
+ return Res;
+ }
+
+-extern "C" static void Wrap_WriteByte(void *pp, Byte b)
++extern "C" {
++static void Wrap_WriteByte(void *pp, Byte b)
+ {
+ CByteOutBufWrap *p = (CByteOutBufWrap *)pp;
+ Byte *dest = p->Cur;
+@@ -219,6 +222,7 @@
+ if (dest == p->Lim)
+ p->Flush();
+ }
++}
+
+ CByteOutBufWrap::CByteOutBufWrap(): Buf(0)
+ {