diff options
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/csound/Makefile | 2 | ||||
| -rw-r--r-- | audio/grip/Makefile | 2 | ||||
| -rw-r--r-- | audio/icecast-kh/Makefile | 2 | ||||
| -rw-r--r-- | audio/icecast/Makefile | 2 | ||||
| -rw-r--r-- | audio/julius/Makefile | 2 |
5 files changed, 9 insertions, 1 deletions
diff --git a/audio/csound/Makefile b/audio/csound/Makefile index 105c45c557aa..8ab6dc4eca5a 100644 --- a/audio/csound/Makefile +++ b/audio/csound/Makefile @@ -23,6 +23,8 @@ USE_LDCONFIG= yes CPE_VENDOR= csounds +CONFLICTS_INSTALL= clearsilver go-cs libextractor outguess + CFLAGS_powerpc= -maltivec CFLAGS_powerpcspe= -DPFFFT_SIMD_DISABLE CFLAGS_powerpc64= -maltivec diff --git a/audio/grip/Makefile b/audio/grip/Makefile index 690d44b25508..21c568344d4b 100644 --- a/audio/grip/Makefile +++ b/audio/grip/Makefile @@ -24,6 +24,8 @@ USE_XORG= ice sm x11 xext GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-werror +CONFLICTS_INSTALL= py*-grip + OPTIONS_DEFINE= CDDA2WAV CDPARANOIA FAAC FLAC LAME NLS VORBIS OPTIONS_DEFAULT= CDPARANOIA FLAC VORBIS diff --git a/audio/icecast-kh/Makefile b/audio/icecast-kh/Makefile index 4d75dce28f96..0e30c39aaee0 100644 --- a/audio/icecast-kh/Makefile +++ b/audio/icecast-kh/Makefile @@ -23,7 +23,7 @@ GH_PROJECT= icecast-kh USE_GNOME= libxml2 libxslt USE_RC_SUBR= icecast -CONFLICTS_INSTALL= icecast icecast2 +CONFLICTS_INSTALL= icecast GNU_CONFIGURE= yes CONFIGURE_ENV= OGG_PREFIX=${LOCALBASE} diff --git a/audio/icecast/Makefile b/audio/icecast/Makefile index d1cbff162fde..9cb6f3d6e60f 100644 --- a/audio/icecast/Makefile +++ b/audio/icecast/Makefile @@ -31,6 +31,8 @@ USE_GNOME= libxml2 libxslt GNU_CONFIGURE= yes USE_RC_SUBR= icecast +CONFLICTS_INSTALL= icecast-kh + SUB_FILES= pkg-message CPE_VENDOR= xiph diff --git a/audio/julius/Makefile b/audio/julius/Makefile index 3a254d11b624..7fefb54b5703 100644 --- a/audio/julius/Makefile +++ b/audio/julius/Makefile @@ -16,6 +16,8 @@ GNU_CONFIGURE= yes USES= iconv perl5 shebangfix SHEBANG_FILES= jclient-perl/jclient.pl +INSTALL_CONFLICTS= generate julius-caesariii php*-pear-Text_Highlighter + CONFIGURE_ENV= ac_cv_path_PERL=${PERL} CPPFLAGS+= -I${LOCALBASE}/include CFLAGS+= -Wno-return-type |