Mon May 18 05:11:50 2009 UTC ()
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.


(dholland)
diff -r1.12 -r1.13 pkgsrc/audio/rplay/distinfo
diff -r1.5 -r1.6 pkgsrc/audio/rplay/patches/patch-ab
diff -r1.3 -r1.4 pkgsrc/audio/rplay/patches/patch-ar
diff -r0 -r1.1 pkgsrc/audio/rplay/patches/patch-ba
diff -r0 -r1.1 pkgsrc/audio/rplay/patches/patch-bb
cvs diff -r1.12 -r1.13 pkgsrc/audio/rplay/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/rplay/Attic/distinfo 2008/04/03 11:03:21 1.12
+++ pkgsrc/audio/rplay/Attic/distinfo 2009/05/18 05:11:50 1.13
@@ -1,33 +1,35 @@ @@ -1,33 +1,35 @@
1$NetBSD: distinfo,v 1.12 2008/04/03 11:03:21 joerg Exp $ 1$NetBSD: distinfo,v 1.13 2009/05/18 05:11:50 dholland Exp $
2 2
3SHA1 (rplay-3.3.2.tar.gz) = 80b8001998a6f9837773f26285afffd609df2662 3SHA1 (rplay-3.3.2.tar.gz) = 80b8001998a6f9837773f26285afffd609df2662
4RMD160 (rplay-3.3.2.tar.gz) = e5c740eade2cc770ea78c8f53020fa6d78f59861 4RMD160 (rplay-3.3.2.tar.gz) = e5c740eade2cc770ea78c8f53020fa6d78f59861
5Size (rplay-3.3.2.tar.gz) = 480015 bytes 5Size (rplay-3.3.2.tar.gz) = 480015 bytes
6SHA1 (patch-aa) = d90e20abbca433740b7d53ba66e89f9dd80f8286 6SHA1 (patch-aa) = d90e20abbca433740b7d53ba66e89f9dd80f8286
7SHA1 (patch-ab) = 4f2b26f96e431ebec8169c7ecd9187e0d9196b73 7SHA1 (patch-ab) = 6dccfb19d0e0024c12daf1604fba73aa74c37fe2
8SHA1 (patch-ac) = 89ccb3b33b245710b5349899c6539c004c9bade2 8SHA1 (patch-ac) = 89ccb3b33b245710b5349899c6539c004c9bade2
9SHA1 (patch-ad) = 395048f6f0d0c579dfe81a0a2a0556651305e07b 9SHA1 (patch-ad) = 395048f6f0d0c579dfe81a0a2a0556651305e07b
10SHA1 (patch-ae) = 5095335425d16e24831ee8bcaacc60b0ec4d00ee 10SHA1 (patch-ae) = 5095335425d16e24831ee8bcaacc60b0ec4d00ee
11SHA1 (patch-af) = 12f6bc02de7fceb44b6390178429654ef85dcc5d 11SHA1 (patch-af) = 12f6bc02de7fceb44b6390178429654ef85dcc5d
12SHA1 (patch-ag) = ce19208502a150b7b9808c8f1755d116c978a506 12SHA1 (patch-ag) = ce19208502a150b7b9808c8f1755d116c978a506
13SHA1 (patch-ai) = b95f7af868a2dcf4a46f8b0294cef97c277d1933 13SHA1 (patch-ai) = b95f7af868a2dcf4a46f8b0294cef97c277d1933
14SHA1 (patch-aj) = 47535315d2edecd578a0e5c59cdfdf9f2e9a9a4a 14SHA1 (patch-aj) = 47535315d2edecd578a0e5c59cdfdf9f2e9a9a4a
15SHA1 (patch-ak) = 283d43624c6aa6b8577fae84763fd7e7611259df 15SHA1 (patch-ak) = 283d43624c6aa6b8577fae84763fd7e7611259df
16SHA1 (patch-al) = d1ba256801fe89606be00e61062156814cf5de6e 16SHA1 (patch-al) = d1ba256801fe89606be00e61062156814cf5de6e
17SHA1 (patch-am) = cdea095456b089284ce4da9152cce0958bbc9c0f 17SHA1 (patch-am) = cdea095456b089284ce4da9152cce0958bbc9c0f
18SHA1 (patch-an) = c59d49c738596943b6e4fbef19130d3a38fe4ad2 18SHA1 (patch-an) = c59d49c738596943b6e4fbef19130d3a38fe4ad2
19SHA1 (patch-ao) = 01316da024026f526dd5389c3a6c2eaf89814546 19SHA1 (patch-ao) = 01316da024026f526dd5389c3a6c2eaf89814546
20SHA1 (patch-ap) = 46e7e7fc0fb3b7d5228bf81877ac186eda1be00f 20SHA1 (patch-ap) = 46e7e7fc0fb3b7d5228bf81877ac186eda1be00f
21SHA1 (patch-aq) = 41e6f83bb5c8a1223fc9d9cd8a21fee36012965f 21SHA1 (patch-aq) = 41e6f83bb5c8a1223fc9d9cd8a21fee36012965f
22SHA1 (patch-ar) = 2428398a2d00e3db937d3692cfedf9cdd7691db8 22SHA1 (patch-ar) = ed50669c6210add534a4c91e7995a61e7db90dc8
23SHA1 (patch-as) = 64d31c1bc4d1659a18e9bfb922550f4a390f15bd 23SHA1 (patch-as) = 64d31c1bc4d1659a18e9bfb922550f4a390f15bd
24SHA1 (patch-at) = d3f20f7693c0d4401c393a1bbcb766dee722a1d0 24SHA1 (patch-at) = d3f20f7693c0d4401c393a1bbcb766dee722a1d0
25SHA1 (patch-au) = 7451e5ba18e21c3787869cf9a1d55433d9d488fc 25SHA1 (patch-au) = 7451e5ba18e21c3787869cf9a1d55433d9d488fc
26SHA1 (patch-av) = 6eaa0294af7d559b7e0b74e22e93aecc42db1a9a 26SHA1 (patch-av) = 6eaa0294af7d559b7e0b74e22e93aecc42db1a9a
27SHA1 (patch-aw) = 82de8a6a58f0e3db1d52f97bcaff7f4ad643bb73 27SHA1 (patch-aw) = 82de8a6a58f0e3db1d52f97bcaff7f4ad643bb73
28SHA1 (patch-ax) = 7b2ce8d34bca784df1fcaa53fe081c89ca882b58 28SHA1 (patch-ax) = 7b2ce8d34bca784df1fcaa53fe081c89ca882b58
29SHA1 (patch-ay) = eabf297f65a66174ce032bf7498bf6f324fe0d13 29SHA1 (patch-ay) = eabf297f65a66174ce032bf7498bf6f324fe0d13
30SHA1 (patch-az) = 8a55e0097ce509e169be02a127efb3db18aa395f 30SHA1 (patch-az) = 8a55e0097ce509e169be02a127efb3db18aa395f
 31SHA1 (patch-ba) = 394dfa920f36a5e0f7e919de016fefac2a447322
 32SHA1 (patch-bb) = 6829e94a21eee04b58021e2d848a624b0c037b00
31SHA1 (patch-ca) = d5ffe7a8e0f2112adf0d11b5661d565e5a57dec8 33SHA1 (patch-ca) = d5ffe7a8e0f2112adf0d11b5661d565e5a57dec8
32SHA1 (patch-cb) = 24c810e43d6735c24908ba429ede32a49cff36e8 34SHA1 (patch-cb) = 24c810e43d6735c24908ba429ede32a49cff36e8
33SHA1 (patch-cc) = 824d7c70282d24e489c7c041982018da13ac70ce 35SHA1 (patch-cc) = 824d7c70282d24e489c7c041982018da13ac70ce
cvs diff -r1.5 -r1.6 pkgsrc/audio/rplay/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/audio/rplay/patches/Attic/patch-ab 2005/05/23 08:44:37 1.5
+++ pkgsrc/audio/rplay/patches/Attic/patch-ab 2009/05/18 05:11:50 1.6
@@ -1,41 +1,41 @@ @@ -1,41 +1,41 @@
1$NetBSD: patch-ab,v 1.5 2005/05/23 08:44:37 rillig Exp $ 1$NetBSD: patch-ab,v 1.6 2009/05/18 05:11:50 dholland Exp $
2 2
3--- configure.in.orig Wed Jun 9 02:26:28 1999 3--- configure.in.orig Wed Jun 9 02:26:28 1999
4+++ configure.in Tue Jan 18 16:20:01 2000 4+++ configure.in Tue Jan 18 16:20:01 2000
5@@ -59,6 +59,7 @@ 5@@ -59,6 +59,7 @@
6 AC_HEADER_TIME 6 AC_HEADER_TIME
7 dnl AC_PATH_XTRA 7 dnl AC_PATH_XTRA
8 AC_CHECK_HEADERS(fcntl.h sys/file.h sys/ioctl.h sys/time.h stdlib.h unistd.h memory.h string.h strings.h utime.h limits.h gsm.h gsm/gsm.h rxposix.h rx/rxposix.h) 8 AC_CHECK_HEADERS(fcntl.h sys/file.h sys/ioctl.h sys/time.h stdlib.h unistd.h memory.h string.h strings.h utime.h limits.h gsm.h gsm/gsm.h rxposix.h rx/rxposix.h)
9+AC_CHECK_HEADERS(readline.h history.h readline/readline.h readline/history.h) 9+AC_CHECK_HEADERS(readline.h history.h readline/readline.h readline/history.h)
10 AC_HEADER_SYS_WAIT 10 AC_HEADER_SYS_WAIT
11  11
12 dnl Check for typedefs, structures, and compiler characteristics. 12 dnl Check for typedefs, structures, and compiler characteristics.
13@@ -74,7 +75,20 @@ 13@@ -74,7 +75,20 @@
14 AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"]) 14 AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"])
15 AC_CHECK_LIB(nsl, t_accept, [LIBS="$LIBS -lnsl"]) 15 AC_CHECK_LIB(nsl, t_accept, [LIBS="$LIBS -lnsl"])
16  16
17-AC_CHECK_LIB(readline, readline, [RL_LIBS="-lreadline"]) 17-AC_CHECK_LIB(readline, readline, [RL_LIBS="-lreadline"])
18+if test "$ac_cv_header_readline_h" = "yes" || 18+if test "$ac_cv_header_readline_h" = "yes" ||
19+ test "$ac_cv_header_readline_readline_h" = "yes"; then 19+ test "$ac_cv_header_readline_readline_h" = "yes"; then
20+ AC_CHECK_LIB(termcap, tputs, 20+ AC_CHECK_LIB(termcap, tputs,
21+ [AC_CHECK_LIB(edit, readline, 21+ [AC_CHECK_LIB(edit, readline,
22+ [AC_DEFINE(HAVE_LIBEDIT) 22+ [AC_DEFINE(HAVE_LIBEDIT)
23+ AC_DEFINE(HAVE_READLINE) 23+ AC_DEFINE(HAVE_READLINE)
24+ RL_LIBS="-ledit -ltermcap"], 24+ RL_LIBS="-ledit -ltermcap"],
25+ [AC_CHECK_LIB(readline, readline, 25+ [AC_CHECK_LIB(readline, readline,
26+ [AC_DEFINE(HAVE_LIBREADLINE) 26+ [AC_DEFINE(HAVE_LIBREADLINE)
27+ AC_DEFINE(HAVE_READLINE) 27+ AC_DEFINE(HAVE_READLINE)
28+ RL_LIBS="-ledit -ltermcap"], -ltermcap) 28+ RL_LIBS="-lreadline"], -ltermcap)
29+ ], -ltermcap) 29+ ], -ltermcap)
30+ ]) 30+ ])
31+fi 31+fi
32 AC_SUBST(RL_LIBS) 32 AC_SUBST(RL_LIBS)
33  33
34 AC_CHECK_LIB(gsm, gsm_decode, [HAVE_GSM="yes"]) 34 AC_CHECK_LIB(gsm, gsm_decode, [HAVE_GSM="yes"])
35@@ -209,6 +223,24 @@ 35@@ -209,6 +223,24 @@
36 AC_MSG_RESULT($is_freebsd) 36 AC_MSG_RESULT($is_freebsd)
37 if test $is_freebsd = "yes"; then 37 if test $is_freebsd = "yes"; then
38 RPLAY_TARGET="FreeBSD" 38 RPLAY_TARGET="FreeBSD"
39+fi 39+fi
40+fi 40+fi
41+ 41+
cvs diff -r1.3 -r1.4 pkgsrc/audio/rplay/patches/Attic/patch-ar (expand / switch to unified diff)

--- pkgsrc/audio/rplay/patches/Attic/patch-ar 2005/10/10 15:13:58 1.3
+++ pkgsrc/audio/rplay/patches/Attic/patch-ar 2009/05/18 05:11:50 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-ar,v 1.3 2005/10/10 15:13:58 joerg Exp $ 1$NetBSD: patch-ar,v 1.4 2009/05/18 05:11:50 dholland Exp $
2 2
3--- configure.orig 1999-06-09 06:26:19.000000000 +0000 3--- configure.orig 1999-06-09 06:26:19.000000000 +0000
4+++ configure 4+++ configure
5@@ -1,30 +1,326 @@ 5@@ -1,30 +1,326 @@
6 #! /bin/sh 6 #! /bin/sh
7- 7-
8 # Guess values for system-dependent variables and create Makefiles. 8 # Guess values for system-dependent variables and create Makefiles.
9-# Generated automatically using autoconf version 2.13  9-# Generated automatically using autoconf version 2.13
10-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. 10-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
11+# Generated by GNU Autoconf 2.59. 11+# Generated by GNU Autoconf 2.59.
12 # 12 #
13+# Copyright (C) 2003 Free Software Foundation, Inc. 13+# Copyright (C) 2003 Free Software Foundation, Inc.
14 # This configure script is free software; the Free Software Foundation 14 # This configure script is free software; the Free Software Foundation
@@ -6850,27 +6850,27 @@ $NetBSD: patch-ar,v 1.3 2005/10/10 15:13 @@ -6850,27 +6850,27 @@ $NetBSD: patch-ar,v 1.3 2005/10/10 15:13
6850- echo "$ac_t""yes" 1>&6 6850- echo "$ac_t""yes" 1>&6
6851- RL_LIBS="-lreadline" 6851- RL_LIBS="-lreadline"
6852+echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5 6852+echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5
6853+echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6 6853+echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6
6854+if test $ac_cv_lib_readline_readline = yes; then 6854+if test $ac_cv_lib_readline_readline = yes; then
6855+ cat >>confdefs.h <<\_ACEOF 6855+ cat >>confdefs.h <<\_ACEOF
6856+#define HAVE_LIBREADLINE 1 6856+#define HAVE_LIBREADLINE 1
6857+_ACEOF 6857+_ACEOF
6858+ 6858+
6859+ cat >>confdefs.h <<\_ACEOF 6859+ cat >>confdefs.h <<\_ACEOF
6860+#define HAVE_READLINE 1 6860+#define HAVE_READLINE 1
6861+_ACEOF 6861+_ACEOF
6862+ 6862+
6863+ RL_LIBS="-ledit -ltermcap" 6863+ RL_LIBS="-lreadline"
6864 else 6864 else
6865- echo "$ac_t""no" 1>&6 6865- echo "$ac_t""no" 1>&6
6866+ -ltermcap 6866+ -ltermcap
6867 fi 6867 fi
6868  6868
6869  6869
6870+fi 6870+fi
6871  6871
6872-echo $ac_n "checking for gsm_decode in -lgsm""... $ac_c" 1>&6 6872-echo $ac_n "checking for gsm_decode in -lgsm""... $ac_c" 1>&6
6873-echo "configure:2329: checking for gsm_decode in -lgsm" >&5 6873-echo "configure:2329: checking for gsm_decode in -lgsm" >&5
6874-ac_lib_var=`echo gsm'_'gsm_decode | sed 'y%./+-%__p_%'` 6874-ac_lib_var=`echo gsm'_'gsm_decode | sed 'y%./+-%__p_%'`
6875-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 6875-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
6876- echo $ac_n "(cached) $ac_c" 1>&6 6876- echo $ac_n "(cached) $ac_c" 1>&6
File Added: pkgsrc/audio/rplay/patches/Attic/patch-ba
$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;
File Added: pkgsrc/audio/rplay/patches/Attic/patch-bb
$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"