Update 0.61 to 0.65

 - ChangeLog doesn't seem to be available, but three patches
   are now included in upstream and removing them.

5 files changed, 6 insertions, 121 deletions

diff --git a/archivers/unalz/Makefile b/archivers/unalz/Makefile
index 7e4b326d9b8..e6a39cbb283 100644
--- a/archivers/unalz/Makefile
+++ b/archivers/unalz/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2014/10/09 14:05:54 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2015/01/09 13:49:28 mef Exp $
 #
 
-DISTNAME=		unalz-0.61
+DISTNAME=		unalz-0.65
 CATEGORIES=		archivers
 MASTER_SITES=		http://www.kipple.pe.kr/win/unalz/
 EXTRACT_SUFX=		.tgz
diff --git a/archivers/unalz/distinfo b/archivers/unalz/distinfo
index cb3224bbd63..03946469057 100644
--- a/archivers/unalz/distinfo
+++ b/archivers/unalz/distinfo
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.21 2014/01/09 15:54:44 jperkin Exp $
+$NetBSD: distinfo,v 1.22 2015/01/09 13:49:28 mef Exp $
 
-SHA1 (unalz-0.61.tgz) = a6cab2a02b7f44957211e694b7d8d144840b2255
-RMD160 (unalz-0.61.tgz) = 68cb957aeacfc8452e01637f7e0a50939d515ab6
-Size (unalz-0.61.tgz) = 138152 bytes
-SHA1 (patch-UnAlz.h) = ecd2cb74b6d9fc53caa79a20ff0f930dfc00712d
+SHA1 (unalz-0.65.tgz) = 98a64f799892f7adfffd4635bd19826fe8f18b26
+RMD160 (unalz-0.65.tgz) = bb55aee26e12c8bf0e4422b11feffa5c88844771
+Size (unalz-0.65.tgz) = 137985 bytes
 SHA1 (patch-aa) = 327fd080040946fe7a0707698f90d7709a2d3c5b
-SHA1 (patch-ab) = 5dca0ba5d5b6b99c3b6985195e6fc52dc89fae44
 SHA1 (patch-ac) = 00c6255437f4ebdf3676787ed63cc838a16476d4
-SHA1 (patch-ad) = 0a830c3995600d0c25ae1b32c00df2d0604571d7
diff --git a/archivers/unalz/patches/patch-UnAlz.h b/archivers/unalz/patches/patch-UnAlz.h
deleted file mode 100644
index 93bcf860ac7..00000000000
--- a/archivers/unalz/patches/patch-UnAlz.h
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-UnAlz.h,v 1.2 2014/01/09 15:54:44 jperkin Exp $
-
-* <cstring> for memset(3) and strlen(3)
-* <cstdlib> for free(3)
-* Avoid ERR macro
-
---- UnAlz.h.orig	2007-02-10 05:55:10.000000000 +0000
-+++ UnAlz.h
-@@ -131,6 +131,8 @@
- #define _UNALZ_H_

- 

- #include <vector>

-+#include <cstring>

-+#include <cstdlib>

- using namespace std;

- 

- 

-@@ -426,6 +428,7 @@ public :
- 	FileList::iterator	GetCurFileHeader() { return m_posCur; };		///<  ÇöÀç (SetCurrentFile() ·Î ¼¼ÆõÈ) ÆÄÀÏ Á¤º¸

- 

- public :

-+#undef ERR

- 	enum ERR							///< ¿¡·¯ ÄÚµå - Á¤¸® ÇÊ¿ä..

- 	{

- 		ERR_NOERR,

diff --git a/archivers/unalz/patches/patch-ab b/archivers/unalz/patches/patch-ab
deleted file mode 100644
index 1b9bf85240d..00000000000
--- a/archivers/unalz/patches/patch-ab
+++ /dev/null
@@ -1,63 +0,0 @@
-$NetBSD: patch-ab,v 1.13 2013/05/28 19:00:04 joerg Exp $
-
-* Use system/buildlinked headers.
-* The correct type for get_crc_table with zlib 1.2.7 is z_crc_t*
-
---- UnAlz.cpp.orig	2007-02-10 05:51:54.000000000 +0000
-+++ UnAlz.cpp
-@@ -1,5 +1,5 @@
--#include "zlib/zlib.h"

--#include "bzip2/bzlib.h"

-+#include <zlib.h>

-+#include <bzlib.h>

- #include "UnAlz.h"

- 

- // utime ÇÔ¼ö ó¸®

-@@ -159,7 +159,7 @@ CUnAlz::CUnAlz()

- {

- 	memset(m_files, 0, sizeof(m_files));

- 	m_nErr = ERR_NOERR;

--	m_posCur = (FileList::iterator)NULL;

-+	m_posCur = m_fileList.end();

- 	m_pFuncCallBack = NULL;

- 	m_pCallbackParam = NULL;

- 	m_bHalt = FALSE;

-@@ -331,7 +331,7 @@ void CUnAlz::Close()

- 		i->Clear();

- 	}

- 

--	m_posCur = (FileList::iterator)NULL;

-+	m_posCur = m_fileList.end();

- }

- 

- ////////////////////////////////////////////////////////////////////////////////////////////////////

-@@ -641,7 +641,7 @@ BOOL CUnAlz::SetCurrentFile(const char* 
- 		}

- 	}

- 

--	m_posCur = (FileList::iterator)NULL;

-+	m_posCur = m_fileList.end();

- 

- 	return FALSE;

- }

-@@ -682,7 +682,7 @@ BOOL CUnAlz::ExtractCurrentFileToBuf(BYT
- ////////////////////////////////////////////////////////////////////////////////////////////////////

- BOOL CUnAlz::ExtractCurrentFile(const char* szDestPathName, const char* szDestFileName)

- {

--	if(m_posCur==(FileList::iterator)NULL) {ASSERT(0); return FALSE;}

-+	if(m_posCur==m_fileList.end()) {ASSERT(0); return FALSE;}

- 

- 	BOOL	ret=FALSE;

- 

-@@ -1891,7 +1891,11 @@ void CUnAlz::DecryptingData(int nSize, B
- ////////////////////////////////////////////////////////////////////////////////////////////////////

- UINT32 CUnAlz::CRC32(UINT32 l, BYTE c)

- {

-+#if ZLIB_VERNUM >= 0x1270

-+	const z_crc_t *CRC_TABLE = get_crc_table();

-+#else

- 	const unsigned long *CRC_TABLE = get_crc_table();

-+#endif

- 	return CRC_TABLE[(l ^ c) & 0xff] ^ (l >> 8);

- }

- 

diff --git a/archivers/unalz/patches/patch-ad b/archivers/unalz/patches/patch-ad
deleted file mode 100644
index 56bec0fb334..00000000000
--- a/archivers/unalz/patches/patch-ad
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2012/05/23 04:11:38 dholland Exp $
-
- - <locale.h> is needed to declare LC_ALL.
- - update const compliance for recent C++ compilers
-
---- main.cpp.orig	2007-02-10 15:08:27.000000000 +0000
-+++ main.cpp
-@@ -2,6 +2,7 @@
- #	pragma warning( disable : 4786 )		// stl warning ¾ø¾Ö±â

- #endif

- 

-+#include <locale.h>

- #include <stdio.h>

- #include <iostream>

- #include <time.h>

-@@ -131,7 +132,7 @@ int main(int argc, char* argv[])

- 

- 	CUnAlz	unalz;

- 	char* source=NULL;

--	char* destpath=".";

-+	const char* destpath=".";

- 	char* destcodepage=NULL;

- 	char* password=NULL;

- 	int   count;