Update to 5.50 Beta 1 (5.5.3)

- Convert to options target helper
- Regenerate patch files with makepatch:

5 files changed, 40 insertions, 18 deletions

diff --git a/archivers/unrar/Makefile b/archivers/unrar/Makefile
index 97928e6bfd58..32163596c4b8 100644
--- a/archivers/unrar/Makefile
+++ b/archivers/unrar/Makefile
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	unrar
-PORTVERSION=	5.40
+PORTVERSION=	5.50b1
 PORTEPOCH=	5
 CATEGORIES+=	archivers
 MASTER_SITES=	http://www.rarlab.com/rar/ \
 		LOCAL/sunpoet
-DISTNAME=	unrarsrc-5.4.5
+DISTNAME=	unrarsrc-5.5.3
 
 MAINTAINER?=	sunpoet@FreeBSD.org
 COMMENT=	Extract, view & test RAR archives
@@ -36,6 +36,8 @@ OPENSSL_AES_USES=	ssl
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/unrar ${STAGEDIR}${PREFIX}/bin/
+
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/
 	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
 
diff --git a/archivers/unrar/distinfo b/archivers/unrar/distinfo
index e1306e3add59..dfbe445f9b88 100644
--- a/archivers/unrar/distinfo
+++ b/archivers/unrar/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1472916114
-SHA256 (unrarsrc-5.4.5.tar.gz) = e470c584332422893fb52e049f2cbd99e24dc6c6da971008b4e2ae4284f8796c
-SIZE (unrarsrc-5.4.5.tar.gz) = 226320
+TIMESTAMP = 1493557889
+SHA256 (unrarsrc-5.5.3.tar.gz) = d1d9ef4a9247db088f825666de8f8bb69006d8d8b0e004ff366b3e04c103a2b3
+SIZE (unrarsrc-5.5.3.tar.gz) = 219557
diff --git a/archivers/unrar/files/patch-os.hpp b/archivers/unrar/files/patch-os.hpp
index 0a23dbaaa41e..dff506575c08 100644
--- a/archivers/unrar/files/patch-os.hpp
+++ b/archivers/unrar/files/patch-os.hpp
@@ -1,9 +1,9 @@
---- os.hpp.orig	2013-12-01 08:10:14 UTC
+--- os.hpp.orig	2017-04-28 17:28:46 UTC
 +++ os.hpp
-@@ -151,6 +151,10 @@
- #include <utime.h>
+@@ -150,6 +150,10 @@
  #include <locale.h>
  
+ 
 +#ifdef OPENSSL_AES
 +#include <openssl/evp.h>
 +#endif // OPENSSL_AES
diff --git a/archivers/unrar/files/patch-rijndael.cpp b/archivers/unrar/files/patch-rijndael.cpp
index e6cc85144360..0d48cdad9eaa 100644
--- a/archivers/unrar/files/patch-rijndael.cpp
+++ b/archivers/unrar/files/patch-rijndael.cpp
@@ -1,4 +1,4 @@
---- rijndael.cpp.orig	2014-06-10 17:14:06 UTC
+--- rijndael.cpp.orig	2017-04-28 17:28:47 UTC
 +++ rijndael.cpp
 @@ -7,6 +7,8 @@
   ***************************************************************************/
@@ -9,7 +9,7 @@
  #ifdef USE_SSE
  #include <wmmintrin.h>
  #endif
-@@ -56,6 +58,7 @@
+@@ -56,6 +58,7 @@ inline void Copy128(byte *dest,const byt
  #endif
  }
  
@@ -17,7 +17,7 @@
  
  //////////////////////////////////////////////////////////////////////////////////////////////////////////////////
  // API
-@@ -63,14 +66,35 @@
+@@ -63,14 +66,35 @@ inline void Copy128(byte *dest,const byt
  
  Rijndael::Rijndael()
  {
@@ -53,15 +53,35 @@
  #ifdef USE_SSE
    // Check SSE here instead of constructor, so if object is a part of some
    // structure memset'ed before use, this variable is not lost.
-@@ -111,6 +135,7 @@
+@@ -111,6 +135,7 @@ void Rijndael::Init(bool Encrypt,const b
  
    if(!Encrypt)
      keyEncToDec();
 +#endif // OPENSSL_AES
  }
  
+ void Rijndael::blockEncrypt(const byte *input,size_t inputLen,byte *outBuffer)
+@@ -118,6 +143,11 @@ void Rijndael::blockEncrypt(const byte *
+   if (inputLen <= 0)
+     return;
+ 
++#ifdef OPENSSL_AES
++  int outLen;
++  EVP_CipherUpdate(&ctx, outBuffer, &outLen, input, inputLen);
++  return;
++#else // OPENSSL_AES
+   size_t numBlocks = inputLen/16;
+ #ifdef USE_SSE
+   if (AES_NI)
+@@ -176,6 +206,7 @@ void Rijndael::blockEncrypt(const byte *
+     input += 16;
+   }
+   Copy128(m_initVector,prevBlock);
++#endif // OPENSSL_AES
+ }
+ 
  
-@@ -120,6 +145,11 @@
+@@ -217,6 +248,11 @@ void Rijndael::blockDecrypt(const byte *
    if (inputLen <= 0)
      return;
  
@@ -73,7 +93,7 @@
    size_t numBlocks=inputLen/16;
  #ifdef USE_SSE
    if (AES_NI)
-@@ -182,6 +212,8 @@
+@@ -279,6 +315,8 @@ void Rijndael::blockDecrypt(const byte *
    }
  
    memcpy(m_initVector,iv,16);
@@ -82,7 +102,7 @@
  }
  
  
-@@ -217,7 +249,7 @@
+@@ -314,7 +352,7 @@ void Rijndael::blockDecryptSSE(const byt
  }
  #endif
  
@@ -91,7 +111,7 @@
  //////////////////////////////////////////////////////////////////////////////////////////////////////////////////
  // ALGORITHM
  //////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-@@ -357,7 +389,7 @@
+@@ -454,7 +492,7 @@ void Rijndael::GenerateTables()
      U1[b][0]=U2[b][1]=U3[b][2]=U4[b][3]=T5[i][0]=T6[i][1]=T7[i][2]=T8[i][3]=FFmul0e(b);
    }
  }
diff --git a/archivers/unrar/files/patch-rijndael.hpp b/archivers/unrar/files/patch-rijndael.hpp
index ca305b23e5a7..8cf2a821ed90 100644
--- a/archivers/unrar/files/patch-rijndael.hpp
+++ b/archivers/unrar/files/patch-rijndael.hpp
@@ -1,4 +1,4 @@
---- rijndael.hpp.orig	2014-06-10 17:14:06 UTC
+--- rijndael.hpp.orig	2017-04-28 17:28:47 UTC
 +++ rijndael.hpp
 @@ -16,6 +16,9 @@
  class Rijndael
@@ -10,7 +10,7 @@
  #ifdef USE_SSE
      void blockEncryptSSE(const byte *input,size_t numBlocks,byte *outBuffer);
      void blockDecryptSSE(const byte *input, size_t numBlocks, byte *outBuffer);
-@@ -25,6 +28,7 @@
+@@ -25,6 +28,7 @@ class Rijndael
      void keySched(byte key[_MAX_KEY_COLUMNS][4]);
      void keyEncToDec();
      void GenerateTables();