archivers/libunrar6: Move to archivers/libunrar

Unversion archivers/libunrar6 now that this is the only version
of libunrar in the ports tree.

11 files changed, 10 insertions, 10 deletions

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/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
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 <bsd.port.mk>
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 <bsd.port.mk>
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