diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2007-10-02 18:01:51 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2007-10-02 18:01:51 +0000 |
| commit | 11dda04c5428337868e593958a2b3b748212bb37 (patch) | |
| tree | f1215444f51df28fb416ca195895aff8c25af120 /audio | |
| parent | Fix the build when audio/oss is installed by force to search for (diff) | |
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')
| -rw-r--r-- | audio/oss/Makefile | 7 | ||||
| -rw-r--r-- | audio/oss/pkg-plist | 4 |
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 |