Tue Mar 30 10:29:22 2010 UTC ()
Use ${LIBOSSAUDIO} from oss.buildlink3.mk. (PR pkg/43077)


(martin)
diff -r1.47 -r1.48 pkgsrc/audio/mpg123/Makefile
diff -r1.1 -r1.2 pkgsrc/audio/mpg123-oss/Makefile
cvs diff -r1.47 -r1.48 pkgsrc/audio/mpg123/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/mpg123/Makefile 2010/03/30 09:12:04 1.47
+++ pkgsrc/audio/mpg123/Makefile 2010/03/30 10:29:22 1.48
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.47 2010/03/30 09:12:04 martin Exp $ 1# $NetBSD: Makefile,v 1.48 2010/03/30 10:29:22 martin Exp $
2 2
3PKGNAME= ${DISTNAME:C/[^[:alnum:]]*//} 3PKGNAME= ${DISTNAME:C/[^[:alnum:]]*//}
4COMMENT= MPEG layer 1, 2, and 3 audio player 4COMMENT= MPEG layer 1, 2, and 3 audio player
5 5
6PKGCONFIG_OVERRIDE+= libmpg123.pc.in 6PKGCONFIG_OVERRIDE+= libmpg123.pc.in
7 7
8MPG123_SUBDIRS= src doc 8MPG123_SUBDIRS= src doc
9MPG123_SUBDIRS.src= output libmpg123 9MPG123_SUBDIRS.src= output libmpg123
10 10
11MAKE_ENV+= MPG123_PROGRAM=mpg123 11MAKE_ENV+= MPG123_PROGRAM=mpg123
12MAKE_ENV+= EXTRA_INSTALL_TARGETS="install-exec-am install-data-am" 12MAKE_ENV+= EXTRA_INSTALL_TARGETS="install-exec-am install-data-am"
13 13
14MPG123_BUILDING_BASE= # empty 14MPG123_BUILDING_BASE= # empty
@@ -21,26 +21,27 @@ PLIST_VARS+= oss @@ -21,26 +21,27 @@ PLIST_VARS+= oss
21PLIST_VARS+= sun 21PLIST_VARS+= sun
22PLIST_VARS+= coreaudio 22PLIST_VARS+= coreaudio
23 23
24.if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" \ 24.if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" \
25 || ${OPSYS} == "SunOS" || ${OPSYS} == "DragonFly" 25 || ${OPSYS} == "SunOS" || ${OPSYS} == "DragonFly"
26MPG123_DEFAULT_MODULE= sun 26MPG123_DEFAULT_MODULE= sun
27PLIST.sun = yes 27PLIST.sun = yes
28.elif ${OPSYS} == "Darwin" 28.elif ${OPSYS} == "Darwin"
29MPG123_DEFAULT_MODULE= coreaudio 29MPG123_DEFAULT_MODULE= coreaudio
30PLIST.coreaudio = yes 30PLIST.coreaudio = yes
31.else 31.else
32MPG123_DEFAULT_MODULE= oss 32MPG123_DEFAULT_MODULE= oss
33PLIST.oss = yes 33PLIST.oss = yes
34LIBS+= -lossaudio 34.include "../../mk/oss.buildlink3.mk"
 35LIBS+= ${LIBOSSAUDIO}
35CPPFLAGS+= -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\"" 36CPPFLAGS+= -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
36CPPFLAGS+= -DDEVOSSSOUND="\"${DEVOSSSOUND}\"" 37CPPFLAGS+= -DDEVOSSSOUND="\"${DEVOSSSOUND}\""
37.endif 38.endif
38 39
39# MPG123_MODULE is not finally set yet, to avoid NOT_FOR_PLATFORM triggers 40# MPG123_MODULE is not finally set yet, to avoid NOT_FOR_PLATFORM triggers
40.include "Makefile.common" 41.include "Makefile.common"
41 42
42.include "options.mk" 43.include "options.mk"
43.include "../../mk/bsd.pkg.mk" 44.include "../../mk/bsd.pkg.mk"
44 45
45# now we can set the default module 46# now we can set the default module
46MPG123_MODULE= ${MPG123_DEFAULT_MODULE} 47MPG123_MODULE= ${MPG123_DEFAULT_MODULE}
cvs diff -r1.1 -r1.2 pkgsrc/audio/mpg123-oss/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/mpg123-oss/Attic/Makefile 2010/03/14 14:19:19 1.1
+++ pkgsrc/audio/mpg123-oss/Attic/Makefile 2010/03/30 10:29:22 1.2
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1# $NetBSD: Makefile,v 1.1 2010/03/14 14:19:19 martin Exp $ 1# $NetBSD: Makefile,v 1.2 2010/03/30 10:29:22 martin Exp $
2# 2#
3 3
4MPG123_MODULE= oss 4MPG123_MODULE= oss
5# this is builtin with ../mpg123 on all other architectures 5# this is builtin with ../mpg123 on all other architectures
6ONLY_FOR_PLATFORM+= NetBSD-*-* FreeBSD-*-* OpenBSD-*-* SunOS-*-* 6ONLY_FOR_PLATFORM+= NetBSD-*-* FreeBSD-*-* OpenBSD-*-* SunOS-*-*
7ONLY_FOR_PLATFORM+= DragonFly-*-* 7ONLY_FOR_PLATFORM+= DragonFly-*-*
8 8
9.include "${.CURDIR}/../../audio/mpg123/Makefile.common" 9.include "${.CURDIR}/../../audio/mpg123/Makefile.common"
10 10
11LIBS+= -lossaudio 11.include "../../mk/oss.buildlink3.mk"
 12LIBS+= ${LIBOSSAUDIO}
12CPPFLAGS+= -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\"" 13CPPFLAGS+= -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
13CPPFLAGS+= -DDEVOSSSOUND="\"${DEVOSSSOUND}\"" 14CPPFLAGS+= -DDEVOSSSOUND="\"${DEVOSSSOUND}\""
14 15
15.include "../../mk/oss.buildlink3.mk" 
16 
17.include "../../audio/mpg123/buildlink3.mk" 16.include "../../audio/mpg123/buildlink3.mk"
18 17
19.include "../../mk/bsd.pkg.mk" 18.include "../../mk/bsd.pkg.mk"