Three fixes to close PR 39819:

(1) Fix top level makefile to stop on error.
(2) Use <errno.h>, not <sys/errno.h>, in rplayd/cdrom.c to fix Solaris build.
(3) Fix botched configure test for libedit vs. readline.

4 files changed, 79 insertions, 4 deletions

diff --git a/audio/rplay/patches/patch-ab b/audio/rplay/patches/patch-ab
index 62dc4d07cc4..971027718d5 100644
--- a/audio/rplay/patches/patch-ab
+++ b/audio/rplay/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.5 2005/05/23 08:44:37 rillig Exp $
+$NetBSD: patch-ab,v 1.6 2009/05/18 05:11:50 dholland Exp $
 
 --- configure.in.orig	Wed Jun  9 02:26:28 1999
 +++ configure.in	Tue Jan 18 16:20:01 2000
@@ -25,7 +25,7 @@ $NetBSD: patch-ab,v 1.5 2005/05/23 08:44:37 rillig Exp $
 +	    [AC_CHECK_LIB(readline, readline,
 +		[AC_DEFINE(HAVE_LIBREADLINE)
 +		 AC_DEFINE(HAVE_READLINE)
-+		 RL_LIBS="-ledit -ltermcap"], -ltermcap)
++		 RL_LIBS="-lreadline"], -ltermcap)
 +	    ], -ltermcap)
 +	])
 +fi
diff --git a/audio/rplay/patches/patch-ar b/audio/rplay/patches/patch-ar
index 3363c5c543c..651b8ba1360 100644
--- a/audio/rplay/patches/patch-ar
+++ b/audio/rplay/patches/patch-ar
@@ -1,4 +1,4 @@
-$NetBSD: patch-ar,v 1.3 2005/10/10 15:13:58 joerg Exp $
+$NetBSD: patch-ar,v 1.4 2009/05/18 05:11:50 dholland Exp $
 
 --- configure.orig	1999-06-09 06:26:19.000000000 +0000
 +++ configure
@@ -6860,7 +6860,7 @@ $NetBSD: patch-ar,v 1.3 2005/10/10 15:13:58 joerg Exp $
 +#define HAVE_READLINE 1
 +_ACEOF
 +
-+		 RL_LIBS="-ledit -ltermcap"
++		 RL_LIBS="-lreadline"
  else
 -  echo "$ac_t""no" 1>&6
 +  -ltermcap
diff --git a/audio/rplay/patches/patch-ba b/audio/rplay/patches/patch-ba
new file mode 100644
index 00000000000..ff5ac01399d
--- /dev/null
+++ b/audio/rplay/patches/patch-ba
@@ -0,0 +1,60 @@
+$NetBSD: patch-ba,v 1.1 2009/05/18 05:11:50 dholland Exp $
+
+Fix makefile to stop on error.
+
+--- Makefile.in.orig	2009-05-18 00:56:38.000000000 -0400
++++ Makefile.in	2009-05-18 00:57:03.000000000 -0400
+@@ -10,7 +10,7 @@
+ all:
+ 		@for i in $(TARGET); \
+ 		do \
+-			(echo make all in $$i...; cd $$i; $(MAKE) $(MFLAGS) all); \
++			(echo make all in $$i...; cd $$i; $(MAKE) $(MFLAGS) all) || exit 1; \
+ 		done;
+ 
+ world:		all install
+@@ -18,32 +18,32 @@
+ install:
+ 		@for i in $(TARGET); \
+ 		do \
+-			(echo make install in $$i...; cd $$i; $(MAKE) $(MFLAGS) install); \
++			(echo make install in $$i...; cd $$i; $(MAKE) $(MFLAGS) install) || exit 1; \
+ 		done;
+ 
+ uninstall:
+ 		@for i in $(TARGET); \
+ 		do \
+-			(echo make uninstall in $$i...; cd $$i; $(MAKE) $(MFLAGS) uninstall); \
++			(echo make uninstall in $$i...; cd $$i; $(MAKE) $(MFLAGS) uninstall) || exit 1; \
+ 		done;
+ 
+ clean:
+ 		@for i in $(TARGET); \
+ 		do \
+-			(echo make clean in $$i...; cd $$i; $(MAKE) $(MFLAGS) clean); \
++			(echo make clean in $$i...; cd $$i; $(MAKE) $(MFLAGS) clean) || exit 1; \
+ 		done;
+ 
+ distclean:
+ 		@for i in $(TARGET); \
+ 		do \
+-			(echo make distclean in $$i...; cd $$i; $(MAKE) $(MFLAGS) distclean); \
++			(echo make distclean in $$i...; cd $$i; $(MAKE) $(MFLAGS) distclean) || exit 1; \
+ 		done;
+ 		$(RM) Makefile Makefile.config config.status config.cache config.log *~ *.bak *.orig stamp-configure stamp-build
+ 
+ tags:
+ 		@for i in $(TARGET); \
+ 		do \
+-			(echo make tags in $$i...; cd $$i; $(MAKE) $(MFLAGS) tags); \
++			(echo make tags in $$i...; cd $$i; $(MAKE) $(MFLAGS) tags) || exit 1; \
+ 		done;
+ 
+ TAGS:		tags
+@@ -53,5 +53,5 @@
+ depend:
+ 		@for i in $(TARGET); \
+ 		do \
+-			(echo make depend in $$i...; cd $$i; $(MAKE) $(MFLAGS) depend); \
++			(echo make depend in $$i...; cd $$i; $(MAKE) $(MFLAGS) depend) || exit 1; \
+ 		done;
diff --git a/audio/rplay/patches/patch-bb b/audio/rplay/patches/patch-bb
new file mode 100644
index 00000000000..6ea75eaeb28
--- /dev/null
+++ b/audio/rplay/patches/patch-bb
@@ -0,0 +1,15 @@
+$NetBSD: patch-bb,v 1.1 2009/05/18 05:11:50 dholland Exp $
+
+Fix inclusion of errno.h to work properly on e.g. Solaris.
+
+--- rplayd/cdrom.c~	1999-03-10 02:58:02.000000000 -0500
++++ rplayd/cdrom.c	2009-05-18 00:54:06.000000000 -0400
+@@ -34,7 +34,7 @@
+ #ifdef HAVE_CDROM
+ 
+ #include <sys/types.h>
+-#include <sys/errno.h>
++#include <errno.h>
+ #include "rplayd.h"
+ #include "cdrom.h"
+