ports/146138: [PATCH]archivers/lzma: update to 9.12

[bf]

>Number:         146138
>Category:       ports
>Synopsis:       [PATCH]archivers/lzma: update to 9.12
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Apr 29 05:40:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     bf
>Release:        9-CURRENT amd64
>Organization:
-
>Environment:
>Description:

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -x 'old.*' -x 'new.*' -x '1.*' -x '2.*' -ruN lzma.orig/Makefile lzma/Makefile
--- lzma.orig/Makefile	2009-12-20 22:51:43.000000000 -0500
+++ lzma/Makefile	2010-04-29 01:26:59.000000000 -0400
@@ -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 at gmail.com
@@ -21,7 +20,7 @@
 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 -x 'old.*' -x 'new.*' -x '1.*' -x '2.*' -ruN lzma.orig/distinfo lzma/distinfo
--- lzma.orig/distinfo	2009-12-20 22:51:43.000000000 -0500
+++ lzma/distinfo	2010-04-28 21:22:38.000000000 -0400
@@ -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 -x 'old.*' -x 'new.*' -x '1.*' -x '2.*' -ruN lzma.orig/files/patch-CPP_7zip_Common_CWrappers.cpp lzma/files/patch-CPP_7zip_Common_CWrappers.cpp
--- lzma.orig/files/patch-CPP_7zip_Common_CWrappers.cpp	1969-12-31 19:00:00.000000000 -0500
+++ lzma/files/patch-CPP_7zip_Common_CWrappers.cpp	2010-04-29 01:20:52.000000000 -0400
@@ -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)
+ {


>Release-Note:
>Audit-Trail:
>Unformatted: