Wed Feb 20 10:15:30 2008 UTC ()
Remove an obsolete CONFLICTS line.


(xtraeme)
diff -r1.4 -r1.5 pkgsrc/multimedia/ffmpeg-devel/Makefile
cvs diff -r1.4 -r1.5 pkgsrc/multimedia/ffmpeg-devel/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg-devel/Attic/Makefile 2008/02/20 10:12:04 1.4
+++ pkgsrc/multimedia/ffmpeg-devel/Attic/Makefile 2008/02/20 10:15:30 1.5
@@ -1,34 +1,32 @@ @@ -1,34 +1,32 @@
1# $NetBSD: Makefile,v 1.4 2008/02/20 10:12:04 xtraeme Exp $ 1# $NetBSD: Makefile,v 1.5 2008/02/20 10:15:30 xtraeme 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
14#PKG_DESTDIR_SUPPORT= user-destdir 14#PKG_DESTDIR_SUPPORT= user-destdir
15 15
16HAS_CONFIGURE= YES 16HAS_CONFIGURE= YES
17USE_LIBTOOL= YES 17USE_LIBTOOL= YES
18USE_TOOLS+= gmake texi2html pod2man 18USE_TOOLS+= gmake texi2html pod2man
19 19
20CONFLICTS+= ffmpeg-devel-[0-9]* 
21 
22REPLACE_PERL+= doc/texi2pod.pl 20REPLACE_PERL+= doc/texi2pod.pl
23 21
24SUBST_CLASSES+= conf 22SUBST_CLASSES+= conf
25SUBST_STAGE.conf= post-patch 23SUBST_STAGE.conf= post-patch
26SUBST_FILES.conf= ffserver.c 24SUBST_FILES.conf= ffserver.c
27SUBST_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'
28SUBST_MESSAGE.conf= Fixing configuration path. 26SUBST_MESSAGE.conf= Fixing configuration path.
29 27
30PLIST_SRC+= ${PKGDIR}/PLIST 28PLIST_SRC+= ${PKGDIR}/PLIST
31 29
32CONF_FILES+= ${PREFIX}/share/examples/ffmpeg/ffserver.conf \ 30CONF_FILES+= ${PREFIX}/share/examples/ffmpeg/ffserver.conf \
33 ${PKG_SYSCONFDIR}/ffserver.conf 31 ${PKG_SYSCONFDIR}/ffserver.conf
34 32