pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/audio/xmms Fix PLIST on platforms without OSS.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/68bc34b9bf24
branches:  trunk
changeset: 515789:68bc34b9bf24
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Sat Jul 08 01:11:21 2006 +0000

description:
Fix PLIST on platforms without OSS.

diffstat:

 audio/xmms/Makefile.common |  11 ++++-------
 audio/xmms/PLIST.SunOS     |   2 ++
 audio/xmms/PLIST.common    |   4 ++--
 3 files changed, 8 insertions(+), 9 deletions(-)

diffs (55 lines):

diff -r 4f514864e388 -r 68bc34b9bf24 audio/xmms/Makefile.common
--- a/audio/xmms/Makefile.common        Sat Jul 08 00:53:09 2006 +0000
+++ b/audio/xmms/Makefile.common        Sat Jul 08 01:11:21 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.24 2006/07/07 15:49:31 jlam Exp $
+# $NetBSD: Makefile.common,v 1.25 2006/07/08 01:11:21 minskim Exp $
 #
 
 DISTNAME=      xmms-1.2.10
@@ -60,18 +60,15 @@
        ${RM} -f ${WRKSRC}/Output/OSS/soundcard.h
 .endif
 
-.if ${OPSYS} == "SunOS"
-PLIST_SUBST+=  LIBAUDIO=libSolaris
-.else
-PLIST_SUBST+=  LIBAUDIO=libOSS
-.endif
-
 # the configure test for OSS is broken on Solaris and by default tries
 # to build the OSS module. explicitly turn it off for all platforms
 # except those which support OSS.
 .if ${OPSYS} != "FreeBSD" && ${OPSYS} != "Linux" && ${OPSYS} != "NetBSD" && \
        ${OPSYS} != "OpenBSD" && ${OPSYS} != "DragonFly"
 CONFIGURE_ARGS+=       --disable-oss
+PLIST_SUBST+=          OSS="@comment "
+.else
+PLIST_SUBST+=          OSS=""
 .endif
 
 .include "../../audio/libmikmod/buildlink3.mk"
diff -r 4f514864e388 -r 68bc34b9bf24 audio/xmms/PLIST.SunOS
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/xmms/PLIST.SunOS    Sat Jul 08 01:11:21 2006 +0000
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.SunOS,v 1.1 2006/07/08 01:11:21 minskim Exp $
+lib/xmms/Output/libSolaris.la
diff -r 4f514864e388 -r 68bc34b9bf24 audio/xmms/PLIST.common
--- a/audio/xmms/PLIST.common   Sat Jul 08 00:53:09 2006 +0000
+++ b/audio/xmms/PLIST.common   Sat Jul 08 01:11:21 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.5 2006/04/17 07:07:13 jlam Exp $
+@comment $NetBSD: PLIST.common,v 1.6 2006/07/08 01:11:21 minskim Exp $
 bin/wmxmms
 bin/xmms
 bin/xmms-config
@@ -22,7 +22,7 @@
 lib/xmms/Input/libtonegen.la
 lib/xmms/Input/libvorbis.la
 lib/xmms/Input/libwav.la
-lib/xmms/Output/${LIBAUDIO}.la
+${OSS}lib/xmms/Output/libOSS.la
 lib/xmms/Output/libdisk_writer.la
 lib/xmms/Visualization/libbscope.la
 lib/xmms/Visualization/libogl_spectrum.la



Home | Main Index | Thread Index | Old Index