aboutsummaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2003-10-10 02:37:20 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2003-10-10 02:37:20 +0000
commit4e33ae17e227a0f6ab87d600046106153e42f507 (patch)
tree7e8b1aad1846184b741f99545a4b4de2c4f3c14b /audio
parent1018402a14a54332c84aec3e37f60f6895964d53 (diff)
Notes
Diffstat (limited to 'audio')
-rw-r--r--audio/esound/Makefile2
-rw-r--r--audio/libaudiofile/Makefile2
2 files changed, 4 insertions, 0 deletions
diff --git a/audio/esound/Makefile b/audio/esound/Makefile
index b415b4dc3aba..fb861abd561f 100644
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@@ -24,6 +24,8 @@ INSTALLS_SHLIB= yes
USE_GNOME= gnometarget gnomehack
USE_LIBTOOL= yes
+CONFLICTS= py*-ro-*
+
MAN1= esd-config.1 esd.1 esdcat.1 esdctl.1 esddsp.1 esdfilt.1 esdloop.1 \
esdmon.1 esdplay.1 esdrec.1 esdsample.1
diff --git a/audio/libaudiofile/Makefile b/audio/libaudiofile/Makefile
index 1cf8796b3f69..e97a6237872f 100644
--- a/audio/libaudiofile/Makefile
+++ b/audio/libaudiofile/Makefile
@@ -21,4 +21,6 @@ USE_GNOME= gnomehack gnometarget pkgconfig
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
+CONFLICTS= osalp-0.7.*
+
.include <bsd.port.mk>