Update to 5.0.7:

No changelog found.

5 files changed, 8 insertions, 74 deletions

diff --git a/archivers/unrar/Makefile b/archivers/unrar/Makefile
index 4d114e87f51..aec209f229c 100644
--- a/archivers/unrar/Makefile
+++ b/archivers/unrar/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.67 2012/09/14 12:44:06 wiz Exp $
+# $NetBSD: Makefile,v 1.68 2013/07/02 06:40:56 wiz Exp $
 
-DISTNAME=	unrarsrc-4.2.4
+DISTNAME=	unrarsrc-5.0.7
 PKGNAME=	${DISTNAME:S/src//}
 CATEGORIES=	archivers
 MASTER_SITES=	http://www.rarlab.com/rar/
@@ -9,26 +9,20 @@ MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	http://www.rarlab.com/
 COMMENT=	Extract, view & test RAR archives
 LICENSE=	unrar-license
-
-RESTRICTED=	Do not charge a fee for redistribution.  Do not use to develop a rar archiver.
-# Reading the license implies NO_BIN_ON_FTP should be set because no
-# permission is granted to distribute derived works (e.g., binaries).
 # From private mail addressed to pkgsrc maintainers:
 #
 # Date: Wed, 10 Sep 2008 18:27:35 +0600
 # From: Eugene Roshal <roshal@rarlab.com>
 # You can redistribute either original or modified binaries or sources.
-NO_SRC_ON_CDROM=${RESTRICTED}
-NO_BIN_ON_CDROM=${RESTRICTED}
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 NO_CONFIGURE=	YES
 USE_LANGUAGES=	c++
-# XXX: makefile.unix has DOS line endings
+# XXX: makefile has DOS line endings
 USE_TOOLS+=	gmake
 
-MAKE_FILE=	makefile.unix
+MAKE_FILE=	makefile
 
 WRKSRC=		${WRKDIR}/unrar
 
@@ -39,14 +33,4 @@ do-install:
 	cd ${WRKSRC} && ${INSTALL_DATA} readme.txt license.txt	\
 		${DESTDIR}${PREFIX}/share/doc/unrar
 
-.include "../../mk/bsd.prefs.mk"
-
-# Don't set _LARGEFILE_SOURCE for platforms w/o ftello() and fseeko().
-#
-.for platform in Interix-* NetBSD-1.5*
-.  if ${MACHINE_PLATFORM:M${platform}} != ""
-.MAKEFLAGS+=	DEFINES=""
-.  endif
-.endfor
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/unrar/distinfo b/archivers/unrar/distinfo
index d42971b2090..8a5902e35d7 100644
--- a/archivers/unrar/distinfo
+++ b/archivers/unrar/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.46 2012/11/07 22:35:55 adam Exp $
+$NetBSD: distinfo,v 1.47 2013/07/02 06:40:56 wiz Exp $
 
-SHA1 (unrarsrc-4.2.4.tar.gz) = 1cc29603fb4e4df16a3aa9bfc7da1afaf0923259
-RMD160 (unrarsrc-4.2.4.tar.gz) = 53a590ed2a71be86a0a7abfe9c37ddc8dc869800
-Size (unrarsrc-4.2.4.tar.gz) = 164641 bytes
-SHA1 (patch-ac) = 4ee81900eff28a01fa609e548a72cfad3f352700
-SHA1 (patch-consio.cpp) = 341dd714b165fabf3dec0213b9bb3e57dcc146f5
-SHA1 (patch-makefile.unix) = 9c8b428d616fb8f9caeddd6bbe65e4902763b0c2
+SHA1 (unrarsrc-5.0.7.tar.gz) = 7d1cd96d29695e90df4aaef426e7068b241e2528
+RMD160 (unrarsrc-5.0.7.tar.gz) = fd3a3ba33e1250e0b9680138a22241a26ee5722e
+Size (unrarsrc-5.0.7.tar.gz) = 208034 bytes
diff --git a/archivers/unrar/patches/patch-ac b/archivers/unrar/patches/patch-ac
deleted file mode 100644
index 5c2850d6126..00000000000
--- a/archivers/unrar/patches/patch-ac
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2012/09/14 14:09:17 wiz Exp $
-
---- os.hpp.orig	2008-09-16 14:24:56.000000000 +0000
-+++ os.hpp
-@@ -212,6 +213,12 @@
-   #endif
- #endif
- 
-+#if defined(__i386) || defined(i386) || defined(__i386__) || defined(__amd64) || defined(amd64) || defined(__amd64__)
-+  #ifndef LITTLE_ENDIAN
-+     #define LITTLE_ENDIAN
-+  #endif
-+#endif
-+
- #endif
- 
-   typedef const char* MSGID;
diff --git a/archivers/unrar/patches/patch-consio.cpp b/archivers/unrar/patches/patch-consio.cpp
deleted file mode 100644
index 29b60312413..00000000000
--- a/archivers/unrar/patches/patch-consio.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-consio.cpp,v 1.1 2011/12/09 13:51:56 hans Exp $
-
-Use getpassphrase(3C) on SunOS to allow passwords longer than 8 chars.
-
---- consio.cpp.orig	2011-03-02 08:43:12.000000000 +0100
-+++ consio.cpp	2011-12-09 14:38:05.903683508 +0100
-@@ -129,6 +129,8 @@ void GetPasswordText(wchar *Str,uint Max
-   char StrA[MAXPASSWORD];
- #if defined(_EMX) || defined(_BEOS) || defined(__sparc) || defined(sparc) || defined (__VMS)
-   fgets(StrA,ASIZE(StrA)-1,stdin);
-+#elif defined(__sun)
-+  strncpyz(StrA,getpassphrase(""),ASIZE(StrA));
- #else
-   strncpyz(StrA,getpass(""),ASIZE(StrA));
- #endif
diff --git a/archivers/unrar/patches/patch-makefile.unix b/archivers/unrar/patches/patch-makefile.unix
deleted file mode 100644
index 21c94167f4b..00000000000
--- a/archivers/unrar/patches/patch-makefile.unix
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-makefile.unix,v 1.1 2012/11/07 22:35:55 adam Exp $
-
-Use pkgsrc provided CXX and CXXFLAGS.
-
---- makefile.unix.orig	2012-11-07 22:31:22.000000000 +0000
-+++ makefile.unix
-@@ -2,8 +2,6 @@
- # Makefile for UNIX - unrar
- 
- # Linux using GCC
--CXX=g++
--CXXFLAGS=-O2
- LIBFLAGS=-fPIC
- DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
- STRIP=strip