Update to use the codecs distributed with mplayer-0.60.

Some additional codecs, some removed.

3 files changed, 46 insertions, 28 deletions

diff --git a/graphics/win32-codecs/Makefile b/graphics/win32-codecs/Makefile
index 8517c094859..3cdcd2ac219 100644
--- a/graphics/win32-codecs/Makefile
+++ b/graphics/win32-codecs/Makefile
@@ -1,20 +1,14 @@
-# $NetBSD: Makefile,v 1.2 2001/09/27 23:18:13 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2002/01/21 21:47:47 wiz Exp $
 #
 
-DISTNAME=	binaries-${CODEC_VERSION}
-PKGNAME=	win32-codecs-${CODEC_VERSION}
+DISTNAME=	w32codec-0.60
+PKGNAME=	win32-codecs-011227
 CATEGORIES=	graphics
-MASTER_SITES=	http://ernie.eit.uni-kl.de/avifile/		\
-		http://divx.euro.ru/				\
-		http://www.toon.eu.org/divx/
-DISTFILES=	${DISTNAME}.zip wmvds32.ax.gz
+MASTER_SITES=	ftp://mplayerhq.hu/MPlayer/releases/
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	zuntum@netbsd.org
-COMMENT=	Huge compilation of Win32 binary codecs, including MPEG-4(DivX ;-))
-
-BUILD_DEPENDS=	unzip-[0-9]*:../../archivers/unzip
-
-EXTRACT_ONLY=	#
+COMMENT=	huge compilation of Win32 binary codecs
 
 NO_BUILD=	yes
 
@@ -26,13 +20,8 @@ NO_BIN_ON_FTP=  ${RESTRICTED}
 NO_SRC_ON_CDROM=${RESTRICTED}
 NO_SRC_ON_FTP=	${RESTRICTED}
 
-CODEC_VERSION=	010122
-
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/win32
-	${LOCALBASE}/bin/unzip ${DISTDIR}/binaries-${CODEC_VERSION}.zip \
-		-d ${PREFIX}/lib/win32
-	${GZCAT} ${DISTDIR}/wmvds32.ax.gz > ${PREFIX}/lib/win32/wmvds32.ax
-	${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/lib/win32
+	${INSTALL_DATA} ${WRKSRC}/* ${PREFIX}/lib/win32
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/win32-codecs/PLIST b/graphics/win32-codecs/PLIST
index 4ecb5003529..e877935b2b5 100644
--- a/graphics/win32-codecs/PLIST
+++ b/graphics/win32-codecs/PLIST
@@ -1,22 +1,53 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:54:26 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/01/21 21:47:48 wiz Exp $
+lib/win32/3ivxdmo.dll
 lib/win32/acelpdec.ax
+lib/win32/asusasv2.dll
+lib/win32/asusasvd.dll
 lib/win32/ativcr2.dll
+lib/win32/avimszh.dll
+lib/win32/avizlib.dll
+lib/win32/divx.dll
 lib/win32/divx_c32.ax
 lib/win32/divxa32.acm
 lib/win32/divxc32.dll
-lib/win32/divxc32f.dll
+lib/win32/divxdec.ax
+lib/win32/huffyuv.dll
+lib/win32/i263_32.drv
 lib/win32/iccvid.dll
+lib/win32/icmw_32.dll
+lib/win32/imaadp32.acm
 lib/win32/imc32.acm
 lib/win32/ir32_32.dll
 lib/win32/ir41_32.dll
-lib/win32/ir41_qc.dll
 lib/win32/ir50_32.dll
-lib/win32/ir50_qc.dll
-lib/win32/ir50_qcx.dll
+lib/win32/ivvideo.dll
+lib/win32/l3codeca.acm
+lib/win32/l3codecx.ax
+lib/win32/lhacm.acm
 lib/win32/m3jpeg32.dll
+lib/win32/m3jpegdec.ax
+lib/win32/mcdvd_32.dll
+lib/win32/mcmjpg32.dll
 lib/win32/mpg4c32.dll
+lib/win32/mpg4ds32.ax
 lib/win32/msadp32.acm
+lib/win32/msg711.acm
+lib/win32/msgsm32.acm
+lib/win32/msh261.drv
 lib/win32/msms001.vwp
+lib/win32/msnaudio.acm
+lib/win32/msrle32.dll
+lib/win32/msscds32.ax
+lib/win32/msvidc32.dll
+lib/win32/mvoiced.vwp
+lib/win32/pclepim1.dll
+lib/win32/qdv.dll
+lib/win32/tm20dec.ax
+lib/win32/tssoft32.acm
+lib/win32/ubv263d+.ax
+lib/win32/vivog723.acm
 lib/win32/voxmsdec.ax
+lib/win32/vp31vfw.dll
+lib/win32/wmv8ds32.ax
 lib/win32/wmvds32.ax
 @dirrm lib/win32
diff --git a/graphics/win32-codecs/distinfo b/graphics/win32-codecs/distinfo
index 90e2e0863c3..2a959394346 100644
--- a/graphics/win32-codecs/distinfo
+++ b/graphics/win32-codecs/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 09:54:28 wiz Exp $
+$NetBSD: distinfo,v 1.3 2002/01/21 21:47:48 wiz Exp $
 
-SHA1 (binaries-010122.zip) = 2e23951a738da355095220df54f37453e9ad3fd8
-Size (binaries-010122.zip) = 1903024 bytes
-SHA1 (wmvds32.ax.gz) = 7abcb1bc8b024aa129f1d1542b729c1d7aca34df
-Size (wmvds32.ax.gz) = 87379 bytes
+SHA1 (w32codec-0.60.tar.bz2) = ff758f04884885356a92aaa9a5764ea4088a7a11
+Size (w32codec-0.60.tar.bz2) = 3951093 bytes