diff options
| author | lioux <lioux@FreeBSD.org> | 2004-07-21 07:57:51 +0800 |
|---|---|---|
| committer | lioux <lioux@FreeBSD.org> | 2004-07-21 07:57:51 +0800 |
| commit | 20f7402c17c70b5bb65d8d554cafafc5f38a7666 (patch) | |
| tree | feddf9ed2b09ecf02084f1e5239c7a6d066d6e96 /multimedia | |
| parent | 220d66c169f247e8a07ac739f0b97bb98772488a (diff) | |
| download | freebsd-ports-gnome-20f7402c17c70b5bb65d8d554cafafc5f38a7666.tar.gz freebsd-ports-gnome-20f7402c17c70b5bb65d8d554cafafc5f38a7666.tar.zst freebsd-ports-gnome-20f7402c17c70b5bb65d8d554cafafc5f38a7666.zip | |
Re-add CONFLICTS=faad* so that mpeg4ip does not conflict with
audio/faad port when it installs its own libmp4v2 (WITHOUT_MPEG4IP)
library instead of the mpeg4ip's one
PR: 66724
Submitted by: michael johnson <ahze@ahze.net>
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/mpeg4ip/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile index 4b36dc26d12d..41f4d98af151 100644 --- a/multimedia/mpeg4ip/Makefile +++ b/multimedia/mpeg4ip/Makefile @@ -91,6 +91,10 @@ post-extract: .include <bsd.port.pre.mk> +.if exists(${LOCALBASE}/include/systems.h) +CONFLICTS= faad* +.endif + .if ${ARCH} == "amd64" CFLAGS+= -fPIC -DPIC .endif |