- Add the REALPLAYER and QUICKTIME(off) OPTIONS. If QUICKTIME OPTION is off,

  this port could install without problem of vulnerabilities.
- Bump PORTREVISION
- Other few modifications

Sponsored by:	FreeBSD Bugathon

3 files changed, 65 insertions, 41 deletions

diff --git a/multimedia/win32-codecs/Makefile b/multimedia/win32-codecs/Makefile
index 14295574179b..52a210c11c9b 100644
--- a/multimedia/win32-codecs/Makefile
+++ b/multimedia/win32-codecs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	win32-codecs
 PORTVERSION=	3.${CODEC_MPLAYER_VERSION:S/pre/.p/}
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://www1.mplayerhq.hu/MPlayer/releases/codecs/ \
@@ -25,7 +26,6 @@ EXTRACT_ONLY=	all-20060611.tar.bz2
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Huge compilation of Win32 binary video codecs
 
-FORBIDDEN=	Remote code execution: http://vuxml.FreeBSD.org/24f6b1eb-43d5-11db-81e1-000e0c2e438a.html
 RESTRICTED=	Unsure of codec\'s license
 
 ONLY_FOR_ARCHS=	i386
@@ -40,16 +40,40 @@ CODEC_MPLAYER_VERSION=	1.0pre8
 CODEC_DETECTION_FILE=	${LOCALBASE}/lib/win32/${PKGNAME}
 
 # additional codec packs
-ADDITIONAL_CODECS_DISTFILES=	qt63dlls-20050115.tar.bz2 \
-				qtextras-20041107.tar.bz2 \
-				rp9codecs-20050115.tar.bz2 \
-				rp9codecs-win32-20050115.tar.bz2 \
-				xanimdlls-20040626.tar.bz2
+ADDITIONAL_CODECS_DISTFILES=	xanimdlls-20040626.tar.bz2
 
 # extraction wrksrc
 ADDITIONAL_CODECS_WRKSRC=	${DISTFILES:S/.tar.bz2//}
 
+# list of quicktime codecs that will be removed
+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
+
+.include <bsd.port.pre.mk>
+
+.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
+
+.if !defined(WITHOUT_REALPLAYER)
+ADDITIONAL_CODECS_DISTFILES+=	rp9codecs-20050115.tar.bz2 \
+				rp9codecs-win32-20050115.tar.bz2
+PLIST_SUB+=	REALPLAYER=""
+.else
+PLIST_SUB+=	REALPLAYER="@comment "
+.endif
+
 post-extract:
+	@cd ${WRKDIR}/all-20060611 && \
+		${RM} ${REMOVE_CODECS_FILES}
 .for file in ${ADDITIONAL_CODECS_DISTFILES}
 	@cd ${WRKDIR} && ${TAR} xyf \
 		${DISTDIR}/${DIST_SUBDIR}/${file}
@@ -67,4 +91,4 @@ do-install:
 	@${CP} /dev/null ${PREFIX}/lib/win32/${PKGNAME}
 	@${CHMOD} 0444 ${PREFIX}/lib/win32/${PKGNAME}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/multimedia/win32-codecs/distinfo b/multimedia/win32-codecs/distinfo
index f91bfb7fcfcb..e816cee901de 100644
--- a/multimedia/win32-codecs/distinfo
+++ b/multimedia/win32-codecs/distinfo
@@ -1,6 +1,9 @@
 MD5 (win32/all-20060611.tar.bz2) = 0f2f5adfb539ef0a40fc72a2b46a0349
 SHA256 (win32/all-20060611.tar.bz2) = 7eae86ca5565fc93030a9f4299bd0d45ff195bf11e4ed24916c3f58b4102b589
 SIZE (win32/all-20060611.tar.bz2) = 13806629
+MD5 (win32/xanimdlls-20040626.tar.bz2) = a7c980a1a94fbac6ebd34c7485a1891d
+SHA256 (win32/xanimdlls-20040626.tar.bz2) = 389bd7722dacf99bb453c85c2a2740b676aeed3ab2ca54d66ede86e33086b4ce
+SIZE (win32/xanimdlls-20040626.tar.bz2) = 318850
 MD5 (win32/qt63dlls-20050115.tar.bz2) = dbb2e77156a69179473b86f7498e9b29
 SHA256 (win32/qt63dlls-20050115.tar.bz2) = e2e68180b3f7b95ed9d03244ed9f39431861894eea7d0b696236a7dd7b313c48
 SIZE (win32/qt63dlls-20050115.tar.bz2) = 2694390
@@ -13,6 +16,3 @@ SIZE (win32/rp9codecs-20050115.tar.bz2) = 510136
 MD5 (win32/rp9codecs-win32-20050115.tar.bz2) = 6b56c1c127f5ac0c4c8a9878f24477ca
 SHA256 (win32/rp9codecs-win32-20050115.tar.bz2) = f1a8ae1861263411ee6233373b8f98490e334e9ca058af1149ce5eec11d737b7
 SIZE (win32/rp9codecs-win32-20050115.tar.bz2) = 540641
-MD5 (win32/xanimdlls-20040626.tar.bz2) = a7c980a1a94fbac6ebd34c7485a1891d
-SHA256 (win32/xanimdlls-20040626.tar.bz2) = 389bd7722dacf99bb453c85c2a2740b676aeed3ab2ca54d66ede86e33086b4ce
-SIZE (win32/xanimdlls-20040626.tar.bz2) = 318850
diff --git a/multimedia/win32-codecs/pkg-plist b/multimedia/win32-codecs/pkg-plist
index d2b4f1307e07..6074323518f3 100644
--- a/multimedia/win32-codecs/pkg-plist
+++ b/multimedia/win32-codecs/pkg-plist
@@ -109,40 +109,40 @@ lib/win32/wmsdmod.dll
 lib/win32/wmvadvd.dll
 lib/win32/wvc1dmod.dll
 @comment qt63dlls
-lib/win32/ACTLComponent.qtx
-lib/win32/AvidQTAVUICodec.qtx
-lib/win32/QuickTimeEssentials.qtx
-lib/win32/QuickTime.qts
-lib/win32/QuickTimeInternetExtras.qtx
-lib/win32/qtmlClient.dll
+%%QUICKTIME%%lib/win32/ACTLComponent.qtx
+%%QUICKTIME%%lib/win32/AvidQTAVUICodec.qtx
+%%QUICKTIME%%lib/win32/QuickTimeEssentials.qtx
+%%QUICKTIME%%lib/win32/QuickTime.qts
+%%QUICKTIME%%lib/win32/QuickTimeInternetExtras.qtx
+%%QUICKTIME%%lib/win32/qtmlClient.dll
 @comment qtextras
-lib/win32/BeHereiVideo.qtx
-lib/win32/Indeo4.qtx
-lib/win32/On2_VP3.qtx
-lib/win32/ZyGoVideo.qtx
-lib/win32/3ivX.qtx
+%%QUICKTIME%%lib/win32/BeHereiVideo.qtx
+%%QUICKTIME%%lib/win32/Indeo4.qtx
+%%QUICKTIME%%lib/win32/On2_VP3.qtx
+%%QUICKTIME%%lib/win32/ZyGoVideo.qtx
+%%QUICKTIME%%lib/win32/3ivX.qtx
 @comment rp9codecs
-lib/win32/dnet.so.6.0
-lib/win32/drv2.so.6.0
-lib/win32/tokr.so.6.0
-lib/win32/drv4.so.6.0
-lib/win32/dspr.so.6.0
-lib/win32/atrc.so.6.0
-lib/win32/drv3.so.6.0
-lib/win32/ddnt.so.6.0
-lib/win32/cook.so.6.0
-lib/win32/sipr.so.6.0
-lib/win32/tokf.so.6.0
+%%REALPLAYER%%lib/win32/dnet.so.6.0
+%%REALPLAYER%%lib/win32/drv2.so.6.0
+%%REALPLAYER%%lib/win32/tokr.so.6.0
+%%REALPLAYER%%lib/win32/drv4.so.6.0
+%%REALPLAYER%%lib/win32/dspr.so.6.0
+%%REALPLAYER%%lib/win32/atrc.so.6.0
+%%REALPLAYER%%lib/win32/drv3.so.6.0
+%%REALPLAYER%%lib/win32/ddnt.so.6.0
+%%REALPLAYER%%lib/win32/cook.so.6.0
+%%REALPLAYER%%lib/win32/sipr.so.6.0
+%%REALPLAYER%%lib/win32/tokf.so.6.0
 @comment rp9codecs-win32
-lib/win32/atrc3260.dll
-lib/win32/cook3260.dll
-lib/win32/drv13260.dll
-lib/win32/drv23260.dll
-lib/win32/drv33260.dll
-lib/win32/drv43260.dll
-lib/win32/pncrt.dll
-lib/win32/sipr3260.dll
-lib/win32/tokr3260.dll
+%%REALPLAYER%%lib/win32/atrc3260.dll
+%%REALPLAYER%%lib/win32/cook3260.dll
+%%REALPLAYER%%lib/win32/drv13260.dll
+%%REALPLAYER%%lib/win32/drv23260.dll
+%%REALPLAYER%%lib/win32/drv33260.dll
+%%REALPLAYER%%lib/win32/drv43260.dll
+%%REALPLAYER%%lib/win32/pncrt.dll
+%%REALPLAYER%%lib/win32/sipr3260.dll
+%%REALPLAYER%%lib/win32/tokr3260.dll
 @comment xanimdlls
 lib/win32/vid_3ivX.xa
 lib/win32/vid_3ivX_d3.5_linuxELFx86c6.xa