avifile and avifile-devel moved to the multimedia category.

34 files changed, 1 insertions, 744 deletions

diff --git a/graphics/Makefile b/graphics/Makefile
index a6f310b1b49..67ad079885f 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.283 2004/01/26 14:54:05 jmmv Exp $
+# $NetBSD: Makefile,v 1.284 2004/01/26 15:15:35 jmmv Exp $
 #
 
 COMMENT=	Graphics tools and libraries
@@ -29,8 +29,6 @@ SUBDIR+=	autotrace
 SUBDIR+=	avi-xmms
 SUBDIR+=	aview
 SUBDIR+=	aview-x11
-SUBDIR+=	avifile
-SUBDIR+=	avifile-devel
 SUBDIR+=	barcode
 SUBDIR+=	bktr2jpeg
 SUBDIR+=	blender
diff --git a/graphics/avifile-devel/DESCR b/graphics/avifile-devel/DESCR
deleted file mode 100644
index 09ed2e9a3df..00000000000
--- a/graphics/avifile-devel/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/graphics/avifile-devel/Makefile b/graphics/avifile-devel/Makefile
deleted file mode 100644
index 2e103d732ce..00000000000
--- a/graphics/avifile-devel/Makefile
+++ /dev/null
@@ -1,75 +0,0 @@
-# $NetBSD: Makefile,v 1.39 2004/01/26 12:31:03 jmmv Exp $
-#
-
-DISTNAME=	avifile-0.6.20010814
-PKGREVISION=	4
-CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-EXTRACT_SUFX=	.tar.bz2
-
-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
-
-NO_SRC_ON_FTP=		"Already in MASTER_SITE_LOCAL"
-
-BUILD_USES_GETTEXT_M4=	YES
-
-WRKSRC=			${WRKDIR}/avifile-0.6
-AUTOMAKE_REQD=		1.4
-USE_BUILDLINK2=		YES
-USE_X11=		YES
-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-dpms
-
-# ffmpeg codec *partially* works, but is incredibly slow so we don't want
-# to use it
-CONFIGURE_ARGS+=	--disable-ffmpeg
-
-CXXFLAGS+=		-L${LOCALBASE}/lib -I${LOCALBASE}/include
-
-.include "../../mk/bsd.prefs.mk"
-
-AVIFILE_USE_QT?=	NO
-
-.if defined (AVIFILE_USE_QT) && ${AVIFILE_USE_QT} == "YES"
-#
-# it would be more logical to set PLIST_SRC to PLIST first and then add
-# PLIST.qt to it, but @dirrm lib/avifile-0.6 will fail while processing
-# pkg/PLIST, because the directory still contains files (they are listed in
-# PLIST.qt) and isn't empty, thus can't be removed
-#
-PLIST_SRC=		${PKGDIR}/PLIST.qt
-PLIST_SRC+=		${PKGDIR}/PLIST
-
-CXXFLAGS+=		-Wl,${RPATH_FLAG}${QTDIR}/lib
-CXXFLAGS+=		-Wl,${RPATH_FLAG}${LOCALBASE}/lib
-CXXFLAGS+=		-Wl,${RPATH_FLAG}${X11BASE}/lib
-FIX_RPATH+=		CXXFLAGS
-
-CONFIGURE_ARGS+=	--enable-qt
-CONFIGURE_ARGS+=	--with-qt-dir="${QTDIR}"
-
-.  include "../../x11/qt2-designer/buildlink2.mk"
-.endif
-
-pre-configure:
-	cd ${WRKSRC} && libtoolize --force --copy
-	cd ${WRKSRC} && ${ACLOCAL}
-	cd ${WRKSRC} && ${AUTOHEADER}
-	cd ${WRKSRC} && ${AUTOCONF}
-	cd ${WRKSRC} && ${AUTOMAKE} --add-missing --copy --foreign
-
-.include "../../devel/SDL/buildlink2.mk"
-.include "../../mk/automake.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/avifile-devel/PLIST b/graphics/avifile-devel/PLIST
deleted file mode 100644
index fe4a0141ce3..00000000000
--- a/graphics/avifile-devel/PLIST
+++ /dev/null
@@ -1,72 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:50:19 zuntum Exp $
-bin/avifile-config
-include/avifile/Locker.h
-include/avifile/ReadHandlers.h
-include/avifile/StreamInfo.h
-include/avifile/VideoDPMS.h
-include/avifile/audiodecoder.h
-include/avifile/audioencoder.h
-include/avifile/avifile.h
-include/avifile/avifmt.h
-include/avifile/aviplay.h
-include/avifile/com.h
-include/avifile/config.h
-include/avifile/configfile.h
-include/avifile/cpuinfo.h
-include/avifile/creators.h
-include/avifile/default.h
-include/avifile/except.h
-include/avifile/formats.h
-include/avifile/fourcc.h
-include/avifile/image.h
-include/avifile/infotypes.h
-include/avifile/mmx.h
-include/avifile/playerwidget.h
-include/avifile/plugin.h
-include/avifile/registry.h
-include/avifile/renderer.h
-include/avifile/subtitle.h
-include/avifile/utils.h
-include/avifile/version.h
-include/avifile/videodecoder.h
-include/avifile/videoencoder.h
-lib/avifile-0.6/libaudiodec-0.6.so
-lib/avifile-0.6/libaudiodec-0.6.so.2
-lib/avifile-0.6/libaudiodec-0.6.so.2.0
-lib/avifile-0.6/libaudiodec.a
-lib/avifile-0.6/libaudiodec.la
-lib/avifile-0.6/libaudiodec.so
-lib/avifile-0.6/libmp3lame_audioenc-0.6.so
-lib/avifile-0.6/libmp3lame_audioenc-0.6.so.2
-lib/avifile-0.6/libmp3lame_audioenc-0.6.so.2.0
-lib/avifile-0.6/libmp3lame_audioenc.a
-lib/avifile-0.6/libmp3lame_audioenc.la
-lib/avifile-0.6/libmp3lame_audioenc.so
-lib/avifile-0.6/libmpeg_audiodec-0.6.so
-lib/avifile-0.6/libmpeg_audiodec-0.6.so.2
-lib/avifile-0.6/libmpeg_audiodec-0.6.so.2.0
-lib/avifile-0.6/libmpeg_audiodec.a
-lib/avifile-0.6/libmpeg_audiodec.la
-lib/avifile-0.6/libmpeg_audiodec.so
-lib/avifile-0.6/libwin32-0.6.so
-lib/avifile-0.6/libwin32-0.6.so.2
-lib/avifile-0.6/libwin32-0.6.so.2.0
-lib/avifile-0.6/libwin32.a
-lib/avifile-0.6/libwin32.la
-lib/avifile-0.6/libwin32.so
-lib/libaviplay-0.6.so
-lib/libaviplay-0.6.so.2
-lib/libaviplay-0.6.so.2.0
-lib/libaviplay.a
-lib/libaviplay.la
-lib/libaviplay.so
-share/avifile-0.6/about.ppm
-share/avifile-0.6/mute.ppm
-share/avifile-0.6/open.ppm
-share/avifile-0.6/pause.ppm
-share/avifile-0.6/play.ppm
-share/avifile-0.6/stop.ppm
-share/avifile-0.6/test.png
-@dirrm share/avifile-0.6
-@dirrm lib/avifile-0.6
-@dirrm include/avifile
diff --git a/graphics/avifile-devel/PLIST.qt b/graphics/avifile-devel/PLIST.qt
deleted file mode 100644
index a5692ed658e..00000000000
--- a/graphics/avifile-devel/PLIST.qt
+++ /dev/null
@@ -1,13 +0,0 @@
-@comment $NetBSD: PLIST.qt,v 1.1 2001/10/31 23:57:10 zuntum Exp $
-bin/avibench
-bin/avicat
-bin/avimake
-bin/aviplay
-bin/avirecompress
-bin/avitype
-lib/avifile-0.6/libmjpeg-0.6.so
-lib/avifile-0.6/libmjpeg-0.6.so.2
-lib/avifile-0.6/libmjpeg-0.6.so.2.0
-lib/avifile-0.6/libmjpeg.a
-lib/avifile-0.6/libmjpeg.la
-lib/avifile-0.6/libmjpeg.so
diff --git a/graphics/avifile-devel/buildlink2.mk b/graphics/avifile-devel/buildlink2.mk
deleted file mode 100644
index 1118942baed..00000000000
--- a/graphics/avifile-devel/buildlink2.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.6 2003/07/26 21:41:25 jmmv Exp $
-
-.if !defined(AVIFILE_BUILDLINK2_MK)
-AVIFILE_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=		avifile
-BUILDLINK_DEPENDS.avifile?=	avifile>=0.6.20010814nb4
-BUILDLINK_PKGSRCDIR.avifile?=	../../graphics/avifile-devel
-
-EVAL_PREFIX+=			BUILDLINK_PREFIX.avifile=avifile
-BUILDLINK_PREFIX.avifile_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.avifile=	lib/libaviplay.*
-BUILDLINK_FILES.avifile+=	lib/avifile-0.6/*
-BUILDLINK_FILES.avifile+=	include/avifile/*
-BUILDLINK_FILES.avifile+=	include/avifile/wine/*
-
-BUILDLINK_TARGETS+=	avifile-buildlink
-
-avifile-buildlink: _BUILDLINK_USE
-
-.endif	# AVIFILE_BUILDLINK2_MK
diff --git a/graphics/avifile-devel/distinfo b/graphics/avifile-devel/distinfo
deleted file mode 100644
index 0c86dd79903..00000000000
--- a/graphics/avifile-devel/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.13 2003/02/13 16:31:25 fredb Exp $
-
-SHA1 (avifile-0.6.20010814.tar.bz2) = 695227679dd09e9b9d1fb71caf58a9d92204b262
-Size (avifile-0.6.20010814.tar.bz2) = 1067753 bytes
-SHA1 (patch-aa) = b7da74c557f6107d160a06d8215de28fcb8d065a
-SHA1 (patch-ab) = 3cdeb5e5d3c692e00e1b2da72e859b48989eb7f2
-SHA1 (patch-ac) = 82f089b95d1328c5980cb2d543f2eaef41b9862b
diff --git a/graphics/avifile-devel/patches/patch-aa b/graphics/avifile-devel/patches/patch-aa
deleted file mode 100644
index 5c41584bfdd..00000000000
--- a/graphics/avifile-devel/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2002/10/09 13:05:03 wiz Exp $
-
---- player/main.cpp.orig	Thu Aug  9 18:50:55 2001
-+++ player/main.cpp
-@@ -15,7 +15,7 @@ Copyright 2000 Eugene Kuznetsov  (divx@e
- #include <floatingpoint.h>
- #endif
- #ifdef __NetBSD__
--#include <machine/ieeefp.h>
-+#include <ieeefp.h>
- #endif
- 
- #include <iostream>
diff --git a/graphics/avifile-devel/patches/patch-ab b/graphics/avifile-devel/patches/patch-ab
deleted file mode 100644
index d9200659639..00000000000
--- a/graphics/avifile-devel/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2002/10/09 13:05:03 wiz Exp $
-
---- samples/qtrecompress/main.cpp.orig	Fri Aug 10 02:32:19 2001
-+++ samples/qtrecompress/main.cpp
-@@ -6,7 +6,7 @@
- #include <floatingpoint.h>
- #endif
- #ifdef __NetBSD__
--#include <machine/ieeefp.h>
-+#include <ieeefp.h>
- #endif
- 
- #include <iostream>
diff --git a/graphics/avifile-devel/patches/patch-ac b/graphics/avifile-devel/patches/patch-ac
deleted file mode 100644
index ac28af17649..00000000000
--- a/graphics/avifile-devel/patches/patch-ac
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2003/02/13 16:31:25 fredb Exp $
-
---- avifile-config.in.orig	Tue Aug 14 14:51:13 2001
-+++ avifile-config.in
-@@ -99,7 +99,12 @@ else
- fi
- 
- if test "$lib_dir" != "/usr/lib"; then
--    libs="-L$lib_dir @AVIFILE_RLD_FLAGS@ -laviplay"
-+    if test -n "@DGA_LDADD@@VM_LDADD@@XV_LDADD@"; then
-+	X_LDFLAGS="@X_LDFLAGS@"
-+	libs="-L$lib_dir @AVIFILE_RLD_FLAGS@ -laviplay $X_LDFLAGS ${X_LDFLAGS:+-Wl,-rpath,}${X_LDFLAGS#*-L} @DGA_LDADD@ @VM_LDADD@ @XV_LDADD@"
-+    else
-+	libs="-L$lib_dir @AVIFILE_RLD_FLAGS@ -laviplay"
-+    fi
- else
-     libs="@AVIFILE_RLD_FLAGS@ -laviplay"
- fi
diff --git a/graphics/avifile/DESCR b/graphics/avifile/DESCR
deleted file mode 100644
index 09ed2e9a3df..00000000000
--- a/graphics/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/graphics/avifile/MESSAGE b/graphics/avifile/MESSAGE
deleted file mode 100644
index 5c48baa9ac5..00000000000
--- a/graphics/avifile/MESSAGE
+++ /dev/null
@@ -1,9 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.3 2002/09/24 12:30:05 wiz Exp $
-
-This package requires a kernel built with
-the directive:
-
-options USER_LDT
-
-===========================================================================
diff --git a/graphics/avifile/Makefile b/graphics/avifile/Makefile
deleted file mode 100644
index 237e8634b31..00000000000
--- a/graphics/avifile/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.21 2004/01/26 12:31:03 jmmv Exp $
-
-DISTNAME=	avifile-0.53.5
-PKGREVISION=	2
-CATEGORIES=	graphics
-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_BUILDLINK2=		YES
-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/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/avifile/PLIST b/graphics/avifile/PLIST
deleted file mode 100644
index 6e207188a55..00000000000
--- a/graphics/avifile/PLIST
+++ /dev/null
@@ -1,60 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:50:17 zuntum 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.a
-lib/libaviplay.la
-lib/libaviplay.so
-lib/libaviplay.so.0
-lib/libaviplay.so.0.0
-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/graphics/avifile/buildlink2.mk b/graphics/avifile/buildlink2.mk
deleted file mode 100644
index 7e8f305fb9b..00000000000
--- a/graphics/avifile/buildlink2.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/07/26 21:41:25 jmmv Exp $
-
-.if !defined(AVIFILE_BUILDLINK2_MK)
-AVIFILE_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=		avifile
-BUILDLINK_DEPENDS.avifile?=	avifile>=0.53.5nb2
-BUILDLINK_PKGSRCDIR.avifile?=	../../graphics/avifile
-
-EVAL_PREFIX+=			BUILDLINK_PREFIX.avifile=avifile
-BUILDLINK_PREFIX.avifile_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.avifile=	lib/libaviplay.*
-BUILDLINK_FILES.avifile+=	include/avifile/*
-BUILDLINK_FILES.avifile+=	include/avifile/wine/*
-
-BUILDLINK_TARGETS+=	avifile-buildlink
-
-avifile-buildlink: _BUILDLINK_USE
-
-.endif	# AVIFILE_BUILDLINK2_MK
diff --git a/graphics/avifile/distinfo b/graphics/avifile/distinfo
deleted file mode 100644
index 6a26dec451c..00000000000
--- a/graphics/avifile/distinfo
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: distinfo,v 1.4 2002/01/23 16:52:10 skrll Exp $
-
-SHA1 (avifile-0.53.5.tar.gz) = bc9d27c65ab4f8df9006c6037d539ff71adb0ad7
-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) = 8c9ffd2dc38ed38058102afa0af13258f89415d4
-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/graphics/avifile/patches/patch-aa b/graphics/avifile/patches/patch-aa
deleted file mode 100644
index 3863fb1aaf0..00000000000
--- a/graphics/avifile/patches/patch-aa
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2001/04/18 15:57:26 zuntum 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/graphics/avifile/patches/patch-ab b/graphics/avifile/patches/patch-ab
deleted file mode 100644
index f9dc9bd9c13..00000000000
--- a/graphics/avifile/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/04/12 21:26:21 zuntum 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/graphics/avifile/patches/patch-ac b/graphics/avifile/patches/patch-ac
deleted file mode 100644
index bac1bc5cfd9..00000000000
--- a/graphics/avifile/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/04/12 21:26:21 zuntum 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/graphics/avifile/patches/patch-ad b/graphics/avifile/patches/patch-ad
deleted file mode 100644
index 7f4ea92d0f6..00000000000
--- a/graphics/avifile/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/04/12 21:26:21 zuntum 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/graphics/avifile/patches/patch-ae b/graphics/avifile/patches/patch-ae
deleted file mode 100644
index 445e4c90012..00000000000
--- a/graphics/avifile/patches/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2001/04/12 21:26:21 zuntum 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/graphics/avifile/patches/patch-af b/graphics/avifile/patches/patch-af
deleted file mode 100644
index 30510cd4ccc..00000000000
--- a/graphics/avifile/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2001/04/12 21:26:21 zuntum 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/graphics/avifile/patches/patch-ag b/graphics/avifile/patches/patch-ag
deleted file mode 100644
index 7889be9696f..00000000000
--- a/graphics/avifile/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2001/04/12 21:26:21 zuntum 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/graphics/avifile/patches/patch-ai b/graphics/avifile/patches/patch-ai
deleted file mode 100644
index 5bb22d944a7..00000000000
--- a/graphics/avifile/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 2001/04/12 21:26:21 zuntum 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/graphics/avifile/patches/patch-aj b/graphics/avifile/patches/patch-aj
deleted file mode 100644
index 94ad7c3075b..00000000000
--- a/graphics/avifile/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1.1.1 2001/04/12 21:26:21 zuntum 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/graphics/avifile/patches/patch-ak b/graphics/avifile/patches/patch-ak
deleted file mode 100644
index 8367fa23f31..00000000000
--- a/graphics/avifile/patches/patch-ak
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ak,v 1.1.1.1 2001/04/12 21:26:21 zuntum 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/graphics/avifile/patches/patch-al b/graphics/avifile/patches/patch-al
deleted file mode 100644
index 487a8f73ff2..00000000000
--- a/graphics/avifile/patches/patch-al
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-al,v 1.1.1.1 2001/04/12 21:26:21 zuntum 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/graphics/avifile/patches/patch-am b/graphics/avifile/patches/patch-am
deleted file mode 100644
index c77ae2af968..00000000000
--- a/graphics/avifile/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.1.1.1 2001/04/12 21:26:21 zuntum Exp $
-
---- lib/loader/win32.c.orig	Wed Jan 31 21:23:25 2001
-+++ lib/loader/win32.c
-@@ -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;
diff --git a/graphics/avifile/patches/patch-an b/graphics/avifile/patches/patch-an
deleted file mode 100644
index 2080d33f656..00000000000
--- a/graphics/avifile/patches/patch-an
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-an,v 1.1.1.1 2001/04/12 21:26:21 zuntum 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/graphics/avifile/patches/patch-ao b/graphics/avifile/patches/patch-ao
deleted file mode 100644
index 7e5b610908b..00000000000
--- a/graphics/avifile/patches/patch-ao
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ao,v 1.1.1.1 2001/04/12 21:26:21 zuntum 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/graphics/avifile/patches/patch-ap b/graphics/avifile/patches/patch-ap
deleted file mode 100644
index 4fa8e290456..00000000000
--- a/graphics/avifile/patches/patch-ap
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ap,v 1.2 2002/01/23 16:52:10 skrll 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/graphics/avifile/patches/patch-aq b/graphics/avifile/patches/patch-aq
deleted file mode 100644
index 20d21070dfa..00000000000
--- a/graphics/avifile/patches/patch-aq
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aq,v 1.2 2002/01/23 16:52:10 skrll 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/graphics/avifile/patches/patch-ar b/graphics/avifile/patches/patch-ar
deleted file mode 100644
index 82013dc07a5..00000000000
--- a/graphics/avifile/patches/patch-ar
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2002/01/23 16:52:10 skrll 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/graphics/avifile/patches/patch-as b/graphics/avifile/patches/patch-as
deleted file mode 100644
index 2978d75100b..00000000000
--- a/graphics/avifile/patches/patch-as
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-as,v 1.1 2002/01/23 16:52:10 skrll 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.