[47956] trunk/dports/archivers/xar-devel

[afb at macports.org]

Revision: 47956
          http://trac.macports.org/changeset/47956
Author:   afb at macports.org
Date:     2009-03-11 08:26:16 -0700 (Wed, 11 Mar 2009)
Log Message:
-----------
bump revision, for liblzma update and patch

Modified Paths:
--------------
    trunk/dports/archivers/xar-devel/Portfile

Added Paths:
-----------
    trunk/dports/archivers/xar-devel/files/
    trunk/dports/archivers/xar-devel/files/patch-lzmaxar.c

Modified: trunk/dports/archivers/xar-devel/Portfile
===================================================================
--- trunk/dports/archivers/xar-devel/Portfile	2009-03-11 14:52:21 UTC (rev 47955)
+++ trunk/dports/archivers/xar-devel/Portfile	2009-03-11 15:26:16 UTC (rev 47956)
@@ -4,6 +4,7 @@
 
 name                xar-devel
 version             1.6
+revision            2
 categories          archivers sysutils
 platforms           darwin freebsd linux
 description         xar is the eXtensible ARchiver
@@ -16,6 +17,7 @@
 distname            xar-${version}
 fetch.type          svn
 svn.url             http://xar.googlecode.com/svn/trunk/xar
+svn.tag             224
 worksrcdir          xar
 
 depends_lib         port:bzip2 \
@@ -25,6 +27,8 @@
                     port:openssl \
                     port:zlib
 
+patchfiles          patch-lzmaxar.c
+
 pre-configure {
     system "cd ${worksrcpath}; ./autogen.sh"
 }

Added: trunk/dports/archivers/xar-devel/files/patch-lzmaxar.c
===================================================================
--- trunk/dports/archivers/xar-devel/files/patch-lzmaxar.c	                        (rev 0)
+++ trunk/dports/archivers/xar-devel/files/patch-lzmaxar.c	2009-03-11 15:26:16 UTC (rev 47956)
@@ -0,0 +1,108 @@
+Index: lib/lzmaxar.c
+===================================================================
+--- lib/lzmaxar.c	(revision 224)
++++ lib/lzmaxar.c	(arbetskopia)
+@@ -76,11 +76,12 @@
+ #else
+ 	lzma_options_lzma options2;
+ #endif
+-	lzma_allocator allocator;
+ #if LZMA_VERSION < 40420010U
+ 	lzma_memory_limitter *limit;
+-#else
++	lzma_allocator allocator;
++#elif LZMA_VERSION < 49990060U
+ 	lzma_memlimit *limit;
++	lzma_allocator allocator;
+ #endif
+ };
+ 
+@@ -133,15 +134,23 @@
+ 		else
+ 			return 0;
+ 		
++	#if LZMA_VERSION < 49990070U
+ 		lzma_init_decoder();
++	#endif
+ 	#ifdef LZMA_STREAM_INIT_VAR
+ 		LZMA_CONTEXT(context)->lzma = LZMA_STREAM_INIT_VAR;
+ 	#endif
+ 	#if LZMA_VERSION < 49990050U
+ 		r = lzma_auto_decoder(&LZMA_CONTEXT(context)->lzma, NULL, NULL);
++	#elif LZMA_VERSION < 49990060U
++		r = lzma_auto_decoder(&LZMA_CONTEXT(context)->lzma,
++		        lzma_easy_memory_usage(preset_level), 0);
++	#elif LZMA_VERSION < 49990070U
++		r = lzma_auto_decoder(&LZMA_CONTEXT(context)->lzma,
++		        lzma_easy_encoder_memusage(preset_level, 0), 0);
+ 	#else
+ 		r = lzma_auto_decoder(&LZMA_CONTEXT(context)->lzma,
+-		        lzma_easy_memory_usage(preset_level), 0);
++		        lzma_easy_encoder_memusage(preset_level), 0);
+ 	#endif
+ 		if( (r != LZMA_OK) ) {
+ 			xar_err_new(x);
+@@ -217,7 +226,7 @@
+ 		lzma_end(&LZMA_CONTEXT(context)->lzma);		
+ #if LZMA_VERSION < 40420010U
+ 		lzma_memory_limitter_end(LZMA_CONTEXT(context)->limit, 1);
+-#else
++#elif LZMA_VERSION < 49990060U
+ 		lzma_memlimit_end(LZMA_CONTEXT(context)->limit, 1);
+ #endif
+ 
+@@ -273,7 +282,9 @@
+ 			}
+ 		}
+ 		
++#if LZMA_VERSION < 49990070U
+ 		lzma_init_encoder();
++#endif
+ #if LZMA_VERSION < 49990050U
+ 		LZMA_CONTEXT(context)->options.check = LZMA_CHECK_CRC64;
+ 		LZMA_CONTEXT(context)->options.has_crc32 = 1; /* true */
+@@ -298,13 +309,17 @@
+ 		LZMA_CONTEXT(context)->limit = lzma_memory_limitter_create(memory_limit);
+ 		LZMA_CONTEXT(context)->allocator.alloc = (void*) lzma_memory_alloc;
+ 		LZMA_CONTEXT(context)->allocator.free = (void*) lzma_memory_free;
+-#else
++		LZMA_CONTEXT(context)->allocator.opaque = LZMA_CONTEXT(context)->limit;
++		LZMA_CONTEXT(context)->lzma.allocator = &LZMA_CONTEXT(context)->allocator;
++#elif LZMA_VERSION < 49990060U
+ 		LZMA_CONTEXT(context)->limit = lzma_memlimit_create(memory_limit);
+ 		LZMA_CONTEXT(context)->allocator.alloc = (void*) lzma_memlimit_alloc;
+ 		LZMA_CONTEXT(context)->allocator.free = (void*) lzma_memlimit_free;
+-#endif
+ 		LZMA_CONTEXT(context)->allocator.opaque = LZMA_CONTEXT(context)->limit;
+ 		LZMA_CONTEXT(context)->lzma.allocator = &LZMA_CONTEXT(context)->allocator;
++#else
++		lzma_memlimit_set(&LZMA_CONTEXT(context)->lzma, memory_limit);
++#endif
+ #if LZMA_VERSION < 49990050U
+ 		if (alone){
+ 		LZMA_CONTEXT(context)->options2.uncompressed_size = *inlen;
+@@ -326,6 +341,15 @@
+ 		else
+ 		r = lzma_stream_encoder(&LZMA_CONTEXT(context)->lzma,
+ 		                        LZMA_CONTEXT(context)->filters, LZMA_CONTEXT(context)->check);
++#elif LZMA_VERSION < 49990070U
++		if (alone){
++		lzma_lzma_preset(&(LZMA_CONTEXT(context)->options2), level);
++		r = lzma_alone_encoder(&LZMA_CONTEXT(context)->lzma,
++		                       &(LZMA_CONTEXT(context)->options2));
++		}
++		else
++		r = lzma_easy_encoder(&LZMA_CONTEXT(context)->lzma,
++		                      level, 0, LZMA_CHECK_CRC64);
+ #else
+ 		if (alone){
+ 		lzma_lzma_preset(&(LZMA_CONTEXT(context)->options2), level);
+@@ -334,7 +358,7 @@
+ 		}
+ 		else
+ 		r = lzma_easy_encoder(&LZMA_CONTEXT(context)->lzma,
+-		                      (lzma_easy_level) level);
++		                      level, LZMA_CHECK_CRC64);
+ #endif
+ 		if( (r != LZMA_OK) ) {
+ 			xar_err_new(x);


Property changes on: trunk/dports/archivers/xar-devel/files/patch-lzmaxar.c
___________________________________________________________________
Added: svn:eol-style
   + native
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090311/a8427454/attachment-0001.html>