diff options
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/SDL_mixer/Makefile | 15 | ||||
| -rw-r--r-- | audio/SDL_mixer/distinfo | 10 | ||||
| -rw-r--r-- | audio/SDL_mixer/patches/patch-aa | 12 |
3 files changed, 19 insertions, 18 deletions
diff --git a/audio/SDL_mixer/Makefile b/audio/SDL_mixer/Makefile index ae5e61618e6..0a7b8fc2bad 100644 --- a/audio/SDL_mixer/Makefile +++ b/audio/SDL_mixer/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.28 2006/06/12 16:28:05 wiz Exp $ +# $NetBSD: Makefile,v 1.29 2006/07/07 06:52:46 adam Exp $ -DISTNAME= SDL_mixer-1.2.6 -PKGREVISION= 5 +DISTNAME= SDL_mixer-1.2.7 CATEGORIES= audio MASTER_SITES= http://www.libsdl.org/projects/SDL_mixer/release/ @@ -13,8 +12,8 @@ CONFLICTS= SDL-mixer-[0-9]* PKG_INSTALLATION_TYPES= overwrite pkgviews -USE_LIBTOOL= YES -GNU_CONFIGURE= YES +USE_LIBTOOL= yes +GNU_CONFIGURE= yes .include "../../mk/bsd.prefs.mk" @@ -24,8 +23,10 @@ CFLAGS+= -DSYSCONFDIR="\"${PKG_SYSCONFDIR}\"" INSTALLATION_DIRS= bin post-install: - ${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/playmus ${PREFIX}/bin - ${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/playwave ${PREFIX}/bin + ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} \ + ${WRKSRC}/build/playmus ${PREFIX}/bin + ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} \ + ${WRKSRC}/build/playwave ${PREFIX}/bin .include "../../audio/libvorbis/buildlink3.mk" .include "../../multimedia/libogg/buildlink3.mk" diff --git a/audio/SDL_mixer/distinfo b/audio/SDL_mixer/distinfo index 93bb7f21c93..0f22c397aa0 100644 --- a/audio/SDL_mixer/distinfo +++ b/audio/SDL_mixer/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.7 2005/06/01 14:11:26 wiz Exp $ +$NetBSD: distinfo,v 1.8 2006/07/07 06:52:46 adam Exp $ -SHA1 (SDL_mixer-1.2.6.tar.gz) = d8e09d87a750c4bd989f0a3e4f1b6baff601b8f1 -RMD160 (SDL_mixer-1.2.6.tar.gz) = f20e3b7db266d9a0da75f2319dcc403d869907e6 -Size (SDL_mixer-1.2.6.tar.gz) = 1147838 bytes -SHA1 (patch-aa) = 1e4de54337d13e3c8407ca4bd6cc0b8777b6992f +SHA1 (SDL_mixer-1.2.7.tar.gz) = 42b351360ea9debb2bec23e7e67ba355ec3762a9 +RMD160 (SDL_mixer-1.2.7.tar.gz) = cacb218f966d35cc66c663c0ce65b148869c08c3 +Size (SDL_mixer-1.2.7.tar.gz) = 1960614 bytes +SHA1 (patch-aa) = fb2d442a918936fabf427abf883df4605e219f37 diff --git a/audio/SDL_mixer/patches/patch-aa b/audio/SDL_mixer/patches/patch-aa index d6aa6aec985..4c21f2fcace 100644 --- a/audio/SDL_mixer/patches/patch-aa +++ b/audio/SDL_mixer/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.4 2005/06/01 14:11:26 wiz Exp $ +$NetBSD: patch-aa,v 1.5 2006/07/07 06:52:46 adam Exp $ ---- timidity/config.h.orig 2004-12-16 05:20:14.000000000 +0000 +--- timidity/config.h.orig 2006-05-01 09:25:52.000000000 +0200 +++ timidity/config.h -@@ -223,7 +223,7 @@ typedef char int8; +@@ -169,7 +169,7 @@ typedef char int8; /* You could specify a complete path, e.g. "/etc/timidity.cfg", and then specify the library directory in the configuration file. */ -#define CONFIG_FILE "timidity.cfg" +#define CONFIG_FILE SYSCONFDIR"/timidity.cfg" - #ifdef __WIN32__ - #define DEFAULT_PATH "\\TIMIDITY" - #else + #define CONFIG_FILE_ETC "/etc/timidity.cfg" + #define CONFIG_FILE_ETC_TIMIDITY "/etc/timidity/timidity.cfg" + |