diff options
| author | marino <marino> | 2011-11-22 16:37:01 +0000 |
|---|---|---|
| committer | marino <marino> | 2011-11-22 16:37:01 +0000 |
| commit | 36c7205ac2ae0395995df4d9eef2c620b57d4809 (patch) | |
| tree | 97abc0bda1329ece2c9645ea7c32638c4242bfaf /audio/maplay/Makefile | |
| parent | 003e9c3cd6a700832802fe539bb83c0d210c66cf (diff) | |
| download | pkgsrc-36c7205ac2ae0395995df4d9eef2c620b57d4809.tar.gz | |
audio/maplay: Fix DragonFly breakage
This package has been broken at least since DragonFly moved to gcc44 for
their base compiler. The previously deprecated "-m486" is no longer
recognized, but the -march defaults to i486 now anyway, so this switch is
no longer required.
GCC 4.4 got rid of the iostream and iomanip backwards compatibility, so
trying to include these headers is another source of breakage. While
probably correct for all platforms, this commit conservatively only
changes the build process for DragonFly since maplay apparently is
building okay on NetBSD.
No PKGREVISION bump is required.
Diffstat (limited to 'audio/maplay/Makefile')
| -rw-r--r-- | audio/maplay/Makefile | 20 |
1 files changed, 19 insertions, 1 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 |