Update unalz to 0.50.

New features:
  - "-l" option to show the list of files.
  - "-d" option to specify output folder.
  - decompressing individual files.
  - setting time attribute of decompressed files.

2 files changed, 23 insertions, 24 deletions

diff --git a/archivers/unalz/patches/patch-aa b/archivers/unalz/patches/patch-aa
index 4d3ded84b67..132346c0193 100644
--- a/archivers/unalz/patches/patch-aa
+++ b/archivers/unalz/patches/patch-aa
@@ -1,39 +1,38 @@
-$NetBSD: patch-aa,v 1.2 2005/03/02 16:18:47 minskim Exp $
+$NetBSD: patch-aa,v 1.3 2005/10/01 10:55:35 minskim Exp $
 
---- Makefile.orig	2004-11-27 10:58:24.000000000 -0600
+--- Makefile.orig	2005-07-08 18:32:15.000000000 -0700
 +++ Makefile
-@@ -1,9 +1,10 @@
+@@ -1,9 +1,9 @@
 -CPP = g++
 -CC  = gcc
--OBJ = main.o UnAlz.o UnAlzBz2decompress.o UnAlzBzip2.o UnAlzbzlib.o zlib/adler32.o zlib/crc32.o zlib/infback.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/zutil.o bzip2/blocksort.o bzip2/compress.o bzip2/crctable.o bzip2/huffman.o bzip2/randtable.o
+-OBJ = main.o UnAlz.o UnAlzUtils.o UnAlzBz2decompress.o UnAlzBzip2.o UnAlzbzlib.o zlib/adler32.o zlib/crc32.o zlib/infback.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/zutil.o bzip2/blocksort.o bzip2/compress.o bzip2/crctable.o bzip2/huffman.o bzip2/randtable.o
 +#CPP = g++
 +#CC  = gcc
-+OBJ = main.o UnAlz.o UnAlzBz2decompress.o UnAlzBzip2.o UnAlzbzlib.o
++OBJ = main.o UnAlz.o UnAlzUtils.o UnAlzBz2decompress.o UnAlzBzip2.o UnAlzbzlib.o
  BIN = unalz
 -LDFLAGS = 
 -CFLAGS = -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 
 +LDFLAGS += -lz -lbz2
-+CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 
-+CXXFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_UNALZ_ICONV
++CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_UNALZ_ICONV -D_UNALZ_UTF8
  
  all:
  	@echo ""
-@@ -21,8 +22,7 @@ all:
- 	@echo ""
- 
- posix: unalz
--	$(CPP) -c UnAlz.cpp  -c main.cpp -D_UNALZ_ICONV $(CFLAGS) 
--	$(CPP) $(OBJ) $(LDFLAGS) -liconv -o $(BIN) 
-+	$(CXX) $(OBJ) $(LDFLAGS) -liconv -o $(BIN) 
+@@ -26,8 +26,7 @@ posix: unalz
+ 	$(CPP) $(OBJ) $(LDFLAGS) -liconv -o $(BIN) 
  
  posix-utf8: unalz
- 	$(CPP) -c UnAlz.cpp -c main.cpp -D_UNALZ_ICONV -D_UNALZ_UTF8 $(CFLAGS)
-@@ -37,6 +37,8 @@ clean:
+-	$(CPP) -c UnAlz.cpp -c UnAlzUtils.cpp -c main.cpp -D_UNALZ_ICONV -D_UNALZ_UTF8 $(CFLAGS)
+-	$(CPP) $(OBJ) $(LDFLAGS) -liconv -o $(BIN)
++	$(CXX) $(OBJ) $(LDFLAGS) -liconv -o $(BIN)
+ 
+ posix-noiconv: unalz
+ 	$(CPP) -c UnAlz.cpp -c UnAlzUtils.cpp -c main.cpp $(CFLAGS)
+@@ -45,6 +44,8 @@ clean:
  
  $(BIN): $(OBJ)
  
 +.cpp.o:
-+	${CXX} ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET}
++	${CXX} ${CPPFLAGS} ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET}
  
  zlib/adler32.o: zlib/adler32.c
  	$(CC) -c zlib/adler32.c -o zlib/adler32.o $(CFLAGS)
diff --git a/archivers/unalz/patches/patch-ab b/archivers/unalz/patches/patch-ab
index 29cadba21ff..2feb5468a0e 100644
--- a/archivers/unalz/patches/patch-ab
+++ b/archivers/unalz/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.5 2005/07/19 13:51:52 minskim Exp $
+$NetBSD: patch-ab,v 1.6 2005/10/01 10:55:35 minskim Exp $
 
---- UnAlz.cpp.orig	2005-06-17 22:31:33.000000000 -0500
+--- UnAlz.cpp.orig	2005-07-02 07:40:29.000000000 -0700
 +++ UnAlz.cpp
 @@ -1,6 +1,6 @@
  //#include "stdafx.h"

@@ -10,8 +10,8 @@ $NetBSD: patch-ab,v 1.5 2005/07/19 13:51:52 minskim Exp $
 +#include <bzlib.h>

  #include "UnAlz.h"

  

- // mkdir

-@@ -18,6 +18,10 @@
+ // utime ÇÔ¼ö ó¸®

+@@ -30,6 +30,10 @@
  #	include <errno.h>		// iconv.h ¶§¹®¿¡ ÇÊ¿ä 

  #endif

  

@@ -22,7 +22,7 @@ $NetBSD: patch-ab,v 1.5 2005/07/19 13:51:52 minskim Exp $
  

  #define swapint64(Data) (INT64) ( (((Data)&0x00000000000000FFLL) << 56) | (((Data)&0x000000000000FF00LL) << 40) | (((Data)&0x0000000000FF0000LL) << 24) | (((Data)&0x00000000FF000000LL) << 8)  | (((Data)&0x000000FF00000000LL) >> 8)  | (((Data)&0x0000FF0000000000LL) >> 24) | (((Data)&0x00FF000000000000LL) >> 40) | (((Data)&0xFF00000000000000LL) >> 56) )

  #define swapint32(a)    ((((a)&0xff)<<24)+(((a>>8)&0xff)<<16)+(((a>>16)&0xff)<<8)+(((a>>24)&0xff)))

-@@ -33,7 +37,7 @@
+@@ -45,7 +49,7 @@
  	inline UINT64	unalz_le64toh(UINT64 a){return a;}

  #endif

  

@@ -31,11 +31,11 @@ $NetBSD: patch-ab,v 1.5 2005/07/19 13:51:52 minskim Exp $
  #	include <sys/endian.h>	

  	inline UINT16	unalz_le16toh(UINT16 a){return le16toh(a);}

  	inline UINT32	unalz_le32toh(UINT32 a){return le32toh(a);}

-@@ -389,7 +393,7 @@ BOOL CUnAlz::ReadLocalFileheader()

+@@ -413,7 +417,7 @@ BOOL CUnAlz::ReadLocalFileheader()

  	size_t size;

  	char inbuf[ICONV_BUF_SIZE];

  	char outbuf[ICONV_BUF_SIZE];

--#if defined(__FreeBSD__) || defined(__CYGWIN__)

+-#if defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__APPLE__)

 +#if defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__NetBSD__)

  	const char *inptr = inbuf;

  #else