summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorminskim <minskim@pkgsrc.org>2006-07-08 01:11:21 +0000
committerminskim <minskim@pkgsrc.org>2006-07-08 01:11:21 +0000
commit81fa7bb23b72e4953964d41754a65a5da2526934 (patch)
tree5c356b69dac08072bb84ebb3b452ec1ce921f1a6
parentd931fdee2d310b80d521a12def67ae01269c3724 (diff)
downloadpkgsrc-81fa7bb23b72e4953964d41754a65a5da2526934.tar.gz
Fix PLIST on platforms without OSS.
-rw-r--r--audio/xmms/Makefile.common11
-rw-r--r--audio/xmms/PLIST.SunOS2
-rw-r--r--audio/xmms/PLIST.common4
3 files changed, 8 insertions, 9 deletions
diff --git a/audio/xmms/Makefile.common b/audio/xmms/Makefile.common
index 5cf50ccfcef..c685621b9c4 100644
--- a/audio/xmms/Makefile.common
+++ b/audio/xmms/Makefile.common
@@ -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 @@ post-patch:
${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 --git a/audio/xmms/PLIST.SunOS b/audio/xmms/PLIST.SunOS
new file mode 100644
index 00000000000..c23c7064136
--- /dev/null
+++ b/audio/xmms/PLIST.SunOS
@@ -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 --git a/audio/xmms/PLIST.common b/audio/xmms/PLIST.common
index f9696c4b516..6a36a228fe1 100644
--- a/audio/xmms/PLIST.common
+++ b/audio/xmms/PLIST.common
@@ -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/libmpg123.la
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