summaryrefslogtreecommitdiff
path: root/archivers
diff options
context:
space:
mode:
Diffstat (limited to 'archivers')
-rw-r--r--archivers/Makefile2
-rw-r--r--archivers/libunrar/Makefile (renamed from archivers/libunrar6/Makefile)4
-rw-r--r--archivers/libunrar/distinfo (renamed from archivers/libunrar6/distinfo)0
-rw-r--r--archivers/libunrar/files/patch-os.hpp (renamed from archivers/libunrar6/files/patch-os.hpp)0
-rw-r--r--archivers/libunrar/files/patch-rijndael.cpp (renamed from archivers/libunrar6/files/patch-rijndael.cpp)0
-rw-r--r--archivers/libunrar/files/patch-rijndael.hpp (renamed from archivers/libunrar6/files/patch-rijndael.hpp)0
-rw-r--r--archivers/libunrar/pkg-descr (renamed from archivers/libunrar6/pkg-descr)0
7 files changed, 2 insertions, 4 deletions
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/libunrar6/Makefile b/archivers/libunrar/Makefile
index 2e746185298c..9f6a60bf0732 100644
--- a/archivers/libunrar6/Makefile
+++ b/archivers/libunrar/Makefile
@@ -1,4 +1,4 @@
-PORTNAME= libunrar6
+PORTNAME= libunrar
PORTVERSION= 6.2.8
CATEGORIES= archivers
MASTER_SITES= http://www.rarlab.com/rar/
@@ -16,8 +16,6 @@ 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}" \
diff --git a/archivers/libunrar6/distinfo b/archivers/libunrar/distinfo
index b35936afea0e..b35936afea0e 100644
--- a/archivers/libunrar6/distinfo
+++ b/archivers/libunrar/distinfo
diff --git a/archivers/libunrar6/files/patch-os.hpp b/archivers/libunrar/files/patch-os.hpp
index ef633fb42257..ef633fb42257 100644
--- a/archivers/libunrar6/files/patch-os.hpp
+++ b/archivers/libunrar/files/patch-os.hpp
diff --git a/archivers/libunrar6/files/patch-rijndael.cpp b/archivers/libunrar/files/patch-rijndael.cpp
index 92b411d99b5c..92b411d99b5c 100644
--- a/archivers/libunrar6/files/patch-rijndael.cpp
+++ b/archivers/libunrar/files/patch-rijndael.cpp
diff --git a/archivers/libunrar6/files/patch-rijndael.hpp b/archivers/libunrar/files/patch-rijndael.hpp
index 0e1ccbfbd379..0e1ccbfbd379 100644
--- a/archivers/libunrar6/files/patch-rijndael.hpp
+++ b/archivers/libunrar/files/patch-rijndael.hpp
diff --git a/archivers/libunrar6/pkg-descr b/archivers/libunrar/pkg-descr
index 799db1eedf95..799db1eedf95 100644
--- a/archivers/libunrar6/pkg-descr
+++ b/archivers/libunrar/pkg-descr