aboutsummaryrefslogtreecommitdiffstats
path: root/audio/oss
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2007-10-03 02:01:51 +0800
committerjkim <jkim@FreeBSD.org>2007-10-03 02:01:51 +0800
commit8c525625cfba3a08fc8629275dadfeebcad76c26 (patch)
tree5635896b1fe1c460b6d5616137c2c928e89a71a0 /audio/oss
parentc4a8bc22ad7489ac6080dd8364fd11c96fbf7b7c (diff)
downloadfreebsd-ports-gnome-8c525625cfba3a08fc8629275dadfeebcad76c26.tar.gz
freebsd-ports-gnome-8c525625cfba3a08fc8629275dadfeebcad76c26.tar.zst
freebsd-ports-gnome-8c525625cfba3a08fc8629275dadfeebcad76c26.zip
Do not install soundcard.h.
This header file conflicts with FreeBSD's soundcard.h. -CURRENT has OSS v4 compatible version but -STABLE does not. Since we are not installing libOSSlib.so at the moment, it is useless any way. Pointed out by: trasz Approved by: glewis (mentor)
Diffstat (limited to 'audio/oss')
-rw-r--r--audio/oss/Makefile7
-rw-r--r--audio/oss/pkg-plist4
2 files changed, 2 insertions, 9 deletions
diff --git a/audio/oss/Makefile b/audio/oss/Makefile
index 8e264282e22c..62b1ba694830 100644
--- a/audio/oss/Makefile
+++ b/audio/oss/Makefile
@@ -7,7 +7,7 @@
PORTNAME= oss
DISTVERSION= 4.0-build1006
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio kld
MASTER_SITES= http://developer.opensound.com/sources/stable/
DISTNAME= ${PORTNAME}-v${DISTVERSION}-src-cddl
@@ -61,18 +61,15 @@ do-configure:
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/prototype/usr/bin/* ${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/prototype/usr//sbin/savemixer ${PREFIX}/sbin
+ ${INSTALL_PROGRAM} ${WRKSRC}/prototype/usr/sbin/savemixer ${PREFIX}/sbin
${INSTALL_PROGRAM} ${WRKSRC}/prototype/usr/sbin/ossdevlinks ${PREFIX}/sbin
${INSTALL_PROGRAM} ${WRKSRC}/prototype/usr/sbin/ossdetect ${PREFIX}/sbin
${INSTALL_PROGRAM} ${WRKSRC}/prototype/usr/sbin/ossctl ${PREFIX}/sbin
${INSTALL_SCRIPT} ${WRKSRC}/prototype/usr/sbin/soundon ${PREFIX}/sbin
${INSTALL_SCRIPT} ${WRKSRC}/prototype/usr/sbin/soundoff ${PREFIX}/sbin
- #${INSTALL_PROGRAM} ${WRKSRC}/prototype/usr/lib/oss/lib/libOSSlib.so ${PREFIX}/lib
@# oss.conf does not contain any user-configurable data; it's ok to overwrite it.
${INSTALL_DATA} ${WRKSRC}/prototype/etc/oss.conf ${PREFIX}/etc/oss.conf
${MKDIR} ${PREFIX}/include/sys
- ${INSTALL_DATA} ${WRKSRC}/prototype/usr/lib/oss/include/sys/soundcard.h ${PREFIX}/include/sys
- #${INSTALL_DATA} ${WRKSRC}/prototype/usr/lib/oss/include/midiparser.h ${PREFIX}/include
${MKDIR} ${PREFIX}/lib/oss
${MKDIR} ${PREFIX}/lib/oss/logs
${MKDIR} ${PREFIX}/lib/oss/etc
diff --git a/audio/oss/pkg-plist b/audio/oss/pkg-plist
index 8d16250ddd4d..4a5121c29c25 100644
--- a/audio/oss/pkg-plist
+++ b/audio/oss/pkg-plist
@@ -11,10 +11,6 @@ sbin/ossdetect
sbin/ossctl
sbin/soundon
sbin/soundoff
-@comment lib/libOSSlib.so
-include/sys/soundcard.h
-@dirrmtry include/sys
-@comment include/midiparser.h
lib/oss/modules/osscore.ko
lib/oss/modules/ali5455.ko
lib/oss/modules/allegro.ko