From 07ca23d3cd5e4626be2d8f1074f81390254b0881 Mon Sep 17 00:00:00 2001 From: Michael Johnson Date: Tue, 13 Mar 2007 13:13:50 +0000 Subject: Disable Quicktime codec instead of marking it FORBIDDEN if WITH_QUICKTIME is defined Reported by: White Hat --- multimedia/win32-codecs/Makefile | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'multimedia') diff --git a/multimedia/win32-codecs/Makefile b/multimedia/win32-codecs/Makefile index f8e78c40d33b..d178eb0bdd8c 100644 --- a/multimedia/win32-codecs/Makefile +++ b/multimedia/win32-codecs/Makefile @@ -22,7 +22,7 @@ DISTFILES= all-20061022.tar.bz2 \ DIST_SUBDIR= win32 EXTRACT_ONLY= all-20061022.tar.bz2 -MAINTAINER= ports@FreeBSD.org +MAINTAINER= multimedia@FreeBSD.org COMMENT= Huge compilation of Win32 binary video codecs RESTRICTED= Unsure of codec's license # ' @@ -48,19 +48,18 @@ ADDITIONAL_CODECS_WRKSRC= ${DISTFILES:S/.tar.bz2//} REMOVE_CODECS_FILES= AvidQTAVUICodec.qtx QuickTimeEssentials.qtx QuickTime.qts \ QuickTimeInternetExtras.qtx qtmlClient.dll BeHereiVideo.qtx -OPTIONS= QUICKTIME "Install quicktime codec" off \ - REALPLAYER "Install realplayer codec" on +OPTIONS= REALPLAYER "Install realplayer codec" on .include -.if defined(WITH_QUICKTIME) -FORBIDDEN= Remote code execution: http://vuxml.FreeBSD.org/24f6b1eb-43d5-11db-81e1-000e0c2e438a.html -ADDITIONAL_CODECS_DISTFILES+= qt63dlls-20050115.tar.bz2 \ - qtextras-20041107.tar.bz2 -PLIST_SUB+= QUICKTIME="" -.else +#.if defined(WITH_QUICKTIME) +#FORBIDDEN= Remote code execution: http://vuxml.FreeBSD.org/24f6b1eb-43d5-11db-81e1-000e0c2e438a.html +#ADDITIONAL_CODECS_DISTFILES+= qt63dlls-20050115.tar.bz2 \ +# qtextras-20041107.tar.bz2 +#PLIST_SUB+= QUICKTIME="" +#.else PLIST_SUB+= QUICKTIME="@comment " -.endif +#.endif .if !defined(WITHOUT_REALPLAYER) ADDITIONAL_CODECS_DISTFILES+= rp9codecs-20050115.tar.bz2 \ -- cgit v1.2.3