Update to 1.5.4. No changelog available.

9 files changed, 42 insertions, 80 deletions

diff --git a/audio/rioutil/Makefile b/audio/rioutil/Makefile
index 2327f73fdfe..85ab30ba8e0 100644
--- a/audio/rioutil/Makefile
+++ b/audio/rioutil/Makefile
@@ -1,21 +1,25 @@
-# $NetBSD: Makefile,v 1.26 2018/02/27 23:56:07 khorben Exp $
+# $NetBSD: Makefile,v 1.27 2019/12/31 12:10:20 schmonz Exp $
 #
 
-DISTNAME=	rioutil-1.5.0
-PKGREVISION=	1
+DISTNAME=	rioutil-${GITHUB_TAG}
+PKGNAME=	${DISTNAME:S/-v/-/}
+GITHUB_TAG=	v1.5.4
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rioutil/}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=hjelmn/}
 
 MAINTAINER=	schmonz@NetBSD.org
-HOMEPAGE=	http://rioutil.sourceforge.net/
+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
-CONFIGURE_ARGS+=	--with-libusb
 
-ONLY_FOR_PLATFORM=	Darwin-*-* Linux-*-* NetBSD-1.6*-* NetBSD-[2-9]*-*
+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-*-*
diff --git a/audio/rioutil/distinfo b/audio/rioutil/distinfo
index 87189c9dea0..5940be050d0 100644
--- a/audio/rioutil/distinfo
+++ b/audio/rioutil/distinfo
@@ -1,12 +1,9 @@
-$NetBSD: distinfo,v 1.13 2017/07/01 16:18:00 schmonz Exp $
+$NetBSD: distinfo,v 1.14 2019/12/31 12:10:20 schmonz Exp $
 
-SHA1 (rioutil-1.5.0.tar.gz) = f775bab0ed7ec456dd5d2826083ca8a5075aa4ec
-RMD160 (rioutil-1.5.0.tar.gz) = 2f1db9eb36501aecdb388278d5f7c1876bfebf19
-SHA512 (rioutil-1.5.0.tar.gz) = 3e3bf1c053e2f0146c504c5015e33cd3281daad136f41d82100d6181b6720c7f1131615c663f821573d7aeb077efc1b59e8e23a8f15a851e332ad61ea0479f1d
-Size (rioutil-1.5.0.tar.gz) = 401244 bytes
-SHA1 (patch-aa) = 4783194bc911fc9c9b1ebd9f03a92180cd7a8f77
-SHA1 (patch-ab) = d5a206224a24bf9dfd651c003b621dc5cea90a58
-SHA1 (patch-ac) = 2ea2f01308a3d3e92fc0fb1b652c1df50dddef01
-SHA1 (patch-ae) = d5428a2e3e5edfe367e5afaecf944830f7187342
-SHA1 (patch-src_Makefile.am) = c11e89ad256ffc621db9e255944815164ad69d38
-SHA1 (patch-src_Makefile.in) = 69f3ea1e56aa26f1db696b7eaa0d6118393f9854
+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-aa b/audio/rioutil/patches/patch-aa
deleted file mode 100644
index 53f66f9cc9b..00000000000
--- a/audio/rioutil/patches/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2007/01/06 04:21:24 schmonz Exp $
-
---- src/main.c.orig	2006-08-08 12:23:08.000000000 -0400
-+++ src/main.c
-@@ -730,10 +730,10 @@ static void usage (void) {
-   printf("  -d, --delete=<int>     delete a track(s)\n\n");
- 
-   printf(" options:\n");
--#if !defined(__FreeBSD__) || !defined(__NetBSD__)
--  printf("  -o, --device=<int>     minor number of rio (assigned by driver), /dev/usb/rio?\n");
--#else
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
-   printf("  -o, --device=<int>     minor number of rio (assigned by driver), /dev/urio?\n");
-+#else
-+  printf("  -o, --device=<int>     minor number of rio (assigned by driver), /dev/usb/rio?\n");
- #endif
-   printf("  -k, --nocolor          supress ansi color\n");
-   printf("  -m, --memory=<int>     memory unit to upload/download/delete/format to/from\n");
diff --git a/audio/rioutil/patches/patch-ae b/audio/rioutil/patches/patch-ae
deleted file mode 100644
index 674102213fc..00000000000
--- a/audio/rioutil/patches/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2007/02/02 15:58:58 joerg Exp $
-
---- include/rioi.h.orig	2006-08-04 22:40:49.000000000 +0000
-+++ include/rioi.h
-@@ -190,7 +190,8 @@ Group ID                0x7c   ????     
- #define bswap_32(x) NXSwapLong(x)
- #define bswap_16(x) NXSwapShort(x)
- 
--#elif defined (__NetBSD__)
-+#elif defined (__NetBSD__) || defined(__DragonFly__)
-+#include <sys/endian.h>
- 
- #define bswap_64(x) bswap64(x)
- #define bswap_32(x) bswap32(x)
diff --git a/audio/rioutil/patches/patch-ac b/audio/rioutil/patches/patch-librioutil_driver__file.c
index 4f7bf234250..14143324902 100644
--- a/audio/rioutil/patches/patch-ac
+++ b/audio/rioutil/patches/patch-librioutil_driver__file.c
@@ -1,6 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2007/01/06 04:21:24 schmonz Exp $
+$NetBSD: patch-librioutil_driver__file.c,v 1.1 2019/12/31 12:10:20 schmonz Exp $
 
---- librioutil/driver_file.c.orig	2006-08-07 11:47:28.000000000 -0400
+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";
diff --git a/audio/rioutil/patches/patch-ab b/audio/rioutil/patches/patch-linux__driver_rio__usb.h
index b259415274f..43d4c1e2eb7 100644
--- a/audio/rioutil/patches/patch-ab
+++ b/audio/rioutil/patches/patch-linux__driver_rio__usb.h
@@ -1,6 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2007/01/06 04:21:24 schmonz Exp $
+$NetBSD: patch-linux__driver_rio__usb.h,v 1.1 2019/12/31 12:10:20 schmonz Exp $
 
---- linux_driver/rio_usb.h.orig	2006-08-07 11:47:28.000000000 -0400
+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;
diff --git a/audio/rioutil/patches/patch-src_Makefile.am b/audio/rioutil/patches/patch-src_Makefile.am
deleted file mode 100644
index 37deca2264f..00000000000
--- a/audio/rioutil/patches/patch-src_Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_Makefile.am,v 1.1 2017/07/01 16:18:00 schmonz Exp $
-
---- src/Makefile.am.orig	2006-08-07 15:47:28.000000000 +0000
-+++ src/Makefile.am
-@@ -5,7 +5,7 @@ INCLUDES = -I$(top_srcdir)/include -I/us
- rioutil_SOURCES = main.c getopt.c getopt1.c main.h getopt.h
- 
- if MACOSX
--rioutil_LDADD = -L/usr/local/lib $(top_srcdir)/librioutil/librioutil.la -lIOKit
-+rioutil_LDADD = -L/usr/local/lib $(top_srcdir)/librioutil/librioutil.la -framework IOKit
- PREBIND_FLAGS = -prebind
- else
- rioutil_LDADD = -L/usr/local/lib $(top_srcdir)/librioutil/librioutil.la
diff --git a/audio/rioutil/patches/patch-src_Makefile.in b/audio/rioutil/patches/patch-src_Makefile.in
deleted file mode 100644
index 9fd99f09342..00000000000
--- a/audio/rioutil/patches/patch-src_Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_Makefile.in,v 1.1 2017/07/01 16:18:00 schmonz Exp $
-
---- src/Makefile.in.orig	2006-08-14 19:38:08.000000000 +0000
-+++ src/Makefile.in
-@@ -175,7 +175,7 @@ target_alias = @target_alias@
- INCLUDES = -I$(top_srcdir)/include -I/usr/local/include
- rioutil_SOURCES = main.c getopt.c getopt1.c main.h getopt.h
- @MACOSX_FALSE@rioutil_LDADD = -L/usr/local/lib $(top_srcdir)/librioutil/librioutil.la
--@MACOSX_TRUE@rioutil_LDADD = -L/usr/local/lib $(top_srcdir)/librioutil/librioutil.la -lIOKit
-+@MACOSX_TRUE@rioutil_LDADD = -L/usr/local/lib $(top_srcdir)/librioutil/librioutil.la -framework IOKit
- @MACOSX_TRUE@PREBIND_FLAGS = -prebind
- rioutil_LDFLAGS = $(PREBIND_FLAGS)
- rioutil_DEPENDENCIES = $(top_srcdir)/librioutil/librioutil.la
diff --git a/audio/rioutil/patches/patch-src_main.c b/audio/rioutil/patches/patch-src_main.c
new file mode 100644
index 00000000000..a5456877ca4
--- /dev/null
+++ b/audio/rioutil/patches/patch-src_main.c
@@ -0,0 +1,15 @@
+$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");