From 6a441534d1e47cd6c22e20d8a57173c3d58b0367 Mon Sep 17 00:00:00 2001 From: dholland Date: Mon, 18 May 2009 05:11:50 +0000 Subject: Three fixes to close PR 39819: (1) Fix top level makefile to stop on error. (2) Use , not , in rplayd/cdrom.c to fix Solaris build. (3) Fix botched configure test for libedit vs. readline. --- audio/rplay/distinfo | 8 +++--- audio/rplay/patches/patch-ab | 4 +-- audio/rplay/patches/patch-ar | 4 +-- audio/rplay/patches/patch-ba | 60 ++++++++++++++++++++++++++++++++++++++++++++ audio/rplay/patches/patch-bb | 15 +++++++++++ 5 files changed, 84 insertions(+), 7 deletions(-) create mode 100644 audio/rplay/patches/patch-ba create mode 100644 audio/rplay/patches/patch-bb (limited to 'audio') diff --git a/audio/rplay/distinfo b/audio/rplay/distinfo index b5bc376a9f5..dc47f4adbae 100644 --- a/audio/rplay/distinfo +++ b/audio/rplay/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.12 2008/04/03 11:03:21 joerg Exp $ +$NetBSD: distinfo,v 1.13 2009/05/18 05:11:50 dholland Exp $ SHA1 (rplay-3.3.2.tar.gz) = 80b8001998a6f9837773f26285afffd609df2662 RMD160 (rplay-3.3.2.tar.gz) = e5c740eade2cc770ea78c8f53020fa6d78f59861 Size (rplay-3.3.2.tar.gz) = 480015 bytes SHA1 (patch-aa) = d90e20abbca433740b7d53ba66e89f9dd80f8286 -SHA1 (patch-ab) = 4f2b26f96e431ebec8169c7ecd9187e0d9196b73 +SHA1 (patch-ab) = 6dccfb19d0e0024c12daf1604fba73aa74c37fe2 SHA1 (patch-ac) = 89ccb3b33b245710b5349899c6539c004c9bade2 SHA1 (patch-ad) = 395048f6f0d0c579dfe81a0a2a0556651305e07b SHA1 (patch-ae) = 5095335425d16e24831ee8bcaacc60b0ec4d00ee @@ -19,7 +19,7 @@ SHA1 (patch-an) = c59d49c738596943b6e4fbef19130d3a38fe4ad2 SHA1 (patch-ao) = 01316da024026f526dd5389c3a6c2eaf89814546 SHA1 (patch-ap) = 46e7e7fc0fb3b7d5228bf81877ac186eda1be00f SHA1 (patch-aq) = 41e6f83bb5c8a1223fc9d9cd8a21fee36012965f -SHA1 (patch-ar) = 2428398a2d00e3db937d3692cfedf9cdd7691db8 +SHA1 (patch-ar) = ed50669c6210add534a4c91e7995a61e7db90dc8 SHA1 (patch-as) = 64d31c1bc4d1659a18e9bfb922550f4a390f15bd SHA1 (patch-at) = d3f20f7693c0d4401c393a1bbcb766dee722a1d0 SHA1 (patch-au) = 7451e5ba18e21c3787869cf9a1d55433d9d488fc @@ -28,6 +28,8 @@ SHA1 (patch-aw) = 82de8a6a58f0e3db1d52f97bcaff7f4ad643bb73 SHA1 (patch-ax) = 7b2ce8d34bca784df1fcaa53fe081c89ca882b58 SHA1 (patch-ay) = eabf297f65a66174ce032bf7498bf6f324fe0d13 SHA1 (patch-az) = 8a55e0097ce509e169be02a127efb3db18aa395f +SHA1 (patch-ba) = 394dfa920f36a5e0f7e919de016fefac2a447322 +SHA1 (patch-bb) = 6829e94a21eee04b58021e2d848a624b0c037b00 SHA1 (patch-ca) = d5ffe7a8e0f2112adf0d11b5661d565e5a57dec8 SHA1 (patch-cb) = 24c810e43d6735c24908ba429ede32a49cff36e8 SHA1 (patch-cc) = 824d7c70282d24e489c7c041982018da13ac70ce 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 +-#include ++#include + #include "rplayd.h" + #include "cdrom.h" + -- cgit v1.2.3