From bc8993b85b9486eec098bbfa8b175d255e9e42b8 Mon Sep 17 00:00:00 2001 From: "Jason E. Hale" Date: Wed, 21 Jun 2023 01:24:33 -0400 Subject: archivers/libunrar6: Move to archivers/libunrar Unversion archivers/libunrar6 now that this is the only version of libunrar in the ports tree. --- MOVED | 2 +- archivers/Makefile | 2 +- archivers/libunrar/Makefile | 49 ++++++++++ archivers/libunrar/distinfo | 3 + archivers/libunrar/files/patch-os.hpp | 13 +++ archivers/libunrar/files/patch-rijndael.cpp | 136 +++++++++++++++++++++++++++ archivers/libunrar/files/patch-rijndael.hpp | 24 +++++ archivers/libunrar/pkg-descr | 4 + archivers/libunrar6/Makefile | 51 ---------- archivers/libunrar6/distinfo | 3 - archivers/libunrar6/files/patch-os.hpp | 13 --- archivers/libunrar6/files/patch-rijndael.cpp | 136 --------------------------- archivers/libunrar6/files/patch-rijndael.hpp | 24 ----- archivers/libunrar6/pkg-descr | 4 - graphics/py-mcomix/Makefile | 3 +- sysutils/fusefs-rar2fs/Makefile | 6 +- x11-fm/doublecmd/Makefile | 3 +- 17 files changed, 238 insertions(+), 238 deletions(-) create mode 100644 archivers/libunrar/Makefile create mode 100644 archivers/libunrar/distinfo create mode 100644 archivers/libunrar/files/patch-os.hpp create mode 100644 archivers/libunrar/files/patch-rijndael.cpp create mode 100644 archivers/libunrar/files/patch-rijndael.hpp create mode 100644 archivers/libunrar/pkg-descr delete mode 100644 archivers/libunrar6/Makefile delete mode 100644 archivers/libunrar6/distinfo delete mode 100644 archivers/libunrar6/files/patch-os.hpp delete mode 100644 archivers/libunrar6/files/patch-rijndael.cpp delete mode 100644 archivers/libunrar6/files/patch-rijndael.hpp delete mode 100644 archivers/libunrar6/pkg-descr diff --git a/MOVED b/MOVED index a83bb8ae39dd..2e12a4c1dfff 100644 --- a/MOVED +++ b/MOVED @@ -7632,7 +7632,6 @@ www/rubygem-rack227|www/rubygem-rack22|2023-06-05|Remove obsoleted port. Use www databases/rubygem-pg13|databases/rubygem-pg|2023-06-05|Remove obsoleted port. Use databases/rubygem-pg instead devel/rubygem-fast_gettext1|devel/rubygem-fast_gettext|2023-06-05|Remove obsoleted port. Use devel/rubygem-fast_gettext instead devel/rubygem-gettext-setup0|devel/rubygem-gettext-setup|2023-06-05|Remove obsoleted port. Use devel/rubygem-gettext-setup instead -archivers/libunrar|archivers/libunrar6|2023-06-06|Remove obsoleted port. Use archivers/libunrar6 instead x11/radare-cutter||2023-06-07|Has expired: Cutter for radare has been discontinued as Cutter has moved to use rizin as their backend framework security/py-sequoia||2023-06-09|Deprecated upstream, broken as based on older dependency audio/hvl2wav|audio/ocp|2023-06-10|Has expired: Abandoned upstream, use audio/ocp instead @@ -7649,3 +7648,4 @@ comms/deforaos-phone||2023-06-18|Removed, needs expired x11/deforaos-panel textproc/apache-solr9|textproc/apache-solr|2023-06-18|New stable release games/poker-eval||2023-06-20|Upstream vanished graphics/3d-ascii-viewer-c|graphics/3d-ascii-viewer|2023-06-21|Project was renamed +archivers/libunrar6|archivers/libunrar|2023-06-21|Moved to unversioned origin. Use archivers/libunrar instead diff --git a/archivers/Makefile b/archivers/Makefile index bb18abda91cd..22e73d5ae510 100644 --- a/archivers/Makefile +++ b/archivers/Makefile @@ -69,7 +69,7 @@ SUBDIR += libmspack SUBDIR += libpar2 SUBDIR += librtfcomp - SUBDIR += libunrar6 + SUBDIR += libunrar SUBDIR += libzip SUBDIR += libzippp SUBDIR += linux-c7-lz4 diff --git a/archivers/libunrar/Makefile b/archivers/libunrar/Makefile new file mode 100644 index 000000000000..9f6a60bf0732 --- /dev/null +++ b/archivers/libunrar/Makefile @@ -0,0 +1,49 @@ +PORTNAME= libunrar +PORTVERSION= 6.2.8 +CATEGORIES= archivers +MASTER_SITES= http://www.rarlab.com/rar/ +DISTNAME= unrarsrc-${PORTVERSION} + +MAINTAINER= jhale@FreeBSD.org +COMMENT= RAR archive extraction library +WWW= https://www.rarlab.com/ + +LICENSE= UNRAR +LICENSE_NAME= UnRAR License +LICENSE_FILE= ${WRKSRC}/license.txt +LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept + +USES= compiler:c++11-lang gmake +USE_LDCONFIG= yes + +ALL_TARGET= lib +MAKEFILE= makefile +MAKE_ARGS= AR="${AR}" \ + CXX="${CXX}" \ + CXXFLAGS="${CXXFLAGS} -fPIC" \ + LDFLAGS="-Wl,-soname,${SONAME} -pthread ${LDFLAGS}" \ + STRIP="${STRIP_CMD}" +SONAME= libunrar.so.6 +WRKSRC= ${WRKDIR}/unrar + +OPTIONS_DEFINE= OPENSSL_AES +OPTIONS_DEFAULT= OPENSSL_AES + +OPENSSL_AES_DESC= Use OpenSSL implementation of AES +OPENSSL_AES_CPPFLAGS= -DOPENSSL_AES -I${OPENSSLINC} +OPENSSL_AES_LDFLAGS= -L${OPENSSLLIB} -lcrypto +OPENSSL_AES_USES= ssl + +PLIST_FILES= lib/libunrar.a \ + lib/libunrar.so \ + lib/${SONAME} \ + include/${PORTNAME}/dll.hpp + +do-install: + ${INSTALL_DATA} ${WRKSRC}/libunrar.a ${STAGEDIR}${PREFIX}/lib/libunrar.a + ${INSTALL_LIB} ${WRKSRC}/libunrar.so ${STAGEDIR}${PREFIX}/lib/${SONAME} + ${RLN} ${STAGEDIR}${PREFIX}/lib/${SONAME} ${STAGEDIR}${PREFIX}/lib/${SONAME:R} + @${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME} + ${INSTALL_DATA} ${WRKSRC}/dll.hpp ${STAGEDIR}${PREFIX}/include/${PORTNAME}/dll.hpp + +.include diff --git a/archivers/libunrar/distinfo b/archivers/libunrar/distinfo new file mode 100644 index 000000000000..b35936afea0e --- /dev/null +++ b/archivers/libunrar/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1686905718 +SHA256 (unrarsrc-6.2.8.tar.gz) = 1777e3d3b073815ff68a411ddb1ab76d0a4e1f58ecc7080035b27b52967ff911 +SIZE (unrarsrc-6.2.8.tar.gz) = 246249 diff --git a/archivers/libunrar/files/patch-os.hpp b/archivers/libunrar/files/patch-os.hpp new file mode 100644 index 000000000000..ef633fb42257 --- /dev/null +++ b/archivers/libunrar/files/patch-os.hpp @@ -0,0 +1,13 @@ +--- os.hpp.orig 2023-01-17 16:25:54 UTC ++++ os.hpp +@@ -173,6 +173,10 @@ + #include + + ++#ifdef OPENSSL_AES ++#include ++#endif // OPENSSL_AES ++ + #ifdef S_IFLNK + #define SAVE_LINKS + #endif diff --git a/archivers/libunrar/files/patch-rijndael.cpp b/archivers/libunrar/files/patch-rijndael.cpp new file mode 100644 index 000000000000..92b411d99b5c --- /dev/null +++ b/archivers/libunrar/files/patch-rijndael.cpp @@ -0,0 +1,136 @@ +--- rijndael.cpp.orig 2023-01-17 16:25:54 UTC ++++ rijndael.cpp +@@ -3,6 +3,8 @@ + **************************************************************************/ + #include "rar.hpp" + ++#ifndef OPENSSL_AES ++ + #ifdef USE_SSE + #include + #endif +@@ -75,6 +77,7 @@ inline void Copy128(byte *dest,const byte *src) + #endif + } + ++#endif // OPENSSL_AES + + ////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + // API +@@ -82,14 +85,41 @@ inline void Copy128(byte *dest,const byte *src) + + Rijndael::Rijndael() + { ++#ifndef OPENSSL_AES + if (S5[0]==0) + GenerateTables(); ++#endif // OPENSSL_AES + CBCMode = true; // Always true for RAR. + } + + + void Rijndael::Init(bool Encrypt,const byte *key,uint keyLen,const byte * initVector) + { ++#ifdef OPENSSL_AES ++ const EVP_CIPHER *cipher; ++ switch(keyLen) ++ { ++ case 128: ++ cipher = EVP_aes_128_cbc(); ++ break; ++ case 192: ++ cipher = EVP_aes_192_cbc(); ++ break; ++ case 256: ++ cipher = EVP_aes_256_cbc(); ++ break; ++ } ++ ++#if OPENSSL_VERSION_NUMBER < 0x10100000L ++ EVP_CIPHER_CTX_init(&ctx); ++ EVP_CipherInit_ex(&ctx, cipher, NULL, key, initVector, Encrypt); ++ EVP_CIPHER_CTX_set_padding(&ctx, 0); ++#else ++ EVP_CIPHER_CTX_init(ctx); ++ EVP_CipherInit_ex(ctx, cipher, NULL, key, initVector, Encrypt); ++ EVP_CIPHER_CTX_set_padding(ctx, 0); ++#endif ++#else // OPENSSL_AES + // Check SIMD here instead of constructor, so if object is a part of some + // structure memset'ed before use, these variables are not lost. + #if defined(USE_SSE) +@@ -141,6 +171,7 @@ void Rijndael::Init(bool Encrypt,const byte *key,uint + + if(!Encrypt) + keyEncToDec(); ++#endif // OPENSSL_AES + } + + +@@ -149,6 +180,15 @@ void Rijndael::blockEncrypt(const byte *input,size_t i + if (inputLen <= 0) + return; + ++#ifdef OPENSSL_AES ++ int outLen; ++#if OPENSSL_VERSION_NUMBER < 0x10100000L ++ EVP_CipherUpdate(&ctx, outBuffer, &outLen, input, inputLen); ++#else ++ EVP_CipherUpdate(ctx, outBuffer, &outLen, input, inputLen); ++#endif ++ return; ++#else // OPENSSL_AES + size_t numBlocks = inputLen/16; + #if defined(USE_SSE) + if (AES_NI) +@@ -213,6 +253,7 @@ void Rijndael::blockEncrypt(const byte *input,size_t i + input += 16; + } + Copy128(m_initVector,prevBlock); ++#endif // OPENSSL_AES + } + + +@@ -288,6 +329,15 @@ void Rijndael::blockDecrypt(const byte *input, size_t + if (inputLen <= 0) + return; + ++#ifdef OPENSSL_AES ++ int outLen; ++#if OPENSSL_VERSION_NUMBER < 0x10100000L ++ EVP_CipherUpdate(&ctx, outBuffer, &outLen, input, inputLen); ++#else ++ EVP_CipherUpdate(ctx, outBuffer, &outLen, input, inputLen); ++#endif ++ return; ++#else // OPENSSL_AES + size_t numBlocks=inputLen/16; + #if defined(USE_SSE) + if (AES_NI) +@@ -356,6 +406,8 @@ void Rijndael::blockDecrypt(const byte *input, size_t + } + + memcpy(m_initVector,iv,16); ++ ++#endif // OPENSSL_AES + } + + +@@ -426,7 +478,7 @@ void Rijndael::blockDecryptNeon(const byte *input, siz + } + #endif + +- ++#ifndef OPENSSL_AES + ////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + // ALGORITHM + ////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +@@ -555,7 +607,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]=gmul(b,0xe); + } + } +- ++#endif // OPENSSL_AES + + #if 0 + static void TestRijndael(); diff --git a/archivers/libunrar/files/patch-rijndael.hpp b/archivers/libunrar/files/patch-rijndael.hpp new file mode 100644 index 000000000000..0e1ccbfbd379 --- /dev/null +++ b/archivers/libunrar/files/patch-rijndael.hpp @@ -0,0 +1,24 @@ +--- rijndael.hpp.orig 2023-01-17 16:25:54 UTC ++++ rijndael.hpp +@@ -12,6 +12,13 @@ + class Rijndael + { + private: ++#ifdef OPENSSL_AES ++#if OPENSSL_VERSION_NUMBER < 0x10100000L ++ EVP_CIPHER_CTX ctx; ++#else ++ EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new(); ++#endif ++#else // OPENSSL_AES + #ifdef USE_SSE + void blockEncryptSSE(const byte *input,size_t numBlocks,byte *outBuffer); + void blockDecryptSSE(const byte *input, size_t numBlocks, byte *outBuffer); +@@ -31,6 +38,7 @@ class Rijndael + void keySched(byte key[_MAX_KEY_COLUMNS][4]); + void keyEncToDec(); + void GenerateTables(); ++#endif // OPENSSL_AES + + // RAR always uses CBC, but we may need to turn it off when calling + // this code from other archive formats with CTR and other modes. diff --git a/archivers/libunrar/pkg-descr b/archivers/libunrar/pkg-descr new file mode 100644 index 000000000000..799db1eedf95 --- /dev/null +++ b/archivers/libunrar/pkg-descr @@ -0,0 +1,4 @@ +The UnRAR library is a minor part of the RAR archiver and contains +the RAR uncompression algorithm. UnRAR requires a very small amount +of memory to operate. It can be used by other programs to extract +RAR archives. diff --git a/archivers/libunrar6/Makefile b/archivers/libunrar6/Makefile deleted file mode 100644 index 2e746185298c..000000000000 --- a/archivers/libunrar6/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -PORTNAME= libunrar6 -PORTVERSION= 6.2.8 -CATEGORIES= archivers -MASTER_SITES= http://www.rarlab.com/rar/ -DISTNAME= unrarsrc-${PORTVERSION} - -MAINTAINER= jhale@FreeBSD.org -COMMENT= RAR archive extraction library -WWW= https://www.rarlab.com/ - -LICENSE= UNRAR -LICENSE_NAME= UnRAR License -LICENSE_FILE= ${WRKSRC}/license.txt -LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept - -USES= compiler:c++11-lang gmake -USE_LDCONFIG= yes - -CONFLICTS_INSTALL= libunrar # lib/libunrar.so - -ALL_TARGET= lib -MAKEFILE= makefile -MAKE_ARGS= AR="${AR}" \ - CXX="${CXX}" \ - CXXFLAGS="${CXXFLAGS} -fPIC" \ - LDFLAGS="-Wl,-soname,${SONAME} -pthread ${LDFLAGS}" \ - STRIP="${STRIP_CMD}" -SONAME= libunrar.so.6 -WRKSRC= ${WRKDIR}/unrar - -OPTIONS_DEFINE= OPENSSL_AES -OPTIONS_DEFAULT= OPENSSL_AES - -OPENSSL_AES_DESC= Use OpenSSL implementation of AES -OPENSSL_AES_CPPFLAGS= -DOPENSSL_AES -I${OPENSSLINC} -OPENSSL_AES_LDFLAGS= -L${OPENSSLLIB} -lcrypto -OPENSSL_AES_USES= ssl - -PLIST_FILES= lib/libunrar.a \ - lib/libunrar.so \ - lib/${SONAME} \ - include/${PORTNAME}/dll.hpp - -do-install: - ${INSTALL_DATA} ${WRKSRC}/libunrar.a ${STAGEDIR}${PREFIX}/lib/libunrar.a - ${INSTALL_LIB} ${WRKSRC}/libunrar.so ${STAGEDIR}${PREFIX}/lib/${SONAME} - ${RLN} ${STAGEDIR}${PREFIX}/lib/${SONAME} ${STAGEDIR}${PREFIX}/lib/${SONAME:R} - @${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME} - ${INSTALL_DATA} ${WRKSRC}/dll.hpp ${STAGEDIR}${PREFIX}/include/${PORTNAME}/dll.hpp - -.include diff --git a/archivers/libunrar6/distinfo b/archivers/libunrar6/distinfo deleted file mode 100644 index b35936afea0e..000000000000 --- a/archivers/libunrar6/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1686905718 -SHA256 (unrarsrc-6.2.8.tar.gz) = 1777e3d3b073815ff68a411ddb1ab76d0a4e1f58ecc7080035b27b52967ff911 -SIZE (unrarsrc-6.2.8.tar.gz) = 246249 diff --git a/archivers/libunrar6/files/patch-os.hpp b/archivers/libunrar6/files/patch-os.hpp deleted file mode 100644 index ef633fb42257..000000000000 --- a/archivers/libunrar6/files/patch-os.hpp +++ /dev/null @@ -1,13 +0,0 @@ ---- os.hpp.orig 2023-01-17 16:25:54 UTC -+++ os.hpp -@@ -173,6 +173,10 @@ - #include - - -+#ifdef OPENSSL_AES -+#include -+#endif // OPENSSL_AES -+ - #ifdef S_IFLNK - #define SAVE_LINKS - #endif diff --git a/archivers/libunrar6/files/patch-rijndael.cpp b/archivers/libunrar6/files/patch-rijndael.cpp deleted file mode 100644 index 92b411d99b5c..000000000000 --- a/archivers/libunrar6/files/patch-rijndael.cpp +++ /dev/null @@ -1,136 +0,0 @@ ---- rijndael.cpp.orig 2023-01-17 16:25:54 UTC -+++ rijndael.cpp -@@ -3,6 +3,8 @@ - **************************************************************************/ - #include "rar.hpp" - -+#ifndef OPENSSL_AES -+ - #ifdef USE_SSE - #include - #endif -@@ -75,6 +77,7 @@ inline void Copy128(byte *dest,const byte *src) - #endif - } - -+#endif // OPENSSL_AES - - ////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - // API -@@ -82,14 +85,41 @@ inline void Copy128(byte *dest,const byte *src) - - Rijndael::Rijndael() - { -+#ifndef OPENSSL_AES - if (S5[0]==0) - GenerateTables(); -+#endif // OPENSSL_AES - CBCMode = true; // Always true for RAR. - } - - - void Rijndael::Init(bool Encrypt,const byte *key,uint keyLen,const byte * initVector) - { -+#ifdef OPENSSL_AES -+ const EVP_CIPHER *cipher; -+ switch(keyLen) -+ { -+ case 128: -+ cipher = EVP_aes_128_cbc(); -+ break; -+ case 192: -+ cipher = EVP_aes_192_cbc(); -+ break; -+ case 256: -+ cipher = EVP_aes_256_cbc(); -+ break; -+ } -+ -+#if OPENSSL_VERSION_NUMBER < 0x10100000L -+ EVP_CIPHER_CTX_init(&ctx); -+ EVP_CipherInit_ex(&ctx, cipher, NULL, key, initVector, Encrypt); -+ EVP_CIPHER_CTX_set_padding(&ctx, 0); -+#else -+ EVP_CIPHER_CTX_init(ctx); -+ EVP_CipherInit_ex(ctx, cipher, NULL, key, initVector, Encrypt); -+ EVP_CIPHER_CTX_set_padding(ctx, 0); -+#endif -+#else // OPENSSL_AES - // Check SIMD here instead of constructor, so if object is a part of some - // structure memset'ed before use, these variables are not lost. - #if defined(USE_SSE) -@@ -141,6 +171,7 @@ void Rijndael::Init(bool Encrypt,const byte *key,uint - - if(!Encrypt) - keyEncToDec(); -+#endif // OPENSSL_AES - } - - -@@ -149,6 +180,15 @@ void Rijndael::blockEncrypt(const byte *input,size_t i - if (inputLen <= 0) - return; - -+#ifdef OPENSSL_AES -+ int outLen; -+#if OPENSSL_VERSION_NUMBER < 0x10100000L -+ EVP_CipherUpdate(&ctx, outBuffer, &outLen, input, inputLen); -+#else -+ EVP_CipherUpdate(ctx, outBuffer, &outLen, input, inputLen); -+#endif -+ return; -+#else // OPENSSL_AES - size_t numBlocks = inputLen/16; - #if defined(USE_SSE) - if (AES_NI) -@@ -213,6 +253,7 @@ void Rijndael::blockEncrypt(const byte *input,size_t i - input += 16; - } - Copy128(m_initVector,prevBlock); -+#endif // OPENSSL_AES - } - - -@@ -288,6 +329,15 @@ void Rijndael::blockDecrypt(const byte *input, size_t - if (inputLen <= 0) - return; - -+#ifdef OPENSSL_AES -+ int outLen; -+#if OPENSSL_VERSION_NUMBER < 0x10100000L -+ EVP_CipherUpdate(&ctx, outBuffer, &outLen, input, inputLen); -+#else -+ EVP_CipherUpdate(ctx, outBuffer, &outLen, input, inputLen); -+#endif -+ return; -+#else // OPENSSL_AES - size_t numBlocks=inputLen/16; - #if defined(USE_SSE) - if (AES_NI) -@@ -356,6 +406,8 @@ void Rijndael::blockDecrypt(const byte *input, size_t - } - - memcpy(m_initVector,iv,16); -+ -+#endif // OPENSSL_AES - } - - -@@ -426,7 +478,7 @@ void Rijndael::blockDecryptNeon(const byte *input, siz - } - #endif - -- -+#ifndef OPENSSL_AES - ////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - // ALGORITHM - ////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -@@ -555,7 +607,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]=gmul(b,0xe); - } - } -- -+#endif // OPENSSL_AES - - #if 0 - static void TestRijndael(); diff --git a/archivers/libunrar6/files/patch-rijndael.hpp b/archivers/libunrar6/files/patch-rijndael.hpp deleted file mode 100644 index 0e1ccbfbd379..000000000000 --- a/archivers/libunrar6/files/patch-rijndael.hpp +++ /dev/null @@ -1,24 +0,0 @@ ---- rijndael.hpp.orig 2023-01-17 16:25:54 UTC -+++ rijndael.hpp -@@ -12,6 +12,13 @@ - class Rijndael - { - private: -+#ifdef OPENSSL_AES -+#if OPENSSL_VERSION_NUMBER < 0x10100000L -+ EVP_CIPHER_CTX ctx; -+#else -+ EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new(); -+#endif -+#else // OPENSSL_AES - #ifdef USE_SSE - void blockEncryptSSE(const byte *input,size_t numBlocks,byte *outBuffer); - void blockDecryptSSE(const byte *input, size_t numBlocks, byte *outBuffer); -@@ -31,6 +38,7 @@ class Rijndael - void keySched(byte key[_MAX_KEY_COLUMNS][4]); - void keyEncToDec(); - void GenerateTables(); -+#endif // OPENSSL_AES - - // RAR always uses CBC, but we may need to turn it off when calling - // this code from other archive formats with CTR and other modes. diff --git a/archivers/libunrar6/pkg-descr b/archivers/libunrar6/pkg-descr deleted file mode 100644 index 799db1eedf95..000000000000 --- a/archivers/libunrar6/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -The UnRAR library is a minor part of the RAR archiver and contains -the RAR uncompression algorithm. UnRAR requires a very small amount -of memory to operate. It can be used by other programs to extract -RAR archives. diff --git a/graphics/py-mcomix/Makefile b/graphics/py-mcomix/Makefile index 92a845fed5f0..b00dcaac297f 100644 --- a/graphics/py-mcomix/Makefile +++ b/graphics/py-mcomix/Makefile @@ -1,5 +1,6 @@ PORTNAME= mcomix PORTVERSION= 2.1.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/MComix-${PORTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -23,6 +24,6 @@ OPTIONS_DEFINE= RAR OPTIONS_DEFAULT=RAR RAR_DESC= RAR (.cbr) comic book archives support -RAR_RUN_DEPENDS=${LOCALBASE}/lib/libunrar.so.6:archivers/libunrar6 +RAR_RUN_DEPENDS=${LOCALBASE}/lib/libunrar.so:archivers/libunrar .include diff --git a/sysutils/fusefs-rar2fs/Makefile b/sysutils/fusefs-rar2fs/Makefile index c75f638c187a..ab1dd062143b 100644 --- a/sysutils/fusefs-rar2fs/Makefile +++ b/sysutils/fusefs-rar2fs/Makefile @@ -1,7 +1,7 @@ PORTNAME= rar2fs DISTVERSION= 1.29.5 DISTVERSIONPREFIX= v -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= sysutils PKGNAMEPREFIX= fusefs- @@ -13,7 +13,7 @@ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${NONEXISTENT}:${LIBUNRAR_PORT}:patch -LIB_DEPENDS= libunrar.so.6:${LIBUNRAR_PORT} +LIB_DEPENDS= libunrar.so:${LIBUNRAR_PORT} USES= autoreconf compiler:c11 gmake fuse USE_GITHUB= yes @@ -31,7 +31,7 @@ PLIST_FILES= bin/${PORTNAME} \ bin/mkr2i \ man/man1/rar2fs.1.gz -LIBUNRAR_PORT= archivers/libunrar6 +LIBUNRAR_PORT= archivers/libunrar LIBUNRAR_PKG= ${LIBUNRAR_PORT:S|archivers/||} .include diff --git a/x11-fm/doublecmd/Makefile b/x11-fm/doublecmd/Makefile index a01ff074c4a4..854b9e718211 100644 --- a/x11-fm/doublecmd/Makefile +++ b/x11-fm/doublecmd/Makefile @@ -1,5 +1,6 @@ PORTNAME= doublecmd PORTVERSION= 1.0.11 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= x11-fm PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX} @@ -80,7 +81,7 @@ WFX_SAMBA_DESC= SMB protocol support WLX_DESC= Internal viewer plugins WLX_MPLAYER_DESC= Use MPlayer for multimedia files -WCX_UNRAR_LIB_DEPENDS= libunrar.so.6:archivers/libunrar6 +WCX_UNRAR_LIB_DEPENDS= libunrar.so:archivers/libunrar WFX_SAMBA_USES= samba:lib WLX_MPLAYER_RUN_DEPENDS= mplayer:multimedia/mplayer -- cgit v1.2.3