10 files changed, 18 insertions, 245 deletions

diff --git a/multimedia/win32-codecs/Makefile b/multimedia/win32-codecs/Makefile
index 3938e8300efc..df8ac4946c1b 100644
--- a/multimedia/win32-codecs/Makefile
+++ b/multimedia/win32-codecs/Makefile
@@ -1,110 +1,39 @@
-# New ports collection makefile for:   avifile
+# New ports collection makefile for:	avifile
 # Date created: 	16 September 2000
 # Whom: 		Holger Lamm
 #
 # $FreeBSD$
 #
 
-PORTNAME=	avifile
-PORTVERSION=	0.53.4
-CATEGORIES=	graphics
+PORTNAME=	win32-codecs
+PORTVERSION=	${CODEC_VERSION}
+CATEGORIES=	graphics audio
 MASTER_SITES=	http://ernie.eit.uni-kl.de/avifile/ \
 		http://divx.euro.ru/ \
 		http://www.toon.eu.org/divx/
-DISTFILES=	avifile-${PORTVERSION}.tar.gz \
-		binaries-${CODEC_VERSION}.zip \
+DISTFILES=	binaries-${CODEC_VERSION}.zip \
 		wmvds32.ax.gz
-EXTRACT_ONLY=	avifile-${PORTVERSION}.tar.gz
+EXTRACT_ONLY=	binaries-${CODEC_VERSION}.zip
 
 MAINTAINER=	holger@eit.uni-kl.de
 
-LIB_DEPENDS=	SDL-1.1.2:${PORTSDIR}/devel/sdl-devel
-BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
-
 RESTRICTED=	Unsure of codec\'s license
-RESTRICTED_FILES=	binaries-${CODEC_VERSION}.zip \
-			wmvds32.ax.gz
 
 ONLY_FOR_ARCHS=	i386
-USE_QT2=	yes
-USE_XLIB=	yes
-USE_GMAKE=	yes
-INSTALLS_SHLIB=	yes
-
-USE_AUTOCONF=	yes
-USE_LIBTOOL=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
-		MOC="${MOC}" \
-		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--with-qt-includes=${X11BASE}/include/qt2 \
-		--with-qt-libraries=${X11BASE}/lib \
-		--with-win32-path=${LOCALBASE}/lib/win32 \
-		--enable-release
-PLIST_SUB=	LIB_VERSION="${LIB_VERSION}"
+USE_ZIP=	yes
+NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
 
 CODEC_VERSION=	010122
-LIB_VERSION=	0
-# Adhoc fix. First part.
-# qt is there but configure is not finding it
-# Therefore, it is avoiding this directories
-# At least, on lioux's homesystem with qt 2.2.3
-EXTRA_BUILD_DIR=	player samples/benchmark samples/qtrecompress
-
-SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
-MOC?=		${X11BASE}/bin/moc2
-DIFF?=		/usr/bin/diff
-
-.include <bsd.port.pre.mk>
+# Used by other ports to detect if this is installed
+CODEC_DETECTION_FILE=	${LOCALBASE}/lib/win32/wmvds32.ax
 
 post-extract:
-	@${LOCALBASE}/bin/unzip ${DISTDIR}/binaries-${CODEC_VERSION}.zip \
-		-d ${WRKDIR}/codecs
-	@${GZCAT} ${DISTDIR}/wmvds32.ax.gz > ${WRKDIR}/codecs/wmvds32.ax
-
-# Libtool fix code kindly provided by Mr. Maxim Sobolev <sobomax@FreeBSD.org>
-post-configure:
-	@${PERL} -pi -e \
-		's|^deplibs_check_method=.*|deplibs_check_method=pass_all|' \
-			${WRKSRC}/libtool
-
-post-build:
-.for dir in ${EXTRA_BUILD_DIR}
-	(cd ${WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE})
-.endfor
+	@${GZCAT} ${DISTDIR}/wmvds32.ax.gz > ${WRKDIR}/wmvds32.ax
 
-post-install:
+do-install:
 	@${MKDIR} ${PREFIX}/lib/win32
-	@${INSTALL_DATA} ${WRKDIR}/codecs/* ${PREFIX}/lib/win32
-	@/usr/bin/fmt < ${PKGMESSAGE}
-	@${INSTALL_DATA} ${WRKSRC}/lib/libaviplay.la ${PREFIX}/lib
-	@${LN} -sf libaviplay.so.${LIB_VERSION} ${PREFIX}/lib/libaviplay.so
-# Adhoc fix. Second part.
-# Install the missed applications.
-.if exists(${PREFIX}/bin/aviplay)
-	${DIFF} ${WRKSRC}/player/.libs/aviplay ${PREFIX}/bin > /dev/null || \
-			${INSTALL_PROGRAM} ${WRKSRC}/player/.libs/aviplay \
-				${PREFIX}/bin
-.else
-	${INSTALL_PROGRAM} ${WRKSRC}/player/.libs/aviplay ${PREFIX}/bin
-.endif
-.if exists(${PREFIX}/bin/benchmark)
-	${DIFF} ${WRKSRC}/samples/benchmark/.libs/benchmark \
-		${PREFIX}/bin > /dev/null || \
-			${INSTALL_PROGRAM} \
-				${WRKSRC}/samples/benchmark/.libs/benchmark \
-					${PREFIX}/bin
-.else
-	${INSTALL_PROGRAM} ${WRKSRC}/samples/benchmark/.libs/benchmark \
-		${PREFIX}/bin
-.endif
-.if exists(${PREFIX}/bin/qtrecompress)
-	${DIFF} ${WRKSRC}/samples/qtrecompress/.libs/qtrecompress \
-		${PREFIX}/bin > /dev/null || \
-			${INSTALL_PROGRAM} ${WRKSRC}/samples/qtrecompress/.libs/qtrecompress ${PREFIX}/bin
-.else
-	${INSTALL_PROGRAM} ${WRKSRC}/samples/qtrecompress/.libs/qtrecompress \
-		${PREFIX}/bin
-.endif
+	@${CHMOD} 0555 ${PREFIX}/lib/win32
+	@${INSTALL_DATA} ${WRKDIR}/* ${PREFIX}/lib/win32
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/multimedia/win32-codecs/distinfo b/multimedia/win32-codecs/distinfo
index debab7223a25..75de48921143 100644
--- a/multimedia/win32-codecs/distinfo
+++ b/multimedia/win32-codecs/distinfo
@@ -1,3 +1,2 @@
-MD5 (avifile-0.53.4.tar.gz) = 9f5dc386314ccc2748af0200d87f356f
 MD5 (binaries-010122.zip) = ffc44e68b581994613931a9e47500446
 MD5 (wmvds32.ax.gz) = 886493bf1d0fa9ea088755c3fbddcfd7
diff --git a/multimedia/win32-codecs/files/patch-aa b/multimedia/win32-codecs/files/patch-aa
deleted file mode 100644
index ededdb39d3f5..000000000000
--- a/multimedia/win32-codecs/files/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
---- lib/avifile/AviWrite.cpp.orig	Fri Oct  6 12:58:16 2000
-+++ lib/avifile/AviWrite.cpp	Fri Oct  6 12:59:14 2000
-@@ -23,7 +23,11 @@
-     try
-     {
-         m_status=0;
-+#ifdef O_LARGEFILE
- 	m_fd=new FileBuffer(name, O_WRONLY | O_CREAT | O_TRUNC | O_LARGEFILE, mask);
-+#else
-+	m_fd=new FileBuffer(name, O_WRONLY | O_CREAT | O_TRUNC, mask);
-+#endif
- 	const int junk_size=0x800;
-         char* junk=new char[junk_size];
- 	memset(junk, 0, junk_size);
diff --git a/multimedia/win32-codecs/files/patch-ab b/multimedia/win32-codecs/files/patch-ab
deleted file mode 100644
index 5b0f59a9bd72..000000000000
--- a/multimedia/win32-codecs/files/patch-ab
+++ /dev/null
@@ -1,23 +0,0 @@
---- lib/loader/win32.c.orig	Thu Jan  4 01:18:05 2001
-+++ lib/loader/win32.c	Thu Jan  4 01:18:10 2001
-@@ -1085,6 +1085,7 @@
- static double CPU_Freq()
- {
- //#ifdef USE_TSC
-+#ifdef __Linux__
- 	FILE *f = fopen ("/proc/cpuinfo", "r");
- 	char line[200];
- 	char model[200]="unknown";
-@@ -1121,9 +1122,9 @@
- 	fclose(f);
- 	if(freq<0)return old_freq();
- 	return freq;
--//#else
--//	return old_freq();
--//#endif    	
-+#else
-+	return old_freq();
-+#endif    	
- }
- 
- long WINAPI expQueryPerformanceFrequency(long long* z)
diff --git a/multimedia/win32-codecs/files/patch-ac b/multimedia/win32-codecs/files/patch-ac
deleted file mode 100644
index f2c4fefd748c..000000000000
--- a/multimedia/win32-codecs/files/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
---- lib/videocodec/Module.h.orig	Fri Oct  6 13:01:34 2000
-+++ lib/videocodec/Module.h	Fri Oct  6 13:02:09 2000
-@@ -4,6 +4,12 @@
- #include <videoencoder.h>
- #include <list>
- #include <string>
-+#if (defined(__unix__) || defined(unix)) && !defined(USG)
-+#include <sys/param.h>
-+#endif
-+#if (defined(BSD) && (BSD >= 199103))
-+#include <sys/time.h>
-+#endif
- using namespace std;
- 
- class VideoCodecControl;
diff --git a/multimedia/win32-codecs/files/patch-ae b/multimedia/win32-codecs/files/patch-ae
deleted file mode 100644
index 38258f8a1512..000000000000
--- a/multimedia/win32-codecs/files/patch-ae
+++ /dev/null
@@ -1,19 +0,0 @@
---- aclocal.m4.orig	Thu Dec 21 15:30:34 2000
-+++ aclocal.m4	Thu Dec 21 15:31:01 2000
-@@ -569,7 +569,7 @@
- 
-  if test "$qt_libdir" ; then
-   ac_QT_NAME=$DEFAULTQTLIB
--  AC_CHECK_LIB(qt-mt, main,ac_QT_NAME=-lqt-mt)
-+dnl  AC_CHECK_LIB(qt-mt, main,ac_QT_NAME=-lqt-mt)
-  fi;
-  LIBS="$LIBS $ac_QT_NAME -lXext -lX11 $LIBSOCKET"
- 
-@@ -609,7 +609,7 @@
- else
-   have_qt="yes"
-   ac_QT_NAME=$DEFAULTQTLIB
--  AC_CHECK_LIB(qt-mt, main,ac_QT_NAME=-lqt-mt)
-+dnl  AC_CHECK_LIB(qt-mt, main,ac_QT_NAME=-lqt-mt)
-   LIBS="$LIBS $ac_QT_NAME -lXext -lX11 $LIBSOCKET"
- fi
diff --git a/multimedia/win32-codecs/pkg-comment b/multimedia/win32-codecs/pkg-comment
index 60c45289857e..d2fcdf638783 100644
--- a/multimedia/win32-codecs/pkg-comment
+++ b/multimedia/win32-codecs/pkg-comment
@@ -1 +1 @@
-AVI player/converter with numerous codecs, including MPEG-4(DivX ;-))
+Huge compilation of Win32 binary codecs, including MPEG-4(DivX ;-))
diff --git a/multimedia/win32-codecs/pkg-descr b/multimedia/win32-codecs/pkg-descr
index b583b05810be..b3cb9a63fab9 100644
--- a/multimedia/win32-codecs/pkg-descr
+++ b/multimedia/win32-codecs/pkg-descr
@@ -1,6 +1,4 @@
-An AVI player and converter built around the 
-Windows binary codecs.
-Does not use Wine. It supports the following codecs:
+A huge compilation of Win32 codecs:
 
 Video:
 - Win32 VfW DLLs:
diff --git a/multimedia/win32-codecs/pkg-message b/multimedia/win32-codecs/pkg-message
deleted file mode 100644
index ab4ce4da9eeb..000000000000
--- a/multimedia/win32-codecs/pkg-message
+++ /dev/null
@@ -1,22 +0,0 @@
-	ATTENTIONATTENTION:
-
-This port requires a kernel built with
-the directive:
-
-options USER_LDT
-
-Please, check the FreeBSD Handbook for instructions
-on building a custom kernel. If you do not know
-where to find it, check the FreeBSD website
-http://www.freebsd.org/
-
-Also, if the port finished building but
-did not install the aviplay program. You
-should consider installing the very
-latest qt library supporting threads.
-Version 2.2.3 and over should be
-enough. Then, try rebuilding the avifile
-port.
-
-Please, check the FreeBSD Handbook on
-updating your port tree if you need to.
diff --git a/multimedia/win32-codecs/pkg-plist b/multimedia/win32-codecs/pkg-plist
index 96325411cbb9..c5905b9dac64 100644
--- a/multimedia/win32-codecs/pkg-plist
+++ b/multimedia/win32-codecs/pkg-plist
@@ -1,60 +1,3 @@
-include/avifile/audiodecoder.h
-include/avifile/audioencoder.h
-include/avifile/avifile.h
-include/avifile/avifmt.h
-include/avifile/aviplay.h
-include/avifile/aviutil.h
-include/avifile/com.h
-include/avifile/config.h
-include/avifile/default.h
-include/avifile/except.h
-include/avifile/image.h
-include/avifile/infotypes.h
-include/avifile/loader.h
-include/avifile/registry.h
-include/avifile/version.h
-include/avifile/videodecoder.h
-include/avifile/videoencoder.h
-include/avifile/wine/basetsd.h
-include/avifile/wine/config.h
-include/avifile/wine/debugtools.h
-include/avifile/wine/driver.h
-include/avifile/wine/elfdll.h
-include/avifile/wine/heap.h
-include/avifile/wine/ldt.h
-include/avifile/wine/mmreg.h
-include/avifile/wine/module.h
-include/avifile/wine/msacm.h
-include/avifile/wine/msacmdrv.h
-include/avifile/wine/ntdef.h
-include/avifile/wine/pe_image.h
-include/avifile/wine/poppack.h
-include/avifile/wine/pshpack1.h
-include/avifile/wine/pshpack2.h
-include/avifile/wine/pshpack4.h
-include/avifile/wine/pshpack8.h
-include/avifile/wine/vfw.h
-include/avifile/wine/winbase.h
-include/avifile/wine/windef.h
-include/avifile/wine/windows.h
-include/avifile/wine/winerror.h
-include/avifile/wine/winestring.h
-include/avifile/wine/winnt.h
-include/avifile/wine/winreg.h
-include/avifile/wine/winuser.h
-@dirrm include/avifile/wine
-@dirrm include/avifile
-bin/avifile-config
-bin/aviplay
-bin/benchmark
-bin/qtrecompress
-share/avifile/open.ppm
-share/avifile/pause.ppm
-share/avifile/play.ppm
-share/avifile/stop.ppm
-share/avifile/about.ppm
-share/avifile/test.png
-@dirrm share/avifile
 lib/win32/ativcr2.dll
 lib/win32/divx_c32.ax
 lib/win32/divxa32.acm
@@ -76,6 +19,3 @@ lib/win32/msms001.vwp
 lib/win32/voxmsdec.ax
 lib/win32/wmvds32.ax
 @dirrm lib/win32
-lib/libaviplay.la
-lib/libaviplay.so
-lib/libaviplay.so.%%LIB_VERSION%%