Rename sysutils/xfce4-xarchiver to archivers/xarchiver

xarchiver is no longer part of xfce (for years), and the package
name and location makes it difficult to find. match other package
managers.

11 files changed, 31 insertions, 25 deletions

diff --git a/archivers/Makefile b/archivers/Makefile
index aee8e48e757..fdc9e3cc329 100644
--- a/archivers/Makefile
+++ b/archivers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.184 2021/06/12 06:03:56 nia Exp $
+# $NetBSD: Makefile,v 1.185 2021/06/13 08:15:50 nia Exp $
 #
 
 COMMENT=	Archivers and compression tools
@@ -141,6 +141,7 @@ SUBDIR+=	unshield
 SUBDIR+=	unzip
 SUBDIR+=	unzoo
 SUBDIR+=	upx
+SUBDIR+=	xarchiver
 SUBDIR+=	xbin
 SUBDIR+=	xfce4-thunar-archive
 SUBDIR+=	xmill
diff --git a/archivers/xarchiver/DESCR b/archivers/xarchiver/DESCR
new file mode 100644
index 00000000000..6e512ea01da
--- /dev/null
+++ b/archivers/xarchiver/DESCR
@@ -0,0 +1,6 @@
+Desktop Environment independent archiver front end. All common archive
+formats are supported, deb and RPM packages are handled without their package
+managers being installed. Xarchiver only depends on the GTK+ libraries and
+utilizes various (un)compressor/(un)archiver command line programs at runtime.
+Installation of xdg-utils is optional but installing it will allow Xarchiver
+to support opening more file types directly from inside an archive.
diff --git a/sysutils/xfce4-xarchiver/Makefile b/archivers/xarchiver/Makefile
index 7f19296729c..b566b4e1f5f 100644
--- a/sysutils/xfce4-xarchiver/Makefile
+++ b/archivers/xarchiver/Makefile
@@ -1,22 +1,25 @@
-# $NetBSD: Makefile,v 1.52 2021/05/24 19:54:21 wiz Exp $
+# $NetBSD: Makefile,v 1.1 2021/06/13 08:15:50 nia Exp $
 
-DISTNAME=	xarchiver-0.5.4.16
-PKGNAME=	xfce4-${DISTNAME}
-PKGREVISION=	1
-CATEGORIES=	sysutils
+DISTNAME=	xarchiver-0.5.4.17
+CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ib/}
 GITHUB_PROJECT=	xarchiver
 GITHUB_TAG=	${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://github.com/ib/xarchiver
-COMMENT=	Xfce archiver handler
+COMMENT=	GTK+ frontend to various command line archivers
 LICENSE=	gnu-gpl-v2
 
+CONFLICTS+=	xfce4-xarchiver-[0-9]*
+SUPERSEDES+=	xfce4-xarchiver-[0-9]*
+PREV_PKGPATH=	sysutils/xfce4-xarchiver
+
 USE_TOOLS+=	pkg-config perl gmake ggrep
 USE_TOOLS+=	intltool msgfmt msgmerge xgettext
 GNU_CONFIGURE=	yes
 
+TOOL_DEPENDS+=	docbook-xsl-[0-9]*:../../textproc/docbook-xsl
 TOOL_DEPENDS+=	libxslt-[0-9]*:../../textproc/libxslt
 
 .include "../../x11/gtk3/buildlink3.mk"
diff --git a/sysutils/xfce4-xarchiver/PLIST b/archivers/xarchiver/PLIST
index 81cd0d39365..e538a75d558 100644
--- a/sysutils/xfce4-xarchiver/PLIST
+++ b/archivers/xarchiver/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2020/11/24 10:43:25 nia Exp $
+@comment $NetBSD: PLIST,v 1.1 2021/06/13 08:15:50 nia Exp $
 bin/xarchiver
 libexec/thunar-archive-plugin/xarchiver.tap
 man/man1/xarchiver.1
diff --git a/archivers/xarchiver/distinfo b/archivers/xarchiver/distinfo
new file mode 100644
index 00000000000..477406b96cb
--- /dev/null
+++ b/archivers/xarchiver/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2021/06/13 08:15:50 nia Exp $
+
+SHA1 (xarchiver-0.5.4.17.tar.gz) = e7576d43d44cbb8dcede71aa1d39f5c319f1134c
+RMD160 (xarchiver-0.5.4.17.tar.gz) = 3dc12f6291511587f2cf053bf76f526ca0575b6b
+SHA512 (xarchiver-0.5.4.17.tar.gz) = 5b19fd0fb90f99aee0ac2576bc4efce9ef4eef9119fc118815f6d925e3877c0895475fbdf7363d8adfb6371fb7fd73299ea3a7cb3b6d9fff19c89d1d287d3a84
+Size (xarchiver-0.5.4.17.tar.gz) = 1077111 bytes
diff --git a/archivers/xfce4-thunar-archive/Makefile b/archivers/xfce4-thunar-archive/Makefile
index 602f01c7d53..90a0028c7a5 100644
--- a/archivers/xfce4-thunar-archive/Makefile
+++ b/archivers/xfce4-thunar-archive/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2020/08/31 18:06:32 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2021/06/13 08:15:50 nia Exp $
 
-PKGREVISION= 10
+PKGREVISION= 11
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	thunar-archive-plugin-0.4.0
@@ -12,7 +12,7 @@ MAINTAINER=	youri@NetBSD.org
 HOMEPAGE=	https://goodies.xfce.org/projects/thunar-plugins/thunar-archive-plugin
 COMMENT=	Thunar archive plugin
 
-DEPENDS=	xfce4-xarchiver-[0-9]*:../../sysutils/xfce4-xarchiver
+DEPENDS=	xarchiver-[0-9]*:../../archivers/xarchiver
 
 .include "../../sysutils/xfce4-thunar/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/meta-pkgs/xfce4/Makefile b/meta-pkgs/xfce4/Makefile
index 11017a7bf9e..983828ba51c 100644
--- a/meta-pkgs/xfce4/Makefile
+++ b/meta-pkgs/xfce4/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.103 2021/05/24 19:53:04 wiz Exp $
+# $NetBSD: Makefile,v 1.104 2021/06/13 08:15:50 nia Exp $
 
 META_PACKAGE=	yes
 
-PKGREVISION= 6
+PKGREVISION= 7
 .include "Makefile.common"
 
 DISTNAME=	xfce4-${XFCE4_VERSION}
@@ -22,7 +22,6 @@ DEPENDS+=	xfce4-terminal>=0.8.8:../../x11/xfce4-terminal
 DEPENDS+=	xfce4-thunar>=1.8.9:../../sysutils/xfce4-thunar
 DEPENDS+=	xfce4-wm>=4.14.0:../../wm/xfce4-wm
 DEPENDS+=	xfce4-wm-themes>=4.10.0:../../wm/xfce4-wm-themes
-DEPENDS+=	xfce4-xarchiver>=0.5.4:../../sysutils/xfce4-xarchiver
 DEPENDS+=	elementary-xfce-icon-theme>=0.5:../../graphics/elementary-xfce-icon-theme
 DEPENDS+=	xdg-utils-[0-9]*:../../misc/xdg-utils
 
diff --git a/meta-pkgs/xfce4/Makefile.common b/meta-pkgs/xfce4/Makefile.common
index a9f89a9da6d..08d750f581b 100644
--- a/meta-pkgs/xfce4/Makefile.common
+++ b/meta-pkgs/xfce4/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.70 2021/05/06 20:40:49 wiz Exp $
+# $NetBSD: Makefile.common,v 1.71 2021/06/13 08:15:50 nia Exp $
 #
 # used by archivers/xfce4-thunar-archive/Makefile
 # used by audio/xfce4-xmms-plugin/Makefile
@@ -31,7 +31,6 @@
 # used by sysutils/xfce4-thunar-vcs/Makefile
 # used by sysutils/xfce4-thunar/Makefile
 # used by sysutils/xfce4-verve-plugin/Makefile
-# used by sysutils/xfce4-xarchiver/Makefile
 # used by sysutils/xfce4-xkb-plugin/Makefile
 # used by textproc/xfce4-dict/Makefile
 # used by time/xfce4-datetime-plugin/Makefile
diff --git a/sysutils/Makefile b/sysutils/Makefile
index c1b3268ad75..a211ba4a865 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.959 2021/05/25 10:21:26 adam Exp $
+# $NetBSD: Makefile,v 1.960 2021/06/13 08:15:50 nia Exp $
 #
 
 COMMENT=	System utilities
@@ -868,7 +868,6 @@ SUBDIR+=	xfce4-taskmanager
 SUBDIR+=	xfce4-thunar
 SUBDIR+=	xfce4-thunar-vcs
 SUBDIR+=	xfce4-verve-plugin
-SUBDIR+=	xfce4-xarchiver
 SUBDIR+=	xfce4-xkb-plugin
 SUBDIR+=	xfe
 SUBDIR+=	xfm
diff --git a/sysutils/xfce4-xarchiver/DESCR b/sysutils/xfce4-xarchiver/DESCR
deleted file mode 100644
index b8c0d214d47..00000000000
--- a/sysutils/xfce4-xarchiver/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Xfce archive handler.
diff --git a/sysutils/xfce4-xarchiver/distinfo b/sysutils/xfce4-xarchiver/distinfo
deleted file mode 100644
index 335e9b70f62..00000000000
--- a/sysutils/xfce4-xarchiver/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.8 2021/01/21 02:32:05 gutteridge Exp $
-
-SHA1 (xarchiver-0.5.4.16.tar.gz) = e8d1033032aba56a9fd6ea0d3d81dd8c2554fa2f
-RMD160 (xarchiver-0.5.4.16.tar.gz) = 1a71a9e720ee38a5e4fd3c7d060ec8d0a7826d7e
-SHA512 (xarchiver-0.5.4.16.tar.gz) = 794027cbbc33371008fa259c07c5821ffa63a110a130c2ee6d5fbc40177823af25777d07a0522cd809feb4122b1b741f24f6108dffdda330e54f6402ef97ae4a
-Size (xarchiver-0.5.4.16.tar.gz) = 1071484 bytes