Mon May 19 11:47:44 2008 UTC ()
add a CONFLICTS line for ffmpeg-[0-9]*


(abs)
diff -r1.7 -r1.8 pkgsrc/multimedia/ffmpeg-devel/Makefile
cvs diff -r1.7 -r1.8 pkgsrc/multimedia/ffmpeg-devel/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg-devel/Attic/Makefile 2008/04/20 20:38:53 1.7
+++ pkgsrc/multimedia/ffmpeg-devel/Attic/Makefile 2008/05/19 11:47:44 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.7 2008/04/20 20:38:53 heinz Exp $ 1# $NetBSD: Makefile,v 1.8 2008/05/19 11:47:44 abs Exp $
2 2
3DISTNAME= ffmpeg-${DISTVERSION} 3DISTNAME= ffmpeg-${DISTVERSION}
4PKGNAME= ffmpeg-devel-${DISTVERSION:S/-//g} 4PKGNAME= ffmpeg-devel-${DISTVERSION:S/-//g}
5CATEGORIES= multimedia 5CATEGORIES= multimedia
6MASTER_SITES= ${MASTER_SITE_FREEBSD} 6MASTER_SITES= ${MASTER_SITE_FREEBSD}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://ffmpeg.mplayerhq.hu/ 10HOMEPAGE= http://ffmpeg.mplayerhq.hu/
11COMMENT= MPEG decoding, encoding and streaming software 11COMMENT= MPEG decoding, encoding and streaming software
12 12
13DISTVERSION= 2007-10-04 13DISTVERSION= 2007-10-04
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
@@ -19,26 +19,28 @@ USE_TOOLS+= gmake texi2html pod2man @@ -19,26 +19,28 @@ USE_TOOLS+= gmake texi2html pod2man
19 19
20REPLACE_PERL+= doc/texi2pod.pl 20REPLACE_PERL+= doc/texi2pod.pl
21 21
22SUBST_CLASSES+= conf pc 22SUBST_CLASSES+= conf pc
23SUBST_STAGE.conf= post-patch 23SUBST_STAGE.conf= post-patch
24SUBST_FILES.conf= ffserver.c 24SUBST_FILES.conf= ffserver.c
25SUBST_SED.conf= -e 's,/etc/ffserver.conf,${PKG_SYSCONFDIR}/ffserver.conf,g' 25SUBST_SED.conf= -e 's,/etc/ffserver.conf,${PKG_SYSCONFDIR}/ffserver.conf,g'
26SUBST_MESSAGE.conf= Fixing configuration path. 26SUBST_MESSAGE.conf= Fixing configuration path.
27SUBST_STAGE.pc= pre-install 27SUBST_STAGE.pc= pre-install
28SUBST_FILES.pc= *.pc 28SUBST_FILES.pc= *.pc
29SUBST_SED.pc= -e 's|-lx264||g' 29SUBST_SED.pc= -e 's|-lx264||g'
30SUBST_MESSAGE.pc= Fixing hardcoded libs. 30SUBST_MESSAGE.pc= Fixing hardcoded libs.
31 31
 32CONFLICTS+= ffmpeg-[0-9]*
 33
32PLIST_SRC+= ${PKGDIR}/PLIST 34PLIST_SRC+= ${PKGDIR}/PLIST
33 35
34CONF_FILES+= ${PREFIX}/share/examples/ffmpeg/ffserver.conf \ 36CONF_FILES+= ${PREFIX}/share/examples/ffmpeg/ffserver.conf \
35 ${PKG_SYSCONFDIR}/ffserver.conf 37 ${PKG_SYSCONFDIR}/ffserver.conf
36 38
37MAKE_ENV+= EXTRA_LIBS=${LIBGETOPT:Q} \ 39MAKE_ENV+= EXTRA_LIBS=${LIBGETOPT:Q} \
38 LOCALBASE=${LOCALBASE:Q} 40 LOCALBASE=${LOCALBASE:Q}
39 41
40CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} \ 42CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} \
41 --cc=${CC:Q} \ 43 --cc=${CC:Q} \
42 --prefix=${PREFIX:Q} \ 44 --prefix=${PREFIX:Q} \
43 --disable-vhook \ 45 --disable-vhook \
44 --disable-debug \ 46 --disable-debug \