Fix some build warnings likely indicating LP64 problems. PKGREVISION -> 9.

While here clean out pkglint and add a bunch of patch comments.

31 files changed, 196 insertions, 72 deletions

diff --git a/audio/rplay/Makefile b/audio/rplay/Makefile
index 90c9512e1bd..f844b378540 100644
--- a/audio/rplay/Makefile
+++ b/audio/rplay/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.67 2018/01/26 12:45:27 he Exp $
+# $NetBSD: Makefile,v 1.68 2018/02/20 08:35:52 dholland Exp $
 
 DISTNAME=	rplay-3.3.2
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	audio
 #MASTER_SITES=	http://rplay.doit.org/dist/
 
@@ -13,22 +13,21 @@ LICENSE=	gnu-gpl-v2
 USE_TOOLS+=		makeinfo
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--build=BUILD
 
-INFO_FILES=	yes
-RCD_SCRIPTS=	rplayd
-EGDIR=		${PREFIX}/share/examples/rplay
+INFO_FILES=		yes
+RCD_SCRIPTS=		rplayd
+EGDIR=			${PREFIX}/share/examples/rplay
 INSTALLATION_DIRS=	${EGDIR}
 
-pre-configure:
-	cd ${WRKSRC}/doc; for manpage in *.[0-9]; do			\
-		${SED}	-e "s|/usr/local/etc|${PKG_SYSCONFDIR}|g"	\
-			-e "s|/usr/local|${PREFIX}|g"			\
-			-e "s|/etc/rplay|${PKG_SYSCONFDIR}|g"		\
-			$${manpage} > $${manpage}.pdone;		\
-		${MV} -f $${manpage}.pdone $${manpage};			\
-	done
+SUBST_CLASSES+=		paths
+SUBST_STAGE.paths=	pre-configure
+SUBST_FILES.paths=	doc/*.[0-9]
+SUBST_SED.paths=	-e "s|/usr/local/etc|${PKG_SYSCONFDIR}|g"
+SUBST_SED.paths+=	-e "s|/usr/local|${PREFIX}|g"
+SUBST_SED.paths+=	-e "s|/etc/rplay|${PKG_SYSCONFDIR}|g"
+SUBST_MESSAGE.paths=	Fixing paths in manpages.
 
 post-install:
 .for f in rplay.conf rplay.helpers rplay.hosts rplay.servers
diff --git a/audio/rplay/distinfo b/audio/rplay/distinfo
index d8dcb78d558..dbcd98d5b8d 100644
--- a/audio/rplay/distinfo
+++ b/audio/rplay/distinfo
@@ -1,40 +1,43 @@
-$NetBSD: distinfo,v 1.18 2018/01/26 12:45:27 he Exp $
+$NetBSD: distinfo,v 1.19 2018/02/20 08:35:52 dholland Exp $
 
 SHA1 (rplay-3.3.2.tar.gz) = 80b8001998a6f9837773f26285afffd609df2662
 RMD160 (rplay-3.3.2.tar.gz) = e5c740eade2cc770ea78c8f53020fa6d78f59861
 SHA512 (rplay-3.3.2.tar.gz) = b0683de0f5dc1483d22ac68c0502fe66e89ba1c25300fdca9486df1cb6ea96393b18b783f918f18dba0ba0fbfd20410448e3e03df06fc4afba1b63024d82a713
 Size (rplay-3.3.2.tar.gz) = 480015 bytes
-SHA1 (patch-aa) = d90e20abbca433740b7d53ba66e89f9dd80f8286
-SHA1 (patch-ab) = 6dccfb19d0e0024c12daf1604fba73aa74c37fe2
-SHA1 (patch-ac) = 89ccb3b33b245710b5349899c6539c004c9bade2
+SHA1 (patch-aa) = 77a3b871388602fe9e125c8d4f165286b65579d6
+SHA1 (patch-ab) = 8d4863656f1761af6207913dd35d764a3bfda6b5
+SHA1 (patch-ac) = bbe497d8eabdf4b6b377d7fb08d5615d16d9b3d5
 SHA1 (patch-ad) = 395048f6f0d0c579dfe81a0a2a0556651305e07b
 SHA1 (patch-ae) = 5095335425d16e24831ee8bcaacc60b0ec4d00ee
 SHA1 (patch-af) = 12f6bc02de7fceb44b6390178429654ef85dcc5d
 SHA1 (patch-ag) = ce19208502a150b7b9808c8f1755d116c978a506
-SHA1 (patch-ai) = b95f7af868a2dcf4a46f8b0294cef97c277d1933
-SHA1 (patch-aj) = 3839a4c729f7e82296e0d0b629485692cc604336
-SHA1 (patch-ak) = 0d7ba37676cce0851df8dd8aa7a27d75af3dae5a
-SHA1 (patch-al) = c8a436e471dffd8a620b8886e58a2d6b93c6bdbe
-SHA1 (patch-am) = cdea095456b089284ce4da9152cce0958bbc9c0f
-SHA1 (patch-an) = c59d49c738596943b6e4fbef19130d3a38fe4ad2
-SHA1 (patch-ao) = 01316da024026f526dd5389c3a6c2eaf89814546
-SHA1 (patch-ap) = 587a5614b591b8a031bb4b57198a170f621f4eb8
-SHA1 (patch-aq) = 41e6f83bb5c8a1223fc9d9cd8a21fee36012965f
-SHA1 (patch-ar) = ed50669c6210add534a4c91e7995a61e7db90dc8
-SHA1 (patch-as) = 64d31c1bc4d1659a18e9bfb922550f4a390f15bd
-SHA1 (patch-at) = d3f20f7693c0d4401c393a1bbcb766dee722a1d0
-SHA1 (patch-au) = 7451e5ba18e21c3787869cf9a1d55433d9d488fc
-SHA1 (patch-av) = 6eaa0294af7d559b7e0b74e22e93aecc42db1a9a
-SHA1 (patch-aw) = 82de8a6a58f0e3db1d52f97bcaff7f4ad643bb73
-SHA1 (patch-ax) = 7b2ce8d34bca784df1fcaa53fe081c89ca882b58
-SHA1 (patch-ay) = eabf297f65a66174ce032bf7498bf6f324fe0d13
-SHA1 (patch-az) = 8a55e0097ce509e169be02a127efb3db18aa395f
+SHA1 (patch-ai) = 586f6d6c1479012c269e79273132fdc1b5d45967
+SHA1 (patch-aj) = 36cc584f1329e499b659127bb89d9cd562f8681b
+SHA1 (patch-ak) = 7a1661eeae0a9950097b303940aff824d8a49b87
+SHA1 (patch-al) = 0a19345ae81a2bac7434e8bc4e6c4cbc61a35407
+SHA1 (patch-am) = 6324cd60e3f391fd6a34d7d5d90e2150f15af8b0
+SHA1 (patch-an) = a5f1a3eb087350026167c257468992bdbe6e59bb
+SHA1 (patch-ao) = 46fdf3d1c5eaff61af77f800b7f0bf5a99daa0e2
+SHA1 (patch-ap) = 90b3ebc9aef8afc02bced8fcebc633d4b3b51509
+SHA1 (patch-aq) = 94a7841b15b3cfc804827cf5afde17726c2abf9e
+SHA1 (patch-ar) = 0cae0bfe7632b6b5151803362dc15492f7f06f94
+SHA1 (patch-as) = f3656ae2ce795208b8da7d623fb743d59bc8a286
+SHA1 (patch-at) = 302aafefd2d3e3a577f90f064e20cb4e064278e3
+SHA1 (patch-au) = b70e133bc6a57c31b782267b76a2559f4b5207e1
+SHA1 (patch-av) = 535d6b7e456a3710ed42f29f9c016fad25101cb1
+SHA1 (patch-aw) = decc04ef5df8beddc8363b57812491af76e5b11c
+SHA1 (patch-ax) = c03601aea39ae25ccf9fdd185d755fd170545d60
+SHA1 (patch-ay) = a538d4a51d8940012d952f3ee83d19e5e95868ad
+SHA1 (patch-az) = ad7ec6d8477b837c3f053bce5e6953039d68b6b9
 SHA1 (patch-ba) = 394dfa920f36a5e0f7e919de016fefac2a447322
 SHA1 (patch-bb) = 6829e94a21eee04b58021e2d848a624b0c037b00
 SHA1 (patch-bc) = ea0d5d00cf71263f6f6cf2e54a8dd8b730aba8e8
-SHA1 (patch-ca) = d5ffe7a8e0f2112adf0d11b5661d565e5a57dec8
-SHA1 (patch-cb) = 24c810e43d6735c24908ba429ede32a49cff36e8
-SHA1 (patch-cc) = 824d7c70282d24e489c7c041982018da13ac70ce
-SHA1 (patch-devrplay_Makefile.in) = 0e158606fefa128cfcd798cd7919fe589ba04144
-SHA1 (patch-devrplay_devrplay.c) = b9a5434a8060347217e5a683cfc84d9bf73d9572
+SHA1 (patch-ca) = 28dd70179002299ed89f82089400fc83e1e015f4
+SHA1 (patch-cb) = 5bce9b440f812f41bc90f9daca3d788e96d5820d
+SHA1 (patch-cc) = ad1c91a1dcaf8f9cfe476ff6202ad5df60d60cec
+SHA1 (patch-devrplay_Makefile.in) = 307e9766679c4550ae25b9c45433bba3c5db02ca
+SHA1 (patch-devrplay_devrplay.c) = 0ee4eab36266206e5a32778de39df08d8bc08058
 SHA1 (patch-include_config.h.in) = 1b706770619f17517f78eb3cd125263910a7c479
+SHA1 (patch-librplay_rplay.c) = 9e86fe6d5c90723f8b2176210052a9ee94c8f34c
+SHA1 (patch-librplay_rptp.c) = c0b9184d9d9d30e49ee879cf1a1039427d8827bd
+SHA1 (patch-rplayd_host.c) = a216ff644fc3c9bba471c46f242b7bd2485ac7ba
diff --git a/audio/rplay/patches/patch-aa b/audio/rplay/patches/patch-aa
index 9fca1b20d61..a86edba5330 100644
--- a/audio/rplay/patches/patch-aa
+++ b/audio/rplay/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.5 2008/04/03 11:03:21 joerg Exp $
+$NetBSD: patch-aa,v 1.6 2018/02/20 08:35:52 dholland Exp $
+
+Configure for pkgsrc.
 
 --- Makefile.config.in.orig	1998-08-13 08:12:59.000000000 +0200
 +++ Makefile.config.in
diff --git a/audio/rplay/patches/patch-ab b/audio/rplay/patches/patch-ab
index 971027718d5..e76190e1b99 100644
--- a/audio/rplay/patches/patch-ab
+++ b/audio/rplay/patches/patch-ab
@@ -1,4 +1,7 @@
-$NetBSD: patch-ab,v 1.6 2009/05/18 05:11:50 dholland Exp $
+$NetBSD: patch-ab,v 1.7 2018/02/20 08:35:52 dholland Exp $
+
+Fix readline configury.
+Add NetBSD backend.
 
 --- configure.in.orig	Wed Jun  9 02:26:28 1999
 +++ configure.in	Tue Jan 18 16:20:01 2000
diff --git a/audio/rplay/patches/patch-ac b/audio/rplay/patches/patch-ac
index 7805e90640f..160b79bdc90 100644
--- a/audio/rplay/patches/patch-ac
+++ b/audio/rplay/patches/patch-ac
@@ -1,4 +1,6 @@
-$NetBSD: patch-ac,v 1.3 2000/01/26 22:11:36 jlam Exp $
+$NetBSD: patch-ac,v 1.4 2018/02/20 08:35:52 dholland Exp $
+
+Make sure info files get built.
 
 --- doc/Makefile.in.orig	Tue Jul 14 18:35:23 1998
 +++ doc/Makefile.in	Tue Jan 18 16:15:32 2000
diff --git a/audio/rplay/patches/patch-ai b/audio/rplay/patches/patch-ai
index 77bca25f758..fa031f980b4 100644
--- a/audio/rplay/patches/patch-ai
+++ b/audio/rplay/patches/patch-ai
@@ -1,4 +1,6 @@
-$NetBSD: patch-ai,v 1.2 2000/01/26 22:11:36 jlam Exp $
+$NetBSD: patch-ai,v 1.3 2018/02/20 08:35:52 dholland Exp $
+
+Fix readline configury.
 
 --- include/config.h.in.orig	Wed Jun  9 02:25:20 1999
 +++ include/config.h.in	Tue Jan 18 16:15:33 2000
diff --git a/audio/rplay/patches/patch-aj b/audio/rplay/patches/patch-aj
index b750d735389..0eae73e2578 100644
--- a/audio/rplay/patches/patch-aj
+++ b/audio/rplay/patches/patch-aj
@@ -1,4 +1,6 @@
-$NetBSD: patch-aj,v 1.2 2009/10/06 17:27:51 joerg Exp $
+$NetBSD: patch-aj,v 1.3 2018/02/20 08:35:52 dholland Exp $
+
+libtoolize
 
 --- librplay/Makefile.in.orig	Mon Mar 22 21:38:38 1999
 +++ librplay/Makefile.in	Tue Jan 18 16:15:33 2000
diff --git a/audio/rplay/patches/patch-ak b/audio/rplay/patches/patch-ak
index a2dcc5f6804..4627ac2f397 100644
--- a/audio/rplay/patches/patch-ak
+++ b/audio/rplay/patches/patch-ak
@@ -1,4 +1,6 @@
-$NetBSD: patch-ak,v 1.2 2009/10/06 17:27:51 joerg Exp $
+$NetBSD: patch-ak,v 1.3 2018/02/20 08:35:52 dholland Exp $
+
+libtoolize.
 
 --- rplay/Makefile.in.orig	Sat Mar 20 19:44:57 1999
 +++ rplay/Makefile.in	Tue Jan 18 16:15:33 2000
diff --git a/audio/rplay/patches/patch-al b/audio/rplay/patches/patch-al
index 6a777b1db09..c89eabdde3d 100644
--- a/audio/rplay/patches/patch-al
+++ b/audio/rplay/patches/patch-al
@@ -1,4 +1,6 @@
-$NetBSD: patch-al,v 1.2 2009/10/06 17:27:51 joerg Exp $
+$NetBSD: patch-al,v 1.3 2018/02/20 08:35:52 dholland Exp $
+
+libtoolize
 
 --- rplayd/Makefile.in.orig	Wed Jun  9 02:27:43 1999
 +++ rplayd/Makefile.in	Wed Jan 26 17:03:44 2000
diff --git a/audio/rplay/patches/patch-am b/audio/rplay/patches/patch-am
index 783d6531728..7feb1c794e4 100644
--- a/audio/rplay/patches/patch-am
+++ b/audio/rplay/patches/patch-am
@@ -1,4 +1,6 @@
-$NetBSD: patch-am,v 1.1 2000/01/26 22:11:37 jlam Exp $
+$NetBSD: patch-am,v 1.2 2018/02/20 08:35:52 dholland Exp $
+
+Fix compilation.
 
 --- rplayd/sound.h.orig	Wed Jun  9 02:27:44 1999
 +++ rplayd/sound.h	Tue Jan 18 16:15:33 2000
diff --git a/audio/rplay/patches/patch-an b/audio/rplay/patches/patch-an
index 6287617ebb5..128dfc0f0b9 100644
--- a/audio/rplay/patches/patch-an
+++ b/audio/rplay/patches/patch-an
@@ -1,4 +1,6 @@
-$NetBSD: patch-an,v 1.1 2000/01/26 22:11:37 jlam Exp $
+$NetBSD: patch-an,v 1.2 2018/02/20 08:35:52 dholland Exp $
+
+Fix compilation.
 
 --- rplayd/spool.c.orig	Wed Mar 10 16:14:38 1999
 +++ rplayd/spool.c	Tue Jan 18 16:15:33 2000
diff --git a/audio/rplay/patches/patch-ao b/audio/rplay/patches/patch-ao
index ac3e00628e8..c594707a0ec 100644
--- a/audio/rplay/patches/patch-ao
+++ b/audio/rplay/patches/patch-ao
@@ -1,4 +1,6 @@
-$NetBSD: patch-ao,v 1.1 2000/01/26 22:11:37 jlam Exp $
+$NetBSD: patch-ao,v 1.2 2018/02/20 08:35:52 dholland Exp $
+
+Use standard headers.
 
 --- rplayd/timer.h.orig	Wed Mar 10 02:58:04 1999
 +++ rplayd/timer.h	Tue Jan 18 16:15:34 2000
diff --git a/audio/rplay/patches/patch-ap b/audio/rplay/patches/patch-ap
index c7196f5cad4..d2d6298b30f 100644
--- a/audio/rplay/patches/patch-ap
+++ b/audio/rplay/patches/patch-ap
@@ -1,4 +1,6 @@
-$NetBSD: patch-ap,v 1.2 2009/10/06 17:27:51 joerg Exp $
+$NetBSD: patch-ap,v 1.3 2018/02/20 08:35:52 dholland Exp $
+
+libtoolize
 
 --- rptp/Makefile.in.orig	Wed Jun  9 02:27:48 1999
 +++ rptp/Makefile.in	Tue Jan 18 16:15:34 2000
diff --git a/audio/rplay/patches/patch-aq b/audio/rplay/patches/patch-aq
index 3020511e2ac..88209ef1b03 100644
--- a/audio/rplay/patches/patch-aq
+++ b/audio/rplay/patches/patch-aq
@@ -1,4 +1,6 @@
-$NetBSD: patch-aq,v 1.1 2000/01/26 22:11:37 jlam Exp $
+$NetBSD: patch-aq,v 1.2 2018/02/20 08:35:52 dholland Exp $
+
+Fix readline configury.
 
 --- rptp/rptp.c.orig	Sat Mar 20 19:45:08 1999
 +++ rptp/rptp.c	Tue Jan 18 16:15:34 2000
diff --git a/audio/rplay/patches/patch-ar b/audio/rplay/patches/patch-ar
index 651b8ba1360..2c8e56f1350 100644
--- a/audio/rplay/patches/patch-ar
+++ b/audio/rplay/patches/patch-ar
@@ -1,4 +1,6 @@
-$NetBSD: patch-ar,v 1.4 2009/05/18 05:11:50 dholland Exp $
+$NetBSD: patch-ar,v 1.5 2018/02/20 08:35:52 dholland Exp $
+
+Regenerate.
 
 --- configure.orig	1999-06-09 06:26:19.000000000 +0000
 +++ configure
diff --git a/audio/rplay/patches/patch-as b/audio/rplay/patches/patch-as
index 6f3740eb259..1b61b0889fe 100644
--- a/audio/rplay/patches/patch-as
+++ b/audio/rplay/patches/patch-as
@@ -1,4 +1,6 @@
-$NetBSD: patch-as,v 1.1 2004/05/07 01:42:28 danw Exp $
+$NetBSD: patch-as,v 1.2 2018/02/20 08:35:52 dholland Exp $
+
+Use standard headers.
 
 --- include/malloc.h.orig	Thu May  6 21:37:16 2004
 +++ include/malloc.h
diff --git a/audio/rplay/patches/patch-at b/audio/rplay/patches/patch-at
index 84bcd4e7f97..976b0ce04a3 100644
--- a/audio/rplay/patches/patch-at
+++ b/audio/rplay/patches/patch-at
@@ -1,4 +1,7 @@
-$NetBSD: patch-at,v 1.2 2007/01/06 17:41:00 veego Exp $
+$NetBSD: patch-at,v 1.3 2018/02/20 08:35:52 dholland Exp $
+
+Don't declare own errno.
+XXX: not sure what the first hunk's for.
 
 --- rplayd/rplayd.h.orig	1999-03-10 08:58:04.000000000 +0100
 +++ rplayd/rplayd.h	2007-01-06 18:33:05.000000000 +0100
diff --git a/audio/rplay/patches/patch-au b/audio/rplay/patches/patch-au
index 3a93596b45c..abedb81e2e9 100644
--- a/audio/rplay/patches/patch-au
+++ b/audio/rplay/patches/patch-au
@@ -1,4 +1,6 @@
-$NetBSD: patch-au,v 1.1 2005/10/10 15:13:58 joerg Exp $
+$NetBSD: patch-au,v 1.2 2018/02/20 08:35:52 dholland Exp $
+
+Use standard headers.
 
 --- rplayd/misc.c.orig	2005-08-04 22:36:40.000000000 +0000
 +++ rplayd/misc.c
diff --git a/audio/rplay/patches/patch-av b/audio/rplay/patches/patch-av
index 4b8714f950e..221ceeb85d8 100644
--- a/audio/rplay/patches/patch-av
+++ b/audio/rplay/patches/patch-av
@@ -1,4 +1,6 @@
-$NetBSD: patch-av,v 1.1 2005/10/10 15:13:58 joerg Exp $
+$NetBSD: patch-av,v 1.2 2018/02/20 08:35:52 dholland Exp $
+
+Use standard headers.
 
 --- rplayd/timer.c.orig	2005-08-04 22:38:22.000000000 +0000
 +++ rplayd/timer.c
diff --git a/audio/rplay/patches/patch-aw b/audio/rplay/patches/patch-aw
index d731c45721e..d3722cdb8c7 100644
--- a/audio/rplay/patches/patch-aw
+++ b/audio/rplay/patches/patch-aw
@@ -1,4 +1,6 @@
-$NetBSD: patch-aw,v 1.1 2005/10/10 15:13:58 joerg Exp $
+$NetBSD: patch-aw,v 1.2 2018/02/20 08:35:52 dholland Exp $
+
+Use standard headers.
 
 --- rplayd/cache.c.orig	2005-10-10 16:54:10.000000000 +0200
 +++ rplayd/cache.c
diff --git a/audio/rplay/patches/patch-ax b/audio/rplay/patches/patch-ax
index 1ea0c763ad0..6f38bc4e710 100644
--- a/audio/rplay/patches/patch-ax
+++ b/audio/rplay/patches/patch-ax
@@ -1,4 +1,6 @@
-$NetBSD: patch-ax,v 1.1 2005/10/10 15:13:58 joerg Exp $
+$NetBSD: patch-ax,v 1.2 2018/02/20 08:35:52 dholland Exp $
+
+Use standard headers.
 
 --- rplayd/sound.c.orig	2005-10-10 16:55:19.000000000 +0200
 +++ rplayd/sound.c
diff --git a/audio/rplay/patches/patch-ay b/audio/rplay/patches/patch-ay
index 834eb83058c..a5931bf46d2 100644
--- a/audio/rplay/patches/patch-ay
+++ b/audio/rplay/patches/patch-ay
@@ -1,13 +1,26 @@
-$NetBSD: patch-ay,v 1.1 2008/04/03 11:03:21 joerg Exp $
+$NetBSD: patch-ay,v 1.2 2018/02/20 08:35:52 dholland Exp $
 
---- rplayd/connection.c.orig	2008-04-03 12:39:36.000000000 +0200
+Use standard headers.
+Use ctype.h correctly.
+
+--- rplayd/connection.c.orig	1999-03-10 07:58:03.000000000 +0000
 +++ rplayd/connection.c
-@@ -25,7 +25,7 @@
+@@ -25,7 +25,8 @@
  #include "config.h"
  #endif
  #include <sys/time.h>
 -#include <sys/errno.h>
 +#include <errno.h>
++#include <ctype.h>
  #include <stdlib.h>
  #include <unistd.h>
  #ifdef HAVE_STRING_H
+@@ -1741,7 +1742,7 @@ event_update(c)
+ 	if (c->event->success)
+ 	{
+ 	    if (c->event->start[0] != '\0'
+-		&& isascii(c->event->start[0]))
++		&& isascii((unsigned char)c->event->start[0]))
+ 	    {
+ 		b = c->event->buffer;	/* save the event's buffer */
+ 		c->event->buffer = NULL;
diff --git a/audio/rplay/patches/patch-az b/audio/rplay/patches/patch-az
index 5c22aa914ff..b446a4356e0 100644
--- a/audio/rplay/patches/patch-az
+++ b/audio/rplay/patches/patch-az
@@ -1,4 +1,6 @@
-$NetBSD: patch-az,v 1.1 2008/04/03 11:03:21 joerg Exp $
+$NetBSD: patch-az,v 1.2 2018/02/20 08:35:52 dholland Exp $
+
+Use standard headers.
 
 --- rplayd/rplayd.c.orig	2008-04-03 12:49:24.000000000 +0200
 +++ rplayd/rplayd.c
diff --git a/audio/rplay/patches/patch-ca b/audio/rplay/patches/patch-ca
index a84befcc821..4375a2f8781 100644
--- a/audio/rplay/patches/patch-ca
+++ b/audio/rplay/patches/patch-ca
@@ -1,4 +1,7 @@
-$NetBSD: patch-ca,v 1.1 2004/12/22 16:19:34 ben Exp $
+$NetBSD: patch-ca,v 1.2 2018/02/20 08:35:52 dholland Exp $
+
+Backend for NetBSD.
+
 --- rplayd/audio/audio_NetBSD.h.orig	Thu Nov 18 22:37:44 2004
 +++ rplayd/audio/audio_NetBSD.h	Thu Nov 18 22:46:15 2004
 @@ -0,0 +1,40 @@
diff --git a/audio/rplay/patches/patch-cb b/audio/rplay/patches/patch-cb
index 279ab37ffb8..9c7528e0518 100644
--- a/audio/rplay/patches/patch-cb
+++ b/audio/rplay/patches/patch-cb
@@ -1,7 +1,10 @@
-$NetBSD: patch-cb,v 1.1 2004/12/22 16:19:34 ben Exp $
---- rplayd/audio/audio_NetBSD.c.orig	Sat Dec 18 17:40:37 2004
-+++ rplayd/audio/audio_NetBSD.c	Sat Dec 18 18:19:18 2004
-@@ -0,0 +1,598 @@
+$NetBSD: patch-cb,v 1.2 2018/02/20 08:35:52 dholland Exp $
+
+Backend for NetBSD.
+
+--- rplayd/audio/audio_NetBSD.c.orig	2018-02-20 08:02:48.586673776 +0000
++++ rplayd/audio/audio_NetBSD.c
+@@ -0,0 +1,599 @@
 +/* #Id: audio_NetBSD  0.02  2004/12/18  OHt # */
 +
 +/*
@@ -37,6 +40,7 @@ $NetBSD: patch-cb,v 1.1 2004/12/22 16:19:34 ben Exp $
 +#include <sys/fcntl.h>
 +#include <sys/errno.h>
 +#include <sys/audioio.h>
++#include <unistd.h>
 +#include <errno.h>
 +
 +/*
diff --git a/audio/rplay/patches/patch-cc b/audio/rplay/patches/patch-cc
index d6b62353018..0ff21b19b7a 100644
--- a/audio/rplay/patches/patch-cc
+++ b/audio/rplay/patches/patch-cc
@@ -1,4 +1,6 @@
-$NetBSD: patch-cc,v 1.1 2004/12/22 16:19:34 ben Exp $
+$NetBSD: patch-cc,v 1.2 2018/02/20 08:35:52 dholland Exp $
+
+Avoid defining own magic numbers.
 
 --- adpcm/g72x.h.orig	Tue Jul 14 15:35:23 1998
 +++ adpcm/g72x.h
diff --git a/audio/rplay/patches/patch-devrplay_Makefile.in b/audio/rplay/patches/patch-devrplay_Makefile.in
index 2a0323a3e4c..3d3cfe8d911 100644
--- a/audio/rplay/patches/patch-devrplay_Makefile.in
+++ b/audio/rplay/patches/patch-devrplay_Makefile.in
@@ -1,4 +1,6 @@
-$NetBSD: patch-devrplay_Makefile.in,v 1.1 2012/02/06 02:40:29 sbd Exp $
+$NetBSD: patch-devrplay_Makefile.in,v 1.2 2018/02/20 08:35:52 dholland Exp $
+
+libtoolize.
 
 --- devrplay/Makefile.in.orig	1999-03-23 02:36:30.000000000 +0000
 +++ devrplay/Makefile.in
diff --git a/audio/rplay/patches/patch-devrplay_devrplay.c b/audio/rplay/patches/patch-devrplay_devrplay.c
index 26f39ea36b9..186994707fd 100644
--- a/audio/rplay/patches/patch-devrplay_devrplay.c
+++ b/audio/rplay/patches/patch-devrplay_devrplay.c
@@ -1,4 +1,6 @@
-$NetBSD: patch-devrplay_devrplay.c,v 1.1 2012/02/06 02:40:29 sbd Exp $
+$NetBSD: patch-devrplay_devrplay.c,v 1.2 2018/02/20 08:35:52 dholland Exp $
+
+Fix Linux build.
 
 --- devrplay/devrplay.c.orig	1999-03-21 00:44:48.000000000 +0000
 +++ devrplay/devrplay.c
diff --git a/audio/rplay/patches/patch-librplay_rplay.c b/audio/rplay/patches/patch-librplay_rplay.c
new file mode 100644
index 00000000000..97f14b14044
--- /dev/null
+++ b/audio/rplay/patches/patch-librplay_rplay.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-librplay_rplay.c,v 1.1 2018/02/20 08:35:52 dholland Exp $
+
+Use standard headers.
+
+--- librplay/rplay.c~	1999-03-10 07:57:56.000000000 +0000
++++ librplay/rplay.c
+@@ -29,6 +29,7 @@
+ #include <sys/param.h>
+ #include <netdb.h>
+ #include <string.h>
++#include <time.h>
+ #include <arpa/inet.h>
+ 
+ #ifdef __STDC__
diff --git a/audio/rplay/patches/patch-librplay_rptp.c b/audio/rplay/patches/patch-librplay_rptp.c
new file mode 100644
index 00000000000..972d860d30c
--- /dev/null
+++ b/audio/rplay/patches/patch-librplay_rptp.c
@@ -0,0 +1,26 @@
+$NetBSD: patch-librplay_rptp.c,v 1.1 2018/02/20 08:35:52 dholland Exp $
+
+Use ctype.h correctly.
+
+--- librplay/rptp.c~	1999-03-10 07:57:56.000000000 +0000
++++ librplay/rptp.c
+@@ -44,6 +44,7 @@
+ #else
+ #include <varargs.h>
+ #endif
++#include <ctype.h>
+ #include <errno.h>
+ 
+ int rptp_errno = RPTP_ERROR_NONE;
+@@ -574,9 +575,9 @@ rptp_parse(response, name)
+ 	while (p && *p)
+ 	{
+ 	    /* Skip white-space. */
+-	    if (isspace(*p))
++	    if (isspace((unsigned char)*p))
+ 	    {
+-		for (p++; isspace(*p); p++) ;
++		for (p++; isspace((unsigned char)*p); p++) ;
+ 		continue;
+ 	    }
+ 
diff --git a/audio/rplay/patches/patch-rplayd_host.c b/audio/rplay/patches/patch-rplayd_host.c
new file mode 100644
index 00000000000..f9b576ae109
--- /dev/null
+++ b/audio/rplay/patches/patch-rplayd_host.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-rplayd_host.c,v 1.1 2018/02/20 08:35:52 dholland Exp $
+
+Use standard headers.
+
+--- rplayd/host.c~	1999-06-09 06:27:44.000000000 +0000
++++ rplayd/host.c
+@@ -30,6 +30,7 @@
+ #ifdef HAVE_STRING_H
+ #include <string.h>
+ #endif
++#include <time.h>
+ #include "host.h"
+ #include "buffer.h"
+ #include "misc.h"