aboutsummaryrefslogtreecommitdiffstats
path: root/multimedia
diff options
context:
space:
mode:
authorpav <pav@FreeBSD.org>2004-05-17 06:09:12 +0800
committerpav <pav@FreeBSD.org>2004-05-17 06:09:12 +0800
commit2d79442323e88d1c552cd4630a351eb92758db1f (patch)
tree087105f47ab2bac59dab6490f70a3c8f83158227 /multimedia
parent1864b589f90beb30e94acadc1f9e48a435636bfa (diff)
downloadfreebsd-ports-gnome-2d79442323e88d1c552cd4630a351eb92758db1f.tar.gz
freebsd-ports-gnome-2d79442323e88d1c552cd4630a351eb92758db1f.tar.zst
freebsd-ports-gnome-2d79442323e88d1c552cd4630a351eb92758db1f.zip
- faad have been teached to live along us, what worse, we're now a dependency
for faad, so emove conflicts. Reported by: Kay Lehmann <kay_lehmann@web.de>
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/mpeg4ip/Makefile2
1 files changed, 0 insertions, 2 deletions
diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile
index 546500c23ad5..8b89081156fd 100644
--- a/multimedia/mpeg4ip/Makefile
+++ b/multimedia/mpeg4ip/Makefile
@@ -30,8 +30,6 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
INSTALLS_SHLIB= yes
-CONFLICTS= faad*
-
DOC_FILES= COPYING README doc/MPEG4IP_Guide.pdf
PORTDOCS= COPYING MPEG4IP_Guide.pdf README