Update to 3.8.3, changes unknown.

patch-aa was included upstream.

4 files changed, 14 insertions, 50 deletions

diff --git a/archivers/unrar/Makefile b/archivers/unrar/Makefile
index 0cf22b4a289..721626b82cc 100644
--- a/archivers/unrar/Makefile
+++ b/archivers/unrar/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.58 2008/09/21 10:45:34 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2008/10/09 13:27:35 wiz Exp $
 
-DISTNAME=	unrarsrc-3.7.8
+DISTNAME=	unrarsrc-3.8.3
 PKGNAME=	${DISTNAME:S/src//}
-PKGREVISION=	2
 CATEGORIES=	archivers
 MASTER_SITES=	http://www.rarlab.com/rar/ \
 		ftp://ftp.rarlab.com/rar/
@@ -16,6 +15,8 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 NO_CONFIGURE=	YES
 USE_LANGUAGES=	c++
+# XXX: makefile.unix has DOS line endings
+USE_TOOLS+=	gmake
 
 MAKE_FILE=	makefile.unix
 
diff --git a/archivers/unrar/distinfo b/archivers/unrar/distinfo
index 5e6ec0da40f..ebe2f07a1ee 100644
--- a/archivers/unrar/distinfo
+++ b/archivers/unrar/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.36 2008/09/21 10:45:34 wiz Exp $
+$NetBSD: distinfo,v 1.37 2008/10/09 13:27:35 wiz Exp $
 
-SHA1 (unrarsrc-3.7.8.tar.gz) = b2146b8021274cd6a0a3b816b2ec6f241c62baea
-RMD160 (unrarsrc-3.7.8.tar.gz) = 0cabdd5f3d0698889dddff56669eafdcb922c327
-Size (unrarsrc-3.7.8.tar.gz) = 131120 bytes
-SHA1 (patch-aa) = 272060ab4fcaaae0de0d99a8533b268a3aa6d91a
-SHA1 (patch-ac) = ce3b9a618045d7ca7232e1622ac84bd82216e297
+SHA1 (unrarsrc-3.8.3.tar.gz) = 3b14c8b1ae43911e18c15a10d53db631d6ed6818
+RMD160 (unrarsrc-3.8.3.tar.gz) = 1fdfdc66b31ce30844df0b868749710531ea7dcd
+Size (unrarsrc-3.8.3.tar.gz) = 135689 bytes
+SHA1 (patch-ac) = ca8bcbc1ce6723a2cd576067c6fbd171abb0c711
diff --git a/archivers/unrar/patches/patch-aa b/archivers/unrar/patches/patch-aa
deleted file mode 100644
index 00afc74b821..00000000000
--- a/archivers/unrar/patches/patch-aa
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-aa,v 1.12 2005/05/21 15:30:06 wiz Exp $
-
---- makefile.unix.orig	2005-04-30 09:00:12.000000000 +0200
-+++ makefile.unix
-@@ -6,8 +6,8 @@
- #
- 
- # Linux using GCC
--CXX=g++
--CXXFLAGS=-O2
-+#CXX=g++
-+#CXXFLAGS=-O2
- DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
- STRIP=strip
- 
-@@ -82,9 +82,11 @@ STRIP=strip
- 
- ##########################
- 
--COMPILE=$(CXX) $(CXXFLAGS) $(DEFINES)
-+COMPILE=$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(DEFINES)
- LINK=$(CXX)
- 
-+WHAT=UNRAR
-+
- UNRAR_OBJ=filestr.o recvol.o rs.o scantree.o
- LIB_OBJ=filestr.o scantree.o dll.o
- 
-@@ -101,7 +103,6 @@ all:	unrar
- clean:
- 	@rm -f *.o *.bak *~
- 
--unrar:	WHAT=UNRAR
- unrar:	$(OBJECTS) $(UNRAR_OBJ)
- 	@rm -f unrar
- 	$(LINK) -o unrar $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS)	
diff --git a/archivers/unrar/patches/patch-ac b/archivers/unrar/patches/patch-ac
index 415562efb6a..b54b759f29d 100644
--- a/archivers/unrar/patches/patch-ac
+++ b/archivers/unrar/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2005/09/17 20:37:29 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2008/10/09 13:27:35 wiz Exp $
 
---- os.hpp.orig	2005-08-03 18:34:30.000000000 +0200
+--- os.hpp.orig	2008-09-16 14:24:56.000000000 +0000
 +++ os.hpp
-@@ -133,7 +133,8 @@
+@@ -135,7 +135,8 @@
  
  #endif
  
@@ -12,7 +12,7 @@ $NetBSD: patch-ac,v 1.1 2005/09/17 20:37:29 wiz Exp $
  
  #define  NM  1024
  
-@@ -208,6 +209,12 @@
+@@ -212,6 +213,12 @@
    #endif
  #endif
  
@@ -24,4 +24,4 @@ $NetBSD: patch-ac,v 1.1 2005/09/17 20:37:29 wiz Exp $
 +
  #endif
  
- typedef const char* MSGID;
+   typedef const char* MSGID;