From 9c89a75479ed11011996f643940c74ef59228cd5 Mon Sep 17 00:00:00 2001 From: naddy Date: Mon, 26 Nov 2012 17:17:41 +0000 Subject: [PATCH] maintenance update to 4.20; drop maintainer by his request --- archivers/unrar/Makefile | 8 +++----- archivers/unrar/distinfo | 7 ++----- archivers/unrar/patches/patch-makefile_unix | 14 +++++++------- archivers/unrar/patches/patch-os_hpp | 16 ++++++++-------- 4 files changed, 20 insertions(+), 25 deletions(-) diff --git a/archivers/unrar/Makefile b/archivers/unrar/Makefile index aa50fa14b73..9a434736b68 100644 --- a/archivers/unrar/Makefile +++ b/archivers/unrar/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.56 2012/04/08 17:04:20 naddy Exp $ +# $OpenBSD: Makefile,v 1.57 2012/11/26 17:17:41 naddy Exp $ COMMENT= extract, list, and test RAR archives @@ -9,15 +9,13 @@ COMMENT= extract, list, and test RAR archives # to 0 for a non-beta release, e.g., "4.00 beta 6" was succeeded # by "4.00". -PKGNAME= unrar-4.10 +PKGNAME= unrar-4.20 EPOCH= 1 -DISTNAME= unrarsrc-4.1.4 +DISTNAME= unrarsrc-4.2.4 CATEGORIES= archivers HOMEPAGE= http://www.rarlab.com/ -MAINTAINER= Amit Kulkarni - # nonstandard PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes diff --git a/archivers/unrar/distinfo b/archivers/unrar/distinfo index 3b3c5856903..c5ece0ba6dc 100644 --- a/archivers/unrar/distinfo +++ b/archivers/unrar/distinfo @@ -1,5 +1,2 @@ -MD5 (unrarsrc-4.1.4.tar.gz) = gIySpmGCCmN8oTMM9AwY5A== -RMD160 (unrarsrc-4.1.4.tar.gz) = C7IAwB9mUUK3WBsbQO8QR9yhPFc= -SHA1 (unrarsrc-4.1.4.tar.gz) = rkseLJnpZSfEqX+YDapUdJn0Kg8= -SHA256 (unrarsrc-4.1.4.tar.gz) = cF2TKF/NO5wR9o5S2WOV2UK/PCAXLc7hTw148f7lc2E= -SIZE (unrarsrc-4.1.4.tar.gz) = 157135 +SHA256 (unrarsrc-4.2.4.tar.gz) = lDK/eY5fcSPzBg83t1t8B/NvAJEwX0ZHPcrpFU+M1oY= +SIZE (unrarsrc-4.2.4.tar.gz) = 164641 diff --git a/archivers/unrar/patches/patch-makefile_unix b/archivers/unrar/patches/patch-makefile_unix index 20e3d26585b..4293515e32f 100644 --- a/archivers/unrar/patches/patch-makefile_unix +++ b/archivers/unrar/patches/patch-makefile_unix @@ -1,10 +1,10 @@ -$OpenBSD: patch-makefile_unix,v 1.15 2012/04/08 17:04:20 naddy Exp $ ---- makefile.unix.orig Mon May 30 18:47:49 2011 -+++ makefile.unix Sun Apr 8 18:41:22 2012 -@@ -8,9 +8,10 @@ - # Linux using GCC +$OpenBSD: patch-makefile_unix,v 1.16 2012/11/26 17:17:41 naddy Exp $ +--- makefile.unix.orig Tue May 15 07:31:03 2012 ++++ makefile.unix Sun Nov 25 23:28:26 2012 +@@ -5,9 +5,10 @@ CXX=g++ CXXFLAGS=-O2 + LIBFLAGS=-fPIC -DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE +DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DOPENSSL STRIP=strip @@ -13,9 +13,9 @@ $OpenBSD: patch-makefile_unix,v 1.15 2012/04/08 17:04:20 naddy Exp $ # Linux using LCC #CXX=lcc -@@ -106,6 +107,8 @@ OBJECTS=rar.o strlist.o strfn.o pathfn.o savepos.o sma +@@ -103,6 +104,8 @@ OBJECTS=rar.o strlist.o strfn.o pathfn.o savepos.o sma archive.o arcread.o unicode.o system.o isnt.o crypt.o crc.o rawread.o encname.o \ - resource.o match.o timefn.o rdwrfn.o consio.o options.o ulinks.o errhnd.o rarvm.o \ + resource.o match.o timefn.o rdwrfn.o consio.o options.o ulinks.o errhnd.o rarvm.o secpassword.o \ rijndael.o getbits.o sha1.o extinfo.o extract.o volume.o list.o find.o unpack.o cmddata.o + +.SUFFIXES: .cpp diff --git a/archivers/unrar/patches/patch-os_hpp b/archivers/unrar/patches/patch-os_hpp index 938d35ad58e..7115dd7b050 100644 --- a/archivers/unrar/patches/patch-os_hpp +++ b/archivers/unrar/patches/patch-os_hpp @@ -1,7 +1,7 @@ -$OpenBSD: patch-os_hpp,v 1.8 2012/04/08 17:04:20 naddy Exp $ ---- os.hpp.orig Mon Jan 9 14:46:08 2012 -+++ os.hpp Sun Apr 8 18:41:22 2012 -@@ -193,6 +193,10 @@ +$OpenBSD: patch-os_hpp,v 1.9 2012/11/26 17:17:41 naddy Exp $ +--- os.hpp.orig Sat Jun 9 15:21:04 2012 ++++ os.hpp Sun Nov 25 23:31:08 2012 +@@ -169,6 +169,10 @@ #include #include @@ -12,19 +12,19 @@ $OpenBSD: patch-os_hpp,v 1.8 2012/04/08 17:04:20 naddy Exp $ #ifdef S_IFLNK #define SAVE_LINKS #endif -@@ -263,12 +267,12 @@ +@@ -240,12 +244,12 @@ #endif #endif -#if !defined(BIG_ENDIAN) && !defined(_WIN_CE) && defined(_WIN_ALL) +#if defined(ALLOW_NOT_ALIGNED_INT) - /* allow not aligned integer access, increases speed in some operations */ + // Allow not aligned integer access, increases speed in some operations. -#define ALLOW_NOT_ALIGNED_INT +#undef ALLOW_NOT_ALIGNED_INT #endif -#if defined(__sparc) || defined(sparc) || defined(__sparcv9) +#ifndef STRICT_ALIGNMENT_REQUIRED - /* prohibit not aligned access to data structures in text comression - algorithm, increases memory requirements */ + // Prohibit not aligned access to data structures in text compression + // algorithm, increases memory requirements #define STRICT_ALIGNMENT_REQUIRED