diff options
| -rw-r--r-- | audio/maplay/Makefile | 20 | ||||
| -rw-r--r-- | audio/maplay/distinfo | 6 | ||||
| -rw-r--r-- | audio/maplay/patches/patch-ac | 4 | ||||
| -rw-r--r-- | audio/maplay/patches/patch-ah | 22 |
4 files changed, 35 insertions, 17 deletions
diff --git a/audio/maplay/Makefile b/audio/maplay/Makefile index 26d5ee7786f..8a9abd0227c 100644 --- a/audio/maplay/Makefile +++ b/audio/maplay/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2009/07/07 15:25:39 joerg Exp $ +# $NetBSD: Makefile,v 1.22 2011/11/22 16:37:01 marino Exp $ DISTNAME= maplay1_2 PKGNAME= maplay-1.2 @@ -19,6 +19,24 @@ NOT_FOR_PLATFORM= Interix-*-* INSTALLATION_DIRS= bin +.include "../../mk/bsd.prefs.mk" +.if ${OPSYS} == "DragonFly" +SUBST_CLASSES+= iostream iomanip +SUBST_STAGE.iostream= post-patch +SUBST_STAGE.iomanip= post-patch +SUBST_FILES.iostream= obuffer.h synthesis_filter.h \ + ulaw.cc crc.cc ibitstream.cc obuffer.cc \ + subband_layer_1.cc subband_layer_2.cc \ + scalefactors.cc synthesis_filter.cc \ + header.cc maplay.cc +SUBST_FILES.iomanip= header.cc maplay.cc +SUBST_SED.iostream= -e 's,<iostream.h>,<iostream>,' \ + -e 's,cerr,std::cerr,g' +SUBST_SED.iomanip= -e 's,<iomanip.h>,<iomanip>,' +SUBST_MESSAGE.iostream= Fixing old iostream headers includes +SUBST_MESSAGE.iomanip= Fixing old iomanip headers includes +.endif + pre-configure: cd ${WRKSRC} && ${MAKE} pre-install diff --git a/audio/maplay/distinfo b/audio/maplay/distinfo index 0cf2d0d49ea..b85660260da 100644 --- a/audio/maplay/distinfo +++ b/audio/maplay/distinfo @@ -1,16 +1,16 @@ -$NetBSD: distinfo,v 1.8 2011/08/29 00:04:07 dholland Exp $ +$NetBSD: distinfo,v 1.9 2011/11/22 16:37:01 marino Exp $ SHA1 (maplay1_2.tar) = faeac51cfbf011956a17721e2077d0ed11f8d8dd RMD160 (maplay1_2.tar) = bc016d4cc8f356d9c2c0a90d4afde5e67c45ba14 Size (maplay1_2.tar) = 286720 bytes SHA1 (patch-aa) = 46d7f3934c08ac98e4ac7646105fce635d4a5313 SHA1 (patch-ab) = 92582f6a9b87ca4c61aaf42a1d03349b455997dc -SHA1 (patch-ac) = 53abb9ca8231cf48c0900fb286c39de768345831 +SHA1 (patch-ac) = c926ed6b98b9df1d569ee35fba66c170a4999785 SHA1 (patch-ad) = 389c418dac740b6959b441439cc4660ed28daee0 SHA1 (patch-ae) = 4579d1dc9dbae73c0d33f0fc5fe038733640bcef SHA1 (patch-af) = 843b8fad21e2feeee07feb3292a34456f88c639f SHA1 (patch-ag) = 582bec6631acd1478dacc19feba60e4bed9062ab -SHA1 (patch-ah) = 8694b317538758c2eb06b6a815b707c1ceaa250a +SHA1 (patch-ah) = 72f4adc3c698c48c91a42f3c32f7cf0ef3557c82 SHA1 (patch-ai) = 2d7cc43f33db4f60549e2be27f388b92c7b0b4a8 SHA1 (patch-aj) = 9b44b0e3b85adfe24419d8fa4dac9253fbf9c36d SHA1 (patch-ak) = 3edf1fb29f243eb5e0507f57fee2e200e9214045 diff --git a/audio/maplay/patches/patch-ac b/audio/maplay/patches/patch-ac index 49f7d4d0560..ad523eeea3e 100644 --- a/audio/maplay/patches/patch-ac +++ b/audio/maplay/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.4 2005/12/11 22:17:37 joerg Exp $ +$NetBSD: patch-ac,v 1.5 2011/11/22 16:37:01 marino Exp $ --- configuration.sh.orig 1994-06-23 12:14:46.000000000 +0000 +++ configuration.sh @@ -14,7 +14,7 @@ $NetBSD: patch-ac,v 1.4 2005/12/11 22:17:37 joerg Exp $ + AUDIO_INCLUDES='#include <sys/audioio.h>' ;; + FreeBSD*|DragonFly*) + COMPILER=g++ -+ COMPILERFLAGS='-O2 -m486 -DLINUX -DDAMN_INTEL_BYTE_ORDER' ++ COMPILERFLAGS='-O2 -DLINUX -DDAMN_INTEL_BYTE_ORDER' + INCLUDEDIRS= + LIBRARIES= + AUDIO_INCLUDES='#include <machine/soundcard.h>' ;; diff --git a/audio/maplay/patches/patch-ah b/audio/maplay/patches/patch-ah index e55a6d2d529..8bb3d6cf4e7 100644 --- a/audio/maplay/patches/patch-ah +++ b/audio/maplay/patches/patch-ah @@ -1,8 +1,4 @@ -$NetBSD: patch-ah,v 1.3 2011/08/29 00:04:07 dholland Exp $ - -- avoid assorted name conflicts -- support NetBSD and FreeBSD -- main() needs a return type +$NetBSD: patch-ah,v 1.4 2011/11/22 16:37:01 marino Exp $ --- maplay.cc.orig 1994-06-23 12:14:36.000000000 +0000 +++ maplay.cc @@ -39,25 +35,29 @@ $NetBSD: patch-ah,v 1.3 2011/08/29 00:04:07 dholland Exp $ if (argc < 2 || !strncmp (argv[1], "-h", 2)) { -@@ -146,6 +146,9 @@ usage: +@@ -146,6 +146,12 @@ usage: #ifdef Solaris "SPARC Solaris 2.x" #else +#ifdef __FreeBSD__ + "FreeBSD" +#else ++#ifdef __DragonFly__ ++ "DragonFly" ++#else #ifdef LINUX "Linux" #else -@@ -159,6 +162,7 @@ usage: +@@ -159,6 +165,8 @@ usage: #endif #endif #endif +#endif ++#endif " version)\n" "@(#) Copyright (C) 1993, 1994 Tobias Bading (bading@cs.tu-berlin.de)\n" "@(#) Berlin University of Technology\n" -@@ -180,10 +184,10 @@ usage: +@@ -180,10 +188,10 @@ usage: stdout_mode = True; break; case 'l': @@ -70,7 +70,7 @@ $NetBSD: patch-ah,v 1.3 2011/08/29 00:04:07 dholland Exp $ break; #ifdef SPARC case 'u': -@@ -250,7 +254,7 @@ usage: +@@ -250,7 +258,7 @@ usage: // get info from header of first frame: layer = header->layer (); if ((mode = header->mode ()) == single_channel) @@ -79,7 +79,7 @@ $NetBSD: patch-ah,v 1.3 2011/08/29 00:04:07 dholland Exp $ sample_frequency = header->sample_frequency (); // create filter(s): -@@ -319,6 +323,17 @@ usage: +@@ -319,6 +327,17 @@ usage: Exit (0); } #else @@ -97,7 +97,7 @@ $NetBSD: patch-ah,v 1.3 2011/08/29 00:04:07 dholland Exp $ //#ifdef your_machine // { // if (mode == single_channel || which_channels != both) -@@ -333,6 +348,7 @@ usage: +@@ -333,6 +352,7 @@ usage: Exit (0); } //#endif // !your_machine |