Remove avifile -- very outdated version that does not build with gcc3.

avifile's development itself seems very slow, and there was
no taker for updating the package. Use mplayer or xine.

25 files changed, 1 insertions, 531 deletions

diff --git a/multimedia/Makefile b/multimedia/Makefile
index 90df14a2762..8d0313d8230 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2005/04/19 15:38:40 wiz Exp $
+# $NetBSD: Makefile,v 1.68 2005/04/22 19:32:10 wiz Exp $
 #
 
 COMMENT=	Multimedia utilities
@@ -7,7 +7,6 @@ SUBDIR+=	RealPlayerGold
 SUBDIR+=	acidrip
 SUBDIR+=	alevt
 SUBDIR+=	avidemux
-SUBDIR+=	avifile
 SUBDIR+=	dirac
 SUBDIR+=	divxplayer
 SUBDIR+=	dumpmpeg
diff --git a/multimedia/avifile/DESCR b/multimedia/avifile/DESCR
deleted file mode 100644
index 09ed2e9a3df..00000000000
--- a/multimedia/avifile/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-An MPEG-4 (aka DivX) player library built around the Windows binaries,
-that does not need Wine.  There is also a xmps plugin you can build
-(manually).
diff --git a/multimedia/avifile/MESSAGE b/multimedia/avifile/MESSAGE
deleted file mode 100644
index 515f1452ae2..00000000000
--- a/multimedia/avifile/MESSAGE
+++ /dev/null
@@ -1,9 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2004/01/26 15:11:46 jmmv Exp $
-
-This package requires a kernel built with
-the directive:
-
-options USER_LDT
-
-===========================================================================
diff --git a/multimedia/avifile/Makefile b/multimedia/avifile/Makefile
deleted file mode 100644
index e78022e64f2..00000000000
--- a/multimedia/avifile/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:40 tv Exp $
-
-DISTNAME=	avifile-0.53.5
-PKGREVISION=	4
-CATEGORIES=	multimedia
-MASTER_SITES=	http://ernie.eit.uni-kl.de/avifile/			\
-		http://divx.euro.ru/					\
-		http://www.toon.eu.org/divx/
-
-MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://avifile.sourceforge.net/
-COMMENT=	MPEG-4 (DivX) video player library
-
-DEPENDS=	win32-codecs>=010122:../../multimedia/win32-codecs
-
-ONLY_FOR_PLATFORM=	NetBSD-*-i386
-
-USE_GNU_TOOLS+=		make
-USE_LIBTOOL=		YES
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
-
-GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--with-win32-path="${LOCALBASE}/lib/win32"
-CONFIGURE_ARGS+=	--disable-qt
-
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/avifile/PLIST b/multimedia/avifile/PLIST
deleted file mode 100644
index 62049be3ed5..00000000000
--- a/multimedia/avifile/PLIST
+++ /dev/null
@@ -1,56 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:44 jlam Exp $
-bin/avifile-config
-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
-lib/libaviplay.la
-share/avifile/about.ppm
-share/avifile/open.ppm
-share/avifile/pause.ppm
-share/avifile/play.ppm
-share/avifile/stop.ppm
-share/avifile/test.png
-@dirrm share/avifile
-@dirrm include/avifile/wine
-@dirrm include/avifile
diff --git a/multimedia/avifile/buildlink3.mk b/multimedia/avifile/buildlink3.mk
deleted file mode 100644
index 6efe6101985..00000000000
--- a/multimedia/avifile/buildlink3.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:01 tv Exp $
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-AVIFILE_BUILDLINK3_MK:=	${AVIFILE_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	avifile
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Navifile}
-BUILDLINK_PACKAGES+=	avifile
-
-.if !empty(AVIFILE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.avifile+=	avifile>=0.53.5nb2
-BUILDLINK_RECOMMENDED.avifile+=	avifile>=0.53.5nb3
-BUILDLINK_PKGSRCDIR.avifile?=	../../multimedia/avifile
-.endif	# AVIFILE_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/avifile/distinfo b/multimedia/avifile/distinfo
deleted file mode 100644
index 241c852cbf9..00000000000
--- a/multimedia/avifile/distinfo
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 11:24:02 agc Exp $
-
-SHA1 (avifile-0.53.5.tar.gz) = bc9d27c65ab4f8df9006c6037d539ff71adb0ad7
-RMD160 (avifile-0.53.5.tar.gz) = fc497b1715fd6793ff6b33e5c35188f142594265
-Size (avifile-0.53.5.tar.gz) = 848382 bytes
-SHA1 (patch-aa) = e497c4526fa50140dc19cef8cbf171baa13e55c9
-SHA1 (patch-ab) = f6ce2519d56cde66cf88d5180c87ee2453c155e7
-SHA1 (patch-ac) = add3437da5e5724269d2dc10c0d10e1bc6c022cd
-SHA1 (patch-ad) = 21ceab52fd184ee856780e5f38405a67a471ed07
-SHA1 (patch-ae) = 36b45ff4f4e350195bf0731c64fb52449ed23c41
-SHA1 (patch-af) = 48cb4d9cf0c45fd8c60d5cabd0ce71d8100f880a
-SHA1 (patch-ag) = 49a96eb69108e1bc3bc1a7f69db4a86cf3be1935
-SHA1 (patch-ai) = fb735fb071ad6bddce0520f55f266e8c05b1ef34
-SHA1 (patch-aj) = 9fac29acf89aa99f546581ecb7b800029643297f
-SHA1 (patch-ak) = f16d6fd4192f74d2f2eb67bc41672e41c6cfba48
-SHA1 (patch-al) = 218f2f2da4ad82ccced63ad00873f186f9924201
-SHA1 (patch-am) = 455dd9d3bfc10572ce85fd1015ccd09b3f9a067e
-SHA1 (patch-an) = 3e9857a9e52fce6f51d7cdf99db82b48fc4cbfe9
-SHA1 (patch-ao) = 01e418460da9ffa59b0d1799845049a8aa4bf7c9
-SHA1 (patch-ap) = fd8b4ec6e53ef4ef87983fc63bd7636c7653ebe4
-SHA1 (patch-aq) = bbae73f76390f5e27d9f3135f2ddb4230b47121f
-SHA1 (patch-ar) = 6a302643818a478003d75d2ff7ab1133a90fc412
-SHA1 (patch-as) = 140bea8a63ccd109c00b6f8eb0a40dc42161adbb
diff --git a/multimedia/avifile/patches/patch-aa b/multimedia/avifile/patches/patch-aa
deleted file mode 100644
index 787df2319e7..00000000000
--- a/multimedia/avifile/patches/patch-aa
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/01/26 15:11:46 jmmv Exp $
-
---- lib/aviplay/audio.cpp.orig	Fri Dec 15 07:53:05 2000
-+++ lib/aviplay/audio.cpp
-@@ -28,7 +28,11 @@
- #include <pthread.h>
- 
- 
--#include <sys/soundcard.h>
-+#ifdef __NetBSD__
-+#include <soundcard.h>
-+#else
-+ #include <sys/soundcard.h>
-+#endif
- 
- #include "aviplay_impl.h"
- #include "audio.h"
-@@ -112,7 +116,7 @@
- int audio_queue::write(int fd)//writes some data
- {
-     int startpos, size, tmp;
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
-     const int AUDIO_BUFFER_SIZE=2048;
- #else
-     const int AUDIO_BUFFER_SIZE=8192;
-@@ -372,7 +376,7 @@
- 	audio_fd=-1;
- 	try
- 	{
--    	    audio_fd=open("/dev/dsp",O_RDWR|O_NDELAY);
-+    	    audio_fd=open("/dev/sound",O_RDWR|O_NDELAY);
- 	    if(audio_fd<=0)
-   		throw FATAL("Can't open audio device");
- 	    if(audio_fd>0)
-@@ -388,7 +392,7 @@
- 	catch(FatalError&)
- 	{
- 	    if(audio_fd>0)::close(audio_fd);
--	    audio_fd=open("/dev/dsp", O_RDWR);
-+	    audio_fd=open("/dev/sound", O_RDWR);
- 	}
-         if(audio_fd<=0)
-      	    throw FATAL("Can't open audio device");
diff --git a/multimedia/avifile/patches/patch-ab b/multimedia/avifile/patches/patch-ab
deleted file mode 100644
index 0b725ecc2e0..00000000000
--- a/multimedia/avifile/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/01/26 15:11:46 jmmv Exp $
-
---- lib/avifile/File64.h.orig	Sun Nov 26 18:43:55 2000
-+++ lib/avifile/File64.h
-@@ -3,7 +3,7 @@
- 
- typedef long long 
__int64;
- //typedef int HANDLE;
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
- #define lseek64 lseek
- //#else
- //extern "C" __int64 lseek64(int fd, __int64 offset, int);
diff --git a/multimedia/avifile/patches/patch-ac b/multimedia/avifile/patches/patch-ac
deleted file mode 100644
index 78aff3c3741..00000000000
--- a/multimedia/avifile/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/01/26 15:11:46 jmmv Exp $
-
---- lib/avifile/AVIReadHandler2.cpp.orig	Wed Jan 10 19:01:12 2001
-+++ lib/avifile/AVIReadHandler2.cpp
-@@ -27,6 +27,10 @@
- typedef long long
 __int64;
- //#define STREAMING_DEBUG
- 
-+#if defined(__NetBSD__)
-+#define lseek64 lseek
-+#endif
-+
- // HACK!!!!
- 
- extern pthread_mutex_t g_diskcs;
diff --git a/multimedia/avifile/patches/patch-ad b/multimedia/avifile/patches/patch-ad
deleted file mode 100644
index 8d444a67c78..00000000000
--- a/multimedia/avifile/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2004/01/26 15:11:46 jmmv Exp $
-
---- lib/avifile/FastReadStream.cpp.orig	Sun Nov 26 18:43:55 2000
-+++ lib/avifile/FastReadStream.cpp
-@@ -6,7 +6,7 @@
- #include <string.h>
- #include <errno.h>
- #include <sys/types.h>
--#ifndef __FreeBSD__
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__)
- #include <features.h>
- #endif
- #include <unistd.h>
-@@ -16,7 +16,7 @@
- #include <stdlib.h>
- #endif
- 
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
- #define lseek64 lseek
- #else
- extern "C" __int64 lseek64(int fd, __int64 offset, int);
diff --git a/multimedia/avifile/patches/patch-ae b/multimedia/avifile/patches/patch-ae
deleted file mode 100644
index c70b660a1e9..00000000000
--- a/multimedia/avifile/patches/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2004/01/26 15:11:46 jmmv Exp $
-
---- lib/avifile/Cache.cpp.orig	Tue Oct 10 20:31:37 2000
-+++ lib/avifile/Cache.cpp
-@@ -3,6 +3,10 @@
- #include <except.h>
- #define BUFFERING 100
- 
-+#ifdef __NetBSD__
-+#define lseek64 lseek
-+#endif
-+
- class mem_counter
- {
- int size;
diff --git a/multimedia/avifile/patches/patch-af b/multimedia/avifile/patches/patch-af
deleted file mode 100644
index 05e7f1b3617..00000000000
--- a/multimedia/avifile/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2004/01/26 15:11:46 jmmv Exp $
-
---- lib/avifile/AviWrite.cpp.orig	Fri Dec  1 12:13:53 2000
-+++ lib/avifile/AviWrite.cpp
-@@ -12,7 +12,7 @@
- 
- #include "AviWrite.h"
- 
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
- #define lseek64 lseek
- #define O_LARGEFILE 0
- #endif
diff --git a/multimedia/avifile/patches/patch-ag b/multimedia/avifile/patches/patch-ag
deleted file mode 100644
index 2d880e5f7e0..00000000000
--- a/multimedia/avifile/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2004/01/26 15:11:46 jmmv Exp $
-
---- player/Makefile.in.orig	Thu Feb  8 04:19:59 2001
-+++ player/Makefile.in
-@@ -207,7 +207,7 @@
- 
- MOC = @MOC@
- UIC = @UIC@
--LDFLAGS = @LIBS@ @X_LDFLAGS@ -lX11 -lXext @QT_LDFLAGS@  @QT_NAME@ @SDL_LIBS@
-+LDFLAGS = @LIBS@ @X_LDFLAGS@ -lX11 -lXext @QT_LDFLAGS@  @QT_NAME@ @SDL_LIBS@ -li386
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../include/config.h
- CONFIG_CLEAN_FILES = 
diff --git a/multimedia/avifile/patches/patch-ai b/multimedia/avifile/patches/patch-ai
deleted file mode 100644
index 0d0be985867..00000000000
--- a/multimedia/avifile/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 2004/01/26 15:11:46 jmmv Exp $
-
---- lib/aviplay/Makefile.in.orig	Wed Jan 10 19:02:43 2001
-+++ lib/aviplay/Makefile.in
-@@ -210,7 +210,7 @@
- 
- DEFS = @DEFS@ -I. -I$(srcdir) -I../../include
- CPPFLAGS = @CPPFLAGS@
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = @LDFLAGS@ -li386
- libaviplay_la_LDFLAGS = 
- libaviplay_la_LIBADD = 
- libaviplay_la_OBJECTS =  audio.lo aviplay.lo aviutil.lo
diff --git a/multimedia/avifile/patches/patch-aj b/multimedia/avifile/patches/patch-aj
deleted file mode 100644
index 3aca9c86783..00000000000
--- a/multimedia/avifile/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1.1.1 2004/01/26 15:11:46 jmmv Exp $
-
---- lib/Makefile.in.orig	Wed Jan 10 19:02:33 2001
-+++ lib/Makefile.in
-@@ -202,7 +202,7 @@
- libaviplay_la_LIBADD = loader/libloader.la videocodec/libvideocodec.la avifile/libavi_io.la aviplay/libaviplay.la audiodecoder/libaudiodec.la audioencoder/libaudioenc.la audiodecoder/mpeg/libmpeg.la audioencoder/lame3.70/libmp3lame.la videocodec/DirectShow/libds_videocodec.la
- 
- 
--LDFLAGS = @SDL_LIBS@ @AC3_LIBS@ @AC3_LDADD@
-+LDFLAGS = @SDL_LIBS@ @AC3_LIBS@ @AC3_LDADD@ -li386
- 
- LIBS = @SDL_LIBS@ @AVILIBDEPLIB@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/multimedia/avifile/patches/patch-ak b/multimedia/avifile/patches/patch-ak
deleted file mode 100644
index 63efedb5d17..00000000000
--- a/multimedia/avifile/patches/patch-ak
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ak,v 1.1.1.1 2004/01/26 15:11:49 jmmv Exp $
-
---- lib/videocodec/Module.cpp.orig	Sun Dec 17 01:07:43 2000
-+++ lib/videocodec/Module.cpp
-@@ -4,7 +4,7 @@
- #include <registry.h>
- #include <except.h>
- 
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
- #include <sys/time.h>
- #endif
- #define __MODULE__ "Win32 loader"
-@@ -138,7 +138,7 @@
-     int result;
-     DRVR* module=(DRVR*)handle;
-     char qw[200];    
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
- 	/*   XXX
- 	 *	disable Thread Context Switch in Windows Dll Calls.
- 	 *	Because Thread Switched Win32 Dll Calls <-> another threads
-@@ -155,7 +155,7 @@
-     REST_ALL;
-     __asm__ __volatile__ ("fsave (%0)\n\t": :"r"(&qw));    
- 
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
-     setitimer(ITIMER_PROF,&itoval,NULL);
- #endif
-     return result;
diff --git a/multimedia/avifile/patches/patch-al b/multimedia/avifile/patches/patch-al
deleted file mode 100644
index d4f43b1f505..00000000000
--- a/multimedia/avifile/patches/patch-al
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-al,v 1.1.1.1 2004/01/26 15:11:49 jmmv Exp $
-
---- lib/loader/driver.c.orig	Mon Dec 18 02:07:13 2000
-+++ lib/loader/driver.c
-@@ -13,7 +13,7 @@
- #include <wine/vfw.h>
- #include <registry.h>
- 
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
- #include <sys/time.h>
- #endif
- 
-@@ -38,7 +38,7 @@
- {
-     DRVR* module=(DRVR*)hDriver;
-     int result;
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
-     struct itimerval itoval;
-     struct itimerval itval;
- #endif
-@@ -48,14 +48,14 @@
-     if(module==0)return -1;
-     if(module->hDriverModule==0)return -1;
-     if(module->DriverProc==0)return -1;
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
-     memset(&itval,0,sizeof(struct itimerval));
-     setitimer(ITIMER_PROF ,&itval,&itoval);
- #endif
-     STORE_ALL;
-     result=module->DriverProc(module->dwDriverID,1,message,lParam1,lParam2);
-     REST_ALL;
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
-     setitimer(ITIMER_PROF,&itoval,NULL);
- #endif
- #ifdef DETAILED_OUT    
diff --git a/multimedia/avifile/patches/patch-am b/multimedia/avifile/patches/patch-am
deleted file mode 100644
index 5c3cf9905b1..00000000000
--- a/multimedia/avifile/patches/patch-am
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-am,v 1.2 2004/07/30 09:57:54 salo Exp $
-
---- lib/loader/win32.c.orig	2001-01-31 21:23:25.000000000 +0100
-+++ lib/loader/win32.c	2004-07-30 11:54:45.000000000 +0200
-@@ -696,7 +696,7 @@
- 	cachedsi.wProcessorLevel		= 5; /* pentium */
- 	cachedsi.wProcessorRevision		= 0x0101;
- 	
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
-         cachedsi.dwProcessorType = PROCESSOR_INTEL_PENTIUM;
-         cachedsi.wProcessorLevel= 5;
- 	PF[PF_COMPARE_EXCHANGE_DOUBLE] = TRUE;
-@@ -1094,11 +1094,11 @@
- {
- #warning FIXME
-     if(s1)
--    dbgprintf("MultiByteToWideChar(codepage %d, flags 0x%x, string 0x%x='%s',
-+    dbgprintf("MultiByteToWideChar(codepage %d, flags 0x%x, string 0x%x='%s', \
- 	size %d, dest buffer 0x%x, dest size %d) => 1 ( L\"\\0\" )\n",
- 	    v1, v2, s1, s1, siz1, s2, siz2);
-     else
--    dbgprintf("MultiByteToWideChar(codepage %d, flags 0x%x, string NULL,
-+    dbgprintf("MultiByteToWideChar(codepage %d, flags 0x%x, string NULL, \
- 	size %d, dest buffer 0x%x, dest size %d) => 1 ( L\"\\0\" )\n",
- 	    v1, v2, siz1, s2, siz2);
-     
-@@ -1605,11 +1605,11 @@
- {
-     long result=CreateFileMappingA(hFile, lpAttr, flProtect, dwMaxHigh, dwMaxLow, name);
-     if(!name)
--    dbgprintf("CreateFileMappingA(file 0x%x, lpAttr 0x%x, 
-+    dbgprintf("CreateFileMappingA(file 0x%x, lpAttr 0x%x, \
- 	flProtect 0x%x, dwMaxHigh 0x%x, dwMaxLow 0x%x, name 0) => %d\n",
- 	    hFile, lpAttr, flProtect, dwMaxHigh, dwMaxLow, result);
-     else
--    dbgprintf("CreateFileMappingA(file 0x%x, lpAttr 0x%x, 
-+    dbgprintf("CreateFileMappingA(file 0x%x, lpAttr 0x%x, \
- 	flProtect 0x%x, dwMaxHigh 0x%x, dwMaxLow 0x%x, name 0x%x='%s') => %d\n",
- 	    hFile, lpAttr, flProtect, dwMaxHigh, dwMaxLow, name, name, result);    
-     return result;
diff --git a/multimedia/avifile/patches/patch-an b/multimedia/avifile/patches/patch-an
deleted file mode 100644
index a0944c41c29..00000000000
--- a/multimedia/avifile/patches/patch-an
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-an,v 1.1.1.1 2004/01/26 15:11:49 jmmv Exp $
-
---- player/main.cpp.orig	Thu Dec 14 03:37:50 2000
-+++ player/main.cpp
-@@ -16,6 +16,9 @@
- #ifdef __FreeBSD__
- #include <floatingpoint.h>
- #endif
-+#ifdef __NetBSD__
-+#include <machine/ieeefp.h>
-+#endif
- #include "mywidget.h"
- #include <default.h>
- #include <version.h>
diff --git a/multimedia/avifile/patches/patch-ao b/multimedia/avifile/patches/patch-ao
deleted file mode 100644
index 55e4a5611ba..00000000000
--- a/multimedia/avifile/patches/patch-ao
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ao,v 1.1.1.1 2004/01/26 15:11:49 jmmv Exp $
-
---- player/renderer.cpp.orig	Wed Feb  7 18:21:11 2001
-+++ player/renderer.cpp
-@@ -9,7 +9,7 @@
- 
- #include <unistd.h>
- #define QT_CLEAN_NAMESPACE
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
- #include <machine/param.h>
- #include <sys/types.h>
- #endif
diff --git a/multimedia/avifile/patches/patch-ap b/multimedia/avifile/patches/patch-ap
deleted file mode 100644
index 3c900e200eb..00000000000
--- a/multimedia/avifile/patches/patch-ap
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ap,v 1.1.1.1 2004/01/26 15:11:49 jmmv Exp $
-
---- lib/loader/Makefile.am.orig	Fri Jan 26 16:06:42 2001
-+++ lib/loader/Makefile.am
-@@ -9,4 +9,4 @@
- LIBS=
- 
- stubs.lo: stubs.s
--	$(CC) -c ./stubs.s -o stubs.lo
-+	$(LIBTOOL) $(CC) -c ./stubs.s -o stubs.o
diff --git a/multimedia/avifile/patches/patch-aq b/multimedia/avifile/patches/patch-aq
deleted file mode 100644
index b0aeb966dc4..00000000000
--- a/multimedia/avifile/patches/patch-aq
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aq,v 1.1.1.1 2004/01/26 15:11:49 jmmv Exp $
-
---- lib/videocodec/Makefile.am.orig	Wed Jan 10 18:00:05 2001
-+++ lib/videocodec/Makefile.am
-@@ -5,6 +5,6 @@
- libvideocodec_la_LIBADD=codeckeeper.lo
- CXXFLAGS=-I../../include
- codeckeeper.lo: codeckeeper.cpp
--	$(CXX) $(CXXFLAGS) $(DEFINES) -O0 -fPIC -c codeckeeper.cpp -o codeckeeper.lo
-+	$(LIBTOOL) --mode=compile $(CXX) $(CXXFLAGS) $(DEFINES) -O0 -c codeckeeper.cpp -o codeckeeper.o
- 
- LIBS=
diff --git a/multimedia/avifile/patches/patch-ar b/multimedia/avifile/patches/patch-ar
deleted file mode 100644
index d22dcbdde29..00000000000
--- a/multimedia/avifile/patches/patch-ar
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ar,v 1.1.1.1 2004/01/26 15:11:49 jmmv Exp $
-
---- lib/loader/Makefile.in.orig	Wed Jan 23 16:35:05 2002
-+++ lib/loader/Makefile.in
-@@ -1,6 +1,6 @@
--# Makefile.in generated automatically by automake 1.4 from Makefile.am
-+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
- 
--# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -332,7 +332,7 @@
- 	@for file in $(DISTFILES); do \
- 	  d=$(srcdir); \
- 	  if test -d $$d/$$file; then \
--	    cp -pr $$/$$file $(distdir)/$$file; \
-+	    cp -pr $$d/$$file $(distdir)/$$file; \
- 	  else \
- 	    test -f $(distdir)/$$file \
- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-@@ -449,7 +449,7 @@
- 
- 
- stubs.lo: stubs.s
--	$(CC) -c ./stubs.s -o stubs.lo
-+	$(LIBTOOL) $(CC) -c ./stubs.s -o stubs.o
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/multimedia/avifile/patches/patch-as b/multimedia/avifile/patches/patch-as
deleted file mode 100644
index bddc30fbe60..00000000000
--- a/multimedia/avifile/patches/patch-as
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-as,v 1.1.1.1 2004/01/26 15:11:49 jmmv Exp $
-
---- lib/videocodec/Makefile.in.orig	Wed Jan 23 16:35:05 2002
-+++ lib/videocodec/Makefile.in
-@@ -1,6 +1,6 @@
--# Makefile.in generated automatically by automake 1.4 from Makefile.am
-+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
- 
--# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -328,7 +328,7 @@
- 	dot_seen=no; \
- 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
- 	  rev="$$subdir $$rev"; \
--	  test "$$subdir" = "." && dot_seen=yes; \
-+	  test "$$subdir" != "." || dot_seen=yes; \
- 	done; \
- 	test "$$dot_seen" = "no" && rev=". $$rev"; \
- 	target=`echo $@ | sed s/-recursive//`; \
-@@ -394,7 +394,7 @@
- 	@for file in $(DISTFILES); do \
- 	  d=$(srcdir); \
- 	  if test -d $$d/$$file; then \
--	    cp -pr $$/$$file $(distdir)/$$file; \
-+	    cp -pr $$d/$$file $(distdir)/$$file; \
- 	  else \
- 	    test -f $(distdir)/$$file \
- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-@@ -545,7 +545,7 @@
- mostlyclean distclean maintainer-clean
- 
- codeckeeper.lo: codeckeeper.cpp
--	$(CXX) $(CXXFLAGS) $(DEFINES) -O0 -fPIC -c codeckeeper.cpp -o codeckeeper.lo
-+	$(LIBTOOL) --mode=compile $(CXX) $(CXXFLAGS) $(DEFINES) -O0 -c codeckeeper.cpp -o codeckeeper.o
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.