diff options
| author | abs <abs> | 2008-05-19 11:47:44 +0000 |
|---|---|---|
| committer | abs <abs> | 2008-05-19 11:47:44 +0000 |
| commit | ce1163d61097924b9214f68b63a2ac018756888e (patch) | |
| tree | 25f55048e0d16c258e7dab74b32b65d43f230cf4 /multimedia | |
| parent | bece886b29ddae918852ecaa2d13dfe04bf4f9ea (diff) | |
| download | pkgsrc-ce1163d61097924b9214f68b63a2ac018756888e.tar.gz | |
add a CONFLICTS line for ffmpeg-[0-9]*
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/ffmpeg-devel/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile index dae98f55218..39cc5e1e1c4 100644 --- a/multimedia/ffmpeg-devel/Makefile +++ b/multimedia/ffmpeg-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2008/04/20 20:38:53 heinz Exp $ +# $NetBSD: Makefile,v 1.8 2008/05/19 11:47:44 abs Exp $ DISTNAME= ffmpeg-${DISTVERSION} PKGNAME= ffmpeg-devel-${DISTVERSION:S/-//g} @@ -29,6 +29,8 @@ SUBST_FILES.pc= *.pc SUBST_SED.pc= -e 's|-lx264||g' SUBST_MESSAGE.pc= Fixing hardcoded libs. +CONFLICTS+= ffmpeg-[0-9]* + PLIST_SRC+= ${PKGDIR}/PLIST CONF_FILES+= ${PREFIX}/share/examples/ffmpeg/ffserver.conf \ |