ffmpeg sets ffmpeg-devel-20* in CONFLICTS, but ffmpeg-devel PORTNAME is simply ffmpeg, and then the conflict is not correctly recognised Fix: Patch attached with submission follows: How-To-Repeat: cd /usr/ports/multimedia/ffmpeg-devel && cd /usr/ports/multimedia/ffmpeg
Responsible Changed From-To: freebsd-ports-bugs->mm Over to maintainer (via the GNATS Auto Assign Tool)
Alberto Villa <avilla@FreeBSD.org> writes: > @@ -17,7 +17,7 @@ > > BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm > > -CONFLICTS= ffmpeg-devel-20* > +CONFLICTS= ffmpeg-20* > > HAS_CONFIGURE= yes > CONFIGURE_LOG= config.err I wonder why the -devel port doesn't have PKGNAMESUFFIX. By having a suffix in pkgname we can reduce CONFLICTS to depend on it as well as nuke LATEST_LINK. CONFLICTS= ffmpeg-devel-[0-9]* # for ffmpeg CONFLICTS= ffmpeg-[0-9]* # for ffmpeg-devel --- a.diff begins here --- Index: multimedia/ffmpeg/Makefile =================================================================== RCS file: /a/.cvsup/ports/multimedia/ffmpeg/Makefile,v retrieving revision 1.114 diff -u -p -r1.114 Makefile --- multimedia/ffmpeg/Makefile 1 Aug 2010 20:41:25 -0000 1.114 +++ multimedia/ffmpeg/Makefile 17 Sep 2010 01:40:46 -0000 @@ -17,7 +17,7 @@ COMMENT= Realtime audio/video encoder/co BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm -CONFLICTS= ffmpeg-devel-20* +CONFLICTS= ffmpeg-devel-[0-9]* HAS_CONFIGURE= yes CONFIGURE_LOG= config.err Index: multimedia/ffmpeg-devel/Makefile =================================================================== RCS file: /a/.cvsup/ports/multimedia/ffmpeg-devel/Makefile,v retrieving revision 1.126 diff -u -p -r1.126 Makefile --- multimedia/ffmpeg-devel/Makefile 1 Aug 2010 20:41:26 -0000 1.126 +++ multimedia/ffmpeg-devel/Makefile 17 Sep 2010 01:40:34 -0000 @@ -11,15 +11,14 @@ PORTREVISION= 2 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= mm +PKGNAMESUFFIX= -devel MAINTAINER= mm@FreeBSD.org COMMENT= Realtime audio/video encoder/converter and streaming server BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm -CONFLICTS= ffmpeg-0.* - -LATEST_LINK= ffmpeg-devel +CONFLICTS= ffmpeg-[0-9]* WRKSRC= ${WRKDIR}/ffmpeg-export-${DISTVERSION} HAS_CONFIGURE= yes --- a.diff ends here ---
mm 2010-10-16 22:36:03 UTC FreeBSD ports repository Modified files: multimedia/ffmpeg Makefile Log: - fix conflicts with ffmpeg-devel [1] - properly handle alsa-lib as a possible dependency [2] PR: ports/150634 [1], ports/151508 [2] Submitted by: avilla@FreeBSD.org [1], makc@FreeBSD.org [2] Revision Changes Path 1.116 +12 -3 ports/multimedia/ffmpeg/Makefile _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed. Thanks!