Remove Rio-related packages.

These pacakges are intended to handle an early 2000s MP3 player. I expect
they are no longer in use.

Proposed on pkgsrc-users a month ago.

26 files changed, 1 insertions, 702 deletions

diff --git a/audio/Makefile b/audio/Makefile
index e42e4a71b37..ae3eeb7cb0e 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.584 2020/01/22 18:17:55 nia Exp $
+# $NetBSD: Makefile,v 1.585 2020/01/29 19:00:33 maya Exp $
 #
 
 COMMENT=	Audio tools
@@ -395,9 +395,6 @@ SUBDIR+=	qtplay
 SUBDIR+=	quodlibet
 SUBDIR+=	rexima
 SUBDIR+=	rhythmbox
-SUBDIR+=	rio
-SUBDIR+=	rio500
-SUBDIR+=	rioutil
 SUBDIR+=	rip
 SUBDIR+=	rosegarden
 SUBDIR+=	rplay
diff --git a/audio/rio/DESCR b/audio/rio/DESCR
deleted file mode 100644
index 69f29499f44..00000000000
--- a/audio/rio/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-'rio' is a simple command line utility which allows you to display and
-manage files on your Diamond Rio portable music player.
-
-At present the Rio utility supports the Diamond Rio PMP300 with 32M
-internal flash memory.  Additional external flash memory is now
-supported thanks to the work done by Guido March
-(march@pc40.mpier.uni-frankfurt.de).
diff --git a/audio/rio/Makefile b/audio/rio/Makefile
deleted file mode 100644
index aa10992f7dd..00000000000
--- a/audio/rio/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# $NetBSD: Makefile,v 1.27 2018/01/01 18:16:35 rillig Exp $
-#
-
-DISTNAME=	rio007
-PKGNAME=	rio-1.07
-CATEGORIES=	audio
-MASTER_SITES=	http://www.world.co.uk/sba/
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-#HOMEPAGE=	http://www.world.co.uk/sba/rio.html
-COMMENT=	Utility to display and manage files on the Diamond Rio PMP300
-LICENSE=	gnu-gpl-v2
-
-ONLY_FOR_PLATFORM=	NetBSD-*-i386 NetBSD-*-x86_64
-
-WRKSRC=		${WRKDIR}/rio107
-MAKE_FILE=	makefile
-USE_LANGUAGES=	c++
-LIBS.NetBSD=	-l${MACHINE_ARCH}
-
-INSTALLATION_DIRS=	bin
-SPECIAL_PERMS=		bin/rio ${SETUID_ROOT_PERMS}
-
-do-build:
-	cd ${WRKSRC} && ${CXX} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} ${LIBS} app.cpp rio.cpp -o rio
-	${SED} ${FILES_SUBST_SED} ${FILESDIR}/find-lpt-port > ${WRKSRC}/find-lpt-port.sh
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/rio ${DESTDIR}${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/rio
-	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/rio
-	${INSTALL_SCRIPT} ${WRKSRC}/find-lpt-port.sh \
-		${DESTDIR}${PREFIX}/bin/find-lpt-port
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/rio/PLIST b/audio/rio/PLIST
deleted file mode 100644
index e765a5a137c..00000000000
--- a/audio/rio/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2018/01/01 22:29:17 rillig Exp $
-bin/find-lpt-port
-bin/rio
-share/rio/README
diff --git a/audio/rio/distinfo b/audio/rio/distinfo
deleted file mode 100644
index 0e3a89ddd18..00000000000
--- a/audio/rio/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.5 2015/11/03 01:12:48 agc Exp $
-
-SHA1 (rio007.tgz) = d7abbcd9619ff6528be31c38d55445bebb44e9f0
-RMD160 (rio007.tgz) = 82528f4877e3339c407b6e5dea9393123d44f72d
-SHA512 (rio007.tgz) = 0109778af6da27113149841abd8f27db71edb8a17267d9acccbeed19751b30aa56545ad619c276fb5235b3edf03fd319ac7fd7c90ecd093bd886b968c18e7d18
-Size (rio007.tgz) = 28953 bytes
-SHA1 (patch-aa) = 2aba53b31ff0b75a297fe7696252c02c03850014
-SHA1 (patch-ab) = e7b0e333be109ebe1a5d291724b874418e1dd919
-SHA1 (patch-ac) = 4f490e55a906891f2c0488e9bdb78f5a26c7f073
diff --git a/audio/rio/files/find-lpt-port b/audio/rio/files/find-lpt-port
deleted file mode 100644
index 0395868e2e6..00000000000
--- a/audio/rio/files/find-lpt-port
+++ /dev/null
@@ -1,13 +0,0 @@
-#!@SH@
-#
-# $NetBSD: find-lpt-port,v 1.2 2007/06/15 15:13:34 jlam Exp $
-#
-# Small shell script to find the lpt port easily
-
-if [ -e /var/run/dmesg.boot ]; then
-	bootfile="/var/run/dmesg.boot"
-else
-	bootfile='`dmesg`'
-fi
-@AWK@ '/^lp[at][0-9]+/ { gsub("\-.*", "", $5); print $5 }' < $bootfile
-exit 0
diff --git a/audio/rio/patches/patch-aa b/audio/rio/patches/patch-aa
deleted file mode 100644
index 2e39b72c83d..00000000000
--- a/audio/rio/patches/patch-aa
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2008/08/02 18:32:15 dholland Exp $
-
-Add support for NetBSD and Solaris
-Make sure the program is being run by effective uid 0
-Bug fix: time_t != long. 
-
---- app.cpp.orig	1999-06-11 12:26:46.000000000 -0400
-+++ app.cpp	2008-08-02 14:25:08.000000000 -0400
-@@ -67,6 +67,20 @@
- 	#define		SIZE_MAXPATH			MAXPATH
- 	#define		DELETEARRAY				delete
- 
-+#elif defined(__NetBSD__)
-+	// NetBSD g++
-+	#include	<unistd.h>
-+	#include	<sys/syslimits.h>
-+	#define		SIZE_MAXPATH			PATH_MAX
-+	#define		DELETEARRAY				delete[]
-+
-+#elif defined(__sun__) && defined(__svr4__)
-+	// Solaris 2.x g++
-+	#include	<unistd.h>
-+	#include	<limits.h>
-+	#define		SIZE_MAXPATH			PATH_MAX
-+	#define		DELETEARRAY				delete[]
-+
- #else
- 	// not supported
- 	#error ! ! compiler/platform not supported ! !
-@@ -97,7 +111,7 @@
- 
- ///////////////////////////////////////////////////////////////////////////////
- // return pointer to static string containing datetime
--static char* TimeStr( long lValue )
-+static char* TimeStr( time_t lValue )
- {
- 	static char szBuf[ 64 ];
- 	struct tm* psDateTime;
-@@ -519,6 +533,13 @@ int main( int iCountArg, char* paszArg[]
- 		Help();
- 		CLEANUP_RETURN( FALSE );
- 	}
-+#if defined(__NetBSD__)
-+	if (geteuid() != 0) {
-+		ERRORSTR("You need to be root to run this program,\n");
-+		ERRORSTR("because access is made to the parallel port directly.\n");
-+		CLEANUP_RETURN(FALSE);
-+	}
-+#endif
- 	for( int iA=1; iA<iCountArg; ++iA )
- 	{
- 		// check for display directory request
diff --git a/audio/rio/patches/patch-ab b/audio/rio/patches/patch-ab
deleted file mode 100644
index 7c782f773de..00000000000
--- a/audio/rio/patches/patch-ab
+++ /dev/null
@@ -1,110 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2008/08/02 18:32:15 dholland Exp $
-
-Add NetBSD and Solaris platforms
-Add inb() and outb() from XFree86 sources.
-Add NetBSD/x86_64 support.
-
---- rio.cpp.orig	1999-06-11 12:26:46.000000000 -0400
-+++ rio.cpp	2008-08-02 14:16:07.000000000 -0400
-@@ -109,11 +109,101 @@
- 	#define		CLOCK_SECOND			((int)CLOCKS_PER_SEC)
- 	#define		DELETEARRAY				delete
- 
-+#elif defined(__NetBSD__)
-+	// NetBSD/i386,amd64 g++
-+	#include	<fcntl.h>
-+	#include	<unistd.h>
-+	#include	<machine/sysarch.h>
-+	//#include	<machine/cpufunc.h>
-+	#define		OUTPORT(p,v)			outb( p, v )
-+	#define		INPORT(p)				inb( p )
-+	#define		CLOCK_SECOND			CLOCKS_PER_SEC
-+	#define		DELETEARRAY				delete[]
-+
-+#elif defined(__sun__) && defined(__svr4__)
-+	// Solaris/i386 g++
-+	#include	<fcntl.h>
-+	#include	<unistd.h>
-+	#include	<sys/cpupart.h>
-+	#include	<sys/cpuvar.h>
-+	#include	<sys/ddi.h>
-+	#include	<sys/sunddi.h>
-+	#define		OUTPORT(p,v)			outb( p, v )
-+	#define		INPORT(p)				inb( p )
-+	#define		CLOCK_SECOND			CLOCKS_PER_SEC
-+	#define		DELETEARRAY				delete[]
-+
- #else
- 	// not supported
- 	#error ! ! compiler/platform not supported ! !
- #endif
- 
-+#if defined(__NetBSD__)
-+/* copied from the XFree86 sources */
-+/* xc/programs/Xserver/hw/xfree86/common/compiler.h */
-+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/compiler.h,v 3.24.2.4 1998/10/18 20:42:10 hohndel Exp $ */
-+/*
-+ * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
-+ *
-+ * Permission to use, copy, modify, distribute, and sell this software and its
-+ * documentation for any purpose is hereby granted without fee, provided that
-+ * the above copyright notice appear in all copies and that both that
-+ * copyright notice and this permission notice appear in supporting
-+ * documentation, and that the name of Thomas Roell not be used in
-+ * advertising or publicity pertaining to distribution of the software without
-+ * specific, written prior permission.  Thomas Roell makes no representations
-+ * about the suitability of this software for any purpose.  It is provided
-+ * "as is" without express or implied warranty.
-+ *
-+ * THOMAS ROELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+ * EVENT SHALL THOMAS ROELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+ * PERFORMANCE OF THIS SOFTWARE.
-+ *
-+ */
-+/* $XConsortium: compiler.h /main/16 1996/10/25 15:38:34 kaleb $ */
-+/* also hacked by agc to do i386_iopl, and by dholland for x86_64_iopl */
-+static int ports_enabled;
-+
-+static __inline__ unsigned int
-+inb(unsigned short int port)
-+{
-+	unsigned char	ret;
-+
-+	if (!ports_enabled) {
-+#ifdef __i386__
-+		i386_iopl(1);
-+#endif
-+#ifdef __x86_64__
-+		x86_64_iopl(1);
-+#endif
-+		ports_enabled = 1;
-+	}
-+	__asm__ __volatile__("inb %1,%0" :
-+		"=a" (ret) :
-+		"d" (port));
-+	return ret;
-+}
-+
-+static __inline__ void
-+outb(unsigned short int port, unsigned char val)
-+{
-+	if (!ports_enabled) {
-+#ifdef __i386__
-+		i386_iopl(1);
-+#endif
-+#ifdef __x86_64__
-+		x86_64_iopl(1);
-+#endif
-+		ports_enabled = 1;
-+	}
-+	__asm__ __volatile__("outb %0,%1" : :"a" (val), "d" (port));
-+}
-+#endif
-+
- // port offset constants
- #define		OFFSET_PORT_DATA		0
- #define		OFFSET_PORT_STATUS		1
diff --git a/audio/rio/patches/patch-ac b/audio/rio/patches/patch-ac
deleted file mode 100644
index 8ec3a82ba84..00000000000
--- a/audio/rio/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2000/01/11 11:32:12 agc Exp $
-
---- makefile	2000/01/07 14:53:24	1.1
-+++ makefile	2000/01/07 14:53:54
-@@ -9,7 +9,7 @@
- all: 		rio
- 
- rio:		app.cpp rio.cpp
--		g++ -O1 -o rio app.cpp rio.cpp
-+		g++ -O1 -o rio app.cpp rio.cpp -li386
- 		chmod +s rio
- 
- clean:
diff --git a/audio/rio500/DESCR b/audio/rio500/DESCR
deleted file mode 100644
index 6e74bfc9d82..00000000000
--- a/audio/rio500/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-Utilities to upload files and manage folders for Diamond Rio 500 MP3 player.
-Requires USB support and the urio(4) driver configured in the kernel.
diff --git a/audio/rio500/Makefile b/audio/rio500/Makefile
deleted file mode 100644
index ea4971ab0a4..00000000000
--- a/audio/rio500/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.27 2020/01/26 05:26:13 rillig Exp $
-#
-
-DISTNAME=	rio500-0.7
-PKGREVISION=	4
-CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rio500/}
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://rio500.sourceforge.net/
-COMMENT=	Utilities to manage your Diamond Rio 500 MP3 player
-LICENSE=	gnu-gpl-v2
-
-NOT_FOR_PLATFORM=	Interix-*-*
-
-USE_TOOLS+=		gmake
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-devicepath=/dev
-CONFIGURE_ARGS+=	--with-deviceentry=urio0
-
-REPLACE_SH=		scripts/rio_add_directory
-
-.include "../../devel/glib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/rio500/PLIST b/audio/rio500/PLIST
deleted file mode 100644
index 0e18cb66eb6..00000000000
--- a/audio/rio500/PLIST
+++ /dev/null
@@ -1,47 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:32:21 joerg Exp $
-bin/rio_add_directory
-bin/rio_add_folder
-bin/rio_add_song
-bin/rio_del_song
-bin/rio_font_info
-bin/rio_format
-bin/rio_get_song
-bin/rio_stat
-include/libfon.h
-include/libpsf.h
-include/librio500.h
-include/librio500_api.h
-lib/librio500.a
-lib/librio500_api.a
-share/rio500/fonts/6581.fon
-share/rio500/fonts/Readme.txt
-share/rio500/fonts/amiga.fon
-share/rio500/fonts/amplitud.fon
-share/rio500/fonts/atopaz.fon
-share/rio500/fonts/blackout.fon
-share/rio500/fonts/camels.fon
-share/rio500/fonts/cbm64.fon
-share/rio500/fonts/ce.fon
-share/rio500/fonts/ck.nfo
-share/rio500/fonts/defjam.fon
-share/rio500/fonts/dynamic.fon
-share/rio500/fonts/flt.fon
-share/rio500/fonts/font-bitmaps.psf
-share/rio500/fonts/future.fon
-share/rio500/fonts/genesis.fon
-share/rio500/fonts/heretic2.fon
-share/rio500/fonts/hl1.fon
-share/rio500/fonts/hl2.fon
-share/rio500/fonts/icoin.fon
-share/rio500/fonts/kung_fu.fon
-share/rio500/fonts/noname.fon
-share/rio500/fonts/phont.fon
-share/rio500/fonts/q1c.fon
-share/rio500/fonts/q2c.fon
-share/rio500/fonts/qu.fon
-share/rio500/fonts/sac.fon
-share/rio500/fonts/shylock.fon
-share/rio500/fonts/sin.fon
-share/rio500/fonts/star.fon
-share/rio500/fonts/trek.fon
-share/rio500/fonts/triangle.fon
diff --git a/audio/rio500/distinfo b/audio/rio500/distinfo
deleted file mode 100644
index c49710fc2f8..00000000000
--- a/audio/rio500/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.6 2015/11/03 01:12:49 agc Exp $
-
-SHA1 (rio500-0.7.tar.gz) = f22237d3e13222da69d7b7a09f7e27e2aff8e1b8
-RMD160 (rio500-0.7.tar.gz) = 59f56abb5f5ca16d6a8a7792dd227417bcd66709
-SHA512 (rio500-0.7.tar.gz) = dc31533abd56e0012e5803d69fcd846956253a3bf0ab4badc6732351b39ff195bd9e1224477e525d0750ebed600f6152de6deff83160dd038e0b3291a4ff6dac
-Size (rio500-0.7.tar.gz) = 169143 bytes
-SHA1 (patch-aa) = 037b0b5b0aaf5ba107dde56fadc1d613a94966ab
-SHA1 (patch-ab) = 668eca0fcdc2a3c55c12f8fe1a8c59c8e7ee0ba2
-SHA1 (patch-ac) = 6dcf08fcfb89177844b311bffb07a4eb9683d131
-SHA1 (patch-ad) = 04fa62f4246d7dfe7208a5424505676b0cb7b5d8
-SHA1 (patch-ae) = 57a64b9b9cb9301d9a183786510019bf7f618a50
-SHA1 (patch-af) = 99f19db26f6f8dc5825dabd1db4e17c8dba25658
diff --git a/audio/rio500/patches/patch-aa b/audio/rio500/patches/patch-aa
deleted file mode 100644
index c0523dbeb76..00000000000
--- a/audio/rio500/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2002/03/05 18:05:40 skrll Exp $
-
---- include/Makefile.in.orig	Tue Mar  5 09:53:07 2002
-+++ include/Makefile.in
-@@ -86,7 +86,7 @@
- fontpath = @fontpath@
- psffont = @psffont@
- 
--include_HEADERS = libfon.h libpsf.h librio500.h librio500_api.h getopt.h 
-+include_HEADERS = libfon.h libpsf.h librio500.h librio500_api.h
- extra_DIST = usbdevice_fs.h usbdevfs.h usbdrv.h rio500_usb.h
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = config.h
diff --git a/audio/rio500/patches/patch-ab b/audio/rio500/patches/patch-ab
deleted file mode 100644
index 7145b6bec9a..00000000000
--- a/audio/rio500/patches/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2000/08/22 13:35:05 dmcmahill Exp $
-
---- include/libfon.h.orig	Sun May 21 19:01:46 2000
-+++ include/libfon.h	Tue Aug 22 09:16:46 2000
-@@ -25,4 +25,5 @@
- 
- #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#include <sys/inttypes.h>
- #include <sys/param.h>
- #else
diff --git a/audio/rio500/patches/patch-ac b/audio/rio500/patches/patch-ac
deleted file mode 100644
index b3b7ef2eb63..00000000000
--- a/audio/rio500/patches/patch-ac
+++ /dev/null
@@ -1,114 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2000/08/22 15:40:12 dmcmahill Exp $
-
---- lib/librio500.c.orig	Tue Aug 22 14:52:30 2000
-+++ lib/librio500.c	Tue Aug 22 14:55:42 2000
-@@ -24,7 +24,7 @@
- #include "libfon.h"
- 
- #ifdef WORDS_BIGENDIAN
--#include <byteswap.h>
-+#include <machine/bswap.h>
- #endif
- 
- void
-@@ -55,9 +55,9 @@
-    need to byteswap to get to le */
- 
- #ifdef WORDS_BIGENDIAN
--  location.offset     = bswap_16(location.offset);
--  location.bytes      = bswap_16(location.bytes);
--  location.folder_num = bswap_16(location.folder_num);
-+  location.offset     = bswap16(location.offset);
-+  location.bytes      = bswap16(location.bytes);
-+  location.folder_num = bswap16(location.folder_num);
- #endif
- 
-   rio_ctl_msg (fd, RIO_DIR_OUT, 0x56, 0, 0, 
-@@ -87,13 +87,13 @@
-    to read correctly */
- 
- #ifdef WORDS_BIGENDIAN
--  status.dunno1 = bswap_16(status.dunno1);
--  status.block_size = bswap_16(status.block_size);
--  status.num_blocks = bswap_16(status.num_blocks);
--  status.first_free_block = bswap_16(status.first_free_block);
--  status.num_unused_blocks = bswap_16(status.num_unused_blocks);
--  status.dunno2 = bswap_32(status.dunno2);
--  status.dunno3 = bswap_32(status.dunno3);
-+  status.dunno1 = bswap16(status.dunno1);
-+  status.block_size = bswap16(status.block_size);
-+  status.num_blocks = bswap16(status.num_blocks);
-+  status.first_free_block = bswap16(status.first_free_block);
-+  status.num_unused_blocks = bswap16(status.num_unused_blocks);
-+  status.dunno2 = bswap32(status.dunno2);
-+  status.dunno3 = bswap32(status.dunno3);
- #endif
- 
-   return &status;
-@@ -476,25 +476,25 @@
- void
- bswap_folder_entry (folder_entry *fe)
- {
--  fe->offset = bswap_16(fe->offset);
--  fe->dunno1 = bswap_16(fe->dunno1);
--  fe->fst_free_entry_off = bswap_16(fe->fst_free_entry_off);
--  fe->dunno2 = bswap_16(fe->dunno2);
--  fe->dunno3 = bswap_32(fe->dunno3);
--  fe->dunno4 = bswap_32(fe->dunno4);
--  fe->time = bswap_32(fe->time);
-+  fe->offset = bswap16(fe->offset);
-+  fe->dunno1 = bswap16(fe->dunno1);
-+  fe->fst_free_entry_off = bswap16(fe->fst_free_entry_off);
-+  fe->dunno2 = bswap16(fe->dunno2);
-+  fe->dunno3 = bswap32(fe->dunno3);
-+  fe->dunno4 = bswap32(fe->dunno4);
-+  fe->time = bswap32(fe->time);
- }
- 
- void
- bswap_song_entry (song_entry *se)
- {
--  se->offset = bswap_16(se->offset);
--  se->dunno1 = bswap_16(se->dunno1);
--  se->length = bswap_32(se->length);
--  se->dunno2 = bswap_16(se->dunno2);
--  se->dunno3 = bswap_16(se->dunno3);
--  se->mp3sig = bswap_32(se->mp3sig);
--  se->time = bswap_32(se->time);
-+  se->offset = bswap16(se->offset);
-+  se->dunno1 = bswap16(se->dunno1);
-+  se->length = bswap32(se->length);
-+  se->dunno2 = bswap16(se->dunno2);
-+  se->dunno3 = bswap16(se->dunno3);
-+  se->mp3sig = bswap32(se->mp3sig);
-+  se->time = bswap32(se->time);
- }
- 
- 
-@@ -662,7 +662,7 @@
-   rio_ctl_msg (fd, RIO_DIR_IN, req, val, idx, 4, (BYTE*)&status);
- 
- #ifdef WORDS_BIGENDIAN
--   status = bswap_32 (status);
-+   status = bswap32 (status);
- #endif
- 
-   return status;
-@@ -740,7 +740,7 @@
- /* on big_endian platforms, need to byteswap num_blocks to write to le rio */
- 
- #ifdef WORDS_BIGENDIAN
--   new_smiley->num_blocks = bswap_16(new_smiley->num_blocks);
-+   new_smiley->num_blocks = bswap16(new_smiley->num_blocks);
- #endif
- 
-    return new_smiley;
-@@ -802,7 +802,7 @@
-    transfer to rio */
- 
- #ifdef WORDS_BIGENDIAN
--  new_bitmap->num_blocks = bswap_16(new_bitmap->num_blocks);
-+  new_bitmap->num_blocks = bswap16(new_bitmap->num_blocks);
- #endif
- 
-   return new_bitmap;
diff --git a/audio/rio500/patches/patch-ad b/audio/rio500/patches/patch-ad
deleted file mode 100644
index de74399870b..00000000000
--- a/audio/rio500/patches/patch-ad
+++ /dev/null
@@ -1,85 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2000/08/22 15:40:12 dmcmahill Exp $
-
---- lib/libfon.c.orig	Tue Aug 22 14:54:21 2000
-+++ lib/libfon.c	Tue Aug 22 14:54:35 2000
-@@ -23,7 +23,7 @@
- #include "libfon.h"
- 
- #ifdef WORDS_BIGENDIAN
--#include <byteswap.h>
-+#include <machine/bswap.h>
- #endif
- 
- struct fon_font *
-@@ -61,9 +61,9 @@
- 	fread (&MZ_hdr, sizeof (MZ_Header), 1, fp);
- 
- #ifdef WORDS_BIGENDIAN
--	MZ_hdr.magic = bswap_16(MZ_hdr.magic);
--        MZ_hdr.dummy[29] = bswap_16(MZ_hdr.dummy[29]);
--	//MZ_hdr.ne_location = bswap_16(MZ_hdr.ne_location); 
-+	MZ_hdr.magic = bswap16(MZ_hdr.magic);
-+        MZ_hdr.dummy[29] = bswap16(MZ_hdr.dummy[29]);
-+	//MZ_hdr.ne_location = bswap16(MZ_hdr.ne_location); 
- #endif
- 
- /* ne_location is a 16bit quantity,l_e.  It appears fseek below wants 
-@@ -82,15 +82,15 @@
- 	fread (&NE_hdr, sizeof (NE_Header), 1, fp);
- 	
- 	#ifdef WORDS_BIGENDIAN
--	NE_hdr.magic = bswap_16(NE_hdr.magic);
--	NE_hdr.dummy1[15] = bswap_16(NE_hdr.dummy1[15]);
-+	NE_hdr.magic = bswap16(NE_hdr.magic);
-+	NE_hdr.dummy1[15] = bswap16(NE_hdr.dummy1[15]);
- 	
--	//NE_hdr.nonres_name_length = bswap_16(NE_hdr.nonres_name_length);
-+	//NE_hdr.nonres_name_length = bswap16(NE_hdr.nonres_name_length);
- 	/* fseek seems to like l_e quantities */
- 	
- 	/* Ok . . I'm an idiot, nonres_name_start was 32bit, can use bswap */
- 	
--	NE_hdr.nonres_name_start=bswap_32(NE_hdr.nonres_name_start);
-+	NE_hdr.nonres_name_start=bswap32(NE_hdr.nonres_name_start);
- 	#endif 
- 	
- 	if (NE_hdr.magic != NE_HEADER_MAGIC ) {
-@@ -119,7 +119,7 @@
- 	fread(&number_of_fonts, 2, 1, fp);
- 	
- 	#ifdef WORDS_BIGENDIAN
--	number_of_fonts = bswap_32(number_of_fonts);
-+	number_of_fonts = bswap32(number_of_fonts);
- 	#endif 
- 	/* font info stored in 32bit 32bit 32bit l_e format for win fonts */
- 	/* need to swap to use on ppc */
-@@ -181,13 +181,13 @@
- 	/* Do any sort of byte swapping necessary for big endian after reading data */
- 
- 	#ifdef WORDS_BIGENDIAN
--	font->Header[i].Windows_version = bswap_16(font->Header[i].Windows_version);
--	font->Header[i].Bytes_per_char_cell = bswap_16(font->Header[i].Bytes_per_char_cell);
--	font->Header[i].File_sizeH = bswap_16(font->Header[i].File_sizeH);
--	font->Header[i].File_sizeL = bswap_16(font->Header[i].File_sizeL);
--	font->Header[i].Nominal_point_size = bswap_16(font->Header[i].Nominal_point_size);
--	font->Header[i].Vertical_resolution = bswap_16(font->Header[i].Vertical_resolution);
--	font->Header[i].Horizontal_resolution = bswap_16(font->Header[i].Horizontal_resolution);
-+	font->Header[i].Windows_version = bswap16(font->Header[i].Windows_version);
-+	font->Header[i].Bytes_per_char_cell = bswap16(font->Header[i].Bytes_per_char_cell);
-+	font->Header[i].File_sizeH = bswap16(font->Header[i].File_sizeH);
-+	font->Header[i].File_sizeL = bswap16(font->Header[i].File_sizeL);
-+	font->Header[i].Nominal_point_size = bswap16(font->Header[i].Nominal_point_size);
-+	font->Header[i].Vertical_resolution = bswap16(font->Header[i].Vertical_resolution);
-+	font->Header[i].Horizontal_resolution = bswap16(font->Header[i].Horizontal_resolution);
- 	#endif
- 
- 	}
-@@ -231,7 +231,7 @@
- 		(void)fread(&bitmap_start_offset, 2, 1, fp);
- 
- 		#ifdef WORDS_BIGENDIAN
--		bitmap_start_offset = bswap_32(bitmap_start_offset);
-+		bitmap_start_offset = bswap32(bitmap_start_offset);
- 		#endif
- 		
- 		/* b_s_off comes out of .fon in l_e, need to convert */
diff --git a/audio/rio500/patches/patch-ae b/audio/rio500/patches/patch-ae
deleted file mode 100644
index 07a5456d2e2..00000000000
--- a/audio/rio500/patches/patch-ae
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2000/08/22 15:40:12 dmcmahill Exp $
-
---- lib/usbdrvlinux.c.orig	Tue Aug 22 14:58:45 2000
-+++ lib/usbdrvlinux.c	Tue Aug 22 14:59:00 2000
-@@ -54,7 +54,7 @@
- #include <dirent.h>
- 
- #ifdef WORDS_BIGENDIAN
--# include <byteswap.h>
-+# include <machine/bswap.h>
- #endif
- 
- #if TIME_WITH_SYS_TIME
-@@ -200,8 +200,8 @@
- 	pid = desc.idProduct[0] | (desc.idProduct[1] << 8);
- 
- 	#ifdef WORDS_BIGENDIAN
--	vid = bswap_16(vid);
--	pid = bswap_16(pid);
-+	vid = bswap16(vid);
-+	pid = bswap16(pid);
- 	#endif
- 
- 	if ((vid != vendorid && vendorid == -1) ||
-@@ -270,8 +270,8 @@
- 		        pid = desc.idProduct[0] | (desc.idProduct[1] << 8);
- 
- 			#ifdef WORDS_BIGENDIAN
--			vid = bswap_16(vid);
--			pid = bswap_16(pid);
-+			vid = bswap16(vid);
-+			pid = bswap16(pid);
- 			#endif
- 
-                         if ((vid == vendorid || vendorid == 0xffff) &&
diff --git a/audio/rio500/patches/patch-af b/audio/rio500/patches/patch-af
deleted file mode 100644
index 243739319fd..00000000000
--- a/audio/rio500/patches/patch-af
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-af,v 1.1 2005/12/11 21:13:45 joerg Exp $
-
---- src/rio_add_song.c.orig	2005-12-11 21:01:42.000000000 +0000
-+++ src/rio_add_song.c
-@@ -325,6 +325,7 @@ main(int argc, char *argv[])
-    send_command (rio_dev, 0x58, 0x0, card_number);
- 
- try_next:
-+	;
-    } /* end of add file loop */
- 
-    /* Close device */
diff --git a/audio/rioutil/DESCR b/audio/rioutil/DESCR
deleted file mode 100644
index bab64eb553b..00000000000
--- a/audio/rioutil/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-A utility designed for the use of interfacing with Rio's third,
-fourth, and fifth generations of portable mp3 players: Rio
-600/800/900/S-Series/Riot/psa[play/Fuse.
diff --git a/audio/rioutil/Makefile b/audio/rioutil/Makefile
deleted file mode 100644
index 85ab30ba8e0..00000000000
--- a/audio/rioutil/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile,v 1.27 2019/12/31 12:10:20 schmonz Exp $
-#
-
-DISTNAME=	rioutil-${GITHUB_TAG}
-PKGNAME=	${DISTNAME:S/-v/-/}
-GITHUB_TAG=	v1.5.4
-CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_GITHUB:=hjelmn/}
-
-MAINTAINER=	schmonz@NetBSD.org
-HOMEPAGE=	https://github.com/hjelmn/rioutil/
-COMMENT=	Program and library to interface with Rio 600, 800, Nike psa[play
-LICENSE=	gnu-gpl-v2
-
-USE_LIBTOOL=		yes
-USE_TOOLS+=		autoreconf autoconf automake aclocal pkg-config
-GNU_CONFIGURE=		yes
-
-pre-configure:
-	cd ${WRKSRC} && autoreconf -ivf
-
-ONLY_FOR_PLATFORM=	Darwin-*-* Linux-*-* NetBSD-1.6.*-* NetBSD-[2-9].*-*
-# depends on -r1.6 of sys/dev/usb/urio.c
-ONLY_FOR_PLATFORM+=	NetBSD-1.5Z-* NetBSD-1.5Z[A-Z]-*
-ONLY_FOR_PLATFORM+=	DragonFly-*-* FreeBSD-*-* OpenBSD-*-*
-
-.include "../../audio/id3lib/buildlink3.mk"
-.include "../../mk/libusb.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/rioutil/PLIST b/audio/rioutil/PLIST
deleted file mode 100644
index 6056e5c7749..00000000000
--- a/audio/rioutil/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2004/09/22 08:09:17 jlam Exp $
-bin/rioutil
-include/rio.h
-lib/librioutil.la
-man/man1/rioutil.1
diff --git a/audio/rioutil/distinfo b/audio/rioutil/distinfo
deleted file mode 100644
index 5940be050d0..00000000000
--- a/audio/rioutil/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.14 2019/12/31 12:10:20 schmonz Exp $
-
-SHA1 (rioutil-v1.5.4.tar.gz) = b7da8b205f691894a3b551a4c79c90d17c6bf47f
-RMD160 (rioutil-v1.5.4.tar.gz) = 22d8898fdcec2fa13c5f82d902b5e4a3a15764e9
-SHA512 (rioutil-v1.5.4.tar.gz) = b64027089a7c0a3b712486e3b2549dae5a8ceff9687a183fd411f6b9d197a97ea22bd7294242b3f9e8522da9ebe7e87dc5bc980633632ce3d4884341ee085a62
-Size (rioutil-v1.5.4.tar.gz) = 84592 bytes
-SHA1 (patch-librioutil_driver__file.c) = 60b189031c95bb285d1eb5cb96049175d00bcbf3
-SHA1 (patch-linux__driver_rio__usb.h) = 26e0b64384e0c71eb589281ffe58737af29d51ca
-SHA1 (patch-src_main.c) = d3e3eb1893f4ffe29e87d489064e4912e0b24d09
diff --git a/audio/rioutil/patches/patch-librioutil_driver__file.c b/audio/rioutil/patches/patch-librioutil_driver__file.c
deleted file mode 100644
index 14143324902..00000000000
--- a/audio/rioutil/patches/patch-librioutil_driver__file.c
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-librioutil_driver__file.c,v 1.1 2019/12/31 12:10:20 schmonz Exp $
-
-Support DragonFly.
-
---- librioutil/driver_file.c.orig	2019-05-14 19:24:11.000000000 +0000
-+++ librioutil/driver_file.c
-@@ -32,7 +32,7 @@
- char driver_method[] = "device file";
- 
- /* Duplicated from rio_usb.h */
--#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
- #define RIO_RECV_COMMAND _IOWR('U', 201, struct RioCommand)
- #else
- #define RIO_RECV_COMMAND 0x2
-@@ -42,7 +42,7 @@ char driver_method[] = "device file";
- #ifdef linux
- #include <linux/usb.h>
- #define RIODEVICE  "/dev/usb/rio"
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
- #define RIODEVICE "/dev/urio"
- #elif defined(__NetBSD__)
- #define RIODEVICE "/dev/urio"
diff --git a/audio/rioutil/patches/patch-linux__driver_rio__usb.h b/audio/rioutil/patches/patch-linux__driver_rio__usb.h
deleted file mode 100644
index 43d4c1e2eb7..00000000000
--- a/audio/rioutil/patches/patch-linux__driver_rio__usb.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-linux__driver_rio__usb.h,v 1.1 2019/12/31 12:10:20 schmonz Exp $
-
-Support DragonFly.
-
---- linux_driver/rio_usb.h.orig	2019-05-14 19:24:11.000000000 +0000
-+++ linux_driver/rio_usb.h
-@@ -61,7 +61,7 @@ struct RioCommand {
- 	int timeout;
- };
- 
--#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
- #define RIO_SEND_COMMAND       _IOWR('U', 200, struct RioCommand)
- #define RIO_RECV_COMMAND       _IOWR('U', 201, struct RioCommand)
- #else
diff --git a/audio/rioutil/patches/patch-src_main.c b/audio/rioutil/patches/patch-src_main.c
deleted file mode 100644
index a5456877ca4..00000000000
--- a/audio/rioutil/patches/patch-src_main.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_main.c,v 1.1 2019/12/31 12:10:20 schmonz Exp $
-
-Support DragonFly.
-
---- src/main.c.orig	2019-05-14 19:24:11.000000000 +0000
-+++ src/main.c
-@@ -942,7 +942,7 @@ static void usage (void) {
-   printf("  -d, --delete=<int>     delete a track(s)\n\n");
- 
-   printf(" general options:\n");
--#if !defined(__FreeBSD__) || !defined(__NetBSD__)
-+#if !defined(__FreeBSD__) || !defined(__NetBSD__) || !defined(__DragonFly__)
-   printf("  -o, --device=<int>     minor number of rio (assigned by driver), /dev/usb/rio?\n");
- #else
-   printf("  -o, --device=<int>     minor number of rio (assigned by driver), /dev/urio?\n");