Backport a change from 1.5.22 to 1.5.18 that fixes some issues withtv_libtool_1_5_18_tmpdirfix

temp dir creation when using relink-based finalization.
author: tv <tv> 2006-01-31 20:19:02 +0000
committer: tv <tv> 2006-01-31 20:19:02 +0000
commit: 1bf85a33a7f0af352174332dac11865971217df5 (patch)
tree: ac38b597af8194f97ef08d4fd0ea67ec8fae54d6 /multimedia
parent: fb412398b2a8cd982d1920218452cdaea52847a6 (diff)
download: pkgsrc-1bf85a33a7f0af352174332dac11865971217df5.tar.gz
666 files changed, 0 insertions, 21086 deletions
diff --git a/multimedia/Makefile b/multimedia/Makefile
deleted file mode 100644
index a772bc8add1..00000000000
--- a/multimedia/Makefile
+++ /dev/null
@@ -1,94 +0,0 @@
-# $NetBSD: Makefile,v 1.78 2005/11/04 04:56:11 minskim Exp $
-#
-
-COMMENT=	Multimedia utilities
-
-SUBDIR+=	RealPlayerGold
-SUBDIR+=	acidrip
-SUBDIR+=	alevt
-SUBDIR+=	avidemux
-SUBDIR+=	dirac
-SUBDIR+=	divxplayer
-SUBDIR+=	dumpmpeg
-SUBDIR+=	dvdauthor
-SUBDIR+=	dvdrip
-SUBDIR+=	ffmpeg
-SUBDIR+=	flashplayer
-SUBDIR+=	fxtv
-SUBDIR+=	gmencoder
-SUBDIR+=	gmplayer
-SUBDIR+=	gnome2-media
-SUBDIR+=	gopchop
-SUBDIR+=	gst-plugins
-SUBDIR+=	gst-plugins-dvdnav
-SUBDIR+=	gst-plugins-dvdread
-SUBDIR+=	gst-plugins-mpeg2dec
-SUBDIR+=	gst-plugins-ogg
-SUBDIR+=	gst-plugins-theora
-SUBDIR+=	gst-plugins-xvid
-SUBDIR+=	gstreamer
-SUBDIR+=	gxine
-SUBDIR+=	kdemultimedia3
-SUBDIR+=	kmplayer
-SUBDIR+=	libassetml
-SUBDIR+=	libdv
-SUBDIR+=	libdv-tools
-SUBDIR+=	libdvbpsi
-SUBDIR+=	libdvdcss
-SUBDIR+=	libdvdnav
-SUBDIR+=	libdvdplay
-SUBDIR+=	libdvdread
-SUBDIR+=	libflash
-SUBDIR+=	libmatroska
-SUBDIR+=	libmpeg2
-SUBDIR+=	libmpeg3
-SUBDIR+=	libogg
-SUBDIR+=	libtheora
-SUBDIR+=	lsdvd
-SUBDIR+=	mencoder
-SUBDIR+=	ming
-SUBDIR+=	mjpegtools
-SUBDIR+=	mkvtoolnix
-SUBDIR+=	mmg
-SUBDIR+=	moz-bin-flash
-SUBDIR+=	moz-flash
-SUBDIR+=	mpeg-lib
-SUBDIR+=	mpeg_encode
-SUBDIR+=	mpeg_play
-SUBDIR+=	mplayer
-SUBDIR+=	mplayer-plugin-firefox
-SUBDIR+=	mplayer-plugin-firefox-gtk1
-SUBDIR+=	mplayer-plugin-mozilla
-SUBDIR+=	mplayer-plugin-mozilla-gtk2
-SUBDIR+=	mplayer-share
-SUBDIR+=	mplex
-SUBDIR+=	ns-flash
-SUBDIR+=	ogle
-SUBDIR+=	ogle_gui
-SUBDIR+=	ogmtools
-SUBDIR+=	openquicktime
-SUBDIR+=	p5-xmltv
-SUBDIR+=	php-ming
-SUBDIR+=	py-ming
-SUBDIR+=	realplayer-codecs
-SUBDIR+=	regionset
-SUBDIR+=	ruby-ming
-SUBDIR+=	smpeg
-SUBDIR+=	smpeg-xmms
-SUBDIR+=	swfdec
-SUBDIR+=	swfdec-gtk2
-SUBDIR+=	totem
-SUBDIR+=	totem-xine
-SUBDIR+=	transcode
-SUBDIR+=	vlc
-SUBDIR+=	vls
-SUBDIR+=	win32-codecs
-SUBDIR+=	xanim
-SUBDIR+=	xawtv
-SUBDIR+=	xfmedia
-SUBDIR+=	xine-lib
-SUBDIR+=	xine-ui
-SUBDIR+=	xvid4conf
-SUBDIR+=	xvidcore
-
-.include "../mk/bsd.pkg.subdir.mk"
diff --git a/multimedia/RealPlayerGold/DESCR b/multimedia/RealPlayerGold/DESCR
deleted file mode 100644
index c3b3931908c..00000000000
--- a/multimedia/RealPlayerGold/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-  RealPlayer for Unix allows you to play streaming audio and video over the
-Internet in real-time.  RealPlayerGold supports RealAudio, RealVideo 10,
-MP3, Ogg Vorbis and Theora, H263, AAC, and more.  Other features include
-a Mozilla compatible plugin, a themeable GTK2 user interface, accelerated
-video, and full screen playback.
diff --git a/multimedia/RealPlayerGold/Makefile b/multimedia/RealPlayerGold/Makefile
deleted file mode 100644
index 34cf8e45a9c..00000000000
--- a/multimedia/RealPlayerGold/Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2005/10/04 15:28:25 rpaulo Exp $
-#
-
-DISTNAME=		RealPlayer10GOLD
-PKGNAME=		RealPlayerGold-10.0.6
-CATEGORIES=		multimedia
-MASTER_SITES=		http://forms.real.com/real/player/download.html?f=unix/
-EXTRACT_SUFX=		.rpm
-
-MAINTAINER=		tech-pkg@NetBSD.org
-HOMEPAGE=		http://www.real.com/linux/
-COMMENT=		Real Audio and Video Player
-
-RPMFILES=		${DISTNAME}${EXTRACT_SUFX}
-RPM2PKGARGS=		-d ${PREFIX} -f ${PLIST_SRC} -p ${REALPLAYER_SUBDIR} -s3
-RPM2PKGSTRIP=		3
-EXTRACT_ONLY=		# empty
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-DIST_SUBDIR=		${PKGNAME_NOREV}
-
-.include "../../emulators/suse_linux/Makefile.application"
-
-.if ${OPSYS} != "Linux"
-DEPENDS+=		suse_base>=9.1:../../emulators/suse91_base
-DEPENDS+=		suse_fontconfig>=9.1:../../emulators/suse91_fontconfig
-DEPENDS+=		suse_freetype2>=9.1:../../emulators/suse91_freetype2
-DEPENDS+=		suse_x11>=9.1:../../emulators/suse91_x11
-DEPENDS+=		suse_gtk2>=9.1:../../emulators/suse91_gtk2
-.endif
-
-REALPLAYER_SUBDIR=	lib
-REALPLAYER_HOME=	${PREFIX}/${REALPLAYER_SUBDIR}/RealPlayer
-
-RESTRICTED=		"Redistribution not permitted"
-NO_SRC_ON_FTP=		${RESTRICTED}
-NO_SRC_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_FTP=		${RESTRICTED}
-NO_BIN_ON_CDROM=	${RESTRICTED}
-
-ONLY_FOR_PLATFORM=	*-*-i386
-
-.include "../../mk/x11.buildlink3.mk"
-
-do-build:
-	${SED} -e 's|@REALPLAYER_HOME@|${REALPLAYER_HOME}|g'		\
-		${FILESDIR}/realplay.sh > ${WRKDIR}/realplayergold
-
-post-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/realplayergold ${PREFIX}/bin
-	${ECHO} bin/realplayergold >> ${PLIST_SRC}
-	${SED} -e 's|/bin/true|${TRUE}|g' < ${REALPLAYER_HOME}/realplay	\
-		> ${WRKDIR}/realplay
-	${INSTALL_SCRIPT} ${WRKDIR}/realplay ${REALPLAYER_HOME}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/RealPlayerGold/distinfo b/multimedia/RealPlayerGold/distinfo
deleted file mode 100644
index 914556e9ceb..00000000000
--- a/multimedia/RealPlayerGold/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/10/04 15:28:25 rpaulo Exp $
-
-SHA1 (RealPlayerGold-10.0.6/RealPlayer10GOLD.rpm) = d3db703699894d501f37dd02e1df472e0c0b6fc6
-RMD160 (RealPlayerGold-10.0.6/RealPlayer10GOLD.rpm) = 1fd538288ffc43208f3303473c6c0ec091bfeaf6
-Size (RealPlayerGold-10.0.6/RealPlayer10GOLD.rpm) = 6643315 bytes
diff --git a/multimedia/RealPlayerGold/files/realplay.sh b/multimedia/RealPlayerGold/files/realplay.sh
deleted file mode 100644
index 2adf6ffe9c0..00000000000
--- a/multimedia/RealPlayerGold/files/realplay.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-#
-#	$NetBSD: realplay.sh,v 1.1.1.1 2004/11/20 12:45:40 rh Exp $
-#
-HELIX_LIBS=@REALPLAYER_HOME@ ; export HELIX_LIBS
-LD_LIBRARY_PATH=${HELIX_LIBS}/lib:${HELIX_LIBS}/plugins:${HELIX_LIBS}:${LD_LIBRARY_PATH} ; export LD_LIBRARY_PATH
-exec ${HELIX_LIBS}/realplay "$@"
diff --git a/multimedia/acidrip/DESCR b/multimedia/acidrip/DESCR
deleted file mode 100644
index d72b2f9e01e..00000000000
--- a/multimedia/acidrip/DESCR
+++ /dev/null
@@ -1,13 +0,0 @@
-AcidRip is a Gtk2::Perl application for ripping and encoding DVD's. It
-neatly wraps MPlayer and MEncoder, which I think is pretty handy, seeing
-as MPlayer is by far the best bit of video playing kit around for *nix.
-As well as creating a simple Graphical Interface for those scared of
-getting down and dirty with MEncoders command line interface, It also
-automates the process in a number of ways:
-
-    * Parses DVD into contents tree
-    * Finds longest title
-    * Calculate video bitrate for given filesize
-    * Finds black bands and crops them
-    * Gives suggestions for improved performance
-    * Other stuff!
diff --git a/multimedia/acidrip/Makefile b/multimedia/acidrip/Makefile
deleted file mode 100644
index 5d52fb89ebf..00000000000
--- a/multimedia/acidrip/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2005/08/06 06:19:24 jlam Exp $
-#
-
-DISTNAME=	acidrip-0.14
-PKGREVISION=	2
-CATEGORIES=	multimedia
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=acidrip/}
-
-MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://untrepid.com/acidrip/
-COMMENT=	Gtk2::Perl application for ripping and encoding DVDs
-
-DEPENDS+=	lsdvd-[0-9]*:../../multimedia/lsdvd
-DEPENDS+=	mencoder-[0-9]*:../../multimedia/mencoder
-DEPENDS+=	mplayer-[0-9]*:../../multimedia/mplayer
-DEPENDS+=	p5-gtk2>=1.040:../../x11/p5-gtk2
-
-PERL5_PACKLIST= auto/AcidRip/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/acidrip/PLIST b/multimedia/acidrip/PLIST
deleted file mode 100644
index d8550199763..00000000000
--- a/multimedia/acidrip/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/04/20 22:58:57 xtraeme Exp $
diff --git a/multimedia/acidrip/distinfo b/multimedia/acidrip/distinfo
deleted file mode 100644
index 67514a8d891..00000000000
--- a/multimedia/acidrip/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 11:24:02 agc Exp $
-
-SHA1 (acidrip-0.14.tar.gz) = 5873c835c0d52edc2c1a799e9751980b6c7cc4f1
-RMD160 (acidrip-0.14.tar.gz) = 14d0f5969fdc5f0c6777e4bfdd38628d0c747608
-Size (acidrip-0.14.tar.gz) = 92086 bytes
diff --git a/multimedia/alevt/DESCR b/multimedia/alevt/DESCR
deleted file mode 100644
index 0ae1a255504..00000000000
--- a/multimedia/alevt/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-AleVT is a teletext/videotext decoder and browser for the bttv driver
-(/dev/vbi) and X11.  It features multiple windows, a page cache,
-regexp searching, built-in manual, and more.  There's also a program
-to get the time from teletext and one to capture teletext pages from
-scripts.
diff --git a/multimedia/alevt/Makefile b/multimedia/alevt/Makefile
deleted file mode 100644
index 7b0c05cc45b..00000000000
--- a/multimedia/alevt/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2005/06/01 18:03:06 jlam Exp $
-
-DISTNAME=	alevt-1.6.0
-PKGREVISION=	2
-CATEGORIES=	multimedia
-MASTER_SITES=	${MASTER_SITE_SUNSITE:=apps/video/}
-
-MAINTAINER=	magick@bundy.zhadum.de
-HOMEPAGE=	http://user.exit.de/froese/
-COMMENT=	Teletext decoder and browser for Brooktree 848 compatible TV cards
-
-DEPENDS+=	fxtv>=1.02:../../multimedia/fxtv
-
-ONLY_FOR_PLATFORM=	NetBSD-1.4[Y-Z]-* NetBSD-1.4Z[A-Z]-* \
-			NetBSD-1.5_ALPHA-* NetBSD-1.[56]*-* \
-			NetBSD-[2-9]*-*
-
-USE_DIRS+=	xdg-1.1
-USE_X11BASE=	YES
-USE_TOOLS+=	gmake
-
-pre-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
-
-.include "../../graphics/png/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/alevt/PLIST b/multimedia/alevt/PLIST
deleted file mode 100644
index 94281eb0107..00000000000
--- a/multimedia/alevt/PLIST
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/01/26 11:38:02 jmmv Exp $
-bin/alevt
-bin/alevt-date
-bin/alevt-cap
-man/man1/alevt.1x
-man/man1/alevt-cap.1
-man/man1/alevt-date.1
-share/pixmaps/mini-alevt.xpm
diff --git a/multimedia/alevt/distinfo b/multimedia/alevt/distinfo
deleted file mode 100644
index 7d74d4ec4fe..00000000000
--- a/multimedia/alevt/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 11:24:02 agc Exp $
-
-SHA1 (alevt-1.6.0.tar.gz) = ac7d71e738e77fc485c59221171011673e239bbe
-RMD160 (alevt-1.6.0.tar.gz) = 33c30480c2e148642d653153662715da370ae76e
-Size (alevt-1.6.0.tar.gz) = 116646 bytes
-SHA1 (patch-aa) = 86e57806c89cdcf55be6125c0c3af6c136c76022
diff --git a/multimedia/alevt/patches/patch-aa b/multimedia/alevt/patches/patch-aa
deleted file mode 100644
index 744f1304b06..00000000000
--- a/multimedia/alevt/patches/patch-aa
+++ /dev/null
@@ -1,70 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/01/26 11:38:02 jmmv Exp $
-
---- Makefile.orig	Wed Oct 11 20:08:29 2000
-+++ Makefile	Wed Nov  1 15:56:37 2000
-@@ -6,7 +6,7 @@
- # a smaller and thinner font
- #FONT=neep9
- 
--CFLAGS=$(OPT) -DVERSION=\"$(VER)\" $(DEFS) -I/usr/X11R6/include -I/usr/local/include -W
-+CFLAGS=$(OPT) -DVERSION=\"$(VER)\" $(DEFS) -I$(LOCALBASE)/include -I$(X11BASE)/include -I/usr/local/include -W
- 
- EXPOBJS=export.o exp-txt.o exp-html.o exp-gfx.o font.o
- OBJS=main.o ui.o xio.o fdset.o vbi.o cache.o help.o edline.o search.o edit.o misc.o hamm.o lang.o $(EXPOBJS)
-@@ -14,20 +14,20 @@
- COBJS=alevt-cap.o vbi.o fdset.o misc.o hamm.o lang.o $(EXPOBJS)
- 
- ifneq ($(findstring WITH_PNG,$(DEFS)),)
--EXPLIBS=-L/usr/local/lib -lpng -lz -lm
-+EXPLIBS=-L$(LOCALBASE)/lib -L/usr/local/lib -lpng -lz -lm
- endif
- 
- all: alevt alevt-date alevt-cap alevt.1x alevt-date.1 alevt-cap.1
--	sync
-+#	sync
- 
- alevt: $(OBJS)
--	$(CC) $(OPT) $(OBJS) -o alevt -L/usr/X11R6/lib -lX11 $(EXPLIBS)
-+	$(CC) $(OPT) $(LDFLAGS) $(OBJS) -o alevt -L/usr/X11R6/lib -lX11 $(EXPLIBS)
- 
- alevt-date: $(TOBJS)
--	$(CC) $(OPT) $(TOBJS) -o alevt-date
-+	$(CC) $(OPT) $(LDFLAGS) $(TOBJS) -o alevt-date
- 
- alevt-cap: $(COBJS)
--	$(CC) $(OPT) $(COBJS) -o alevt-cap $(EXPLIBS)
-+	$(CC) $(OPT) $(LDFLAGS) $(COBJS) -o alevt-cap $(EXPLIBS)
- 
- font.h: fontsize.h
- fontsize.h: font1.xbm font2.xbm
-@@ -62,21 +62,21 @@
- 	install -m 0755 alevt		${RPM_BUILD_ROOT}/usr/X11R6/bin
- 	install -m 0755 alevt-date	${RPM_BUILD_ROOT}/usr/X11R6/bin
- 	install -m 0755 alevt-cap	${RPM_BUILD_ROOT}/usr/X11R6/bin
--	install -m 0644 alevt.1x	${RPM_BUILD_ROOT}/usr/X11R6/man/man1
-+	install -m 0644 alevt.1x	${RPM_BUILD_ROOT}/usr/X11R6/man/man1/alevt.1
- 	install -m 0644 alevt-date.1	${RPM_BUILD_ROOT}/usr/X11R6/man/man1
- 	install -m 0644 alevt-cap.1	${RPM_BUILD_ROOT}/usr/X11R6/man/man1
- 
- # anything below this line is just for me!
- 
- install: all
--	install -m 0755 alevt		/usr/local/bin
--	install -m 0755 alevt-date	/usr/local/bin
--	install -m 0755 alevt-cap	/usr/local/bin
--	install -m 0644 alevt.1x	/usr/local/man/man1
--	install -m 0644 alevt-date.1	/usr/local/man/man1
--	install -m 0644 alevt-cap.1	/usr/local/man/man1
--	install -m 0644 contrib/mini-alevt.xpm /usr/include/X11/pixmaps
--	sync
-+	$(BSD_INSTALL_PROGRAM) alevt		$(PREFIX)/bin
-+	$(BSD_INSTALL_PROGRAM) alevt-date	$(PREFIX)/bin
-+	$(BSD_INSTALL_PROGRAM) alevt-cap	$(PREFIX)/bin
-+	$(BSD_INSTALL_DATA) alevt.1x	$(PREFIX)/man/man1
-+	$(BSD_INSTALL_DATA) alevt-date.1	$(PREFIX)/man/man1
-+	$(BSD_INSTALL_DATA) alevt-cap.1	$(PREFIX)/man/man1
-+	$(BSD_INSTALL_DATA) contrib/mini-alevt.xpm $(PREFIX)/share/pixmaps
-+#	sync
- 
- depend:
- 	makedepend -Y -- $(CFLAGS_none) -- *.c 2>/dev/null
diff --git a/multimedia/avidemux/DESCR b/multimedia/avidemux/DESCR
deleted file mode 100644
index cb237667ee9..00000000000
--- a/multimedia/avidemux/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Avidemux is a graphical tool to edit video.  It can open several file
-formats, and various audio and video codecs.  Video can be edited,
-cut, appended, filtered (resize/crop/denoise), and re-encoded. Output
-file formats include Avi, MPEG1/2, MPEG2PS, OGM, and raw stripped audio
-or video.
diff --git a/multimedia/avidemux/Makefile b/multimedia/avidemux/Makefile
deleted file mode 100644
index 59b1d58d589..00000000000
--- a/multimedia/avidemux/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-# $NetBSD: Makefile,v 1.19 2005/08/10 20:56:20 jlam Exp $
-#
-
-DISTNAME=	avidemux-2.0.40
-CATEGORIES=	multimedia
-MASTER_SITES=	http://download.berlios.de/avidemux/
-
-MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://fixounet.free.fr/avidemux/
-COMMENT=	Graphical video editing program
-
-GCC_REQD=		3.0
-GNU_CONFIGURE=		YES
-USE_LANGUAGES=		c c++
-USE_LIBTOOL=		YES
-USE_TOOLS+=		gmake pkg-config
-
-CPPFLAGS+=		-DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
-LDFLAGS+=		${LIBOSSAUDIO}
-CONFIGURE_ENV+=		ac_cv_path_ART_CONFIG=no
-CONFIGURE_ARGS+=	--disable-faad # Dolby doesn't allow binary distribution
-
-.include "../../mk/bsd.prefs.mk"
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.avidemux
-.if ${MACHINE_ARCH} == "i386"
-PKG_SUPPORTED_OPTIONS=	mmx
-.endif
-
-.include "../../mk/bsd.options.mk"
-
-.if empty(PKG_OPTIONS:Mmmx)
-CONFIGURE_ARGS+=	--disable-mmx
-
-post-configure:
-	${MV} ${WRKSRC}/adm_lavcodec/config.mak \
-		${WRKSRC}/adm_lavcodec/config.mak.in
-	${SED} -e 's/TARGET_MMX=yes/TARGET_MMX=no/g' \
-		< ${WRKSRC}/adm_lavcodec/config.mak.in \
-		> ${WRKSRC}/adm_lavcodec/config.mak
-.endif
-
-.include "../../audio/faac/buildlink3.mk"
-.include "../../audio/lame/buildlink3.mk"
-.include "../../audio/liba52/buildlink3.mk"
-.include "../../audio/libmad/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../multimedia/mjpegtools/buildlink3.mk"
-.include "../../multimedia/xvidcore/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/avidemux/PLIST b/multimedia/avidemux/PLIST
deleted file mode 100644
index c89599bd143..00000000000
--- a/multimedia/avidemux/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/05/28 05:52:18 reed Exp $
-bin/avidemux2
diff --git a/multimedia/avidemux/distinfo b/multimedia/avidemux/distinfo
deleted file mode 100644
index 3608052e026..00000000000
--- a/multimedia/avidemux/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/05/28 05:52:18 reed Exp $
-
-SHA1 (avidemux-2.0.40.tar.gz) = 0231cf9e6a42b091bde2d90f5fc5d65fa9b3d06d
-RMD160 (avidemux-2.0.40.tar.gz) = faa76ae78fb60bdb0790174cce591118d03578e0
-Size (avidemux-2.0.40.tar.gz) = 3755632 bytes
diff --git a/multimedia/dirac/DESCR b/multimedia/dirac/DESCR
deleted file mode 100644
index c14b658cd98..00000000000
--- a/multimedia/dirac/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-Dirac is a prototype video codec, under development by BBC R&D, and initially
-released in March 2003.
-
-Dirac is a general-purpose video codec aimed at resolutions from QCIF
-(180x144) to HDTV (1920x1080) progressive or interlaced. It uses wavelets,
-motion compensation and arithmetic coding and aims to be competitive with
-other state of the art codecs.
diff --git a/multimedia/dirac/Makefile b/multimedia/dirac/Makefile
deleted file mode 100644
index 837e2cb680c..00000000000
--- a/multimedia/dirac/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2005/08/10 20:56:20 jlam Exp $
-#
-
-DISTNAME=		Dirac-0.2.0
-PKGNAME=		${DISTNAME:S/D/d/}
-CATEGORIES=		multimedia
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=dirac/}
-
-MAINTAINER=		tech-pkg@NetBSD.org
-HOMEPAGE=		http://dirac.sourceforge.net/
-COMMENT=		Open-source video codec designed at the BBC
-
-USE_TOOLS+=		pkg-config
-USE_LANGUAGES=		c c++
-GNU_CONFIGURE=		yes
-
-PKGCONFIG_OVERRIDE+=	dirac.pc.in
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/dirac/PLIST b/multimedia/dirac/PLIST
deleted file mode 100644
index 54e3c8b2f58..00000000000
--- a/multimedia/dirac/PLIST
+++ /dev/null
@@ -1,37 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/05/16 02:07:44 xtraeme Exp $
-bin/dirac_decoder
-bin/dirac_encoder
-bin/make_header
-include/Dirac/arith_codec.h
-include/Dirac/arrays.h
-include/Dirac/band_codec.h
-include/Dirac/bit_manager.h
-include/Dirac/block_match.h
-include/Dirac/cmd_line.h
-include/Dirac/common.h
-include/Dirac/comp_compress.h
-include/Dirac/comp_decompress.h
-include/Dirac/context.h
-include/Dirac/downconvert.h
-include/Dirac/frame.h
-include/Dirac/frame_compress.h
-include/Dirac/frame_decompress.h
-include/Dirac/golomb.h
-include/Dirac/gop.h
-include/Dirac/me_mode_decn.h
-include/Dirac/me_subpel.h
-include/Dirac/me_utils.h
-include/Dirac/mot_comp.h
-include/Dirac/motion.h
-include/Dirac/motion_estimate.h
-include/Dirac/mv_codec.h
-include/Dirac/pic_io.h
-include/Dirac/seq_compress.h
-include/Dirac/seq_decompress.h
-include/Dirac/upconvert.h
-include/Dirac/wavelet_utils.h
-lib/libdirac_common.a
-lib/libdirac_decoder.a
-lib/libdirac_encoder.a
-lib/libdirac_motionest.a
-@dirrm include/Dirac
diff --git a/multimedia/dirac/buildlink3.mk b/multimedia/dirac/buildlink3.mk
deleted file mode 100644
index 5fc589842c7..00000000000
--- a/multimedia/dirac/buildlink3.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/05/16 02:07:44 xtraeme Exp $
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-DIRAC_BUILDLINK3_MK:=	${DIRAC_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	dirac
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndirac}
-BUILDLINK_PACKAGES+=	dirac
-
-.if !empty(DIRAC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.dirac+=	dirac>=0.2.0
-BUILDLINK_PKGSRCDIR.dirac?=	../../multimedia/dirac
-BUILDLINK_DEPMETHOD.dirac?=	build
-.endif	# DIRAC_BUILDLINK3_MK
-
-
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/dirac/distinfo b/multimedia/dirac/distinfo
deleted file mode 100644
index 084f03e4516..00000000000
--- a/multimedia/dirac/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 11:24:02 agc Exp $
-
-SHA1 (Dirac-0.2.0.tar.gz) = b87a0442fc199c23e90f89a280d5db8268555325
-RMD160 (Dirac-0.2.0.tar.gz) = 8152859c19a4c414c5fe17eeb4ec6793d4052cdd
-Size (Dirac-0.2.0.tar.gz) = 200203 bytes
diff --git a/multimedia/divxplayer/DESCR b/multimedia/divxplayer/DESCR
deleted file mode 100644
index 029df1e4c7b..00000000000
--- a/multimedia/divxplayer/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-The DivX(TM) Player for Linux from DivX.com is built from the same
-codebase as the Windows version. It performs exactly like its Windows
-cousin in all respects, and can even use the same skin files. Behold
-the wonders of cross-platform development.
diff --git a/multimedia/divxplayer/Makefile b/multimedia/divxplayer/Makefile
deleted file mode 100644
index 653bbdea26d..00000000000
--- a/multimedia/divxplayer/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2005/06/17 03:50:23 jlam Exp $
-
-DISTNAME=	divx-player-installer
-PKGNAME=	divxplayer-0.2.0
-CATEGORIES=	multimedia
-MASTER_SITES=	${MASTER_SITE_LOCAL:=${PKGNAME}/}
-
-MAINTAINER=	david@silicium.ath.cx
-HOMEPAGE=	http://www.divx.com/
-COMMENT=	DivX(TM) Video Player for Linux from DivX.com
-
-DEPENDS+=	suse_linux>=7.3:../../emulators/suse_linux
-DEPENDS+=	suse_x11>=7.3:../../emulators/suse_linux
-
-ONLY_FOR_PLATFORM= NetBSD-*-i386
-
-WRKSRC=		${WRKDIR}/divx-player-installer
-CHECK_SHLIBS=	NO
-NO_BUILD=	YES
-USE_X11BASE=	YES
-
-DIST_SUBDIR=	${PKGNAME}
-
-BINARY=		divxPlayer.bin
-DATADIR=	${PREFIX}/share/divxplayer
-
-INSTALLATION_DIRS=	bin
-
-post-patch:
-	${SED} -e "s|%%DATADIR%%|${DATADIR}|" ${FILESDIR}/launcher.sh \
-		> ${WRKDIR}/frontend.sh
-
-do-install:
-	${MKDIR} ${DATADIR}
-	${MKDIR} ${DATADIR}/Skins
-	${INSTALL_DATA} ${WRKSRC}/Skins/* ${DATADIR}/Skins
-	${INSTALL_PROGRAM} ${WRKSRC}/${BINARY} ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKDIR}/frontend.sh \
-		${PREFIX}/bin/${BINARY:S/.bin$//}
-
-.include "../../mk/x11.buildlink3.mk"
-.include "../../emulators/suse_linux/Makefile.application"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/divxplayer/PLIST b/multimedia/divxplayer/PLIST
deleted file mode 100644
index 8fcfdfd4011..00000000000
--- a/multimedia/divxplayer/PLIST
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/01/26 13:28:19 jmmv Exp $
-bin/divxPlayer
-bin/divxPlayer.bin
-share/divxplayer/Skins/Corner.zip
-share/divxplayer/Skins/Default.dps
-share/divxplayer/Skins/divxexplorer.dps
-@dirrm share/divxplayer/Skins
-@dirrm share/divxplayer
diff --git a/multimedia/divxplayer/distinfo b/multimedia/divxplayer/distinfo
deleted file mode 100644
index b01a1f30e91..00000000000
--- a/multimedia/divxplayer/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 11:24:02 agc Exp $
-
-SHA1 (divxplayer-0.2.0/divx-player-installer.tar.gz) = 63e39c6ed7539e3d7e94b16df93745aba9550d42
-RMD160 (divxplayer-0.2.0/divx-player-installer.tar.gz) = a48ba17ebe92f3dd7bd3871ba2c18b9e6b48f609
-Size (divxplayer-0.2.0/divx-player-installer.tar.gz) = 3888848 bytes
diff --git a/multimedia/divxplayer/files/launcher.sh b/multimedia/divxplayer/files/launcher.sh
deleted file mode 100644
index e455a68b6b6..00000000000
--- a/multimedia/divxplayer/files/launcher.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-PROGRAM="$0"
-DATADIR="%%DATADIR%%"
-DIVX_SKIN_DIR=${DATADIR}/Skins
-
-export DIVX_SKIN_DIR
-
-if [ -f ~/.divxPlayer/DivXPlayer.dbf ]
-then
-	rm -f ~/.divxPlayer/DivXPlayer.dbf
-fi
-
-exec ${PROGRAM}.bin "${@}"
diff --git a/multimedia/dumpmpeg/DESCR b/multimedia/dumpmpeg/DESCR
deleted file mode 100644
index b9bc91395d1..00000000000
--- a/multimedia/dumpmpeg/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-dumpmpeg is a program that allows you to dump video frames from MPEG
-movie files. It uses the SDL MPEG Player Library to accomplish this and
-thus requires an open X-Window.  Since it uses the SMPEG library, it
-can dump frames from format it supports, which currently is MPEG-1 video
-files.
diff --git a/multimedia/dumpmpeg/Makefile b/multimedia/dumpmpeg/Makefile
deleted file mode 100644
index e50b4b0f515..00000000000
--- a/multimedia/dumpmpeg/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:40 tv Exp $
-#
-
-DISTNAME=	dumpmpeg-0.6
-PKGREVISION=	4
-CATEGORIES=	multimedia
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dumpmpeg/}
-
-MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://sourceforge.net/projects/dumpmpeg
-COMMENT=	Splits an MPEG stream into single images
-
-GNU_CONFIGURE=		YES
-
-.include "../../multimedia/smpeg/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/dumpmpeg/PLIST b/multimedia/dumpmpeg/PLIST
deleted file mode 100644
index c23c281c2c9..00000000000
--- a/multimedia/dumpmpeg/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2004/06/26 18:05:45 grant Exp $
-bin/dumpmpeg
-man/man1/dumpmpeg.1
diff --git a/multimedia/dumpmpeg/distinfo b/multimedia/dumpmpeg/distinfo
deleted file mode 100644
index 400dc667a17..00000000000
--- a/multimedia/dumpmpeg/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 11:24:02 agc Exp $
-
-SHA1 (dumpmpeg-0.6.tar.gz) = 99bd1e62d69c3727d69d1f313c0277718b83d66e
-RMD160 (dumpmpeg-0.6.tar.gz) = d53404045542a7ec0c156a0cfbf6fd0f6fb8781f
-Size (dumpmpeg-0.6.tar.gz) = 43257 bytes
-SHA1 (patch-aa) = 3b1613a264dd5704d74ab732d3c335c971f5f819
diff --git a/multimedia/dumpmpeg/patches/patch-aa b/multimedia/dumpmpeg/patches/patch-aa
deleted file mode 100644
index d0eb1c695d2..00000000000
--- a/multimedia/dumpmpeg/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2004/06/26 18:05:45 grant Exp $
-
---- dumpmpeg.c.orig	Thu May 17 15:52:12 2001
-+++ dumpmpeg.c
-@@ -318,14 +318,14 @@
- #ifdef VCD_SUPPORT
-   /* Check if source is a CDROM device */
-   if((fd = vcd_open(argv[i])) != 0)
--    mpeg = SMPEG_new_descr(fd, &info, 1);
-+    mpeg = SMPEG_new_descr(fd, &info, 0);	/* we don't need audio! */
-   else
- #endif
-   {
-     if(strcmp(argv[i], "-") == 0) /* Use stdin for input */
--      mpeg = SMPEG_new_descr(0, &info, 1);
-+      mpeg = SMPEG_new_descr(0, &info, 0);	/* we don't need audio! */
-     else
--      mpeg = SMPEG_new(argv[i], &info, 1);
-+      mpeg = SMPEG_new(argv[i], &info, 0);	/* we don't need audio! */
-   }
- 
-   if ( SMPEG_error(mpeg) ) {
diff --git a/multimedia/dvdauthor/DESCR b/multimedia/dvdauthor/DESCR
deleted file mode 100644
index 4d09c2988eb..00000000000
--- a/multimedia/dvdauthor/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-A simple set of tools to help you author a DVD. The idea is to be able to
-create menus, buttons, chapters, etc, but for now you can just take an MPEG
-stream (as created by mplex -f 8 from mjpegtools 1.6.0) and write it to DVD.
diff --git a/multimedia/dvdauthor/Makefile b/multimedia/dvdauthor/Makefile
deleted file mode 100644
index 7bdcc598189..00000000000
--- a/multimedia/dvdauthor/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:18 jlam Exp $
-
-DISTNAME=		dvdauthor-0.6.10
-PKGREVISION=	2
-CATEGORIES=		multimedia
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=dvdauthor/}
-
-MAINTAINER=		sekiya@NetBSD.org
-HOMEPAGE=		http://dvdauthor.sourceforge.net/
-COMMENT=		Tools to assist DVD authoring
-
-GNU_CONFIGURE=		YES
-USE_TOOLS=		gmake
-
-.include "../../graphics/ImageMagick/buildlink3.mk"
-.include "../../converters/fribidi/buildlink3.mk"
-.include "../libdvdread/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/dvdauthor/PLIST b/multimedia/dvdauthor/PLIST
deleted file mode 100644
index fa302b17595..00000000000
--- a/multimedia/dvdauthor/PLIST
+++ /dev/null
@@ -1,9 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/06/25 06:58:42 sekiya Exp $
-bin/dvdauthor
-bin/dvddirdel
-bin/dvdunauthor
-bin/mpeg2desc
-bin/spumux
-bin/spuunmux
-man/man1/dvdauthor.1
-man/man1/spumux.1
diff --git a/multimedia/dvdauthor/distinfo b/multimedia/dvdauthor/distinfo
deleted file mode 100644
index 3f61ac686a2..00000000000
--- a/multimedia/dvdauthor/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 11:24:02 agc Exp $
-
-SHA1 (dvdauthor-0.6.10.tar.gz) = bee2c9beb58a020bcf0ccfd39eca8d30ebd54602
-RMD160 (dvdauthor-0.6.10.tar.gz) = c9df3ac669161e8f07e837e2a6fc76e7af97c1a1
-Size (dvdauthor-0.6.10.tar.gz) = 240010 bytes
-SHA1 (patch-aa) = b86c7a584fddaf733662c0bc32df239a1bb37e98
diff --git a/multimedia/dvdauthor/patches/patch-aa b/multimedia/dvdauthor/patches/patch-aa
deleted file mode 100644
index 20d463ff56e..00000000000
--- a/multimedia/dvdauthor/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2004/07/10 21:06:55 wiz Exp $
-
---- Makefile.in.orig	2004-01-15 20:42:47.000000000 +0100
-+++ Makefile.in
-@@ -9,7 +9,7 @@ CC = @CC@
- CFLAGS = -Wall @CFLAGS@ @XML_CFLAGS@ @MAGICK_CFLAGS@ @FREETYPE_CFLAGS@ @FRIBIDI_CFLAGS@ -MD
- # CFLAGS += -g
- 
--BISON=bison
-+BISON=yacc
- FLEX=flex
- 
- CPPFLAGS = -DSYSCONFDIR="\"$(sysconfdir)\""
diff --git a/multimedia/dvdrip/DESCR b/multimedia/dvdrip/DESCR
deleted file mode 100644
index 746b861de87..00000000000
--- a/multimedia/dvdrip/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-dvd::rip is a full featured DVD copy program written in Perl. It
-provides an easy to use but feature-rich Gtk+ GUI to control almost
-all aspects of the ripping and transcoding process. It uses the widely
-known video processing swissknife transcode and many other Open Source
-tools. dvd::rip itself is licensed under GPL / Perl Artistic License.
-
-	"And note: it's spelled dvd::rip, and nothing else."
diff --git a/multimedia/dvdrip/Makefile b/multimedia/dvdrip/Makefile
deleted file mode 100644
index cbc66c5e0ac..00000000000
--- a/multimedia/dvdrip/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# $NetBSD: Makefile,v 1.15 2005/10/29 02:27:47 grant Exp $
-#
-
-DISTNAME=	Video-DVDRip-0.50.18
-PKGNAME=	${DISTNAME:C|Video-DVDRip|dvdrip|}
-PKGREVISION=	4
-CATEGORIES=	multimedia x11 sysutils
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Video/}
-
-MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://www.exit1.org/dvdrip/
-COMMENT=	Graphical frontend for DVD ripping
-
-DEPENDS+=	cdrdao>=1.1.7:../../sysutils/cdrdao
-DEPENDS+=	{cdrecord,cdrtools-ossdvd}>=1.10:../../sysutils/cdrecord
-DEPENDS+=	mplayer>=0.90:../../multimedia/mplayer
-DEPENDS+=	ogmtools-[0-9]*:../../multimedia/ogmtools
-DEPENDS+=	p5-Gdk-Pixbuf-[0-9]*:../../graphics/p5-Gdk-Pixbuf
-DEPENDS+=	subtitleripper-[0-9]*:../../textproc/subtitleripper
-DEPENDS+=	transcode>=0.6.9:../../multimedia/transcode
-DEPENDS+=	vcdimager>=0.7.12:../../sysutils/vcdimager-devel
-
-.if (${MACHINE_ARCH} == "i386")
-#DEPENDS+=	rar>=2.02:../../archivers/rar
-.endif
-
-BUILDLINK_DEPENDS.perl= perl>=5.6.0
-
-USE_PKGLOCALEDIR=	YES
-
-PERL5_PACKLIST= auto/Video/DVDRip/.packlist
-
-# XXX xine support
-# XXX fping support
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../graphics/ImageMagick/buildlink3.mk"
-.include "../../multimedia/mjpegtools/buildlink3.mk"
-
-.include "../../lang/perl5/module.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/dvdrip/PLIST b/multimedia/dvdrip/PLIST
deleted file mode 100644
index 95530d00a8a..00000000000
--- a/multimedia/dvdrip/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2004/03/06 11:39:31 grant Exp $
diff --git a/multimedia/dvdrip/distinfo b/multimedia/dvdrip/distinfo
deleted file mode 100644
index c67c4e75418..00000000000
--- a/multimedia/dvdrip/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 11:24:02 agc Exp $
-
-SHA1 (Video-DVDRip-0.50.18.tar.gz) = 6b60d4afe9048387a9f684bfb372280b07809a79
-RMD160 (Video-DVDRip-0.50.18.tar.gz) = 2a53e10b5209a6c1447f0bd2563cecba924bc546
-Size (Video-DVDRip-0.50.18.tar.gz) = 233184 bytes
diff --git a/multimedia/ffmpeg/DESCR b/multimedia/ffmpeg/DESCR
deleted file mode 100644
index e30ce647cc7..00000000000
--- a/multimedia/ffmpeg/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-FFmpeg is the first complete and free Internet Live Audio and Video
-Broadcasting solution. FFMpeg aims at being the command line tool to
-handle audio and video. It is a "three-in-one" solution.
-
-FFmpeg includes a soft VCR capable of encoding in many different
-formats simultaneously, a streaming server for Netcasting multimedia
-and is available under the GNU General Public License.
-
-FFmpeg generates streaming files, in many popular formats
-simultaneously, faster than any other solution.
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
deleted file mode 100644
index 906ef56befc..00000000000
--- a/multimedia/ffmpeg/Makefile
+++ /dev/null
@@ -1,89 +0,0 @@
-# $NetBSD: Makefile,v 1.17 2005/06/01 18:03:06 jlam Exp $
-
-DISTNAME=	ffmpeg-0.4.8
-PKGREVISION=	3
-CATEGORIES=	multimedia net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ffmpeg/}
-
-MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://ffmpeg.sourceforge.net/
-COMMENT=	MPEG decoding, encoding and streaming software
-
-HAS_CONFIGURE=	YES
-USE_TOOLS+=	gmake
-USE_LIBTOOL=	YES
-USE_PKGINSTALL=	YES
-
-CONF_FILES=	${PREFIX}/share/examples/ffmpeg/ffserver.conf \
-		${PKG_SYSCONFDIR}/ffserver.conf
-
-MAKE_ENV+=	EXTRA_LIBS=${BUILDLINK_LDADD.getopt:Q} \
-		FFSERVER_CONF=${PKG_SYSCONFDIR:Q}/ffserver.conf \
-		LOCALBASE=${LOCALBASE:Q}
-
-CONFIGURE_ARGS=		--cc=${CC} --prefix=${PREFIX}
-CONFIGURE_ARGS+=	--enable-pp --disable-vhook --disable-debug
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.ffmpeg
-PKG_SUPPORTED_OPTIONS=	bktr lame mmx vorbis
-
-.include "../../mk/bsd.options.mk"
-
-.include "../../mk/bsd.prefs.mk"
-
-.include "../../mk/compiler.mk"
-
-.if !empty(MACHINE_ARCH:Mi386)
-.  if !empty(PKG_OPTIONS:Mmmx) && !empty(CC_VERSION:Mgcc*)
-CFLAGS+=		-fomit-frame-pointer
-.  else
-CONFIGURE_ARGS+=	--disable-mmx
-.  endif
-.else
-CONFIGURE_ARGS+=	--disable-mmx
-.endif
-
-.if !empty(PKG_OPTIONS:Mbktr)
-post-extract:
-	${CP} ${FILESDIR}/grab_bsdbktr.c ${WRKSRC}/libavformat
-
-post-patch:
-	${PATCH} --quiet -d ${WRKSRC} < ${FILESDIR}/bktr.diff
-	${PATCH} --quiet -d ${WRKSRC} < ${FILESDIR}/ffmpeg.1.diff
-.endif
-
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ffmpeg \
-		${PREFIX}/share/doc/ffmpeg \
-		${PREFIX}/include/ffmpeg/libpostproc
-	${INSTALL_DATA} ${WRKSRC}/libavcodec/apiexample.c \
-		${PREFIX}/share/doc/ffmpeg
-	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/doc/TODO \
-		${PREFIX}/share/doc/ffmpeg
-	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${WRKSRC}/doc/*.txt \
-		${PREFIX}/share/doc/ffmpeg
-	${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf \
-		${PREFIX}/share/examples/ffmpeg
-	# ffplay not installed
-	${RM} ${PREFIX}/man/man1/ffplay.1
-	${INSTALL_DATA} ${WRKSRC}/libavcodec/libpostproc/postprocess.h \
-		${PREFIX}/include/ffmpeg/libpostproc
-
-.include "../../devel/libgetopt/buildlink3.mk"
-
-.if !empty(PKG_OPTIONS:Mlame)
-CONFIGURE_ARGS+= --enable-mp3lame
-.include "../../audio/lame/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-mp3lame
-.endif
-
-.if !empty(PKG_OPTIONS:Mvorbis)
-CONFIGURE_ARGS+= --enable-vorbis
-.include "../../audio/libvorbis/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-vorbis
-.endif
-
-.include "../../mk/dlopen.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/ffmpeg/PLIST b/multimedia/ffmpeg/PLIST
deleted file mode 100644
index 5b01e253bab..00000000000
--- a/multimedia/ffmpeg/PLIST
+++ /dev/null
@@ -1,30 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:09:44 jlam Exp $
-bin/ffmpeg
-bin/ffserver
-include/ffmpeg/avcodec.h
-include/ffmpeg/avformat.h
-include/ffmpeg/avio.h
-include/ffmpeg/common.h
-include/ffmpeg/libpostproc/postprocess.h
-include/ffmpeg/rtp.h
-include/ffmpeg/rtsp.h
-include/ffmpeg/rtspcodes.h
-lib/libavcodec.la
-lib/libavformat.la
-man/man1/ffmpeg.1
-man/man1/ffserver.1
-share/doc/ffmpeg/README
-share/doc/ffmpeg/TODO
-share/doc/ffmpeg/apiexample.c
-share/doc/ffmpeg/faq.html
-share/doc/ffmpeg/ffmpeg-doc.html
-share/doc/ffmpeg/ffmpeg_powerpc_performance_evaluation_howto.txt
-share/doc/ffmpeg/ffplay-doc.html
-share/doc/ffmpeg/ffserver-doc.html
-share/doc/ffmpeg/hooks.html
-share/doc/ffmpeg/optimization.txt
-share/examples/ffmpeg/ffserver.conf
-@dirrm share/examples/ffmpeg
-@dirrm share/doc/ffmpeg
-@dirrm include/ffmpeg/libpostproc
-@dirrm include/ffmpeg
diff --git a/multimedia/ffmpeg/buildlink3.mk b/multimedia/ffmpeg/buildlink3.mk
deleted file mode 100644
index 92b9e1bdd1b..00000000000
--- a/multimedia/ffmpeg/buildlink3.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:02 tv Exp $
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-FFMPEG_BUILDLINK3_MK:=	${FFMPEG_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	ffmpeg
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nffmpeg}
-BUILDLINK_PACKAGES+=	ffmpeg
-
-.if !empty(FFMPEG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ffmpeg+=	ffmpeg>=0.4.8
-BUILDLINK_RECOMMENDED.ffmpeg+=	ffmpeg>=0.4.8nb3
-BUILDLINK_PKGSRCDIR.ffmpeg?=	../../multimedia/ffmpeg
-.endif	# FFMPEG_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo
deleted file mode 100644
index d1f773a4981..00000000000
--- a/multimedia/ffmpeg/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.8 2005/03/05 13:32:10 grant Exp $
-
-SHA1 (ffmpeg-0.4.8.tar.gz) = 629a0f8f4daa3da1dedd8ba58bfdec4c47581bb4
-RMD160 (ffmpeg-0.4.8.tar.gz) = 8196b92b16506ddd848410c20407a7416011447e
-Size (ffmpeg-0.4.8.tar.gz) = 1352874 bytes
-SHA1 (patch-aa) = e57ba32021ff55f7b545581eae9f0027cddbd883
-SHA1 (patch-ab) = f596db3c555ab772eae2da5b8144c23fb4f2eaa0
-SHA1 (patch-ac) = 6f137ca14131e00c2db89cbe44657f32f3513e98
-SHA1 (patch-ad) = e058ddcb0ad4211c16d2f4c5fe0859723316b3a8
-SHA1 (patch-ae) = 7223978301c95de96d19610afb332f10764c4de0
-SHA1 (patch-af) = 6e245cee0c49bc9a829bc9caf5fad5f887da8e3c
-SHA1 (patch-ag) = 975f7dac2488f367083cf4375b862fe8e3f4daf6
diff --git a/multimedia/ffmpeg/files/bktr.diff b/multimedia/ffmpeg/files/bktr.diff
deleted file mode 100644
index 690204aa74b..00000000000
--- a/multimedia/ffmpeg/files/bktr.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- libavformat/Makefile.orig	2004-08-14 14:51:47.000000000 +0200
-+++ libavformat/Makefile	2004-08-14 14:52:43.000000000 +0200
-@@ -32,7 +32,7 @@
- OBJS+= framehook.o 
- 
- ifeq ($(CONFIG_VIDEO4LINUX),yes)
--OBJS+= grab.o
-+OBJS+= grab_bsdbktr.o
- endif
- 
- ifeq ($(CONFIG_DV1394),yes)
---- configure.org       2004-07-31 17:12:40.000000000 +0200
-+++ configure   2004-07-31 17:12:54.000000000 +0200
-@@ -231,6 +231,8 @@
- *) ;;
- esac
-
-+v4l="yes"
-+
- # From mplayer configure. We need TARGET_OS available
- # to the Makefile, so it can distinguish between flavors
- # of AltiVec on PowerPC
diff --git a/multimedia/ffmpeg/files/ffmpeg.1.diff b/multimedia/ffmpeg/files/ffmpeg.1.diff
deleted file mode 100644
index 8e2ae71e9bb..00000000000
--- a/multimedia/ffmpeg/files/ffmpeg.1.diff
+++ /dev/null
@@ -1,61 +0,0 @@
---- doc/ffmpeg.1.orig	2004-08-29 12:38:34.000000000 +0200
-+++ doc/ffmpeg.1	2004-08-29 13:03:08.000000000 +0200
-@@ -505,21 +505,49 @@
- tell that the raw codec data must be copied as is.
- .Sh "Audio/Video grab options"
- .IX Subsection "Audio/Video grab options"
--.IP "\fB\-vd device\fR" 4
--.IX Item "-vd device"
--set video grab device (e.g. \fI/dev/video0\fR)
--.IP "\fB\-vc channel\fR" 4
--.IX Item "-vc channel"
--set video grab channel (\s-1DV1394\s0 only)
- .IP "\fB\-tvstd standard\fR" 4
- .IX Item "-tvstd standard"
- set television standard (\s-1NTSC\s0, \s-1PAL\s0 (\s-1SECAM\s0))
--.IP "\fB\-dv1394\fR" 4
--.IX Item "-dv1394"
--set \s-1DV1394\s0 grab
- .IP "\fB\-ad device\fR" 4
- .IX Item "-ad device"
- set audio device (e.g. \fI/dev/dsp\fR)
-+.PP
-+This build of ffmpeg includes NetBSD-specific patches that change the
-+video-grabbing semantics. Recording from bktr(4) can be controlled via the
-+following environment variables:
-+.PP
-+.RS
-+.B BKTR_DEV
-+(0\-4): which of the devices on the bktr should provide the signal (tuner,
-+video-in,...)
-+.PP
-+.B BKTR_FORMAT
-+(1\-6): TV format, 1 PAL 2 NTSC 3 SECAM 4 PALN 5 PALM 6 NTSCJ
-+.PP
-+.B BKTR_FREQUENCY
-+(float): frequency to which the tuner should be set.
-+.PP
-+.B BKTR_CHANNEL
-+(int): channel to which the tuner should be set, overrides BKTR_FREQUENCY
-+.RE
-+.PP
-+If you set the channel or frequency with a different program such as xawtv
-+or fxtv you might not get audio; try to use the environment variables in
-+that case. Do not forget to set the following mixerctl variables to useful
-+values:
-+.PP
-+.RS
-+record.source=line
-+.PP
-+record.volume=255,255
-+.PP
-+inputs.line=255,255
-+.RE
-+.PP
-+One possible command line would then be:
-+.PP
-+ffmpeg -y -intra -tvstd pal -vcodec mpeg2video -s 768x576 -b 9600 -ab 128 -ad
-+/dev/audio -ac 2 -ar 44100 /tmp/file.mpg
- .Sh "Advanced options"
- .IX Subsection "Advanced options"
- .IP "\fB\-map file:stream\fR" 4
diff --git a/multimedia/ffmpeg/files/grab_bsdbktr.c b/multimedia/ffmpeg/files/grab_bsdbktr.c
deleted file mode 100644
index 8932d6364f9..00000000000
--- a/multimedia/ffmpeg/files/grab_bsdbktr.c
+++ /dev/null
@@ -1,325 +0,0 @@
-/*
- * FreeBSD video grab interface
- * Copyright (c) 2002 Steve O'Hara-Smith
- * based on
- *           Linux video grab interface
- *           Copyright (c) 2000,2001 Gerard Lantau.
- * and
- *           simple_grab.c Copyright (c) 1999 Roger Hardiman
- *
- * GPL virus inherited:
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-#include "avformat.h"
-#include <dev/ic/bt8xx.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <sys/mman.h>
-#include <sys/time.h>
-#include <signal.h>
-
-typedef struct {
-	int fd;
-	int tuner_fd;
-	int frame_format; /* see VIDEO_PALETTE_xxx */
-	int width, height;
-	int frame_rate;
-	int frame_rate_base;
-	int64_t per_frame;
-} VideoData;
-
-const char *video_device = "/dev/bktr0";
-
-#define PAL 1
-#define PALBDGHI 1
-#define NTSC 2
-#define NTSCM 2
-#define SECAM 3
-#define PALN 4
-#define PALM 5
-#define NTSCJ 6
-
-/* PAL is 768 x 576. NTSC is 640 x 480 */
-#define PAL_HEIGHT 576
-#define SECAM_HEIGHT 576
-#define NTSC_HEIGHT 480
-
-#ifndef VIDEO_FORMAT
-#define VIDEO_FORMAT NTSC
-#endif
-
-static int bktr_dev[] = { METEOR_DEV0, METEOR_DEV1, METEOR_DEV2,
-                   METEOR_DEV3, METEOR_DEV_SVIDEO };
-
-static u_int8_t *video_buf;
-static int nsignals = 0;
-static void catchsignal(int signal)
-{
-	nsignals++;
-	return;
-}
-
-static int bktr_init (const char *video_device, int width, int height,
-	int format, u_int8_t **video_buf, int *video_fd, int *tuner_fd,
-	int idev, double frequency)
-{
-	struct meteor_geomet geo;
-	int h_max;
-	long ioctl_frequency;
-	char *arg;
-	int c;
-	int channel = 0;
-	struct sigaction act,old;
-
-	if (idev < 0 || idev > 4)
-	{
-		arg = getenv ("BKTR_DEV");
-		if (arg)
-			idev = atoi (arg);
-		if (idev < 0 || idev > 4)
-			idev = 0;
-	}
-
-	if (format < 1 || format > 6)
-	{
-		arg = getenv ("BKTR_FORMAT");
-		if (arg)
-			format = atoi (arg);
-		if (format < 1 || format > 6)
-			format = VIDEO_FORMAT;
-	}
-
-	if (frequency <= 0)
-	{
-		arg = getenv ("BKTR_FREQUENCY");
-		if (arg)
-			frequency = atof (arg);
-		if (frequency <= 0)
-			frequency = 0.0;
-	}
-
-	arg = getenv ("BKTR_CHANNEL");
-	if (arg)
-		channel = atoi (arg);
-	if (channel < 0)
-		channel = 0;
-
-	memset(&act,0,sizeof(act));
-	sigemptyset(&act.sa_mask);
-	act.sa_handler  = catchsignal;
-	sigaction(SIGUSR1,&act,&old);
-
-	*tuner_fd = open ("/dev/tuner0", O_RDONLY);
-	if (*tuner_fd < 0) {
-		perror("Warning: Tuner not opened continuing");
-	}
-
-	*video_fd = open (video_device, O_RDONLY);
-	if (*video_fd < 0) {
-		perror (video_device);
-		return -1;
-	}
-
-	geo.rows = height;
-	geo.columns = width;
-	geo.frames = 1;
-//	geo.oformat = METEOR_GEO_YUV_422 | METEOR_GEO_YUV_12;
-	geo.oformat = METEOR_GEO_YUV_PACKED;
-
-	switch (format) {
-	case PAL:   h_max = PAL_HEIGHT;   c = BT848_IFORM_F_PALBDGHI; break;
-	case PALN:  h_max = PAL_HEIGHT;   c = BT848_IFORM_F_PALN;     break;
-	case PALM:  h_max = PAL_HEIGHT;   c = BT848_IFORM_F_PALM;     break;
-	case SECAM: h_max = SECAM_HEIGHT; c = BT848_IFORM_F_SECAM;    break;
-	case NTSC:  h_max = NTSC_HEIGHT;  c = BT848_IFORM_F_NTSCM;    break;
-	case NTSCJ: h_max = NTSC_HEIGHT;  c = BT848_IFORM_F_NTSCJ;    break;
-	default:    h_max = PAL_HEIGHT;   c = BT848_IFORM_F_PALBDGHI; break;
-	}
-	if (height <= h_max/2) {
-		geo.oformat |= METEOR_GEO_EVEN_ONLY;
-	}
-
-	if (ioctl(*video_fd, METEORSETGEO, &geo) < 0) {
-		perror ("METEORSETGEO");
-		return -1;
-	}
-
-	if (ioctl(*video_fd, BT848SFMT, &c) < 0) {
-		perror ("BT848SFMT");
-		return -1;
-	}
-
-	c = bktr_dev[idev];
-	if (ioctl(*video_fd, METEORSINPUT, &c) < 0) {
-		perror ("METEORSINPUT");
-		return -1;
-	}
-	*video_buf = (u_int8_t *) mmap((caddr_t)0, width*height*2,
-		PROT_READ, MAP_SHARED, *video_fd, (off_t) 0);
-	if (*video_buf == MAP_FAILED) {
-		perror ("mmap");
-		return -1;
-	}
-	if (frequency != 0.0) {
-		ioctl_frequency  = (unsigned long)(frequency*16); 
-		if (ioctl(*tuner_fd, TVTUNER_SETFREQ, &ioctl_frequency)<0)
-			perror("TVTUNER_SETFREQ");
-	}
-	if (channel != 0) {
-		if (ioctl(*tuner_fd, TVTUNER_SETCHNL, &channel) < 0)
-			perror("TVTUNER_SETCHNL");
-	}
-	c = METEOR_CAP_CONTINOUS;
-	ioctl(*video_fd, METEORCAPTUR, &c);
-	c = SIGUSR1;
-	ioctl (*video_fd, METEORSSIGNAL, &c);
-	return 0;
-}
-
-static void bktr_getframe(u_int64_t per_frame)
-{
-	u_int64_t curtime;
-	static u_int64_t last_frame_time = 0;
-
-	curtime = av_gettime();
-	if (!last_frame_time
-	    || ((last_frame_time + per_frame) > curtime)) {
-		if (!usleep (last_frame_time + per_frame + per_frame/8 - curtime)) {
-			if (!nsignals)
-				printf ("\nSLEPT NO signals - %d microseconds late\n",
-				        (int) (av_gettime() - last_frame_time - per_frame));
-		}
-	}
-	nsignals = 0;
-
-	last_frame_time = curtime;
-}
-
-void bf_memcpy (char *dest, char *src, int size)
-{
-	while (size -= 2)
-	{
-		dest[0] = src[1];
-		dest[1] = src[0];
-		dest += 2;
-		src += 2;
-	}
-}
-
-/* note: we support only one picture read at a time */
-static int grab_read_packet(AVFormatContext *s1, AVPacket *pkt)
-{
-	VideoData *s = s1->priv_data;
-	int size, halfsize;
-
-	size = s->width * s->height;
-	halfsize = size << 1;
-
-//	if (av_new_packet(pkt, size + halfsize) < 0)
-	if (av_new_packet(pkt, size + size) < 0)
-		return -EIO;
-
-	bktr_getframe (s->per_frame);
-	pkt->pts = av_gettime() & ((1LL << 48) - 1);
-	bf_memcpy (pkt->data, video_buf, size + size);
-//	bf_memcpy (pkt->data, video_buf, size + halfsize);
-
-//	return size + halfsize;
-	return size + size;
-}
-
-static int grab_read_header (AVFormatContext *s1,  AVFormatParameters *ap)
-{
-	VideoData *s = s1->priv_data;
-	AVStream *st;
-	int width, height;
-	int frame_rate;
-	int frame_rate_base;
-	int format = -1;
-
-	if (!ap || ap->width <= 0 || ap->height <= 0 || ap->frame_rate <= 0)
-		return -1;
-
-	width = ap->width;
-	height = ap->height;
-	frame_rate = ap->frame_rate;
-	frame_rate_base = ap->frame_rate_base;
-
-	st = av_new_stream(s1, 0);
-	if (!st)
-		return -ENOMEM;
-
-	s->width = width;
-	s->height = height;
-	s->frame_rate = frame_rate;
-	s->frame_rate_base = frame_rate_base;
-	s->per_frame = ((int64_t)1000000 * s->frame_rate_base) / s->frame_rate;
-
-	st->codec.codec_type = CODEC_TYPE_VIDEO;
-//	st->codec.pix_fmt = PIX_FMT_YUV420P;
-	st->codec.pix_fmt = PIX_FMT_YUV422;
-	st->codec.codec_id = CODEC_ID_RAWVIDEO;
-	st->codec.width = width;
-	st->codec.height = height;
-	st->codec.frame_rate = frame_rate;
-	st->codec.frame_rate_base = frame_rate_base;
-
-	av_set_pts_info(s1, 48, 1, 1000000); /* 48 bits pts in use */
-
-   if (ap->standard) {
-		if (!strcasecmp(ap->standard, "pal"))
-		    format = PAL;
-		if (!strcasecmp(ap->standard, "secam"))
-		    format = SECAM;
-		if (!strcasecmp(ap->standard, "ntsc"))
-		    format = NTSC;
-	}
-
-	if (bktr_init (video_device, width, height, format, &video_buf,
-		       &(s->fd), &(s->tuner_fd), -1, 0.0) < 0)
-		return -EIO;
-	return 0;
-}
-
-static int grab_read_close (AVFormatContext *s1)
-{
-	VideoData *s = s1->priv_data;
-
-	int c = METEOR_CAP_STOP_CONT;
-	ioctl(s->fd, METEORCAPTUR, &c);
-	close(s->fd);
-	close(s->tuner_fd);
-	av_free(s);
-	return 0;
-}
-
-AVInputFormat video_grab_device_format = {
-	"video4linux",
-	"video grab",
-	 sizeof(VideoData),
-	 NULL,
-	grab_read_header,
-	grab_read_packet,
-	grab_read_close,
-	flags: AVFMT_NOFILE,
-};
-
-int video_grab_init(void)
-{
-	av_register_input_format(&video_grab_device_format);
-	return 0;
-}
diff --git a/multimedia/ffmpeg/patches/patch-aa b/multimedia/ffmpeg/patches/patch-aa
deleted file mode 100644
index 41f45059c2a..00000000000
--- a/multimedia/ffmpeg/patches/patch-aa
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/03/05 13:32:10 grant Exp $
-
---- configure.orig	2003-09-29 01:26:39.000000000 +1000
-+++ configure
-@@ -148,11 +148,10 @@ FFSLDFLAGS=""
- need_inet_aton="yes"
- extralibs="$extralibs -lsocket -lnsl"
- ;;
--FreeBSD)
-+FreeBSD|NetBSD)
- v4l="no"
- audio_oss="yes"
- dv1394="no"
--make="gmake"
- LDFLAGS="$LDFLAGS -export-dynamic"
- ;;
- BSD/OS)
-@@ -959,6 +958,9 @@ if test "$vhook" = "yes" ; then
-   echo "#define HAVE_VHOOK 1" >> $TMPH
-   extralibs="$extralibs $ldl"
- fi
-+if test "$ffserver" = "yes" ; then
-+  extralibs="$extralibs $ldl"
-+fi
- if test "$lshared" = "yes" ; then
-   echo "BUILD_SHARED=yes" >> config.mak
-   echo "PIC=-fPIC" >> config.mak
diff --git a/multimedia/ffmpeg/patches/patch-ab b/multimedia/ffmpeg/patches/patch-ab
deleted file mode 100644
index 150006d66cd..00000000000
--- a/multimedia/ffmpeg/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2004/05/25 21:49:26 wiz Exp $
-
---- ffserver.c.orig	2003-09-28 17:26:39.000000000 +0200
-+++ ffserver.c
-@@ -4488,7 +4488,7 @@ static void show_help(void)
-            "\n"
-            "-L            : print the LICENSE\n"
-            "-h            : this help\n"
--           "-f configfile : use configfile instead of /etc/ffserver.conf\n"
-+           "-f configfile : use configfile instead of " FFSERVER_CONF "\n"
-            );
- }
- 
-@@ -4546,7 +4546,7 @@ int main(int argc, char **argv)
- 
-     av_register_all();
- 
--    config_filename = "/etc/ffserver.conf";
-+    config_filename = FFSERVER_CONF;
- 
-     my_program_name = argv[0];
-     my_program_dir = getcwd(0, 0);
diff --git a/multimedia/ffmpeg/patches/patch-ac b/multimedia/ffmpeg/patches/patch-ac
deleted file mode 100644
index d4d665cd7df..00000000000
--- a/multimedia/ffmpeg/patches/patch-ac
+++ /dev/null
@@ -1,108 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2004/05/25 21:49:26 wiz Exp $
-
---- Makefile.orig	2003-09-28 17:26:39.000000000 +0200
-+++ Makefile
-@@ -6,8 +6,7 @@ include config.mak
- 
- VPATH=$(SRC_PATH)
- 
--CFLAGS= $(OPTFLAGS) -Wall -g -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
--LDFLAGS+= -g 
-+CFLAGS= $(OPTFLAGS) -Wall -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
- 
- ifeq ($(TARGET_GPROF),yes)
- CFLAGS+=-p
-@@ -42,6 +41,8 @@ ifeq ($(CONFIG_VORBIS),yes)
- EXTRALIBS+=-logg -lvorbis -lvorbisenc
- endif
- 
-+EXTRALIBS+=${LIBOSSAUDIO}
-+
- ifeq ($(CONFIG_FAAD),yes)
- ifeq ($(CONFIG_FAADBIN),yes)
- # no libs needed
-@@ -64,7 +65,7 @@ endif
- 
- OBJS = ffmpeg.o ffserver.o cmdutils.o ffplay.o
- SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s)
--FFLIBS = -L./libavformat -lavformat -L./libavcodec -lavcodec
-+FFLIBS = libavformat/libavformat.la libavcodec/libavcodec.la
- 
- all: lib $(PROG) $(PROGTEST) $(VHOOK)
- 
-@@ -72,42 +73,34 @@ lib:
- 	$(MAKE) -C libavcodec all
- 	$(MAKE) -C libavformat all
- 
--ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs
--	$(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS)
--
--ffmpeg$(EXESUF): ffmpeg_g$(EXESUF)
--	cp -p $< $@
--	$(STRIP) $@
--
--ffserver$(EXESUF): ffserver.o .libs
--	$(CC) $(LDFLAGS) $(FFSLDFLAGS) -o $@ ffserver.o $(FFLIBS) $(EXTRALIBS) 
-+ffmpeg$(EXESUF): ffmpeg.o cmdutils.o .ffmpeglibs
-+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS)
- 
--ffplay_g$(EXESUF): ffplay.o cmdutils.o .libs
--	$(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(FFLIBS) $(EXTRALIBS) $(SDL_LIBS)
-+ffserver$(EXESUF): ffserver.o .ffmpeglibs
-+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(FFSLDFLAGS) -o $@ ffserver.o $(FFLIBS) $(EXTRALIBS) 
- 
--ffplay$(EXESUF): ffplay_g$(EXESUF)
--	cp -p $< $@
--	$(STRIP) $@
-+ffplay$(EXESUF): ffplay.o cmdutils.o .ffmpeglibs
-+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(FFLIBS) $(EXTRALIBS) $(SDL_LIBS)
- 
--output_example$(EXESUF): output_example.o .libs
--	$(CC) $(LDFLAGS) -o $@ output_example.o $(FFLIBS) $(EXTRALIBS)
-+output_example$(EXESUF): output_example.o .ffmpeglibs
-+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ output_example.o $(FFLIBS) $(EXTRALIBS)
- 
- ffplay.o: ffplay.c
- 	$(CC) $(CFLAGS) $(SDL_CFLAGS) -c -o $@ $< 
- 
- %.o: %.c
--	$(CC) $(CFLAGS) -c -o $@ $< 
-+	$(CC) -DFFSERVER_CONF=\"$(FFSERVER_CONF)\" $(CFLAGS) -c -o $@ $<
- 
--videohook: .libs
-+videohook: .ffmpeglibs
- 	$(MAKE) -C vhook all
- 
- .PHONY: install
- 
- install: all install-man $(INSTALLVHOOK)
--	$(MAKE) -C libavcodec install
--	$(MAKE) -C libavformat install
-+	$(MAKE) -C libavcodec install install-headers
-+	$(MAKE) -C libavformat install install-headers
- 	install -d "$(bindir)"
--	install -c -s -m 755 $(PROG) "$(bindir)"
-+	$(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) $(PROG) "$(bindir)"
- 
- # create the window installer
- wininstaller: all install
-@@ -145,15 +138,15 @@ endif
- .depend: $(SRCS)
- 	$(CC) -MM $(CFLAGS) $^ 1>.depend
- 
--.libs: lib
--	@test -f .libs || touch .libs
--	@for i in $(DEP_LIBS) ; do if $(TEST) $$i -nt .libs ; then touch .libs; fi ; done
-+.ffmpeglibs: lib
-+	@test -f .ffmpeglibs || touch .ffmpeglibs
-+	@for i in $(DEP_LIBS) ; do if $(TEST) $$i -nt .ffmpeglibs ; then touch .ffmpeglibs; fi ; done
- 
- clean: $(CLEANVHOOK)
- 	$(MAKE) -C libavcodec clean
- 	$(MAKE) -C libavformat clean
- 	$(MAKE) -C tests clean
--	rm -f *.o *.d *~ .libs .depend gmon.out TAGS ffmpeg_g$(EXESUF) ffplay_g$(EXESUF) $(PROG) $(PROGTEST)
-+	rm -f *.o *.d *~ .ffmpeglibs .depend gmon.out TAGS ffmpeg_g$(EXESUF) ffplay_g$(EXESUF) $(PROG) $(PROGTEST)
- 
- clean-vhook:
- 	$(MAKE) -C vhook clean
diff --git a/multimedia/ffmpeg/patches/patch-ad b/multimedia/ffmpeg/patches/patch-ad
deleted file mode 100644
index 08bff48b34d..00000000000
--- a/multimedia/ffmpeg/patches/patch-ad
+++ /dev/null
@@ -1,57 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2004/08/29 22:43:50 wiz Exp $
-
---- libavformat/Makefile.orig	2003-09-28 17:26:40.000000000 +0200
-+++ libavformat/Makefile	2004-08-14 14:50:54.000000000 +0200
-@@ -60,6 +60,11 @@
- 
- ifeq ($(CONFIG_VORBIS),yes)
- OBJS+= ogg.o
-+EXTRALIBS+= -lvorbis -lvorbisenc
-+endif
-+
-+ifeq ($(CONFIG_MP3LAME),yes)
-+EXTRALIBS += -lmp3lame
- endif
- 
- LIB= $(LIBPREF)avformat$(LIBSUF)
-@@ -69,12 +74,14 @@
- 
- SRCS := $(OBJS:.o=.c) $(PPOBJS:.o=.cpp)
- 
-+install: all
-+	$(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) $(LIB:.a=.la) $(prefix)/lib
-+
- all: $(LIB) $(SLIB)
- 
- $(LIB): $(OBJS) $(PPOBJS)
- 	rm -f $@
--	$(AR) rc $@ $(OBJS) $(PPOBJS)
--	$(RANLIB) $@
-+	$(LIBTOOL) --mode=link $(CC) -o $(LIB:.a=.la) $(OBJS:.o=.lo)  $(PPOBJS:.o=.lo) -rpath $(prefix)/lib $(LIBOSSAUDIO) $(EXTRALIBS)
- 
- $(SLIB): $(OBJS)
- ifeq ($(CONFIG_WIN32),yes)
-@@ -84,9 +91,6 @@
- 	$(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS)
- endif
- 
--depend: $(SRCS)
--	$(CC) -MM $(CFLAGS) $^ 1>.depend
--
- ifeq ($(BUILD_SHARED),yes)
- install: all install-headers
- ifeq ($(CONFIG_WIN32),yes)
-@@ -112,11 +116,11 @@
-                 "$(prefix)/include/ffmpeg"
- 
- %.o: %.c
--	$(CC) $(CFLAGS) -c -o $@ $< 
-+	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c -o $@ $< 
- 
- # BeOS: remove -Wall to get rid of all the "multibyte constant" warnings
- %.o: %.cpp
--	g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $< 
-+	$(LIBTOOL) --mode=compile $(CXX) $(subst -Wall,,$(CFLAGS)) -c -o $@ $< 
- 
- clean: 
- 	rm -f *.o *.d .depend *~ *.a $(LIB)
diff --git a/multimedia/ffmpeg/patches/patch-ae b/multimedia/ffmpeg/patches/patch-ae
deleted file mode 100644
index 11f5083c976..00000000000
--- a/multimedia/ffmpeg/patches/patch-ae
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2004/08/06 11:01:54 drochner Exp $
-
---- libavcodec/Makefile.orig	2003-09-28 17:26:39.000000000 +0200
-+++ libavcodec/Makefile
-@@ -145,6 +145,9 @@ SLIB= $(SLIBPREF)avcodec$(SLIBSUF)
- endif
- TESTS= imgresample-test dct-test motion-test fft-test
- 
-+install: all
-+	$(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) $(LIB:.a=.la) $(prefix)/lib
-+
- all: $(LIB) $(SLIB)
- 
- amrlibs:
-@@ -154,8 +157,8 @@ tests: apiexample cpuid_test $(TESTS)
- 
- $(LIB): $(OBJS) $(AMRLIBS)
- 	rm -f $@
--	$(AR) rc $@ $(OBJS) $(AMREXTRALIBS)
--	$(RANLIB) $@
-+	$(LIBTOOL) --mode=link $(CC) -o $(LIB:.a=.la) $(OBJS:.o=.lo) -rpath $(prefix)/lib $(EXTRALIBS) $(AMREXTRALIBS)
-+
- 
- $(SLIB): $(OBJS)
- ifeq ($(CONFIG_WIN32),yes)
-@@ -171,13 +174,10 @@ libpostproc/libpostproc.a:
- 	$(MAKE) -C libpostproc
- 
- %.o: %.c
--	$(CC) $(CFLAGS) -c -o $@ $< 
-+	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c -o $@ $< 
- 
- %.o: %.S
--	$(CC) $(CFLAGS) -c -o $@ $<
--
--depend: $(SRCS)
--	$(CC) -MM $(CFLAGS) $^ 1>.depend
-+	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
- 
- dep:	depend
- 
diff --git a/multimedia/ffmpeg/patches/patch-af b/multimedia/ffmpeg/patches/patch-af
deleted file mode 100644
index 908dd87f2e6..00000000000
--- a/multimedia/ffmpeg/patches/patch-af
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-af,v 1.4 2004/07/31 11:08:47 recht Exp $
-
---- libavcodec/libpostproc/postprocess_template.c.orig	Sun Jul 18 18:13:02 2004
-+++ libavcodec/libpostproc/postprocess_template.c	Sun Jul 18 19:25:47 2004
-@@ -2614,12 +2614,12 @@
- static inline void RENAME(blockCopy)(uint8_t dst[], int dstStride, uint8_t src[], int srcStride,
- 	int levelFix, int64_t *packedOffsetAndScale)
- {
--#ifndef HAVE_MMX
-+#if !defined(HAVE_MMX) || (__GNUC__ < 3)
- 	int i;
- #endif
- 	if(levelFix)
- 	{
--#ifdef HAVE_MMX
-+#if defined(HAVE_MMX) && (__GNUC__ >= 3)
- 					asm volatile(
- 						"movq (%%eax), %%mm2	\n\t" // packedYOffset
- 						"movq 8(%%eax), %%mm3	\n\t" // packedYScale
-@@ -2702,7 +2702,7 @@
- 	}
- 	else
- 	{
--#ifdef HAVE_MMX
-+#if defined(HAVE_MMX) && (__GNUC__ >= 3)
- 					asm volatile(
- 						"leal (%0,%2), %%eax	\n\t"
- 						"leal (%1,%3), %%edx	\n\t"
diff --git a/multimedia/ffmpeg/patches/patch-ag b/multimedia/ffmpeg/patches/patch-ag
deleted file mode 100644
index 14a3ec05a98..00000000000
--- a/multimedia/ffmpeg/patches/patch-ag
+++ /dev/null
@@ -1,194 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2004/08/29 22:43:50 wiz Exp $
-
---- libavformat/audio.c.orig	2003-09-28 17:26:40.000000000 +0200
-+++ libavformat/audio.c
-@@ -18,10 +18,19 @@
-  */
- #include "avformat.h"
- 
-+#ifdef __NetBSD__
-+#define USE_SUNAUDIO
-+#endif
-+
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-+#ifndef USE_SUNAUDIO
- #include <sys/soundcard.h>
-+#else
-+#include <sys/types.h>
-+#include <sys/audioio.h>
-+#endif
- #include <unistd.h>
- #include <fcntl.h>
- #include <sys/ioctl.h>
-@@ -47,9 +56,18 @@ static int audio_open(AudioData *s, int 
-     int tmp, err;
-     char *flip = getenv("AUDIO_FLIP_LEFT");
- 
-+#ifdef USE_SUNAUDIO
-+    audio_info_t info;
-+    struct audio_prinfo *settings;
-+    int mixer_fd;
-+
-+    if (!audio_device)
-+	audio_device = "/dev/audio";
-+#else
-     /* open linux audio device */
-     if (!audio_device)
-         audio_device = "/dev/dsp";
-+#endif
- 
-     if (is_output)
-         audio_fd = open(audio_device, O_WRONLY);
-@@ -77,6 +95,7 @@ static int audio_open(AudioData *s, int 
-     }
- #endif
- 
-+#ifndef USE_SUNAUDIO
-     /* select format : favour native format */
-     err = ioctl(audio_fd, SNDCTL_DSP_GETFMTS, &tmp);
-     
-@@ -124,14 +143,114 @@ static int audio_open(AudioData *s, int 
-     }
-     if (tmp)
-         s->channels = 2;
-+#else /* USE_SUNAUDIO */
-+    AUDIO_INITINFO(&info);
-+    if (!is_output) {
-+	info.mode = AUMODE_RECORD;
-+	settings = &info.record;
-+    } else {
-+	info.mode = AUMODE_PLAY;
-+	settings = &info.play;
-+    }
-+
-+    /* select format */
-+    /* Try native 16 bit format first */
-+#ifdef WORDS_BIGENDIAN
-+    settings->encoding = AUDIO_ENCODING_SLINEAR_BE;
-+    s->codec_id = CODEC_ID_PCM_S16BE;
-+#else
-+    settings->encoding = AUDIO_ENCODING_SLINEAR_LE;
-+    s->codec_id = CODEC_ID_PCM_S16LE;
-+#endif
-+    settings->precision = 16;
-+    err = ioctl(audio_fd, AUDIO_SETINFO, &info);
-+    if (err < 0) {
-+        fprintf(stderr, "Soundcard does not support signed 16 bit sample format\n");
-+        close(audio_fd);
-+        return -EIO;
-+    }
-     
-+    /* set channels */
-+    AUDIO_INITINFO(&info);
-+    settings->channels = s->channels;
-+    err = ioctl(audio_fd, AUDIO_SETINFO, &info);
-+    if (err < 0) {
-+	fprintf(stderr, "stereo not supported, using mono");
-+    }
-+
-+    /* set gain */
-+    AUDIO_INITINFO(&info);
-+    settings->gain = AUDIO_MAX_GAIN;
-+    err = ioctl(audio_fd, AUDIO_SETINFO, &info);
-+    if (err < 0) {
-+	fprintf(stderr, "setting gain to %d failed", AUDIO_MAX_GAIN);
-+    }
-+
-+#ifndef MIXER_DEVICE
-+#define MIXER_DEVICE "/dev/mixer"
-+#endif
-+    if ((mixer_fd=open(MIXER_DEVICE, O_RDONLY)) == -1)
-+	fprintf(stderr, "can't open %s\n", MIXER_DEVICE);
-+    else {
-+	int n;
-+	mixer_devinfo_t mdt;
-+	/* get debuggin information about all mixer devices */
-+	mdt.index = n = 0;
-+	while (ioctl(mixer_fd, AUDIO_MIXER_DEVINFO, &mdt) != -1) {
-+	    if (strcasecmp(mdt.label.name, "inputs") == 0) {
-+		while (mdt.next != -1) {
-+		    printf("Mixer device %d: `%s' has type %d, class %d\n",
-+			   mdt.index, mdt.label.name, mdt.type,
-+			   mdt.mixer_class);
-+		    mdt.index = mdt.next;
-+		    if (ioctl(mixer_fd, AUDIO_MIXER_DEVINFO, &mdt) == -1) {
-+			fprintf(stderr, "getting next mixer device "
-+				"failed (%d)", mdt.index);
-+			break;
-+		    }
-+		    printf("next device: ");
-+		}
-+		printf("Mixer device %d: `%s' has type %d, class %d\n",
-+		       mdt.index, mdt.label.name, mdt.type,
-+		       mdt.mixer_class);
-+	    }
-+	    n++;
-+	    mdt.index = n;
-+	}
-+	/* set input to line-in */
-+	AUDIO_INITINFO(&info);
-+	settings->port = AUDIO_LINE_IN;
-+	err = ioctl(audio_fd, AUDIO_SETINFO, &info);
-+	if (err < 0) {
-+	    fprintf(stderr, "setting input to line-in failed");
-+	}
-+    }
-+    close(mixer_fd);
-+#endif
-+
-+#ifndef USE_SUNAUDIO
-     tmp = s->sample_rate;
-     err = ioctl(audio_fd, SNDCTL_DSP_SPEED, &tmp);
-     if (err < 0) {
-         perror("SNDCTL_DSP_SPEED");
-         goto fail;
-     }
-+    
-     s->sample_rate = tmp; /* store real sample rate */
-+#else
-+    AUDIO_INITINFO(&info);
-+    settings->sample_rate = s->sample_rate;
-+    err = ioctl(audio_fd, AUDIO_SETINFO, &info);
-+    if (err < 0) {
-+	fprintf(stderr, "setting sample rate to %d failed", s->sample_rate);
-+	err = ioctl(audio_fd, AUDIO_GETINFO, &info);
-+	if (err < 0) {
-+	    perror("AUDIO_GETINFO");
-+	    goto fail;
-+	}
-+	s->sample_rate = settings->sample_rate;
-+    }
-+#endif
-     s->fd = audio_fd;
- 
-     return 0;
-@@ -239,7 +358,11 @@ static int audio_read_packet(AVFormatCon
-     AudioData *s = s1->priv_data;
-     int ret, bdelay;
-     int64_t cur_time;
-+#ifndef USE_SUNAUDIO
-     struct audio_buf_info abufi;
-+#else
-+    audio_info_t info;
-+#endif
-     
-     if (av_new_packet(pkt, s->frame_size) < 0)
-         return -EIO;
-@@ -274,9 +397,15 @@ static int audio_read_packet(AVFormatCon
-     /* compute pts of the start of the packet */
-     cur_time = av_gettime();
-     bdelay = ret;
-+#ifndef USE_SUNAUDIO
-     if (ioctl(s->fd, SNDCTL_DSP_GETISPACE, &abufi) == 0) {
-         bdelay += abufi.bytes;
-     }
-+#else
-+    if (ioctl(s->fd, AUDIO_GETINFO, &info) == 0) {
-+	bdelay += info.record.seek * (info.record.precision/8);
-+    }
-+#endif
-     /* substract time represented by the number of bytes in the audio fifo */
-     cur_time -= (bdelay * 1000000LL) / (s->sample_rate * s->channels);
- 
diff --git a/multimedia/flashplayer/DESCR b/multimedia/flashplayer/DESCR
deleted file mode 100644
index e8f0eb3df30..00000000000
--- a/multimedia/flashplayer/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Swfplayer is a standalone open source Flash(tm) player using libflash.
-You can use it to quickly play movies without starting Netscape.  It can
-also play movies in the root window (suitable for xscreensaver).
diff --git a/multimedia/flashplayer/Makefile b/multimedia/flashplayer/Makefile
deleted file mode 100644
index 717a2a929bc..00000000000
--- a/multimedia/flashplayer/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:41 tv Exp $
-#
-
-.include "../../multimedia/libflash/Makefile.common"
-
-PKGNAME=	${DISTNAME:C/-/player-/}
-PKGREVISION=	3
-COMMENT=	Standalone open source Flash(tm) player
-
-BUILD_DIRS=	${WRKSRC}/Player
-CPPFLAGS+=	-DDEV_DSP="\"${DEVOSSSOUND}\""
-
-.include "../../mk/compiler.mk"
-
-.if !empty(CC_VERSION:Mgcc-3.*)
-MAKE_ENV+=	LIBSTDCPP=-lstdc++
-.else
-MAKE_ENV+=	LIBSTDCPP=
-.endif
-
-.include "../../multimedia/libflash/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/flashplayer/PLIST b/multimedia/flashplayer/PLIST
deleted file mode 100644
index 60ccee7f769..00000000000
--- a/multimedia/flashplayer/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/01/26 13:36:18 jmmv Exp $
-bin/swfplayer
diff --git a/multimedia/fxtv/DESCR b/multimedia/fxtv/DESCR
deleted file mode 100644
index 34927232924..00000000000
--- a/multimedia/fxtv/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-To use this application, you need a video capture/tuner card
-that's based on the Brooktree 848 capture chip, such as one of the
-Hauppauge Wincast/TV or Win/TV cards, the STV TV PCI card, or the
-Intel Smart Video Recorder III.
diff --git a/multimedia/fxtv/Makefile b/multimedia/fxtv/Makefile
deleted file mode 100644
index 59af2b59826..00000000000
--- a/multimedia/fxtv/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2005/06/01 16:41:26 wiz Exp $
-
-DISTNAME=	fxtv-1.03
-PKGREVISION=	8
-CATEGORIES=	multimedia
-MASTER_SITES=	${HOMEPAGE}
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	tron@NetBSD.org
-HOMEPAGE=	http://people.freebsd.org/~rhh/fxtv/
-COMMENT=	TV display application for Brooktree 848 compatible TV cards
-
-USE_X11BASE=	YES
-USE_TOOLS+=	gmake
-
-SUBST_CLASSES+=		ossaudio
-SUBST_MESSAGE.ossaudio=	"Fixing path to audio device."
-SUBST_STAGE.ossaudio=	pre-configure
-SUBST_FILES.ossaudio=	app_rsrc.h Fxtv README
-SUBST_SED.ossaudio=	-e 's|/dev/dsp|${DEVOSSAUDIO}|g'
-
-post-extract:
-	@${RM} -f ${WRKSRC}/videolib/videolib.o
-
-pre-configure:
-	if [ -r /usr/include/machine/mouse.h ] ; then \
-		${ECHO} '#define HAVE_MOUSE_H 1' > ${WRKSRC}/netbsdconf.h; \
-	else \
-		${ECHO} '#define HAVE_MOUSE_H 0' > ${WRKSRC}/netbsdconf.h; \
-	fi
-
-.include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/tiff/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
-.include "../../x11/Xaw3d/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/fxtv/PLIST b/multimedia/fxtv/PLIST
deleted file mode 100644
index 0e83cb2c704..00000000000
--- a/multimedia/fxtv/PLIST
+++ /dev/null
@@ -1,15 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/02/23 01:06:21 wiz Exp $
-bin/fxtv
-lib/X11/app-defaults/Fxtv
-lib/X11/fxtv/README
-lib/X11/fxtv/bitmaps/mini-camera.xpm
-lib/X11/fxtv/bitmaps/mini-down.xbm
-lib/X11/fxtv/bitmaps/mini-resize.xpm
-lib/X11/fxtv/bitmaps/mini-sound.xbm
-lib/X11/fxtv/bitmaps/mini-up.xbm
-lib/X11/fxtv/bitmaps/radio_off.xbm
-lib/X11/fxtv/bitmaps/radio_on.xbm
-lib/X11/fxtv/fxtv_cnvt.sh
-man/man1/fxtv.1
-@dirrm lib/X11/fxtv/bitmaps
-@dirrm lib/X11/fxtv
diff --git a/multimedia/fxtv/distinfo b/multimedia/fxtv/distinfo
deleted file mode 100644
index 219653b9c06..00000000000
--- a/multimedia/fxtv/distinfo
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 11:24:02 agc Exp $
-
-SHA1 (fxtv-1.03.tgz) = 2ed9f2bee879a931c7f963a4ad7d07ef9cd297f9
-RMD160 (fxtv-1.03.tgz) = 740ddbb4e3b58028a6b8f17483bc27b82420f280
-Size (fxtv-1.03.tgz) = 198669 bytes
-SHA1 (patch-aa) = 19f9625dbfbacf06fdd7bb45b72a1806dc822568
-SHA1 (patch-ab) = a62c497255063a88b7d240e902a45c85f59f84b0
-SHA1 (patch-ac) = 27a825287c17d1cc957fb89ba2f665c01f998c15
-SHA1 (patch-ad) = daea79659e2b7af142ca101601887d58239f35d7
-SHA1 (patch-ae) = aa7689ff62388d4d50f89501f2c3084bc04409d8
-SHA1 (patch-af) = 50ab2d960955a8e97b6b56265195ec325b206cf9
-SHA1 (patch-ag) = 13655a94cd6200d12e25d406d7c1923f89000c80
-SHA1 (patch-ah) = 896d5164b176154b398f52d5c9887210da3d1e77
-SHA1 (patch-ai) = 85baa4b457dede91bf74ce0d8e4655fae9da2d96
-SHA1 (patch-aj) = d614a3b8813b07eaf4c17ae20b492b008df1f5d6
-SHA1 (patch-ak) = 87e4f9636aa798f9f0f5a4e27a936f800461667a
-SHA1 (patch-al) = d60ac498f40cd9ec833ca436708cb140856826f1
-SHA1 (patch-ba) = 20efae40631bdb5be57e12445bf2135a47952763
-SHA1 (patch-bb) = 1a6cc73078ac7587e6df9de6c3ec9930e498484e
-SHA1 (patch-bc) = d5ddc97b1ba5a1660d622f20d89a3a680596f024
-SHA1 (patch-bd) = c24ef4e00d800368a843d0972d66080ddc2b07eb
-SHA1 (patch-be) = ff86cb36c3379727de59632ac29efdbbc6baa1ec
-SHA1 (patch-bf) = e3ce002d342ae508262f21e9eaa4af20d1d56f77
-SHA1 (patch-bg) = fa2895e34aea2be7fccfb912276a5fbfb6c9d1be
diff --git a/multimedia/fxtv/patches/patch-aa b/multimedia/fxtv/patches/patch-aa
deleted file mode 100644
index 8c04f7a070a..00000000000
--- a/multimedia/fxtv/patches/patch-aa
+++ /dev/null
@@ -1,82 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/02/23 01:11:47 wiz Exp $
-
---- Makefile.orig	2001-02-12 23:08:59.000000000 +0100
-+++ Makefile	2005-02-23 02:00:43.000000000 +0100
-@@ -4,13 +4,10 @@
- 
- HAVE_XFREE86 = YES
- 
--ifneq ($(X11PREFIX),)                      # NetBSD
--X11BASE      ?= $(X11PREFIX)
--else
- X11BASE      ?= /usr/X11R6
--endif
-+X11BASEINST  ?= $(PREFIX)
- 
--X11BASEINST  ?= $(X11BASE)
-+PREFIX       ?= /usr/local
- LOCALBASE    ?= /usr/local
- DEBUG        = NO
- OS           = $(shell uname -s)
-@@ -24,15 +21,6 @@
- override SHELL             = /bin/sh
- 
- #
--# NetBSD stuff
--#
--ifeq ($(OS),NetBSD)
--  override INC            += -I/usr/pkg/include
--  override LIBDIRS        += /usr/pkg/lib
--  override LD_INC         += -lossaudio -lz
--endif
--
--#
- # OpenBSD stuff
- #
- ifeq ($(OS),OpenBSD)
-@@ -51,9 +39,9 @@
-   override RPATH_FLAG      = -R
- endif
- 
--override LD_INC            = $(foreach dir,$(LIBDIRS),-Wl,-L,$(dir))
-+override LD_INC            = $(foreach dir,$(LIBDIRS),-Wl,-L$(dir))
- ifneq ($(RPATH_FLAG),)
--  override LD_INC         += $(foreach dir,$(LIBDIRS),-Wl,$(RPATH_FLAG),$(dir))
-+  override LD_INC         += $(foreach dir,$(LIBDIRS),-Wl,$(RPATH_FLAG)$(dir))
- endif
- 
- #
-@@ -62,7 +50,7 @@
- ifneq ($(DEBUG),NO)
-   override CFLAGS          = -DDEBUG -g
- else
--  override CFLAGS          = -DNDEBUG -O2
-+  override CFLAGS          = -DNDEBUG
- endif
- C_WARN_FLAG                = -Wall
- override CFLAGS           += $(C_WARN_FLAG) $(INC) $(CF_VERS)
-@@ -72,6 +60,15 @@
- 
- override CFLAGS           += $(C_WARN_FLAG) -DX11BASE=\"$(X11BASEINST)\"
- 
-+#
-+# NetBSD stuff
-+#
-+ifeq ($(OS),NetBSD)
-+  override INC            += -I$(LOCALBASE)/include
-+  override LIBDIRS        += $(LOCALBASE)/lib
-+  override LD_INC         += $(LIBOSSAUDIO) -lz
-+endif
-+
- ifeq ($(OS), linux)
- override CFLAGS            = $(CFLAGS) -DOLD_TUNER_IFACE
- endif
-@@ -81,7 +78,7 @@
- #
- override LDFLAGS           = $(LD_INC) 
- override VIDEOLIB_LIB      = $(VIDEOLIB_DIR)/libvideo.a
--override LIBS              = -ltiff -ljpeg -lXaw3d -lXmu -lXt -lXpm \
-+override LIBS              = -lpng -ltiff -ljpeg -lXaw3d -lXmu -lXt -lXpm \
-                              -lSM -lICE -lXext -lX11 -lm
- ifeq ($(HAVE_XFREE86),YES)
-   override LIBS           += -lXxf86dga -lXxf86vm
diff --git a/multimedia/fxtv/patches/patch-ab b/multimedia/fxtv/patches/patch-ab
deleted file mode 100644
index 2aa8d8cf18e..00000000000
--- a/multimedia/fxtv/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/01/26 11:36:35 jmmv Exp $
-
---- pixelview_remote.c.orig	Sun May 21 17:10:09 2000
-+++ pixelview_remote.c	Tue Feb 13 22:39:48 2001
-@@ -32,6 +32,7 @@
-  *
-  */
- 
-+#include <sys/ioctl.h>
- #include <string.h>
- #include <stdlib.h>
- #include <stdio.h>
diff --git a/multimedia/fxtv/patches/patch-ac b/multimedia/fxtv/patches/patch-ac
deleted file mode 100644
index e885e7b944c..00000000000
--- a/multimedia/fxtv/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/01/26 11:36:35 jmmv Exp $
-
---- tvaudio.c.orig	Mon Feb 12 15:56:29 2001
-+++ tvaudio.c
-@@ -107,7 +107,11 @@
- #ifdef SOUND_MIXER_VIDEO
-     else if ( STREQ( buf, "VIDEO" ) ) {
-        Mixer_dev_id   = SOUND_MIXER_VIDEO;
-+#ifndef SOUND_MASK_VIDEO
-+       Mixer_dev_mask = 1 << SOUND_MIXER_VIDEO;
-+#else
-        Mixer_dev_mask = SOUND_MASK_VIDEO;
-+#endif
-        Mixer_dev_name = "VIDEO";
-     }
- #endif
diff --git a/multimedia/fxtv/patches/patch-ad b/multimedia/fxtv/patches/patch-ad
deleted file mode 100644
index 222b1314f87..00000000000
--- a/multimedia/fxtv/patches/patch-ad
+++ /dev/null
@@ -1,252 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2004/02/22 10:00:31 jmmv Exp $
-
---- app_rsrc.h.orig	2001-02-12 22:17:53.000000000 +0100
-+++ app_rsrc.h
-@@ -80,6 +80,8 @@ typedef struct _AppResources {
-     int      Bpp_24bit;
-     int      Bpp_32bit;
- 
-+    Boolean  aot_mode;
-+
-     Boolean  afc_mode;
-     Boolean  disable_direct_v;
-     String   remote_type;             /*  Type of Remote Control attached  */
-@@ -191,6 +193,8 @@ extern AppResources     App_res;
- 
- #define RNafc               "afc"
- #define RCafc               "Afc"
-+#define RNalwaysOnTop       "alwaysOnTop"
-+#define RCalwaysOnTop       "AlwaysOnTop"
- 
- #define RNdisableDirectV    "disableDirectV"
- #define RCdisableDirectV    "DisableDirectV"
-@@ -284,6 +288,7 @@ static XrmOptionDescRec Cmd_line_options
-    { "-Bpp24bit"           , RNBpp24bit       , XrmoptionSepArg, NULL        },
-    { "-Bpp32bit"           , RNBpp32bit       , XrmoptionSepArg, NULL        },
-                                                                              
-+   { "-noalwaysOnTop"      , RNalwaysOnTop    , XrmoptionNoArg , pFALSE      },
-    { "-noafc"              , RNafc            , XrmoptionNoArg , pFALSE      },
-    { "-disableDirectV"     , RNdisableDirectV , XrmoptionNoArg , pTRUE       },
-    { "-remoteType"         , RNremoteType     , XrmoptionSepArg, NULL        },
-@@ -434,6 +439,10 @@ static XtResource Resources[] = {
-         XtOffsetOf(AppResources, Bpp_32bit), XtRString,
-         "-1" /*  0 = Guess */ },   
- 
-+    { RNalwaysOnTop, RCalwaysOnTop, XtRBoolean, sizeof(Boolean),
-+        XtOffsetOf(AppResources, aot_mode), XtRImmediate,
-+        (XtPointer) True },
-+
-     { RNafc, RCafc, XtRBoolean, sizeof(Boolean),
-         XtOffsetOf(AppResources, afc_mode), XtRImmediate,
-         (XtPointer) True },
-@@ -525,96 +534,96 @@ static XtResource Resources[] = {
- };
- 
- 
--#define OPTION_HELP_STR "\
--                      BSD X TV (fxtv), Version " VERS_STR ".  
--                         Written by Randall Hopper
--
--Please mail Fxtv and Bt848 driver-related comments and help requests to the
--multimedia@freebsd.org list.  Feel free to subscribe and contribute 
--(listserv: majordomo@freebsd.org).
--
--Available options:
--
---driverDefaults             - Use appearance parms from driver on startup
---colorbars                  - Turn on colorbar display (for testing)
---hue [-90...90]             - Initial Hue           ; def=0
---brightness [-50..50]       - Initial Brightness (%); def=0
---contrast [0..200]          - Initial Contrast   (%); def=100
---satU [0..200]              - U Saturation       (%); def=100
---satV [0..284]              - V Saturation       (%); def=100
---aspectlock                 - Enable 4:3 aspect lock on video window
--
---deviceNumber <#>           - bktr/tuner device numbers; def=0      
---inputFormat <fmt>          - Tuner signal input format (ntsc,ntscm,ntscj,
--                                 palbdghi,pal,palm,paln,secam,palncomb,rsvd)
--
---tunerMode [cable|antenna]  - Tuner Mode
---defaultInput <input>       - Startup tuner signal input 
--                                 [tuner|video|svideo|csvideo|dev3]
---defaultAudioInput <input>  - Startup TV card audio input 
--                                 [tuner|external|internal|auto]
---defaultChannel <#>         - Startup Channel Number
---cableStationList   <...>   - List of cable station presets (see rsrc file)
---antennaStationList <...>   - List of antenna station presets
---cableFreqSet   <freqset>   - Freq set for cable   (def = cableirc)
--                              [nabcst|cableirc|cablehrc|weurope|jpnbcst|
--                               jpncable|xussr|australia|france]
---antennaFreqSet <freqset>   - Freq set for antenna (def = nabcst)
--
---noAudio                    - Suppress playing audio through soundcard
---dspDevice                  - Override default DSP device   (def=/dev/dsp)
---mixerDevice                - Override default mixer device (def=/dev/mixer)
---mixerChannel               - Audio mixer (line,line1/2/3,cd,mic,video)
--
---stationInWinTitle          - Display station text in window title
---stationInWinIcon           - Display station text in window icon
--
---stationAnnotFont <fontpat> - Font pattern for station annot (see rsrc file)
---stationAnnotColor <color>  - Color for station annot
---stationAnnotDelay <msec>   - How long to display (0 = never; -1 = always)
---stationAnnotIDOnly         - Display station ID alone (when available)
--
---tunerModeAnnot{Font,Color,Delay}
---inputDevAnnot{Font,Color,Delay}
---volumeDevAnnot{Font,Color,Delay}
---muteDevAnnot{Font,Color,Delay}
--                            - Other annotation options (see stationAnnot)
--
---remoteType                 - Type of attached remote control 
--                              [None|X10|Hauppauge|PixelView]
--
---recCmdMpeg2                - MPEG-2 Audio record command 
---recCmdMpeg3                - MPEG-3 Audio record command
---playCmdMpeg2               - MPEG-2 Audio play   command
---playCmdMpeg3               - MPEG-3 Audio play   command
--
---videoCnvtScript            - Video conversion workhorse script for vid encod.
--
---bswap2Bpp                  - Byte/word swap options for direct video
---nobswap2Bpp                  (used to match driver's pixel format with
---bswap3Bpp                    the video card's)
---nobswap3Bpp
---bswap4Bpp                        2Bpp - 15/16-bpp modes
---nobswap4Bpp                      3Bpp - packed 24bpp modes
---bwwap4Bpp                        4Bpp - unpacked 24bpp modes
---nowswap4Bpp
--
---Bpp24bit [3|4]             - Set frame buffer Bytes-per-pixel for 24bpp mode
---Bpp32bit [3|4]             - Set frame buffer Bytes-per-pixel for 32bpp mode
--
---videoCapFile[1-4]          - Optional paths (0-4) to scratch file paths to 
--                              use for video capture; spreads load across disks
--
---noafc                      - Disable AFC
---disableDirectV             - Disable DMA transfers straight to video card
---debug <area>               - Debug Msgs 
--                              {startup,driver,subproc,events,video,frame}
---help                       - Display program options
--
--NOTE:  All command line options are accessible as X resources as well.
--       The X resources have the same names as the command-line options.
--       See the sample Fxtv class resource file for details.
--"
-+#define OPTION_HELP_STR \
-+"                      BSD X TV (fxtv), Version " VERS_STR ".\n" \
-+"                         Written by Randall Hopper\n" \
-+"\n" \
-+"Please mail Fxtv and Bt848 driver-related comments and help requests to the\n" \
-+"multimedia@freebsd.org list.  Feel free to subscribe and contribute\n" \
-+"(listserv: majordomo@freebsd.org).\n" \
-+"\n" \
-+"Available options:\n" \
-+"\n" \
-+"-driverDefaults             - Use appearance parms from driver on startup\n" \
-+"-colorbars                  - Turn on colorbar display (for testing)\n" \
-+"-hue [-90...90]             - Initial Hue           ; def=0\n" \
-+"-brightness [-50..50]       - Initial Brightness (%); def=0\n" \
-+"-contrast [0..200]          - Initial Contrast   (%); def=100\n" \
-+"-satU [0..200]              - U Saturation       (%); def=100\n" \
-+"-satV [0..284]              - V Saturation       (%); def=100\n" \
-+"-aspectlock                 - Enable 4:3 aspect lock on video window\n" \
-+"-noalwaysOnTop              - Disable always on top\n" \
-+"\n" \
-+"-deviceNumber <#>           - bktr/tuner device numbers; def=0\n" \
-+"-inputFormat <fmt>          - Tuner signal input format (ntsc,ntscm,ntscj,\n" \
-+"                                 palbdghi,pal,palm,paln,secam,palncomb,rsvd)\n" \
-+"\n" \
-+"-tunerMode [cable|antenna]  - Tuner Mode\n" \
-+"-defaultInput <input>       - Startup tuner signal input\n" \
-+"                                 [tuner|video|svideo|csvideo|dev3]\n" \
-+"-defaultAudioInput <input>  - Startup TV card audio input\n" \
-+"                                 [tuner|external|internal|auto]\n" \
-+"-defaultChannel <#>         - Startup Channel Number\n" \
-+"-cableStationList   <...>   - List of cable station presets (see rsrc file)\n" \
-+"-antennaStationList <...>   - List of antenna station presets\n" \
-+"-cableFreqSet   <freqset>   - Freq set for cable   (def = cableirc)\n" \
-+"                              [nabcst|cableirc|cablehrc|weurope|jpnbcst|\n" \
-+"                               jpncable|xussr|australia|france]\n" \
-+"-antennaFreqSet <freqset>   - Freq set for antenna (def = nabcst)\n" \
-+"\n" \
-+"-noAudio                    - Suppress playing audio through soundcard\n" \
-+"-dspDevice                  - Override default DSP device   (def=/dev/audio)\n" \
-+"-mixerDevice                - Override default mixer device (def=/dev/mixer)\n" \
-+"-mixerChannel               - Audio mixer (line,line1/2/3,cd,mic,video)\n" \
-+"\n" \
-+"-stationInWinTitle          - Display station text in window title\n" \
-+"-stationInWinIcon           - Display station text in window icon\n" \
-+"\n" \
-+"-stationAnnotFont <fontpat> - Font pattern for station annot (see rsrc file)\n" \
-+"-stationAnnotColor <color>  - Color for station annot\n" \
-+"-stationAnnotDelay <msec>   - How long to display (0 = never; -1 = always)\n" \
-+"-stationAnnotIDOnly         - Display station ID alone (when available)\n" \
-+"\n" \
-+"-tunerModeAnnot{Font,Color,Delay}\n" \
-+"-inputDevAnnot{Font,Color,Delay}\n" \
-+"-volumeDevAnnot{Font,Color,Delay}\n" \
-+"-muteDevAnnot{Font,Color,Delay}\n" \
-+"                            - Other annotation options (see stationAnnot)\n" \
-+"\n" \
-+"-remoteType                 - Type of attached remote control\n" \
-+"                              [None|X10|Hauppauge|PixelView]\n" \
-+"\n" \
-+"-recCmdMpeg2                - MPEG-2 Audio record command\n" \
-+"-recCmdMpeg3                - MPEG-3 Audio record command\n" \
-+"-playCmdMpeg2               - MPEG-2 Audio play   command\n" \
-+"-playCmdMpeg3               - MPEG-3 Audio play   command\n" \
-+"\n" \
-+"-videoCnvtScript            - Video conversion workhorse script for vid encod.\n" \
-+"\n" \
-+"-bswap2Bpp                  - Byte/word swap options for direct video\n" \
-+"-nobswap2Bpp                  (used to match driver's pixel format with\n" \
-+"-bswap3Bpp                    the video card's)\n" \
-+"-nobswap3Bpp\n" \
-+"-bswap4Bpp                        2Bpp - 15/16-bpp modes\n" \
-+"-nobswap4Bpp                      3Bpp - packed 24bpp modes\n" \
-+"-bwwap4Bpp                        4Bpp - unpacked 24bpp modes\n" \
-+"-nowswap4Bpp\n" \
-+"\n" \
-+"-Bpp24bit [3|4]             - Set frame buffer Bytes-per-pixel for 24bpp mode\n" \
-+"-Bpp32bit [3|4]             - Set frame buffer Bytes-per-pixel for 32bpp mode\n" \
-+"\n" \
-+"-videoCapFile[1-4]          - Optional paths (0-4) to scratch file paths to\n" \
-+"                              use for video capture; spreads load across disks\n" \
-+"\n" \
-+"-noafc                      - Disable AFC\n" \
-+"-disableDirectV             - Disable DMA transfers straight to video card\n" \
-+"-debug <area>               - Debug Msgs\n" \
-+"                              {startup,driver,subproc,events,video,frame}\n" \
-+"-help                       - Display program options\n" \
-+"\n" \
-+"NOTE:  All command line options are accessible as X resources as well.\n" \
-+"       The X resources have the same names as the command-line options.\n" \
-+"       See the sample Fxtv class resource file for details.\n"
- 
- static String fallback_resources[] = { 
-  /*"Fxtv.geometry: +10+10",*/
-@@ -681,6 +690,7 @@ static String fallback_resources[] = { 
-    "*menuBox*optionsMenu*captureToCmd.label:  Capture To...",
-    "*menuBox*optionsMenu*saveOptionsCmd.label:Save Options",
-    "*menuBox*optionsMenu*setAfcCmd.label:     AFC",
-+   "*menuBox*optionsMenu*setAotCmd.label:     Always on top",
- 
-    "*menuBox*helpMenu.label:                  Help",
-    "*menuBox*helpMenu.menu.label:             Help",
-@@ -789,6 +799,7 @@ static String fallback_resources[] = { 
-    "*imageSaveDialog*suffixLabel.label:            Append Img # Suffix",
-    "*imageSaveDialog*formatLabel.label:            Format:",
-    "*imageSaveDialog*formatMenuBox*tiffCmd.label:  TIFF",
-+   "*imageSaveDialog*formatMenuBox*pngCmd.label:   PNG",
-    "*imageSaveDialog*formatMenuBox*ppmCmd.label:   PPM",
-    "*imageSaveDialog*okCmd.label:                  OK",
- 
-@@ -902,6 +913,7 @@ static String fallback_resources[] = { 
-    "*videoSaveDialog*imageEncLabel.label:           IMAGE ENCODE",
-    "*videoSaveDialog*iFileFmtLabel.label:           Format:",
-    "*videoSaveDialog*iFileFmtMenuBox*tiffCmd.label: TIFF",
-+   "*videoSaveDialog*iFileFmtMenuBox*pngCmd.label:  PNG",
-    "*videoSaveDialog*iFileFmtMenuBox*ppmCmd.label:  PPM",
-    "*videoSaveDialog*iFileFmtMenuBox*yuvCmd.label:  YUV",
- 
diff --git a/multimedia/fxtv/patches/patch-ae b/multimedia/fxtv/patches/patch-ae
deleted file mode 100644
index 3857ce8c817..00000000000
--- a/multimedia/fxtv/patches/patch-ae
+++ /dev/null
@@ -1,119 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2004/01/26 11:36:38 jmmv Exp $
-
---- imgsav.c.orig	Sun Sep 26 16:35:06 1999
-+++ imgsav.c
-@@ -29,6 +29,7 @@
- 
- /*      ******************** Include Files                ************** */
- 
-+#include <png.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
-@@ -254,6 +255,96 @@ void TVIMGSAVDoSaveTIFF( char filename[]
- }
- 
- 
-+void TVIMGSAVDoSavePNG( char filename[], TV_IMAGE *img )
-+{
-+    char       errmsg[160];
-+    png_structp png_ptr;
-+    png_infop  info_ptr;
-+    FILE      *out;
-+    TV_INT32   linebytes,
-+               y,
-+               pass,
-+               compon;
-+    TV_UINT8  *buf;
-+
-+    buf = NULL;
-+    if ( img->pix_geom.type != TV_PIXELTYPE_RGB ) {
-+        fprintf( stderr, "Attempt to save non-RGB data as TIFF\n" );
-+        exit(1);
-+    }
-+
-+    /*  Open output file  */
-+    if ( (out = fopen( filename, "wb" )) == NULL ) {
-+        sprintf( errmsg, "Can't open output file '%s'", filename );
-+        XUTILDialogPause( TVTOPLEVEL, "Error", errmsg, TV_DIALOG_TYPE_OK );
-+        return;
-+    }
-+
-+    /*  Create PNG data structures and initialize  */
-+    png_ptr = png_create_write_struct
-+	(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
-+    if (!png_ptr) {
-+        sprintf( errmsg, "Can't create PNG write structure" );
-+        XUTILDialogPause( TVTOPLEVEL, "Error", errmsg, TV_DIALOG_TYPE_OK );
-+	return;
-+    }
-+    info_ptr = png_create_info_struct(png_ptr);
-+    if (!info_ptr) {
-+	png_destroy_write_struct(&png_ptr, NULL);
-+        sprintf( errmsg, "Can't create PNG info structure" );
-+        XUTILDialogPause( TVTOPLEVEL, "Error", errmsg, TV_DIALOG_TYPE_OK );
-+	return;
-+    }
-+
-+    if (setjmp(png_jmpbuf(png_ptr))) {
-+	fprintf( stderr, "PNG write error\n" );
-+	XBell( TVDISPLAY, 100 );
-+	png_destroy_write_struct( &png_ptr, &info_ptr );
-+	free( buf );
-+	fclose( out );
-+	unlink( filename );
-+	return;
-+    }
-+    png_init_io(png_ptr, out);
-+    /*  fast compression  */
-+    png_set_compression_level(png_ptr, Z_BEST_SPEED);
-+
-+    /*  Setup image format info (chunks)  */
-+    png_set_IHDR(png_ptr, info_ptr, img->geom.w, img->geom.h,
-+		 TV_BITS_PER_COMP, PNG_COLOR_TYPE_RGB /* XXX: ? */,
-+		 PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
-+		 PNG_FILTER_TYPE_DEFAULT);
-+    /*  and write it  */
-+    png_write_info(png_ptr, info_ptr);
-+    /*  flush image out every 50 rows */
-+    png_set_flush(png_ptr, 50);
-+
-+    linebytes = img->geom.w * TV_BYTES_PER_PIX;
-+
-+    if ( (buf = malloc( linebytes )) == NULL )
-+        TVUTILOutOfMemory();
-+
-+    /*  Convert & write the image data  */
-+    for ( pass = 0; pass < 1; pass++ ) {
-+        compon = DoRed | DoGreen | DoBlue;
-+        for ( y = 0; y < img->geom.h; y++ ) {
-+
-+            /*  Format scanline  */
-+            TVIMGSAVFmtScanline24bpp( img, y, compon, buf );
-+
-+            /*  And write it in PNG  */
-+	    png_write_row(png_ptr, buf);
-+        }
-+    }
-+
-+    /*  All done.  Close up shop and go home  */
-+    png_write_end(png_ptr, NULL);
-+    png_destroy_write_struct(&png_ptr, &info_ptr);
-+    fclose(out);
-+    free( buf );
-+}
-+
-+
- void TVIMGSAVDoSavePPM( char filename[], TV_IMAGE *img )
- {
-     static char     *S_fp_buf   = NULL;
-@@ -407,6 +498,9 @@ void TVIMGSAVDoSave( char filename[], TV
-                 exit(1);
-             }
-             TVIMGSAVDoSaveTIFF( filename, img );  break;
-+
-+        case TV_STILL_FMT_PNG :
-+            TVIMGSAVDoSavePNG ( filename, img );  break;
- 
-         case TV_STILL_FMT_PPM :
-             TVIMGSAVDoSavePPM ( filename, img );  break;
diff --git a/multimedia/fxtv/patches/patch-af b/multimedia/fxtv/patches/patch-af
deleted file mode 100644
index c462d278fdd..00000000000
--- a/multimedia/fxtv/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2004/01/26 11:36:38 jmmv Exp $
-
---- tvutil.c.orig	Mon May 13 13:43:42 2002
-+++ tvutil.c	Mon May 13 13:44:18 2002
-@@ -112,7 +112,7 @@
- #elif defined(__bsdi__)
-     int    mib[2] = { CTL_KERN, KERN_MAXFILES };
- #elif defined(__NetBSD__)
--    int    mib[2] = { CTL_KERN, OPEN_MAX };
-+    int    mib[2] = { CTL_KERN, KERN_MAXFILES };
- #elif defined(__OpenBSD__)
-     int    mib[2] = { CTL_KERN, OPEN_MAX };
- #endif
diff --git a/multimedia/fxtv/patches/patch-ag b/multimedia/fxtv/patches/patch-ag
deleted file mode 100644
index dfdef768194..00000000000
--- a/multimedia/fxtv/patches/patch-ag
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2004/01/26 11:36:38 jmmv Exp $
-
---- fxtv_cnvt.sh.orig	Mon Feb 12 22:18:40 2001
-+++ fxtv_cnvt.sh
-@@ -32,7 +32,7 @@
- #VIDEO_TARGET_FPS="30"
- #VIDEO_STREAM="YES"
- #
--#IMAGE_TARGET_FMT="YUV"                 # TIFF|PPM|YUV
-+#IMAGE_TARGET_FMT="YUV"                 # TIFF|PNG|PPM|YUV
- #
- #CLEANUP_TEMP_FILES="YES"
- 
-@@ -73,6 +73,10 @@ MPEG_ENC_PARAM_STR_TIFF=\
- 'BASE_FILE_FORMAT  PPM
- INPUT_CONVERT     tifftopnm *'
- 
-+MPEG_ENC_PARAM_STR_PNG=\
-+'BASE_FILE_FORMAT  PPM
-+INPUT_CONVERT     pngtopnm *'
-+
- MPEG_ENC_PARAM_STR_PPM=\
- 'BASE_FILE_FORMAT  PPM         
- INPUT_CONVERT     *'
-@@ -181,8 +185,8 @@ GenAudioPipe() {
- 
-    # Do we need an intermediate file?
-    if [ $mpeg_enc = YES ]; then
--      out_soxfn="$out_fnbase.aiff"
--      out_soxfmt="AIFF"
-+      out_soxfn="$out_fnbase.raw"
-+      out_soxfmt="RAW"
-    else
-       out_soxfn="$GAout_fn"
-       out_soxfmt="$out_fmt"
-@@ -258,6 +262,7 @@ WriteMPEGEncodeParamFile() {
-     # Write the frame-format specific part 
-     case $frame_fmt in
-        TIFF)  str="$MPEG_ENC_PARAM_STR_TIFF";;
-+       PNG)   str="$MPEG_ENC_PARAM_STR_PNG";;
-        PPM)   str="$MPEG_ENC_PARAM_STR_PPM" ;;
-        YUV)   str="$MPEG_ENC_PARAM_STR_IYUV";;
-     esac
-@@ -277,6 +282,7 @@ WriteMPEGEncodeParamFile() {
-        base=`basename $out_fnbase`
-        case $frame_fmt in
-           TIFF)  ext="tif";;
-+          PNG)   ext="png";;
-           PPM)   ext="ppm";;
-           YUV)   ext="yuv";;
-        esac
-@@ -321,6 +327,7 @@ CountFrameFiles() {
- 
-     case $frame_fmt in
-        TIFF)  ext="tif";;
-+       PNG)   ext="png";;
-        PPM)   ext="ppm";;
-        YUV)   ext="yuv";;
-     esac
diff --git a/multimedia/fxtv/patches/patch-ah b/multimedia/fxtv/patches/patch-ah
deleted file mode 100644
index e835f0ffc2a..00000000000
--- a/multimedia/fxtv/patches/patch-ah
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 2004/01/26 11:36:38 jmmv Exp $
-
---- imgsav_dlg.c.orig	Mon Sep  6 15:07:29 1999
-+++ imgsav_dlg.c
-@@ -69,6 +69,7 @@ static Pixmap Select_pixmap   = None,
- 
- static TV_IFILEFMT_ITEM_DEF Fmtitem_def[] = {
-     { TV_STILL_FMT_TIFF   ,  "tiff", "tiffCmd" },
-+    { TV_STILL_FMT_PNG    ,  "png",  "pngCmd" },
-     { TV_STILL_FMT_PPM    ,  "ppm" , "ppmCmd"  }
- };
- 
diff --git a/multimedia/fxtv/patches/patch-ai b/multimedia/fxtv/patches/patch-ai
deleted file mode 100644
index e18ccbaaff7..00000000000
--- a/multimedia/fxtv/patches/patch-ai
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 2004/01/26 11:36:38 jmmv Exp $
-
---- batch_mode.c.orig	Sat Oct 23 15:50:35 1999
-+++ batch_mode.c
-@@ -154,6 +154,8 @@ static void DoStreamVideo( TV_BATCH_PARM
- 
-     if ( STREQ( parm->frame_fmt, "TIFF" ) )
-         fmt = TV_STILL_FMT_TIFF;
-+    else if ( STREQ( parm->frame_fmt, "PNG" ) )
-+        fmt = TV_STILL_FMT_PNG;
-     else if ( STREQ( parm->frame_fmt, "PPM" ) )
-         fmt = TV_STILL_FMT_PPM;
-     else if ( STREQ( parm->frame_fmt, "YUV" ) )
-@@ -175,6 +177,7 @@ static void DoStreamVideo( TV_BATCH_PARM
-     if ( parm->video_target && !video2stdout )
-         switch ( fmt ) {
-             case TV_STILL_FMT_TIFF : frame_ext = "tif";  break;
-+            case TV_STILL_FMT_PNG  : frame_ext = "png";  break;
-             case TV_STILL_FMT_PPM  : frame_ext = "ppm";  break;
-             case TV_STILL_FMT_YUV  : frame_ext = "yuv";  break;
-             default: abort();
-@@ -209,7 +212,8 @@ static void DoStreamVideo( TV_BATCH_PARM
-         return;
- 
-     /*  Sanity check raw data with save type  */
--    if ( ((( fmt == TV_STILL_FMT_TIFF ) || ( fmt == TV_STILL_FMT_PPM )) &&
-+    if ( ((( fmt == TV_STILL_FMT_TIFF ) || ( fmt == TV_STILL_FMT_PNG )
-+	   || ( fmt == TV_STILL_FMT_PPM )) &&
-           ( img.pix_geom.type != TV_PIXELTYPE_RGB )) ||
-          (( fmt == TV_STILL_FMT_YUV ) &&
-           ( img.pix_geom.type != TV_PIXELTYPE_YUV )) ) {
diff --git a/multimedia/fxtv/patches/patch-aj b/multimedia/fxtv/patches/patch-aj
deleted file mode 100644
index 1eb4a5e69a8..00000000000
--- a/multimedia/fxtv/patches/patch-aj
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-aj,v 1.2 2004/02/22 10:00:31 jmmv Exp $
-
---- Fxtv.orig	2003-09-28 17:38:29.000000000 +0200
-+++ Fxtv	2003-09-28 17:38:29.000000000 +0200
-@@ -11,6 +11,8 @@
-                                         ! tuner, video, svideo, csvideo, dev3
- !Fxtv*defaultAudioInput: tuner           
-                                         ! tuner, external, internal, auto
-+Fxtv*alwaysOnTop: 	True
-+                                        ! Always On Top
- Fxtv*afc:      		False
-                                         ! Automatic Frequency Control
- !Fxtv*remoteType:	Hauppauge
-@@ -320,6 +322,7 @@
- *imageSaveDialog*suffixLabel.label:            Append Img # Suffix
- *imageSaveDialog*formatLabel.label:            Format:
- *imageSaveDialog*formatMenuBox*tiffCmd.label:  TIFF
-+*imageSaveDialog*formatMenuBox*pngCmd.label:   PNG
- *imageSaveDialog*formatMenuBox*ppmCmd.label:   PPM
- *imageSaveDialog*okCmd.label:                  OK
- 
-@@ -432,6 +435,7 @@
- *videoSaveDialog*imageEncLabel.label:           IMAGE ENCODE
- *videoSaveDialog*iFileFmtLabel.label:           Format:
- *videoSaveDialog*iFileFmtMenuBox*tiffCmd.label: TIFF
-+*videoSaveDialog*iFileFmtMenuBox*pngCmd.label:  PNG
- *videoSaveDialog*iFileFmtMenuBox*ppmCmd.label:  PPM
- *videoSaveDialog*iFileFmtMenuBox*yuvCmd.label:  YUV
- 
diff --git a/multimedia/fxtv/patches/patch-ak b/multimedia/fxtv/patches/patch-ak
deleted file mode 100644
index 82ada6b8419..00000000000
--- a/multimedia/fxtv/patches/patch-ak
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ak,v 1.1.1.1 2004/01/26 11:36:40 jmmv Exp $
-
---- glob.h.orig	2001-02-12 20:24:44.000000000 +0100
-+++ glob.h
-@@ -54,6 +54,7 @@ typedef enum {
- 
- typedef enum {
-             TV_STILL_FMT_TIFF,
-+            TV_STILL_FMT_PNG,
-             TV_STILL_FMT_PPM,
-             TV_STILL_FMT_YUV,
-             TV_NUM_STILL_FMTS
-@@ -133,6 +134,8 @@ typedef struct {
-     TV_TUNER_MODE tuner_mode;
-     TV_BOOL       afc_mode;
- 
-+    TV_BOOL       aot_mode;
-+
-     TV_BOOL       last_station_is_chan;
-     TV_INT32      last_chan;
-     double        last_freq;
diff --git a/multimedia/fxtv/patches/patch-al b/multimedia/fxtv/patches/patch-al
deleted file mode 100644
index 673575ccb23..00000000000
--- a/multimedia/fxtv/patches/patch-al
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-al,v 1.1.1.1 2004/01/26 11:36:40 jmmv Exp $
-
---- vidsav_dlg.c.orig	Mon Feb 12 22:20:10 2001
-+++ vidsav_dlg.c
-@@ -235,6 +235,7 @@ static TV_ICAPFMT_ITEM_DEF     Icap_fmt_
- 
- static TV_IFILEFMT_ITEM_DEF    Ifile_fmt_item_def[] = {
-     { TV_STILL_FMT_TIFF   ,  "tiff", "tiffCmd" },
-+    { TV_STILL_FMT_PNG    ,  "png",  "pngCmd" },
-     { TV_STILL_FMT_PPM    ,  "ppm" , "ppmCmd"  },
-     { TV_STILL_FMT_YUV    ,  "yuv" , "yuvCmd"  }
- };
-@@ -872,6 +873,7 @@ static TV_BOOL WriteVidConvertShScript( 
- 
-     switch ( p->img_sav_fmt ) {
-         case TV_STILL_FMT_TIFF : str = "TIFF";  break;
-+        case TV_STILL_FMT_PNG  : str = "PNG";  break;
-         case TV_STILL_FMT_PPM  : str = "PPM" ;  break;
-         case TV_STILL_FMT_YUV  : str = "YUV" ;  break;
-         default                : str = ""    ;  break;
diff --git a/multimedia/fxtv/patches/patch-ba b/multimedia/fxtv/patches/patch-ba
deleted file mode 100644
index 593b593b2f0..00000000000
--- a/multimedia/fxtv/patches/patch-ba
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD: patch-ba,v 1.1.1.1 2004/01/26 11:36:40 jmmv Exp $
---- remote.c.orig	Fri Jan 10 02:18:28 2003
-+++ remote.c	Fri Jan 10 02:18:32 2003
-@@ -33,6 +33,8 @@
- 
- /*      ******************** Include Files                ************** */
- 
-+#include "netbsdconf.h"
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <errno.h>
-@@ -53,8 +55,10 @@
- #  include <machine/mouse.h>
- # endif
- #else
-+#if HAVE_MOUSE_H
- # include <machine/mouse.h>
- #endif
-+#endif
- #include <X11/Intrinsic.h>
- #include "tvdebug.h"
- #include "tvutil.h"
-@@ -62,6 +66,8 @@
- #include "haup_remote.h"
- #include "pixelview_remote.h"
- 
-+#if HAVE_MOUSE_H
-+
- /*      ******************** Local defines                ************** */
- 
- /*  FIXME: Remove this old code someday  */
-@@ -847,3 +853,18 @@
-     case REMOTE_TYPE_PIXELVIEW :  TVPIXELVIEWREMOTEFlush(); break;
-   }
- }
-+
-+#else /* HAVE_MOUSE_H */
-+void
-+TVREMOTEOpen( XtAppContext       app_ctx, 
-+	char               rem_type[], 
-+	TVREMOTE_CB_FUNCT *cb )
-+	{
-+	}
-+
-+void
-+TVREMOTEFlush( void )
-+	{
-+	}
-+
-+#endif /* HAVE_MOUSE_H */
diff --git a/multimedia/fxtv/patches/patch-bb b/multimedia/fxtv/patches/patch-bb
deleted file mode 100644
index 61c3669d0e8..00000000000
--- a/multimedia/fxtv/patches/patch-bb
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bb,v 1.1.1.1 2004/01/26 11:36:40 jmmv Exp $
-
---- glob.c.orig	2001-02-12 19:26:16.000000000 +0100
-+++ glob.c
-@@ -131,6 +131,7 @@ void TVGLOBInitPrefs( TV_PREFS *p )
-     p->cable_freq_set  = 1;
-     p->tuner_mode      = TV_TUNER_MODE_ANTENNA;
-     p->afc_mode        = TRUE;
-+    p->aot_mode        = TRUE;
- 
-     p->last_chan       = 3;               /*  -1 = use last_freq  */
-     p->last_freq       = 0.0;
diff --git a/multimedia/fxtv/patches/patch-bc b/multimedia/fxtv/patches/patch-bc
deleted file mode 100644
index 561fbd488c2..00000000000
--- a/multimedia/fxtv/patches/patch-bc
+++ /dev/null
@@ -1,66 +0,0 @@
-$NetBSD: patch-bc,v 1.1.1.1 2004/01/26 11:36:40 jmmv Exp $
-
---- tvmenu.c.orig	2001-02-12 22:19:33.000000000 +0100
-+++ tvmenu.c
-@@ -103,7 +103,7 @@ typedef void XT_CB( Widget w, XtPointer 
- 
- /*      ******************** Forward declarations         ************** */
- 
--static XT_CB QuitCB, FreezeCB, MuteCB, ZoomCB, InputCB, AfcCB, TModeCB, 
-+static XT_CB QuitCB, FreezeCB, MuteCB, ZoomCB, InputCB, AfcCB, AotCB, TModeCB, 
-              ChanUpDnCB, AppearCB, AspectCB, AboutCB, ImgSavCB, ImgSavAsCB, 
-              AudSavAsCB, VidSavAsCB, FormatCB, AudInpCB, StationPopupCB;
- 
-@@ -160,6 +160,7 @@ static TV_MENUITEM_DEF Menuitem_def[] = 
-    { TVMI( FORMAT,FORMAT_PALNCOMB   ), "palncombFmt"   , WC_mcmd , FormatCB  },
-    { TVMI( OPTIONS,OPTIONS_ASPECT   ), "aspectLockCmd" , WC_mcmd , AspectCB  },
-    { TVMI( OPTIONS,OPTIONS_AFC      ), "setAfcCmd",      WC_mcmd , AfcCB     },
-+   { TVMI( OPTIONS,OPTIONS_AOT      ), "setAotCmd",      WC_mcmd , AotCB     },
-    { TV_MENU_OPTIONS, -1             , "line"          , WC_mline, NULL      },
- /*
-    { TVMI( OPTIONS,OPTIONS_SAVE     ), "saveOptionsCmd", WC_mcmd , NULL      },
-@@ -396,6 +397,16 @@ static void AfcCB( Widget w, XtPointer c
-     TVMENUSetSelectedAfcMode( p->afc_mode );
- }
- 
-+/*   AotCB - Change the always on top mode */
-+static void AotCB( Widget w, XtPointer cl, XtPointer cb )
-+{
-+    TV_PREFS        *p = &G_glob.prefs;
-+
-+    p->aot_mode = !p->aot_mode;
-+    XUTILSetAlwaysOnTop( p->aot_mode );
-+    TVMENUSetSelectedAotMode( p->aot_mode );
-+}
-+
- void TVMENUSetSelectedInputFormat( TV_INPUT_FORMAT fmt )
- {
-     TV_MENUITEM_DEF *mi;
-@@ -1008,6 +1019,19 @@ void TVMENUSetSelectedAfcMode( TV_BOOL a
-                                 NULL);
- }
- 
-+void TVMENUSetSelectedAotMode( TV_BOOL aot )
-+{
-+    TV_MENUITEM_DEF *item = LookupMenuItemByKey( TV_MENUITEM_OPTIONS_AOT );
-+    Pixmap           pix;
-+
-+    if ( Select_pixmap == None )
-+        TVMENULoadRadioPixmaps();
-+
-+    pix = aot ? Select_pixmap : Unselect_pixmap;
-+    XtVaSetValues( item->wgt  , XtNleftBitmap, pix,
-+                                NULL);
-+}
-+
- void TVMENUSetSelectedAspectLock( TV_BOOL aspect_lock )
- {
-     TV_MENUITEM_DEF *item = LookupMenuItemByKey( TV_MENUITEM_OPTIONS_ASPECT );
-@@ -1043,6 +1067,7 @@ void TVMENUResync()
-     TVMENUSetSelectedAudioInputDevice( aud_input     );
-     TVMENUSetSelectedTunerMode       ( p->tuner_mode );
-     TVMENUSetSelectedAfcMode         ( p->afc_mode   );
-+    TVMENUSetSelectedAotMode         ( p->aot_mode   );
- }
- 
- /*  TVTOOLSSetStationText  -  Sets the channel text to the specified      */
diff --git a/multimedia/fxtv/patches/patch-bd b/multimedia/fxtv/patches/patch-bd
deleted file mode 100644
index 4935b444f95..00000000000
--- a/multimedia/fxtv/patches/patch-bd
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-bd,v 1.1.1.1 2004/01/26 11:36:40 jmmv Exp $
-
---- tvmenu.h.orig	2001-02-12 20:00:59.000000000 +0100
-+++ tvmenu.h
-@@ -63,6 +63,7 @@ typedef enum {
-     TV_MENUITEM_FORMAT_PALNCOMB,
-     TV_MENUITEM_OPTIONS_ASPECT,
-     TV_MENUITEM_OPTIONS_AFC,
-+    TV_MENUITEM_OPTIONS_AOT,
-     TV_MENUITEM_OPTIONS_SAVE,
-     TV_MENUITEM_HELP_ABOUT,
-        TV_NUM_MENUITEMS
-@@ -101,6 +102,8 @@ void TVMENUSetSelectedAudioInputDevice( 
- 
- void TVMENUSetSelectedAfcMode( TV_BOOL afc );
- 
-+void TVMENUSetSelectedAotMode( TV_BOOL aot );
-+
- void TVMENUSetSelectedAspectLock( TV_BOOL aspect_lock );
- 
- void TVMENUSetSelectedTunerMode( TV_TUNER_MODE mode );
diff --git a/multimedia/fxtv/patches/patch-be b/multimedia/fxtv/patches/patch-be
deleted file mode 100644
index 41a65baa7a3..00000000000
--- a/multimedia/fxtv/patches/patch-be
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-be,v 1.1.1.1 2004/01/26 11:36:40 jmmv Exp $
-
---- xutil.h.orig	2003-09-28 17:18:28.000000000 +0200
-+++ xutil.h	2003-09-28 17:18:28.000000000 +0200
-@@ -137,6 +137,8 @@
-                                       int           screen,
-                                       XVisualInfo **fb_visual );
- 
-+void XUTILSetAlwaysOnTop( TV_BOOL status );
-+
- #ifdef __cplusplus
- }  /* Close 'extern "C"' */
- #endif
diff --git a/multimedia/fxtv/patches/patch-bf b/multimedia/fxtv/patches/patch-bf
deleted file mode 100644
index 8d11067d163..00000000000
--- a/multimedia/fxtv/patches/patch-bf
+++ /dev/null
@@ -1,70 +0,0 @@
-$NetBSD: patch-bf,v 1.1.1.1 2004/01/26 11:36:40 jmmv Exp $
-
---- xutil.c.orig	1999-11-05 01:38:54.000000000 +0100
-+++ xutil.c
-@@ -44,6 +44,7 @@
- #include <X11/Shell.h>
- #include <X11/Xaw/Dialog.h>
- #include <X11/xpm.h>
-+#include "glob.h"
- #include "tvdefines.h"
- #include "xutil.h"
- #include "app_rsrc.h"
-@@ -63,6 +64,10 @@ void XawScrollbarSetThumb( Widget w, flo
- 
- #define WM_BORDER_PAD 40
- 
-+#define _NET_WM_STATE_REMOVE	0
-+#define _NET_WM_STATE_ADD	1
-+#define _NET_WM_STATE_TOGGLE	2
-+
- typedef struct {
-     pid_t                  cmd_pid;
-     TVUTIL_PIPE_END        end[3];
-@@ -1543,3 +1548,46 @@ void XUTILDetermineFrameBufferVisual( Di
-         }
-     }
- }
-+
-+static void
-+change_state (Display *d, Screen * screen, Window xwindow, int add,
-+              Atom state1, Atom state2)
-+{
-+    XEvent xev;
-+
-+    xev.xclient.type = ClientMessage;
-+    xev.xclient.serial = 0;
-+    xev.xclient.send_event = True;
-+    xev.xclient.display = d;
-+    xev.xclient.window = xwindow;
-+    xev.xclient.message_type = XInternAtom (d, "_NET_WM_STATE", FALSE);
-+    xev.xclient.format = 32;
-+    xev.xclient.data.l[0] = add ? _NET_WM_STATE_ADD : _NET_WM_STATE_REMOVE;
-+    xev.xclient.data.l[1] = state1;
-+    xev.xclient.data.l[2] = state2;
-+
-+    XSendEvent (d, RootWindowOfScreen (screen), False,
-+                SubstructureRedirectMask | SubstructureNotifyMask, &xev);
-+}
-+
-+void XUTILSetAlwaysOnTop(TV_BOOL status)
-+{
-+    Display  *d       = TVDISPLAY;
-+    Screen   *screen  = XtScreen ( TVTOPLEVEL );
-+    Window   win      = XtWindow ( TVTOPLEVEL );
-+    static Atom xa_ABOVE = 0;
-+    static Atom xa_BELOW = 0;
-+        
-+    if (!xa_ABOVE)
-+    {
-+        xa_ABOVE = XInternAtom (d, "_NET_WM_STATE_ABOVE", FALSE);
-+        xa_BELOW = XInternAtom (d, "_NET_WM_STATE_BELOW", FALSE);
-+    }
-+
-+    if (status) {
-+        change_state (d, screen, win, FALSE, xa_ABOVE, xa_BELOW);
-+        change_state (d, screen, win, TRUE,  xa_ABOVE, None);
-+    } else {
-+        change_state (d, screen, win, FALSE, xa_ABOVE, xa_BELOW);
-+    }
-+}
diff --git a/multimedia/fxtv/patches/patch-bg b/multimedia/fxtv/patches/patch-bg
deleted file mode 100644
index 77a937c3dcb..00000000000
--- a/multimedia/fxtv/patches/patch-bg
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-bg,v 1.1.1.1 2004/01/26 11:36:40 jmmv Exp $
-
---- tv.c.orig	2001-02-12 20:03:09.000000000 +0100
-+++ tv.c
-@@ -873,6 +873,9 @@ int main( int argc, char *argv[] )
-     S_wm_delete_window = XInternAtom( TVDISPLAY, "WM_DELETE_WINDOW", False );
-     XSetWMProtocols( TVDISPLAY, XtWindow( top_level ), &S_wm_delete_window, 1);
-     
-+    p->aot_mode = (App_res.aot_mode != FALSE);
-+    XUTILSetAlwaysOnTop( p->aot_mode );
-+
-     TVSCREENUpdateShellRsrcs( top_level, d->video_wgt );
- 
-     TVMENUResync();
diff --git a/multimedia/gmencoder/DESCR b/multimedia/gmencoder/DESCR
deleted file mode 100644
index a470541a035..00000000000
--- a/multimedia/gmencoder/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Gmencoder is a GNOME2 frontend to mplayer/mencoder.  It supports much of the
-output codecs, as well as postprocesing, cropping, scaling, subtitles ripping,
-and one, two or three passes for encoding.
diff --git a/multimedia/gmencoder/Makefile b/multimedia/gmencoder/Makefile
deleted file mode 100644
index 299fdf0ddda..00000000000
--- a/multimedia/gmencoder/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2005/08/10 20:56:20 jlam Exp $
-#
-
-DISTNAME=	gmencoder-0.1.0
-PKGREVISION=	12
-CATEGORIES=	multimedia
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gmencoder/}
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://gmencoder.sourceforge.net/
-COMMENT=	GNOME2 frontend to mencoder
-
-BUILD_USES_MSGFMT=	yes
-DEPENDS+=       	mencoder>=0.90:../../multimedia/mencoder
-DEPENDS+=       	mplayer>=0.90:../../multimedia/mplayer
-
-GNU_CONFIGURE=		yes
-USE_DIRS+=       	gnome2-1.5
-USE_TOOLS+=		gmake pkg-config
-USE_PKGINSTALL=		yes
-USE_PKGLOCALEDIR=	yes
-
-CFLAGS+=		-DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
-EGDIR=			${PREFIX}/share/examples/gmencoder
-CONF_FILES=		${EGDIR}/gmencoder_opts ${PKG_SYSCONFDIR}/gmencoder_opts
-
-post-build:
-	${MV} ${WRKSRC}/etc/gmencoder_opts ${WRKSRC}/etc/gmencoder_opts.in
-	${SED} -e 's|/usr/local|${PREFIX}|g' \
-		< ${WRKSRC}/etc/gmencoder_opts.in > ${WRKSRC}/etc/gmencoder_opts
-
-post-install:
-	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/etc/gmencoder_opts ${EGDIR}
-
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gmencoder/PLIST b/multimedia/gmencoder/PLIST
deleted file mode 100644
index 284890e774a..00000000000
--- a/multimedia/gmencoder/PLIST
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/01/26 12:12:06 jmmv Exp $
-bin/gmencoder
-share/examples/gmencoder/gmencoder_opts
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gmencoder.mo
-share/pixmaps/gmencoder/media-pause.png
-share/pixmaps/gmencoder/media-play.png
-@dirrm share/pixmaps/gmencoder
-@dirrm share/examples/gmencoder
diff --git a/multimedia/gmencoder/distinfo b/multimedia/gmencoder/distinfo
deleted file mode 100644
index 133dd776583..00000000000
--- a/multimedia/gmencoder/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 11:24:02 agc Exp $
-
-SHA1 (gmencoder-0.1.0.tgz) = c262f402b004e2d13fec8f2e81eaf5309f268d83
-RMD160 (gmencoder-0.1.0.tgz) = 2621bbcdb8180a940f29a1501acb65e170c2520a
-Size (gmencoder-0.1.0.tgz) = 120557 bytes
-SHA1 (patch-aa) = 989772ed57ae44eb19f7d8f64a0ee20de5355de4
-SHA1 (patch-ab) = bbb32ad10269338ca727e951e11c7a4fdb00ce5d
-SHA1 (patch-ac) = b36a57a29360042a2ff266d3d6fea8372747c707
diff --git a/multimedia/gmencoder/patches/patch-aa b/multimedia/gmencoder/patches/patch-aa
deleted file mode 100644
index af8f59ca1a2..00000000000
--- a/multimedia/gmencoder/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/01/26 12:12:06 jmmv Exp $
-
---- src/callbacks.c.orig	2003-04-23 19:55:26.000000000 +0200
-+++ src/callbacks.c	2003-04-23 19:55:40.000000000 +0200
-@@ -8,6 +8,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <unistd.h>
-+#include <pthread.h>
- 
- #include "callbacks.h"
- #include "interface.h"
diff --git a/multimedia/gmencoder/patches/patch-ab b/multimedia/gmencoder/patches/patch-ab
deleted file mode 100644
index 3d13fd34af8..00000000000
--- a/multimedia/gmencoder/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/01/26 12:12:06 jmmv Exp $
-
---- src/main.c.orig	2003-06-12 17:32:13.000000000 +0200
-+++ src/main.c
-@@ -359,7 +359,7 @@ Configura ()
- 
- 	if (!strlen (fichero_opts))
- 	{
--		sprintf (fichero_opts, "/etc/gmencoder_opts", home);
-+		sprintf (fichero_opts, PKG_SYSCONFDIR "/gmencoder_opts", home);
- 		if (-1 != (fd = open (fichero_opts, O_RDONLY)))
- 		{
- 			close (fd);
diff --git a/multimedia/gmencoder/patches/patch-ac b/multimedia/gmencoder/patches/patch-ac
deleted file mode 100644
index 040579cba12..00000000000
--- a/multimedia/gmencoder/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/01/26 12:12:06 jmmv Exp $
-
---- configure.orig	2003-06-12 17:48:46.000000000 +0200
-+++ configure
-@@ -3876,7 +3876,7 @@ done
- 
- # Busco la versi�n de mplayer 
- echo -n checking for mplayer...
--MPLAYER=`type -path mplayer` 
-+MPLAYER=`whereis mplayer` 
- if [ "$?" = "1" ] ; then
- 	echo No mplayer found in your path
- fi
-@@ -3901,7 +3901,7 @@ esac
- EXTRA_DEFS="$EXTRA_DEFS -D$VER -DMP_PATH=\\\"\"${MPLAYER}\\\"\""
- 
- echo -n checking for mencoder...
--MENCODER=`type -path mencoder`
-+MENCODER=`whereis mencoder`
- if [ "$?" = "1" ] ; then
- 	echo No mencoder found in your path
- fi
diff --git a/multimedia/gmplayer/DESCR b/multimedia/gmplayer/DESCR
deleted file mode 100644
index 7775780b112..00000000000
--- a/multimedia/gmplayer/DESCR
+++ /dev/null
@@ -1,13 +0,0 @@
-MPlayer is a movie player for LINUX (runs on many other Unices,
-and non-x86 CPUs). It plays most MPEG, VOB, AVI, VIVO, ASF/WMV,
-QT/MOV, FLI, RM, NuppelVideo, yuv4mpeg, FILM, RoQ files, supported
-by many native, XAnim, and Win32 DLL codecs. You can watch VideoCD,
-SVCD, DVD, 3ivx, and even DivX movies too. The another big feature
-of mplayer is the wide range of supported output drivers. It works
-with X11, Xv, DGA, OpenGL, SVGAlib, fbdev, AAlib, DirectFB, but you
-can use GGI and SDL (and this way all their drivers) and some
-lowlevel card-specific drivers (for  Matrox, 3Dfx and Radeon) too!
-Most of them supports software or hardware scaling, so you can enjoy
-movies in fullscreen. And what about the nice big antialiased shaded
-subtitles (10  supported  types!!!) with european/ISO 8859-1,2
-(hungarian, english, czech, etc), cyrillic, korean fonts, and OSD...
diff --git a/multimedia/gmplayer/Makefile b/multimedia/gmplayer/Makefile
deleted file mode 100644
index 31959552146..00000000000
--- a/multimedia/gmplayer/Makefile
+++ /dev/null
@@ -1,81 +0,0 @@
-# $NetBSD: Makefile,v 1.40 2005/11/09 06:23:04 minskim Exp $
-
-#
-# NOTE: if you are updating both mplayer and gmplayer, you must ensure
-# that *both* distinfo files contain the correct, up-to-date files and
-# checksums.
-#
-# NOTE: patches are shared between mplayer and gmplayer!
-#
-
-PKGNAME=	gmplayer-${MPLAYER_PKG_VERSION}
-PKGREVISION=	3
-
-SKIN_SITES=	http://www1.mplayerhq.hu/MPlayer/Skin/		\
-		ftp://ftp1.mplayerhq.hu/MPlayer/Skin/		\
-		http://ftp5.mplayerhq.hu/mplayer/Skin/		\
-		ftp://ftp5.mplayerhq.hu/mplayer/Skin/		\
-		ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/mplayer/ \
-		${MASTER_SITE_LOCAL:=mplayer}
-
-.include "../../multimedia/mplayer-share/Makefile.common"
-
-COMMENT=	Software only MPEG-1/2/4 video decoder with a GTK+ interface
-
-SKINS +=	AlienMind-1.2${EXTRACT_SUFX}			\
-		Blue-1.4${EXTRACT_SUFX}				\
-		BlueHeart-1.5${EXTRACT_SUFX}			\
-		CornerMP-1.2${EXTRACT_SUFX}			\
-		CornerMP-aqua-1.4${EXTRACT_SUFX}		\
-		Cyrus-1.2${EXTRACT_SUFX}			\
-		MidnightLove-1.6${EXTRACT_SUFX}			\
-		WMP6-2.2${EXTRACT_SUFX}				\
-		avifile-1.6${EXTRACT_SUFX}			\
-		gnome-1.1${EXTRACT_SUFX}			\
-		hayraphon-1.0${EXTRACT_SUFX}			\
-		hwswskin-1.1${EXTRACT_SUFX}			\
-		mentalic-1.2${EXTRACT_SUFX}			\
-		neutron-1.5${EXTRACT_SUFX}			\
-		phony-1.1${EXTRACT_SUFX}			\
-		plastic-1.2${EXTRACT_SUFX}			\
-		proton-1.2${EXTRACT_SUFX}			\
-		slim-1.2${EXTRACT_SUFX}				\
-		xanim-1.6${EXTRACT_SUFX}			\
-		xine-lcd-1.2${EXTRACT_SUFX}
-
-.if !defined(SITES_AlienMind-1.2.tar.bz2)
-.  for skin in ${SKINS}
-SITES_${skin}= ${SKIN_SITES}
-.  endfor
-.endif
-
-DISTFILES+=	${DISTNAME}${EXTRACT_SUFX}
-DISTFILES+=	${SKINS}
-DISTINFO_FILE=	${.CURDIR}/distinfo
-DIST_SUBDIR=	${PKGNAME_NOREV}-20050409
-
-USE_TOOLS+=		gtar
-CONFIGURE_ARGS+=	--enable-gui --disable-mencoder \
-			--confdir=${PREFIX}/share/mplayer
-
-INSTALLATION_DIRS=	bin
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/mplayer ${PREFIX}/bin/gmplayer
-	${INSTALL_DATA_DIR} ${PREFIX}/share/mplayer/Skin
-.for SKIN in ${SKINS}
-	@${ECHO_MSG} "Installing skin ${SKIN}..."
-	@${BZCAT} ${DISTDIR}/${DIST_SUBDIR}/${SKIN} |	\
-	  ${GTAR} xCmf ${PREFIX}/share/mplayer/Skin -
-.endfor
-	@${CHMOD} -R a+r ${PREFIX}/share/mplayer/Skin
-	@${CHMOD} a+rx ${PREFIX}/share/mplayer/Skin/*
-	@${RM} -f ${PREFIX}/share/mplayer/Skin/default
-	${LN} -s Blue ${PREFIX}/share/mplayer/Skin/default
-
-.include "../../multimedia/mplayer-share/Makefile.depends"
-
-.include "../../x11/gtk/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
-.include "../../multimedia/mplayer-share/Makefile.cflags"
diff --git a/multimedia/gmplayer/PLIST b/multimedia/gmplayer/PLIST
deleted file mode 100644
index 84459112ef0..00000000000
--- a/multimedia/gmplayer/PLIST
+++ /dev/null
@@ -1,583 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2004/10/20 20:02:13 tron Exp $
-bin/gmplayer
-share/mplayer/Skin/AlienMind/README
-share/mplayer/Skin/AlienMind/VERSION
-share/mplayer/Skin/AlienMind/balance.png
-share/mplayer/Skin/AlienMind/eqb.png
-share/mplayer/Skin/AlienMind/exit.png
-share/mplayer/Skin/AlienMind/font.fnt
-share/mplayer/Skin/AlienMind/font.png
-share/mplayer/Skin/AlienMind/iconify.png
-share/mplayer/Skin/AlienMind/load.png
-share/mplayer/Skin/AlienMind/loop.png
-share/mplayer/Skin/AlienMind/main.png
-share/mplayer/Skin/AlienMind/menu.png
-share/mplayer/Skin/AlienMind/menubutt.png
-share/mplayer/Skin/AlienMind/menus.png
-share/mplayer/Skin/AlienMind/next.png
-share/mplayer/Skin/AlienMind/numbers.fnt
-share/mplayer/Skin/AlienMind/numbers.png
-share/mplayer/Skin/AlienMind/pause.png
-share/mplayer/Skin/AlienMind/play.png
-share/mplayer/Skin/AlienMind/plb.png
-share/mplayer/Skin/AlienMind/pos.png
-share/mplayer/Skin/AlienMind/prev.png
-share/mplayer/Skin/AlienMind/shuffle.png
-share/mplayer/Skin/AlienMind/skin
-share/mplayer/Skin/AlienMind/stop.png
-share/mplayer/Skin/AlienMind/sub.png
-share/mplayer/Skin/AlienMind/volume.png
-share/mplayer/Skin/Blue/README
-share/mplayer/Skin/Blue/VERSION
-share/mplayer/Skin/Blue/about.png
-share/mplayer/Skin/Blue/bareqb.png
-share/mplayer/Skin/Blue/barexit.png
-share/mplayer/Skin/Blue/barffwd.png
-share/mplayer/Skin/Blue/barfwd.png
-share/mplayer/Skin/Blue/barmute.png
-share/mplayer/Skin/Blue/barplay.png
-share/mplayer/Skin/Blue/barrev.png
-share/mplayer/Skin/Blue/barrevv.png
-share/mplayer/Skin/Blue/barstop.png
-share/mplayer/Skin/Blue/barzoom.png
-share/mplayer/Skin/Blue/eqb.png
-share/mplayer/Skin/Blue/exit.png
-share/mplayer/Skin/Blue/font-pl.png
-share/mplayer/Skin/Blue/font.fnt
-share/mplayer/Skin/Blue/forward.png
-share/mplayer/Skin/Blue/icons/icon32x32.png
-share/mplayer/Skin/Blue/icons/icon48x48.png
-share/mplayer/Skin/Blue/load.png
-share/mplayer/Skin/Blue/main-silver.png
-share/mplayer/Skin/Blue/main.png
-share/mplayer/Skin/Blue/menu.png
-share/mplayer/Skin/Blue/menus.png
-share/mplayer/Skin/Blue/minimize.png
-share/mplayer/Skin/Blue/mute.png
-share/mplayer/Skin/Blue/next.png
-share/mplayer/Skin/Blue/play.png
-share/mplayer/Skin/Blue/playbar.png
-share/mplayer/Skin/Blue/playlist.png
-share/mplayer/Skin/Blue/pos.png
-share/mplayer/Skin/Blue/prefs.png
-share/mplayer/Skin/Blue/prev.png
-share/mplayer/Skin/Blue/progres-long2c.png
-share/mplayer/Skin/Blue/progres-long2d.png
-share/mplayer/Skin/Blue/rev.png
-share/mplayer/Skin/Blue/skin
-share/mplayer/Skin/Blue/skinb.png
-share/mplayer/Skin/Blue/stop.png
-share/mplayer/Skin/Blue/subblue.png
-share/mplayer/Skin/Blue/subload.png
-share/mplayer/Skin/Blue/symbols.fnt
-share/mplayer/Skin/Blue/symbols2.png
-share/mplayer/Skin/Blue/symbolsg.fnt
-share/mplayer/Skin/Blue/zoom-3.png
-share/mplayer/Skin/BlueHeart/README
-share/mplayer/Skin/BlueHeart/VERSION
-share/mplayer/Skin/BlueHeart/eq.png
-share/mplayer/Skin/BlueHeart/eqb.png
-share/mplayer/Skin/BlueHeart/exit.png
-share/mplayer/Skin/BlueHeart/font.fnt
-share/mplayer/Skin/BlueHeart/font.png
-share/mplayer/Skin/BlueHeart/iconify.png
-share/mplayer/Skin/BlueHeart/load.png
-share/mplayer/Skin/BlueHeart/main.png
-share/mplayer/Skin/BlueHeart/menu.png
-share/mplayer/Skin/BlueHeart/menubutt.png
-share/mplayer/Skin/BlueHeart/menus.png
-share/mplayer/Skin/BlueHeart/next.png
-share/mplayer/Skin/BlueHeart/pause.png
-share/mplayer/Skin/BlueHeart/play.png
-share/mplayer/Skin/BlueHeart/plb.png
-share/mplayer/Skin/BlueHeart/pos.png
-share/mplayer/Skin/BlueHeart/prev.png
-share/mplayer/Skin/BlueHeart/skin
-share/mplayer/Skin/BlueHeart/stop.png
-share/mplayer/Skin/BlueHeart/sub.png
-share/mplayer/Skin/BlueHeart/symbols.fnt
-share/mplayer/Skin/BlueHeart/symbols.png
-share/mplayer/Skin/CornerMP-aqua/README
-share/mplayer/Skin/CornerMP-aqua/VERSION
-share/mplayer/Skin/CornerMP-aqua/about.png
-share/mplayer/Skin/CornerMP-aqua/back.png
-share/mplayer/Skin/CornerMP-aqua/eqls.png
-share/mplayer/Skin/CornerMP-aqua/exit.png
-share/mplayer/Skin/CornerMP-aqua/font.fnt
-share/mplayer/Skin/CornerMP-aqua/font.png
-share/mplayer/Skin/CornerMP-aqua/forwd.png
-share/mplayer/Skin/CornerMP-aqua/full.png
-share/mplayer/Skin/CornerMP-aqua/icnf.png
-share/mplayer/Skin/CornerMP-aqua/load.png
-share/mplayer/Skin/CornerMP-aqua/main.png
-share/mplayer/Skin/CornerMP-aqua/menu.png
-share/mplayer/Skin/CornerMP-aqua/menu_ko.png
-share/mplayer/Skin/CornerMP-aqua/menus.png
-share/mplayer/Skin/CornerMP-aqua/menus_ko.png
-share/mplayer/Skin/CornerMP-aqua/next.png
-share/mplayer/Skin/CornerMP-aqua/pause.png
-share/mplayer/Skin/CornerMP-aqua/play.png
-share/mplayer/Skin/CornerMP-aqua/plst.png
-share/mplayer/Skin/CornerMP-aqua/pos.png
-share/mplayer/Skin/CornerMP-aqua/prev.png
-share/mplayer/Skin/CornerMP-aqua/skin
-share/mplayer/Skin/CornerMP-aqua/stop.png
-share/mplayer/Skin/CornerMP-aqua/sub.png
-share/mplayer/Skin/CornerMP-aqua/subt.png
-share/mplayer/Skin/CornerMP-aqua/symbols.fnt
-share/mplayer/Skin/CornerMP-aqua/symbols.png
-share/mplayer/Skin/CornerMP/README
-share/mplayer/Skin/CornerMP/VERSION
-share/mplayer/Skin/CornerMP/about.png
-share/mplayer/Skin/CornerMP/back.png
-share/mplayer/Skin/CornerMP/eqls.png
-share/mplayer/Skin/CornerMP/exit.png
-share/mplayer/Skin/CornerMP/font.fnt
-share/mplayer/Skin/CornerMP/font.png
-share/mplayer/Skin/CornerMP/forwd.png
-share/mplayer/Skin/CornerMP/full.png
-share/mplayer/Skin/CornerMP/icnf.png
-share/mplayer/Skin/CornerMP/load.png
-share/mplayer/Skin/CornerMP/main.png
-share/mplayer/Skin/CornerMP/menu.png
-share/mplayer/Skin/CornerMP/menu_ko.png
-share/mplayer/Skin/CornerMP/menus.png
-share/mplayer/Skin/CornerMP/menus_ko.png
-share/mplayer/Skin/CornerMP/next.png
-share/mplayer/Skin/CornerMP/pause.png
-share/mplayer/Skin/CornerMP/play.png
-share/mplayer/Skin/CornerMP/plst.png
-share/mplayer/Skin/CornerMP/pos.png
-share/mplayer/Skin/CornerMP/prev.png
-share/mplayer/Skin/CornerMP/skin
-share/mplayer/Skin/CornerMP/stop.png
-share/mplayer/Skin/CornerMP/sub.png
-share/mplayer/Skin/CornerMP/subt.png
-share/mplayer/Skin/CornerMP/symbols.fnt
-share/mplayer/Skin/CornerMP/symbols.png
-share/mplayer/Skin/Cyrus/README
-share/mplayer/Skin/Cyrus/VERSION
-share/mplayer/Skin/Cyrus/eq.png
-share/mplayer/Skin/Cyrus/eqb.png
-share/mplayer/Skin/Cyrus/exit.png
-share/mplayer/Skin/Cyrus/font.fnt
-share/mplayer/Skin/Cyrus/font.png
-share/mplayer/Skin/Cyrus/iconify.png
-share/mplayer/Skin/Cyrus/load.png
-share/mplayer/Skin/Cyrus/main.png
-share/mplayer/Skin/Cyrus/menu.png
-share/mplayer/Skin/Cyrus/menubutt.png
-share/mplayer/Skin/Cyrus/menus.png
-share/mplayer/Skin/Cyrus/next.png
-share/mplayer/Skin/Cyrus/pause.png
-share/mplayer/Skin/Cyrus/play.png
-share/mplayer/Skin/Cyrus/plb.png
-share/mplayer/Skin/Cyrus/pos.png
-share/mplayer/Skin/Cyrus/posbar.png
-share/mplayer/Skin/Cyrus/prev.png
-share/mplayer/Skin/Cyrus/skin
-share/mplayer/Skin/Cyrus/stop.png
-share/mplayer/Skin/Cyrus/sub.png
-share/mplayer/Skin/Cyrus/symbols.fnt
-share/mplayer/Skin/Cyrus/symbols.png
-share/mplayer/Skin/MidnightLove/README
-share/mplayer/Skin/MidnightLove/VERSION
-share/mplayer/Skin/MidnightLove/eq.png
-share/mplayer/Skin/MidnightLove/eqb.png
-share/mplayer/Skin/MidnightLove/exit.png
-share/mplayer/Skin/MidnightLove/font.fnt
-share/mplayer/Skin/MidnightLove/font.png
-share/mplayer/Skin/MidnightLove/iconify.png
-share/mplayer/Skin/MidnightLove/load.png
-share/mplayer/Skin/MidnightLove/main.png
-share/mplayer/Skin/MidnightLove/maximize.png
-share/mplayer/Skin/MidnightLove/menu.png
-share/mplayer/Skin/MidnightLove/menubutt.png
-share/mplayer/Skin/MidnightLove/menus.png
-share/mplayer/Skin/MidnightLove/next.png
-share/mplayer/Skin/MidnightLove/pause.png
-share/mplayer/Skin/MidnightLove/play.png
-share/mplayer/Skin/MidnightLove/plb.png
-share/mplayer/Skin/MidnightLove/pos.png
-share/mplayer/Skin/MidnightLove/prev.png
-share/mplayer/Skin/MidnightLove/skin
-share/mplayer/Skin/MidnightLove/stop.png
-share/mplayer/Skin/MidnightLove/sub.png
-share/mplayer/Skin/MidnightLove/symbols.fnt
-share/mplayer/Skin/MidnightLove/symbols.png
-share/mplayer/Skin/WMP6/README
-share/mplayer/Skin/WMP6/VERSION
-share/mplayer/Skin/WMP6/bw10sec.png
-share/mplayer/Skin/WMP6/bw1min.png
-share/mplayer/Skin/WMP6/close.png
-share/mplayer/Skin/WMP6/equalizer.png
-share/mplayer/Skin/WMP6/favorites.png
-share/mplayer/Skin/WMP6/file.png
-share/mplayer/Skin/WMP6/font.fnt
-share/mplayer/Skin/WMP6/font.png
-share/mplayer/Skin/WMP6/fw10sec.png
-share/mplayer/Skin/WMP6/fw1min.png
-share/mplayer/Skin/WMP6/go.png
-share/mplayer/Skin/WMP6/help.png
-share/mplayer/Skin/WMP6/main.png
-share/mplayer/Skin/WMP6/maximize.png
-share/mplayer/Skin/WMP6/media.png
-share/mplayer/Skin/WMP6/menu.png
-share/mplayer/Skin/WMP6/menus.png
-share/mplayer/Skin/WMP6/minimize.png
-share/mplayer/Skin/WMP6/music.png
-share/mplayer/Skin/WMP6/mute.png
-share/mplayer/Skin/WMP6/next.png
-share/mplayer/Skin/WMP6/pause.png
-share/mplayer/Skin/WMP6/play.png
-share/mplayer/Skin/WMP6/playlist.png
-share/mplayer/Skin/WMP6/pos.png
-share/mplayer/Skin/WMP6/prev.png
-share/mplayer/Skin/WMP6/radio.png
-share/mplayer/Skin/WMP6/skin
-share/mplayer/Skin/WMP6/stop.png
-share/mplayer/Skin/WMP6/sub.png
-share/mplayer/Skin/WMP6/sub.png.win
-share/mplayer/Skin/WMP6/symbols.fnt
-share/mplayer/Skin/WMP6/symbols.png
-share/mplayer/Skin/WMP6/view.png
-share/mplayer/Skin/WMP6/vol.png
-share/mplayer/Skin/avifile/README
-share/mplayer/Skin/avifile/VERSION
-share/mplayer/Skin/avifile/alap.png
-share/mplayer/Skin/avifile/font.fnt
-share/mplayer/Skin/avifile/font.png
-share/mplayer/Skin/avifile/help.png
-share/mplayer/Skin/avifile/load.png
-share/mplayer/Skin/avifile/menu.png
-share/mplayer/Skin/avifile/menus.png
-share/mplayer/Skin/avifile/mute.png
-share/mplayer/Skin/avifile/pause.png
-share/mplayer/Skin/avifile/play.png
-share/mplayer/Skin/avifile/pos.png
-share/mplayer/Skin/avifile/skin
-share/mplayer/Skin/avifile/stop.png
-share/mplayer/Skin/avifile/sub.png
-share/mplayer/Skin/avifile/symbols.fnt
-share/mplayer/Skin/avifile/symbols.png
-share/mplayer/Skin/avifile/volume.png
-share/mplayer/Skin/default
-share/mplayer/Skin/gnome/README
-share/mplayer/Skin/gnome/VERSION
-share/mplayer/Skin/gnome/back.png
-share/mplayer/Skin/gnome/exit.png
-share/mplayer/Skin/gnome/font.fnt
-share/mplayer/Skin/gnome/font.png
-share/mplayer/Skin/gnome/forward.png
-share/mplayer/Skin/gnome/load.png
-share/mplayer/Skin/gnome/main.png
-share/mplayer/Skin/gnome/main_fixed.png
-share/mplayer/Skin/gnome/menu.png
-share/mplayer/Skin/gnome/menus.png
-share/mplayer/Skin/gnome/pause.png
-share/mplayer/Skin/gnome/play.png
-share/mplayer/Skin/gnome/pos.png
-share/mplayer/Skin/gnome/skin
-share/mplayer/Skin/gnome/stop.png
-share/mplayer/Skin/gnome/sub.png
-share/mplayer/Skin/gnome/symbols.fnt
-share/mplayer/Skin/gnome/symbols.png
-share/mplayer/Skin/gnome/volume.png
-share/mplayer/Skin/hayraphon/README
-share/mplayer/Skin/hayraphon/VERSION
-share/mplayer/Skin/hayraphon/bal.png
-share/mplayer/Skin/hayraphon/bal.png-old
-share/mplayer/Skin/hayraphon/eq.png
-share/mplayer/Skin/hayraphon/exit.png
-share/mplayer/Skin/hayraphon/font.fnt
-share/mplayer/Skin/hayraphon/font.png
-share/mplayer/Skin/hayraphon/forward.png
-share/mplayer/Skin/hayraphon/main.png
-share/mplayer/Skin/hayraphon/max.png
-share/mplayer/Skin/hayraphon/menu.png
-share/mplayer/Skin/hayraphon/menus.png
-share/mplayer/Skin/hayraphon/min.png
-share/mplayer/Skin/hayraphon/next.png
-share/mplayer/Skin/hayraphon/open.png
-share/mplayer/Skin/hayraphon/pause.png
-share/mplayer/Skin/hayraphon/play.png
-share/mplayer/Skin/hayraphon/pref.png
-share/mplayer/Skin/hayraphon/prev.png
-share/mplayer/Skin/hayraphon/rew.png
-share/mplayer/Skin/hayraphon/seek.png
-share/mplayer/Skin/hayraphon/skin
-share/mplayer/Skin/hayraphon/stop.png
-share/mplayer/Skin/hayraphon/sub.png
-share/mplayer/Skin/hayraphon/vol.png
-share/mplayer/Skin/hwswskin/README
-share/mplayer/Skin/hwswskin/VERSION
-share/mplayer/Skin/hwswskin/button-about.png
-share/mplayer/Skin/hwswskin/button-exit.png
-share/mplayer/Skin/hwswskin/button-forward.png
-share/mplayer/Skin/hwswskin/button-fullscr.png
-share/mplayer/Skin/hwswskin/button-next.png
-share/mplayer/Skin/hwswskin/button-open.png
-share/mplayer/Skin/hwswskin/button-pause.png
-share/mplayer/Skin/hwswskin/button-play.png
-share/mplayer/Skin/hwswskin/button-playlst.png
-share/mplayer/Skin/hwswskin/button-prev.png
-share/mplayer/Skin/hwswskin/button-rewind.png
-share/mplayer/Skin/hwswskin/button-skinbr.png
-share/mplayer/Skin/hwswskin/button-stop.png
-share/mplayer/Skin/hwswskin/font.fnt
-share/mplayer/Skin/hwswskin/font.png
-share/mplayer/Skin/hwswskin/main.png
-share/mplayer/Skin/hwswskin/pos.png
-share/mplayer/Skin/hwswskin/skin
-share/mplayer/Skin/hwswskin/sub.png
-share/mplayer/Skin/hwswskin/vol.png
-share/mplayer/Skin/mentalic/README
-share/mplayer/Skin/mentalic/VERSION
-share/mplayer/Skin/mentalic/about.png
-share/mplayer/Skin/mentalic/back.png
-share/mplayer/Skin/mentalic/exit.png
-share/mplayer/Skin/mentalic/font.fnt
-share/mplayer/Skin/mentalic/font.png
-share/mplayer/Skin/mentalic/forward.png
-share/mplayer/Skin/mentalic/fsb.png
-share/mplayer/Skin/mentalic/iconify.png
-share/mplayer/Skin/mentalic/load.png
-share/mplayer/Skin/mentalic/main.png
-share/mplayer/Skin/mentalic/menu.png
-share/mplayer/Skin/mentalic/menus.png
-share/mplayer/Skin/mentalic/next.png
-share/mplayer/Skin/mentalic/pause.png
-share/mplayer/Skin/mentalic/play.png
-share/mplayer/Skin/mentalic/pos.png
-share/mplayer/Skin/mentalic/prev.png
-share/mplayer/Skin/mentalic/skin
-share/mplayer/Skin/mentalic/stop.png
-share/mplayer/Skin/mentalic/sub.png
-share/mplayer/Skin/mentalic/symbols.fnt
-share/mplayer/Skin/mentalic/symbols.png
-share/mplayer/Skin/mentalic/symbolsV.fnt
-share/mplayer/Skin/mentalic/symbolsV.png
-share/mplayer/Skin/mentalic/volume.png
-share/mplayer/Skin/neutron/README
-share/mplayer/Skin/neutron/VERSION
-share/mplayer/Skin/neutron/about.png
-share/mplayer/Skin/neutron/back.png
-share/mplayer/Skin/neutron/eqb.png
-share/mplayer/Skin/neutron/exit.png
-share/mplayer/Skin/neutron/font.fnt
-share/mplayer/Skin/neutron/font.png
-share/mplayer/Skin/neutron/forward.png
-share/mplayer/Skin/neutron/fsb.png
-share/mplayer/Skin/neutron/iconify.png
-share/mplayer/Skin/neutron/load.png
-share/mplayer/Skin/neutron/main.png
-share/mplayer/Skin/neutron/menu.png
-share/mplayer/Skin/neutron/menus.png
-share/mplayer/Skin/neutron/mute.png
-share/mplayer/Skin/neutron/next.png
-share/mplayer/Skin/neutron/pause.png
-share/mplayer/Skin/neutron/play.png
-share/mplayer/Skin/neutron/plb.png
-share/mplayer/Skin/neutron/pos.png
-share/mplayer/Skin/neutron/pref.png
-share/mplayer/Skin/neutron/prev.png
-share/mplayer/Skin/neutron/skin
-share/mplayer/Skin/neutron/stop.png
-share/mplayer/Skin/neutron/sub.png
-share/mplayer/Skin/neutron/symbols.fnt
-share/mplayer/Skin/neutron/symbols.png
-share/mplayer/Skin/neutron/volume.png
-share/mplayer/Skin/phony/README
-share/mplayer/Skin/phony/VERSION
-share/mplayer/Skin/phony/about.png
-share/mplayer/Skin/phony/back.png
-share/mplayer/Skin/phony/exit.png
-share/mplayer/Skin/phony/font2.fnt
-share/mplayer/Skin/phony/font2.png
-share/mplayer/Skin/phony/forward.png
-share/mplayer/Skin/phony/load.png
-share/mplayer/Skin/phony/main.png
-share/mplayer/Skin/phony/menu.png
-share/mplayer/Skin/phony/menus.png
-share/mplayer/Skin/phony/mute.png
-share/mplayer/Skin/phony/next.png
-share/mplayer/Skin/phony/pause.png
-share/mplayer/Skin/phony/play.png
-share/mplayer/Skin/phony/pos.png
-share/mplayer/Skin/phony/prev.png
-share/mplayer/Skin/phony/progress.png
-share/mplayer/Skin/phony/skin
-share/mplayer/Skin/phony/small-bright.png
-share/mplayer/Skin/phony/small.png
-share/mplayer/Skin/phony/stop.png
-share/mplayer/Skin/phony/sub2.png
-share/mplayer/Skin/phony/symbols2.fnt
-share/mplayer/Skin/phony/symbols2.png
-share/mplayer/Skin/phony/volume.png
-share/mplayer/Skin/phony/zoom.png
-share/mplayer/Skin/plastic/README
-share/mplayer/Skin/plastic/VERSION
-share/mplayer/Skin/plastic/about.png
-share/mplayer/Skin/plastic/back.png
-share/mplayer/Skin/plastic/eqb.png
-share/mplayer/Skin/plastic/exit.png
-share/mplayer/Skin/plastic/font.fnt
-share/mplayer/Skin/plastic/font.png
-share/mplayer/Skin/plastic/forward.png
-share/mplayer/Skin/plastic/fsb.png
-share/mplayer/Skin/plastic/iconify.png
-share/mplayer/Skin/plastic/load.png
-share/mplayer/Skin/plastic/main.png
-share/mplayer/Skin/plastic/menu.png
-share/mplayer/Skin/plastic/menus.png
-share/mplayer/Skin/plastic/next.png
-share/mplayer/Skin/plastic/pause.png
-share/mplayer/Skin/plastic/play.png
-share/mplayer/Skin/plastic/plb.png
-share/mplayer/Skin/plastic/pos.png
-share/mplayer/Skin/plastic/prev.png
-share/mplayer/Skin/plastic/skin
-share/mplayer/Skin/plastic/stop.png
-share/mplayer/Skin/plastic/sub.png
-share/mplayer/Skin/plastic/subt.png
-share/mplayer/Skin/plastic/symbols.fnt
-share/mplayer/Skin/plastic/symbols.png
-share/mplayer/Skin/plastic/volume.png
-share/mplayer/Skin/proton/README
-share/mplayer/Skin/proton/VERSION
-share/mplayer/Skin/proton/about.png
-share/mplayer/Skin/proton/equel.png
-share/mplayer/Skin/proton/exit.png
-share/mplayer/Skin/proton/ff.png
-share/mplayer/Skin/proton/font.fnt
-share/mplayer/Skin/proton/font.png
-share/mplayer/Skin/proton/fullscr.png
-share/mplayer/Skin/proton/icon.png
-share/mplayer/Skin/proton/knob.png
-share/mplayer/Skin/proton/main.png
-share/mplayer/Skin/proton/menu.png
-share/mplayer/Skin/proton/menus.png
-share/mplayer/Skin/proton/mute.png
-share/mplayer/Skin/proton/next.png
-share/mplayer/Skin/proton/open.png
-share/mplayer/Skin/proton/pause.png
-share/mplayer/Skin/proton/play.png
-share/mplayer/Skin/proton/playl.png
-share/mplayer/Skin/proton/pref.png
-share/mplayer/Skin/proton/prev.png
-share/mplayer/Skin/proton/rew.png
-share/mplayer/Skin/proton/skin
-share/mplayer/Skin/proton/slider.png
-share/mplayer/Skin/proton/stop.png
-share/mplayer/Skin/proton/sub.png
-share/mplayer/Skin/proton/symbols.fnt
-share/mplayer/Skin/proton/symbols.png
-share/mplayer/Skin/slim/README
-share/mplayer/Skin/slim/VERSION
-share/mplayer/Skin/slim/about.png
-share/mplayer/Skin/slim/back.png
-share/mplayer/Skin/slim/double.png
-share/mplayer/Skin/slim/exit.png
-share/mplayer/Skin/slim/font.fnt
-share/mplayer/Skin/slim/font.png
-share/mplayer/Skin/slim/forward.png
-share/mplayer/Skin/slim/fsb.png
-share/mplayer/Skin/slim/iconify.png
-share/mplayer/Skin/slim/load.png
-share/mplayer/Skin/slim/main.png
-share/mplayer/Skin/slim/menu.png
-share/mplayer/Skin/slim/menus.png
-share/mplayer/Skin/slim/next.png
-share/mplayer/Skin/slim/normal.png
-share/mplayer/Skin/slim/pause.png
-share/mplayer/Skin/slim/play.png
-share/mplayer/Skin/slim/plb.png
-share/mplayer/Skin/slim/pos.png
-share/mplayer/Skin/slim/pref.png
-share/mplayer/Skin/slim/prev.png
-share/mplayer/Skin/slim/skin
-share/mplayer/Skin/slim/stop.png
-share/mplayer/Skin/slim/sub.png
-share/mplayer/Skin/slim/subt.png
-share/mplayer/Skin/slim/symbols.fnt
-share/mplayer/Skin/slim/symbols.png
-share/mplayer/Skin/slim/volume.png
-share/mplayer/Skin/xanim/README
-share/mplayer/Skin/xanim/VERSION
-share/mplayer/Skin/xanim/back.png
-share/mplayer/Skin/xanim/back2.png
-share/mplayer/Skin/xanim/back3.png
-share/mplayer/Skin/xanim/exit.png
-share/mplayer/Skin/xanim/ff2.png
-share/mplayer/Skin/xanim/ff3.png
-share/mplayer/Skin/xanim/grab.png
-share/mplayer/Skin/xanim/main.png
-share/mplayer/Skin/xanim/menu.png
-share/mplayer/Skin/xanim/menus.png
-share/mplayer/Skin/xanim/minus.png
-share/mplayer/Skin/xanim/o.png
-share/mplayer/Skin/xanim/play.png
-share/mplayer/Skin/xanim/plus.png
-share/mplayer/Skin/xanim/skin
-share/mplayer/Skin/xanim/stop.png
-share/mplayer/Skin/xanim/sub.png
-share/mplayer/Skin/xanim/vol.png
-share/mplayer/Skin/xanim/volbar.png
-share/mplayer/Skin/xanim/volmin.png
-share/mplayer/Skin/xanim/volplus.png
-share/mplayer/Skin/xine-lcd/README
-share/mplayer/Skin/xine-lcd/VERSION
-share/mplayer/Skin/xine-lcd/close.png
-share/mplayer/Skin/xine-lcd/dvd.png
-share/mplayer/Skin/xine-lcd/eject.png
-share/mplayer/Skin/xine-lcd/ffwd.png
-share/mplayer/Skin/xine-lcd/font.fnt
-share/mplayer/Skin/xine-lcd/font.png
-share/mplayer/Skin/xine-lcd/fs.png
-share/mplayer/Skin/xine-lcd/fullsc.png
-share/mplayer/Skin/xine-lcd/main-jo.png
-share/mplayer/Skin/xine-lcd/main.png
-share/mplayer/Skin/xine-lcd/menu.png
-share/mplayer/Skin/xine-lcd/menus.png
-share/mplayer/Skin/xine-lcd/minus.png
-share/mplayer/Skin/xine-lcd/mute.png
-share/mplayer/Skin/xine-lcd/next.png
-share/mplayer/Skin/xine-lcd/pause.png
-share/mplayer/Skin/xine-lcd/play.png
-share/mplayer/Skin/xine-lcd/playlist.png
-share/mplayer/Skin/xine-lcd/plbutton.png
-share/mplayer/Skin/xine-lcd/plus.png
-share/mplayer/Skin/xine-lcd/poti.png
-share/mplayer/Skin/xine-lcd/power.png
-share/mplayer/Skin/xine-lcd/pref.png
-share/mplayer/Skin/xine-lcd/prev.png
-share/mplayer/Skin/xine-lcd/rewind.png
-share/mplayer/Skin/xine-lcd/seekbar.png
-share/mplayer/Skin/xine-lcd/skin
-share/mplayer/Skin/xine-lcd/stop.png
-share/mplayer/Skin/xine-lcd/sub.png
-share/mplayer/Skin/xine-lcd/subt.png
-share/mplayer/Skin/xine-lcd/vcd.png
-share/mplayer/Skin/xine-lcd/volume.png
-@dirrm share/mplayer/Skin/xine-lcd
-@dirrm share/mplayer/Skin/xanim
-@dirrm share/mplayer/Skin/slim
-@dirrm share/mplayer/Skin/proton
-@dirrm share/mplayer/Skin/plastic
-@dirrm share/mplayer/Skin/phony
-@dirrm share/mplayer/Skin/neutron
-@dirrm share/mplayer/Skin/mentalic
-@dirrm share/mplayer/Skin/hwswskin
-@dirrm share/mplayer/Skin/hayraphon
-@dirrm share/mplayer/Skin/gnome
-@dirrm share/mplayer/Skin/avifile
-@dirrm share/mplayer/Skin/WMP6
-@dirrm share/mplayer/Skin/MidnightLove
-@dirrm share/mplayer/Skin/Cyrus
-@dirrm share/mplayer/Skin/CornerMP-aqua
-@dirrm share/mplayer/Skin/CornerMP
-@dirrm share/mplayer/Skin/Blue/icons
-@dirrm share/mplayer/Skin/Blue
-@dirrm share/mplayer/Skin/BlueHeart
-@dirrm share/mplayer/Skin/AlienMind
-@dirrm share/mplayer/Skin
diff --git a/multimedia/gmplayer/distinfo b/multimedia/gmplayer/distinfo
deleted file mode 100644
index f2f3f4615dd..00000000000
--- a/multimedia/gmplayer/distinfo
+++ /dev/null
@@ -1,85 +0,0 @@
-$NetBSD: distinfo,v 1.30 2005/11/09 06:23:04 minskim Exp $
-
-SHA1 (gmplayer-1.0rc7-20050409/MPlayer-1.0pre7.tar.bz2) = df1e8d4f2f44d72c6f7989932f3b272e815ecb80
-RMD160 (gmplayer-1.0rc7-20050409/MPlayer-1.0pre7.tar.bz2) = a4bac10df287c4b134ea49b3bc9bf7fb0126cae6
-Size (gmplayer-1.0rc7-20050409/MPlayer-1.0pre7.tar.bz2) = 6868877 bytes
-SHA1 (gmplayer-1.0rc7-20050409/AlienMind-1.2.tar.bz2) = 5e2cab3f22150e401db08e959581cd2093e803c6
-RMD160 (gmplayer-1.0rc7-20050409/AlienMind-1.2.tar.bz2) = 8c526153ba2894c0e6c9baab3e214bab67aaa3e7
-Size (gmplayer-1.0rc7-20050409/AlienMind-1.2.tar.bz2) = 131339 bytes
-SHA1 (gmplayer-1.0rc7-20050409/Blue-1.4.tar.bz2) = 35a4f687d5f70565d066c9b9cadf5cb60273a0ed
-RMD160 (gmplayer-1.0rc7-20050409/Blue-1.4.tar.bz2) = 83c7d62f8d3e96d59876cc1a2e544005e5d6f159
-Size (gmplayer-1.0rc7-20050409/Blue-1.4.tar.bz2) = 221764 bytes
-SHA1 (gmplayer-1.0rc7-20050409/BlueHeart-1.5.tar.bz2) = 2438d2af2102caeccefbf66af871a348c9575a85
-RMD160 (gmplayer-1.0rc7-20050409/BlueHeart-1.5.tar.bz2) = 8a53660718ae00cc841042824e984e14ea2b747b
-Size (gmplayer-1.0rc7-20050409/BlueHeart-1.5.tar.bz2) = 281119 bytes
-SHA1 (gmplayer-1.0rc7-20050409/CornerMP-1.2.tar.bz2) = c448fae0d02ffac9aa4c212af8defc858990864f
-RMD160 (gmplayer-1.0rc7-20050409/CornerMP-1.2.tar.bz2) = 040910749ca16b7b775f6b8aee1057826c02362a
-Size (gmplayer-1.0rc7-20050409/CornerMP-1.2.tar.bz2) = 232716 bytes
-SHA1 (gmplayer-1.0rc7-20050409/CornerMP-aqua-1.4.tar.bz2) = 1a307da65b56c0755cdfd6752383a6fdfdd2d72a
-RMD160 (gmplayer-1.0rc7-20050409/CornerMP-aqua-1.4.tar.bz2) = 13a237f796376a14babe50ac349e68885a6f93f3
-Size (gmplayer-1.0rc7-20050409/CornerMP-aqua-1.4.tar.bz2) = 243178 bytes
-SHA1 (gmplayer-1.0rc7-20050409/Cyrus-1.2.tar.bz2) = 80a7b341529f6baa228c34b38911d2691208b6bd
-RMD160 (gmplayer-1.0rc7-20050409/Cyrus-1.2.tar.bz2) = 1e07b9490a55bd26cc7e9de324b014e743fe1c97
-Size (gmplayer-1.0rc7-20050409/Cyrus-1.2.tar.bz2) = 228506 bytes
-SHA1 (gmplayer-1.0rc7-20050409/MidnightLove-1.6.tar.bz2) = 1612eb15d1fd68e2cb47a2690b0c13515c7a145f
-RMD160 (gmplayer-1.0rc7-20050409/MidnightLove-1.6.tar.bz2) = 3e1b40fb62bf2b1e2700836dcf9513ec26d24192
-Size (gmplayer-1.0rc7-20050409/MidnightLove-1.6.tar.bz2) = 539590 bytes
-SHA1 (gmplayer-1.0rc7-20050409/WMP6-2.2.tar.bz2) = f9dcd52ba1f8420d1249f4151079b47c8aa41eef
-RMD160 (gmplayer-1.0rc7-20050409/WMP6-2.2.tar.bz2) = b07b14b8079550b930fc2cdc488c77e58ef32a00
-Size (gmplayer-1.0rc7-20050409/WMP6-2.2.tar.bz2) = 39344 bytes
-SHA1 (gmplayer-1.0rc7-20050409/avifile-1.6.tar.bz2) = c839506a840b3ff10cd00a787a344504e78a5006
-RMD160 (gmplayer-1.0rc7-20050409/avifile-1.6.tar.bz2) = e02d945059d1cebebdcf0dd74da6b6bc8396e3d8
-Size (gmplayer-1.0rc7-20050409/avifile-1.6.tar.bz2) = 42452 bytes
-SHA1 (gmplayer-1.0rc7-20050409/gnome-1.1.tar.bz2) = 4763acd5a90ba29ac0d6d2b8331ce184c30b6a88
-RMD160 (gmplayer-1.0rc7-20050409/gnome-1.1.tar.bz2) = 5c3f9eaca9945f8743e342615e1ed9d439eb191b
-Size (gmplayer-1.0rc7-20050409/gnome-1.1.tar.bz2) = 368743 bytes
-SHA1 (gmplayer-1.0rc7-20050409/hayraphon-1.0.tar.bz2) = f854f4046ec069ec73219decfa2b92a4e1fb7346
-RMD160 (gmplayer-1.0rc7-20050409/hayraphon-1.0.tar.bz2) = b2c0eee0e714c22a3910eaf7e70c59f6e08e4a8a
-Size (gmplayer-1.0rc7-20050409/hayraphon-1.0.tar.bz2) = 77636 bytes
-SHA1 (gmplayer-1.0rc7-20050409/hwswskin-1.1.tar.bz2) = f1e9a037cbaaa0cf34bccd53c22e10a96b4d80bc
-RMD160 (gmplayer-1.0rc7-20050409/hwswskin-1.1.tar.bz2) = 0e4da149a0ee6128da232ce77f4f156329d0839a
-Size (gmplayer-1.0rc7-20050409/hwswskin-1.1.tar.bz2) = 20396 bytes
-SHA1 (gmplayer-1.0rc7-20050409/mentalic-1.2.tar.bz2) = 04215f8aac705c0da435868320efcfcd6b2162b4
-RMD160 (gmplayer-1.0rc7-20050409/mentalic-1.2.tar.bz2) = 2191983bf3a1da841485c66842609137f79cdaea
-Size (gmplayer-1.0rc7-20050409/mentalic-1.2.tar.bz2) = 166602 bytes
-SHA1 (gmplayer-1.0rc7-20050409/neutron-1.5.tar.bz2) = 10b3e7173d9eefb3bbd68b87bdf4c2d5ed186609
-RMD160 (gmplayer-1.0rc7-20050409/neutron-1.5.tar.bz2) = 8c4ad1ebbdb2b43a791de179aa79394f48dfd11b
-Size (gmplayer-1.0rc7-20050409/neutron-1.5.tar.bz2) = 369346 bytes
-SHA1 (gmplayer-1.0rc7-20050409/phony-1.1.tar.bz2) = 84eb32235084930e3f794ee4e494b80a3010c108
-RMD160 (gmplayer-1.0rc7-20050409/phony-1.1.tar.bz2) = 4e7bf56a8f5d686c4a37311cddb67efdd4dae2d8
-Size (gmplayer-1.0rc7-20050409/phony-1.1.tar.bz2) = 386470 bytes
-SHA1 (gmplayer-1.0rc7-20050409/plastic-1.2.tar.bz2) = 59f88489040f32cd8ca8012e0a8f92364fcc5820
-RMD160 (gmplayer-1.0rc7-20050409/plastic-1.2.tar.bz2) = 22e672269a9e270fa422af08f255769b2f14d081
-Size (gmplayer-1.0rc7-20050409/plastic-1.2.tar.bz2) = 454163 bytes
-SHA1 (gmplayer-1.0rc7-20050409/proton-1.2.tar.bz2) = d62b50421e26e1f257e3efabe062700079bc9efd
-RMD160 (gmplayer-1.0rc7-20050409/proton-1.2.tar.bz2) = c1c1aa99dedcc41328133094bfc239d2dbf24b7c
-Size (gmplayer-1.0rc7-20050409/proton-1.2.tar.bz2) = 322593 bytes
-SHA1 (gmplayer-1.0rc7-20050409/slim-1.2.tar.bz2) = 5880c2055b733648a7980dc0d60a5243b8fbda1b
-RMD160 (gmplayer-1.0rc7-20050409/slim-1.2.tar.bz2) = 4e27f4a1d1694a59260e3acaa604fc7edd43c8fd
-Size (gmplayer-1.0rc7-20050409/slim-1.2.tar.bz2) = 399004 bytes
-SHA1 (gmplayer-1.0rc7-20050409/xanim-1.6.tar.bz2) = f5bb045d9ac18808aae63114379a6d80e32f6850
-RMD160 (gmplayer-1.0rc7-20050409/xanim-1.6.tar.bz2) = 0470d3af5b8d7eae36075f0b866bf668f905dd52
-Size (gmplayer-1.0rc7-20050409/xanim-1.6.tar.bz2) = 94541 bytes
-SHA1 (gmplayer-1.0rc7-20050409/xine-lcd-1.2.tar.bz2) = 44524a37835dcd8ed2984166777159ec9b7a8755
-RMD160 (gmplayer-1.0rc7-20050409/xine-lcd-1.2.tar.bz2) = 743397c118ce7bd05c295aab4edca41c3eeed71e
-Size (gmplayer-1.0rc7-20050409/xine-lcd-1.2.tar.bz2) = 172359 bytes
-SHA1 (patch-aa) = d77cd903d735d7a88336e0aff309f8508cafed94
-SHA1 (patch-ab) = 1a08f717e326d83b355eee26e1be9c0636b735c5
-SHA1 (patch-ac) = 3b9ae32e6e656ec4b58b7e51a1c2eaa280384f3e
-SHA1 (patch-ad) = d705dd315e913593223b83e533c60a9620d34cc8
-SHA1 (patch-ae) = 601808d8c89cba68156fb3c95fe9fcfb8da4fca0
-SHA1 (patch-af) = 6eab8572b239f6ac7afc03ad6254a7c97f90663e
-SHA1 (patch-ag) = 9bc3466ef24970e3f26fc64601d9f2c27fa394d2
-SHA1 (patch-ah) = 744f073e791257768e5ec7da8e321d2f25d1fb2c
-SHA1 (patch-da) = be092da4f854708c1ef47f10c26e361c095a6799
-SHA1 (patch-dc) = b11ef06a89f13e2ae5e013d569aa5acc99c770aa
-SHA1 (patch-dd) = e5b23b73a1e53e3185ecbac26042432395cd5e63
-SHA1 (patch-de) = 923814d978a3ed2b00494cf7f7fd17acd72aa610
-SHA1 (patch-df) = 0a85d1d8fbbbc1a86436e7364b72619a9a32e2d7
-SHA1 (patch-dg) = 1633dfd61c83796ce148ede22bafbe01f67d2bd4
-SHA1 (patch-dh) = 639638d871af2462945d8c5e454cae291a15e939
-SHA1 (patch-di) = 5b4c7d96537882422fb648181a93ec9ba9e13c7e
-SHA1 (patch-dj) = e72e08dda9f3eb97bf5e63751bf18999f1689434
-SHA1 (patch-dk) = 744911451794b554f9754b4cd77cf24520ed0f8e
-SHA1 (patch-dm) = b57da36cce0b896b51ca1ff2eef3c58ed95e2b68
-SHA1 (patch-do) = dbd4705c81ee4e6fa7cefc93dc187733a739d710
diff --git a/multimedia/gnome2-media/DESCR b/multimedia/gnome2-media/DESCR
deleted file mode 100644
index 3fdb25c6983..00000000000
--- a/multimedia/gnome2-media/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-  This package contains gnome-media, a set of audio/multimedia tools
-for GNOME2.
-
-From the GNOME home page:
-
-GNOME stands for GNU Network Object Model Environment.  The GNOME
-project intends to build a complete, user-friendly desktop based
-entirely on free software.  GNOME is part of the GNU project, and
-GNOME is part of the OpenSource(tm) movement.  The desktop will
-consist of small utilities and larger applications which share a
-consistent look and feel.  GNOME uses GTK+ as the GUI toolkit for
-all GNOME-compliant applications.
diff --git a/multimedia/gnome2-media/Makefile b/multimedia/gnome2-media/Makefile
deleted file mode 100644
index 0418fb46cf8..00000000000
--- a/multimedia/gnome2-media/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-# $NetBSD: Makefile,v 1.21 2005/10/16 12:12:50 jmmv Exp $
-
-DISTNAME=		gnome-media-2.12.0
-CATEGORIES=		multimedia gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-media/2.12/}
-EXTRACT_SUFX=		.tar.bz2
-
-MAINTAINER=		rh@NetBSD.org
-HOMEPAGE=		http://www.gnome.org/
-COMMENT=		Set of audio/multimedia applications for GNOME2
-
-BUILD_USES_MSGFMT=	yes
-DEPENDS+=		gst-plugins-cdparanoia>=0.8.8:../../audio/gst-plugins-cdparanoia
-DEPENDS+=		gst-plugins-esound>=0.8.8:../../audio/gst-plugins-esound
-DEPENDS+=		gst-plugins-oss>=0.8.8:../../audio/gst-plugins-oss
-
-GNU_CONFIGURE=		yes
-USE_DIRS+=		gnome2-1.5
-USE_PKGLOCALEDIR=	yes
-USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake perl pkg-config
-
-CONFIGURE_ARGS+=	--enable-gtk-doc=no
-CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
-CONFIGURE_ENV+=		XGETTEXT="${LOCALBASE}/bin/xgettext"
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD"
-CONFIGURE_ENV+=		CDROM_HOST="bsd"
-.endif
-
-GCONF2_SCHEMAS=		CDDB-Slave2.schemas
-GCONF2_SCHEMAS+=	gnome-audio-profiles.schemas
-GCONF2_SCHEMAS+=	gnome-cd.schemas
-GCONF2_SCHEMAS+=	gnome-sound-recorder.schemas
-
-.include "../../audio/esound/buildlink3.mk"
-.include "../../devel/GConf2/schemas.mk"
-.include "../../devel/GConf2-ui/buildlink3.mk"
-.include "../../devel/gail/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/libbonobo/buildlink3.mk"
-.include "../../multimedia/gst-plugins/buildlink3.mk"
-.include "../../multimedia/gstreamer/buildlink3.mk"
-.include "../../net/ORBit2/buildlink3.mk"
-.include "../../sysutils/gnome-vfs2/buildlink3.mk"
-.include "../../sysutils/nautilus-cd-burner/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
-.include "../../x11/gnome-desktop/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gnome2-media/PLIST b/multimedia/gnome2-media/PLIST
deleted file mode 100644
index 51da5ec8fbc..00000000000
--- a/multimedia/gnome2-media/PLIST
+++ /dev/null
@@ -1,591 +0,0 @@
-@comment $NetBSD: PLIST,v 1.8 2005/10/16 12:12:50 jmmv Exp $
-bin/cddb-slave2-properties
-bin/gnome-audio-profiles-properties
-bin/gnome-cd
-bin/gnome-sound-recorder
-bin/gnome-volume-control
-bin/gstreamer-properties
-bin/vumeter
-include/cddb-slave2/cddb-slave-client.h
-include/gnome-media/profiles/audio-profile-choose.h
-include/gnome-media/profiles/audio-profile-edit.h
-include/gnome-media/profiles/audio-profile.h
-include/gnome-media/profiles/audio-profiles-edit.h
-include/gnome-media/profiles/gnome-media-profiles.h
-lib/bonobo/servers/GNOME_Media_CDDBSlave2.server
-lib/libcddb-slave2.la
-lib/libglade/2.0/libgnome-media-profiles.la
-lib/libgnome-media-profiles.la
-lib/pkgconfig/gnome-media-profiles.pc
-libexec/CDDBSlave2
-libexec/cddb-track-editor
-share/applications/cddb-slave.desktop
-share/applications/gnome-cd.desktop
-share/applications/gnome-sound-recorder.desktop
-share/applications/gnome-volume-control.desktop
-share/applications/gstreamer-properties.desktop
-share/applications/reclevel.desktop
-share/applications/vumeter.desktop
-share/gconf/schemas/CDDB-Slave2.schemas
-share/gconf/schemas/gnome-audio-profiles.schemas
-share/gconf/schemas/gnome-cd.schemas
-share/gconf/schemas/gnome-sound-recorder.schemas
-share/gconf/schemas/gnome-volume-control.schemas
-share/gnome-media/glade/gnome-audio-profiles.glade2
-share/gnome-media/pixmaps/3dsound.png
-share/gnome-media/pixmaps/chain-broken.png
-share/gnome-media/pixmaps/chain.png
-share/gnome-media/pixmaps/headphones.png
-share/gnome-media/pixmaps/mixer.png
-share/gnome-media/pixmaps/noplay.png
-share/gnome-media/pixmaps/norecord.png
-share/gnome-media/pixmaps/phone.png
-share/gnome-media/pixmaps/play.png
-share/gnome-media/pixmaps/record.png
-share/gnome-media/pixmaps/tone.png
-share/gnome-media/pixmaps/video.png
-share/gnome-sound-recorder/ui/ui.xml
-share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_button.png
-share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_window.png
-share/gnome/help/gnome-cd/C/figures/cdplayer_window.png
-share/gnome/help/gnome-cd/C/figures/eject_button.png
-share/gnome/help/gnome-cd/C/figures/forward_button.png
-share/gnome/help/gnome-cd/C/figures/next_button.png
-share/gnome/help/gnome-cd/C/figures/pause_button.png
-share/gnome/help/gnome-cd/C/figures/play_button.png
-share/gnome/help/gnome-cd/C/figures/preferences_button.png
-share/gnome/help/gnome-cd/C/figures/previous_button.png
-share/gnome/help/gnome-cd/C/figures/rewind_button.png
-share/gnome/help/gnome-cd/C/figures/stop_button.png
-share/gnome/help/gnome-cd/C/gnome-cd.xml
-share/gnome/help/gnome-cd/C/legal.xml
-share/gnome/help/gnome-cd/de/figures/cdplayer_trackeditor_button.png
-share/gnome/help/gnome-cd/de/figures/cdplayer_trackeditor_window.png
-share/gnome/help/gnome-cd/de/figures/cdplayer_window.png
-share/gnome/help/gnome-cd/de/figures/eject_button.png
-share/gnome/help/gnome-cd/de/figures/forward_button.png
-share/gnome/help/gnome-cd/de/figures/gnome-cd-prefs.png
-share/gnome/help/gnome-cd/de/figures/gnome-cd-track.png
-share/gnome/help/gnome-cd/de/figures/gnome-cd.png
-share/gnome/help/gnome-cd/de/figures/next_button.png
-share/gnome/help/gnome-cd/de/figures/pause_button.png
-share/gnome/help/gnome-cd/de/figures/play_button.png
-share/gnome/help/gnome-cd/de/figures/preferences_button.png
-share/gnome/help/gnome-cd/de/figures/previous_button.png
-share/gnome/help/gnome-cd/de/figures/rewind_button.png
-share/gnome/help/gnome-cd/de/figures/stop_button.png
-share/gnome/help/gnome-cd/de/gnome-cd.xml
-share/gnome/help/gnome-cd/de/legal.xml
-share/gnome/help/gnome-cd/es/figures/cdplayer_trackeditor_button.png
-share/gnome/help/gnome-cd/es/figures/cdplayer_trackeditor_window.png
-share/gnome/help/gnome-cd/es/figures/cdplayer_window.png
-share/gnome/help/gnome-cd/es/figures/eject_button.png
-share/gnome/help/gnome-cd/es/figures/forward_button.png
-share/gnome/help/gnome-cd/es/figures/gnome-cd-prefs.png
-share/gnome/help/gnome-cd/es/figures/gnome-cd-track.png
-share/gnome/help/gnome-cd/es/figures/gnome-cd.png
-share/gnome/help/gnome-cd/es/figures/next_button.png
-share/gnome/help/gnome-cd/es/figures/pause_button.png
-share/gnome/help/gnome-cd/es/figures/play_button.png
-share/gnome/help/gnome-cd/es/figures/preferences_button.png
-share/gnome/help/gnome-cd/es/figures/previous_button.png
-share/gnome/help/gnome-cd/es/figures/rewind_button.png
-share/gnome/help/gnome-cd/es/figures/stop_button.png
-share/gnome/help/gnome-cd/es/gnome-cd.xml
-share/gnome/help/gnome-cd/es/legal.xml
-share/gnome/help/gnome-cd/fr/figures/cdplayer_trackeditor_button.png
-share/gnome/help/gnome-cd/fr/figures/cdplayer_trackeditor_window.png
-share/gnome/help/gnome-cd/fr/figures/cdplayer_window.png
-share/gnome/help/gnome-cd/fr/figures/eject_button.png
-share/gnome/help/gnome-cd/fr/figures/forward_button.png
-share/gnome/help/gnome-cd/fr/figures/gnome-cd-prefs.png
-share/gnome/help/gnome-cd/fr/figures/gnome-cd-track.png
-share/gnome/help/gnome-cd/fr/figures/gnome-cd.png
-share/gnome/help/gnome-cd/fr/figures/next_button.png
-share/gnome/help/gnome-cd/fr/figures/pause_button.png
-share/gnome/help/gnome-cd/fr/figures/play_button.png
-share/gnome/help/gnome-cd/fr/figures/preferences_button.png
-share/gnome/help/gnome-cd/fr/figures/previous_button.png
-share/gnome/help/gnome-cd/fr/figures/rewind_button.png
-share/gnome/help/gnome-cd/fr/figures/stop_button.png
-share/gnome/help/gnome-cd/fr/gnome-cd.xml
-share/gnome/help/gnome-cd/fr/legal.xml
-share/gnome/help/gnome-cd/it/figures/cdplayer_trackeditor_button.png
-share/gnome/help/gnome-cd/it/figures/cdplayer_trackeditor_window.png
-share/gnome/help/gnome-cd/it/figures/cdplayer_window.png
-share/gnome/help/gnome-cd/it/figures/eject_button.png
-share/gnome/help/gnome-cd/it/figures/forward_button.png
-share/gnome/help/gnome-cd/it/figures/gnome-cd-prefs.png
-share/gnome/help/gnome-cd/it/figures/gnome-cd-track.png
-share/gnome/help/gnome-cd/it/figures/gnome-cd.png
-share/gnome/help/gnome-cd/it/figures/next_button.png
-share/gnome/help/gnome-cd/it/figures/pause_button.png
-share/gnome/help/gnome-cd/it/figures/play_button.png
-share/gnome/help/gnome-cd/it/figures/preferences_button.png
-share/gnome/help/gnome-cd/it/figures/previous_button.png
-share/gnome/help/gnome-cd/it/figures/rewind_button.png
-share/gnome/help/gnome-cd/it/figures/stop_button.png
-share/gnome/help/gnome-cd/it/gnome-cd.xml
-share/gnome/help/gnome-cd/it/legal.xml
-share/gnome/help/gnome-cd/ja/figures/cdplayer_trackeditor_button.png
-share/gnome/help/gnome-cd/ja/figures/cdplayer_trackeditor_window.png
-share/gnome/help/gnome-cd/ja/figures/cdplayer_window.png
-share/gnome/help/gnome-cd/ja/figures/eject_button.png
-share/gnome/help/gnome-cd/ja/figures/forward_button.png
-share/gnome/help/gnome-cd/ja/figures/gnome-cd-prefs.png
-share/gnome/help/gnome-cd/ja/figures/gnome-cd-track.png
-share/gnome/help/gnome-cd/ja/figures/gnome-cd.png
-share/gnome/help/gnome-cd/ja/figures/next_button.png
-share/gnome/help/gnome-cd/ja/figures/pause_button.png
-share/gnome/help/gnome-cd/ja/figures/play_button.png
-share/gnome/help/gnome-cd/ja/figures/preferences_button.png
-share/gnome/help/gnome-cd/ja/figures/previous_button.png
-share/gnome/help/gnome-cd/ja/figures/rewind_button.png
-share/gnome/help/gnome-cd/ja/figures/stop_button.png
-share/gnome/help/gnome-cd/ja/gnome-cd.xml
-share/gnome/help/gnome-cd/ja/legal.xml
-share/gnome/help/gnome-cd/ko/figures/cdplayer_trackeditor_button.png
-share/gnome/help/gnome-cd/ko/figures/cdplayer_trackeditor_window.png
-share/gnome/help/gnome-cd/ko/figures/cdplayer_window.png
-share/gnome/help/gnome-cd/ko/figures/eject_button.png
-share/gnome/help/gnome-cd/ko/figures/forward_button.png
-share/gnome/help/gnome-cd/ko/figures/gnome-cd-prefs.png
-share/gnome/help/gnome-cd/ko/figures/gnome-cd-track.png
-share/gnome/help/gnome-cd/ko/figures/gnome-cd.png
-share/gnome/help/gnome-cd/ko/figures/next_button.png
-share/gnome/help/gnome-cd/ko/figures/pause_button.png
-share/gnome/help/gnome-cd/ko/figures/play_button.png
-share/gnome/help/gnome-cd/ko/figures/preferences_button.png
-share/gnome/help/gnome-cd/ko/figures/previous_button.png
-share/gnome/help/gnome-cd/ko/figures/rewind_button.png
-share/gnome/help/gnome-cd/ko/figures/stop_button.png
-share/gnome/help/gnome-cd/ko/gnome-cd.xml
-share/gnome/help/gnome-cd/ko/legal.xml
-share/gnome/help/gnome-cd/nl/figures/cdplayer_trackeditor_button.png
-share/gnome/help/gnome-cd/nl/figures/cdplayer_trackeditor_window.png
-share/gnome/help/gnome-cd/nl/figures/cdplayer_window.png
-share/gnome/help/gnome-cd/nl/figures/eject_button.png
-share/gnome/help/gnome-cd/nl/figures/forward_button.png
-share/gnome/help/gnome-cd/nl/figures/next_button.png
-share/gnome/help/gnome-cd/nl/figures/pause_button.png
-share/gnome/help/gnome-cd/nl/figures/play_button.png
-share/gnome/help/gnome-cd/nl/figures/preferences_button.png
-share/gnome/help/gnome-cd/nl/figures/previous_button.png
-share/gnome/help/gnome-cd/nl/figures/rewind_button.png
-share/gnome/help/gnome-cd/nl/figures/stop_button.png
-share/gnome/help/gnome-cd/nl/gnome-cd.xml
-share/gnome/help/gnome-cd/nl/legal.xml
-share/gnome/help/gnome-cd/sv/figures/cdplayer_trackeditor_button.png
-share/gnome/help/gnome-cd/sv/figures/cdplayer_trackeditor_window.png
-share/gnome/help/gnome-cd/sv/figures/cdplayer_window.png
-share/gnome/help/gnome-cd/sv/figures/eject_button.png
-share/gnome/help/gnome-cd/sv/figures/forward_button.png
-share/gnome/help/gnome-cd/sv/figures/gnome-cd-prefs.png
-share/gnome/help/gnome-cd/sv/figures/gnome-cd-track.png
-share/gnome/help/gnome-cd/sv/figures/gnome-cd.png
-share/gnome/help/gnome-cd/sv/figures/next_button.png
-share/gnome/help/gnome-cd/sv/figures/pause_button.png
-share/gnome/help/gnome-cd/sv/figures/play_button.png
-share/gnome/help/gnome-cd/sv/figures/preferences_button.png
-share/gnome/help/gnome-cd/sv/figures/previous_button.png
-share/gnome/help/gnome-cd/sv/figures/rewind_button.png
-share/gnome/help/gnome-cd/sv/figures/stop_button.png
-share/gnome/help/gnome-cd/sv/gnome-cd.xml
-share/gnome/help/gnome-cd/sv/legal.xml
-share/gnome/help/gnome-cd/uk/figures/cdplayer_trackeditor_button.png
-share/gnome/help/gnome-cd/uk/figures/cdplayer_trackeditor_window.png
-share/gnome/help/gnome-cd/uk/figures/cdplayer_window.png
-share/gnome/help/gnome-cd/uk/figures/eject_button.png
-share/gnome/help/gnome-cd/uk/figures/forward_button.png
-share/gnome/help/gnome-cd/uk/figures/next_button.png
-share/gnome/help/gnome-cd/uk/figures/pause_button.png
-share/gnome/help/gnome-cd/uk/figures/play_button.png
-share/gnome/help/gnome-cd/uk/figures/preferences_button.png
-share/gnome/help/gnome-cd/uk/figures/previous_button.png
-share/gnome/help/gnome-cd/uk/figures/rewind_button.png
-share/gnome/help/gnome-cd/uk/figures/stop_button.png
-share/gnome/help/gnome-cd/uk/gnome-cd.xml
-share/gnome/help/gnome-cd/uk/legal.xml
-share/gnome/help/gnome-cd/zh_CN/figures/cdplayer_trackeditor_button.png
-share/gnome/help/gnome-cd/zh_CN/figures/cdplayer_trackeditor_window.png
-share/gnome/help/gnome-cd/zh_CN/figures/cdplayer_window.png
-share/gnome/help/gnome-cd/zh_CN/figures/eject_button.png
-share/gnome/help/gnome-cd/zh_CN/figures/forward_button.png
-share/gnome/help/gnome-cd/zh_CN/figures/gnome-cd-prefs.png
-share/gnome/help/gnome-cd/zh_CN/figures/gnome-cd-track.png
-share/gnome/help/gnome-cd/zh_CN/figures/gnome-cd.png
-share/gnome/help/gnome-cd/zh_CN/figures/next_button.png
-share/gnome/help/gnome-cd/zh_CN/figures/pause_button.png
-share/gnome/help/gnome-cd/zh_CN/figures/play_button.png
-share/gnome/help/gnome-cd/zh_CN/figures/preferences_button.png
-share/gnome/help/gnome-cd/zh_CN/figures/previous_button.png
-share/gnome/help/gnome-cd/zh_CN/figures/rewind_button.png
-share/gnome/help/gnome-cd/zh_CN/figures/stop_button.png
-share/gnome/help/gnome-cd/zh_CN/gnome-cd.xml
-share/gnome/help/gnome-cd/zh_CN/legal.xml
-share/gnome/help/gnome-cd/zh_TW/figures/cdplayer_trackeditor_button.png
-share/gnome/help/gnome-cd/zh_TW/figures/cdplayer_trackeditor_window.png
-share/gnome/help/gnome-cd/zh_TW/figures/cdplayer_window.png
-share/gnome/help/gnome-cd/zh_TW/figures/eject_button.png
-share/gnome/help/gnome-cd/zh_TW/figures/forward_button.png
-share/gnome/help/gnome-cd/zh_TW/figures/gnome-cd-prefs.png
-share/gnome/help/gnome-cd/zh_TW/figures/gnome-cd-track.png
-share/gnome/help/gnome-cd/zh_TW/figures/gnome-cd.png
-share/gnome/help/gnome-cd/zh_TW/figures/next_button.png
-share/gnome/help/gnome-cd/zh_TW/figures/pause_button.png
-share/gnome/help/gnome-cd/zh_TW/figures/play_button.png
-share/gnome/help/gnome-cd/zh_TW/figures/preferences_button.png
-share/gnome/help/gnome-cd/zh_TW/figures/previous_button.png
-share/gnome/help/gnome-cd/zh_TW/figures/rewind_button.png
-share/gnome/help/gnome-cd/zh_TW/figures/stop_button.png
-share/gnome/help/gnome-cd/zh_TW/gnome-cd.xml
-share/gnome/help/gnome-cd/zh_TW/legal.xml
-share/gnome/help/gnome-sound-recorder/C/figures/grecord_window.png
-share/gnome/help/gnome-sound-recorder/C/gnome-sound-recorder.xml
-share/gnome/help/gnome-sound-recorder/C/legal.xml
-share/gnome/help/gnome-sound-recorder/uk/figures/grecord_window.png
-share/gnome/help/gnome-sound-recorder/uk/gnome-sound-recorder.xml
-share/gnome/help/gnome-sound-recorder/uk/legal.xml
-share/gnome/help/gnome-volume-control/C/figures/gmix-prefs.png
-share/gnome/help/gnome-volume-control/C/figures/gmix.png
-share/gnome/help/gnome-volume-control/C/figures/gnome-volume-control_window.png
-share/gnome/help/gnome-volume-control/C/gnome-volume-control.xml
-share/gnome/help/gnome-volume-control/C/legal.xml
-share/gnome/help/gnome-volume-control/uk/figures/gmix-prefs.png
-share/gnome/help/gnome-volume-control/uk/figures/gmix.png
-share/gnome/help/gnome-volume-control/uk/figures/gnome-volume-control_window.png
-share/gnome/help/gnome-volume-control/uk/gnome-volume-control.xml
-share/gnome/help/gnome-volume-control/uk/legal.xml
-share/gnome/help/grecord/de/figures/grecord-prefs-path.png
-share/gnome/help/grecord/de/figures/grecord-prefs-play.png
-share/gnome/help/grecord/de/figures/grecord-prefs-rec.png
-share/gnome/help/grecord/de/figures/grecord-prefs-sound.png
-share/gnome/help/grecord/de/figures/grecord-prefs-ui.png
-share/gnome/help/grecord/de/figures/grecord.png
-share/gnome/help/grecord/de/figures/grecord_window.png
-share/gnome/help/grecord/de/grecord.xml
-share/gnome/help/grecord/de/legal.xml
-share/gnome/help/grecord/es/figures/grecord-prefs-path.png
-share/gnome/help/grecord/es/figures/grecord-prefs-play.png
-share/gnome/help/grecord/es/figures/grecord-prefs-rec.png
-share/gnome/help/grecord/es/figures/grecord-prefs-sound.png
-share/gnome/help/grecord/es/figures/grecord-prefs-ui.png
-share/gnome/help/grecord/es/figures/grecord.png
-share/gnome/help/grecord/es/figures/grecord_window.png
-share/gnome/help/grecord/es/grecord.xml
-share/gnome/help/grecord/es/legal.xml
-share/gnome/help/grecord/fr/figures/grecord-prefs-path.png
-share/gnome/help/grecord/fr/figures/grecord-prefs-play.png
-share/gnome/help/grecord/fr/figures/grecord-prefs-rec.png
-share/gnome/help/grecord/fr/figures/grecord-prefs-sound.png
-share/gnome/help/grecord/fr/figures/grecord-prefs-ui.png
-share/gnome/help/grecord/fr/figures/grecord.png
-share/gnome/help/grecord/fr/figures/grecord_window.png
-share/gnome/help/grecord/fr/grecord.xml
-share/gnome/help/grecord/fr/legal.xml
-share/gnome/help/grecord/it/figures/grecord-prefs-path.png
-share/gnome/help/grecord/it/figures/grecord-prefs-play.png
-share/gnome/help/grecord/it/figures/grecord-prefs-rec.png
-share/gnome/help/grecord/it/figures/grecord-prefs-sound.png
-share/gnome/help/grecord/it/figures/grecord-prefs-ui.png
-share/gnome/help/grecord/it/figures/grecord.png
-share/gnome/help/grecord/it/figures/grecord_window.png
-share/gnome/help/grecord/it/grecord.xml
-share/gnome/help/grecord/it/legal.xml
-share/gnome/help/grecord/ja/figures/grecord-prefs-path.png
-share/gnome/help/grecord/ja/figures/grecord-prefs-play.png
-share/gnome/help/grecord/ja/figures/grecord-prefs-rec.png
-share/gnome/help/grecord/ja/figures/grecord-prefs-sound.png
-share/gnome/help/grecord/ja/figures/grecord-prefs-ui.png
-share/gnome/help/grecord/ja/figures/grecord.png
-share/gnome/help/grecord/ja/figures/grecord_window.png
-share/gnome/help/grecord/ja/grecord.xml
-share/gnome/help/grecord/ja/legal.xml
-share/gnome/help/grecord/ko/figures/grecord-prefs-path.png
-share/gnome/help/grecord/ko/figures/grecord-prefs-play.png
-share/gnome/help/grecord/ko/figures/grecord-prefs-rec.png
-share/gnome/help/grecord/ko/figures/grecord-prefs-sound.png
-share/gnome/help/grecord/ko/figures/grecord-prefs-ui.png
-share/gnome/help/grecord/ko/figures/grecord.png
-share/gnome/help/grecord/ko/figures/grecord_window.png
-share/gnome/help/grecord/ko/grecord.xml
-share/gnome/help/grecord/ko/legal.xml
-share/gnome/help/grecord/sv/figures/grecord-prefs-path.png
-share/gnome/help/grecord/sv/figures/grecord-prefs-play.png
-share/gnome/help/grecord/sv/figures/grecord-prefs-rec.png
-share/gnome/help/grecord/sv/figures/grecord-prefs-sound.png
-share/gnome/help/grecord/sv/figures/grecord-prefs-ui.png
-share/gnome/help/grecord/sv/figures/grecord.png
-share/gnome/help/grecord/sv/figures/grecord_window.png
-share/gnome/help/grecord/sv/grecord.xml
-share/gnome/help/grecord/sv/legal.xml
-share/gnome/help/grecord/zh_CN/figures/grecord-prefs-path.png
-share/gnome/help/grecord/zh_CN/figures/grecord-prefs-play.png
-share/gnome/help/grecord/zh_CN/figures/grecord-prefs-rec.png
-share/gnome/help/grecord/zh_CN/figures/grecord-prefs-sound.png
-share/gnome/help/grecord/zh_CN/figures/grecord-prefs-ui.png
-share/gnome/help/grecord/zh_CN/figures/grecord.png
-share/gnome/help/grecord/zh_CN/figures/grecord_window.png
-share/gnome/help/grecord/zh_CN/grecord.xml
-share/gnome/help/grecord/zh_CN/legal.xml
-share/gnome/help/grecord/zh_TW/figures/grecord-prefs-path.png
-share/gnome/help/grecord/zh_TW/figures/grecord-prefs-play.png
-share/gnome/help/grecord/zh_TW/figures/grecord-prefs-rec.png
-share/gnome/help/grecord/zh_TW/figures/grecord-prefs-sound.png
-share/gnome/help/grecord/zh_TW/figures/grecord-prefs-ui.png
-share/gnome/help/grecord/zh_TW/figures/grecord.png
-share/gnome/help/grecord/zh_TW/figures/grecord_window.png
-share/gnome/help/grecord/zh_TW/grecord.xml
-share/gnome/help/grecord/zh_TW/legal.xml
-share/gnome/help/gstreamer-properties/C/figures/gstreamer_properties_window.png
-share/gnome/help/gstreamer-properties/C/gstreamer-properties.xml
-share/gnome/help/gstreamer-properties/C/legal.xml
-share/gnome/help/gstreamer-properties/uk/figures/gstreamer_properties_window.png
-share/gnome/help/gstreamer-properties/uk/gstreamer-properties.xml
-share/gnome/help/gstreamer-properties/uk/legal.xml
-share/gstreamer-properties/glade/gstreamer-properties.glade
-share/gstreamer-properties/icons/gstreamer-properties.png
-share/idl/GNOME_Media_CDDBSlave2.idl
-${PKGLOCALEDIR}/locale/am/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/be/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/bn/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/bs/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/gu/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/he/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/id/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/ne/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/rw/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/th/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/tk/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/xh/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gnome-media-2.0.mo
-${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
-share/omf/gnome-media/gnome-cd-C.omf
-share/omf/gnome-media/gnome-cd-de.omf
-share/omf/gnome-media/gnome-cd-es.omf
-share/omf/gnome-media/gnome-cd-fr.omf
-share/omf/gnome-media/gnome-cd-it.omf
-share/omf/gnome-media/gnome-cd-ja.omf
-share/omf/gnome-media/gnome-cd-ko.omf
-share/omf/gnome-media/gnome-cd-nl.omf
-share/omf/gnome-media/gnome-cd-sv.omf
-share/omf/gnome-media/gnome-cd-uk.omf
-share/omf/gnome-media/gnome-cd-zh_CN.omf
-share/omf/gnome-media/gnome-cd-zh_TW.omf
-share/omf/gnome-media/gnome-volume-control-C.omf
-share/omf/gnome-media/gnome-volume-control-uk.omf
-share/omf/gnome-media/grecord-C.omf
-share/omf/gnome-media/grecord-de.omf
-share/omf/gnome-media/grecord-es.omf
-share/omf/gnome-media/grecord-fr.omf
-share/omf/gnome-media/grecord-it.omf
-share/omf/gnome-media/grecord-ja.omf
-share/omf/gnome-media/grecord-ko.omf
-share/omf/gnome-media/grecord-sv.omf
-share/omf/gnome-media/grecord-uk.omf
-share/omf/gnome-media/grecord-zh_CN.omf
-share/omf/gnome-media/grecord-zh_TW.omf
-share/omf/gnome-media/gstreamer-properties-C.omf
-share/omf/gnome-media/gstreamer-properties-uk.omf
-share/pixmaps/gnome-cd.png
-share/pixmaps/gnome-cd/cd.png
-share/pixmaps/gnome-cd/disc.png
-share/pixmaps/gnome-cd/media-eject.png
-share/pixmaps/gnome-cd/once.png
-share/pixmaps/gnome-cd/repeat.png
-share/pixmaps/gnome-cd/themes/None/None.theme
-share/pixmaps/gnome-cd/themes/None/a-eject-menu.png
-share/pixmaps/gnome-cd/themes/None/a-first-menu.png
-share/pixmaps/gnome-cd/themes/None/a-last-menu.png
-share/pixmaps/gnome-cd/themes/None/a-play-menu.png
-share/pixmaps/gnome-cd/themes/None/a-stop-menu.png
-share/pixmaps/gnome-cd/themes/None/bottom-left.png
-share/pixmaps/gnome-cd/themes/None/bottom-right.png
-share/pixmaps/gnome-cd/themes/None/bottom.png
-share/pixmaps/gnome-cd/themes/None/media-eject.png
-share/pixmaps/gnome-cd/themes/None/media-fwd.png
-share/pixmaps/gnome-cd/themes/None/media-next.png
-share/pixmaps/gnome-cd/themes/None/media-pause.png
-share/pixmaps/gnome-cd/themes/None/media-play.png
-share/pixmaps/gnome-cd/themes/None/media-prev.png
-share/pixmaps/gnome-cd/themes/None/media-rew.png
-share/pixmaps/gnome-cd/themes/None/media-stop.png
-share/pixmaps/gnome-cd/themes/None/middle-left.png
-share/pixmaps/gnome-cd/themes/None/middle-right.png
-share/pixmaps/gnome-cd/themes/None/middle.png
-share/pixmaps/gnome-cd/themes/None/top-left.png
-share/pixmaps/gnome-cd/themes/None/top-right.png
-share/pixmaps/gnome-cd/themes/None/top.png
-share/pixmaps/gnome-cd/themes/lcd/bottom-left.png
-share/pixmaps/gnome-cd/themes/lcd/bottom-right.png
-share/pixmaps/gnome-cd/themes/lcd/bottom.png
-share/pixmaps/gnome-cd/themes/lcd/lcd.theme
-share/pixmaps/gnome-cd/themes/lcd/middle-left.png
-share/pixmaps/gnome-cd/themes/lcd/middle-right.png
-share/pixmaps/gnome-cd/themes/lcd/middle.png
-share/pixmaps/gnome-cd/themes/lcd/top-left.png
-share/pixmaps/gnome-cd/themes/lcd/top-right.png
-share/pixmaps/gnome-cd/themes/lcd/top.png
-share/pixmaps/gnome-cd/themes/media/bottom-left.png
-share/pixmaps/gnome-cd/themes/media/bottom-right.png
-share/pixmaps/gnome-cd/themes/media/bottom.png
-share/pixmaps/gnome-cd/themes/media/media.theme
-share/pixmaps/gnome-cd/themes/media/middle-left.png
-share/pixmaps/gnome-cd/themes/media/middle-right.png
-share/pixmaps/gnome-cd/themes/media/middle.png
-share/pixmaps/gnome-cd/themes/media/top-left.png
-share/pixmaps/gnome-cd/themes/media/top-right.png
-share/pixmaps/gnome-cd/themes/media/top.png
-share/pixmaps/gnome-cd/themes/red-lcd/bottom-left.png
-share/pixmaps/gnome-cd/themes/red-lcd/bottom-right.png
-share/pixmaps/gnome-cd/themes/red-lcd/bottom.png
-share/pixmaps/gnome-cd/themes/red-lcd/middle-left.png
-share/pixmaps/gnome-cd/themes/red-lcd/middle-right.png
-share/pixmaps/gnome-cd/themes/red-lcd/middle.png
-share/pixmaps/gnome-cd/themes/red-lcd/red-lcd.theme
-share/pixmaps/gnome-cd/themes/red-lcd/top-left.png
-share/pixmaps/gnome-cd/themes/red-lcd/top-right.png
-share/pixmaps/gnome-cd/themes/red-lcd/top.png
-share/pixmaps/gnome-cd/track.png
-share/pixmaps/gnome-grecord.png
-share/pixmaps/gnome-mixer.png
-share/pixmaps/gnome-reclevel.png
-share/pixmaps/gnome-vumeter.png
-share/pixmaps/gstreamer-properties.png
-@dirrm share/pixmaps/gnome-cd/themes/red-lcd
-@dirrm share/pixmaps/gnome-cd/themes/media
-@dirrm share/pixmaps/gnome-cd/themes/lcd
-@dirrm share/pixmaps/gnome-cd/themes/None
-@dirrm share/pixmaps/gnome-cd/themes
-@dirrm share/pixmaps/gnome-cd
-@comment in xdg-dirs: @dirrm share/pixmaps
-@dirrm share/omf/gnome-media
-@comment in scrollkeeper: @dirrm share/omf
-@comment in ORBit2: @dirrm share/idl
-@dirrm share/gstreamer-properties/icons
-@dirrm share/gstreamer-properties/glade
-@dirrm share/gstreamer-properties
-@dirrm share/gnome/help/gstreamer-properties/uk/figures
-@dirrm share/gnome/help/gstreamer-properties/uk
-@dirrm share/gnome/help/gstreamer-properties/C/figures
-@dirrm share/gnome/help/gstreamer-properties/C
-@dirrm share/gnome/help/gstreamer-properties
-@dirrm share/gnome/help/grecord/zh_TW/figures
-@dirrm share/gnome/help/grecord/zh_TW
-@dirrm share/gnome/help/grecord/zh_CN/figures
-@dirrm share/gnome/help/grecord/zh_CN
-@dirrm share/gnome/help/grecord/sv/figures
-@dirrm share/gnome/help/grecord/sv
-@dirrm share/gnome/help/grecord/ko/figures
-@dirrm share/gnome/help/grecord/ko
-@dirrm share/gnome/help/grecord/ja/figures
-@dirrm share/gnome/help/grecord/ja
-@dirrm share/gnome/help/grecord/it/figures
-@dirrm share/gnome/help/grecord/it
-@dirrm share/gnome/help/grecord/fr/figures
-@dirrm share/gnome/help/grecord/fr
-@dirrm share/gnome/help/grecord/es/figures
-@dirrm share/gnome/help/grecord/es
-@dirrm share/gnome/help/grecord/de/figures
-@dirrm share/gnome/help/grecord/de
-@dirrm share/gnome/help/grecord
-@dirrm share/gnome/help/gnome-volume-control/uk/figures
-@dirrm share/gnome/help/gnome-volume-control/uk
-@dirrm share/gnome/help/gnome-volume-control/C/figures
-@dirrm share/gnome/help/gnome-volume-control/C
-@dirrm share/gnome/help/gnome-volume-control
-@dirrm share/gnome/help/gnome-sound-recorder/uk/figures
-@dirrm share/gnome/help/gnome-sound-recorder/uk
-@dirrm share/gnome/help/gnome-sound-recorder/C/figures
-@dirrm share/gnome/help/gnome-sound-recorder/C
-@dirrm share/gnome/help/gnome-sound-recorder
-@dirrm share/gnome/help/gnome-cd/zh_TW/figures
-@dirrm share/gnome/help/gnome-cd/zh_TW
-@dirrm share/gnome/help/gnome-cd/zh_CN/figures
-@dirrm share/gnome/help/gnome-cd/zh_CN
-@dirrm share/gnome/help/gnome-cd/uk/figures
-@dirrm share/gnome/help/gnome-cd/uk
-@dirrm share/gnome/help/gnome-cd/sv/figures
-@dirrm share/gnome/help/gnome-cd/sv
-@dirrm share/gnome/help/gnome-cd/nl/figures
-@dirrm share/gnome/help/gnome-cd/nl
-@dirrm share/gnome/help/gnome-cd/ko/figures
-@dirrm share/gnome/help/gnome-cd/ko
-@dirrm share/gnome/help/gnome-cd/ja/figures
-@dirrm share/gnome/help/gnome-cd/ja
-@dirrm share/gnome/help/gnome-cd/it/figures
-@dirrm share/gnome/help/gnome-cd/it
-@dirrm share/gnome/help/gnome-cd/fr/figures
-@dirrm share/gnome/help/gnome-cd/fr
-@dirrm share/gnome/help/gnome-cd/es/figures
-@dirrm share/gnome/help/gnome-cd/es
-@dirrm share/gnome/help/gnome-cd/de/figures
-@dirrm share/gnome/help/gnome-cd/de
-@dirrm share/gnome/help/gnome-cd/C/figures
-@dirrm share/gnome/help/gnome-cd/C
-@dirrm share/gnome/help/gnome-cd
-@comment in gnome2-dirs: @dirrm share/gnome/help
-@dirrm share/gnome-sound-recorder/ui
-@dirrm share/gnome-sound-recorder
-@dirrm share/gnome-media/pixmaps
-@dirrm share/gnome-media/glade
-@dirrm share/gnome-media
-@comment in GConf2: @dirrm share/gconf/schemas
-@comment in xdg-dirs: @dirrm share/applications
-@comment in libglade2: @dirrm lib/libglade/2.0
-@comment in libbonobo: @dirrm lib/bonobo/servers
-@dirrm include/gnome-media/profiles
-@dirrm include/gnome-media
-@dirrm include/cddb-slave2
diff --git a/multimedia/gnome2-media/buildlink3.mk b/multimedia/gnome2-media/buildlink3.mk
deleted file mode 100644
index d2be499c631..00000000000
--- a/multimedia/gnome2-media/buildlink3.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1 2005/03/22 16:34:36 jmmv Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GNOME_MEDIA_BUILDLINK3_MK:=	${GNOME_MEDIA_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gnome-media
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-media}
-BUILDLINK_PACKAGES+=	gnome-media
-
-.if !empty(GNOME_MEDIA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-media+=		gnome-media>=2.10.0
-BUILDLINK_PKGSRCDIR.gnome-media?=	../../multimedia/gnome2-media
-.endif	# GNOME_MEDIA_BUILDLINK3_MK
-
-.include "../../devel/GConf2-ui/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
-.include "../../devel/libgnome/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/gnome2-media/distinfo b/multimedia/gnome2-media/distinfo
deleted file mode 100644
index 6c64538204c..00000000000
--- a/multimedia/gnome2-media/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.11 2005/10/16 12:12:50 jmmv Exp $
-
-SHA1 (gnome-media-2.12.0.tar.bz2) = 6861338957af344457da25e032e0ee78f5f96921
-RMD160 (gnome-media-2.12.0.tar.bz2) = 2f43c4ad210268d67b6311f9e5bb16988459c20b
-Size (gnome-media-2.12.0.tar.bz2) = 3444233 bytes
-SHA1 (patch-aa) = 6d72e7ef6fb4c7bacfed8afd4654ab670c415c6f
-SHA1 (patch-ab) = 0b03cc24429983e6e91f4d697905852820ebc679
diff --git a/multimedia/gopchop/DESCR b/multimedia/gopchop/DESCR
deleted file mode 100644
index 62f08c8ef85..00000000000
--- a/multimedia/gopchop/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-This tool is used for people wanting to take sections out of MPEG2-PS
-files without re-encoding the resulting frames.  The idea is to
-write specific "Group of Pictures" (GOP) sections to a new MPEG2-PS
-file.  These GOPs will decode correctly (in theory), and the gaps
-won't be noticed.  I wrote this tool to edit commercials out of
-MPEG2 files produced by my KFir MPEG2 capture card.  Using this
-tool for anything else is really beyond the scope of its design.
diff --git a/multimedia/gopchop/Makefile b/multimedia/gopchop/Makefile
deleted file mode 100644
index 9648ff2fa44..00000000000
--- a/multimedia/gopchop/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2005/08/15 02:15:56 wiz Exp $
-#
-
-DISTNAME=		gopchop-1.1.7
-PKGREVISION=		1
-CATEGORIES=		multimedia
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gopchop/} \
-			http://outflux.net/unix/software/GOPchop/download/
-
-MAINTAINER=		wiz@NetBSD.org
-HOMEPAGE=		http://outflux.net/unix/software/GOPchop/
-COMMENT=		MPEG2 GOP-accurate editor
-
-GNU_CONFIGURE=		yes
-USE_DIRS+=		xdg-1.1
-USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		pkg-config
-
-.include "../../multimedia/libmpeg2/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gopchop/PLIST b/multimedia/gopchop/PLIST
deleted file mode 100644
index 0dd3df6b061..00000000000
--- a/multimedia/gopchop/PLIST
+++ /dev/null
@@ -1,16 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/04/30 23:06:25 wiz Exp $
-bin/gopchop
-bin/gtkspu
-bin/mpegcat
-man/man1/gopchop.1
-man/man1/gtkspu.1
-man/man1/mpegcat.1
-share/applications/gopchop.desktop
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gopchop.mo
-${PKGLOCALEDIR}/locale/en/LC_MESSAGES/gopchop.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gopchop.mo
-share/pixmaps/gopchop.png
-share/pixmaps/gopchop/about.xpm
-share/pixmaps/gopchop/error.xpm
-share/pixmaps/gopchop/menu_about.png
-@dirrm share/pixmaps/gopchop
diff --git a/multimedia/gopchop/distinfo b/multimedia/gopchop/distinfo
deleted file mode 100644
index 0b41523557f..00000000000
--- a/multimedia/gopchop/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/06/06 15:12:07 wiz Exp $
-
-SHA1 (gopchop-1.1.7.tar.gz) = d7e110d0e12aeb6ae6b6b90c9a3cf1f9222f30e4
-RMD160 (gopchop-1.1.7.tar.gz) = 31e9cf6934099dcda3025ec62e6d84714171809d
-Size (gopchop-1.1.7.tar.gz) = 556083 bytes
-SHA1 (patch-aa) = 560d87bf80a877b39acee9430b10d14e5363c82a
diff --git a/multimedia/gopchop/patches/patch-aa b/multimedia/gopchop/patches/patch-aa
deleted file mode 100644
index 2cf5b09baec..00000000000
--- a/multimedia/gopchop/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/06/06 15:12:07 wiz Exp $
-
---- src/widgets.cpp.orig	2005-05-01 09:03:14.000000000 +0200
-+++ src/widgets.cpp
-@@ -130,6 +130,7 @@ void setup_gtk_stuff()
- 
-     /* figure out where our pixmaps are */
-     add_pixmap_directory(PACKAGE_DATA_DIR "/pixmaps");
-+    add_pixmap_directory(PACKAGE_DATA_DIR "/pixmaps/gopchop");
-     add_pixmap_directory(PACKAGE_SOURCE_DIR "/pixmaps");
- 
-     /* create our main window */
diff --git a/multimedia/gst-plugins-dvdnav/DESCR b/multimedia/gst-plugins-dvdnav/DESCR
deleted file mode 100644
index e14b25c5991..00000000000
--- a/multimedia/gst-plugins-dvdnav/DESCR
+++ /dev/null
@@ -1,11 +0,0 @@
-GStreamer is a library that allows the construction of graphs of
-media-handling components, ranging from simple mp3 playback to complex
-audio (mixing) and video (non-linear editing) processing.
-
-Applications can take advantage of advances in codec and filter technology
-transparently.  Developers can add new codecs and filters by writing a
-simple plugin with a clean, generic interface.
-
-This package provides the dvdnav plugin for GStreamer, which allows navigation
-of menus contained in DVDs.  You'll probably want to install the dvdread plugin
-(from the gst-plugins-dvdread package), too.
diff --git a/multimedia/gst-plugins-dvdnav/Makefile b/multimedia/gst-plugins-dvdnav/Makefile
deleted file mode 100644
index 04b8e2963e5..00000000000
--- a/multimedia/gst-plugins-dvdnav/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2005/09/21 16:10:49 wiz Exp $
-#
-
-GST_PLUGINS_NAME=	dvdnav
-GST_PLUGINS_DIR=	ext/dvdnav
-
-.include "../../multimedia/gst-plugins/Makefile.common"
-
-.include "../../multimedia/libdvdnav/buildlink3.mk"
-.include "../../multimedia/libdvdread/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gst-plugins-dvdnav/PLIST b/multimedia/gst-plugins-dvdnav/PLIST
deleted file mode 100644
index 31c793d2ff0..00000000000
--- a/multimedia/gst-plugins-dvdnav/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:44 jlam Exp $
-lib/gstreamer-0.8/libgstdvdnavsrc.la
-@comment in gstreamer: @dirrm lib/gstreamer-0.8
diff --git a/multimedia/gst-plugins-dvdread/DESCR b/multimedia/gst-plugins-dvdread/DESCR
deleted file mode 100644
index 74423d39f9a..00000000000
--- a/multimedia/gst-plugins-dvdread/DESCR
+++ /dev/null
@@ -1,11 +0,0 @@
-GStreamer is a library that allows the construction of graphs of
-media-handling components, ranging from simple mp3 playback to complex
-audio (mixing) and video (non-linear editing) processing.
-
-Applications can take advantage of advances in codec and filter technology
-transparently.  Developers can add new codecs and filters by writing a
-simple plugin with a clean, generic interface.
-
-This package provides the dvdread plugin for GStreamer, which allows reading
-of DVD disks.  You'll probably want to install the dvdnav plugin (from the
-gst-plugins-dvdnav package), too.
diff --git a/multimedia/gst-plugins-dvdread/Makefile b/multimedia/gst-plugins-dvdread/Makefile
deleted file mode 100644
index 1ca97bb4712..00000000000
--- a/multimedia/gst-plugins-dvdread/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/04/06 13:49:56 jmmv Exp $
-#
-
-GST_PLUGINS_NAME=	dvdread
-GST_PLUGINS_DIR=	ext/dvdread
-
-.include "../../multimedia/gst-plugins/Makefile.common"
-
-.include "../../multimedia/libdvdread/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gst-plugins-dvdread/PLIST b/multimedia/gst-plugins-dvdread/PLIST
deleted file mode 100644
index f5f7924ec1b..00000000000
--- a/multimedia/gst-plugins-dvdread/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:44 jlam Exp $
-lib/gstreamer-0.8/libgstdvdreadsrc.la
-@comment in gstreamer: @dirrm lib/gstreamer-0.8
diff --git a/multimedia/gst-plugins-mpeg2dec/DESCR b/multimedia/gst-plugins-mpeg2dec/DESCR
deleted file mode 100644
index e88d24721d0..00000000000
--- a/multimedia/gst-plugins-mpeg2dec/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-GStreamer is a library that allows the construction of graphs of
-media-handling components, ranging from simple mp3 playback to complex
-audio (mixing) and video (non-linear editing) processing.
-
-Applications can take advantage of advances in codec and filter technology
-transparently.  Developers can add new codecs and filters by writing a
-simple plugin with a clean, generic interface.
-
-This package provides the mpeg2dec plugin for GStreamer, an MPEG 1 and MPEG 2
-video decoder.
diff --git a/multimedia/gst-plugins-mpeg2dec/Makefile b/multimedia/gst-plugins-mpeg2dec/Makefile
deleted file mode 100644
index 5d67433618d..00000000000
--- a/multimedia/gst-plugins-mpeg2dec/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2005/05/25 21:07:59 jmmv Exp $
-#
-
-GST_PLUGINS_NAME=	mpeg2dec
-GST_PLUGINS_DIR=	ext/mpeg2dec
-
-.include "../../multimedia/gst-plugins/Makefile.common"
-
-.include "../../multimedia/libmpeg2/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gst-plugins-mpeg2dec/PLIST b/multimedia/gst-plugins-mpeg2dec/PLIST
deleted file mode 100644
index 3da1fbf88c4..00000000000
--- a/multimedia/gst-plugins-mpeg2dec/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:44 jlam Exp $
-lib/gstreamer-0.8/libgstmpeg2dec.la
-@comment in gstreamer: @dirrm lib/gstreamer-0.8
diff --git a/multimedia/gst-plugins-ogg/DESCR b/multimedia/gst-plugins-ogg/DESCR
deleted file mode 100644
index 4f96a46b70c..00000000000
--- a/multimedia/gst-plugins-ogg/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-GStreamer is a library that allows the construction of graphs of
-media-handling components, ranging from simple mp3 playback to complex
-audio (mixing) and video (non-linear editing) processing.
-
-Applications can take advantage of advances in codec and filter technology
-transparently.  Developers can add new codecs and filters by writing a
-simple plugin with a clean, generic interface.
-
-This package provides the ogg plugin for GStreamer, which lets it handle
-OGG media containers.  You'll probably want to install gst-plugins-vorbis
-and gst-plugins-theora too, which provide its respective audio and video
-codecs.
diff --git a/multimedia/gst-plugins-ogg/Makefile b/multimedia/gst-plugins-ogg/Makefile
deleted file mode 100644
index 581692865da..00000000000
--- a/multimedia/gst-plugins-ogg/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/04/16 13:27:32 jmmv Exp $
-#
-
-GST_PLUGINS_NAME=	ogg
-GST_PLUGINS_DIR=	ext/ogg
-
-.include "../../multimedia/gst-plugins/Makefile.common"
-
-.include "../../multimedia/libogg/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gst-plugins-ogg/PLIST b/multimedia/gst-plugins-ogg/PLIST
deleted file mode 100644
index 7b6140d655a..00000000000
--- a/multimedia/gst-plugins-ogg/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:45 jlam Exp $
-lib/gstreamer-0.8/libgstogg.la
-@comment in gstreamer: @dirrm lib/gstreamer-0.8
diff --git a/multimedia/gst-plugins-theora/DESCR b/multimedia/gst-plugins-theora/DESCR
deleted file mode 100644
index af2e2630e0d..00000000000
--- a/multimedia/gst-plugins-theora/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-GStreamer is a library that allows the construction of graphs of
-media-handling components, ranging from simple mp3 playback to complex
-audio (mixing) and video (non-linear editing) processing.
-
-Applications can take advantage of advances in codec and filter technology
-transparently.  Developers can add new codecs and filters by writing a
-simple plugin with a clean, generic interface.
-
-This package provides the theora plugin for GStreamer, the OGG's free video
-codec.
diff --git a/multimedia/gst-plugins-theora/Makefile b/multimedia/gst-plugins-theora/Makefile
deleted file mode 100644
index 851c75d90f4..00000000000
--- a/multimedia/gst-plugins-theora/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2004/09/01 17:01:31 jmmv Exp $
-#
-
-GST_PLUGINS_NAME=	theora
-GST_PLUGINS_DIR=	ext/theora
-
-.include "../../multimedia/gst-plugins/Makefile.common"
-
-DEPENDS+=		gst-plugins-ogg>=0.8.1:../../multimedia/gst-plugins-ogg
-
-.include "../../multimedia/libtheora/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gst-plugins-theora/PLIST b/multimedia/gst-plugins-theora/PLIST
deleted file mode 100644
index 53658f4e70b..00000000000
--- a/multimedia/gst-plugins-theora/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:45 jlam Exp $
-lib/gstreamer-0.8/libgsttheora.la
-@comment in gstreamer: @dirrm lib/gstreamer-0.8
diff --git a/multimedia/gst-plugins-xvid/DESCR b/multimedia/gst-plugins-xvid/DESCR
deleted file mode 100644
index 5f20c49d01c..00000000000
--- a/multimedia/gst-plugins-xvid/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-GStreamer is a library that allows the construction of graphs of
-media-handling components, ranging from simple mp3 playback to complex
-audio (mixing) and video (non-linear editing) processing.
-
-Applications can take advantage of advances in codec and filter technology
-transparently.  Developers can add new codecs and filters by writing a
-simple plugin with a clean, generic interface.
-
-This package provides the xvid plugin for GStreamer, which lets it handle
-MPEG4 (aka DIVX) media containers.
diff --git a/multimedia/gst-plugins-xvid/Makefile b/multimedia/gst-plugins-xvid/Makefile
deleted file mode 100644
index 8130ea66712..00000000000
--- a/multimedia/gst-plugins-xvid/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/10/21 07:42:39 xtraeme Exp $
-#
-
-GST_PLUGINS_NAME=	xvid
-GST_PLUGINS_DIR=	ext/xvid
-
-BUILDLINK_DEPENDS.xvidcore+=	xvidcore>=1.0.3nb1
-
-.include "../../multimedia/gst-plugins/Makefile.common"
-
-.include "../../multimedia/xvidcore/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gst-plugins-xvid/PLIST b/multimedia/gst-plugins-xvid/PLIST
deleted file mode 100644
index d7639aac139..00000000000
--- a/multimedia/gst-plugins-xvid/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/10/21 07:42:39 xtraeme Exp $
-lib/gstreamer-0.8/libgstxvid.la
-@comment in gstreamer: @dirrm lib/gstreamer-0.8
diff --git a/multimedia/gst-plugins/DESCR b/multimedia/gst-plugins/DESCR
deleted file mode 100644
index b8abf75cf79..00000000000
--- a/multimedia/gst-plugins/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-GStreamer is a library that allows the construction of graphs of
-media-handling components, ranging from simple mp3 playback to complex
-audio (mixing) and video (non-linear editing) processing.
-
-Applications can take advantage of advances in codec and filter technology
-transparently.  Developers can add new codecs and filters by writing a
-simple plugin with a clean, generic interface.
-
-This package is part of gst-plugins, which contains a set of multimedia
-plugins for GStreamer.
diff --git a/multimedia/gst-plugins/Makefile b/multimedia/gst-plugins/Makefile
deleted file mode 100644
index adfd6bee134..00000000000
--- a/multimedia/gst-plugins/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: Makefile,v 1.28 2005/10/12 21:54:04 jmmv Exp $
-#
-
-.include "Makefile.common"
-
-COMMENT+=		base plugins
-
-USE_TOOLS+=		perl:run
-
-PKGCONFIG_OVERRIDE+=	pkgconfig/gstreamer-gconf.pc.in
-PKGCONFIG_OVERRIDE+=	pkgconfig/gstreamer-interfaces.pc.in
-PKGCONFIG_OVERRIDE+=	pkgconfig/gstreamer-media-info.pc.in
-PKGCONFIG_OVERRIDE+=	pkgconfig/gstreamer-libs.pc.in
-PKGCONFIG_OVERRIDE+=	pkgconfig/gstreamer-play.pc.in
-PKGCONFIG_OVERRIDE+=	pkgconfig/gstreamer-plugins.pc.in
-
-CONFIGURE_ARGS+=	--enable-gconf
-CONFIGURE_ARGS+=	--enable-gconftool
-CONFIGURE_ARGS+=	--enable-x
-CONFIGURE_ARGS+=	--enable-xshm
-CONFIGURE_ARGS+=	--enable-xvideo
-CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/gst-plugins
-
-GCONF2_SCHEMAS=		gstreamer-0.8.schemas
-
-REPLACE_PERL+=		tools/gst-launch-ext-m.m
-REPLACE_PERL+=		tools/gst-visualise-m.m
-
-.include "../../devel/GConf2/schemas.mk"
-.include "../../x11/Xfixes/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gst-plugins/Makefile.common b/multimedia/gst-plugins/Makefile.common
deleted file mode 100644
index 2d3e33dcdfd..00000000000
--- a/multimedia/gst-plugins/Makefile.common
+++ /dev/null
@@ -1,170 +0,0 @@
-# $NetBSD: Makefile.common,v 1.23 2005/10/12 21:54:04 jmmv Exp $
-#
-
-DISTNAME=		gst-plugins-0.8.11
-CATEGORIES=		multimedia gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gst-plugins/0.8/} \
-			http://gstreamer.freedesktop.org/src/gst-plugins/
-EXTRACT_SUFX=		.tar.bz2
-
-MAINTAINER=		rh@NetBSD.org
-HOMEPAGE=		http://www.gstreamer.net/
-COMMENT=		GStreamer -
-
-DISTINFO_FILE=		${.CURDIR}/../../multimedia/gst-plugins/distinfo
-FILESDIR=		${.CURDIR}/../../multimedia/gst-plugins/files
-PATCHDIR=		${.CURDIR}/../../multimedia/gst-plugins/patches
-
-BUILD_DEPENDS+=		nasm>=0.98.38:../../devel/nasm
-
-GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake pkg-config
-USE_LIBTOOL=		yes
-USE_PKGLOCALEDIR=	yes
-
-CONFIGURE_ARGS+=	--disable-docs-build
-CONFIGURE_ARGS+=	--disable-examples
-CONFIGURE_ARGS+=	--disable-tests
-
-.include "../../mk/compiler.mk"
-
-.if !empty(PKGSRC_COMPILER:Msunpro)
-# SunPro cc understands __func__ but CC does not, so disable explicitly.
-CONFIGURE_ENV+=		have_func=no
-.endif
-
-# Disable all drivers and features by default.
-.for driver in	a52dec \
-		aalib \
-		aalibtest \
-		alsa \
-		amrnb \
-		arts \
-		artsc \
-		artstest \
-		audiofile \
-		audioresample \
-		cairo \
-		cdaudio \
-		cdio \
-		cdparanoia \
-		cdrom \
-		dirac \
-		directfb \
-		divx \
-		dts \
-		dv1394 \
-		dvdnav \
-		dvdread \
-		dxr3 \
-		esd \
-		esdtest \
-		faac \
-		faad \
-		flac \
-		freetypetest \
-		gconf \
-		gconftool \
-		gdk_pixbuf \
-		gnome_vfs \
-		gsm \
-		gst_v4l \
-		gst_v4l2 \
-		hermes \
-		ivorbis \
-		jack \
-		jpeg \
-		ladspa \
-		lame \
-		lcs \
-		libcaca \
-		libdv \
-		libfame \
-		libfametest \
-		libmikmodtest \
-		libmms \
-		libmng \
-		libpng \
-		libvisual \
-		mad \
-		mikmod \
-		mpeg2dec \
-		mpeg2enc \
-		mplex \
-		musepack \
-		musicbrainz \
-		nas \
-		ogg \
-		oggtest \
-		opengl \
-		oss \
-		osx_audio \
-		osx_video \
-		pango \
-		polyp \
-		qcam \
-		raw1394 \
-		sdl \
-		sdltest \
-		shout \
-		shout2 \
-		shout2test \
-		sidplay \
-		smoothwave \
-		sndfile \
-		sunaudio \
-		spc \
-		speex \
-		swfdec \
-		tarkin \
-		theora \
-		vcd \
-		vorbis \
-		vorbistest \
-		wavpack \
-		x \
-		x264 \
-		xshm \
-		xvid \
-		xvideo
-CONFIGURE_ARGS+=	--disable-${driver}
-.endfor
-.undef driver
-
-# A package building a single plugin of gst-plugins has to include this
-# file and define the following variables:
-#    GST_PLUGINS_NAME - The name of the plugin, to be added to the package
-#                       name and the comment.
-#    GST_PLUGINS_DIR  - The directory where the plugin resides; a relative
-#                       path from WRKSRC.
-#    GST_PLUGINS_FLAG - The name of the flag used to enable the plugin.
-#                       Defaults to GST_PLUGINS_NAME.
-.if defined(GST_PLUGINS_NAME) && !empty(GST_PLUGINS_NAME)
-PKGNAME=		${DISTNAME:S/plugins/plugins-${GST_PLUGINS_NAME}/}
-COMMENT+=		${GST_PLUGINS_NAME} plugin
-
-GST_PLUGINS_FLAG?=	${GST_PLUGINS_NAME}
-GST_PLUGINS_DIR?=	non-existent
-
-CONFIGURE_ARGS:=	${CONFIGURE_ARGS:S/--disable-${GST_PLUGINS_FLAG}/--enable-${GST_PLUGINS_FLAG}/}
-
-BUILD_DIRS=		${WRKSRC}/${GST_PLUGINS_DIR}
-INSTALL_DIRS=		${WRKSRC}/${GST_PLUGINS_DIR}
-
-# Fix paths to already installed libraries (by the gst-plugins package).
-SUBST_CLASSES+=		libs
-SUBST_MESSAGE.libs=	"Fixing path to dependent libraries."
-SUBST_STAGE.libs=	pre-configure
-SUBST_FILES.libs=	${GST_PLUGINS_DIR}/Makefile.in
-SUBST_SED.libs=		-e 's|$$(top_builddir)/gst-libs/gst/libgst|${BUILDLINK_PREFIX.gst-plugins}/lib/libgst|g'
-
-BUILDLINK_DEPENDS.gst-plugins+=	gst-plugins>=0.8.11
-.include "../../multimedia/gst-plugins/buildlink3.mk"
-.endif
-
-BUILDLINK_DEPENDS.gstreamer+=	gstreamer>=0.8.11
-
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../multimedia/gstreamer/plugins.mk"
diff --git a/multimedia/gst-plugins/PLIST b/multimedia/gst-plugins/PLIST
deleted file mode 100644
index 71d601e7b93..00000000000
--- a/multimedia/gst-plugins/PLIST
+++ /dev/null
@@ -1,185 +0,0 @@
-@comment $NetBSD: PLIST,v 1.15 2005/10/12 21:54:04 jmmv Exp $
-bin/gst-launch-ext-0.8
-bin/gst-visualise-0.8
-include/gstreamer-0.8/gst/audio/audio.h
-include/gstreamer-0.8/gst/audio/audioclock.h
-include/gstreamer-0.8/gst/audio/gstaudiofilter.h
-include/gstreamer-0.8/gst/audio/multichannel-enumtypes.h
-include/gstreamer-0.8/gst/audio/multichannel.h
-include/gstreamer-0.8/gst/colorbalance/colorbalance-enumtypes.h
-include/gstreamer-0.8/gst/colorbalance/colorbalance.h
-include/gstreamer-0.8/gst/colorbalance/colorbalancechannel.h
-include/gstreamer-0.8/gst/floatcast/floatcast.h
-include/gstreamer-0.8/gst/gconf/gconf.h
-include/gstreamer-0.8/gst/idct/idct.h
-include/gstreamer-0.8/gst/media-info/media-info.h
-include/gstreamer-0.8/gst/mixer/mixer-enumtypes.h
-include/gstreamer-0.8/gst/mixer/mixer.h
-include/gstreamer-0.8/gst/mixer/mixeroptions.h
-include/gstreamer-0.8/gst/mixer/mixertrack.h
-include/gstreamer-0.8/gst/navigation/navigation.h
-include/gstreamer-0.8/gst/play/play-enumtypes.h
-include/gstreamer-0.8/gst/play/play.h
-include/gstreamer-0.8/gst/propertyprobe/propertyprobe.h
-include/gstreamer-0.8/gst/resample/resample.h
-include/gstreamer-0.8/gst/riff/riff-ids.h
-include/gstreamer-0.8/gst/riff/riff-media.h
-include/gstreamer-0.8/gst/riff/riff-read.h
-include/gstreamer-0.8/gst/tag/tag.h
-include/gstreamer-0.8/gst/tuner/tuner-enumtypes.h
-include/gstreamer-0.8/gst/tuner/tuner.h
-include/gstreamer-0.8/gst/tuner/tunerchannel.h
-include/gstreamer-0.8/gst/tuner/tunernorm.h
-include/gstreamer-0.8/gst/video/video.h
-include/gstreamer-0.8/gst/video/videosink.h
-include/gstreamer-0.8/gst/xoverlay/xoverlay.h
-include/gstreamer-0.8/gst/xwindowlistener/xwindowlistener.h
-lib/gstreamer-0.8/libgstac3parse.la
-lib/gstreamer-0.8/libgstadder.la
-lib/gstreamer-0.8/libgstalaw.la
-lib/gstreamer-0.8/libgstalpha.la
-lib/gstreamer-0.8/libgstalphacolor.la
-lib/gstreamer-0.8/libgstapetag.la
-lib/gstreamer-0.8/libgstasf.la
-lib/gstreamer-0.8/libgstaudio.la
-lib/gstreamer-0.8/libgstaudioconvert.la
-lib/gstreamer-0.8/libgstaudiofilter.la
-lib/gstreamer-0.8/libgstaudiorate.la
-lib/gstreamer-0.8/libgstaudioscale.la
-lib/gstreamer-0.8/libgstauparse.la
-lib/gstreamer-0.8/libgstautodetect.la
-lib/gstreamer-0.8/libgstavi.la
-lib/gstreamer-0.8/libgstcdxaparse.la
-lib/gstreamer-0.8/libgstchart.la
-lib/gstreamer-0.8/libgstcolorspace.la
-lib/gstreamer-0.8/libgstcutter.la
-lib/gstreamer-0.8/libgstdebug.la
-lib/gstreamer-0.8/libgstdecodebin.la
-lib/gstreamer-0.8/libgstdeinterlace.la
-lib/gstreamer-0.8/libgstdvdlpcmdec.la
-lib/gstreamer-0.8/libgstdvdsubdec.la
-lib/gstreamer-0.8/libgstefence.la
-lib/gstreamer-0.8/libgsteffectv.la
-lib/gstreamer-0.8/libgstequalizer.la
-lib/gstreamer-0.8/libgstfestival.la
-lib/gstreamer-0.8/libgstffmpegcolorspace.la
-lib/gstreamer-0.8/libgstfilter.la
-lib/gstreamer-0.8/libgstflxdec.la
-lib/gstreamer-0.8/libgstfreeze.la
-lib/gstreamer-0.8/libgstgamma.la
-lib/gstreamer-0.8/libgstgconfelements.la
-lib/gstreamer-0.8/libgstgoom.la
-lib/gstreamer-0.8/libgstidct.la
-lib/gstreamer-0.8/libgstimagemixer.la
-lib/gstreamer-0.8/libgstinterleave.la
-lib/gstreamer-0.8/libgstlevel.la
-lib/gstreamer-0.8/libgstmatroska.la
-lib/gstreamer-0.8/libgstmedian.la
-lib/gstreamer-0.8/libgstmixmatrix.la
-lib/gstreamer-0.8/libgstmodplug.la
-lib/gstreamer-0.8/libgstmonoscope.la
-lib/gstreamer-0.8/libgstmp1videoparse.la
-lib/gstreamer-0.8/libgstmpeg1systemencode.la
-lib/gstreamer-0.8/libgstmpeg2subt.la
-lib/gstreamer-0.8/libgstmpegaudio.la
-lib/gstreamer-0.8/libgstmpegaudioparse.la
-lib/gstreamer-0.8/libgstmpegstream.la
-lib/gstreamer-0.8/libgstmulaw.la
-lib/gstreamer-0.8/libgstmultifilesink.la
-lib/gstreamer-0.8/libgstmultipart.la
-lib/gstreamer-0.8/libgstnavigationtest.la
-lib/gstreamer-0.8/libgstoverlay.la
-lib/gstreamer-0.8/libgstpassthrough.la
-lib/gstreamer-0.8/libgstplaybin.la
-lib/gstreamer-0.8/libgstplayondemand.la
-lib/gstreamer-0.8/libgstpuzzle.la
-lib/gstreamer-0.8/libgstqtdemux.la
-lib/gstreamer-0.8/libgstresample.la
-lib/gstreamer-0.8/libgstrfbsrc.la
-lib/gstreamer-0.8/libgstriff.la
-lib/gstreamer-0.8/libgstrmdemux.la
-lib/gstreamer-0.8/libgstrtjpeg.la
-lib/gstreamer-0.8/libgstrtp.la
-lib/gstreamer-0.8/libgstsilence.la
-lib/gstreamer-0.8/libgstsinesrc.la
-lib/gstreamer-0.8/libgstsmooth.la
-lib/gstreamer-0.8/libgstsmpte.la
-lib/gstreamer-0.8/libgstspectrum.la
-lib/gstreamer-0.8/libgstspeed.la
-lib/gstreamer-0.8/libgststereo.la
-lib/gstreamer-0.8/libgstsubparse.la
-lib/gstreamer-0.8/libgstswitch.la
-lib/gstreamer-0.8/libgstsynaesthesia.la
-lib/gstreamer-0.8/libgsttagedit.la
-lib/gstreamer-0.8/libgsttcp.la
-lib/gstreamer-0.8/libgsttta.la
-lib/gstreamer-0.8/libgsttypefindfunctions.la
-lib/gstreamer-0.8/libgstudp.la
-lib/gstreamer-0.8/libgstvbidec.la
-lib/gstreamer-0.8/libgstvideo.la
-lib/gstreamer-0.8/libgstvideobalance.la
-lib/gstreamer-0.8/libgstvideobox.la
-lib/gstreamer-0.8/libgstvideocrop.la
-lib/gstreamer-0.8/libgstvideodrop.la
-lib/gstreamer-0.8/libgstvideofilter.la
-lib/gstreamer-0.8/libgstvideoflip.la
-lib/gstreamer-0.8/libgstvideomixer.la
-lib/gstreamer-0.8/libgstvideorate.la
-lib/gstreamer-0.8/libgstvideoscale.la
-lib/gstreamer-0.8/libgstvideotestsrc.la
-lib/gstreamer-0.8/libgstvolenv.la
-lib/gstreamer-0.8/libgstvolume.la
-lib/gstreamer-0.8/libgstwavenc.la
-lib/gstreamer-0.8/libgstwavparse.la
-lib/gstreamer-0.8/libgstximagesink.la
-lib/gstreamer-0.8/libgstxvimagesink.la
-lib/gstreamer-0.8/libgstxwindowlistener.la
-lib/gstreamer-0.8/libgsty4menc.la
-lib/libgstgconf-0.8.la
-lib/libgstinterfaces-0.8.la
-lib/libgstmedia-info-0.8.la
-lib/libgstplay-0.8.la
-lib/pkgconfig/gstreamer-gconf-0.8.pc
-lib/pkgconfig/gstreamer-interfaces-0.8.pc
-lib/pkgconfig/gstreamer-libs-0.8.pc
-lib/pkgconfig/gstreamer-media-info-0.8.pc
-lib/pkgconfig/gstreamer-play-0.8.pc
-lib/pkgconfig/gstreamer-plugins-0.8.pc
-man/man1/gst-launch-ext-0.8.1
-man/man1/gst-visualise-0.8.1
-share/gconf/schemas/gstreamer-0.8.schemas
-${PKGLOCALEDIR}/locale/af/LC_MESSAGES/gst-plugins-0.8.mo
-${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gst-plugins-0.8.mo
-${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gst-plugins-0.8.mo
-${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gst-plugins-0.8.mo
-${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gst-plugins-0.8.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gst-plugins-0.8.mo
-${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/gst-plugins-0.8.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gst-plugins-0.8.mo
-${PKGLOCALEDIR}/locale/or/LC_MESSAGES/gst-plugins-0.8.mo
-${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/gst-plugins-0.8.mo
-${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gst-plugins-0.8.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gst-plugins-0.8.mo
-${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gst-plugins-0.8.mo
-${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gst-plugins-0.8.mo
-${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gst-plugins-0.8.mo
-@comment in GConf2: @dirrm share/gconf/schemas
-@comment in gstreamer: @dirrm lib/gstreamer-0.8
-@dirrm include/gstreamer-0.8/gst/xwindowlistener
-@dirrm include/gstreamer-0.8/gst/xoverlay
-@dirrm include/gstreamer-0.8/gst/video
-@dirrm include/gstreamer-0.8/gst/tuner
-@dirrm include/gstreamer-0.8/gst/tag
-@dirrm include/gstreamer-0.8/gst/riff
-@dirrm include/gstreamer-0.8/gst/resample
-@dirrm include/gstreamer-0.8/gst/propertyprobe
-@dirrm include/gstreamer-0.8/gst/play
-@dirrm include/gstreamer-0.8/gst/navigation
-@dirrm include/gstreamer-0.8/gst/mixer
-@dirrm include/gstreamer-0.8/gst/media-info
-@dirrm include/gstreamer-0.8/gst/idct
-@dirrm include/gstreamer-0.8/gst/gconf
-@dirrm include/gstreamer-0.8/gst/floatcast
-@dirrm include/gstreamer-0.8/gst/colorbalance
-@dirrm include/gstreamer-0.8/gst/audio
-@comment in gstreamer: @dirrm include/gstreamer-0.8/gst
diff --git a/multimedia/gst-plugins/buildlink3.mk b/multimedia/gst-plugins/buildlink3.mk
deleted file mode 100644
index 3f5c0f23212..00000000000
--- a/multimedia/gst-plugins/buildlink3.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/10/03 00:13:02 tv Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GST_PLUGINS_BUILDLINK3_MK:=	${GST_PLUGINS_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gst-plugins
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngst-plugins}
-BUILDLINK_PACKAGES+=	gst-plugins
-
-.if !empty(GST_PLUGINS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gst-plugins+=		gst-plugins>=0.8.0nb2
-BUILDLINK_DEPENDS.gst-plugins+=		gst-plugins>=0.8.4nb1
-BUILDLINK_PKGSRCDIR.gst-plugins?=	../../multimedia/gst-plugins
-.endif	# GST_PLUGINS_BUILDLINK3_MK
-
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/GConf2/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../multimedia/gstreamer/buildlink3.mk"
-
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/gst-plugins/distinfo b/multimedia/gst-plugins/distinfo
deleted file mode 100644
index 0565a60175a..00000000000
--- a/multimedia/gst-plugins/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.28 2005/11/02 15:09:07 joerg Exp $
-
-SHA1 (gst-plugins-0.8.11.tar.bz2) = 4a9be6b62dd0e8a73616e8e93f7a3ace8aec8c59
-RMD160 (gst-plugins-0.8.11.tar.bz2) = 833aec123a52cd0f36ec883c349cc8d69090d749
-Size (gst-plugins-0.8.11.tar.bz2) = 2439654 bytes
-SHA1 (patch-aa) = 288c0b1b6fa295ade5234ab6166140e4f178cb30
-SHA1 (patch-ab) = 7fc0f2214692ab11542527768726eee5dff7d8c8
-SHA1 (patch-ac) = b40375ef906a77c6819c379ea789f568c2cef907
-SHA1 (patch-ae) = 3509dd08d3e010e9eb85c71ae6c42e28f6f9ec2d
-SHA1 (patch-ag) = 264ef4cb6a4fa8eb65ff55ca1c0947d3566a64b8
-SHA1 (patch-ah) = 9df4c75c56f7fe29279f270ffc1cfa716fae1a98
diff --git a/multimedia/gst-plugins/patches/patch-aa b/multimedia/gst-plugins/patches/patch-aa
deleted file mode 100644
index 74b09aa4905..00000000000
--- a/multimedia/gst-plugins/patches/patch-aa
+++ /dev/null
@@ -1,73 +0,0 @@
-$NetBSD: patch-aa,v 1.11 2005/10/12 21:54:04 jmmv Exp $
-
---- configure.orig	2005-09-04 14:21:34.000000000 +0200
-+++ configure
-@@ -28340,6 +28340,10 @@ else
- fi
- 
- 
-+if test -z "$schemas_install"; then
-+  GCONF_SCHEMAS_INSTALL_TRUE='#'
-+  GCONF_SCHEMAS_INSTALL_FALSE=
-+fi
- 
- echo "$as_me: ***" >&6
- echo "$as_me: *** checking plugin:  ***" >&6
-@@ -35066,13 +35070,6 @@ echo "${ECHO_T}$XFIXES_LIBS" >&6
- 
- 
- 
--if test "x$HAVE_XFIXES" = "xyes"; then
--  HAVE_XFIXES_TRUE=
--  HAVE_XFIXES_FALSE='#'
--else
--  HAVE_XFIXES_TRUE='#'
--  HAVE_XFIXES_FALSE=
--fi
- 
- 
- 
-@@ -35180,13 +35177,6 @@ echo "${ECHO_T}$XDAMAGE_LIBS" >&6
- 
- 
- 
--if test "x$HAVE_XDAMAGE" = "xyes"; then
--  HAVE_XDAMAGE_TRUE=
--  HAVE_XDAMAGE_FALSE='#'
--else
--  HAVE_XDAMAGE_TRUE='#'
--  HAVE_XDAMAGE_FALSE=
--fi
- 
- 
-   fi
-@@ -35230,6 +35220,20 @@ else
-   USE_X_TRUE='#'
-   USE_X_FALSE=
- fi
-+if test "x$HAVE_XFIXES" = "xyes"; then
-+  HAVE_XFIXES_TRUE=
-+  HAVE_XFIXES_FALSE='#'
-+else
-+  HAVE_XFIXES_TRUE='#'
-+  HAVE_XFIXES_FALSE=
-+fi
-+if test "x$HAVE_XDAMAGE" = "xyes"; then
-+  HAVE_XDAMAGE_TRUE=
-+  HAVE_XDAMAGE_FALSE='#'
-+else
-+  HAVE_XDAMAGE_TRUE='#'
-+  HAVE_XDAMAGE_FALSE=
-+fi
- 
- 
- 
-@@ -42153,7 +42157,7 @@ fi
-     DVDNAV_CFLAGS=
-     HAVE_DVDNAV=no
-   else
--    if dvdnav-config --plugin-libs  &> /dev/null; then
-+    if dvdnav-config --plugin-libs  > /dev/null 2>&1; then
-       DVDNAV_LIBS=`dvdnav-config --plugin-libs `
-     else
-       DVDNAV_LIBS=`dvdnav-config --libs `
diff --git a/multimedia/gst-plugins/patches/patch-ab b/multimedia/gst-plugins/patches/patch-ab
deleted file mode 100644
index 72ed06e10aa..00000000000
--- a/multimedia/gst-plugins/patches/patch-ab
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ab,v 1.10 2005/11/02 15:09:07 joerg Exp $
-
---- gst/librfb/gstrfbsrc.c.orig	2005-05-17 08:41:44.000000000 +0000
-+++ gst/librfb/gstrfbsrc.c
-@@ -22,11 +22,16 @@
- #include "config.h"
- #endif
- 
-+#if defined(__DragonFly__)
-+#include <sys/time.h>
-+#endif
-+
- #include <gst/gst.h>
- #include <gst/video/video.h>
- 
- #include <string.h>
- #include <stdlib.h>
-+#include <time.h>
- #include <unistd.h>
- 
- #include <librfb/rfb.h>
diff --git a/multimedia/gst-plugins/patches/patch-ac b/multimedia/gst-plugins/patches/patch-ac
deleted file mode 100644
index c1d57cd3f6f..00000000000
--- a/multimedia/gst-plugins/patches/patch-ac
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ac,v 1.10 2005/10/12 21:54:04 jmmv Exp $
-
---- sys/ximage/ximagesrc.c.orig	2005-08-29 13:50:51.000000000 +0200
-+++ sys/ximage/ximagesrc.c
-@@ -93,6 +93,9 @@ struct _GstXimagesrc
-   gboolean have_xfixes;
-   gboolean have_xdamage;
-   gboolean show_pointer;
-+#ifdef HAVE_XFIXES
-+  int fixes_event_base;
-+#endif
- #ifdef HAVE_XDAMAGE
-   Damage damage;
-   int damage_event_base;
-@@ -440,7 +443,7 @@ gst_ximagesrc_change_state (GstElement *
-       {
-         int error_base;
- 
--        if (XFixesQueryExtension (s->xcontext->disp, &s->damage_event_base,
-+        if (XFixesQueryExtension (s->xcontext->disp, &s->fixes_event_base,
-                 &error_base))
-           s->have_xfixes = TRUE;
-       }
diff --git a/multimedia/gst-plugins/patches/patch-ae b/multimedia/gst-plugins/patches/patch-ae
deleted file mode 100644
index 7844cb1a266..00000000000
--- a/multimedia/gst-plugins/patches/patch-ae
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ae,v 1.4 2005/03/22 16:16:33 jmmv Exp $
-
---- ext/artsd/Makefile.in.orig	2005-03-07 17:41:49.000000000 +0100
-+++ ext/artsd/Makefile.in
-@@ -121,9 +121,9 @@ AMDEP_TRUE = @AMDEP_TRUE@
- AMRNB_LIBS = @AMRNB_LIBS@
- AMTAR = @AMTAR@
- AR = @AR@
--ARTSC_CFLAGS = @ARTSC_CFLAGS@
-+ARTSC_CFLAGS = @ARTSC_CFLAGS@ -I@prefix@/include/artsc
- ARTSC_CONFIG = @ARTSC_CONFIG@
--ARTSC_LIBS = @ARTSC_LIBS@
-+ARTSC_LIBS = @ARTSC_LIBS@ -L@prefix@/lib -Wl,-R@prefix@/lib -lartsc
- ARTS_CONFIG = @ARTS_CONFIG@
- ARTS_CXXFLAGS = @ARTS_CXXFLAGS@
- ARTS_LIBS = @ARTS_LIBS@
diff --git a/multimedia/gst-plugins/patches/patch-ag b/multimedia/gst-plugins/patches/patch-ag
deleted file mode 100644
index bfbe21197b7..00000000000
--- a/multimedia/gst-plugins/patches/patch-ag
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2005/08/21 11:27:54 jmmv Exp $
-
-Removed the #define directive from the inside of a macro expansion.
-Needed for gcc-2.95 and possibly others.
-
---- sys/glsink/glimagesink.c.orig	2005-06-14 18:38:03.000000000 +0200
-+++ sys/glsink/glimagesink.c
-@@ -46,6 +46,12 @@ GST_ELEMENT_DETAILS ("Video sink",
-     "An OpenGL 1.2 based videosink",
-     "Gernot Ziegler <gz@lysator.liu.se>, Julien Moutte <julien@moutte.net>");
- 
-+#ifdef GL_YCBCR_MESA
-+#  define YUV_FOO ";" GST_VIDEO_CAPS_YUV ("{ UYVY, YUY2 }")
-+#else
-+#  define YUV_FOO
-+#endif
-+
- /* Default template - initiated with class struct to allow gst-register to work
-    without X running */
- static GstStaticPadTemplate gst_glimagesink_sink_template_factory =
-@@ -53,12 +59,12 @@ static GstStaticPadTemplate gst_glimages
-     GST_PAD_SINK,
-     GST_PAD_ALWAYS,
-     GST_STATIC_CAPS (GST_VIDEO_CAPS_RGBx ";" GST_VIDEO_CAPS_BGRx
--#ifdef GL_YCBCR_MESA
--        ";" GST_VIDEO_CAPS_YUV ("{ UYVY, YUY2 }")
--#endif
-+    YUV_FOO
-     )
-     );
- 
-+#undef YUV_FOO
-+
- #if 0
- enum
- {
diff --git a/multimedia/gst-plugins/patches/patch-ah b/multimedia/gst-plugins/patches/patch-ah
deleted file mode 100644
index 07ca8505efa..00000000000
--- a/multimedia/gst-plugins/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2005/10/21 07:44:08 xtraeme Exp $
-
---- ext/xvid/gstxviddec.c.orig	2005-10-21 08:44:45.000000000 +0200
-+++ ext/xvid/gstxviddec.c	2005-10-21 08:45:00.000000000 +0200
-@@ -38,7 +38,7 @@
- static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
-     GST_PAD_SINK,
-     GST_PAD_ALWAYS,
--    GST_STATIC_CAPS ("video/x-xvid, "
-+    GST_STATIC_CAPS ("video/x-divx, "
-         "width = (int) [ 0, MAX ], "
-         "height = (int) [ 0, MAX ], " "framerate = (double) [ 0, MAX ]")
-     );
diff --git a/multimedia/gstreamer/DESCR b/multimedia/gstreamer/DESCR
deleted file mode 100644
index c24228a771d..00000000000
--- a/multimedia/gstreamer/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-GStreamer is a framework for streaming media.  The fundamental design comes
-from the video pipeline at Oregon Graduate Institute, as well as some ideas
-from DirectMedia.  It's based on plug-ins that will provide the various
-codecs and other functionality.
diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile
deleted file mode 100644
index a7b9e1b55ba..00000000000
--- a/multimedia/gstreamer/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-# $NetBSD: Makefile,v 1.31 2005/10/12 21:53:42 jmmv Exp $
-#
-
-DISTNAME=		gstreamer-0.8.11
-CATEGORIES=		multimedia gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gstreamer/0.8/}
-EXTRACT_SUFX=		.tar.bz2
-
-MAINTAINER=		rh@NetBSD.org
-HOMEPAGE=		http://www.gstreamer.net/
-COMMENT=		GNOME multimedia streamer library
-
-BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
-
-GNU_CONFIGURE=		yes
-USE_PKGINSTALL=		yes
-USE_PKGLOCALEDIR=	yes
-USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake perl pkg-config
-
-CONFIGURE_ARGS+=	--disable-plugin-builddir
-CONFIGURE_ARGS+=	--localstatedir=${PREFIX}/libdata/gstreamer-0.8
-CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
-CONFIGURE_ENV+=		ac_cv_path_PYTHON="${PYTHONBIN}"
-CONFIGURE_ARGS+=	HAVE_GTK_DOC=no
-
-PKGCONFIG_OVERRIDE+=	pkgconfig/gstreamer-control.pc.in
-PKGCONFIG_OVERRIDE+=	pkgconfig/gstreamer.pc.in
-
-REQD_DIRS+=		${GST_DBDIR}
-
-PYTHON_VERSIONS_ACCEPTED=	24 23 22
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-# We must have a glib2 compiled with the RTLD_GLOBAL fix; if not, plugins
-# won't work at all.
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.4.0nb1
-.endif
-.undef f
-
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/popt/buildlink3.mk"
-.include "../../lang/python/application.mk"
-_GSTREAMER_NO_DEPEND=		# defined
-.include "../../multimedia/gstreamer/plugins.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../textproc/libxslt/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gstreamer/PLIST b/multimedia/gstreamer/PLIST
deleted file mode 100644
index 380e3b46498..00000000000
--- a/multimedia/gstreamer/PLIST
+++ /dev/null
@@ -1,223 +0,0 @@
-@comment $NetBSD: PLIST,v 1.14 2005/10/12 21:53:42 jmmv Exp $
-bin/gst-complete
-bin/gst-complete-0.8
-bin/gst-compprep
-bin/gst-compprep-0.8
-bin/gst-feedback
-bin/gst-feedback-0.8
-bin/gst-inspect
-bin/gst-inspect-0.8
-bin/gst-launch
-bin/gst-launch-0.8
-bin/gst-md5sum
-bin/gst-md5sum-0.8
-bin/gst-register
-bin/gst-register-0.8
-bin/gst-typefind
-bin/gst-typefind-0.8
-bin/gst-xmlinspect
-bin/gst-xmlinspect-0.8
-bin/gst-xmllaunch
-bin/gst-xmllaunch-0.8
-include/gstreamer-0.8/gst/bytestream/adapter.h
-include/gstreamer-0.8/gst/bytestream/bytestream.h
-include/gstreamer-0.8/gst/bytestream/filepad.h
-include/gstreamer-0.8/gst/control/control.h
-include/gstreamer-0.8/gst/control/dparam.h
-include/gstreamer-0.8/gst/control/dparam_smooth.h
-include/gstreamer-0.8/gst/control/dparamcommon.h
-include/gstreamer-0.8/gst/control/dparammanager.h
-include/gstreamer-0.8/gst/control/dplinearinterp.h
-include/gstreamer-0.8/gst/control/unitconvert.h
-include/gstreamer-0.8/gst/dataprotocol/dataprotocol.h
-include/gstreamer-0.8/gst/getbits/getbits.h
-include/gstreamer-0.8/gst/gst.h
-include/gstreamer-0.8/gst/gstatomic.h
-include/gstreamer-0.8/gst/gstbin.h
-include/gstreamer-0.8/gst/gstbuffer.h
-include/gstreamer-0.8/gst/gstcaps.h
-include/gstreamer-0.8/gst/gstchildproxy.h
-include/gstreamer-0.8/gst/gstclock.h
-include/gstreamer-0.8/gst/gstcompat.h
-include/gstreamer-0.8/gst/gstconfig.h
-include/gstreamer-0.8/gst/gstcpu.h
-include/gstreamer-0.8/gst/gstdata.h
-include/gstreamer-0.8/gst/gstelement.h
-include/gstreamer-0.8/gst/gstenumtypes.h
-include/gstreamer-0.8/gst/gsterror.h
-include/gstreamer-0.8/gst/gstevent.h
-include/gstreamer-0.8/gst/gstfilter.h
-include/gstreamer-0.8/gst/gstformat.h
-include/gstreamer-0.8/gst/gstindex.h
-include/gstreamer-0.8/gst/gstinfo.h
-include/gstreamer-0.8/gst/gstinterface.h
-include/gstreamer-0.8/gst/gstmacros.h
-include/gstreamer-0.8/gst/gstmarshal.h
-include/gstreamer-0.8/gst/gstmemchunk.h
-include/gstreamer-0.8/gst/gstobject.h
-include/gstreamer-0.8/gst/gstpad.h
-include/gstreamer-0.8/gst/gstparse.h
-include/gstreamer-0.8/gst/gstpipeline.h
-include/gstreamer-0.8/gst/gstplugin.h
-include/gstreamer-0.8/gst/gstpluginfeature.h
-include/gstreamer-0.8/gst/gstprobe.h
-include/gstreamer-0.8/gst/gstquery.h
-include/gstreamer-0.8/gst/gstqueue.h
-include/gstreamer-0.8/gst/gstregistry.h
-include/gstreamer-0.8/gst/gstregistrypool.h
-include/gstreamer-0.8/gst/gstscheduler.h
-include/gstreamer-0.8/gst/gststructure.h
-include/gstreamer-0.8/gst/gstsystemclock.h
-include/gstreamer-0.8/gst/gsttag.h
-include/gstreamer-0.8/gst/gsttaginterface.h
-include/gstreamer-0.8/gst/gstthread.h
-include/gstreamer-0.8/gst/gsttrace.h
-include/gstreamer-0.8/gst/gsttrashstack.h
-include/gstreamer-0.8/gst/gsttypefind.h
-include/gstreamer-0.8/gst/gsttypes.h
-include/gstreamer-0.8/gst/gsturi.h
-include/gstreamer-0.8/gst/gsturitype.h
-include/gstreamer-0.8/gst/gstutils.h
-include/gstreamer-0.8/gst/gstvalue.h
-include/gstreamer-0.8/gst/gstversion.h
-include/gstreamer-0.8/gst/gstxml.h
-lib/gstreamer-0.8/libgstbasicgthreadscheduler.la
-lib/gstreamer-0.8/libgstbasicomegascheduler.la
-lib/gstreamer-0.8/libgstbytestream.la
-lib/gstreamer-0.8/libgstdataprotocol.la
-lib/gstreamer-0.8/libgstelements.la
-lib/gstreamer-0.8/libgstentrygthreadscheduler.la
-lib/gstreamer-0.8/libgstentryomegascheduler.la
-lib/gstreamer-0.8/libgstfairgthreadscheduler.la
-lib/gstreamer-0.8/libgstgetbits.la
-lib/gstreamer-0.8/libgstindexers.la
-lib/gstreamer-0.8/libgstoptgthreadscheduler.la
-lib/gstreamer-0.8/libgstoptomegascheduler.la
-lib/gstreamer-0.8/libgstoptscheduler.la
-lib/gstreamer-0.8/libgstspider.la
-lib/libgstcontrol-0.8.la
-lib/libgstreamer-0.8.la
-lib/pkgconfig/gstreamer-0.8.pc
-lib/pkgconfig/gstreamer-control-0.8.pc
-man/man1/gst-complete-0.8.1
-man/man1/gst-compprep-0.8.1
-man/man1/gst-feedback-0.8.1
-man/man1/gst-inspect-0.8.1
-man/man1/gst-launch-0.8.1
-man/man1/gst-md5sum-0.8.1
-man/man1/gst-register-0.8.1
-man/man1/gst-typefind-0.8.1
-man/man1/gst-xmlinspect-0.8.1
-man/man1/gst-xmllaunch-0.8.1
-share/aclocal/gst-element-check-0.8.m4
-share/doc/gstreamer-0.8/GstBin.html
-share/doc/gstreamer-0.8/GstClock.html
-share/doc/gstreamer-0.8/GstElement.html
-share/doc/gstreamer-0.8/GstElementFactory.html
-share/doc/gstreamer-0.8/GstGhostPad.html
-share/doc/gstreamer-0.8/GstImplementsInterface.html
-share/doc/gstreamer-0.8/GstIndex.html
-share/doc/gstreamer-0.8/GstIndexFactory.html
-share/doc/gstreamer-0.8/GstObject.html
-share/doc/gstreamer-0.8/GstPad.html
-share/doc/gstreamer-0.8/GstPadTemplate.html
-share/doc/gstreamer-0.8/GstPipeline.html
-share/doc/gstreamer-0.8/GstPluginFeature.html
-share/doc/gstreamer-0.8/GstQueue.html
-share/doc/gstreamer-0.8/GstRealPad.html
-share/doc/gstreamer-0.8/GstRegistry.html
-share/doc/gstreamer-0.8/GstScheduler.html
-share/doc/gstreamer-0.8/GstSchedulerFactory.html
-share/doc/gstreamer-0.8/GstTagSetter.html
-share/doc/gstreamer-0.8/GstThread.html
-share/doc/gstreamer-0.8/GstTypeFindFactory.html
-share/doc/gstreamer-0.8/GstXML.html
-share/doc/gstreamer-0.8/api-index.html
-share/doc/gstreamer-0.8/gstreamer-0.8.devhelp
-share/doc/gstreamer-0.8/gstreamer-Gst.html
-share/doc/gstreamer-0.8/gstreamer-GstAtomic.html
-share/doc/gstreamer-0.8/gstreamer-GstBuffer.html
-share/doc/gstreamer-0.8/gstreamer-GstCPU.html
-share/doc/gstreamer-0.8/gstreamer-GstCaps.html
-share/doc/gstreamer-0.8/gstreamer-GstCompat.html
-share/doc/gstreamer-0.8/gstreamer-GstData.html
-share/doc/gstreamer-0.8/gstreamer-GstElementDetails.html
-share/doc/gstreamer-0.8/gstreamer-GstEvent.html
-share/doc/gstreamer-0.8/gstreamer-GstFilter.html
-share/doc/gstreamer-0.8/gstreamer-GstFormat.html
-share/doc/gstreamer-0.8/gstreamer-GstGError.html
-share/doc/gstreamer-0.8/gstreamer-GstInfo.html
-share/doc/gstreamer-0.8/gstreamer-GstMacros.html
-share/doc/gstreamer-0.8/gstreamer-GstMemChunk.html
-share/doc/gstreamer-0.8/gstreamer-GstParse.html
-share/doc/gstreamer-0.8/gstreamer-GstPlugin.html
-share/doc/gstreamer-0.8/gstreamer-GstProbe.html
-share/doc/gstreamer-0.8/gstreamer-GstQuery.html
-share/doc/gstreamer-0.8/gstreamer-GstRegistryPool.html
-share/doc/gstreamer-0.8/gstreamer-GstStructure.html
-share/doc/gstreamer-0.8/gstreamer-GstSystemClock.html
-share/doc/gstreamer-0.8/gstreamer-GstTagList.html
-share/doc/gstreamer-0.8/gstreamer-GstTypeFind.html
-share/doc/gstreamer-0.8/gstreamer-GstTypes.html
-share/doc/gstreamer-0.8/gstreamer-GstUriHandler.html
-share/doc/gstreamer-0.8/gstreamer-GstUriType.html
-share/doc/gstreamer-0.8/gstreamer-GstUtils.html
-share/doc/gstreamer-0.8/gstreamer-GstValue.html
-share/doc/gstreamer-0.8/gstreamer-GstVersion.html
-share/doc/gstreamer-0.8/gstreamer-compat.html
-share/doc/gstreamer-0.8/gstreamer-gstconfig.html
-share/doc/gstreamer-0.8/gstreamer-hierarchy.html
-share/doc/gstreamer-0.8/gstreamer-support.html
-share/doc/gstreamer-0.8/gstreamer.html
-share/doc/gstreamer-0.8/index.html
-share/doc/gstreamer-0.8/index.sgml
-share/doc/gstreamer-0.8/style.css
-share/doc/gstreamer-libs-0.8/GstDParam.html
-share/doc/gstreamer-libs-0.8/GstDParamLinInterp.html
-share/doc/gstreamer-libs-0.8/GstDParamManager.html
-share/doc/gstreamer-libs-0.8/GstDParamSmooth.html
-share/doc/gstreamer-libs-0.8/GstUnitConvert.html
-share/doc/gstreamer-libs-0.8/api-index.html
-share/doc/gstreamer-libs-0.8/gstreamer-control.html
-share/doc/gstreamer-libs-0.8/gstreamer-libs-0.8.devhelp
-share/doc/gstreamer-libs-0.8/gstreamer-libs-GstControl.html
-share/doc/gstreamer-libs-0.8/gstreamer-libs-gstbytestream.html
-share/doc/gstreamer-libs-0.8/gstreamer-libs-gstdataprotocol.html
-share/doc/gstreamer-libs-0.8/gstreamer-libs-gstgetbits.html
-share/doc/gstreamer-libs-0.8/gstreamer-libs-hierarchy.html
-share/doc/gstreamer-libs-0.8/gstreamer-libs.html
-share/doc/gstreamer-libs-0.8/index.html
-share/doc/gstreamer-libs-0.8/index.sgml
-${PKGLOCALEDIR}/locale/af/LC_MESSAGES/gstreamer-0.8.mo
-${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gstreamer-0.8.mo
-${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gstreamer-0.8.mo
-${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gstreamer-0.8.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gstreamer-0.8.mo
-${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gstreamer-0.8.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gstreamer-0.8.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gstreamer-0.8.mo
-${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/gstreamer-0.8.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gstreamer-0.8.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gstreamer-0.8.mo
-${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/gstreamer-0.8.mo
-${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gstreamer-0.8.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gstreamer-0.8.mo
-${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gstreamer-0.8.mo
-${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gstreamer-0.8.mo
-${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gstreamer-0.8.mo
-@dirrm share/doc/gstreamer-libs-0.8
-@exec ${MKDIR} %D/share/doc/${PKGNAME}/pwg
-@dirrm share/doc/${PKGNAME}/pwg
-@exec ${MKDIR} %D/share/doc/${PKGNAME}/manual
-@dirrm share/doc/${PKGNAME}/manual
-@exec ${MKDIR} %D/share/doc/${PKGNAME}/faq
-@dirrm share/doc/${PKGNAME}/faq
-@dirrm share/doc/${PKGNAME}
-@dirrm share/doc/gstreamer-0.8
-@dirrm lib/gstreamer-0.8
-@dirrm include/gstreamer-0.8/gst/getbits
-@dirrm include/gstreamer-0.8/gst/dataprotocol
-@dirrm include/gstreamer-0.8/gst/control
-@dirrm include/gstreamer-0.8/gst/bytestream
-@dirrm include/gstreamer-0.8/gst
-@dirrm include/gstreamer-0.8
diff --git a/multimedia/gstreamer/buildlink3.mk b/multimedia/gstreamer/buildlink3.mk
deleted file mode 100644
index 4981de164e3..00000000000
--- a/multimedia/gstreamer/buildlink3.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.8 2004/10/03 00:13:02 tv Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GSTREAMER_BUILDLINK3_MK:=	${GSTREAMER_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gstreamer
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngstreamer}
-BUILDLINK_PACKAGES+=	gstreamer
-
-.if !empty(GSTREAMER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gstreamer+=	gstreamer>=0.8.0nb1
-BUILDLINK_RECOMMENDED.gstreamer+=	gstreamer>=0.8.5nb1
-BUILDLINK_PKGSRCDIR.gstreamer?=	../../multimedia/gstreamer
-
-PRINT_PLIST_AWK+=	/^@dirrm (include|lib)\/gstreamer-0.8(\/gst)?$$/ \
-				{ print "@comment in gstreamer: " $$0; next; }
-.endif	# GSTREAMER_BUILDLINK3_MK
-
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/popt/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../textproc/libxslt/buildlink3.mk"
-
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/gstreamer/distinfo b/multimedia/gstreamer/distinfo
deleted file mode 100644
index 096edeee0ae..00000000000
--- a/multimedia/gstreamer/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.12 2005/10/12 21:53:42 jmmv Exp $
-
-SHA1 (gstreamer-0.8.11.tar.bz2) = 945b08e68f31f99621ce7c35d7ec3b7ac3e49b1e
-RMD160 (gstreamer-0.8.11.tar.bz2) = bb471ba4f4c32bacc26d29efc1cb8577825ce1e9
-Size (gstreamer-0.8.11.tar.bz2) = 1459651 bytes
-SHA1 (patch-aa) = 749f788b2639bdffb48cf937aae0520db2ba864f
diff --git a/multimedia/gstreamer/files/plugins.tmpl b/multimedia/gstreamer/files/plugins.tmpl
deleted file mode 100644
index db60367b239..00000000000
--- a/multimedia/gstreamer/files/plugins.tmpl
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: plugins.tmpl,v 1.2 2005/01/06 11:23:44 jmmv Exp $
-#
-# Handle registration of GStreamer plugins into the global plugin registry.
-#
-
-GST_COMPPREP="@GST_COMPPREP@"
-GST_REGISTER="@GST_REGISTER@"
-GST_DBDIR="@GST_DBDIR@"
-
-case ${STAGE} in
-POST-INSTALL)
-	${GST_REGISTER} --gst-registry=${GST_DBDIR}/registry.xml >/dev/null
-	${GST_COMPPREP} --gst-registry=${GST_DBDIR}/registry.xml >/dev/null
-	;;
-DEINSTALL)
-	if [ "${PKGBASE}" = gstreamer ]; then
-		${RM} -f ${GST_DBDIR}/compreg.xml ${GST_DBDIR}/registry.xml
-	fi
-	;;
-POST-DEINSTALL)
-	if [ "${PKGBASE}" != gstreamer ]; then
-		${GST_REGISTER} --gst-registry=${GST_DBDIR}/registry.xml \
-			>/dev/null
-		${GST_COMPPREP} --gst-registry=${GST_DBDIR}/registry.xml \
-			>/dev/null
-	fi
-	;;
-*)
-	;;
-esac
diff --git a/multimedia/gstreamer/patches/patch-aa b/multimedia/gstreamer/patches/patch-aa
deleted file mode 100644
index 599f09951c6..00000000000
--- a/multimedia/gstreamer/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2004/04/06 09:30:01 jmmv Exp $
-
---- configure.orig	2004-03-16 12:31:54.000000000 +0100
-+++ configure
-@@ -24079,7 +24079,7 @@ fi;
- if test "x$PLUGINS_USE_BUILDDIR" = "xyes"; then
-   GST_CACHE_DIR=`pwd`
- else
--    GST_CACHE_DIR=${localstatedir}/cache/gstreamer-$GST_MAJORMINOR
-+    GST_CACHE_DIR=${localstatedir}
- fi
- 
- # Check whether --with-cachedir or --without-cachedir was given.
diff --git a/multimedia/gstreamer/plugins.mk b/multimedia/gstreamer/plugins.mk
deleted file mode 100644
index dbe0bc50873..00000000000
--- a/multimedia/gstreamer/plugins.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: plugins.mk,v 1.5 2005/03/25 12:45:09 jmmv Exp $
-#
-# This Makefile fragment is intended to be included by packages that install
-# GStreamer modules.  It takes care of rebuilding the corresponding databases
-# at (de)installation time.
-#
-
-.if !defined(GSTREAMER_PLUGINS_MK)
-GSTREAMER_PLUGINS_MK=	# defined
-
-GST_DBDIR=		${BUILDLINK_PREFIX.gstreamer}/libdata/gstreamer-0.8
-GST_COMPPREP=		${BUILDLINK_PREFIX.gstreamer}/bin/gst-compprep
-GST_REGISTER=		${BUILDLINK_PREFIX.gstreamer}/bin/gst-register
-
-FILES_SUBST+=		GST_DBDIR="${GST_DBDIR}"
-FILES_SUBST+=		GST_COMPPREP="${GST_COMPPREP}"
-FILES_SUBST+=		GST_REGISTER="${GST_REGISTER}"
-INSTALL_EXTRA_TMPL+=	../../multimedia/gstreamer/files/plugins.tmpl
-DEINSTALL_EXTRA_TMPL+=	../../multimedia/gstreamer/files/plugins.tmpl
-USE_PKGINSTALL=		YES
-
-PRINT_PLIST_AWK+=	/^libdata\/gstreamer-0.8/ { next; }
-PRINT_PLIST_AWK+=	/^@dirrm libdata\/gstreamer-0.8/ { next; }
-
-.if defined(_GSTREAMER_NO_DEPEND)
-BUILDLINK_PREFIX.gstreamer=	${LOCALBASE}
-.else
-BUILDLINK_DEPENDS.gstreamer+=	gstreamer>=0.8.1
-.  include "../../multimedia/gstreamer/buildlink3.mk"
-.endif
-
-.endif			# GSTREAMER_PLUGINS_MK
diff --git a/multimedia/gxine/DESCR b/multimedia/gxine/DESCR
deleted file mode 100644
index 82f45c4f957..00000000000
--- a/multimedia/gxine/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-  Gxine is a gtk2 multimedia player that uses xine-lib to decode
-multimedia streams.
diff --git a/multimedia/gxine/Makefile b/multimedia/gxine/Makefile
deleted file mode 100644
index fab601a053d..00000000000
--- a/multimedia/gxine/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2005/10/19 13:26:01 adam Exp $
-
-DISTNAME=	gxine-0.4.9
-CATEGORIES=	multimedia
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xine/}
-
-MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://xinehq.de/
-COMMENT=	Gtk-based media player
-
-USE_LIBTOOL=		yes
-USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake pkg-config
-GNU_CONFIGURE=		yes
-
-PTHREAD_OPTS+=		require
-
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../multimedia/xine-lib/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gxine/PLIST b/multimedia/gxine/PLIST
deleted file mode 100644
index d9bc791e344..00000000000
--- a/multimedia/gxine/PLIST
+++ /dev/null
@@ -1,20 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2005/10/19 13:26:01 adam Exp $
-bin/gxine
-bin/gxine_client
-lib/gxine/gxineplugin.la
-man/man1/gxine.1
-man/man1/gxine_client.1
-share/applications/gxine.desktop
-share/gxine/logo.mpv
-share/gxine/mediamarks
-share/gxine/pixmaps/gxine-icon.xpm
-share/gxine/pixmaps/splash.png
-share/gxine/pixmaps/wizards.png
-${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gxine.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gxine.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gxine.mo
-${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gxine.mo
-share/pixmaps/gxine-logo.png
-@dirrm share/gxine/pixmaps
-@dirrm share/gxine
-@dirrm lib/gxine
diff --git a/multimedia/gxine/distinfo b/multimedia/gxine/distinfo
deleted file mode 100644
index c679cb44a56..00000000000
--- a/multimedia/gxine/distinfo
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: distinfo,v 1.11 2005/10/19 13:26:01 adam Exp $
-
-SHA1 (gxine-0.4.9.tar.gz) = f6a83973aee03e836a1c6953d86677fc2db9baed
-RMD160 (gxine-0.4.9.tar.gz) = 258f74c684a0da1fc1ce59ca14f5372c243117ea
-Size (gxine-0.4.9.tar.gz) = 1352672 bytes
-SHA1 (patch-aa) = 168f7149dbffd7b191721a30193c6d58320534fc
-SHA1 (patch-ab) = b2488c6febee6bc41be26ab8a36563fed5105a52
-SHA1 (patch-ac) = b4db5fbfb45f283937b38db2d2e22110b7e113be
-SHA1 (patch-ad) = 1a0cf404f16806bc75cb12659a6f0f86e5e52705
-SHA1 (patch-af) = e7cee400257c84808064dcc344ac6623c373350d
-SHA1 (patch-ag) = 4c04a21a1fdb56c48384b3883ffb2692d5ac2abd
-SHA1 (patch-ah) = 46e1e60573d33deac2d0c8f5f5c901edb2ef5f27
-SHA1 (patch-ai) = 00deba3aa54610ccf66ae267792b93c307db106d
-SHA1 (patch-aj) = 0a9efacd2aa90855bf990944c058028af367c24d
diff --git a/multimedia/gxine/patches/patch-aa b/multimedia/gxine/patches/patch-aa
deleted file mode 100644
index 26e104d3163..00000000000
--- a/multimedia/gxine/patches/patch-aa
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/05/31 21:33:11 kristerw Exp $
-
---- src/post.c.orig	Tue May 31 23:11:08 2005
-+++ src/post.c	Tue May 31 23:12:30 2005
-@@ -81,6 +81,7 @@
-   const xine_post_in_t *in = xine_post_input (plugin, "parameters");
-   const xine_post_api_t *api;
-   const xine_post_api_descr_t *param_desc;
-+  char *params;
- 
-   if (!in)
-     return NULL;
-@@ -88,7 +89,7 @@
-   api = in->data;
-   param_desc = api->get_param_descr ();
- 
--  char *params = malloc (param_desc->struct_size);
-+  params = malloc (param_desc->struct_size);
-   api->get_parameters (plugin, params);
- 
-   for (;;)
-@@ -494,9 +495,10 @@
-   while ((++param)->type != POST_PARAM_TYPE_LAST)
-   {
-     GtkWidget *widget;
-+    gpointer param_p;
-     info->conf_w = realloc (info->conf_w,
- 			    (param_count + 2) * sizeof (GtkWidget *));
--    gpointer param_p = info->params + param->offset;
-+    param_p = info->params + param->offset;
-     switch (param->type)
-     {
-     case POST_PARAM_TYPE_INT:
diff --git a/multimedia/gxine/patches/patch-ab b/multimedia/gxine/patches/patch-ab
deleted file mode 100644
index 37d5d956a72..00000000000
--- a/multimedia/gxine/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2005/10/19 13:26:02 adam Exp $
-
---- src/http.c.orig	2005-03-17 00:55:23.000000000 +0000
-+++ src/http.c
-@@ -28,6 +28,7 @@
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <netdb.h>
-+#include <netinet/in.h>
- #include <unistd.h>
- #include <fcntl.h>
- #include <string.h>
diff --git a/multimedia/gxine/patches/patch-ac b/multimedia/gxine/patches/patch-ac
deleted file mode 100644
index 0b57e70564b..00000000000
--- a/multimedia/gxine/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2005/05/08 06:33:35 reed Exp $
-
---- src/desktop_integration.c.orig	Tue Nov  9 17:43:13 2004
-+++ src/desktop_integration.c	Sat May  7 18:57:38 2005
-@@ -31,7 +31,9 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <dlfcn.h>
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__)
- #include <alloca.h>
-+#endif
- #include <string.h>
- 
- #include "utils.h"
diff --git a/multimedia/gxine/patches/patch-ad b/multimedia/gxine/patches/patch-ad
deleted file mode 100644
index 13b36522706..00000000000
--- a/multimedia/gxine/patches/patch-ad
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2005/05/27 12:09:27 salo Exp $
-
---- src/spidermonkey/jsprf.c.orig	Sat May  7 19:07:27 2005
-+++ src/spidermonkey/jsprf.c	Sat May  7 19:08:37 2005
-@@ -57,7 +57,11 @@
- #define VARARGS_ASSIGN(foo, bar)	(foo) = (bar)
- #endif
- */
-+#ifndef __FreeBSD__
- #define VARARGS_ASSIGN(foo, bar) __va_copy(foo, bar)
-+#else
-+#define VARARGS_ASSIGN(foo, bar)	(foo) = (bar)
-+#endif
- 
- /*
- ** WARNING: This code may *NOT* call JS_LOG (because JS_LOG calls it)
diff --git a/multimedia/gxine/patches/patch-af b/multimedia/gxine/patches/patch-af
deleted file mode 100644
index 15f44047c19..00000000000
--- a/multimedia/gxine/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.2 2005/09/08 18:15:39 drochner Exp $
-
---- doc/man/Makefile.in.orig	2005-08-26 02:12:42.000000000 +0200
-+++ doc/man/Makefile.in
-@@ -147,7 +147,7 @@ am__include = @am__include@
- am__quote = @am__quote@
- gxine_have_gdk_pixbuf_csource = @gxine_have_gdk_pixbuf_csource@
- install_sh = @install_sh@
--SUBDIRS = en de
-+SUBDIRS = en
- subdir = doc/man
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/include/config.h
diff --git a/multimedia/gxine/patches/patch-ag b/multimedia/gxine/patches/patch-ag
deleted file mode 100644
index 5d1286bfac9..00000000000
--- a/multimedia/gxine/patches/patch-ag
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2005/04/13 16:39:32 rillig Exp $
-
-Needed for gcc-2.95.
-
---- src/defs.h.orig	Fri Nov  5 22:43:39 2004
-+++ src/defs.h	Tue Apr 12 12:48:59 2005
-@@ -26,7 +26,7 @@
- 
- /* debug logging */
- #ifdef LOG
--#define logprintf(FMT,...) printf (FMT, ## __VA_ARGS__)
-+#define logprintf(FMT,...) printf (FMT , ## __VA_ARGS__)
- #else
- #define logprintf(FMT,...)
- #endif
diff --git a/multimedia/gxine/patches/patch-ah b/multimedia/gxine/patches/patch-ah
deleted file mode 100644
index 7bbccc52102..00000000000
--- a/multimedia/gxine/patches/patch-ah
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2005/04/13 16:39:32 rillig Exp $
-
-Needed for NetBSD-1.6.2.
-
---- src/globals.h.orig	Sat Dec 11 01:40:18 2004
-+++ src/globals.h	Tue Apr 12 12:49:30 2005
-@@ -36,6 +36,7 @@
- #include <gdk/gdk.h>
- #include <glib.h>
- #include <xine.h>
-+#include <pthread.h>
- 
- #include "script_engine.h"
- #include "infobar.h"
diff --git a/multimedia/gxine/patches/patch-ai b/multimedia/gxine/patches/patch-ai
deleted file mode 100644
index 21941c98cef..00000000000
--- a/multimedia/gxine/patches/patch-ai
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2005/05/27 12:09:27 salo Exp $
-
-Needed for ISO C90 compliance.
-
---- src/key_events.c.orig	2005-04-26 00:11:56.000000000 +0200
-+++ src/key_events.c	2005-05-27 13:05:59.000000000 +0200
-@@ -610,8 +610,8 @@
- 
- static void do_edit_binding (void)
- {
--  editkey = *lookup_binding (&catch_key_iter);
-   char title[64];
-+  editkey = *lookup_binding (&catch_key_iter);
- 
-   gtk_entry_set_text (GTK_ENTRY (kb_binding_desc), editkey.desc);
-   gtk_entry_set_text (GTK_ENTRY (kb_binding_command), editkey.cmd);
-@@ -1080,9 +1080,7 @@
- 
- /* Xine event mapping data */
- 
--static const kb_xine_event_map_t xine_input = {
--  "INPUT",
--  {
-+static const kb_xine_event_id_t xine_input_ids[] = {
-     { "ANGLE_NEXT", XINE_EVENT_INPUT_ANGLE_NEXT },
-     { "ANGLE_PREVIOUS", XINE_EVENT_INPUT_ANGLE_PREVIOUS },
-     { "DOWN", XINE_EVENT_INPUT_DOWN },
-@@ -1123,7 +1121,10 @@
-     { "9", XINE_EVENT_INPUT_NUMBER_9 },
-     { "-", -1 }, /* null event */
-     { "" }
--  }
-+};
-+
-+static const kb_xine_event_map_t xine_input = {
-+  "INPUT", &xine_input_ids
- };
- 
- 
-@@ -1170,9 +1171,7 @@
- 
- 
- 
--static const kb_xine_event_map_t xine_vdr = {
--  "VDR",
--  {
-+static const kb_xine_event_id_t xine_vdr_ids[] = {
-     { "AUDIO", XINE_EVENT_VDR_MUTE + 1 /* ..._VDR_AUDIO */ },
-     { "BACK", XINE_EVENT_VDR_BACK },
-     { "BLUE", XINE_EVENT_VDR_BLUE },
-@@ -1207,7 +1206,10 @@
-     { "VOLPLUS", XINE_EVENT_VDR_VOLPLUS },
-     { "YELLOW", XINE_EVENT_VDR_YELLOW },
-     { "" }
--  }
-+};
-+
-+static const kb_xine_event_map_t xine_vdr = {
-+  "VDR", &xine_vdr_ids
- };
- 
- JSBool js_event_generic (JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
diff --git a/multimedia/gxine/patches/patch-aj b/multimedia/gxine/patches/patch-aj
deleted file mode 100644
index 6ba828774c8..00000000000
--- a/multimedia/gxine/patches/patch-aj
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2005/04/13 16:39:32 rillig Exp $
-
-Needed for ISO C90 compliance.
-
---- src/key_events.h.orig	Thu Dec 16 00:59:59 2004
-+++ src/key_events.h	Tue Apr 12 12:53:59 2005
-@@ -35,7 +35,7 @@ typedef struct kb_xine_event_id_s kb_xin
- 
- struct kb_xine_event_map_s {
-   char prefix[8];
--  const kb_xine_event_id_t id[];
-+  const kb_xine_event_id_t *id;
- };
- typedef struct kb_xine_event_map_s kb_xine_event_map_t;
- 
diff --git a/multimedia/kdemultimedia3/DESCR b/multimedia/kdemultimedia3/DESCR
deleted file mode 100644
index 4fb692909af..00000000000
--- a/multimedia/kdemultimedia3/DESCR
+++ /dev/null
@@ -1,24 +0,0 @@
-The kdemultimedia module of KDE provides various sound and movie
-format players:
-
-* noatun: a multimedia player for sound and movies, very extensible due to
-          its plugin interface
-* aktion: a player specialized on movies, needs xanim
-* kaboodle: light media player
-* kmid: a standalone and embeddable midi player, includes a karaoke-mode
-* kmidi: midi player, can use sound patch files and create a WAV file
-* kmix: the audio mixer as a standalone program and Kicker applet
-* koncd: frontend for different cd burn programs
-* kscd: a CD player with an interface to the internet CDDB database
-
-The following are libraries and plugins that are building the core
-infrastructure of above applications:
-
-* arts: a versatily multimedia system the consists of various little
-        building blocks that you (or an application) can combine in
-        almost arbitrary ways to create sound and video processing pipes
-* kfile-plugins: provide meta information about sound files
-* mpeglib: a library for MPEG 1 (layer I, II and III) encoded files
-* mpeglib_artsplug: wrapped mpeglib to make it Arts-aware
-* mpg123_artsplugin: a trimmed down mpg123 made Arts-compatible
-* oggvorbis_artsplugin: support for ogg-vorbis (not included) in Arts
diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
deleted file mode 100644
index de93226325e..00000000000
--- a/multimedia/kdemultimedia3/Makefile
+++ /dev/null
@@ -1,67 +0,0 @@
-# $NetBSD: Makefile,v 1.30 2005/08/10 20:56:20 jlam Exp $
-
-DISTNAME=	kdemultimedia-${_KDE_VERSION}
-CATEGORIES=	multimedia
-COMMENT=	Multimedia tools for the KDE integrated X11 desktop
-
-.include "../../meta-pkgs/kde3/Makefile.kde3"
-
-DEPENDS+=	xine-arts>=1rc0a:../../audio/xine-arts
-
-USE_TOOLS+=		pkg-config
-USE_DIRS+=		xdg-1.2
-USE_PKGINSTALL=		YES
-
-REPLACE_PERL=		kscd/workman2cddb.pl
-
-CONF_FILES+=		${PREFIX}/share/examples/kdemultimedia3/applications-merged/kde-multimedia-music.menu \
-			${PKG_SYSCONFDIR}/xdg/menus/applications-merged/kde-multimedia-music.menu
-
-.include "../../mk/compiler.mk"
-.if !empty(CC_VERSION:Mgcc-3.*)
-BUILDLINK_DEPENDS.xine-lib=	xine-lib>=1rc0anb1
-.endif
-
-CONFIGURE_ARGS+=	--enable-cdparanoia
-CONFIGURE_ARGS+=	--with-cdparanoia=${BUILDLINK_PREFIX.cdparanoia}
-CONFIGURE_ARGS+=	--with-vorbis=${BUILDLINK_PREFIX.libvorbis}
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.kdemultimedia
-PKG_SUPPORTED_OPTIONS=	gstreamer oss
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mgstreamer)
-.include "../../multimedia/gstreamer/buildlink3.mk"
-.include "../../multimedia/gst-plugins/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Moss)
-CONFIGURE_ARGS+=	--enable-audio=oss
-.endif
-
-# Ensure we export symbols in the linked shared object.
-LDFLAGS+=		${EXPORT_SYMBOLS_LDFLAGS}
-
-PTHREAD_OPTS+=	require
-
-UNLIMIT_RESOURCES+=	datasize
-
-.include "../../meta-pkgs/kde3/kde3.mk"
-.include "../../audio/arts/buildlink3.mk"
-.include "../../audio/cdparanoia/buildlink3.mk"
-.include "../../audio/lame/buildlink3.mk"
-.include "../../audio/musicbrainz/buildlink3.mk"
-.include "../../audio/tunepimp/buildlink3.mk"
-.include "../../audio/taglib/buildlink3.mk"
-.include "../../multimedia/xine-lib/buildlink3.mk"
-.include "../../x11/kdebase3/buildlink3.mk"
-.include "../../x11/kdelibs3/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
-
-.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "pth"
-.include "../../devel/pthread-sem/buildlink3.mk"
-BUILDLINK_TRANSFORM+=	l:pthread:pthread:semaphore
-.endif
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/kdemultimedia3/PLIST b/multimedia/kdemultimedia3/PLIST
deleted file mode 100644
index b67a7d4dadb..00000000000
--- a/multimedia/kdemultimedia3/PLIST
+++ /dev/null
@@ -1,1239 +0,0 @@
-@comment $NetBSD: PLIST,v 1.18 2005/07/30 11:22:20 markd Exp $
-bin/artsbuilder
-bin/artscontrol
-bin/juk
-bin/kaboodle
-bin/kaudiocreator
-bin/kmid
-bin/kmix
-bin/kmixctrl
-bin/krec
-bin/kscd
-bin/midisend
-bin/mpeglibartsplay
-bin/noatun
-bin/workman2cddb.pl
-bin/yaf-cdda
-bin/yaf-mpgplay
-bin/yaf-splay
-bin/yaf-tplay
-bin/yaf-vorbis
-bin/yaf-yuv
-include/akode/akodelib.h
-include/akode/audiobuffer.h
-include/akode/audioconfiguration.h
-include/akode/audioframe.h
-include/akode/auto_sink.h
-include/akode/converter.h
-include/akode/crossfader.h
-include/akode/decoder.h
-include/akode/encoder.h
-include/akode/fast_resampler.h
-include/akode/file.h
-include/akode/framedecoder.h
-include/akode/frametostream_decoder.h
-include/akode/localfile.h
-include/akode/magic.h
-include/akode/mmapfile.h
-include/akode/player.h
-include/akode/pluginhandler.h
-include/akode/resampler.h
-include/akode/sink.h
-include/akode/streamdecoder.h
-include/akode/streamtoframe_decoder.h
-include/akode/volumefilter.h
-include/akode/wav_decoder.h
-include/arts/artsbuilder.h
-include/arts/artsbuilder.idl
-include/arts/artsgui.h
-include/arts/artsgui.idl
-include/arts/artsmidi.h
-include/arts/artsmidi.idl
-include/arts/artsmodules.h
-include/arts/artsmodules.idl
-include/arts/artsmodulescommon.h
-include/arts/artsmodulescommon.idl
-include/arts/artsmoduleseffects.h
-include/arts/artsmoduleseffects.idl
-include/arts/artsmodulesmixers.h
-include/arts/artsmodulesmixers.idl
-include/arts/artsmodulessynth.h
-include/arts/artsmodulessynth.idl
-include/arts/kartswidget.h
-include/arts/kframe_impl.h
-include/arts/klayoutbox_impl.h
-include/arts/kwidget_impl.h
-include/arts/kwidgetrepo.h
-include/audiocdencoder.h
-include/cmodule.h
-include/effectview.h
-include/equalizerview.h
-include/ksaver.h
-include/libkcddb/cache.h
-include/libkcddb/cddb.h
-include/libkcddb/cdinfo.h
-include/libkcddb/client.h
-include/libkcddb/config.h
-include/libkcddb/configbase.h
-include/mimetypetree.h
-include/mpeglib/decoder/cddaPlugin.h
-include/mpeglib/decoder/command.h
-include/mpeglib/decoder/commandPipe.h
-include/mpeglib/decoder/decoderPlugin.h
-include/mpeglib/decoder/mpegPlugin.h
-include/mpeglib/decoder/mpgPlugin.h
-include/mpeglib/decoder/nukePlugin.h
-include/mpeglib/decoder/splayPlugin.h
-include/mpeglib/decoder/tplayPlugin.h
-include/mpeglib/decoder/vorbisPlugin.h
-include/mpeglib/decoder/yuvPlugin.h
-include/mpeglib/frame/IOFrameQueue.h
-include/mpeglib/frame/audioFrame.h
-include/mpeglib/frame/audioFrameQueue.h
-include/mpeglib/frame/floatFrame.h
-include/mpeglib/frame/frame.h
-include/mpeglib/frame/frameQueue.h
-include/mpeglib/frame/framer.h
-include/mpeglib/frame/pcmFrame.h
-include/mpeglib/frame/rawDataBuffer.h
-include/mpeglib/frame/rawFrame.h
-include/mpeglib/input/bufferInputStream.h
-include/mpeglib/input/cddaInputStream.h
-include/mpeglib/input/cdromInputStream.h
-include/mpeglib/input/fileInputStream.h
-include/mpeglib/input/httpInputStream.h
-include/mpeglib/input/inputDetector.h
-include/mpeglib/input/inputPlugin.h
-include/mpeglib/input/inputStream.h
-include/mpeglib/input/threadSafeInputStream.h
-include/mpeglib/mpegutil/mpegStreamPlayer.h
-include/mpeglib/mpegutil/mpegSystemHeader.h
-include/mpeglib/mpegutil/mpegSystemStream.h
-include/mpeglib/mpegutil/mpegVideoLength.h
-include/mpeglib/mpegutil/pesSystemStream.h
-include/mpeglib/mpegutil/psSystemStream.h
-include/mpeglib/mpegutil/tsSystemStream.h
-include/mpeglib/oggvorbis/oggFrame.h
-include/mpeglib/oggvorbis/ovFramer.h
-include/mpeglib/oggvorbis/vorbisDecoder.h
-include/mpeglib/oggvorbis/vorbisInfo.h
-include/mpeglib/output/artsOutputStream.h
-include/mpeglib/output/audioTime.h
-include/mpeglib/output/avSyncer.h
-include/mpeglib/output/dspX11OutputStream.h
-include/mpeglib/output/outPlugin.h
-include/mpeglib/output/outputStream.h
-include/mpeglib/output/pluginInfo.h
-include/mpeglib/output/threadSafeOutputStream.h
-include/mpeglib/splay/mpegAudioFrame.h
-include/mpeglib/splay/mpegAudioInfo.h
-include/mpeglib/splay/splayDecoder.h
-include/mpeglib/util/abstract/abs_thread.h
-include/mpeglib/util/abstract/threadQueue.h
-include/mpeglib/util/dynBuffer.h
-include/mpeglib/util/file/fileAccess.h
-include/mpeglib/util/mmx/mm_accel.h
-include/mpeglib/util/mmx/mmx.h
-include/mpeglib/util/mmx/mmx_asm.h
-include/mpeglib/util/render/pictureArray.h
-include/mpeglib/util/render/yuvPicture.h
-include/mpeglib/util/syncClock.h
-include/mpeglib/util/timeStamp.h
-include/mpeglib/util/timeStampArray.h
-include/mpeglib/util/timeWrapper.h
-include/mpeglib/util/yaf/yafcore/buffer.h
-include/mpeglib/util/yaf/yafcore/inputDecoder.h
-include/mpeglib/util/yaf/yafcore/inputInterface.h
-include/mpeglib/util/yaf/yafcore/outputInterface.h
-include/mpeglib/util/yaf/yafcore/yaf_control.h
-include/mpeglib/util/yaf/yafxplayer/inputDecoderXPlayer.h
-include/mpeglib/util/yaf/yafxplayer/inputDecoderYAF.h
-include/mpeglib/util/yaf/yafxplayer/yafOutputStream.h
-include/mpeglib_artsplug/decoderBaseObject.h
-include/mpeglib_artsplug/decoderBaseObject.idl
-include/mpeglib_artsplug/decoderBaseObject_impl.h
-include/mpeglib_artsplug/splayPlayObject.h
-include/mpeglib_artsplug/splayPlayObject.idl
-include/mpeglib_artsplug/splayPlayObject_impl.h
-include/noatun/app.h
-include/noatun/controls.h
-include/noatun/conversion.h
-include/noatun/downloader.h
-include/noatun/effects.h
-include/noatun/engine.h
-include/noatun/equalizer.h
-include/noatun/noatunarts.h
-include/noatun/player.h
-include/noatun/playlist.h
-include/noatun/playlistsaver.h
-include/noatun/plugin.h
-include/noatun/pluginloader.h
-include/noatun/pref.h
-include/noatun/scrollinglabel.h
-include/noatun/stdaction.h
-include/noatun/stereobuttonaction.h
-include/noatun/tags.h
-include/noatun/vequalizer.h
-include/noatun/video.h
-include/noatun/winskinvis.h
-include/plugin_deps.h
-lib/kde3/kcm_audiocd.la
-lib/kde3/kcm_cddb.la
-lib/kde3/kcm_krec.la
-lib/kde3/kcm_krec_files.la
-lib/kde3/kfile_au.la
-lib/kde3/kfile_avi.la
-lib/kde3/kfile_flac.la
-lib/kde3/kfile_m3u.la
-lib/kde3/kfile_mp3.la
-lib/kde3/kfile_mpc.la
-lib/kde3/kfile_ogg.la
-lib/kde3/kfile_sid.la
-lib/kde3/kfile_wav.la
-lib/kde3/kio_audiocd.la
-lib/kde3/kmix.la
-lib/kde3/kmix_panelapplet.la
-lib/kde3/kmixctrl.la
-lib/kde3/krec.la
-lib/kde3/libaudiocd_encoder_flac.la
-lib/kde3/libaudiocd_encoder_lame.la
-lib/kde3/libaudiocd_encoder_vorbis.la
-lib/kde3/libaudiocd_encoder_wav.la
-lib/kde3/libkaboodlepart.la
-lib/kde3/libkmidpart.la
-lib/kde3/libkrecexport_mp3.la
-lib/kde3/libkrecexport_ogg.la
-lib/kde3/libkrecexport_wave.la
-lib/kde3/noatun.la
-lib/kde3/noatun_dcopiface.la
-lib/kde3/noatun_excellent.la
-lib/kde3/noatun_htmlexport.la
-lib/kde3/noatun_infrared.la
-lib/kde3/noatun_kaiman.la
-lib/kde3/noatun_keyz.la
-lib/kde3/noatun_kjofol.la
-lib/kde3/noatun_marquis.la
-lib/kde3/noatun_metatag.la
-lib/kde3/noatun_monoscope.la
-lib/kde3/noatun_net.la
-lib/kde3/noatun_splitplaylist.la
-lib/kde3/noatun_systray.la
-lib/kde3/noatun_ui.la
-lib/kde3/noatun_voiceprint.la
-lib/kde3/noatun_winskin.la
-lib/kde3/noatunsimple.la
-lib/kde3/videothumbnail.la
-lib/libakode.la
-lib/libakode_mpc_decoder.la
-lib/libakode_mpeg_decoder.la
-lib/libakode_oss_sink.la
-lib/libakode_xiph_decoder.la
-lib/libarts_akode.la
-lib/libarts_mpeglib.la
-lib/libarts_splay.la
-lib/libarts_xine.la
-lib/libartsbuilder.la
-lib/libartscontrolapplet.la
-lib/libartscontrolsupport.la
-lib/libartseffects.la
-lib/libartsgui.la
-lib/libartsgui_idl.la
-lib/libartsgui_kde.la
-lib/libartsmidi.la
-lib/libartsmidi_idl.la
-lib/libartsmodules.la
-lib/libartsmodulescommon.la
-lib/libartsmoduleseffects.la
-lib/libartsmodulesmixers.la
-lib/libartsmodulessynth.la
-lib/libaudiocdplugins.la
-lib/libaudiofilearts.la
-lib/libkcddb.la
-lib/libkdeinit_kmix.la
-lib/libkdeinit_kmixctrl.la
-lib/libkdeinit_krec.la
-lib/libkdeinit_noatun.la
-lib/libkmidlib.la
-lib/libmpeg.la
-lib/libnoatun.la
-lib/libnoatunarts.la
-lib/libnoatuncontrols.la
-lib/libnoatuntags.la
-lib/libwinskinvis.la
-lib/libyafcore.la
-lib/libyafxplayer.la
-lib/mcop/Arts/ArtsBuilderLoader.mcopclass
-lib/mcop/Arts/Button.mcopclass
-lib/mcop/Arts/EffectRackGuiFactory.mcopclass
-lib/mcop/Arts/Effect_WAVECAPTURE.mcopclass
-lib/mcop/Arts/Environment/Container.mcopclass
-lib/mcop/Arts/Environment/EffectRackItem.mcopclass
-lib/mcop/Arts/Environment/InstrumentItem.mcopclass
-lib/mcop/Arts/Environment/InstrumentItemGuiFactory.mcopclass
-lib/mcop/Arts/Environment/MixerItem.mcopclass
-lib/mcop/Arts/Fader.mcopclass
-lib/mcop/Arts/FiveBandMonoComplexEQ.mcopclass
-lib/mcop/Arts/FiveBandMonoComplexEQGuiFactory.mcopclass
-lib/mcop/Arts/FreeverbGuiFactory.mcopclass
-lib/mcop/Arts/GenericGuiFactory.mcopclass
-lib/mcop/Arts/GraphLine.mcopclass
-lib/mcop/Arts/HBox.mcopclass
-lib/mcop/Arts/Label.mcopclass
-lib/mcop/Arts/LayoutBox.mcopclass
-lib/mcop/Arts/LevelMeter.mcopclass
-lib/mcop/Arts/LineEdit.mcopclass
-lib/mcop/Arts/LittleStereoMixerChannel.mcopclass
-lib/mcop/Arts/LittleStereoMixerChannelGuiFactory.mcopclass
-lib/mcop/Arts/LocalFactory.mcopclass
-lib/mcop/Arts/MidiManager.mcopclass
-lib/mcop/Arts/MixerGuiFactory.mcopclass
-lib/mcop/Arts/MonoSimpleMixerChannel.mcopclass
-lib/mcop/Arts/MonoSimpleMixerChannelGuiFactory.mcopclass
-lib/mcop/Arts/MonoToStereo.mcopclass
-lib/mcop/Arts/PopupBox.mcopclass
-lib/mcop/Arts/Poti.mcopclass
-lib/mcop/Arts/SimpleMixerChannel.mcopclass
-lib/mcop/Arts/SimpleMixerChannelGuiFactory.mcopclass
-lib/mcop/Arts/SpinBox.mcopclass
-lib/mcop/Arts/StereoBalance.mcopclass
-lib/mcop/Arts/StereoBalanceGuiFactory.mcopclass
-lib/mcop/Arts/StereoCompressorGuiFactory.mcopclass
-lib/mcop/Arts/StereoFirEqualizerGuiFactory.mcopclass
-lib/mcop/Arts/StereoToMono.mcopclass
-lib/mcop/Arts/StereoVolumeControlGui.mcopclass
-lib/mcop/Arts/StereoVolumeControlGuiFactory.mcopclass
-lib/mcop/Arts/StructureBuilder.mcopclass
-lib/mcop/Arts/StructureDesc.mcopclass
-lib/mcop/Arts/Synth_ATAN_SATURATE.mcopclass
-lib/mcop/Arts/Synth_AUTOPANNER.mcopclass
-lib/mcop/Arts/Synth_BRICKWALL_LIMITER.mcopclass
-lib/mcop/Arts/Synth_CAPTURE_WAV.mcopclass
-lib/mcop/Arts/Synth_CDELAY.mcopclass
-lib/mcop/Arts/Synth_COMPRESSOR.mcopclass
-lib/mcop/Arts/Synth_DATA.mcopclass
-lib/mcop/Arts/Synth_DEBUG.mcopclass
-lib/mcop/Arts/Synth_DELAY.mcopclass
-lib/mcop/Arts/Synth_DIV.mcopclass
-lib/mcop/Arts/Synth_ENVELOPE_ADSR.mcopclass
-lib/mcop/Arts/Synth_FM_SOURCE.mcopclass
-lib/mcop/Arts/Synth_FREEVERB.mcopclass
-lib/mcop/Arts/Synth_FX_CFLANGER.mcopclass
-lib/mcop/Arts/Synth_MIDI_DEBUG.mcopclass
-lib/mcop/Arts/Synth_MIDI_TEST.mcopclass
-lib/mcop/Arts/Synth_MOOG_VCF.mcopclass
-lib/mcop/Arts/Synth_NIL.mcopclass
-lib/mcop/Arts/Synth_NOISE.mcopclass
-lib/mcop/Arts/Synth_OSC.mcopclass
-lib/mcop/Arts/Synth_PITCH_SHIFT.mcopclass
-lib/mcop/Arts/Synth_PITCH_SHIFT_FFT.mcopclass
-lib/mcop/Arts/Synth_PLAY_PAT.mcopclass
-lib/mcop/Arts/Synth_PSCALE.mcopclass
-lib/mcop/Arts/Synth_RC.mcopclass
-lib/mcop/Arts/Synth_SEQUENCE.mcopclass
-lib/mcop/Arts/Synth_SEQUENCE_FREQ.mcopclass
-lib/mcop/Arts/Synth_SHELVE_CUTOFF.mcopclass
-lib/mcop/Arts/Synth_STD_EQUALIZER.mcopclass
-lib/mcop/Arts/Synth_STEREO_COMPRESSOR.mcopclass
-lib/mcop/Arts/Synth_STEREO_FIR_EQUALIZER.mcopclass
-lib/mcop/Arts/Synth_STEREO_PITCH_SHIFT.mcopclass
-lib/mcop/Arts/Synth_STEREO_PITCH_SHIFT_FFT.mcopclass
-lib/mcop/Arts/Synth_TREMOLO.mcopclass
-lib/mcop/Arts/Synth_VOICE_REMOVAL.mcopclass
-lib/mcop/Arts/Synth_WAVE_PULSE.mcopclass
-lib/mcop/Arts/Synth_WAVE_SOFTSAW.mcopclass
-lib/mcop/Arts/Synth_WAVE_SQUARE.mcopclass
-lib/mcop/Arts/Synth_WAVE_TRI.mcopclass
-lib/mcop/Arts/Synth_XFADE.mcopclass
-lib/mcop/Arts/VBox.mcopclass
-lib/mcop/Arts/VoiceRemovalGuiFactory.mcopclass
-lib/mcop/Arts/Widget.mcopclass
-lib/mcop/Arts/audiofilePlayObject.mcopclass
-lib/mcop/CDDAPlayObject.mcopclass
-lib/mcop/ExtraStereo.mcopclass
-lib/mcop/ExtraStereoGuiFactory.mcopclass
-lib/mcop/MP3PlayObject.mcopclass
-lib/mcop/NULLPlayObject.mcopclass
-lib/mcop/Noatun/Equalizer.mcopclass
-lib/mcop/Noatun/EqualizerSSE.mcopclass
-lib/mcop/Noatun/FFTScope.mcopclass
-lib/mcop/Noatun/FFTScopeStereo.mcopclass
-lib/mcop/Noatun/Listener.mcopclass
-lib/mcop/Noatun/RawScope.mcopclass
-lib/mcop/Noatun/RawScopeStereo.mcopclass
-lib/mcop/Noatun/Session.mcopclass
-lib/mcop/Noatun/StereoEffectStack.mcopclass
-lib/mcop/Noatun/StereoVolumeControl.mcopclass
-lib/mcop/Noatun/StereoVolumeControlSSE.mcopclass
-lib/mcop/Noatun/WinSkinFFT.mcopclass
-lib/mcop/OGGPlayObject.mcopclass
-lib/mcop/RawWriter.mcopclass
-lib/mcop/SplayPlayObject.mcopclass
-lib/mcop/VoiceRemoval.mcopclass
-lib/mcop/WAVPlayObject.mcopclass
-lib/mcop/akodeMPCPlayObject.mcopclass
-lib/mcop/akodeMPEGPlayObject.mcopclass
-lib/mcop/akodePlayObject.mcopclass
-lib/mcop/akodeSpeexStreamPlayObject.mcopclass
-lib/mcop/akodeVorbisStreamPlayObject.mcopclass
-lib/mcop/akodeXiphPlayObject.mcopclass
-lib/mcop/akodearts.mcopclass
-lib/mcop/akodearts.mcoptype
-lib/mcop/artsbuilder.mcopclass
-lib/mcop/artsbuilder.mcoptype
-lib/mcop/artseffects.mcopclass
-lib/mcop/artseffects.mcoptype
-lib/mcop/artsgui.mcopclass
-lib/mcop/artsgui.mcoptype
-lib/mcop/artsmidi.mcopclass
-lib/mcop/artsmidi.mcoptype
-lib/mcop/artsmodules.mcopclass
-lib/mcop/artsmodules.mcoptype
-lib/mcop/artsmodulescommon.mcopclass
-lib/mcop/artsmodulescommon.mcoptype
-lib/mcop/artsmoduleseffects.mcopclass
-lib/mcop/artsmoduleseffects.mcoptype
-lib/mcop/artsmodulesmixers.mcopclass
-lib/mcop/artsmodulesmixers.mcoptype
-lib/mcop/artsmodulessynth.mcopclass
-lib/mcop/artsmodulessynth.mcoptype
-lib/mcop/audiofilearts.mcopclass
-lib/mcop/audiofilearts.mcoptype
-lib/mcop/noatunarts.mcopclass
-lib/mcop/noatunarts.mcoptype
-lib/mcop/winskinvis.mcopclass
-lib/mcop/winskinvis.mcoptype
-lib/mcop/xineAudioPlayObject.mcopclass
-lib/mcop/xineVideoPlayObject.mcopclass
-share/applications/kde/artsbuilder.desktop
-share/applications/kde/artscontrol.desktop
-share/applications/kde/audiocd.desktop
-share/applications/kde/juk.desktop
-share/applications/kde/kaboodle.desktop
-share/applications/kde/kaudiocreator.desktop
-share/applications/kde/kmid.desktop
-share/applications/kde/kmix.desktop
-share/applications/kde/krec.desktop
-share/applications/kde/kscd.desktop
-share/applications/kde/libkcddb.desktop
-share/applications/kde/noatun.desktop
-share/desktop-directories/kde-multimedia-music.directory
-share/doc/kde/HTML/en/artsbuilder/apis.docbook
-share/doc/kde/HTML/en/artsbuilder/arts-structure.png
-share/doc/kde/HTML/en/artsbuilder/artsbuilder.docbook
-share/doc/kde/HTML/en/artsbuilder/common
-share/doc/kde/HTML/en/artsbuilder/detail.docbook
-share/doc/kde/HTML/en/artsbuilder/digitalaudio.docbook
-share/doc/kde/HTML/en/artsbuilder/faq.docbook
-share/doc/kde/HTML/en/artsbuilder/future.docbook
-share/doc/kde/HTML/en/artsbuilder/glossary.docbook
-share/doc/kde/HTML/en/artsbuilder/gui.docbook
-share/doc/kde/HTML/en/artsbuilder/helping.docbook
-share/doc/kde/HTML/en/artsbuilder/images/Doc_MODUL.png
-share/doc/kde/HTML/en/artsbuilder/images/Gui_AUDIO_MANAGER.png
-share/doc/kde/HTML/en/artsbuilder/images/Gui_INSTRUMENT_MAPPER.png
-share/doc/kde/HTML/en/artsbuilder/images/Gui_LABEL.png
-share/doc/kde/HTML/en/artsbuilder/images/Gui_MIXER.png
-share/doc/kde/HTML/en/artsbuilder/images/Gui_PANEL.png
-share/doc/kde/HTML/en/artsbuilder/images/Gui_POTI.png
-share/doc/kde/HTML/en/artsbuilder/images/Gui_SLIDER.png
-share/doc/kde/HTML/en/artsbuilder/images/Gui_SUBPANEL.png
-share/doc/kde/HTML/en/artsbuilder/images/Gui_WINDOW.png
-share/doc/kde/HTML/en/artsbuilder/images/Interface_MIDI_NOTE.png
-share/doc/kde/HTML/en/artsbuilder/images/Synth_ADD.png
-share/doc/kde/HTML/en/artsbuilder/images/Synth_ATAN_SATURATE.png
-share/doc/kde/HTML/en/artsbuilder/images/Synth_BUS_DOWNLINK.png
-share/doc/kde/HTML/en/artsbuilder/images/Synth_BUS_UPLINK.png
-share/doc/kde/HTML/en/artsbuilder/images/Synth_CDELAY.png
-share/doc/kde/HTML/en/artsbuilder/images/Synth_COMPRESSOR.png
-share/doc/kde/HTML/en/artsbuilder/images/Synth_DEBUG.png
-share/doc/kde/HTML/en/artsbuilder/images/Synth_DELAY.png
-share/doc/kde/HTML/en/artsbuilder/images/Synth_DIV.png
-share/doc/kde/HTML/en/artsbuilder/images/Synth_ENVELOPE_ADSR.png
-share/doc/kde/HTML/en/artsbuilder/images/Synth_FILEPLAY.png
-share/doc/kde/HTML/en/artsbuilder/images/Synth_FM_SOURCE.png
-share/doc/kde/HTML/en/artsbuilder/images/Synth_FREQUENCY.png
-share/doc/kde/HTML/en/artsbuilder/images/Synth_MIDI_DEBUG.png
-share/doc/kde/HTML/en/artsbuilder/images/Synth_MIDI_ROUTER.png
-share/doc/kde/HTML/en/artsbuilder/images/Synth_MUL.png
-share/doc/kde/HTML/en/artsbuilder/images/Synth_NIL.png
-share/doc/kde/HTML/en/artsbuilder/images/Synth_PLAY.png
-share/doc/kde/HTML/en/artsbuilder/images/Synth_PLAY_AKAI.png
-share/doc/kde/HTML/en/artsbuilder/images/Synth_PLAY_AKAIS.png
-share/doc/kde/HTML/en/artsbuilder/images/Synth_PLAY_WAV.png
-share/doc/kde/HTML/en/artsbuilder/images/Synth_PSCALE.png
-share/doc/kde/HTML/en/artsbuilder/images/Synth_RC.png
-share/doc/kde/HTML/en/artsbuilder/images/Synth_SEQUENCE.png
-share/doc/kde/HTML/en/artsbuilder/images/Synth_SEQUENCE_FREQ.png
-share/doc/kde/HTML/en/artsbuilder/images/Synth_SHELVE_CUTOFF.png
-share/doc/kde/HTML/en/artsbuilder/images/Synth_STD_EQUALIZER.png
-share/doc/kde/HTML/en/artsbuilder/images/Synth_STRUCT_KILL.png
-share/doc/kde/HTML/en/artsbuilder/images/Synth_WAVE_SIN.png
-share/doc/kde/HTML/en/artsbuilder/images/Synth_WAVE_SQUARE.png
-share/doc/kde/HTML/en/artsbuilder/images/Synth_WAVE_TRI.png
-share/doc/kde/HTML/en/artsbuilder/images/Synth_XFADE.png
-share/doc/kde/HTML/en/artsbuilder/images/schema1.png
-share/doc/kde/HTML/en/artsbuilder/images/schema2.png
-share/doc/kde/HTML/en/artsbuilder/images/schema3.png
-share/doc/kde/HTML/en/artsbuilder/images/schema4.png
-share/doc/kde/HTML/en/artsbuilder/index.cache.bz2
-share/doc/kde/HTML/en/artsbuilder/index.docbook
-share/doc/kde/HTML/en/artsbuilder/mcop.docbook
-share/doc/kde/HTML/en/artsbuilder/midi.docbook
-share/doc/kde/HTML/en/artsbuilder/midiintro.docbook
-share/doc/kde/HTML/en/artsbuilder/modules.docbook
-share/doc/kde/HTML/en/artsbuilder/porting.docbook
-share/doc/kde/HTML/en/artsbuilder/references.docbook
-share/doc/kde/HTML/en/artsbuilder/tools.docbook
-share/doc/kde/HTML/en/juk/common
-share/doc/kde/HTML/en/juk/history-playlist.png
-share/doc/kde/HTML/en/juk/index.cache.bz2
-share/doc/kde/HTML/en/juk/index.docbook
-share/doc/kde/HTML/en/juk/juk-adv-search.png
-share/doc/kde/HTML/en/juk/juk-file-renamer.png
-share/doc/kde/HTML/en/juk/juk-main.png
-share/doc/kde/HTML/en/juk/juk-tag-guesser.png
-share/doc/kde/HTML/en/juk/normal-playlist.png
-share/doc/kde/HTML/en/juk/search-playlist.png
-share/doc/kde/HTML/en/juk/toolbar.png
-share/doc/kde/HTML/en/kaboodle/common
-share/doc/kde/HTML/en/kaboodle/index.cache.bz2
-share/doc/kde/HTML/en/kaboodle/index.docbook
-share/doc/kde/HTML/en/kcontrol/kmixcfg/common
-share/doc/kde/HTML/en/kcontrol/kmixcfg/index.cache.bz2
-share/doc/kde/HTML/en/kcontrol/kmixcfg/index.docbook
-share/doc/kde/HTML/en/kio_audiocd/audiocd.docbook
-share/doc/kde/HTML/en/kmid/common
-share/doc/kde/HTML/en/kmid/index.cache.bz2
-share/doc/kde/HTML/en/kmid/index.docbook
-share/doc/kde/HTML/en/kmix/common
-share/doc/kde/HTML/en/kmix/index.cache.bz2
-share/doc/kde/HTML/en/kmix/index.docbook
-share/doc/kde/HTML/en/kmix/kmix-channel-playback.png
-share/doc/kde/HTML/en/kmix/kmix-channel-record.png
-share/doc/kde/HTML/en/kmix/kmix-window.png
-share/doc/kde/HTML/en/krec/common
-share/doc/kde/HTML/en/krec/index.cache.bz2
-share/doc/kde/HTML/en/krec/index.docbook
-share/doc/kde/HTML/en/krec/krec-configuration.png
-share/doc/kde/HTML/en/krec/krec-hicolor.png
-share/doc/kde/HTML/en/krec/krec-keramik.png
-share/doc/kde/HTML/en/krec/krec-new_file_properties.png
-share/doc/kde/HTML/en/kscd/common
-share/doc/kde/HTML/en/kscd/index.cache.bz2
-share/doc/kde/HTML/en/kscd/index.docbook
-share/doc/kde/HTML/en/kscd/kscd.png
-share/doc/kde/HTML/en/kscd/kscd11.png
-share/doc/kde/HTML/en/kscd/kscd12.png
-share/doc/kde/HTML/en/kscd/kscd13.png
-share/doc/kde/HTML/en/kscd/kscd14.png
-share/doc/kde/HTML/en/kscd/kscd16.png
-share/doc/kde/HTML/en/kscd/kscd18.png
-share/doc/kde/HTML/en/kscd/kscd19.png
-share/doc/kde/HTML/en/kscd/kscd2.png
-share/doc/kde/HTML/en/kscd/kscd3.png
-share/doc/kde/HTML/en/kscd/kscd5.png
-share/doc/kde/HTML/en/kscd/kscd6.png
-share/doc/kde/HTML/en/kscd/kscd9.png
-share/doc/kde/HTML/en/kscd/kscdannounc.png
-share/doc/kde/HTML/en/noatun/common
-share/doc/kde/HTML/en/noatun/index.cache.bz2
-share/doc/kde/HTML/en/noatun/index.docbook
-share/examples/kdemultimedia3/applications-merged/kde-multimedia-music.menu
-share/kde/apps/artsbuilder/artsbuilderui.rc
-share/kde/apps/artsbuilder/examples/README
-share/kde/apps/artsbuilder/examples/example_adsr.arts
-share/kde/apps/artsbuilder/examples/example_atan_saturate.arts
-share/kde/apps/artsbuilder/examples/example_autopanner.arts
-share/kde/apps/artsbuilder/examples/example_brickwall.arts
-share/kde/apps/artsbuilder/examples/example_bus.arts
-share/kde/apps/artsbuilder/examples/example_capture_wav.arts
-share/kde/apps/artsbuilder/examples/example_cdelay.arts
-share/kde/apps/artsbuilder/examples/example_cflanger.arts
-share/kde/apps/artsbuilder/examples/example_data.arts
-share/kde/apps/artsbuilder/examples/example_delay.arts
-share/kde/apps/artsbuilder/examples/example_dtmf1.arts
-share/kde/apps/artsbuilder/examples/example_equalizer.arts
-share/kde/apps/artsbuilder/examples/example_fm.arts
-share/kde/apps/artsbuilder/examples/example_freeverb.arts
-share/kde/apps/artsbuilder/examples/example_moog.arts
-share/kde/apps/artsbuilder/examples/example_multi_add.arts
-share/kde/apps/artsbuilder/examples/example_noise.arts
-share/kde/apps/artsbuilder/examples/example_pitchshift.arts
-share/kde/apps/artsbuilder/examples/example_play_wave.arts
-share/kde/apps/artsbuilder/examples/example_pscale.arts
-share/kde/apps/artsbuilder/examples/example_pulse.arts
-share/kde/apps/artsbuilder/examples/example_rc.arts
-share/kde/apps/artsbuilder/examples/example_record.arts
-share/kde/apps/artsbuilder/examples/example_sequence.arts
-share/kde/apps/artsbuilder/examples/example_shelve_cutoff.arts
-share/kde/apps/artsbuilder/examples/example_sine.arts
-share/kde/apps/artsbuilder/examples/example_softsaw.arts
-share/kde/apps/artsbuilder/examples/example_square.arts
-share/kde/apps/artsbuilder/examples/example_stereobeep.arts
-share/kde/apps/artsbuilder/examples/example_tremolo.arts
-share/kde/apps/artsbuilder/examples/example_tri.arts
-share/kde/apps/artsbuilder/examples/example_xfade.arts
-share/kde/apps/artsbuilder/examples/instrument_arts_all.arts-map
-share/kde/apps/artsbuilder/examples/instrument_chirpdrum.arts
-share/kde/apps/artsbuilder/examples/instrument_deepdrum.arts
-share/kde/apps/artsbuilder/examples/instrument_full_square.arts
-share/kde/apps/artsbuilder/examples/instrument_hihat.arts
-share/kde/apps/artsbuilder/examples/instrument_neworgan.arts
-share/kde/apps/artsbuilder/examples/instrument_nokind.arts
-share/kde/apps/artsbuilder/examples/instrument_organ2.arts
-share/kde/apps/artsbuilder/examples/instrument_simple_sin.arts
-share/kde/apps/artsbuilder/examples/instrument_simple_square.arts
-share/kde/apps/artsbuilder/examples/instrument_simple_tri.arts
-share/kde/apps/artsbuilder/examples/instrument_slide.arts
-share/kde/apps/artsbuilder/examples/instrument_slide1.arts
-share/kde/apps/artsbuilder/examples/instrument_square.arts
-share/kde/apps/artsbuilder/examples/instrument_tri.arts
-share/kde/apps/artsbuilder/examples/template_Empty_Structure.arts
-share/kde/apps/artsbuilder/examples/template_Instrument.arts
-share/kde/apps/artsbuilder/examples/todo/effect_delay.arts
-share/kde/apps/artsbuilder/examples/todo/effect_delay_alone.arts
-share/kde/apps/artsbuilder/examples/todo/effect_flanger_alone.arts
-share/kde/apps/artsbuilder/examples/todo/instrument_flexible_slide.arts
-share/kde/apps/artsbuilder/examples/todo/instrument_flexible_slide_GUI.arts
-share/kde/apps/artsbuilder/examples/todo/instrument_fm_horn.arts
-share/kde/apps/artsbuilder/examples/todo/instrument_moog_vcf_tune.arts
-share/kde/apps/artsbuilder/examples/todo/instrument_moog_vcf_tune_GUI.arts
-share/kde/apps/artsbuilder/examples/todo/mixer_element_eq.arts
-share/kde/apps/artsbuilder/examples/todo/mixer_element_eqfx.arts
-share/kde/apps/artsbuilder/examples/todo/mixer_element_simple.arts
-share/kde/apps/artsbuilder/examples/todo/template_Instrument_GUI.arts
-share/kde/apps/artsbuilder/examples/todo/template_Mixer_Element.arts
-share/kde/apps/artsbuilder/pics/Synth_ADD.xpm
-share/kde/apps/artsbuilder/pics/Synth_AMAN_PLAY.xpm
-share/kde/apps/artsbuilder/pics/Synth_ATAN_SATURATE.xpm
-share/kde/apps/artsbuilder/pics/Synth_BUS_DOWNLINK.xpm
-share/kde/apps/artsbuilder/pics/Synth_BUS_UPLINK.xpm
-share/kde/apps/artsbuilder/pics/Synth_DEBUG.xpm
-share/kde/apps/artsbuilder/pics/Synth_DIV.xpm
-share/kde/apps/artsbuilder/pics/Synth_ENVELOPE_ADSR.xpm
-share/kde/apps/artsbuilder/pics/Synth_FILEPLAY.xpm
-share/kde/apps/artsbuilder/pics/Synth_MIDI_DEBUG.xpm
-share/kde/apps/artsbuilder/pics/Synth_MOOG_VCF.xpm
-share/kde/apps/artsbuilder/pics/Synth_MUL.xpm
-share/kde/apps/artsbuilder/pics/Synth_MULTI_ADD.xpm
-share/kde/apps/artsbuilder/pics/Synth_PLAY.xpm
-share/kde/apps/artsbuilder/pics/Synth_PLAY_WAV.xpm
-share/kde/apps/artsbuilder/pics/Synth_PSCALE.xpm
-share/kde/apps/artsbuilder/pics/Synth_RC.xpm
-share/kde/apps/artsbuilder/pics/Synth_SEQUENCE.xpm
-share/kde/apps/artsbuilder/pics/Synth_SEQUENCE_FREQ.png
-share/kde/apps/artsbuilder/pics/Synth_SHELVE_CUTOFF.xpm
-share/kde/apps/artsbuilder/pics/Synth_WAVE_SAW.xpm
-share/kde/apps/artsbuilder/pics/Synth_WAVE_SIN.xpm
-share/kde/apps/artsbuilder/pics/Synth_WAVE_SQUARE.xpm
-share/kde/apps/artsbuilder/pics/Synth_WAVE_TRI.xpm
-share/kde/apps/artsbuilder/pics/Synth_XFADE.xpm
-share/kde/apps/artscontrol/artscontrol.rc
-share/kde/apps/artscontrol/artsmidimanagerview.rc
-share/kde/apps/juk/jukui-rtl.rc
-share/kde/apps/juk/jukui.rc
-share/kde/apps/juk/pics/playing.png
-share/kde/apps/kaboodle/icons/crystalsvg/16x16/actions/kaboodleloop.png
-share/kde/apps/kaboodle/icons/crystalsvg/22x22/actions/kaboodleloop.png
-share/kde/apps/kaboodle/kaboodlepartui.rc
-share/kde/apps/kaboodle/kaboodleui.rc
-share/kde/apps/kappfinder/apps/Multimedia/ams.desktop
-share/kde/apps/kappfinder/apps/Multimedia/amsynth.desktop
-share/kde/apps/kappfinder/apps/Multimedia/ardour.desktop
-share/kde/apps/kappfinder/apps/Multimedia/djplay.desktop
-share/kde/apps/kappfinder/apps/Multimedia/ecamegapedal.desktop
-share/kde/apps/kappfinder/apps/Multimedia/freebirth.desktop
-share/kde/apps/kappfinder/apps/Multimedia/freqtweak.desktop
-share/kde/apps/kappfinder/apps/Multimedia/galan.desktop
-share/kde/apps/kappfinder/apps/Multimedia/hydrogen.desktop
-share/kde/apps/kappfinder/apps/Multimedia/jack-rack.desktop
-share/kde/apps/kappfinder/apps/Multimedia/jamin.desktop
-share/kde/apps/kappfinder/apps/Multimedia/meterbridge.desktop
-share/kde/apps/kappfinder/apps/Multimedia/mixxx.desktop
-share/kde/apps/kappfinder/apps/Multimedia/muse.desktop
-share/kde/apps/kappfinder/apps/Multimedia/qjackctl.desktop
-share/kde/apps/kappfinder/apps/Multimedia/qsynth.desktop
-share/kde/apps/kappfinder/apps/Multimedia/vkeybd.desktop
-share/kde/apps/kappfinder/apps/Multimedia/zynaddsubfx.desktop
-share/kde/apps/kaudiocreator/eventsrc
-share/kde/apps/kaudiocreator/kaudiocreatorui.rc
-share/kde/apps/kaudiocreator/pics/check.png
-share/kde/apps/kconf_update/audiocd.upd
-share/kde/apps/kconf_update/kaudiocreator-libkcddb.upd
-share/kde/apps/kconf_update/kaudiocreator-meta.upd
-share/kde/apps/kconf_update/kcmcddb-emailsettings.upd
-share/kde/apps/kconf_update/noatun.upd
-share/kde/apps/kconf_update/noatun20update
-share/kde/apps/kconf_update/upgrade-kaudiocreator-metadata.sh
-share/kde/apps/kconf_update/upgrade-metadata.sh
-share/kde/apps/kicker/applets/artscontrolapplet.desktop
-share/kde/apps/kicker/applets/kmixapplet.desktop
-share/kde/apps/kmid/DiesIrae.kar
-share/kde/apps/kmid/Guantanamera.kar
-share/kde/apps/kmid/MariaDeLasMercedes.kar
-share/kde/apps/kmid/OFortuna.kar
-share/kde/apps/kmid/fm/drums.o3
-share/kde/apps/kmid/fm/drums.sb
-share/kde/apps/kmid/fm/std.o3
-share/kde/apps/kmid/fm/std.sb
-share/kde/apps/kmid/icons/button1.xpm
-share/kde/apps/kmid/icons/button2.xpm
-share/kde/apps/kmid/icons/crystalsvg/16x16/actions/piano.png
-share/kde/apps/kmid/icons/crystalsvg/16x16/actions/volume.png
-share/kde/apps/kmid/icons/crystalsvg/22x22/actions/piano.png
-share/kde/apps/kmid/icons/crystalsvg/22x22/actions/volume.png
-share/kde/apps/kmid/icons/crystalsvg/32x32/actions/piano.png
-share/kde/apps/kmid/icons/crystalsvg/32x32/actions/volume.png
-share/kde/apps/kmid/icons/keyboard.xpm
-share/kde/apps/kmid/kmid_partui.rc
-share/kde/apps/kmid/kmidui.rc
-share/kde/apps/kmid/maps/YamahaPSR500.map
-share/kde/apps/kmid/maps/YamahaPSS790.map
-share/kde/apps/kmid/maps/YamahaQY10.map
-share/kde/apps/kmid/maps/gm.map
-share/kde/apps/kmix/kmixui.rc
-share/kde/apps/kmix/pics/Listener.png
-share/kde/apps/kmix/pics/SpeakerFrontLeft.png
-share/kde/apps/kmix/pics/SpeakerFrontRight.png
-share/kde/apps/kmix/pics/SpeakerRearLeft.png
-share/kde/apps/kmix/pics/SpeakerRearRight.png
-share/kde/apps/kmix/pics/kmixdocked.png
-share/kde/apps/kmix/pics/kmixdocked_error.png
-share/kde/apps/kmix/pics/kmixdocked_mute.png
-share/kde/apps/kmix/pics/mix_ac97.png
-share/kde/apps/kmix/pics/mix_audio.png
-share/kde/apps/kmix/pics/mix_bass.png
-share/kde/apps/kmix/pics/mix_cd.png
-share/kde/apps/kmix/pics/mix_digital.png
-share/kde/apps/kmix/pics/mix_ext.png
-share/kde/apps/kmix/pics/mix_headphone.png
-share/kde/apps/kmix/pics/mix_microphone.png
-share/kde/apps/kmix/pics/mix_midi.png
-share/kde/apps/kmix/pics/mix_recmon.png
-share/kde/apps/kmix/pics/mix_record.png
-share/kde/apps/kmix/pics/mix_surround.png
-share/kde/apps/kmix/pics/mix_treble.png
-share/kde/apps/kmix/pics/mix_unknown.png
-share/kde/apps/kmix/pics/mix_video.png
-share/kde/apps/kmix/pics/mix_volume.png
-share/kde/apps/konqueror/servicemenus/audiocd_play.desktop
-share/kde/apps/konqueror/servicemenus/jukservicemenu.desktop
-share/kde/apps/krec/icons/crystalsvg/16x16/actions/krec_record.png
-share/kde/apps/krec/icons/crystalsvg/22x22/actions/krec_record.png
-share/kde/apps/krec/icons/crystalsvg/32x32/actions/krec_record.png
-share/kde/apps/krec/icons/crystalsvg/32x32/mimetypes/krec_fileempty.png
-share/kde/apps/krec/icons/crystalsvg/32x32/mimetypes/krec_fileplay.png
-share/kde/apps/krec/icons/crystalsvg/32x32/mimetypes/krec_filerec.png
-share/kde/apps/krec/krecui.rc
-share/kde/apps/krec/tips
-share/kde/apps/kscd/icons/crystalsvg/22x22/actions/cdsmall.png
-share/kde/apps/noatun/dcopiface.plugin
-share/kde/apps/noatun/eq.preset/preset.dance
-share/kde/apps/noatun/eq.preset/preset.jazz
-share/kde/apps/noatun/eq.preset/preset.metal
-share/kde/apps/noatun/eq.preset/preset.trance
-share/kde/apps/noatun/eq.preset/preset.zero
-share/kde/apps/noatun/excellent.plugin
-share/kde/apps/noatun/excellentui.rc
-share/kde/apps/noatun/htmlexport.plugin
-share/kde/apps/noatun/icons/crystalsvg/128x128/actions/equalizer.png
-share/kde/apps/noatun/icons/crystalsvg/128x128/actions/playlist.png
-share/kde/apps/noatun/icons/crystalsvg/16x16/actions/effect.png
-share/kde/apps/noatun/icons/crystalsvg/16x16/actions/equalizer.png
-share/kde/apps/noatun/icons/crystalsvg/16x16/actions/noatunback.png
-share/kde/apps/noatun/icons/crystalsvg/16x16/actions/noatunforward.png
-share/kde/apps/noatun/icons/crystalsvg/16x16/actions/noatunpause.png
-share/kde/apps/noatun/icons/crystalsvg/16x16/actions/noatunplay.png
-share/kde/apps/noatun/icons/crystalsvg/16x16/actions/noatunplaylist.png
-share/kde/apps/noatun/icons/crystalsvg/16x16/actions/noatunstop.png
-share/kde/apps/noatun/icons/crystalsvg/16x16/actions/playlist.png
-share/kde/apps/noatun/icons/crystalsvg/22x22/actions/equalizer.png
-share/kde/apps/noatun/icons/crystalsvg/22x22/actions/noatunback.png
-share/kde/apps/noatun/icons/crystalsvg/22x22/actions/noatunfback.png
-share/kde/apps/noatun/icons/crystalsvg/22x22/actions/noatunfforward.png
-share/kde/apps/noatun/icons/crystalsvg/22x22/actions/noatunforward.png
-share/kde/apps/noatun/icons/crystalsvg/22x22/actions/noatunloopnone.png
-share/kde/apps/noatun/icons/crystalsvg/22x22/actions/noatunloopplaylist.png
-share/kde/apps/noatun/icons/crystalsvg/22x22/actions/noatunlooprandom.png
-share/kde/apps/noatun/icons/crystalsvg/22x22/actions/noatunloopsong.png
-share/kde/apps/noatun/icons/crystalsvg/22x22/actions/noatunpause.png
-share/kde/apps/noatun/icons/crystalsvg/22x22/actions/noatunplay.png
-share/kde/apps/noatun/icons/crystalsvg/22x22/actions/noatunplaylist.png
-share/kde/apps/noatun/icons/crystalsvg/22x22/actions/noatunstop.png
-share/kde/apps/noatun/icons/crystalsvg/22x22/actions/noatuntiny.png
-share/kde/apps/noatun/icons/crystalsvg/22x22/actions/playlist.png
-share/kde/apps/noatun/icons/crystalsvg/32x32/actions/effect.png
-share/kde/apps/noatun/icons/crystalsvg/32x32/actions/equalizer.png
-share/kde/apps/noatun/icons/crystalsvg/32x32/actions/playlist.png
-share/kde/apps/noatun/icons/crystalsvg/48x48/actions/effect.png
-share/kde/apps/noatun/icons/crystalsvg/48x48/actions/equalizer.png
-share/kde/apps/noatun/icons/crystalsvg/48x48/actions/playlist.png
-share/kde/apps/noatun/icons/crystalsvg/64x64/actions/equalizer.png
-share/kde/apps/noatun/icons/crystalsvg/64x64/actions/playlist.png
-share/kde/apps/noatun/infrared.plugin
-share/kde/apps/noatun/kaiman.plugin
-share/kde/apps/noatun/kaimanui.rc
-share/kde/apps/noatun/keyz.plugin
-share/kde/apps/noatun/kjofolui.plugin
-share/kde/apps/noatun/magictable
-share/kde/apps/noatun/marquis.plugin
-share/kde/apps/noatun/metatag.plugin
-share/kde/apps/noatun/monoscope.plugin
-share/kde/apps/noatun/net.plugin
-share/kde/apps/noatun/noatunui.plugin
-share/kde/apps/noatun/simple.plugin
-share/kde/apps/noatun/simpleui.rc
-share/kde/apps/noatun/skins/kaiman/car-preset/btn_exit.png
-share/kde/apps/noatun/skins/kaiman/car-preset/btn_iconify.png
-share/kde/apps/noatun/skins/kaiman/car-preset/btn_list.png
-share/kde/apps/noatun/skins/kaiman/car-preset/btn_next.png
-share/kde/apps/noatun/skins/kaiman/car-preset/btn_p1.png
-share/kde/apps/noatun/skins/kaiman/car-preset/btn_p2.png
-share/kde/apps/noatun/skins/kaiman/car-preset/btn_p3.png
-share/kde/apps/noatun/skins/kaiman/car-preset/btn_p4.png
-share/kde/apps/noatun/skins/kaiman/car-preset/btn_p5.png
-share/kde/apps/noatun/skins/kaiman/car-preset/btn_p6.png
-share/kde/apps/noatun/skins/kaiman/car-preset/btn_play.png
-share/kde/apps/noatun/skins/kaiman/car-preset/btn_prev.png
-share/kde/apps/noatun/skins/kaiman/car-preset/btn_sml.png
-share/kde/apps/noatun/skins/kaiman/car-preset/btn_stop.png
-share/kde/apps/noatun/skins/kaiman/car-preset/btn_voldn.png
-share/kde/apps/noatun/skins/kaiman/car-preset/btn_volup.png
-share/kde/apps/noatun/skins/kaiman/car-preset/digbig.png
-share/kde/apps/noatun/skins/kaiman/car-preset/digmed.png
-share/kde/apps/noatun/skins/kaiman/car-preset/letters.png
-share/kde/apps/noatun/skins/kaiman/car-preset/main.png
-share/kde/apps/noatun/skins/kaiman/car-preset/monoster.png
-share/kde/apps/noatun/skins/kaiman/car-preset/posbar.png
-share/kde/apps/noatun/skins/kaiman/car-preset/random.png
-share/kde/apps/noatun/skins/kaiman/car-preset/repeat.png
-share/kde/apps/noatun/skins/kaiman/car-preset/skindata
-share/kde/apps/noatun/skins/kaiman/car-preset/status.png
-share/kde/apps/noatun/skins/kaiman/car-preset/volume.png
-share/kde/apps/noatun/skins/kaiman/circle/back.png
-share/kde/apps/noatun/skins/kaiman/circle/back_mask.png
-share/kde/apps/noatun/skins/kaiman/circle/back_sm.png
-share/kde/apps/noatun/skins/kaiman/circle/back_sm_mask.png
-share/kde/apps/noatun/skins/kaiman/circle/bar_pos.png
-share/kde/apps/noatun/skins/kaiman/circle/bar_vol.png
-share/kde/apps/noatun/skins/kaiman/circle/btn_exit.png
-share/kde/apps/noatun/skins/kaiman/circle/btn_iconify.png
-share/kde/apps/noatun/skins/kaiman/circle/btn_list.png
-share/kde/apps/noatun/skins/kaiman/circle/btn_mode.png
-share/kde/apps/noatun/skins/kaiman/circle/btn_next.png
-share/kde/apps/noatun/skins/kaiman/circle/btn_play.png
-share/kde/apps/noatun/skins/kaiman/circle/btn_pref.png
-share/kde/apps/noatun/skins/kaiman/circle/btn_prev.png
-share/kde/apps/noatun/skins/kaiman/circle/btn_repeat.png
-share/kde/apps/noatun/skins/kaiman/circle/btn_shuffle.png
-share/kde/apps/noatun/skins/kaiman/circle/btn_sm_exit.png
-share/kde/apps/noatun/skins/kaiman/circle/btn_sm_iconify.png
-share/kde/apps/noatun/skins/kaiman/circle/btn_sm_mode.png
-share/kde/apps/noatun/skins/kaiman/circle/btn_sm_next.png
-share/kde/apps/noatun/skins/kaiman/circle/btn_sm_play.png
-share/kde/apps/noatun/skins/kaiman/circle/btn_sm_prev.png
-share/kde/apps/noatun/skins/kaiman/circle/btn_sm_stop.png
-share/kde/apps/noatun/skins/kaiman/circle/btn_stop.png
-share/kde/apps/noatun/skins/kaiman/circle/dig.png
-share/kde/apps/noatun/skins/kaiman/circle/digsml.png
-share/kde/apps/noatun/skins/kaiman/circle/letters.png
-share/kde/apps/noatun/skins/kaiman/circle/skindata
-share/kde/apps/noatun/skins/kaiman/circle/status.png
-share/kde/apps/noatun/skins/kaiman/k9/README
-share/kde/apps/noatun/skins/kaiman/k9/conf.jpg
-share/kde/apps/noatun/skins/kaiman/k9/conf.png
-share/kde/apps/noatun/skins/kaiman/k9/eject.jpg
-share/kde/apps/noatun/skins/kaiman/k9/icon.jpg
-share/kde/apps/noatun/skins/kaiman/k9/icon.png
-share/kde/apps/noatun/skins/kaiman/k9/kill.jpg
-share/kde/apps/noatun/skins/kaiman/k9/kill.png
-share/kde/apps/noatun/skins/kaiman/k9/knine-nfont.jpg
-share/kde/apps/noatun/skins/kaiman/k9/knine-nfont.png
-share/kde/apps/noatun/skins/kaiman/k9/knine-nfont2.jpg
-share/kde/apps/noatun/skins/kaiman/k9/knine-nfont2.png
-share/kde/apps/noatun/skins/kaiman/k9/knine-normal2.jpg
-share/kde/apps/noatun/skins/kaiman/k9/knine-normal2.png
-share/kde/apps/noatun/skins/kaiman/k9/knine-vfont.jpg
-share/kde/apps/noatun/skins/kaiman/k9/knine-vfont.png
-share/kde/apps/noatun/skins/kaiman/k9/long2.jpg
-share/kde/apps/noatun/skins/kaiman/k9/mask.png
-share/kde/apps/noatun/skins/kaiman/k9/newtext.jpg
-share/kde/apps/noatun/skins/kaiman/k9/newtext.png
-share/kde/apps/noatun/skins/kaiman/k9/next.jpg
-share/kde/apps/noatun/skins/kaiman/k9/pause.jpg
-share/kde/apps/noatun/skins/kaiman/k9/play.jpg
-share/kde/apps/noatun/skins/kaiman/k9/pos_item.jpg
-share/kde/apps/noatun/skins/kaiman/k9/repeat.jpg
-share/kde/apps/noatun/skins/kaiman/k9/repeat.png
-share/kde/apps/noatun/skins/kaiman/k9/reverse.jpg
-share/kde/apps/noatun/skins/kaiman/k9/shuffle.jpg
-share/kde/apps/noatun/skins/kaiman/k9/shuffle.png
-share/kde/apps/noatun/skins/kaiman/k9/skindata
-share/kde/apps/noatun/skins/kaiman/k9/small-k.jpg
-share/kde/apps/noatun/skins/kaiman/k9/small-k.png
-share/kde/apps/noatun/skins/kaiman/k9/square.jpg
-share/kde/apps/noatun/skins/kaiman/k9/square.png
-share/kde/apps/noatun/skins/kaiman/k9/status.jpg
-share/kde/apps/noatun/skins/kaiman/k9/status.png
-share/kde/apps/noatun/skins/kaiman/k9/stop.jpg
-share/kde/apps/noatun/skins/kaiman/k9/trans-pos.png
-share/kde/apps/noatun/skins/kaiman/k9/trans-slide.png
-share/kde/apps/noatun/skins/kjofol/HexoBronx/HexoBronx.rc
-share/kde/apps/noatun/skins/kjofol/HexoBronx/README.txt
-share/kde/apps/noatun/skins/kjofol/HexoBronx/active.png
-share/kde/apps/noatun/skins/kjofol/HexoBronx/eckig_font.png
-share/kde/apps/noatun/skins/kjofol/HexoBronx/font.png
-share/kde/apps/noatun/skins/kjofol/HexoBronx/inactive.png
-share/kde/apps/noatun/skins/kjofol/HexoBronx/mask.png
-share/kde/apps/noatun/skins/kjofol/HexoBronx/pitch.png
-share/kde/apps/noatun/skins/kjofol/HexoBronx/splash.png
-share/kde/apps/noatun/skins/kjofol/HexoBronx/time_font.png
-share/kde/apps/noatun/skins/kjofol/HexoBronx/volume.png
-share/kde/apps/noatun/skins/kjofol/HexoBronx/volume_pitch_font.png
-share/kde/apps/noatun/skins/kjofol/kjofol/kjofol.dck
-share/kde/apps/noatun/skins/kjofol/kjofol/kjofol.pl
-share/kde/apps/noatun/skins/kjofol/kjofol/kjofol.rc
-share/kde/apps/noatun/skins/kjofol/kjofol/kjofol.wsh
-share/kde/apps/noatun/skins/kjofol/kjofol/sg.png
-share/kde/apps/noatun/skins/kjofol/kjofol/sg_num.png
-share/kde/apps/noatun/skins/kjofol/kjofol/sg_seek.bmp
-share/kde/apps/noatun/skins/kjofol/kjofol/sg_seek.png
-share/kde/apps/noatun/skins/kjofol/kjofol/sg_text.png
-share/kde/apps/noatun/skins/kjofol/kjofol/sgdock.png
-share/kde/apps/noatun/skins/kjofol/kjofol/sgdock2.png
-share/kde/apps/noatun/skins/kjofol/kjofol/sgdocksk.png
-share/kde/apps/noatun/skins/kjofol/kjofol/sgdockvp.png
-share/kde/apps/noatun/skins/kjofol/kjofol/sgeq.png
-share/kde/apps/noatun/skins/kjofol/kjofol/sgpitch.png
-share/kde/apps/noatun/skins/kjofol/kjofol/sgpitchp.png
-share/kde/apps/noatun/skins/kjofol/kjofol/sgplist.png
-share/kde/apps/noatun/skins/kjofol/kjofol/sgplist2.png
-share/kde/apps/noatun/skins/kjofol/kjofol/sgpres1.png
-share/kde/apps/noatun/skins/kjofol/kjofol/sgpres2.png
-share/kde/apps/noatun/skins/kjofol/kjofol/sgpres3.png
-share/kde/apps/noatun/skins/kjofol/kjofol/sgvol.png
-share/kde/apps/noatun/skins/kjofol/kjofol/sgvolnum.png
-share/kde/apps/noatun/skins/kjofol/kjofol/sgvolpos.png
-share/kde/apps/noatun/skins/kjofol/kjofol/sgwshad.png
-share/kde/apps/noatun/skins/kjofol/kjofol/sgwshad2.png
-share/kde/apps/noatun/skins/kjofol/kjofol/sgwshdsk.png
-share/kde/apps/noatun/skins/kjofol/kjofol/sgwshvol.png
-share/kde/apps/noatun/skins/kjofol/kjofol/sgwshvp.png
-share/kde/apps/noatun/skins/kjofol/phong/p_eq.png
-share/kde/apps/noatun/skins/kjofol/phong/p_main.png
-share/kde/apps/noatun/skins/kjofol/phong/p_mainback.png
-share/kde/apps/noatun/skins/kjofol/phong/p_numbers.png
-share/kde/apps/noatun/skins/kjofol/phong/p_playback.png
-share/kde/apps/noatun/skins/kjofol/phong/p_playlist.png
-share/kde/apps/noatun/skins/kjofol/phong/p_propos.png
-share/kde/apps/noatun/skins/kjofol/phong/p_text.png
-share/kde/apps/noatun/skins/kjofol/phong/p_volbar.png
-share/kde/apps/noatun/skins/kjofol/phong/p_volpos.png
-share/kde/apps/noatun/skins/kjofol/phong/phong.dck
-share/kde/apps/noatun/skins/kjofol/phong/phong.rc
-share/kde/apps/noatun/skins/kjofol/phong/phong.wsh
-share/kde/apps/noatun/skins/kjofol/phong/phong_readme.txt
-share/kde/apps/noatun/skins/kjofol/vibrocentric/i_base.png
-share/kde/apps/noatun/skins/kjofol/vibrocentric/i_base2.png
-share/kde/apps/noatun/skins/kjofol/vibrocentric/i_eq.png
-share/kde/apps/noatun/skins/kjofol/vibrocentric/i_font.png
-share/kde/apps/noatun/skins/kjofol/vibrocentric/i_pl.png
-share/kde/apps/noatun/skins/kjofol/vibrocentric/i_pl2.png
-share/kde/apps/noatun/skins/kjofol/vibrocentric/i_pro.png
-share/kde/apps/noatun/skins/kjofol/vibrocentric/i_text.png
-share/kde/apps/noatun/skins/kjofol/vibrocentric/i_vol.png
-share/kde/apps/noatun/skins/kjofol/vibrocentric/i_volpos.png
-share/kde/apps/noatun/skins/kjofol/vibrocentric/vibrocentric.dck
-share/kde/apps/noatun/skins/kjofol/vibrocentric/vibrocentric.rc
-share/kde/apps/noatun/skins/kjofol/vibrocentric/vibrocentric.wsh
-share/kde/apps/noatun/skins/kjofol/vibrocentric/vibrocentric_readme.txt
-share/kde/apps/noatun/skins/winamp/Winamp/BALANCE.BMP
-share/kde/apps/noatun/skins/winamp/Winamp/CBUTTONS.BMP
-share/kde/apps/noatun/skins/winamp/Winamp/FONT.BMP
-share/kde/apps/noatun/skins/winamp/Winamp/MAIN.BMP
-share/kde/apps/noatun/skins/winamp/Winamp/MONOSTER.BMP
-share/kde/apps/noatun/skins/winamp/Winamp/NUMS_EX.BMP
-share/kde/apps/noatun/skins/winamp/Winamp/PLAYPAUS.BMP
-share/kde/apps/noatun/skins/winamp/Winamp/POSBAR.BMP
-share/kde/apps/noatun/skins/winamp/Winamp/SHUFREP.BMP
-share/kde/apps/noatun/skins/winamp/Winamp/SPEC.BMP
-share/kde/apps/noatun/skins/winamp/Winamp/TEXT.BMP
-share/kde/apps/noatun/skins/winamp/Winamp/TITLEBAR.BMP
-share/kde/apps/noatun/skins/winamp/Winamp/VISCOLOR.TXT
-share/kde/apps/noatun/skins/winamp/Winamp/VOLUME.BMP
-share/kde/apps/noatun/splitplaylist.plugin
-share/kde/apps/noatun/splui.rc
-share/kde/apps/noatun/systray.plugin
-share/kde/apps/noatun/systrayui.rc
-share/kde/apps/noatun/voiceprint.plugin
-share/kde/apps/noatun/winskin.plugin
-share/kde/apps/noatun/yhconfig.kcfg
-share/kde/apps/profiles/kscd.profile.xml
-share/kde/apps/videothumbnail/sprocket-large.png
-share/kde/apps/videothumbnail/sprocket-medium.png
-share/kde/apps/videothumbnail/sprocket-small.png
-share/kde/autostart/restore_kmix_volumes.desktop
-share/kde/config.kcfg/audiocd_lame_encoder.kcfg
-share/kde/config.kcfg/audiocd_vorbis_encoder.kcfg
-share/kde/config.kcfg/kaudiocreator.kcfg
-share/kde/config.kcfg/kaudiocreator_encoders.kcfg
-share/kde/config.kcfg/kscd.kcfg
-share/kde/config.kcfg/libkcddb.kcfg
-share/kde/icons/crystalsvg/128x128/actions/artsaudiomanager.png
-share/kde/icons/crystalsvg/128x128/actions/artsenvironment.png
-share/kde/icons/crystalsvg/128x128/actions/artsfftscope.png
-share/kde/icons/crystalsvg/128x128/actions/artsmediatypes.png
-share/kde/icons/crystalsvg/128x128/actions/artsmidimanager.png
-share/kde/icons/crystalsvg/128x128/apps/artscontrol.png
-share/kde/icons/crystalsvg/128x128/apps/juk.png
-share/kde/icons/crystalsvg/128x128/apps/kaboodle.png
-share/kde/icons/crystalsvg/128x128/apps/kmix.png
-share/kde/icons/crystalsvg/128x128/apps/krec.png
-share/kde/icons/crystalsvg/128x128/apps/kscd.png
-share/kde/icons/crystalsvg/128x128/apps/noatun.png
-share/kde/icons/crystalsvg/16x16/actions/artsaudiomanager.png
-share/kde/icons/crystalsvg/16x16/actions/artsbuilderexecute.png
-share/kde/icons/crystalsvg/16x16/actions/artsenvironment.png
-share/kde/icons/crystalsvg/16x16/actions/artsfftscope.png
-share/kde/icons/crystalsvg/16x16/actions/artsmediatypes.png
-share/kde/icons/crystalsvg/16x16/actions/artsmidimanager.png
-share/kde/icons/crystalsvg/16x16/apps/artsbuilder.png
-share/kde/icons/crystalsvg/16x16/apps/artscontrol.png
-share/kde/icons/crystalsvg/16x16/apps/juk.png
-share/kde/icons/crystalsvg/16x16/apps/kaboodle.png
-share/kde/icons/crystalsvg/16x16/apps/kaudiocreator.png
-share/kde/icons/crystalsvg/16x16/apps/kmid.png
-share/kde/icons/crystalsvg/16x16/apps/kmix.png
-share/kde/icons/crystalsvg/16x16/apps/krec.png
-share/kde/icons/crystalsvg/16x16/apps/kscd.png
-share/kde/icons/crystalsvg/16x16/apps/noatun.png
-share/kde/icons/crystalsvg/22x22/actions/artsaudiomanager.png
-share/kde/icons/crystalsvg/22x22/actions/artsbuilderexecute.png
-share/kde/icons/crystalsvg/22x22/actions/artsenvironment.png
-share/kde/icons/crystalsvg/22x22/actions/artsfftscope.png
-share/kde/icons/crystalsvg/22x22/actions/artsmediatypes.png
-share/kde/icons/crystalsvg/22x22/actions/artsmidimanager.png
-share/kde/icons/crystalsvg/22x22/actions/juk_dock.png
-share/kde/icons/crystalsvg/22x22/apps/artscontrol.png
-share/kde/icons/crystalsvg/22x22/apps/kaboodle.png
-share/kde/icons/crystalsvg/22x22/apps/krec.png
-share/kde/icons/crystalsvg/22x22/apps/noatun.png
-share/kde/icons/crystalsvg/32x32/actions/artsaudiomanager.png
-share/kde/icons/crystalsvg/32x32/actions/artsenvironment.png
-share/kde/icons/crystalsvg/32x32/actions/artsfftscope.png
-share/kde/icons/crystalsvg/32x32/actions/artsmediatypes.png
-share/kde/icons/crystalsvg/32x32/actions/artsmidimanager.png
-share/kde/icons/crystalsvg/32x32/apps/artscontrol.png
-share/kde/icons/crystalsvg/32x32/apps/juk.png
-share/kde/icons/crystalsvg/32x32/apps/kaboodle.png
-share/kde/icons/crystalsvg/32x32/apps/kaudiocreator.png
-share/kde/icons/crystalsvg/32x32/apps/kmid.png
-share/kde/icons/crystalsvg/32x32/apps/kmix.png
-share/kde/icons/crystalsvg/32x32/apps/krec.png
-share/kde/icons/crystalsvg/32x32/apps/kscd.png
-share/kde/icons/crystalsvg/32x32/apps/noatun.png
-share/kde/icons/crystalsvg/48x48/actions/artsaudiomanager.png
-share/kde/icons/crystalsvg/48x48/actions/artsenvironment.png
-share/kde/icons/crystalsvg/48x48/actions/artsfftscope.png
-share/kde/icons/crystalsvg/48x48/actions/artsmediatypes.png
-share/kde/icons/crystalsvg/48x48/actions/artsmidimanager.png
-share/kde/icons/crystalsvg/48x48/apps/artscontrol.png
-share/kde/icons/crystalsvg/48x48/apps/juk.png
-share/kde/icons/crystalsvg/48x48/apps/kaboodle.png
-share/kde/icons/crystalsvg/48x48/apps/kmid.png
-share/kde/icons/crystalsvg/48x48/apps/kmix.png
-share/kde/icons/crystalsvg/48x48/apps/krec.png
-share/kde/icons/crystalsvg/48x48/apps/kscd.png
-share/kde/icons/crystalsvg/48x48/apps/noatun.png
-share/kde/icons/crystalsvg/64x64/actions/artsaudiomanager.png
-share/kde/icons/crystalsvg/64x64/actions/artsenvironment.png
-share/kde/icons/crystalsvg/64x64/actions/artsfftscope.png
-share/kde/icons/crystalsvg/64x64/actions/artsmediatypes.png
-share/kde/icons/crystalsvg/64x64/actions/artsmidimanager.png
-share/kde/icons/crystalsvg/64x64/apps/artscontrol.png
-share/kde/icons/crystalsvg/64x64/apps/juk.png
-share/kde/icons/crystalsvg/64x64/apps/kaboodle.png
-share/kde/icons/crystalsvg/64x64/apps/kmix.png
-share/kde/icons/crystalsvg/64x64/apps/krec.png
-share/kde/icons/crystalsvg/64x64/apps/kscd.png
-share/kde/icons/crystalsvg/64x64/apps/noatun.png
-share/kde/icons/crystalsvg/scalable/actions/artsaudiomanager.svg
-share/kde/icons/crystalsvg/scalable/actions/artsenvironment.svg
-share/kde/icons/crystalsvg/scalable/actions/artsfftscope.svg
-share/kde/icons/crystalsvg/scalable/actions/artsmediatypes.svg
-share/kde/icons/crystalsvg/scalable/actions/artsmidimanager.svg
-share/kde/icons/crystalsvg/scalable/apps/artsbuilder.svgz
-share/kde/icons/crystalsvg/scalable/apps/artscontrol.svg
-share/kde/icons/locolor/16x16/apps/kaudiocreator.png
-share/kde/icons/locolor/32x32/apps/kaudiocreator.png
-share/kde/mimelnk/application/x-artsbuilder.desktop
-share/kde/mimelnk/audio/x-karaoke.desktop
-share/kde/mimelnk/interface/x-winamp-skin.desktop
-share/kde/mimelnk/text/xmcd.desktop
-share/kde/services/audiocd.protocol
-share/kde/services/kaboodle_component.desktop
-share/kde/services/kaboodleengine.desktop
-share/kde/services/kcm_krec.desktop
-share/kde/services/kcm_krec_files.desktop
-share/kde/services/kfile_au.desktop
-share/kde/services/kfile_avi.desktop
-share/kde/services/kfile_flac.desktop
-share/kde/services/kfile_m3u.desktop
-share/kde/services/kfile_mp3.desktop
-share/kde/services/kfile_mpc.desktop
-share/kde/services/kfile_ogg.desktop
-share/kde/services/kfile_sid.desktop
-share/kde/services/kfile_wav.desktop
-share/kde/services/kmixctrl_restore.desktop
-share/kde/services/krec_exportmp3.desktop
-share/kde/services/krec_exportogg.desktop
-share/kde/services/krec_exportwave.desktop
-share/kde/services/videothumbnail.desktop
-share/kde/servicetypes/audiomidi.desktop
-share/kde/servicetypes/krec_exportitem.desktop
-@comment in kde: @dirrm share/kde/servicetypes
-@comment in kde: @dirrm share/kde/services
-@comment in kde: @dirrm share/kde/mimelnk/text
-@comment in kde: @dirrm share/kde/mimelnk/interface
-@comment in kde: @dirrm share/kde/mimelnk/audio
-@comment in kde: @dirrm share/kde/mimelnk/application
-@comment in kde: @dirrm share/kde/icons/locolor/32x32/apps
-@comment in kde: @dirrm share/kde/icons/locolor/16x16/apps
-@comment in kde: @dirrm share/kde/icons/crystalsvg/scalable/apps
-@comment in kde: @dirrm share/kde/icons/crystalsvg/scalable/actions
-@comment in kde: @dirrm share/kde/icons/crystalsvg/64x64/apps
-@comment in kde: @dirrm share/kde/icons/crystalsvg/64x64/actions
-@comment in kde: @dirrm share/kde/icons/crystalsvg/48x48/apps
-@comment in kde: @dirrm share/kde/icons/crystalsvg/48x48/actions
-@comment in kde: @dirrm share/kde/icons/crystalsvg/32x32/apps
-@comment in kde: @dirrm share/kde/icons/crystalsvg/32x32/actions
-@comment in kde: @dirrm share/kde/icons/crystalsvg/22x22/apps
-@comment in kde: @dirrm share/kde/icons/crystalsvg/22x22/actions
-@comment in kde: @dirrm share/kde/icons/crystalsvg/16x16/apps
-@comment in kde: @dirrm share/kde/icons/crystalsvg/16x16/actions
-@comment in kde: @dirrm share/kde/icons/crystalsvg/128x128/apps
-@comment in kde: @dirrm share/kde/icons/crystalsvg/128x128/actions
-@comment in kde: @dirrm share/kde/config.kcfg
-@comment in kde: @dirrm share/kde/autostart
-@dirrm share/kde/apps/videothumbnail
-@comment in kde: @dirrm share/kde/apps/profiles
-@dirrm share/kde/apps/noatun/skins/winamp/Winamp
-@dirrm share/kde/apps/noatun/skins/winamp
-@dirrm share/kde/apps/noatun/skins/kjofol/vibrocentric
-@dirrm share/kde/apps/noatun/skins/kjofol/phong
-@dirrm share/kde/apps/noatun/skins/kjofol/kjofol
-@dirrm share/kde/apps/noatun/skins/kjofol/HexoBronx
-@dirrm share/kde/apps/noatun/skins/kjofol
-@dirrm share/kde/apps/noatun/skins/kaiman/k9
-@dirrm share/kde/apps/noatun/skins/kaiman/circle
-@dirrm share/kde/apps/noatun/skins/kaiman/car-preset
-@dirrm share/kde/apps/noatun/skins/kaiman
-@dirrm share/kde/apps/noatun/skins
-@dirrm share/kde/apps/noatun/icons/crystalsvg/64x64/actions
-@dirrm share/kde/apps/noatun/icons/crystalsvg/64x64
-@dirrm share/kde/apps/noatun/icons/crystalsvg/48x48/actions
-@dirrm share/kde/apps/noatun/icons/crystalsvg/48x48
-@dirrm share/kde/apps/noatun/icons/crystalsvg/32x32/actions
-@dirrm share/kde/apps/noatun/icons/crystalsvg/32x32
-@dirrm share/kde/apps/noatun/icons/crystalsvg/22x22/actions
-@dirrm share/kde/apps/noatun/icons/crystalsvg/22x22
-@dirrm share/kde/apps/noatun/icons/crystalsvg/16x16/actions
-@dirrm share/kde/apps/noatun/icons/crystalsvg/16x16
-@dirrm share/kde/apps/noatun/icons/crystalsvg/128x128/actions
-@dirrm share/kde/apps/noatun/icons/crystalsvg/128x128
-@dirrm share/kde/apps/noatun/icons/crystalsvg
-@dirrm share/kde/apps/noatun/icons
-@dirrm share/kde/apps/noatun/eq.preset
-@dirrm share/kde/apps/noatun
-@dirrm share/kde/apps/kscd/icons/crystalsvg/22x22/actions
-@dirrm share/kde/apps/kscd/icons/crystalsvg/22x22
-@dirrm share/kde/apps/kscd/icons/crystalsvg
-@dirrm share/kde/apps/kscd/icons
-@dirrm share/kde/apps/kscd
-@dirrm share/kde/apps/krec/icons/crystalsvg/32x32/mimetypes
-@dirrm share/kde/apps/krec/icons/crystalsvg/32x32/actions
-@dirrm share/kde/apps/krec/icons/crystalsvg/32x32
-@dirrm share/kde/apps/krec/icons/crystalsvg/22x22/actions
-@dirrm share/kde/apps/krec/icons/crystalsvg/22x22
-@dirrm share/kde/apps/krec/icons/crystalsvg/16x16/actions
-@dirrm share/kde/apps/krec/icons/crystalsvg/16x16
-@dirrm share/kde/apps/krec/icons/crystalsvg
-@dirrm share/kde/apps/krec/icons
-@dirrm share/kde/apps/krec
-@comment in kde: @dirrm share/kde/apps/konqueror/servicemenus
-@dirrm share/kde/apps/kmix/pics
-@dirrm share/kde/apps/kmix
-@dirrm share/kde/apps/kmid/maps
-@dirrm share/kde/apps/kmid/icons/crystalsvg/32x32/actions
-@dirrm share/kde/apps/kmid/icons/crystalsvg/32x32
-@dirrm share/kde/apps/kmid/icons/crystalsvg/22x22/actions
-@dirrm share/kde/apps/kmid/icons/crystalsvg/22x22
-@dirrm share/kde/apps/kmid/icons/crystalsvg/16x16/actions
-@dirrm share/kde/apps/kmid/icons/crystalsvg/16x16
-@dirrm share/kde/apps/kmid/icons/crystalsvg
-@dirrm share/kde/apps/kmid/icons
-@dirrm share/kde/apps/kmid/fm
-@dirrm share/kde/apps/kmid
-@comment in kde: @dirrm share/kde/apps/kicker/applets
-@comment in kde: @dirrm share/kde/apps/kconf_update
-@dirrm share/kde/apps/kaudiocreator/pics
-@dirrm share/kde/apps/kaudiocreator
-@comment in kdebase: @dirrm share/kde/apps/kappfinder/apps/Multimedia
-@dirrm share/kde/apps/kaboodle/icons/crystalsvg/22x22/actions
-@dirrm share/kde/apps/kaboodle/icons/crystalsvg/22x22
-@dirrm share/kde/apps/kaboodle/icons/crystalsvg/16x16/actions
-@dirrm share/kde/apps/kaboodle/icons/crystalsvg/16x16
-@dirrm share/kde/apps/kaboodle/icons/crystalsvg
-@dirrm share/kde/apps/kaboodle/icons
-@dirrm share/kde/apps/kaboodle
-@dirrm share/kde/apps/juk/pics
-@dirrm share/kde/apps/juk
-@dirrm share/kde/apps/artscontrol
-@dirrm share/kde/apps/artsbuilder/pics
-@dirrm share/kde/apps/artsbuilder/examples/todo
-@dirrm share/kde/apps/artsbuilder/examples
-@dirrm share/kde/apps/artsbuilder
-@comment in kde: @dirrm share/kde/apps
-@dirrm share/examples/kdemultimedia3/applications-merged
-@dirrm share/examples/kdemultimedia3
-@dirrm share/doc/kde/HTML/en/noatun
-@dirrm share/doc/kde/HTML/en/kscd
-@dirrm share/doc/kde/HTML/en/krec
-@dirrm share/doc/kde/HTML/en/kmix
-@dirrm share/doc/kde/HTML/en/kmid
-@dirrm share/doc/kde/HTML/en/kio_audiocd
-@dirrm share/doc/kde/HTML/en/kcontrol/kmixcfg
-@comment in kde: @dirrm share/doc/kde/HTML/en/kcontrol
-@dirrm share/doc/kde/HTML/en/kaboodle
-@dirrm share/doc/kde/HTML/en/juk
-@dirrm share/doc/kde/HTML/en/artsbuilder/images
-@dirrm share/doc/kde/HTML/en/artsbuilder
-@comment in kde: @dirrm share/doc/kde/HTML/en
-@comment in xdg-dirs: @dirrm share/desktop-directories
-@comment in kde: @dirrm share/applications/kde
-@dirrm lib/mcop/Noatun
-@dirrm lib/mcop/Arts/Environment
-@comment in arts: @dirrm lib/mcop/Arts
-@comment in arts: @dirrm lib/mcop
-@comment in kde: @dirrm lib/kde3
-@dirrm include/noatun
-@dirrm include/mpeglib_artsplug
-@dirrm include/mpeglib/util/yaf/yafxplayer
-@dirrm include/mpeglib/util/yaf/yafcore
-@dirrm include/mpeglib/util/yaf
-@dirrm include/mpeglib/util/render
-@dirrm include/mpeglib/util/mmx
-@dirrm include/mpeglib/util/file
-@dirrm include/mpeglib/util/abstract
-@dirrm include/mpeglib/util
-@dirrm include/mpeglib/splay
-@dirrm include/mpeglib/output
-@dirrm include/mpeglib/oggvorbis
-@dirrm include/mpeglib/mpegutil
-@dirrm include/mpeglib/input
-@dirrm include/mpeglib/frame
-@dirrm include/mpeglib/decoder
-@dirrm include/mpeglib
-@dirrm include/libkcddb
-@comment in arts: @dirrm include/arts
-@dirrm include/akode
diff --git a/multimedia/kdemultimedia3/buildlink3.mk b/multimedia/kdemultimedia3/buildlink3.mk
deleted file mode 100644
index 630b571e219..00000000000
--- a/multimedia/kdemultimedia3/buildlink3.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.5 2005/06/03 22:58:54 markd Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-KDEMULTIMEDIA_BUILDLINK3_MK:=	${KDEMULTIMEDIA_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	kdemultimedia
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nkdemultimedia}
-BUILDLINK_PACKAGES+=	kdemultimedia
-
-.if !empty(KDEMULTIMEDIA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.kdemultimedia+=	kdemultimedia>=3.2.2
-BUILDLINK_RECOMMENDED.kdemultimedia+=	kdemultimedia>=3.4.0
-BUILDLINK_PKGSRCDIR.kdemultimedia?=	../../multimedia/kdemultimedia3
-.endif	# KDEMULTIMEDIA_BUILDLINK3_MK
-
-.include "../../audio/arts/buildlink3.mk"
-.include "../../audio/lame/buildlink3.mk"
-.include "../../audio/musicbrainz/buildlink3.mk"
-.include "../../audio/tunepimp/buildlink3.mk"
-.include "../../audio/taglib/buildlink3.mk"
-.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "pth"
-.include "../../devel/pthread-sem/buildlink3.mk"
-.endif
-.include "../../multimedia/xine-lib/buildlink3.mk"
-.include "../../x11/kdebase3/buildlink3.mk"
-.include "../../x11/kdelibs3/buildlink3.mk"
-
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/kdemultimedia3/distinfo b/multimedia/kdemultimedia3/distinfo
deleted file mode 100644
index 6d1f80bfe9a..00000000000
--- a/multimedia/kdemultimedia3/distinfo
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: distinfo,v 1.22 2005/10/13 12:52:11 markd Exp $
-
-SHA1 (kdemultimedia-3.4.3.tar.bz2) = 8916577123446be621527603b31febb9997609ba
-RMD160 (kdemultimedia-3.4.3.tar.bz2) = 318ebd3149019ec2e5d98b57a548d3ef350a7924
-Size (kdemultimedia-3.4.3.tar.bz2) = 5495757 bytes
-SHA1 (patch-aa) = ecea21cb53b01cc98a15408becd319c2930b67d0
-SHA1 (patch-ab) = 29d8a451cd7e641f67190fa3b4980678ebe7dd70
-SHA1 (patch-ac) = f13b1d7b0285a3189b9b039daef771d9294ad413
-SHA1 (patch-ad) = faf216d3b26c6dfed1b2fa919de69b14a92d0966
-SHA1 (patch-af) = 0336b3def99c649a635e6f5eb0cc962944e890b2
-SHA1 (patch-ag) = c9d1d9d3cf8f18ed9bc8c2054dc641af961d8fb1
-SHA1 (patch-ah) = e84b9dc302a5c8bb7259cd23343bfbc80c287cf2
-SHA1 (patch-ar) = 604469ee9cedaccb5e75567abf1088cddab9bcbc
-SHA1 (patch-cs) = 6b00976b20b3d6af611f75921e20f88086061ce5
-SHA1 (patch-ct) = b61875aa683a08e69f0a403a8111319469fa3c4e
-SHA1 (patch-cu) = 5a93444eee0f7aabbdc2879debc56eac28e1deed
diff --git a/multimedia/kdemultimedia3/patches/patch-aa b/multimedia/kdemultimedia3/patches/patch-aa
deleted file mode 100644
index 8f5ffad877b..00000000000
--- a/multimedia/kdemultimedia3/patches/patch-aa
+++ /dev/null
@@ -1,138 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2005/03/24 22:41:58 markd Exp $
-
---- configure.orig	2005-03-05 01:31:57.000000000 +1300
-+++ configure
-@@ -35079,7 +35079,7 @@ if test "${ac_cv_lib_FLAC_FLAC__seekable
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lFLAC  $LIBS"
-+LIBS="-lFLAC -lm $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -39778,7 +39780,7 @@ echo "${ECHO_T}incs=$para_incdir libs=$p
- echo "${ECHO_T}$with_cdparanoia" >&6
-     CDPARANOIA_ROOT="$with_cdparanoia"
-     if test "x$CDPARANOIA_ROOT" != "x/usr" ; then
--      CDPARANOIA_INCS="-I${CDPARANOIA_ROOT}/include"
-+      CDPARANOIA_INCS="-I${CDPARANOIA_ROOT}/include/cdparanoia"
-       CDPARANOIA_LIBS="-L${CDPARANOIA_ROOT}/lib "
-       if test "$USE_RPATH" = "yes" ; then
-         CDPARANOIA_RPATH="-R ${CDPARANOIA_ROOT}/lib"
-@@ -40333,7 +40335,7 @@ fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_ossaudio_main" >&5
- echo "${ECHO_T}$ac_cv_lib_ossaudio_main" >&6
- if test $ac_cv_lib_ossaudio_main = yes; then
--  LIBOSSAUDIO="-lossaudio"
-+  LIBOSSAUDIO="${LIBOSSAUDIO}"
- fi
- 
- 
-@@ -42057,8 +42059,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
--                x11_dga2=yes
--
-+ 	lib=Xxf86dga
-+ 	shared_lib_found=no
-+ 	for i in ${LDFLAGS}; do
-+ 		case "$i" in
-+ 		-L*)
-+ 			dir=`echo $i | sed "s,^-L,,"`
-+ 			if [ -e $dir/lib${lib}.so ] ||
-+ 			   [ "`echo $dir/lib${lib}.so.*`" != "$dir/lib${lib}.so.*" ]; then
-+ 				shared_lib_found=yes
-+ 				break;
-+ 			fi
-+ 		esac
-+ 	done
-+ 	if [ "$shared_lib_found" = "yes" ]; then
-+ 		x11_dga2=yes
-+ 	fi
-+   
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -42121,7 +42138,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
-+       lib=Xv
-+       shared_lib_found=no
-+      for i in ${LDFLAGS}; do
-+                case "$i" in
-+               -L*)
-+                       dir=`echo $i | sed "s,^-L,,"`
-+                       if [ -e $dir/lib${lib}.so ] ||
-+                          [ "`echo $dir/lib${lib}.so.*`" != "$dir/lib${lib}.so.*" ]; then
-+                               shared_lib_found=yes
-+                               break;
-+                       fi
-+               esac
-+        done
-+       if [ "$shared_lib_found" = "yes" ]; then
-                 x11_xv=yes
-+       fi
- 
- else
-   echo "$as_me: failed program was:" >&5
-@@ -42185,7 +42217,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
-+       lib=Xxf86vm
-+       shared_lib_found=no
-+       for i in ${LDFLAGS}; do
-+                case "$i" in
-+               -L*)
-+                       dir=`echo $i | sed "s,^-L,,"`
-+                       if [ -e $dir/lib${lib}.so ] ||
-+                          [ "`echo $dir/lib${lib}.so.*`" != "$dir/lib${lib}.so.*" ]; then
-+                               shared_lib_found=yes
-+                               break;
-+                       fi
-+               esac
-+       done
-+       if [ "$shared_lib_found" = "yes" ]; then
-                 x11_xvidmode=yes
-+       fi
- 
- else
-   echo "$as_me: failed program was:" >&5
-@@ -42231,8 +42278,8 @@ cat >>conftest.$ac_ext <<_ACEOF
- 		#include <sys/types.h>
- 		typedef int16_t size16;
- 		typedef int32_t size32;
--                #include <cdda_interface.h>
--                #include <cdda_paranoia.h>
-+                #include <cdparanoia/cdda_interface.h>
-+                #include <cdparanoia/cdda_paranoia.h>
- 
- int
- main ()
-@@ -42283,7 +42330,7 @@ if test "${ac_cv_lib_cdda_paranoia_paran
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lcdda_paranoia -lcdda_paranoia -lcdda_interface $LIBS"
-+LIBS="-lcdda_paranoia -lm -lcdda_interface $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -42817,10 +42864,10 @@ _ACEOF
-     ;;
- 
-   NetBSD)
--    echo "$as_me:$LINENO: result: NetBSD :Unknown hardware. You will have problems!!" >&5
--echo "${ECHO_T}NetBSD :Unknown hardware. You will have problems!!" >&6
--    OS_TYPE="BSD"
--
-+     echo "$as_me:$LINENO: result: using -lpthread" >&5
-+     echo $ECHO_N "using -lpthread... $ECHO_C" >&6
-+     OS_TYPE="BSD"
-+     LIBPTHREAD="-lpthread"
- cat >>confdefs.h <<\_ACEOF
- #define OS_BSD 1
- _ACEOF
diff --git a/multimedia/kdemultimedia3/patches/patch-ab b/multimedia/kdemultimedia3/patches/patch-ab
deleted file mode 100644
index 38c7e55dcef..00000000000
--- a/multimedia/kdemultimedia3/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2004/04/20 13:13:42 markd Exp $
-
---- mpeglib/lib/input/cddaInputStream.h.orig	2004-04-12 15:12:43.000000000 +0100
-+++ mpeglib/lib/input/cddaInputStream.h	2004-04-12 15:13:01.000000000 +0100
-@@ -33,8 +33,8 @@
- typedef int32_t size32;
- 
- extern "C" {
--#include <cdda_interface.h>
--#include <cdda_paranoia.h>
-+#include <cdparanoia/cdda_interface.h>
-+#include <cdparanoia/cdda_paranoia.h>
- void paranoiaCallback(long, int);
- }
- //#define CDDA_INCLUDE
diff --git a/multimedia/kdemultimedia3/patches/patch-ac b/multimedia/kdemultimedia3/patches/patch-ac
deleted file mode 100644
index a6ad257237e..00000000000
--- a/multimedia/kdemultimedia3/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2004/04/20 13:13:42 markd Exp $
-
---- mpeglib/lib/decoder/cddaPlugin.cpp.orig	2004-04-12 16:32:14.000000000 +0100
-+++ mpeglib/lib/decoder/cddaPlugin.cpp	2004-04-12 16:32:31.000000000 +0100
-@@ -25,8 +25,8 @@
- typedef int32_t size32;
- 
- extern "C" {
--#include <cdda_interface.h>
--#include <cdda_paranoia.h>
-+#include <cdparanoia/cdda_interface.h>
-+#include <cdparanoia/cdda_paranoia.h>
- }
- 
- 
diff --git a/multimedia/kdemultimedia3/patches/patch-ad b/multimedia/kdemultimedia3/patches/patch-ad
deleted file mode 100644
index c0052bee910..00000000000
--- a/multimedia/kdemultimedia3/patches/patch-ad
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2005/09/06 08:10:59 abs Exp $
-
---- kscd/libwm/plat_freebsd.c.orig	2003-05-05 22:19:39.000000000 +1000
-+++ kscd/libwm/plat_freebsd.c	2004-05-04 19:17:17.000000000 +1000
-@@ -380,6 +380,14 @@
-   return (ioctl(d->fd, CDIOCSTOP));
- } /* gen_stop() */
- 
-+/* XXX */
-+#ifdef __NetBSD__
-+# include <sys/param.h>
-+# if __NetBSD_Version__ >= 299000900	 /* 2.99.9 */
-+#  define HAVE_SYS_STATVFS_H 1
-+# endif
-+#endif
-+
- /*----------------------------------------*
-  * Eject the current CD, if there is one.
-  *----------------------------------------*/
-@@ -388,14 +396,22 @@
- {
-   /* On some systems, we can check to see if the CD is mounted. */
-   struct stat	stbuf;
-+#ifdef HAVE_SYS_STATVFS_H
-+  struct statvfs	buf;
-+#else
-   struct statfs	buf;
-+#endif
-   int rval;
-   
-   if (fstat(d->fd, &stbuf) != 0)
-     return (-2);
-   
-   /* Is this a mounted filesystem? */
-+#ifdef HAVE_SYS_STATVFS_H
-+  if (fstatvfs(stbuf.st_rdev, &buf) == 0)
-+#else
-   if (fstatfs(stbuf.st_rdev, &buf) == 0)
-+#endif
-     return (-3);
-   
-   rval = ioctl(d->fd, CDIOCALLOW);
diff --git a/multimedia/kdemultimedia3/patches/patch-af b/multimedia/kdemultimedia3/patches/patch-af
deleted file mode 100644
index c9aba6d1e43..00000000000
--- a/multimedia/kdemultimedia3/patches/patch-af
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-af,v 1.3 2004/12/23 12:56:04 markd Exp $
-
---- kioslave/audiocd/audiocd.upd.orig	2004-07-02 02:33:46.000000000 +1200
-+++ kioslave/audiocd/audiocd.upd
-@@ -1,4 +1,4 @@
- # Update for transport configuration
- Id=1
- File=kcmaudiocdrc
--Script=upgrade-metadata.sh,bash
-+Script=upgrade-metadata.sh,sh
diff --git a/multimedia/kdemultimedia3/patches/patch-ag b/multimedia/kdemultimedia3/patches/patch-ag
deleted file mode 100644
index 5e418bb88f7..00000000000
--- a/multimedia/kdemultimedia3/patches/patch-ag
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2004/12/23 12:56:04 markd Exp $
-
---- kaudiocreator/kaudiocreator-meta.upd.orig	2004-10-03 20:42:35.000000000 +1300
-+++ kaudiocreator/kaudiocreator-meta.upd
-@@ -1,3 +1,3 @@
- Id=3
- File=kaudiocreatorrc
--Script=upgrade-kaudiocreator-metadata.sh,bash
-+Script=upgrade-kaudiocreator-metadata.sh,sh
diff --git a/multimedia/kdemultimedia3/patches/patch-ah b/multimedia/kdemultimedia3/patches/patch-ah
deleted file mode 100644
index 7ce787450af..00000000000
--- a/multimedia/kdemultimedia3/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2005/03/06 13:02:59 markd Exp $
-
---- kappfinder-data/Makefile.in.orig	2004-11-30 04:21:02.000000000 +1300
-+++ kappfinder-data/Makefile.in
-@@ -424,7 +424,7 @@ x_includes = @x_includes@
- x_libraries = @x_libraries@
- xdg_appsdir = @xdg_appsdir@
- xdg_directorydir = @xdg_directorydir@
--xdg_menudir = @xdg_menudir@
-+xdg_menudir = $(prefix)/share/examples/kdemultimedia3
- xine_artsplugin_SUBDIR_included_FALSE = @xine_artsplugin_SUBDIR_included_FALSE@
- xine_artsplugin_SUBDIR_included_TRUE = @xine_artsplugin_SUBDIR_included_TRUE@
- kappfinder_multimedia_data_DATA = \
diff --git a/multimedia/kdemultimedia3/patches/patch-ar b/multimedia/kdemultimedia3/patches/patch-ar
deleted file mode 100644
index 6d09a2282e7..00000000000
--- a/multimedia/kdemultimedia3/patches/patch-ar
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ar,v 1.2 2004/04/20 13:13:42 markd Exp $
-
---- mpeglib/lib/util/audio/Makefile.in.orig	2004-04-06 02:48:26.000000000 +1200
-+++ mpeglib/lib/util/audio/Makefile.in
-@@ -55,6 +55,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/a
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- LTLIBRARIES = $(noinst_LTLIBRARIES)
-+libaudio_la_LDFLAGS = $(LIBOSSAUDIO)
- libaudio_la_LIBADD =
- am_libaudio_la_OBJECTS = audioIO.lo dspWrapper.lo
- #>- libaudio_la_OBJECTS = $(am_libaudio_la_OBJECTS)
diff --git a/multimedia/kdemultimedia3/patches/patch-cs b/multimedia/kdemultimedia3/patches/patch-cs
deleted file mode 100644
index 0d399620d3f..00000000000
--- a/multimedia/kdemultimedia3/patches/patch-cs
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-cs,v 1.1.1.1 2004/01/26 15:42:42 jmmv Exp $
-
---- mpeglib/lib/util/audio/audioIO_SDL.cpp.orig	2003-11-08 13:24:41.000000000 +0100
-+++ mpeglib/lib/util/audio/audioIO_SDL.cpp	2003-11-08 13:24:58.000000000 +0100
-@@ -11,7 +11,7 @@
-  */
- #include "../../input/bufferInputStream.h"
- #include <assert.h>
--#include <iostream.h>
-+#include <iostream>
- #if defined WIN32
- #include <SDL.h>
- #include <SDL_audio.h>
-@@ -20,6 +20,8 @@
- #include <SDL/SDL_audio.h>
- #endif
- 
-+using namespace std;
-+
- //static  SDL_AudioSpec actual;
- static  BufferInputStream* audioRing;
- static  TimeStamp* dummy;
diff --git a/multimedia/kdemultimedia3/patches/patch-ct b/multimedia/kdemultimedia3/patches/patch-ct
deleted file mode 100644
index cb0f0d58472..00000000000
--- a/multimedia/kdemultimedia3/patches/patch-ct
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ct,v 1.1.1.1 2004/01/26 15:42:43 jmmv Exp $
-
---- mpeglib/example/yaf/yafvorbis/vorbis_control.cpp.orig	2003-11-08 13:30:14.000000000 +0100
-+++ mpeglib/example/yaf/yafvorbis/vorbis_control.cpp	2003-11-08 13:29:46.000000000 +0100
-@@ -19,7 +19,7 @@
- 
- 
- 
--#include <iostream.h>
-+#include <iostream>
- #include <stdio.h>
- #include <stdlib.h>
- #include <math.h>
-@@ -33,6 +33,7 @@
- #include <getopt.h>
- #endif
- 
-+using namespace std;
- 
- 
- 
diff --git a/multimedia/kdemultimedia3/patches/patch-cu b/multimedia/kdemultimedia3/patches/patch-cu
deleted file mode 100644
index c31cf4bede6..00000000000
--- a/multimedia/kdemultimedia3/patches/patch-cu
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-cu,v 1.4 2004/10/14 11:10:00 markd Exp $
-
---- kioslave/audiocd/audiocd.cpp.orig	2004-08-05 19:25:33.000000000 +0000
-+++ kioslave/audiocd/audiocd.cpp	2004-10-10 19:38:46.000000000 +0000
-@@ -1092,7 +1092,7 @@
- 		 * 2) Only increase in size unless the decrease is %5 of last estimate.
- 		 * This prevents continues small changes which is just annoying.
- 		 */
--		unsigned long end = lastSector - firstSector;
-+		unsigned long end = lastSector - firstSector + 1;
- 		unsigned long cur = currentSector - firstSector;
- 		unsigned long estSize = (processed / cur ) * end;
- 
diff --git a/multimedia/kmplayer/DESCR b/multimedia/kmplayer/DESCR
deleted file mode 100644
index d901358f0fc..00000000000
--- a/multimedia/kmplayer/DESCR
+++ /dev/null
@@ -1,18 +0,0 @@
-KMPlayer is a KDE gui frontend to mplayer.  It runs as a standalone application
-as well as being a KPart, making it possible to embed in konqueror or in KHTML.
-As a standalone application it can:
-* Play movies from file/url.
-* Play DVD.
-* Play VCD.
-* Play from a pipe.
-* Play from a TV device.
-* Keep movie sizes ratio.
-* Control arts volume.
-* Resize/fullscreen support.
-* Optional show mplayer output before and after a movie plays.
-* Configurable pattern matching.
-* Position slider.
-* Recording using mencoder.
-* Proxy settings from konqueror are used to set http_proxy environment
-  variable.
-* DCOP KMediaPlayer interface support.
diff --git a/multimedia/kmplayer/Makefile b/multimedia/kmplayer/Makefile
deleted file mode 100644
index 85910650b1b..00000000000
--- a/multimedia/kmplayer/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# $NetBSD: Makefile,v 1.22 2005/10/31 17:35:28 xtraeme Exp $
-#
-
-DISTNAME=	kmplayer-0.9.1
-CATEGORIES=	multimedia kde
-MASTER_SITES=	http://kmplayer.kde.org/pkgs/
-EXTRACT_SUFX=	.tar.bz2
-
-MAINTAINER=	markd@NetBSD.org
-HOMEPAGE=	http://kmplayer.kde.org/
-COMMENT=	KDE frontend to mplayer
-
-BUILD_USES_MSGFMT=	yes
-DEPENDS=		mplayer>=1.0rc3:../../multimedia/mplayer
-DEPENDS+=		mencoder>=1.0rc3:../../multimedia/mencoder
-DEPENDS+=		xine-arts>=1rc0a:../../audio/xine-arts
-
-GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake perl pkg-config
-USE_LANGUAGES=		c c++
-USE_LIBTOOL=		yes
-
-CONFIGURE_ARGS+=	--without-gstreamer
-
-SHLIBTOOL_OVERRIDE=	libtool
-
-SUBST_CLASSES+=		desktop
-SUBST_MESSAGE.desktop=	"Fixing application launcher."
-SUBST_STAGE.desktop=	pre-configure
-SUBST_FILES.desktop=	src/kmplayer.desktop
-SUBST_SED.desktop=	-e 's|@PREFIX@|${PREFIX}|g'
-
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../meta-pkgs/kde3/kde3.mk"
-.include "../../multimedia/xine-lib/buildlink3.mk"
-.include "../../x11/kdelibs3/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/kmplayer/PLIST b/multimedia/kmplayer/PLIST
deleted file mode 100644
index e7304782b64..00000000000
--- a/multimedia/kmplayer/PLIST
+++ /dev/null
@@ -1,126 +0,0 @@
-@comment $NetBSD: PLIST,v 1.10 2005/10/31 17:35:28 xtraeme Exp $
-bin/kmplayer
-bin/kxineplayer
-bin/kxvplayer
-lib/kde3/kmplayer.la
-lib/kde3/libkmplayerpart.la
-lib/libkdeinit_kmplayer.la
-lib/libkmplayercommon.la
-share/applications/kde/kmplayer.desktop
-share/doc/kde/HTML/da/kmplayer/common
-share/doc/kde/HTML/da/kmplayer/index.cache.bz2
-share/doc/kde/HTML/da/kmplayer/index.docbook
-share/doc/kde/HTML/en/kmplayer/common
-share/doc/kde/HTML/en/kmplayer/index.cache.bz2
-share/doc/kde/HTML/en/kmplayer/index.docbook
-share/doc/kde/HTML/es/kmplayer/common
-share/doc/kde/HTML/es/kmplayer/index.cache.bz2
-share/doc/kde/HTML/es/kmplayer/index.docbook
-share/doc/kde/HTML/et/kmplayer/common
-share/doc/kde/HTML/et/kmplayer/index.cache.bz2
-share/doc/kde/HTML/et/kmplayer/index.docbook
-share/doc/kde/HTML/fr/kmplayer/common
-share/doc/kde/HTML/fr/kmplayer/index.cache.bz2
-share/doc/kde/HTML/fr/kmplayer/index.docbook
-share/doc/kde/HTML/it/kmplayer/common
-share/doc/kde/HTML/it/kmplayer/index.cache.bz2
-share/doc/kde/HTML/it/kmplayer/index.docbook
-share/doc/kde/HTML/pt/kmplayer/common
-share/doc/kde/HTML/pt/kmplayer/index.cache.bz2
-share/doc/kde/HTML/pt/kmplayer/index.docbook
-share/doc/kde/HTML/ru/kmplayer/common
-share/doc/kde/HTML/ru/kmplayer/index.cache.bz2
-share/doc/kde/HTML/ru/kmplayer/index.docbook
-share/doc/kde/HTML/sv/kmplayer/common
-share/doc/kde/HTML/sv/kmplayer/index.cache.bz2
-share/doc/kde/HTML/sv/kmplayer/index.docbook
-share/kde/apps/kmplayer/bookmarks.xml
-share/kde/apps/kmplayer/kmplayerpartui.rc
-share/kde/apps/kmplayer/kmplayerui.rc
-share/kde/apps/kmplayer/noise.gif
-share/kde/apps/kmplayer/pluginsinfo
-share/kde/config/kmplayerrc
-share/kde/icons/hicolor/128x128/apps/kmplayer.png
-share/kde/icons/hicolor/16x16/apps/kmplayer.png
-share/kde/icons/hicolor/22x22/apps/kmplayer.png
-share/kde/icons/hicolor/32x32/apps/kmplayer.png
-share/kde/icons/hicolor/48x48/apps/kmplayer.png
-share/kde/icons/hicolor/64x64/apps/kmplayer.png
-share/kde/icons/hicolor/scalable/apps/kmplayer.svgz
-share/kde/mimelnk/application/x-kmplayer.desktop
-share/kde/mimelnk/application/x-mplayer2.desktop
-share/kde/mimelnk/video/x-ms-wmp.desktop
-share/kde/services/kmplayer_part.desktop
-${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/kmplayer.mo
-${PKGLOCALEDIR}/locale/br/LC_MESSAGES/kmplayer.mo
-${PKGLOCALEDIR}/locale/bs/LC_MESSAGES/kmplayer.mo
-${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/kmplayer.mo
-${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/kmplayer.mo
-${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/kmplayer.mo
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/kmplayer.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/kmplayer.mo
-${PKGLOCALEDIR}/locale/el/LC_MESSAGES/kmplayer.mo
-${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/kmplayer.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/kmplayer.mo
-${PKGLOCALEDIR}/locale/et/LC_MESSAGES/kmplayer.mo
-${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/kmplayer.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/kmplayer.mo
-${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/kmplayer.mo
-${PKGLOCALEDIR}/locale/he/LC_MESSAGES/kmplayer.mo
-${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/kmplayer.mo
-${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/kmplayer.mo
-${PKGLOCALEDIR}/locale/is/LC_MESSAGES/kmplayer.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/kmplayer.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/kmplayer.mo
-${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/kmplayer.mo
-${PKGLOCALEDIR}/locale/mt/LC_MESSAGES/kmplayer.mo
-${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/kmplayer.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/kmplayer.mo
-${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/kmplayer.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/kmplayer.mo
-${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/kmplayer.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/kmplayer.mo
-${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/kmplayer.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/kmplayer.mo
-${PKGLOCALEDIR}/locale/rw/LC_MESSAGES/kmplayer.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/kmplayer.mo
-${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/kmplayer.mo
-${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/kmplayer.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/kmplayer.mo
-${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/kmplayer.mo
-${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/kmplayer.mo
-${PKGLOCALEDIR}/locale/xx/LC_MESSAGES/kmplayer.mo
-${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/kmplayer.mo
-@comment in kde: @dirrm share/kde/services
-@comment in kde: @dirrm share/kde/mimelnk/video
-@comment in kde: @dirrm share/kde/mimelnk/application
-@comment in kde: @dirrm share/kde/icons/hicolor/scalable/apps
-@comment in kde: @dirrm share/kde/icons/hicolor/64x64/apps
-@comment in kde: @dirrm share/kde/icons/hicolor/48x48/apps
-@comment in kde: @dirrm share/kde/icons/hicolor/32x32/apps
-@comment in kde: @dirrm share/kde/icons/hicolor/22x22/apps
-@comment in kde: @dirrm share/kde/icons/hicolor/16x16/apps
-@comment in kde: @dirrm share/kde/icons/hicolor/128x128/apps
-@comment in kde: @dirrm share/kde/config
-@dirrm share/kde/apps/kmplayer
-@comment in kde: @dirrm share/kde/apps
-@dirrm share/doc/kde/HTML/sv/kmplayer
-@comment in kde: @dirrm share/doc/kde/HTML/sv
-@dirrm share/doc/kde/HTML/ru/kmplayer
-@comment in kde: @dirrm share/doc/kde/HTML/ru
-@dirrm share/doc/kde/HTML/pt/kmplayer
-@comment in kde: @dirrm share/doc/kde/HTML/pt
-@dirrm share/doc/kde/HTML/it/kmplayer
-@comment in kde: @dirrm share/doc/kde/HTML/it
-@dirrm share/doc/kde/HTML/fr/kmplayer
-@comment in kde: @dirrm share/doc/kde/HTML/fr
-@dirrm share/doc/kde/HTML/et/kmplayer
-@comment in kde: @dirrm share/doc/kde/HTML/et
-@dirrm share/doc/kde/HTML/es/kmplayer
-@comment in kde: @dirrm share/doc/kde/HTML/es
-@dirrm share/doc/kde/HTML/en/kmplayer
-@comment in kde: @dirrm share/doc/kde/HTML/en
-@dirrm share/doc/kde/HTML/da/kmplayer
-@comment in kde: @dirrm share/doc/kde/HTML/da
-@comment in kde: @dirrm share/applications/kde
-@comment in kde: @dirrm lib/kde3
diff --git a/multimedia/kmplayer/distinfo b/multimedia/kmplayer/distinfo
deleted file mode 100644
index 512d8c4f0b5..00000000000
--- a/multimedia/kmplayer/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.10 2005/10/31 17:35:28 xtraeme Exp $
-
-SHA1 (kmplayer-0.9.1.tar.bz2) = 8b10e5a3054c8993eb3060dfe4837dda078790d0
-RMD160 (kmplayer-0.9.1.tar.bz2) = b54a92cf7146142cc838534e67d5defa578b9bda
-Size (kmplayer-0.9.1.tar.bz2) = 891324 bytes
-SHA1 (patch-ab) = 6d0635e5d9ea62de7363f761493d80d9d9734857
diff --git a/multimedia/kmplayer/patches/patch-ab b/multimedia/kmplayer/patches/patch-ab
deleted file mode 100644
index 7e06ffa3b69..00000000000
--- a/multimedia/kmplayer/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2005/04/07 12:07:44 markd Exp $
-
---- src/kmplayer.desktop.orig	2005-03-14 22:22:19.000000000 +1300
-+++ src/kmplayer.desktop
-@@ -2,7 +2,7 @@
- [Desktop Entry]
- Encoding=UTF-8
- Type=Application
--Exec=kmplayer -caption "%c" %i %m %U
-+Exec=@PREFIX@/bin/kmplayer -caption "%c" %i %m %U
- Icon=kmplayer.png
- DocPath=kmplayer/index.html
- Comment=KDE interface for MPlayer
diff --git a/multimedia/libassetml/DESCR b/multimedia/libassetml/DESCR
deleted file mode 100644
index 72be25ae547..00000000000
--- a/multimedia/libassetml/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-AssetML defines an XML file for multimedia metadata, such as name,
-description, categories, and file type.  Applications using the
-libassetml library can query these XML files to share and reuse
-content like image and audio files. This package also provides the
-assetml-query tool for browsing the AssetML database.
diff --git a/multimedia/libassetml/Makefile b/multimedia/libassetml/Makefile
deleted file mode 100644
index 746ee68b953..00000000000
--- a/multimedia/libassetml/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2005/08/10 20:56:20 jlam Exp $
-#
-
-DISTNAME=		libassetml-1.2.1
-CATEGORIES=		multimedia devel
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=ofset/}
-
-MAINTAINER=		reed@reedmedia.net
-HOMEPAGE=		http://www.ofset.org/assetml/
-COMMENT=		Library for sharing image and audio files between projects
-
-BUILD_DEPENDS+=	texi2html-[0-9]*:../../textproc/texi2html
-
-USE_DIRS+=		gnome2-1.5	# share/gnome/help
-USE_TOOLS+=		gmake pkg-config
-USE_PKGLOCALEDIR=	yes
-USE_LIBTOOL=		yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-PKGCONFIG_OVERRIDE+=	${WRKSRC}/src/libassetml.pc.in
-GNU_CONFIGURE=		yes
-INFO_FILES=		libassetml.info
-
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/popt/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/libassetml/PLIST b/multimedia/libassetml/PLIST
deleted file mode 100644
index d6de21f3a3f..00000000000
--- a/multimedia/libassetml/PLIST
+++ /dev/null
@@ -1,15 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/02/16 18:38:41 reed Exp $
-bin/assetml-query
-include/libassetml-1.0/libassetml/assetml.h
-lib/libassetml.la
-lib/pkgconfig/libassetml.pc
-share/gnome/help/libassetml/C/libassetml.html
-share/gnome/help/libassetml/C/topic.dat
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/libassetml.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/libassetml.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/libassetml.mo
-@dirrm share/gnome/help/libassetml/C
-@dirrm share/gnome/help/libassetml
-@comment in gnome2-dirs: @dirrm share/gnome/help
-@dirrm include/libassetml-1.0/libassetml
-@dirrm include/libassetml-1.0
diff --git a/multimedia/libassetml/buildlink3.mk b/multimedia/libassetml/buildlink3.mk
deleted file mode 100644
index f31d3704e10..00000000000
--- a/multimedia/libassetml/buildlink3.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/02/16 18:38:41 reed Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBASSETML_BUILDLINK3_MK:=	${LIBASSETML_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libassetml
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibassetml}
-BUILDLINK_PACKAGES+=	libassetml
-
-.if !empty(LIBASSETML_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libassetml+=	libassetml>=1.2.1
-BUILDLINK_PKGSRCDIR.libassetml?=	../../multimedia/libassetml
-.endif	# LIBASSETML_BUILDLINK3_MK
-
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/libassetml/distinfo b/multimedia/libassetml/distinfo
deleted file mode 100644
index a43bbfba3bd..00000000000
--- a/multimedia/libassetml/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 11:24:03 agc Exp $
-
-SHA1 (libassetml-1.2.1.tar.gz) = 9c5543a99cabe09cda983281ed0e9cb6ace72810
-RMD160 (libassetml-1.2.1.tar.gz) = 5f5f8c84c9830a7488ded0bd2830a84bad637304
-Size (libassetml-1.2.1.tar.gz) = 318920 bytes
diff --git a/multimedia/libdv-tools/DESCR b/multimedia/libdv-tools/DESCR
deleted file mode 100644
index 6ded05ac3a1..00000000000
--- a/multimedia/libdv-tools/DESCR
+++ /dev/null
@@ -1,11 +0,0 @@
-The Quasar DV codec (libdv) is a software codec for DV video, the encoding
-format used by most digital camcorders, typically those that support
-the IEEE 1394 (a.k.a. FireWire or i.Link) interface. libdv was developed
-according to the official standards for DV video: IEC 61834 and SMPTE
-314M.
-
-This package provides playdv for displaying DV-encoded video data,
-dubdv for inserting audio into a digital video stream, encodedv for
-encoding a series of images to a digital video stream, and dvconnect
-for capturing and sending raw DV streams using the Linux IEEE 1394
-video1394 device.
diff --git a/multimedia/libdv-tools/Makefile b/multimedia/libdv-tools/Makefile
deleted file mode 100644
index 252ca5e01e3..00000000000
--- a/multimedia/libdv-tools/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2005/06/03 15:40:31 jmmv Exp $
-
-.include "../../multimedia/libdv/Makefile.common"
-
-PKGNAME=		${DISTNAME:S/-/-tools-/}
-
-COMMENT+=		(standalone tools)
-
-CONFIGURE_ARGS:=	${CONFIGURE_ARGS:S/--disable-gtk/--enable-gtk/g}
-
-BUILD_DIRS=		${WRKSRC}/encodedv ${WRKSRC}/playdv
-INSTALL_DIRS=		${WRKSRC}/encodedv ${WRKSRC}/playdv
-
-BUILDLINK_DEPENDS.libdv+=	libdv>=0.104nb1
-
-.include "../../devel/glib/buildlink3.mk"
-.include "../../multimedia/libdv/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/libdv-tools/PLIST b/multimedia/libdv-tools/PLIST
deleted file mode 100644
index 7ff812dd16b..00000000000
--- a/multimedia/libdv-tools/PLIST
+++ /dev/null
@@ -1,9 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2005/06/03 15:40:31 jmmv Exp $
-bin/dubdv
-bin/dvconnect
-bin/encodedv
-bin/playdv
-man/man1/dubdv.1
-man/man1/dvconnect.1
-man/man1/encodedv.1
-man/man1/playdv.1
diff --git a/multimedia/libdv/DESCR b/multimedia/libdv/DESCR
deleted file mode 100644
index 56e4e689b55..00000000000
--- a/multimedia/libdv/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-The Quasar DV codec (libdv) is a software codec for DV video, the encoding
-format used by most digital camcorders, typically those that support
-the IEEE 1394 (a.k.a. FireWire or i.Link) interface. libdv was developed
-according to the official standards for DV video: IEC 61834 and SMPTE
-314M.
diff --git a/multimedia/libdv/Makefile b/multimedia/libdv/Makefile
deleted file mode 100644
index e0ce692a2dc..00000000000
--- a/multimedia/libdv/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2005/06/03 15:40:30 jmmv Exp $
-
-.include "Makefile.common"
-
-PKGREVISION=	1
-
-MAKE_FLAGS+=	SUBDIRS=libdv
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/libdv/Makefile.common b/multimedia/libdv/Makefile.common
deleted file mode 100644
index 7bae949de61..00000000000
--- a/multimedia/libdv/Makefile.common
+++ /dev/null
@@ -1,38 +0,0 @@
-# $NetBSD: Makefile.common,v 1.3 2005/08/10 20:56:20 jlam Exp $
-
-DISTNAME=	libdv-0.104
-CATEGORIES=	multimedia
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libdv/}
-
-MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
-HOMEPAGE=	http://libdv.sourceforge.net/
-COMMENT=	DV video codec library
-
-DISTINFO_FILE=		${.CURDIR}/../../multimedia/libdv/distinfo
-PATCHDIR=		${.CURDIR}/../../multimedia/libdv/patches
-
-USE_TOOLS+=		pkg-config
-GNU_CONFIGURE=		yes
-USE_LANGUAGES=		c c++
-USE_LIBTOOL=		yes
-PKGCONFIG_OVERRIDE=	${WRKSRC}/libdv.pc.in
-PTHREAD_AUTO_VARS=	yes
-
-CONFIGURE_ARGS+=	--disable-gtk
-
-.include "../../mk/bsd.prefs.mk"
-.if empty(MACHINE_PLATFORM:M*-*-i386)
-CONFIGURE_ARGS+=	--disable-asm
-.endif
-
-.if !exists(${X11BASE}/include/X11/extensions/Xvlib.h)
-CONFIGURE_ARGS+=	--disable-xv
-.endif
-
-LIBS+=		${LIBOSSAUDIO}
-
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/popt/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
diff --git a/multimedia/libdv/PLIST b/multimedia/libdv/PLIST
deleted file mode 100644
index 578ddc0e469..00000000000
--- a/multimedia/libdv/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2005/06/03 15:40:31 jmmv Exp $
-include/libdv/dv.h
-include/libdv/dv_types.h
-lib/libdv.la
-lib/pkgconfig/libdv.pc
-@dirrm include/libdv
diff --git a/multimedia/libdv/buildlink3.mk b/multimedia/libdv/buildlink3.mk
deleted file mode 100644
index c0eff97697c..00000000000
--- a/multimedia/libdv/buildlink3.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.3 2005/06/03 15:40:31 jmmv Exp $
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBDV_BUILDLINK3_MK:=	${LIBDV_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libdv
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibdv}
-BUILDLINK_PACKAGES+=	libdv
-
-.if !empty(LIBDV_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libdv+=	libdv>=0.102
-BUILDLINK_RECOMMENDED.libdv+=	libdv>=0.102nb1
-BUILDLINK_PKGSRCDIR.libdv?=	../../multimedia/libdv
-.endif	# LIBDV_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/libdv/distinfo b/multimedia/libdv/distinfo
deleted file mode 100644
index 3d5f57eaf2d..00000000000
--- a/multimedia/libdv/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.7 2005/06/05 09:53:07 jmmv Exp $
-
-SHA1 (libdv-0.104.tar.gz) = 521a079193f4ae8f9995091b0590c87fde130650
-RMD160 (libdv-0.104.tar.gz) = a91708ecb75533caf2b9038ca68064c7707dcfdf
-Size (libdv-0.104.tar.gz) = 554691 bytes
-SHA1 (patch-aa) = 6910450f2c93ac4989e8c132368d208ddd65cf0d
-SHA1 (patch-ab) = f204ba8b80f48a5965397beb2239b44b45ca8920
-SHA1 (patch-ac) = a8d1fd55c9bf3ee59f34613e285314def3add60b
-SHA1 (patch-ad) = 7b65a66a54c49e5bb7e902ba0cfc67f882b344f0
diff --git a/multimedia/libdv/patches/patch-aa b/multimedia/libdv/patches/patch-aa
deleted file mode 100644
index dc3a7e5ef44..00000000000
--- a/multimedia/libdv/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2004/11/28 14:34:28 wiz Exp $
-
---- libdv/Makefile.in.orig	2004-07-14 17:41:22.000000000 +0200
-+++ libdv/Makefile.in
-@@ -55,7 +55,7 @@ CONFIG_CLEAN_FILES =
- am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgincludedir)"
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
--libdv_la_LIBADD =
-+libdv_la_LIBADD = $(PTHREAD_LIBS)
- am__libdv_la_SOURCES_DIST = dv.c dct.c idct_248.c weighting.c quant.c \
- 	vlc.c place.c parse.c bitstream.c YUY2.c YV12.c rgb.c audio.c \
- 	util.c encode.c headers.c enc_input.c enc_audio_input.c \
diff --git a/multimedia/libdv/patches/patch-ab b/multimedia/libdv/patches/patch-ab
deleted file mode 100644
index d49568f602f..00000000000
--- a/multimedia/libdv/patches/patch-ab
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2005/06/03 15:40:31 jmmv Exp $
-
---- encodedv/Makefile.in.orig	2004-11-30 03:23:42.000000000 +0000
-+++ encodedv/Makefile.in
-@@ -57,19 +57,19 @@ PROGRAMS = $(bin_PROGRAMS) $(noinst_PROG
- am_dubdv_OBJECTS = insert_audio.$(OBJEXT)
- dubdv_OBJECTS = $(am_dubdv_OBJECTS)
- am__DEPENDENCIES_1 =
--dubdv_DEPENDENCIES = ../libdv/libdv.la $(am__DEPENDENCIES_1)
-+dubdv_DEPENDENCIES = $(am__DEPENDENCIES_1)
- am_dvavi_OBJECTS = dvavi.$(OBJEXT)
- dvavi_OBJECTS = $(am_dvavi_OBJECTS)
--dvavi_DEPENDENCIES = ../libdv/libdv.la
-+dvavi_DEPENDENCIES = 
- am_dvconnect_OBJECTS = dvconnect.$(OBJEXT)
- dvconnect_OBJECTS = $(am_dvconnect_OBJECTS)
- dvconnect_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- am_encodedv_OBJECTS = encodedv.$(OBJEXT)
- encodedv_OBJECTS = $(am_encodedv_OBJECTS)
--encodedv_DEPENDENCIES = ../libdv/libdv.la $(am__DEPENDENCIES_1)
-+encodedv_DEPENDENCIES = $(am__DEPENDENCIES_1)
- am_fix_headers_OBJECTS = fix_headers.$(OBJEXT)
- fix_headers_OBJECTS = $(am_fix_headers_OBJECTS)
--fix_headers_DEPENDENCIES = ../libdv/libdv.la
-+fix_headers_DEPENDENCIES = 
- am_ppmqscale_OBJECTS = ppmqscale.$(OBJEXT)
- ppmqscale_OBJECTS = $(am_ppmqscale_OBJECTS)
- ppmqscale_LDADD = $(LDADD)
-@@ -232,18 +232,18 @@ EXTRA_DIST = $(man_MANS)
- MAINTAINERCLEANFILES = Makefile.in $(AUX_DIST)
- CLEANFILES = 
- encodedv_SOURCES = encodedv.c 
--encodedv_LDADD = ../libdv/libdv.la $(POPT_LIB)
-+encodedv_LDADD = `pkg-config --libs libdv` $(POPT_LIB)
- dubdv_SOURCES = insert_audio.c 
--dubdv_LDADD = ../libdv/libdv.la $(POPT_LIB)
-+dubdv_LDADD = `pkg-config --libs libdv` $(POPT_LIB)
- fix_headers_SOURCES = fix_headers.c 
--fix_headers_LDADD = ../libdv/libdv.la
-+fix_headers_LDADD = `pkg-config --libs libdv`
- scan_packet_headers_SOURCES = scan_packet_headers.c
- steal_header_SOURCES = steal_header.c
- ppmqscale_SOURCES = ppmqscale.c
- dvconnect_SOURCES = dvconnect.c
- dvconnect_LDADD = $(PTHREAD_LIBS) $(POPT_LIB)
- dvavi_SOURCES = dvavi.c
--dvavi_LDADD = ../libdv/libdv.la
-+dvavi_LDADD = `pkg-config --libs libdv`
- all: all-am
- 
- .SUFFIXES:
diff --git a/multimedia/libdv/patches/patch-ac b/multimedia/libdv/patches/patch-ac
deleted file mode 100644
index f83f6a11aab..00000000000
--- a/multimedia/libdv/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/06/03 15:40:31 jmmv Exp $
-
---- playdv/Makefile.in.orig	2004-11-30 03:23:43.000000000 +0000
-+++ playdv/Makefile.in
-@@ -58,7 +58,7 @@ am_playdv_OBJECTS = playdv.$(OBJEXT) dis
- playdv_OBJECTS = $(am_playdv_OBJECTS)
- am__DEPENDENCIES_1 =
- playdv_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
--	$(am__DEPENDENCIES_1) ../libdv/libdv.la $(am__DEPENDENCIES_1)
-+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-@@ -209,7 +209,7 @@ CLEANFILES = 
- AM_CFLAGS = $(SDL_CFLAGS) $(GTK_CFLAGS)
- noinst_HEADERS = display.h oss.h
- playdv_SOURCES = playdv.c display.c display.h oss.c
--playdv_LDADD = $(SDL_LIBS) $(GTK_LIBS) $(XV_LIB) ../libdv/libdv.la $(POPT_LIB)
-+playdv_LDADD = $(SDL_LIBS) $(GTK_LIBS) $(XV_LIB) `pkg-config --libs libdv` $(POPT_LIB)
- all: all-am
- 
- .SUFFIXES:
diff --git a/multimedia/libdv/patches/patch-ad b/multimedia/libdv/patches/patch-ad
deleted file mode 100644
index 89adb32bcaf..00000000000
--- a/multimedia/libdv/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2005/06/05 09:53:07 jmmv Exp $
-
---- encodedv/dvconnect.c.orig	2005-05-20 19:07:43.000000000 +0200
-+++ encodedv/dvconnect.c	2005-05-20 19:08:10.000000000 +0200
-@@ -29,6 +29,9 @@
- 
- #define _FILE_OFFSET_BITS 64
- 
-+#if defined(__DragonFly__)
-+#include <sys/types.h>
-+#endif
- #include <stdio.h>
- #include <sys/ioctl.h>
- #include <sys/mman.h>
diff --git a/multimedia/libdvbpsi/DESCR b/multimedia/libdvbpsi/DESCR
deleted file mode 100644
index 8597bdb5ba0..00000000000
--- a/multimedia/libdvbpsi/DESCR
+++ /dev/null
@@ -1,17 +0,0 @@
-libdvbpsi is a simple library designed for decoding and generation of MPEG TS
-and DVB PSI tables.
-
-Current features
-
-    Program Association Table (PAT), decoder and generator.
-    Program Map Table (PMT), decoder and generator.
-    All MPEG 2 descriptors, decoders and generators.
-
-The libdvbpsi is part of the VideoLAN project, a full MPEG2
-client/server solution. The libdvbpsi can also be used with extra
-programs that need DVB and PSI decoders and generators.
-
-The VideoLAN team decided to write the libdvbpsi to make the VideoLAN
-Client and the VideoLAN Server capable of demultiplexing a satellite
-DVB stream. The library aims at making it easy to decode PSI tables
-(such as PAT, PMT etc.) present in a TS/DVB stream.
diff --git a/multimedia/libdvbpsi/Makefile b/multimedia/libdvbpsi/Makefile
deleted file mode 100644
index 7444dc6e4d5..00000000000
--- a/multimedia/libdvbpsi/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:20 jlam Exp $
-
-DISTNAME=	libdvbpsi-0.1.3
-PKGREVISION=	1
-CATEGORIES=	multimedia
-MASTER_SITES=	http://www.videolan.org/pub/libdvbpsi/0.1.3/
-
-MAINTAINER=	wulf@NetBSD.org
-HOMEPAGE=	http://www.videolan.org/
-COMMENT=	PSI decoder and generator library for MPEG2 and DVB streams
-
-GNU_CONFIGURE=	yes
-USE_TOOLS+=	gmake
-USE_LIBTOOL=	yes
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/libdvbpsi/PLIST b/multimedia/libdvbpsi/PLIST
deleted file mode 100644
index f653afe130a..00000000000
--- a/multimedia/libdvbpsi/PLIST
+++ /dev/null
@@ -1,28 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:45 jlam Exp $
-lib/libdvbpsi.la
-include/dvbpsi/dvbpsi.h
-include/dvbpsi/psi.h
-include/dvbpsi/descriptor.h
-include/dvbpsi/pat.h
-include/dvbpsi/pmt.h
-include/dvbpsi/demux.h
-include/dvbpsi/dr_02.h
-include/dvbpsi/dr_03.h
-include/dvbpsi/dr_04.h
-include/dvbpsi/dr_05.h
-include/dvbpsi/dr_06.h
-include/dvbpsi/dr_07.h
-include/dvbpsi/dr_08.h
-include/dvbpsi/dr_09.h
-include/dvbpsi/dr_0a.h
-include/dvbpsi/dr_0b.h
-include/dvbpsi/dr_0c.h
-include/dvbpsi/dr_0d.h
-include/dvbpsi/dr_0e.h
-include/dvbpsi/dr_0f.h
-include/dvbpsi/dr_42.h
-include/dvbpsi/dr_47.h
-include/dvbpsi/dr_48.h
-include/dvbpsi/dr.h
-include/dvbpsi/sdt.h
-@dirrm include/dvbpsi
diff --git a/multimedia/libdvbpsi/buildlink3.mk b/multimedia/libdvbpsi/buildlink3.mk
deleted file mode 100644
index e9af87414d6..00000000000
--- a/multimedia/libdvbpsi/buildlink3.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:02 tv Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBDVBPSI_BUILDLINK3_MK:=	${LIBDVBPSI_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libdvbpsi
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibdvbpsi}
-BUILDLINK_PACKAGES+=	libdvbpsi
-
-.if !empty(LIBDVBPSI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libdvbpsi+=	libdvbpsi>=0.1.3
-BUILDLINK_RECOMMENDED.libdvbpsi+=	libdvbpsi>=0.1.3nb1
-BUILDLINK_PKGSRCDIR.libdvbpsi?=	../../multimedia/libdvbpsi
-.endif	# LIBDVBPSI_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/libdvbpsi/distinfo b/multimedia/libdvbpsi/distinfo
deleted file mode 100644
index 5c0e4567f5a..00000000000
--- a/multimedia/libdvbpsi/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 11:24:03 agc Exp $
-
-SHA1 (libdvbpsi-0.1.3.tar.gz) = 4f38637362dd93ed3362513b480a9fa4e7955600
-RMD160 (libdvbpsi-0.1.3.tar.gz) = 1702a2954e4678586b9796cd71dbe9c6e7aba2bb
-Size (libdvbpsi-0.1.3.tar.gz) = 256610 bytes
diff --git a/multimedia/libdvdcss/DESCR b/multimedia/libdvdcss/DESCR
deleted file mode 100644
index f6ef5d35a64..00000000000
--- a/multimedia/libdvdcss/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-libdvdcss is a simple library designed for accessing DVDs like a block device
-without having to bother about the decryption.
-
-This library is used by libdvdread via dlopen().
diff --git a/multimedia/libdvdcss/Makefile b/multimedia/libdvdcss/Makefile
deleted file mode 100644
index 4f215d941ec..00000000000
--- a/multimedia/libdvdcss/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.14 2005/10/11 16:47:44 dillo Exp $
-#
-# In order to ensure compliance with U.S. and international law, please
-# do not modify this file to provide pointers to the source or homepage
-# for this software or submit any PRs telling us the contents of the
-# HOMEPAGE or MASTER_SITES definitions in this Makefile.
-
-DISTNAME=	libdvdcss-1.2.9
-CATEGORIES=	multimedia
-MASTER_SITES=	${LIBDVDCSS_MASTER_SITES}/${DISTNAME:S/libdvdcss-//}/
-EXTRACT_SUFX=	.tar.bz2
-
-MAINTAINER=	recht@NetBSD.org
-HOMEPAGE=	${LIBDVDCSS_HOMEPAGE}
-COMMENT=	Simple library designed for accessing DVDs
-
-RESTRICTED=	Legal problems due to CSS code
-
-# no source because of the CSS source code in it
-NO_SRC_ON_FTP=		${RESTRICTED}
-NO_BIN_ON_FTP=		${RESTRICTED}
-NO_SRC_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_CDROM=	${RESTRICTED}
-
-# Do *not* add INTERACTIVE_STATE=fetch.  The fetch state is not
-# interactive if LIBDVDCSS_MASTER_SITES is defined.
-
-USE_LIBTOOL=	YES
-GNU_CONFIGURE=	YES
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/libdvdcss/PLIST b/multimedia/libdvdcss/PLIST
deleted file mode 100644
index c9f2c5d6fdb..00000000000
--- a/multimedia/libdvdcss/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:45 jlam Exp $
-include/dvdcss/dvdcss.h
-lib/libdvdcss.la
-@dirrm include/dvdcss
diff --git a/multimedia/libdvdcss/buildlink3.mk b/multimedia/libdvdcss/buildlink3.mk
deleted file mode 100644
index 8bda56fca5b..00000000000
--- a/multimedia/libdvdcss/buildlink3.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:02 tv Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBDVDCSS_BUILDLINK3_MK:=	${LIBDVDCSS_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libdvdcss
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibdvdcss}
-BUILDLINK_PACKAGES+=	libdvdcss
-
-.if !empty(LIBDVDCSS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libdvdcss+=	libdvdcss>=1.2.4
-BUILDLINK_RECOMMENDED.libdvdcss+=	libdvdcss>=1.2.8nb1
-BUILDLINK_PKGSRCDIR.libdvdcss?=	../../multimedia/libdvdcss
-.endif	# LIBDVDCSS_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/libdvdcss/distinfo b/multimedia/libdvdcss/distinfo
deleted file mode 100644
index c0851766bdf..00000000000
--- a/multimedia/libdvdcss/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/07/14 03:56:37 wiz Exp $
-
-SHA1 (libdvdcss-1.2.9.tar.bz2) = 6c834633f58521d8ad09775f625cc723e30f2549
-RMD160 (libdvdcss-1.2.9.tar.bz2) = 5939a195f977544c25ea07e4d1f4b3ac4065212a
-Size (libdvdcss-1.2.9.tar.bz2) = 283329 bytes
diff --git a/multimedia/libdvdnav/DESCR b/multimedia/libdvdnav/DESCR
deleted file mode 100644
index ec0113bb76e..00000000000
--- a/multimedia/libdvdnav/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-libdvdnav is a library that allows easy use of sophisticated DVD navigation
-features such as DVD menus, multiangle playback and even interactive DVD
-games.  All this functionality is provided through a simple API which
-provides the DVD playback as a single logical stream of blocks, intermitted
-by special dvdnav events to report certain conditions.  The main usage of
-libdvdnav is a loop regularly calling a function to get the next block,
-surrounded by additional calls to tell the library of user interaction.
-The whole DVD virtual machine and internal playback states are completely
-encapsulated.
diff --git a/multimedia/libdvdnav/Makefile b/multimedia/libdvdnav/Makefile
deleted file mode 100644
index fe072b189da..00000000000
--- a/multimedia/libdvdnav/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2005/05/04 16:24:52 drochner Exp $
-#
-
-DISTNAME=	libdvdnav-0.1.10
-CATEGORIES=	multimedia
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dvd/}
-
-MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://dvd.sourceforge.net/
-COMMENT=	Library to navigate DVDs
-
-GNU_CONFIGURE=		YES
-USE_LIBTOOL=		YES
-
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/libdvdnav/PLIST b/multimedia/libdvdnav/PLIST
deleted file mode 100644
index 9cf7945448e..00000000000
--- a/multimedia/libdvdnav/PLIST
+++ /dev/null
@@ -1,15 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2005/05/04 16:24:52 drochner Exp $
-bin/dvdnav-config
-include/dvdnav/dvd_reader.h
-include/dvdnav/dvd_types.h
-include/dvdnav/dvdnav.h
-include/dvdnav/dvdnav_events.h
-include/dvdnav/ifo_print.h
-include/dvdnav/ifo_read.h
-include/dvdnav/ifo_types.h
-include/dvdnav/nav_print.h
-include/dvdnav/nav_read.h
-include/dvdnav/nav_types.h
-lib/libdvdnav.la
-share/aclocal/dvdnav.m4
-@dirrm include/dvdnav
diff --git a/multimedia/libdvdnav/buildlink3.mk b/multimedia/libdvdnav/buildlink3.mk
deleted file mode 100644
index 988663fca3b..00000000000
--- a/multimedia/libdvdnav/buildlink3.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:02 tv Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBDVDNAV_BUILDLINK3_MK:=	${LIBDVDNAV_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libdvdnav
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibdvdnav}
-BUILDLINK_PACKAGES+=	libdvdnav
-
-.if !empty(LIBDVDNAV_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libdvdnav+=	libdvdnav>=0.1.9
-BUILDLINK_RECOMMENDED.libdvdnav+=	libdvdnav>=0.1.9nb1
-BUILDLINK_PKGSRCDIR.libdvdnav?=	../../multimedia/libdvdnav
-.endif	# LIBDVDNAV_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/libdvdnav/distinfo b/multimedia/libdvdnav/distinfo
deleted file mode 100644
index b8f6a33936c..00000000000
--- a/multimedia/libdvdnav/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/05/04 16:24:52 drochner Exp $
-
-SHA1 (libdvdnav-0.1.10.tar.gz) = 22289cb8f297664ce36551b818c0083e936632a7
-RMD160 (libdvdnav-0.1.10.tar.gz) = 75e7878ab6fd99294b5a1c8fca1391bdbf113616
-Size (libdvdnav-0.1.10.tar.gz) = 539803 bytes
diff --git a/multimedia/libdvdplay/DESCR b/multimedia/libdvdplay/DESCR
deleted file mode 100644
index 027f0018c0c..00000000000
--- a/multimedia/libdvdplay/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-libdvdplay is an attempt to make a library from ogle dvd navigation code so
-that a simple API provides access to both DVD Video data and DVD information to
-a reader application.
-
-libdvdplay is a layer over libdvdread. As a consequence it provides read, seek
-for DVD media. But it also provides the client application with a set of access
-functions needed to create an interface for the DVD reader (audio, subtitles,
-titles ...).
diff --git a/multimedia/libdvdplay/Makefile b/multimedia/libdvdplay/Makefile
deleted file mode 100644
index 323b6752a8e..00000000000
--- a/multimedia/libdvdplay/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:20 jlam Exp $
-
-DISTNAME=	libdvdplay-1.0.1
-PKGREVISION=	2
-CATEGORIES=	multimedia
-MASTER_SITES=	http://www.videolan.org/pub/libdvdplay/1.0.1/
-
-MAINTAINER=	wulf@NetBSD.org
-HOMEPAGE=	http://developers.videolan.org/libdvdplay/
-COMMENT=	Simple API library designed for DVD navigation
-
-GNU_CONFIGURE=	yes
-USE_TOOLS+=	gmake
-USE_LIBTOOL=	yes
-
-.include "../../multimedia/libdvdread/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/libdvdplay/PLIST b/multimedia/libdvdplay/PLIST
deleted file mode 100644
index 0f734bb9afb..00000000000
--- a/multimedia/libdvdplay/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:45 jlam Exp $
-include/dvdplay/dvdplay.h
-include/dvdplay/info.h
-include/dvdplay/nav.h
-include/dvdplay/state.h
-lib/libdvdplay.la
-@dirrm include/dvdplay
diff --git a/multimedia/libdvdplay/buildlink3.mk b/multimedia/libdvdplay/buildlink3.mk
deleted file mode 100644
index bf7886dbe71..00000000000
--- a/multimedia/libdvdplay/buildlink3.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:02 tv Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBDVDPLAY_BUILDLINK3_MK:=	${LIBDVDPLAY_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libdvdplay
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibdvdplay}
-BUILDLINK_PACKAGES+=	libdvdplay
-
-.if !empty(LIBDVDPLAY_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libdvdplay+=		libdvdplay>=1.0.1
-BUILDLINK_RECOMMENDED.libdvdplay+=	libdvdplay>=1.0.1nb2
-BUILDLINK_PKGSRCDIR.libdvdplay?=	../../multimedia/libdvdplay
-.endif	# LIBDVDPLAY_BUILDLINK3_MK
-
-.include "../../multimedia/libdvdread/buildlink3.mk"
-
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/libdvdplay/distinfo b/multimedia/libdvdplay/distinfo
deleted file mode 100644
index f71c479e3c8..00000000000
--- a/multimedia/libdvdplay/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 11:24:03 agc Exp $
-
-SHA1 (libdvdplay-1.0.1.tar.gz) = a4bf7a8173fbecc9de34c51e302771929252fc98
-RMD160 (libdvdplay-1.0.1.tar.gz) = 3871a2f845d2d0df077ed2f1f7daf80c5b9a7a1a
-Size (libdvdplay-1.0.1.tar.gz) = 227746 bytes
diff --git a/multimedia/libdvdread/DESCR b/multimedia/libdvdread/DESCR
deleted file mode 100644
index 3476ba18a0b..00000000000
--- a/multimedia/libdvdread/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-libdvdread is a library that provides an interface to make life
-for programs that access DVDs a little easier.
diff --git a/multimedia/libdvdread/MESSAGE b/multimedia/libdvdread/MESSAGE
deleted file mode 100644
index 0e33bfae4d8..00000000000
--- a/multimedia/libdvdread/MESSAGE
+++ /dev/null
@@ -1,8 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2004/01/28 14:29:01 recht Exp $
-
-Because of the unclear legal status of libdvdcss, it is not automatically
-installed as part of ${PKGBASE}. It is however needed to play encrypted
-DVDs. If you want to play encrypted DVDs, simply install it yourself.
-
-===========================================================================
diff --git a/multimedia/libdvdread/Makefile b/multimedia/libdvdread/Makefile
deleted file mode 100644
index 2b21567b094..00000000000
--- a/multimedia/libdvdread/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2005/05/25 17:07:53 drochner Exp $
-
-DISTNAME=	libdvdread-0.9.4
-PKGREVISION=	2
-CATEGORIES=	multimedia
-MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/
-
-MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://www.dtek.chalmers.se/groups/dvd/
-COMMENT=	DVD access library, primarily used in Ogle
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
-GNU_CONFIGURE=	yes
-USE_TOOLS+=	gmake
-USE_LIBTOOL=	yes
-
-MESSAGE_SUBST+=	PKGBASE=${PKGBASE}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/libdvdread/PLIST b/multimedia/libdvdread/PLIST
deleted file mode 100644
index 3d304cfe43a..00000000000
--- a/multimedia/libdvdread/PLIST
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:45 jlam Exp $
-include/dvdread/dvd_reader.h
-include/dvdread/ifo_print.h
-include/dvdread/ifo_read.h
-include/dvdread/ifo_types.h
-include/dvdread/nav_print.h
-include/dvdread/nav_read.h
-include/dvdread/nav_types.h
-lib/libdvdread.la
-@dirrm include/dvdread
diff --git a/multimedia/libdvdread/buildlink3.mk b/multimedia/libdvdread/buildlink3.mk
deleted file mode 100644
index 516cb69d1f4..00000000000
--- a/multimedia/libdvdread/buildlink3.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:13:02 tv Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBDVDREAD_BUILDLINK3_MK:=	${LIBDVDREAD_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libdvdread
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibdvdread}
-BUILDLINK_PACKAGES+=	libdvdread
-
-.if !empty(LIBDVDREAD_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libdvdread+=		libdvdread>=0.9.4
-BUILDLINK_RECOMMENDED.libdvdread+=	libdvdread>=0.9.4nb1
-BUILDLINK_PKGSRCDIR.libdvdread?=	../../multimedia/libdvdread
-.endif	# LIBDVDREAD_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/libdvdread/distinfo b/multimedia/libdvdread/distinfo
deleted file mode 100644
index 6e5a3c874eb..00000000000
--- a/multimedia/libdvdread/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.7 2005/05/25 17:11:52 drochner Exp $
-
-SHA1 (libdvdread-0.9.4.tar.gz) = a4b626e49ba8bd33857693c3abe8b34196bc3360
-RMD160 (libdvdread-0.9.4.tar.gz) = 9f7f82e14fb5d458686e5cb2e5f364bad19dd08e
-Size (libdvdread-0.9.4.tar.gz) = 256858 bytes
-SHA1 (patch-aa) = 2b5a308a24e2ba17109f8c4978d0a972864d2a72
-SHA1 (patch-ab) = 52416442f5988b28c109d623d2ac4ee61a802db2
-SHA1 (patch-ac) = 971dc8802bf8f815821e8ad5f279a5148fcf26f7
-SHA1 (patch-ad) = f6d44ffc3434e79499a807daa8daa7f22eba54ab
-SHA1 (patch-ae) = 99d296d4c1c49f1ff4747109dfc8b3d07647ffc4
diff --git a/multimedia/libdvdread/patches/patch-aa b/multimedia/libdvdread/patches/patch-aa
deleted file mode 100644
index 8bd878a28fc..00000000000
--- a/multimedia/libdvdread/patches/patch-aa
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/05/25 17:11:52 drochner Exp $
-
---- dvdread/bswap.h.orig	2002-12-15 01:09:12.000000000 +0100
-+++ dvdread/bswap.h
-@@ -53,19 +53,33 @@
- #define B2N_32(x) x = swap32(x)
- #define B2N_64(x) x = swap64(x)
- 
--#elif defined(__FreeBSD__) && __FreeBSD_version >= 470000
-+#elif defined(__DragonFly__)
- #include <sys/endian.h>
- #define B2N_16(x) x = be16toh(x)
- #define B2N_32(x) x = be32toh(x)
- #define B2N_64(x) x = be64toh(x)
- 
-+#elif defined(__FreeBSD__) && __FreeBSD_version >= 470000
-+#include <sys/endian.h>
-+#define B2N_16(x) x = be16toh(x)
-+#define B2N_32(x) x = be32toh(x)
-+#define B2N_64(x) x = \
-+     ((((x) & 0xff00000000000000) >> 56) | \
-+      (((x) & 0x00ff000000000000) >> 40) | \
-+      (((x) & 0x0000ff0000000000) >> 24) | \
-+      (((x) & 0x000000ff00000000) >>  8) | \
-+      (((x) & 0x00000000ff000000) <<  8) | \
-+      (((x) & 0x0000000000ff0000) << 24) | \
-+      (((x) & 0x000000000000ff00) << 40) | \
-+      (((x) & 0x00000000000000ff) << 56))
-+
- /* This is a slow but portable implementation, it has multiple evaluation 
-  * problems so beware.
-  * Old FreeBSD's and Solaris don't have <byteswap.h> or any other such 
-  * functionality! 
-  */
- 
--#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__)
-+#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined(__INTERIX)
- #define B2N_16(x) \
-  x = ((((x) & 0xff00) >> 8) | \
-       (((x) & 0x00ff) << 8))
diff --git a/multimedia/libdvdread/patches/patch-ab b/multimedia/libdvdread/patches/patch-ab
deleted file mode 100644
index 25305c071f0..00000000000
--- a/multimedia/libdvdread/patches/patch-ab
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2005/05/25 17:11:52 drochner Exp $
-
---- dvdread/dvd_reader.c.orig	2003-02-13 23:31:21.000000000 +0100
-+++ dvdread/dvd_reader.c
-@@ -32,7 +32,7 @@
- #include <limits.h>
- #include <dirent.h>
-  
--#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__bsdi__)|| defined(__DARWIN__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__bsdi__)|| defined(__DARWIN__) || defined(__DragonFly__)
- #define SYS_BSD 1
- #endif
- 
-@@ -282,7 +282,7 @@ static char *bsd_block2char( const char 
-     char *new_path;
- 
-     /* If it doesn't start with "/dev/" or does start with "/dev/r" exit */ 
--    if( !strncmp( path, "/dev/",  5 ) || strncmp( path, "/dev/r", 6 ) ) 
-+    if( strncmp( path, "/dev/",  5 ) || !strncmp( path, "/dev/r", 6 ) ) 
-       return (char *) strdup( path );
- 
-     /* Replace "/dev/" with "/dev/r" */
-@@ -915,7 +915,7 @@ ssize_t DVDReadBlocks( dvd_file_t *dvd_f
-     return (ssize_t)ret;
- }
- 
--int32_t DVDFileSeek( dvd_file_t *dvd_file, int32_t offset )
-+int32_t DVDFileSeek( dvd_file_t *dvd_file, int offset )
- {
-     /* Check arguments. */
-     if( dvd_file == NULL || offset < 0 )
-@@ -1033,7 +1033,7 @@ int DVDISOVolumeInfo( dvd_reader_t *dvd,
- 
-   /* Check arguments. */
-   if( dvd == NULL )
--    return 0;
-+    return -1;
-   
-   if( dvd->dev == NULL ) {
-     /* No block access, so no ISO... */
diff --git a/multimedia/libdvdread/patches/patch-ac b/multimedia/libdvdread/patches/patch-ac
deleted file mode 100644
index ebad152a7d3..00000000000
--- a/multimedia/libdvdread/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2004/06/21 16:14:14 drochner Exp $
-
---- dvdread/ifo_types.h.orig	2004-05-19 21:26:26.000000000 +0200
-+++ dvdread/ifo_types.h
-@@ -407,8 +407,8 @@ typedef struct {
-   uint16_t next_pgc_nr;
-   uint16_t prev_pgc_nr;
-   uint16_t goup_pgc_nr;
--  uint8_t  still_time;
-   uint8_t  pg_playback_mode;
-+  uint8_t  still_time;
-   uint32_t palette[16]; /* New type struct {zero_1, Y, Cr, Cb} ? */
-   uint16_t command_tbl_offset;
-   uint16_t program_map_offset;
diff --git a/multimedia/libdvdread/patches/patch-ad b/multimedia/libdvdread/patches/patch-ad
deleted file mode 100644
index 8df79b44a7a..00000000000
--- a/multimedia/libdvdread/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2005/05/25 17:07:53 drochner Exp $
-
---- dvdread/dvd_input.c.orig	2005-05-24 18:41:21.000000000 +0200
-+++ dvdread/dvd_input.c
-@@ -74,7 +74,7 @@ static dvd_input_t css_open(const char *
-   dvd_input_t dev;
-     
-   /* Allocate the handle structure */
--  dev = (dvd_input_t) malloc(sizeof(dvd_input_t));
-+  dev = (dvd_input_t) malloc(sizeof(struct dvd_input_s));
-   if(dev == NULL) {
-     fprintf(stderr, "libdvdread: Could not allocate memory.\n");
-     return NULL;
-@@ -154,7 +154,7 @@ static dvd_input_t file_open(const char 
-   dvd_input_t dev;
-   
-   /* Allocate the library structure */
--  dev = (dvd_input_t) malloc(sizeof(dvd_input_t));
-+  dev = (dvd_input_t) malloc(sizeof(struct dvd_input_s));
-   if(dev == NULL) {
-     fprintf(stderr, "libdvdread: Could not allocate memory.\n");
-     return NULL;
diff --git a/multimedia/libdvdread/patches/patch-ae b/multimedia/libdvdread/patches/patch-ae
deleted file mode 100644
index 877fd234335..00000000000
--- a/multimedia/libdvdread/patches/patch-ae
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2005/05/25 17:07:53 drochner Exp $
-
---- dvdread/ifo_read.c.orig	2003-01-17 21:49:16.000000000 +0100
-+++ dvdread/ifo_read.c
-@@ -257,6 +257,7 @@ void ifoClose(ifo_handle_t *ifofile) {
-   ifoFree_FP_PGC(ifofile);
-   ifoFree_PGCIT(ifofile);
-   ifoFree_VTS_PTT_SRPT(ifofile);
-+  ifoFree_VTS_TMAPT(ifofile);
- 
-   if(ifofile->vmgi_mat)
-     free(ifofile->vmgi_mat);
-@@ -1624,8 +1625,8 @@ static int ifoRead_PGCIT_internal(ifo_ha
-   }
-   ptr = data;
-   for(i = 0; i < pgcit->nr_of_pgci_srp; i++) {
--    memcpy(&pgcit->pgci_srp[i], ptr, PGCI_LU_SIZE);
--    ptr += PGCI_LU_SIZE;
-+    memcpy(&pgcit->pgci_srp[i], ptr, PGCI_SRP_SIZE);
-+    ptr += PGCI_SRP_SIZE;
-     B2N_16(pgcit->pgci_srp[i].ptl_id_mask);
-     B2N_32(pgcit->pgci_srp[i].pgc_start_byte);
-     CHECK_VALUE(pgcit->pgci_srp[i].unknown1 == 0);
-@@ -1663,8 +1664,10 @@ static int ifoRead_PGCIT_internal(ifo_ha
- static void ifoFree_PGCIT_internal(pgcit_t *pgcit) {
-   if(pgcit) {
-     int i;
--    for(i = 0; i < pgcit->nr_of_pgci_srp; i++)
-+    for(i = 0; i < pgcit->nr_of_pgci_srp; i++) {
-       ifoFree_PGC(pgcit->pgci_srp[i].pgc);
-+      free(pgcit->pgci_srp[i].pgc);
-+    }
-     free(pgcit->pgci_srp);
-   }
- }
diff --git a/multimedia/libflash/DESCR b/multimedia/libflash/DESCR
deleted file mode 100644
index 0ff7e0b140e..00000000000
--- a/multimedia/libflash/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-Libflash is a GPL Flash(tm) library built around a core graphic renderer
-that is capable of playing Flash(tm) movies.
diff --git a/multimedia/libflash/Makefile b/multimedia/libflash/Makefile
deleted file mode 100644
index 8ba41cffc7d..00000000000
--- a/multimedia/libflash/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:42 tv Exp $
-#
-
-.include "Makefile.common"
-
-PKGNAME=	lib${DISTNAME}
-PKGREVISION=	5
-COMMENT=	Open source Flash(tm) library
-
-USE_LIBTOOL=	yes
-BUILD_DIRS=	${WRKSRC}/Lib
-MAKE_ENV+=	LIBOSSAUDIO="${LIBOSSAUDIO}"
-MAKE_ENV+=	LIBSTDCPP=-lstdc++
-
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/libflash/Makefile.common b/multimedia/libflash/Makefile.common
deleted file mode 100644
index 30fa9ea65eb..00000000000
--- a/multimedia/libflash/Makefile.common
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile.common,v 1.6 2005/06/01 18:03:06 jlam Exp $
-#
-
-DISTNAME=	flash-0.4.10
-CATEGORIES=	multimedia
-MASTER_SITES=	http://www.swift-tools.com/Flash/
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://gplflash.sourceforge.net/
-
-USE_LANGUAGES=	c c++
-
-DISTINFO_FILE=	${.CURDIR}/../libflash/distinfo
-PATCHDIR=	${.CURDIR}/../libflash/patches
-
-.include "../../mk/x11.buildlink3.mk"
-
-post-extract: remove-subpackages
-
-remove-subpackages:
-	${RM} -rf ${WRKSRC}/Jpeg ${WRKSRC}/Zlib
-
-.include "../../mk/ossaudio.buildlink3.mk"
diff --git a/multimedia/libflash/PLIST b/multimedia/libflash/PLIST
deleted file mode 100644
index 90d91d25ee8..00000000000
--- a/multimedia/libflash/PLIST
+++ /dev/null
@@ -1,23 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:45 jlam Exp $
-include/flash/adpcm.h
-include/flash/bitmap.h
-include/flash/button.h
-include/flash/character.h
-include/flash/cxform.h
-include/flash/displaylist.h
-include/flash/flash.h
-include/flash/font.h
-include/flash/graphic.h
-include/flash/matrix.h
-include/flash/movie.h
-include/flash/program.h
-include/flash/rect.h
-include/flash/script.h
-include/flash/shape.h
-include/flash/sound.h
-include/flash/sprite.h
-include/flash/sqrt.h
-include/flash/swf.h
-include/flash/text.h
-lib/libflash.la
-@dirrm include/flash
diff --git a/multimedia/libflash/buildlink3.mk b/multimedia/libflash/buildlink3.mk
deleted file mode 100644
index d5c5525a5f9..00000000000
--- a/multimedia/libflash/buildlink3.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:02 tv Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBFLASH_BUILDLINK3_MK:=	${LIBFLASH_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libflash
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibflash}
-BUILDLINK_PACKAGES+=	libflash
-
-.if !empty(LIBFLASH_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libflash+=	libflash>=0.4.10nb4
-BUILDLINK_RECOMMENDED.libflash+=	libflash>=0.4.10nb5
-BUILDLINK_PKGSRCDIR.libflash?=	../../multimedia/libflash
-.endif	# LIBFLASH_BUILDLINK3_MK
-
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
-
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/libflash/distinfo b/multimedia/libflash/distinfo
deleted file mode 100644
index 55cba9c9be5..00000000000
--- a/multimedia/libflash/distinfo
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 11:24:03 agc Exp $
-
-SHA1 (flash-0.4.10.tgz) = 41f2b8bba3e551e611913069e6e650bc4c8ab420
-RMD160 (flash-0.4.10.tgz) = 17c04bb9fd29ab9b91fbc2954e508aead1ab7fb1
-Size (flash-0.4.10.tgz) = 358995 bytes
-SHA1 (patch-ab) = 29afb4393acc2c44e622d398dba05749fb5c581d
-SHA1 (patch-ac) = ce803268d7c85e0317c61dbd63c56028eaba82a8
-SHA1 (patch-ad) = a67db33d60bc5ce23241e5f445aabb9bdb1864c2
-SHA1 (patch-af) = f0c7f279ac3295b5bef7de8d5405b04de33260c0
-SHA1 (patch-ag) = cc6277a63c4bfa54a35b74a1a66dea5923ae8637
-SHA1 (patch-ah) = d4406e8e672762b8ec474acf4923ded2301ad5a9
-SHA1 (patch-ai) = a4f927b4698e7de7b46f2496b57c83a30a57fecb
-SHA1 (patch-aj) = d37351360b7e703747b4742e0378f89c528bdef7
diff --git a/multimedia/libflash/patches/patch-ab b/multimedia/libflash/patches/patch-ab
deleted file mode 100644
index 8e0db487d48..00000000000
--- a/multimedia/libflash/patches/patch-ab
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/01/26 13:34:45 jmmv Exp $
-
---- Lib/Makefile.orig	Sun Jun  4 02:49:23 2000
-+++ Lib/Makefile
-@@ -1,6 +1,5 @@
--CPPFLAGS=-I../Jpeg -I../Zlib
- # Comment out the following line if you use egcs :
--CXXFLAGS=-O3 -Wall -fno-rtti -fno-exceptions
-+CXXFLAGS+=-Wall -fno-rtti -fno-exceptions
- 
- INCLUDES= adpcm.h        cxform.h       graphic.h      script.h       sqrt.h\
- 	bitmap.h       displaylist.h  matrix.h       shape.h        swf.h\
-@@ -34,7 +33,20 @@
- #	bitstream.o
- #	dump.o
- 
--all: libflash.a
-+.cc.o:
-+	${LIBTOOL} --mode=compile ${CXX} -c ${CPPFLAGS} ${CXXFLAGS} $<
-+
-+all: libflash.la
-+
-+install: libflash.la
-+	${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} libflash.la ${PREFIX}/lib
-+	${BSD_INSTALL_DATA_DIR} ${PREFIX}/include/flash
-+	for file in ${INCLUDES}; do \
-+		${BSD_INSTALL_DATA} $$file ${PREFIX}/include/flash; \
-+	done
-+
-+libflash.la: $(SWFOBJS)
-+	${LIBTOOL} --mode=link ${CC} ${LDFLAGS} -o $@ ${SWFOBJS:.o=.lo} -rpath ${PREFIX}/lib -ljpeg -lz ${LIBSTDCPP} ${LIBOSSAUDIO} -version-info 0:4
- 
- libflash.a: $(SWFOBJS) 
- 	ar rcs $@ $(SWFOBJS)
diff --git a/multimedia/libflash/patches/patch-ac b/multimedia/libflash/patches/patch-ac
deleted file mode 100644
index 0e43c54ae00..00000000000
--- a/multimedia/libflash/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/01/26 13:34:45 jmmv Exp $
-
---- Lib/flash.cc.orig	Thu Jul 11 15:07:01 2002
-+++ Lib/flash.cc
-@@ -100,6 +100,7 @@ long FlashGraphicInit(FlashHandle flashH
- 			break;
- 		default:
- 			fprintf(stderr, "Unsupported depth\n");
-+			return 0;
- 	}
- 
- 	fh->gd->setMovieDimension(fh->main->frameRect.xmax - fh->main->frameRect.xmin,
diff --git a/multimedia/libflash/patches/patch-ad b/multimedia/libflash/patches/patch-ad
deleted file mode 100644
index c822beda7d0..00000000000
--- a/multimedia/libflash/patches/patch-ad
+++ /dev/null
@@ -1,65 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2004/01/26 13:34:45 jmmv Exp $
-
---- Lib/sound.cc.orig	Wed Sep  1 08:10:03 1999
-+++ Lib/sound.cc
-@@ -26,7 +26,11 @@
- #include <fcntl.h>
- #include <sys/ioctl.h>
- #ifndef NOSOUND
--#include <linux/soundcard.h>
-+#ifdef HAVE_SOUNDCARD_H
-+#include <soundcard.h>
-+#else
-+#include <sys/soundcard.h>
-+#endif
- #endif
- 
- #ifdef RCSID
-@@ -56,16 +60,16 @@ void
- Sound::setSoundFlags(long f) {
- 	switch (GET_SOUND_RATE_CODE(f)) {
- 		case 0:
--			soundRate = 5500;
-+			soundRate = 5512;
- 			break;
- 		case 1:
--			soundRate = 11000;
-+			soundRate = 11025;
- 			break;
- 		case 2:
--			soundRate = 22000;
-+			soundRate = 22050;
- 			break;
- 		case 3:
--			soundRate = 44000;
-+			soundRate = 44100;
- 			break;
- 	}
- 	if (f & soundIs16bit) {
-@@ -162,7 +166,7 @@ SoundMixer::SoundMixer(char *device)
- 	}
- 
- 	// Reset device
--	status = ioctl(dsp, SNDCTL_DSP_RESET);
-+	status = ioctl(dsp, SNDCTL_DSP_RESET, NULL);
- 	if (status < 0) perror("ioctl SNDCTL_DSP_RESET");
- 
- 	// Set sample size
-@@ -187,7 +191,7 @@ SoundMixer::SoundMixer(char *device)
- 	}
- 
- 	// Set sound rate in Hertz
--	soundRate = 11000;
-+	soundRate = 11025;
- 	status = ioctl(dsp, SNDCTL_DSP_SPEED, &soundRate);
- 	if (status < 0) perror("ioctl SNDCTL_DSP_SPEED");
- 
-@@ -324,7 +328,7 @@ SoundMixer::playSounds()
- 	if (nbBytes) {
- 		// At last ! Play It !
- 		write(dsp,buffer,nbBytes);
--		status = ioctl(dsp, SNDCTL_DSP_POST);
-+		status = ioctl(dsp, SNDCTL_DSP_POST, NULL);
- 	}
- 
- 	return nbBytes;
diff --git a/multimedia/libflash/patches/patch-af b/multimedia/libflash/patches/patch-af
deleted file mode 100644
index f81eadddc01..00000000000
--- a/multimedia/libflash/patches/patch-af
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-af,v 1.2 2004/04/24 22:25:31 wiz Exp $
-
---- Player/Makefile.orig	2000-06-07 20:19:50.000000000 +0200
-+++ Player/Makefile
-@@ -1,14 +1,13 @@
--FLASH=../Lib
--CPPFLAGS=-I$(FLASH)
--CFLAGS=-O3
--LIBS = $(FLASH)/libflash.a ../Zlib/libz.a ../Jpeg/libjpeg.a -L/usr/X11R6/lib -lX11 -lXext -lm
--CC=gcc
--LDFLAGS=
-+LIBS = -lflash -ljpeg -lz ${LIBOSSAUDIO} -lX11 -lXext -lm $(LIBSTDCPP)
-+CFLAGS+= -I${PREFIX}/include/flash
- 
--swfplayer: main.o $(FLASH)/libflash.a ../Zlib/libz.a ../Jpeg/libjpeg.a
-+all: swfplayer
-+
-+install: swfplayer
-+	${BSD_INSTALL_PROGRAM} swfplayer ${PREFIX}/bin
-+
-+swfplayer: main.o
- 	$(CC) $(LDFLAGS) -o $@ main.o $(LIBS)
- 
- clean:
- 	rm -f *~ *.o swfplayer core gmon.out
--
--
diff --git a/multimedia/libflash/patches/patch-ag b/multimedia/libflash/patches/patch-ag
deleted file mode 100644
index f69e777b2a5..00000000000
--- a/multimedia/libflash/patches/patch-ag
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2004/01/26 13:34:46 jmmv Exp $
-
---- Player/main.c.orig	Wed Jun  7 23:56:11 2000
-+++ Player/main.c
-@@ -559,7 +559,11 @@ main(int argc, char **argv)
- 
-         FlashGraphicInitX11(flashHandle, dpy, movie, onRoot);
- 
--	FlashSoundInit(flashHandle, "/dev/dsp");
-+#ifndef DEV_DSP
-+#define DEV_DSP "/dev/dsp"
-+#endif
-+
-+	FlashSoundInit(flashHandle, DEV_DSP);
- 
- 	FlashSetGetUrlMethod(flashHandle, showUrl, 0);
- 
diff --git a/multimedia/libflash/patches/patch-ah b/multimedia/libflash/patches/patch-ah
deleted file mode 100644
index eb371f50b3b..00000000000
--- a/multimedia/libflash/patches/patch-ah
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2004/04/24 22:25:31 wiz Exp $
-
---- Plugin/Makefile.orig	1999-09-28 14:13:38.000000000 +0200
-+++ Plugin/Makefile
-@@ -21,34 +21,30 @@
- 
- PLUGIN_DEFINES= -DXP_UNIX
- OPTIMIZER=
--FLASH=../Lib
- 
- # Solaris
- #LIBCXX=/usr/lib/libC.so
- # gcc
- LIBCXX=
- 
--# Solaris (Sun compiler/linker)
--#SHARED=-G
--# FreeBSD
--#SHARED=-Bshareable
--# Linux
--SHARED=-shared
--
--CFLAGS=  $(OPTIMIZER) $(PLUGIN_DEFINES) -I$(FLASH) -I/usr/X11R6/include
--LDFLAGS= $(FLASH)/libflash.a $(LIBCXX) ../Jpeg/libjpeg.a ../Zlib/libz.a
-+CFLAGS+=  $(OPTIMIZER) $(PLUGIN_DEFINES) $(CPPFLAGS) -I${PREFIX}/include/flash
-+LIBS= -lflash $(LIBSTDCPP) -ljpeg -lz $(LIBOSSAUDIO) -lX11 -lXt
- 
- SRC= plugin.c npunix.c
- OBJ= plugin.o npunix.o
- 
- SHAREDTARGET=npflash.so
- 
--default all: $(SHAREDTARGET)
-+.c.o:
-+	$(SHLIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $<
-+
-+default all: npflash.la
- 
--$(SHAREDTARGET): $(OBJ) $(FLASH)/libflash.a
--	$(LD) $(SHARED) -o $(SHAREDTARGET) $(OBJ) $(LDFLAGS)
-+npflash.la: $(OBJ)
-+	$(SHLIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJ:.o=.lo) $(LIBS) -avoid-version -module -rpath $(MOZ_PLUGDIR)
- 
--plugin.o: $(FLASH)/flash.h
-+$(SHAREDTARGET): $(OBJ)
-+	$(LD) $(SHARED) -o $(SHAREDTARGET) $(OBJ) $(LDFLAGS) $(LIBS)
- 
- clean:
- 	$(RM) $(OBJ) $(SHAREDTARGET)
diff --git a/multimedia/libflash/patches/patch-ai b/multimedia/libflash/patches/patch-ai
deleted file mode 100644
index 210de7f473b..00000000000
--- a/multimedia/libflash/patches/patch-ai
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 2004/01/26 13:34:46 jmmv Exp $
-
---- Plugin/plugin.c.orig	Mon Jun 12 01:24:09 2000
-+++ Plugin/plugin.c
-@@ -162,7 +162,11 @@ NPP_New(NPMIMEType pluginType,
- 
- 		FlashSetCursorOnOffMethod(This->fh, cursorOnOff, (void*)instance);
- 
--		FlashSoundInit(This->fh, "/dev/dsp");
-+#ifndef DEV_DSP
-+#define DEV_DSP	"/dev/dsp"
-+#endif
-+
-+		FlashSoundInit(This->fh, DEV_DSP);
- 
- 		return NPERR_NO_ERROR;
- 	}
-@@ -193,6 +197,7 @@ NPP_Destroy(NPP instance, NPSavedData** 
- 			XSync(This->dpy,False);
- 			XFreePixmap(This->dpy, This->canvas);
- 			shmdt(This->segInfo.shmaddr);
-+			shmctl(This->segInfo.shmid, IPC_RMID, 0);
- 
- 			FlashClose(This->fh);
- 			This->fh = 0;
diff --git a/multimedia/libflash/patches/patch-aj b/multimedia/libflash/patches/patch-aj
deleted file mode 100644
index 2e9c3e12e07..00000000000
--- a/multimedia/libflash/patches/patch-aj
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-aj,v 1.1.1.1 2004/01/26 13:34:46 jmmv Exp $
-
---- Lib/shape.cc.orig	Wed Jun  7 19:11:08 2000
-+++ Lib/shape.cc
-@@ -24,2 +24,4 @@
- 
-+#include <math.h>
-+
- #ifdef RCSID
diff --git a/multimedia/libmatroska/DESCR b/multimedia/libmatroska/DESCR
deleted file mode 100644
index 311c345fdce..00000000000
--- a/multimedia/libmatroska/DESCR
+++ /dev/null
@@ -1,16 +0,0 @@
-Matroska aims to become THE Standard of Multimedia Container Formats.
-It was derived from a project called MCF, but differentiates from it
-significantly.  It is based on EBML (Extensible Binary Meta Language),
-a binary derivative of XML.
-
-Matroska is designed with the future in mind. It incorporates features
-you would expect from a modern container format, like:
-
-- Streamable over internet (HTTP and RTP)
-- Fast seeking in the file
-- High error recovery
-- Menus (like DVDs have)
-- Chapter entries
-- Selectable subtitle streams
-- Selectable audio streams
-- Modularly extendable
diff --git a/multimedia/libmatroska/Makefile b/multimedia/libmatroska/Makefile
deleted file mode 100644
index d1be0e06ac4..00000000000
--- a/multimedia/libmatroska/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.17 2005/11/04 18:55:07 rillig Exp $
-#
-
-DISTNAME=	libmatroska-0.7.7
-CATEGORIES=	multimedia devel
-MASTER_SITES=	http://dl.matroska.org/downloads/libmatroska/
-EXTRACT_SUFX=	.tar.bz2
-
-MAINTAINER=	salo@NetBSD.org
-HOMEPAGE=	http://www.matroska.org/
-COMMENT=	Extensible open standard Audio/Video container format
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
-USE_TOOLS+=	gmake
-USE_LANGUAGES=	c++
-
-NO_CONFIGURE=	yes
-MAKEFLAGS+=	prefix=${PREFIX:Q}
-MAKE_ENV+=	CXXFLAGS=${CXXFLAGS:Q} RANLIB=${RANLIB:Q}
-BUILD_DIRS=	make/linux
-BUILD_TARGET=	staticlib
-INSTALL_TARGET=	install_headers install_staticlib
-TEST_TARGET=	test
-
-.include "../../devel/libebml/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/libmatroska/PLIST b/multimedia/libmatroska/PLIST
deleted file mode 100644
index c748aa00aa8..00000000000
--- a/multimedia/libmatroska/PLIST
+++ /dev/null
@@ -1,32 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/04/18 00:57:21 salo Exp $
-include/matroska/FileKax.h
-include/matroska/KaxAttached.h
-include/matroska/KaxAttachments.h
-include/matroska/KaxBlock.h
-include/matroska/KaxBlockData.h
-include/matroska/KaxChapters.h
-include/matroska/KaxCluster.h
-include/matroska/KaxClusterData.h
-include/matroska/KaxConfig.h
-include/matroska/KaxContentEncoding.h
-include/matroska/KaxContexts.h
-include/matroska/KaxCues.h
-include/matroska/KaxCuesData.h
-include/matroska/KaxInfo.h
-include/matroska/KaxInfoData.h
-include/matroska/KaxSeekHead.h
-include/matroska/KaxSegment.h
-include/matroska/KaxTag.h
-include/matroska/KaxTagMulti.h
-include/matroska/KaxTags.h
-include/matroska/KaxTrackAudio.h
-include/matroska/KaxTrackEntryData.h
-include/matroska/KaxTrackVideo.h
-include/matroska/KaxTracks.h
-include/matroska/KaxTypes.h
-include/matroska/KaxVersion.h
-include/matroska/c/libmatroska.h
-include/matroska/c/libmatroska_t.h
-lib/libmatroska.a
-@dirrm include/matroska/c
-@dirrm include/matroska
diff --git a/multimedia/libmatroska/buildlink3.mk b/multimedia/libmatroska/buildlink3.mk
deleted file mode 100644
index af8df614283..00000000000
--- a/multimedia/libmatroska/buildlink3.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.9 2005/05/30 16:31:40 salo Exp $
-#
-# This Makefile fragment is included by packages that use libmatroska.
-#
-
-BUILDLINK_DEPMETHOD.libmatroska?=	build
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBMATROSKA_BUILDLINK3_MK:=	${LIBMATROSKA_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libmatroska
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmatroska}
-BUILDLINK_PACKAGES+=	libmatroska
-
-.if !empty(LIBMATROSKA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmatroska+=	libmatroska>=0.7.7
-BUILDLINK_PKGSRCDIR.libmatroska?=	../../multimedia/libmatroska
-.endif	# LIBMATROSKA_BUILDLINK3_MK
-
-.include "../../devel/libebml/buildlink3.mk"
-
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/libmatroska/distinfo b/multimedia/libmatroska/distinfo
deleted file mode 100644
index 198ed90b921..00000000000
--- a/multimedia/libmatroska/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.13 2005/06/06 21:15:02 salo Exp $
-
-SHA1 (libmatroska-0.7.7.tar.bz2) = 2f0f52894bfe25b066704685b4f5e4e741df8ff0
-RMD160 (libmatroska-0.7.7.tar.bz2) = d08d23fb0333d927909d915fd8623fc51dd52531
-Size (libmatroska-0.7.7.tar.bz2) = 86472 bytes
-SHA1 (patch-ac) = 1923a41551dc2217bd155f961f5fcae569c48ace
diff --git a/multimedia/libmatroska/patches/patch-ac b/multimedia/libmatroska/patches/patch-ac
deleted file mode 100644
index e76a7674206..00000000000
--- a/multimedia/libmatroska/patches/patch-ac
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2005/06/06 21:15:02 salo Exp $
-
---- make/linux/Makefile.orig	2005-04-19 09:00:00.000000000 +0200
-+++ make/linux/Makefile	2005-06-06 23:12:23.000000000 +0200
-@@ -16,15 +16,15 @@
- else
- prefix=/usr/local
- endif
--libdir=$(prefix)/lib
--includedir=$(prefix)/include/matroska
-+libdir=$(PREFIX)/lib
-+includedir=$(PREFIX)/include/matroska
- 
- # Programs
--CXX=g++
-+#CXX=g++
- LD=$(CXX)
--AR = ar rcvu
--RANLIB = ranlib
--INSTALL = install
-+AR += rcvu
-+#RANLIB = ranlib
-+INSTALL = $(BSD_INSTALL)
- INSTALL_OPTS = -m 644
- INSTALL_OPTS_LIB = -m 644
- INSTALL_DIR_OPTS = -m 755
diff --git a/multimedia/libmpeg2/DESCR b/multimedia/libmpeg2/DESCR
deleted file mode 100644
index 8435ff07719..00000000000
--- a/multimedia/libmpeg2/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-libmpeg2 is a free library for decoding mpeg-2 and mpeg-1 video
-streams acclaimed to be the fastest around.
diff --git a/multimedia/libmpeg2/Makefile b/multimedia/libmpeg2/Makefile
deleted file mode 100644
index 52698b1df74..00000000000
--- a/multimedia/libmpeg2/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2005/08/20 11:44:09 grant Exp $
-
-DISTNAME=	mpeg2dec-0.4.0b
-PKGNAME=	libmpeg2-0.4.0b
-PKGREVISION=	1
-CATEGORIES=	multimedia
-MASTER_SITES=	http://libmpeg2.sourceforge.net/files/
-
-MAINTAINER=	wulf@NetBSD.org
-HOMEPAGE=	http://libmpeg2.sourceforge.net/
-COMMENT=	Library for decoding mpeg-2 and mpeg-1 video streams
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
-# remove on next update, only needed for 0.4.0b
-WRKSRC=		${WRKDIR}/mpeg2dec-0.4.0
-
-GNU_CONFIGURE=	yes
-USE_TOOLS+=	gmake pkg-config
-USE_LIBTOOL=	yes
-
-PKGCONFIG_OVERRIDE+=    libmpeg2/convert/libmpeg2convert.pc.in
-PKGCONFIG_OVERRIDE+=    libmpeg2/libmpeg2.pc.in
-
-CONFIGURE_ARGS+=	--enable-shared
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${MACHINE_ARCH} == "i386"
-.  if ${OPSYS} == "NetBSD" || ${OPSYS} == "Linux"
-CONFIGURE_ENV+=		LIBMPEG2_CFLAGS=-prefer-non-pic
-.  endif
-.endif
-
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/libmpeg2/PLIST b/multimedia/libmpeg2/PLIST
deleted file mode 100644
index c05d00ea801..00000000000
--- a/multimedia/libmpeg2/PLIST
+++ /dev/null
@@ -1,13 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:45 jlam Exp $
-bin/corrupt_mpeg2
-bin/extract_mpeg2
-bin/mpeg2dec
-include/mpeg2dec/mpeg2.h
-include/mpeg2dec/mpeg2convert.h
-lib/libmpeg2.la
-lib/libmpeg2convert.la
-lib/pkgconfig/libmpeg2.pc
-lib/pkgconfig/libmpeg2convert.pc
-man/man1/extract_mpeg2.1
-man/man1/mpeg2dec.1
-@dirrm include/mpeg2dec
diff --git a/multimedia/libmpeg2/buildlink3.mk b/multimedia/libmpeg2/buildlink3.mk
deleted file mode 100644
index 9f7704e23a6..00000000000
--- a/multimedia/libmpeg2/buildlink3.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:02 tv Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBMPEG2_BUILDLINK3_MK:=	${LIBMPEG2_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libmpeg2
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmpeg2}
-BUILDLINK_PACKAGES+=	libmpeg2
-
-.if !empty(LIBMPEG2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmpeg2+=	libmpeg2>=0.4.0
-BUILDLINK_RECOMMENDED.libmpeg2+=	libmpeg2>=0.4.0nb1
-BUILDLINK_PKGSRCDIR.libmpeg2?=	../../multimedia/libmpeg2
-.endif	# LIBMPEG2_BUILDLINK3_MK
-
-.include "../../devel/SDL/buildlink3.mk"
-
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/libmpeg2/distinfo b/multimedia/libmpeg2/distinfo
deleted file mode 100644
index 8f20945c136..00000000000
--- a/multimedia/libmpeg2/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.7 2005/08/20 11:44:09 grant Exp $
-
-SHA1 (mpeg2dec-0.4.0b.tar.gz) = 7ad99a810802f216893022fa14fa078ac49d67d7
-RMD160 (mpeg2dec-0.4.0b.tar.gz) = 44df6c21e88d2c3029ef418ea46e2d6796c90004
-Size (mpeg2dec-0.4.0b.tar.gz) = 473846 bytes
-SHA1 (patch-aa) = d70e401272fe1f87a1a1866248caabe8fab77193
diff --git a/multimedia/libmpeg2/patches/patch-aa b/multimedia/libmpeg2/patches/patch-aa
deleted file mode 100644
index bbb89d8e05f..00000000000
--- a/multimedia/libmpeg2/patches/patch-aa
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2005/08/20 11:44:09 grant Exp $
-
---- configure.orig	2003-12-23 23:07:34.000000000 +1100
-+++ configure
-@@ -3851,7 +3851,7 @@ echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
- 
-     TRY_CFLAGS=`echo "$OPT_CFLAGS $CFLAGS"|sed "s/-O[0-9]*//g"`
- 
--    TRY_CFLAGS="$TRY_CFLAGS -O3"
-+    TRY_CFLAGS="$OPT_CFLAGS $CFLAGS"
-     echo "$as_me:$LINENO: checking if $CC supports $TRY_CFLAGS flags" >&5
- echo $ECHO_N "checking if $CC supports $TRY_CFLAGS flags... $ECHO_C" >&6
-     SAVE_CFLAGS="$CFLAGS"
-@@ -24534,25 +24534,25 @@ done
- 
- 
- 
--echo "$as_me:$LINENO: checking if libtool supports -prefer-non-pic flag" >&5
--echo $ECHO_N "checking if libtool supports -prefer-non-pic flag... $ECHO_C" >&6
--    mkdir ac_test_libtool; cd ac_test_libtool; ac_cv_libtool_non_pic=no
--    echo "int g (int i); int f (int i) {return g (i);}" >f.c
--    echo "int (* hook) (int) = 0; int g (int i) {if (hook) i = hook (i); return i + 1;}" >g.c
--    ../libtool --mode=compile $CC $CFLAGS -prefer-non-pic \
--		-c f.c >/dev/null 2>&1 && \
--	../libtool --mode=compile $CC $CFLAGS -prefer-non-pic \
--		-c g.c >/dev/null 2>&1 && \
--	../libtool --mode=link $CC $CFLAGS -prefer-non-pic -o libfoo.la \
--		-rpath / f.lo g.lo >/dev/null 2>&1 &&
--	ac_cv_libtool_non_pic=yes
--    cd ..; rm -fr ac_test_libtool; echo "$as_me:$LINENO: result: $ac_cv_libtool_non_pic" >&5
--echo "${ECHO_T}$ac_cv_libtool_non_pic" >&6
--    if test x"$ac_cv_libtool_non_pic" = x"yes"; then
--	LIBMPEG2_CFLAGS="$LIBMPEG2_CFLAGS -prefer-non-pic"
--    else
--	:
--    fi
-+#echo "$as_me:$LINENO: checking if libtool supports -prefer-non-pic flag" >&5
-+#echo $ECHO_N "checking if libtool supports -prefer-non-pic flag... $ECHO_C" >&6
-+#    mkdir ac_test_libtool; cd ac_test_libtool; ac_cv_libtool_non_pic=no
-+#    echo "int g (int i); int f (int i) {return g (i);}" >f.c
-+#    echo "int (* hook) (int) = 0; int g (int i) {if (hook) i = hook (i); return i + 1;}" >g.c
-+#    ../libtool --mode=compile $CC $CFLAGS -prefer-non-pic \
-+#		-c f.c >/dev/null 2>&1 && \
-+#	../libtool --mode=compile $CC $CFLAGS -prefer-non-pic \
-+#		-c g.c >/dev/null 2>&1 && \
-+#	../libtool --mode=link $CC $CFLAGS -prefer-non-pic -o libfoo.la \
-+#		-rpath / f.lo g.lo >/dev/null 2>&1 &&
-+#	ac_cv_libtool_non_pic=yes
-+#    cd ..; rm -fr ac_test_libtool; echo "$as_me:$LINENO: result: $ac_cv_libtool_non_pic" >&5
-+#echo "${ECHO_T}$ac_cv_libtool_non_pic" >&6
-+#    if test x"$ac_cv_libtool_non_pic" = x"yes"; then
-+#	LIBMPEG2_CFLAGS="$LIBMPEG2_CFLAGS -prefer-non-pic"
-+#    else
-+#	:
-+#    fi
- 
- # Check whether --enable-accel-detect or --disable-accel-detect was given.
- if test "${enable_accel_detect+set}" = set; then
diff --git a/multimedia/libmpeg3/DESCR b/multimedia/libmpeg3/DESCR
deleted file mode 100644
index ca31a820815..00000000000
--- a/multimedia/libmpeg3/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-Libmpeg3 decodes
-                    MPEG-1 Layer II Audio
-                    MPEG-1 Layer III Audio
-                    MPEG-2 Layer III Audio
-                    MPEG-1 program streams
-                    MPEG-2 program streams
-                    MPEG-2 transport streams
-                    AC3 Audio
-                    MPEG-2 Video
-                    MPEG-1 Video
-                    IFO files
-                    VOB files
diff --git a/multimedia/libmpeg3/Makefile b/multimedia/libmpeg3/Makefile
deleted file mode 100644
index f5437ab5e73..00000000000
--- a/multimedia/libmpeg3/Makefile
+++ /dev/null
@@ -1,71 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2005/07/13 13:16:36 wiz Exp $
-#
-
-DISTNAME=	libmpeg3-1.3
-PKGREVISION=	5
-CATEGORIES=	devel audio graphics multimedia
-MASTER_SITES=	http://heroines.sourceforge.net/
-
-MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://heroines.sourceforge.net/libmpeg3.php3
-COMMENT=	MPEG decoding library
-
-.include "../../mk/bsd.prefs.mk"
-
-.if (${MACHINE_ARCH} == "i386")
-BUILD_DEPENDS+=	nasm-[0-9]*:../../devel/nasm
-.else
-CONFIGURE_ARGS+= --no-mmx --no-css
-.endif
-
-.if ${OPSYS} == "DragonFly"
-CONFIGURE_ARGS+= --no-css
-.endif
-
-HAS_CONFIGURE=	yes
-USE_TOOLS+=	gmake
-
-ONLY_FOR_COMPILER=	gcc
-
-PTHREAD_OPTS+=	require
-
-post-configure:
-	${ECHO} "CFLAGS+=-O2" >>${WRKSRC}/global_config
-	${ECHO} "CFLAGS+=-I${BUILDLINK_DIR}/include" >>${WRKSRC}/global_config
-	${ECHO} "CFLAGS+=-D_FILE_OFFSET_BITS=64" >>${WRKSRC}/global_config
-
-INSTHDRS=	bitstream.h libmpeg3.h mpeg3atrack.h mpeg3css.h \
-		mpeg3demux.h mpeg3io.h mpeg3private.h \
-		mpeg3private.inc mpeg3title.h mpeg3vtrack.h timecode.h
-AINSTHDRS=	ac3.h mpeg3audio.h
-VINSTHDRS=	idct.h mpeg3video.h slice.h
-INSTBINS=	mpeg3cat mpeg3toc mpeg3split
-
-INSTALLATION_DIRS=	bin lib
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/work/dump ${PREFIX}/bin/mpeg3dump
-	for f in ${INSTBINS}; do \
-		${INSTALL_PROGRAM} ${WRKSRC}/work/$$f ${PREFIX}/bin; \
-	done
-	${INSTALL_DATA_DIR} ${PREFIX}/include/mpeg3
-	for f in ${INSTHDRS}; do \
-		${INSTALL_DATA} ${WRKSRC}/$$f ${PREFIX}/include/mpeg3; \
-	done
-	${INSTALL_DATA_DIR} ${PREFIX}/include/mpeg3/audio
-	for f in ${AINSTHDRS}; do \
-		${INSTALL_DATA} ${WRKSRC}/audio/$$f \
-			${PREFIX}/include/mpeg3/audio; \
-	done
-	${INSTALL_DATA_DIR} ${PREFIX}/include/mpeg3/video
-	for f in ${VINSTHDRS}; do \
-		${INSTALL_DATA} ${WRKSRC}/video/$$f \
-			${PREFIX}/include/mpeg3/video; \
-	done
-	${INSTALL_DATA} ${WRKSRC}/work/libmpeg3.a ${PREFIX}/lib
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/libmpeg3
-	${INSTALL_DATA} ${WRKSRC}/docs/index.html \
-		${PREFIX}/share/doc/html/libmpeg3
-
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/libmpeg3/PLIST b/multimedia/libmpeg3/PLIST
deleted file mode 100644
index c29f778ce9e..00000000000
--- a/multimedia/libmpeg3/PLIST
+++ /dev/null
@@ -1,27 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/07/13 13:17:03 wiz Exp $
-bin/mpeg3cat
-bin/mpeg3dump
-bin/mpeg3split
-bin/mpeg3toc
-include/mpeg3/audio/ac3.h
-include/mpeg3/audio/mpeg3audio.h
-include/mpeg3/bitstream.h
-include/mpeg3/libmpeg3.h
-include/mpeg3/mpeg3atrack.h
-include/mpeg3/mpeg3css.h
-include/mpeg3/mpeg3demux.h
-include/mpeg3/mpeg3io.h
-include/mpeg3/mpeg3private.h
-include/mpeg3/mpeg3private.inc
-include/mpeg3/mpeg3title.h
-include/mpeg3/mpeg3vtrack.h
-include/mpeg3/timecode.h
-include/mpeg3/video/idct.h
-include/mpeg3/video/mpeg3video.h
-include/mpeg3/video/slice.h
-lib/libmpeg3.a
-share/doc/html/libmpeg3/index.html
-@dirrm share/doc/html/libmpeg3
-@dirrm include/mpeg3/video
-@dirrm include/mpeg3/audio
-@dirrm include/mpeg3
diff --git a/multimedia/libmpeg3/buildlink3.mk b/multimedia/libmpeg3/buildlink3.mk
deleted file mode 100644
index 10aaf508dd5..00000000000
--- a/multimedia/libmpeg3/buildlink3.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/06/26 18:00:21 grant Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBMPEG3_BUILDLINK3_MK:=	${LIBMPEG3_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libmpeg3
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmpeg3}
-BUILDLINK_PACKAGES+=	libmpeg3
-
-.if !empty(LIBMPEG3_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmpeg3+=	libmpeg3>=1.3nb4
-BUILDLINK_PKGSRCDIR.libmpeg3?=	../../multimedia/libmpeg3
-.endif	# LIBMPEG3_BUILDLINK3_MK
-
-.include "../../mk/pthread.buildlink3.mk"
-
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/libmpeg3/distinfo b/multimedia/libmpeg3/distinfo
deleted file mode 100644
index 287310ebe81..00000000000
--- a/multimedia/libmpeg3/distinfo
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: distinfo,v 1.7 2005/10/29 01:43:18 grant Exp $
-
-SHA1 (libmpeg3-1.3.tar.gz) = e7e8b03ab45d5593558b0d19e31f0694cfdfa2b5
-RMD160 (libmpeg3-1.3.tar.gz) = b1751f681d26758873746aa38368150eb0a4bafd
-Size (libmpeg3-1.3.tar.gz) = 154062 bytes
-SHA1 (patch-aa) = 88e1c193bb00056f757830c98f6bbbc58c1b16da
-SHA1 (patch-ab) = 3223b9f7d81dd73eec6767f9e1bb2cb26b4bcd80
-SHA1 (patch-ac) = 68576efb30a0d6f4cfe23fd543a04c4f3ada8936
-SHA1 (patch-ad) = 86edf9af264370bf89050b02e956b5bacc86881e
-SHA1 (patch-ae) = 411443571371b2f964ab6408ee5be217f8ca7896
-SHA1 (patch-af) = 7e62a236ee0a7398c1b1a3e994261ebb9be50bae
-SHA1 (patch-ag) = bf321ac689b82889ca1a2bb8a96cb6e387280f32
-SHA1 (patch-ah) = 58ffda3df9be3b089de362451ddf249a74fac5be
diff --git a/multimedia/libmpeg3/patches/patch-aa b/multimedia/libmpeg3/patches/patch-aa
deleted file mode 100644
index e4fd99e750a..00000000000
--- a/multimedia/libmpeg3/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2005/07/13 13:16:36 wiz Exp $
-
---- Makefile.orig	2001-05-20 05:05:26.000000000 +0200
-+++ Makefile
-@@ -2,7 +2,7 @@ include global_config
- 
- CFLAGS += 
- 
--OBJDIR = $(shell uname --machine)
-+OBJDIR = work
- 
- $(shell sh -c 'if ! test -d $(OBJDIR)\; then \
- 	mkdir $(OBJDIR)\; \
-@@ -69,7 +69,7 @@ OBJS = \
- 
- OUTPUT = $(OBJDIR)/libmpeg3.a
- UTILS = $(OBJDIR)/dump $(OBJDIR)/mpeg3cat $(OBJDIR)/mpeg3toc $(OBJDIR)/mpeg3split
--LIBS = -lm -lpthread
-+LIBS = -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -lm ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
- 
- all: $(OUTPUT) util
- 
diff --git a/multimedia/libmpeg3/patches/patch-ab b/multimedia/libmpeg3/patches/patch-ab
deleted file mode 100644
index b04eb8c58b4..00000000000
--- a/multimedia/libmpeg3/patches/patch-ab
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2005/10/29 01:43:18 grant Exp $
-
---- mpeg3css.c.orig	2001-05-20 13:05:26.000000000 +1000
-+++ mpeg3css.c
-@@ -45,7 +45,11 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/types.h>
--#include <linux/cdrom.h>
-+#ifdef __linux__
-+# include <linux/cdrom.h>
-+#else
-+# include <sys/dvdio.h>
-+#endif
- 
- #ifndef FIBMAP
- #define FIBMAP	   _IO(0x00,1)	/* bmap access */
diff --git a/multimedia/libmpeg3/patches/patch-ac b/multimedia/libmpeg3/patches/patch-ac
deleted file mode 100644
index af58881aaba..00000000000
--- a/multimedia/libmpeg3/patches/patch-ac
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2005/07/13 13:16:36 wiz Exp $
-
---- mpeg3ifo.c.orig	2001-05-20 05:05:26.000000000 +0200
-+++ mpeg3ifo.c
-@@ -1,10 +1,26 @@
--#include <byteswap.h>
- #include <dirent.h>
- #include <fcntl.h>
- #include <stdlib.h>
- #include <string.h>
- #include <sys/types.h>
- 
-+#if defined(__NetBSD__)
-+#  include <sys/endian.h>
-+#  include <machine/bswap.h>
-+#  define bswap_16(x) bswap16(x)
-+#  define bswap_32(x) bswap32(x)
-+#elif defined(__DragonFly__)
-+#  include <sys/endian.h>
-+#  define bswap_16(x) bswap16(x)
-+#  define bswap_32(x) bswap32(x)
-+#elif defined(linux)
-+#  include <byteswap.h>
-+#elif defined(__APPLE__) || defined(__MACH__) /* MacOS X */
-+#  include <libkern/OSByteOrder.h>
-+#  define bswap_16(x) OSSwapInt16(x)
-+#  define bswap_32(x) OSSwapInt32(x)
-+#endif
-+
- #include "ifo.h"
- #include "mpeg3private.h"
- #include "mpeg3protos.h"
diff --git a/multimedia/libmpeg3/patches/patch-ad b/multimedia/libmpeg3/patches/patch-ad
deleted file mode 100644
index 549eb529364..00000000000
--- a/multimedia/libmpeg3/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2004/06/26 18:00:21 grant Exp $
-
---- ifo.h.orig	Tue Jul 31 17:19:54 2001
-+++ ifo.h	Tue Jul 31 17:20:47 2001
-@@ -193,7 +193,7 @@
- 	u_char *data[10];
- 	
- 	int fd;		// file descriptor
--	__off64_t pos;	// offset of ifo file on device 
-+	off_t pos;	// offset of ifo file on device 
- } ifo_t;
- 
- 
-@@ -221,7 +221,7 @@
-  * Prototypes
-  */
- 
--ifo_t *ifoOpen (int fd, __off64_t pos);
-+ifo_t *ifoOpen (int fd, off_t pos);
- int ifoClose (ifo_t *ifo);
- 
- u_int ifoGetVOBStart	(ifo_t *ifo);
diff --git a/multimedia/libmpeg3/patches/patch-ae b/multimedia/libmpeg3/patches/patch-ae
deleted file mode 100644
index 9ee333b088e..00000000000
--- a/multimedia/libmpeg3/patches/patch-ae
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2005/10/29 01:36:42 grant Exp $
-
---- mpeg3io.c.orig	2001-05-20 13:05:26.000000000 +1000
-+++ mpeg3io.c
-@@ -1,8 +1,21 @@
- #include "mpeg3private.h"
- #include "mpeg3protos.h"
- 
--#include <mntent.h>
--#include <sys/stat.h>
-+#ifndef __NetBSD__
-+# include <mntent.h>
-+# include <sys/stat.h>
-+#else
-+# include <sys/param.h>
-+# include <sys/mount.h>
-+
-+# if __NetBSD_Version__ >= 299000900   /* 2.99.9 */
-+#  define statfs statvfs
-+# endif
-+
-+# include <sys/types.h>
-+# include <sys/stat.h>
-+#endif
-+
- #include <stdlib.h>
- #include <string.h>
- 
-@@ -88,16 +101,23 @@ int mpeg3io_read_data(unsigned char *buf
- 
- int mpeg3io_device(char *path, char *device)
- {
-+#ifndef __NetBSD__
- 	struct stat file_st, device_st;
-     struct mntent *mnt;
- 	FILE *fp;
- 
- 	if(stat(path, &file_st) < 0)
-+#else
-+	struct statfs file_st;
-+
-+	if (statfs(path, &file_st) < 0)
-+#endif
- 	{
- 		perror("mpeg3io_device");
- 		return 1;
- 	}
- 
-+#ifndef __NetBSD__
- 	fp = setmntent(MOUNTED, "r");
-     while(fp && (mnt = getmntent(fp)))
- 	{
-@@ -109,6 +129,9 @@ int mpeg3io_device(char *path, char *dev
- 		}
- 	}
- 	endmntent(fp);
-+#else
-+	strncpy(device, file_st.f_mntfromname, MPEG3_STRLEN);
-+#endif
- 
- 	return 0;
- }
diff --git a/multimedia/libmpeg3/patches/patch-af b/multimedia/libmpeg3/patches/patch-af
deleted file mode 100644
index e890d31e5a9..00000000000
--- a/multimedia/libmpeg3/patches/patch-af
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-af,v 1.1 2004/06/26 18:00:21 grant Exp $
-
---- video/reconstruct.c.orig	Tue Jul 31 17:23:42 2001
-+++ video/reconstruct.c	Tue Jul 31 17:24:52 2001
-@@ -572,7 +572,7 @@
- 	}
- }
- 
--static inline void recv(unsigned char *s, unsigned char *d, int lx, int lx2, int h)
-+static inline void xxrecv(unsigned char *s, unsigned char *d, int lx, int lx2, int h)
- {
- 	unsigned char *dp,*sp,*sp2;
- 	int j;
-@@ -971,7 +971,7 @@
- 			case 0x0:	recc(s, d, lx2, h);       break;
- 			case 0x7:   recva(s, d, lx, lx2, h);  break;
- 			case 0x6:   recvac(s, d, lx, lx2, h); break;
--			case 0x5:	recv(s, d, lx, lx2, h);   break;
-+			case 0x5:	xxrecv(s, d, lx, lx2, h);   break;
- 			case 0x4:	recvc(s, d, lx, lx2, h);  break;
- 			case 0x9:	rech(s, d, lx2, h);       break;
- 			case 0x8:   rechc(s, d, lx2, h);      break;
diff --git a/multimedia/libmpeg3/patches/patch-ag b/multimedia/libmpeg3/patches/patch-ag
deleted file mode 100644
index 2a0f30fefb0..00000000000
--- a/multimedia/libmpeg3/patches/patch-ag
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2004/06/26 18:00:21 grant Exp $
-
---- video/mmxtest.c.orig	Tue Jul 31 19:37:07 2001
-+++ video/mmxtest.c	Tue Jul 31 19:41:16 2001
-@@ -5,39 +5,9 @@
- 
- int mpeg3_mmx_test()
- {
--	int result = 0;
--	FILE *proc;
--	char string[MPEG3_STRLEN];
--
- 
- #ifdef HAVE_MMX
--	if(!(proc = fopen(MPEG3_PROC_CPUINFO, "r")))
--	{
--		fprintf(stderr, "mpeg3_mmx_test: failed to open /proc/cpuinfo\n");
--		return 0;
--	}
--	
--	while(!feof(proc))
--	{
--		fgets(string, MPEG3_STRLEN, proc);
--/* Got the flags line */
--		if(!strncasecmp(string, "flags", 5))
--		{
--			char *needle;
--			needle = strstr(string, "mmx");
--			if(!needle)
--            {
--            	fclose(proc);
--            	return 0;
--            }
--			if(!strncasecmp(needle, "mmx", 3))
--            {
--            	fclose(proc);
--            	return 1;
--            }
--		}
--	}
--   	fclose(proc);
-+	return (1);
- #endif
- 
- 	return 0;
diff --git a/multimedia/libmpeg3/patches/patch-ah b/multimedia/libmpeg3/patches/patch-ah
deleted file mode 100644
index 12035bb0083..00000000000
--- a/multimedia/libmpeg3/patches/patch-ah
+++ /dev/null
@@ -1,310 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2004/06/26 18:00:21 grant Exp $
-
---- video/output.c.orig	2001-05-20 13:05:26.000000000 +1000
-+++ video/output.c	2003-07-29 00:53:45.000000000 +1000
-@@ -207,50 +207,50 @@
- 		);
- }
- 
--static unsigned long long  mpeg3_MMX_U_80 = 0x0000008000800000;
--static unsigned long long  mpeg3_MMX_V_80 = 0x0000000000800080;
--static long long  mpeg3_MMX_U_COEF        = 0x00000058ffd30000;
--static long long  mpeg3_MMX_V_COEF        = 0x00000000ffea006f;
--static long long  mpeg3_MMX_601_Y_COEF    = 0x0000004800480048;
--static long long  mpeg3_MMX_601_Y_DIFF    = 0x0000000000000010;
-+static unsigned long long  mpeg3_MMX_U_80 = 0x0000008000800000LL;
-+static unsigned long long  mpeg3_MMX_V_80 = 0x0000000000800080LL;
-+static long long  mpeg3_MMX_U_COEF        = 0x00000058ffd30000LL;
-+static long long  mpeg3_MMX_V_COEF        = 0x00000000ffea006fLL;
-+static long long  mpeg3_MMX_601_Y_COEF    = 0x0000004800480048LL;
-+static long long  mpeg3_MMX_601_Y_DIFF    = 0x0000000000000010LL;
- 
- inline void mpeg3_bgra32_mmx(unsigned long y, 
- 		unsigned long u, 
- 		unsigned long v, 
- 		unsigned long *output)
- {
--asm("
--/* Output will be 0x00rrggbb with the 00 trailing so this can also be used */
--/* for bgr24. */
--	movd (%0), %%mm0;          /* Load y   0x00000000000000yy */
--	movd (%1), %%mm1;          /* Load u    0x00000000000000cr */
--	movq %%mm0, %%mm3;         /* Copy y to temp */
--	psllq $16, %%mm1;          /* Shift u   0x0000000000cr0000 */
--	movd (%2), %%mm2;          /* Load v    0x00000000000000cb */
--	psllq $16, %%mm3;          /* Shift y */
--	movq %%mm1, %%mm4;         /* Copy u to temp */
--	por %%mm3, %%mm0;          /* Overlay new y byte 0x0000000000yy00yy */
--	psllq $16, %%mm4;          /* Shift u */
--	movq %%mm2, %%mm5;         /* Copy v to temp */
--	psllq $16, %%mm3;          /* Shift y  */
--	por %%mm4, %%mm1;          /* Overlay new u byte 0x000000cr00cr0000 */
--	psllq $16, %%mm5;          /* Shift v  */
--	por %%mm3, %%mm0;          /* Overlay new y byte 0x000000yy00yy00yy */
--	por %%mm5, %%mm2;          /* Overlay new v byte 0x0000000000cb00cb */
--
--/* mm0: 0x000000yy00yy00yy mm1: 0x000000uu00uu0000 mm2: 0x0000000000vv00vv */
-- 	psubw mpeg3_MMX_U_80, %%mm1;    /* Subtract 128 from u 0x000000uu00uu0000 */
-- 	pmullw mpeg3_MMX_U_COEF, %%mm1; /* Multiply u coeffs 0x0000uuuuuuuu0000 */
-- 	psllw $6, %%mm0;                /* Shift y coeffs 0x0000yyy0yyy0yyy0 */
-- 	psubw mpeg3_MMX_V_80, %%mm2;    /* Subtract 128 from v 0x0000000000cb00cb */
-- 	pmullw mpeg3_MMX_V_COEF, %%mm2; /* Multiply v coeffs 0x0000crcrcrcrcrcr */
--
--/* mm0: 0x000000yy00yy00yy mm1: 0x0000uuuuuuuu0000 mm2: 0x00000000vvvvvvvv */
--	paddsw %%mm1, %%mm0;        /* Add u to result */
--	paddsw %%mm2, %%mm0;        /* Add v to result 0x0000rrrrggggbbbb */
--	psraw $6, %%mm0;           /* Demote precision */
--	packuswb %%mm0, %%mm0;     /* Pack into ARGB 0x0000000000rrggbb */
--	movd %%mm0, (%3);          /* Store output */
-+asm("\n\
-+/* Output will be 0x00rrggbb with the 00 trailing so this can also be used */\n\
-+/* for bgr24. */\n\
-+	movd (%0), %%mm0;          /* Load y   0x00000000000000yy */\n\
-+	movd (%1), %%mm1;          /* Load u    0x00000000000000cr */\n\
-+	movq %%mm0, %%mm3;         /* Copy y to temp */\n\
-+	psllq $16, %%mm1;          /* Shift u   0x0000000000cr0000 */\n\
-+	movd (%2), %%mm2;          /* Load v    0x00000000000000cb */\n\
-+	psllq $16, %%mm3;          /* Shift y */\n\
-+	movq %%mm1, %%mm4;         /* Copy u to temp */\n\
-+	por %%mm3, %%mm0;          /* Overlay new y byte 0x0000000000yy00yy */\n\
-+	psllq $16, %%mm4;          /* Shift u */\n\
-+	movq %%mm2, %%mm5;         /* Copy v to temp */\n\
-+	psllq $16, %%mm3;          /* Shift y  */\n\
-+	por %%mm4, %%mm1;          /* Overlay new u byte 0x000000cr00cr0000 */\n\
-+	psllq $16, %%mm5;          /* Shift v  */\n\
-+	por %%mm3, %%mm0;          /* Overlay new y byte 0x000000yy00yy00yy */\n\
-+	por %%mm5, %%mm2;          /* Overlay new v byte 0x0000000000cb00cb */\n\
-+\n\
-+/* mm0: 0x000000yy00yy00yy mm1: 0x000000uu00uu0000 mm2: 0x0000000000vv00vv */\n\
-+ 	psubw mpeg3_MMX_U_80, %%mm1;    /* Subtract 128 from u 0x000000uu00uu0000 */\n\
-+ 	pmullw mpeg3_MMX_U_COEF, %%mm1; /* Multiply u coeffs 0x0000uuuuuuuu0000 */\n\
-+ 	psllw $6, %%mm0;                /* Shift y coeffs 0x0000yyy0yyy0yyy0 */\n\
-+ 	psubw mpeg3_MMX_V_80, %%mm2;    /* Subtract 128 from v 0x0000000000cb00cb */\n\
-+ 	pmullw mpeg3_MMX_V_COEF, %%mm2; /* Multiply v coeffs 0x0000crcrcrcrcrcr */\n\
-+\n\
-+/* mm0: 0x000000yy00yy00yy mm1: 0x0000uuuuuuuu0000 mm2: 0x00000000vvvvvvvv */\n\
-+	paddsw %%mm1, %%mm0;        /* Add u to result */\n\
-+	paddsw %%mm2, %%mm0;        /* Add v to result 0x0000rrrrggggbbbb */\n\
-+	psraw $6, %%mm0;           /* Demote precision */\n\
-+	packuswb %%mm0, %%mm0;     /* Pack into ARGB 0x0000000000rrggbb */\n\
-+	movd %%mm0, (%3);          /* Store output */\n\
- 	"
- :
- : "r" (&y), "r" (&u), "r" (&v), "r" (output));
-@@ -261,39 +261,39 @@
- 		unsigned long v, 
- 		unsigned long *output)
- {
--asm("
--/* Output will be 0x00rrggbb with the 00 trailing so this can also be used */
--/* for bgr24. */
--	movd (%0), %%mm0;          /* Load y   0x00000000000000yy */
--	psubsw mpeg3_MMX_601_Y_DIFF, %%mm0;      /* Subtract 16 from y */
--	movd (%1), %%mm1;          /* Load u    0x00000000000000cr */
--	movq %%mm0, %%mm3;         /* Copy y to temp */
--	psllq $16, %%mm1;          /* Shift u   0x0000000000cr0000 */
--	movd (%2), %%mm2;          /* Load v    0x00000000000000cb */
--	psllq $16, %%mm3;          /* Shift y */
--	movq %%mm1, %%mm4;         /* Copy u to temp */
--	por %%mm3, %%mm0;          /* Overlay new y byte 0x0000000000yy00yy */
--	psllq $16, %%mm4;          /* Shift u */
--	movq %%mm2, %%mm5;         /* Copy v to temp */
--	psllq $16, %%mm3;          /* Shift y  */
--	por %%mm4, %%mm1;          /* Overlay new u byte 0x000000cr00cr0000 */
--	psllq $16, %%mm5;          /* Shift v  */
--	por %%mm3, %%mm0;          /* Overlay new y byte 0x000000yy00yy00yy */
--	por %%mm5, %%mm2;          /* Overlay new v byte 0x0000000000cb00cb */
--
--/* mm0: 0x000000yy00yy00yy mm1: 0x000000uu00uu0000 mm2: 0x0000000000vv00vv */
--	pmullw mpeg3_MMX_601_Y_COEF, %%mm0; /* Scale and shift y coeffs */
--	psubw mpeg3_MMX_U_80, %%mm1;     /* Subtract 128 from u 0x000000uu00uu0000 */
-- 	pmullw mpeg3_MMX_U_COEF, %%mm1;  /* Multiply u coeffs 0x0000uuuuuuuu0000 */
--	psubw mpeg3_MMX_V_80, %%mm2;     /* Subtract 128 from v 0x0000000000cb00cb */
-- 	pmullw mpeg3_MMX_V_COEF, %%mm2;  /* Multiply v coeffs 0x0000crcrcrcrcrcr */
--
--/* mm0: 0x000000yy00yy00yy mm1: 0x0000uuuuuuuu0000 mm2: 0x00000000vvvvvvvv */
--	paddsw %%mm1, %%mm0;        /* Add u to result */
--	paddsw %%mm2, %%mm0;        /* Add v to result 0x0000rrrrggggbbbb */
--	psraw $6, %%mm0;           /* Demote precision */
--	packuswb %%mm0, %%mm0;     /* Pack into ARGB 0x0000000000rrggbb */
--	movd %%mm0, (%3);          /* Store output */
-+asm("\n\
-+/* Output will be 0x00rrggbb with the 00 trailing so this can also be used */\n\
-+/* for bgr24. */\n\
-+	movd (%0), %%mm0;          /* Load y   0x00000000000000yy */\n\
-+	psubsw mpeg3_MMX_601_Y_DIFF, %%mm0;      /* Subtract 16 from y */\n\
-+	movd (%1), %%mm1;          /* Load u    0x00000000000000cr */\n\
-+	movq %%mm0, %%mm3;         /* Copy y to temp */\n\
-+	psllq $16, %%mm1;          /* Shift u   0x0000000000cr0000 */\n\
-+	movd (%2), %%mm2;          /* Load v    0x00000000000000cb */\n\
-+	psllq $16, %%mm3;          /* Shift y */\n\
-+	movq %%mm1, %%mm4;         /* Copy u to temp */\n\
-+	por %%mm3, %%mm0;          /* Overlay new y byte 0x0000000000yy00yy */\n\
-+	psllq $16, %%mm4;          /* Shift u */\n\
-+	movq %%mm2, %%mm5;         /* Copy v to temp */\n\
-+	psllq $16, %%mm3;          /* Shift y  */\n\
-+	por %%mm4, %%mm1;          /* Overlay new u byte 0x000000cr00cr0000 */\n\
-+	psllq $16, %%mm5;          /* Shift v  */\n\
-+	por %%mm3, %%mm0;          /* Overlay new y byte 0x000000yy00yy00yy */\n\
-+	por %%mm5, %%mm2;          /* Overlay new v byte 0x0000000000cb00cb */\n\
-+\n\
-+/* mm0: 0x000000yy00yy00yy mm1: 0x000000uu00uu0000 mm2: 0x0000000000vv00vv */\n\
-+	pmullw mpeg3_MMX_601_Y_COEF, %%mm0; /* Scale and shift y coeffs */\n\
-+	psubw mpeg3_MMX_U_80, %%mm1;     /* Subtract 128 from u 0x000000uu00uu0000 */\n\
-+ 	pmullw mpeg3_MMX_U_COEF, %%mm1;  /* Multiply u coeffs 0x0000uuuuuuuu0000 */\n\
-+	psubw mpeg3_MMX_V_80, %%mm2;     /* Subtract 128 from v 0x0000000000cb00cb */\n\
-+ 	pmullw mpeg3_MMX_V_COEF, %%mm2;  /* Multiply v coeffs 0x0000crcrcrcrcrcr */\n\
-+\n\
-+/* mm0: 0x000000yy00yy00yy mm1: 0x0000uuuuuuuu0000 mm2: 0x00000000vvvvvvvv */\n\
-+	paddsw %%mm1, %%mm0;        /* Add u to result */\n\
-+	paddsw %%mm2, %%mm0;        /* Add v to result 0x0000rrrrggggbbbb */\n\
-+	psraw $6, %%mm0;           /* Demote precision */\n\
-+	packuswb %%mm0, %%mm0;     /* Pack into ARGB 0x0000000000rrggbb */\n\
-+	movd %%mm0, (%3);          /* Store output */\n\
- 	"
- :
- : "r" (&y), "r" (&u), "r" (&v), "r" (output));
-@@ -309,38 +309,38 @@
- 		unsigned long v, 
- 		unsigned long *output)
- {
--asm("
--/* Output will be 0x00bbggrr with the 00 trailing so this can also be used */
--/* for rgb24. */
--	movd (%0), %%mm0;          /* Load y   0x00000000000000yy */
--	movd (%1), %%mm1;          /* Load v    0x00000000000000vv */
--	movq %%mm0, %%mm3;         /* Copy y to temp */
--	psllq $16, %%mm1;          /* Shift v   0x0000000000vv0000 */
--	movd (%2), %%mm2;          /* Load u    0x00000000000000uu */
--	psllq $16, %%mm3;          /* Shift y */
--	movq %%mm1, %%mm4;         /* Copy v to temp */
--	por %%mm3, %%mm0;          /* Overlay new y byte 0x0000000000yy00yy */
--	psllq $16, %%mm4;          /* Shift v */
--	movq %%mm2, %%mm5;         /* Copy u to temp */
--	psllq $16, %%mm3;          /* Shift y  */
--	por %%mm4, %%mm1;          /* Overlay new v byte 0x000000vv00vv0000 */
--	psllq $16, %%mm5;          /* Shift u  */
--	por %%mm3, %%mm0;          /* Overlay new y byte 0x000000yy00yy00yy */
--	por %%mm5, %%mm2;          /* Overlay new u byte 0x0000000000uu00uu */
--
--/* mm0: 0x000000yy00yy00yy mm1: 0x000000vv00vv0000 mm2: 0x0000000000uu00uu */
-- 	psubw mpeg3_MMX_V_80_RGB, %%mm1;    /* Subtract 128 from v 0x000000vv00vv0000 */
-- 	pmullw mpeg3_MMX_V_COEF_RGB, %%mm1; /* Multiply v coeffs 0x0000vvvvvvvv0000 */
-- 	psllw $6, %%mm0;                /* Shift y coeffs 0x0000yyy0yyy0yyy0 */
-- 	psubw mpeg3_MMX_U_80_RGB, %%mm2;    /* Subtract 128 from u 0x0000000000uu00uu */
-- 	pmullw mpeg3_MMX_U_COEF_RGB, %%mm2; /* Multiply u coeffs 0x0000uuuuuuuuuuuu */
--
--/* mm0: 0x000000yy00yy00yy mm1: 0x0000vvvvvvvv0000 mm2: 0x00000000uuuuuuuu */
--	paddsw %%mm1, %%mm0;        /* Add v to result */
--	paddsw %%mm2, %%mm0;        /* Add u to result 0x0000bbbbggggrrrr */
--	psraw $6, %%mm0;           /* Demote precision */
--	packuswb %%mm0, %%mm0;     /* Pack into RGBA 0x0000000000bbggrr */
--	movd %%mm0, (%3);          /* Store output */
-+asm("\n\
-+/* Output will be 0x00bbggrr with the 00 trailing so this can also be used */\n\
-+/* for rgb24. */\n\
-+	movd (%0), %%mm0;          /* Load y   0x00000000000000yy */\n\
-+	movd (%1), %%mm1;          /* Load v    0x00000000000000vv */\n\
-+	movq %%mm0, %%mm3;         /* Copy y to temp */\n\
-+	psllq $16, %%mm1;          /* Shift v   0x0000000000vv0000 */\n\
-+	movd (%2), %%mm2;          /* Load u    0x00000000000000uu */\n\
-+	psllq $16, %%mm3;          /* Shift y */\n\
-+	movq %%mm1, %%mm4;         /* Copy v to temp */\n\
-+	por %%mm3, %%mm0;          /* Overlay new y byte 0x0000000000yy00yy */\n\
-+	psllq $16, %%mm4;          /* Shift v */\n\
-+	movq %%mm2, %%mm5;         /* Copy u to temp */\n\
-+	psllq $16, %%mm3;          /* Shift y  */\n\
-+	por %%mm4, %%mm1;          /* Overlay new v byte 0x000000vv00vv0000 */\n\
-+	psllq $16, %%mm5;          /* Shift u  */\n\
-+	por %%mm3, %%mm0;          /* Overlay new y byte 0x000000yy00yy00yy */\n\
-+	por %%mm5, %%mm2;          /* Overlay new u byte 0x0000000000uu00uu */\n\
-+\n\
-+/* mm0: 0x000000yy00yy00yy mm1: 0x000000vv00vv0000 mm2: 0x0000000000uu00uu */\n\
-+ 	psubw mpeg3_MMX_V_80_RGB, %%mm1;    /* Subtract 128 from v 0x000000vv00vv0000 */\n\
-+ 	pmullw mpeg3_MMX_V_COEF_RGB, %%mm1; /* Multiply v coeffs 0x0000vvvvvvvv0000 */\n\
-+ 	psllw $6, %%mm0;                /* Shift y coeffs 0x0000yyy0yyy0yyy0 */\n\
-+ 	psubw mpeg3_MMX_U_80_RGB, %%mm2;    /* Subtract 128 from u 0x0000000000uu00uu */\n\
-+ 	pmullw mpeg3_MMX_U_COEF_RGB, %%mm2; /* Multiply u coeffs 0x0000uuuuuuuuuuuu */\n\
-+\n\
-+/* mm0: 0x000000yy00yy00yy mm1: 0x0000vvvvvvvv0000 mm2: 0x00000000uuuuuuuu */\n\
-+	paddsw %%mm1, %%mm0;        /* Add v to result */\n\
-+	paddsw %%mm2, %%mm0;        /* Add u to result 0x0000bbbbggggrrrr */\n\
-+	psraw $6, %%mm0;           /* Demote precision */\n\
-+	packuswb %%mm0, %%mm0;     /* Pack into RGBA 0x0000000000bbggrr */\n\
-+	movd %%mm0, (%3);          /* Store output */\n\
- 	"
- :
- : "r" (&y), "r" (&v), "r" (&u), "r" (output));
-@@ -351,39 +351,39 @@
- 		unsigned long v, 
- 		unsigned long *output)
- {
--asm("
--/* Output will be 0x00bbggrr with the 00 trailing so this can also be used */
--/* for rgb24. */
--	movd (%0), %%mm0;          /* Load y   0x00000000000000yy */
--	psubsw mpeg3_MMX_601_Y_DIFF, %%mm0;      /* Subtract 16 from y */
--	movd (%1), %%mm1;          /* Load v    0x00000000000000vv */
--	movq %%mm0, %%mm3;         /* Copy y to temp */
--	psllq $16, %%mm1;          /* Shift v   0x0000000000vv0000 */
--	movd (%2), %%mm2;          /* Load u    0x00000000000000uu */
--	psllq $16, %%mm3;          /* Shift y */
--	movq %%mm1, %%mm4;         /* Copy v to temp */
--	por %%mm3, %%mm0;          /* Overlay new y byte 0x0000000000yy00yy */
--	psllq $16, %%mm4;          /* Shift v */
--	movq %%mm2, %%mm5;         /* Copy u to temp */
--	psllq $16, %%mm3;          /* Shift y  */
--	por %%mm4, %%mm1;          /* Overlay new v byte 0x000000vv00vv0000 */
--	psllq $16, %%mm5;          /* Shift u  */
--	por %%mm3, %%mm0;          /* Overlay new y byte 0x000000yy00yy00yy */
--	por %%mm5, %%mm2;          /* Overlay new u byte 0x0000000000uu00uu */
--
--/* mm0: 0x000000yy00yy00yy     mm1: 0x000000vv00vv0000     mm2: 0x0000000000uu00uu */
--	pmullw mpeg3_MMX_601_Y_COEF, %%mm0;     /* Scale y coeffs */
-- 	psubw mpeg3_MMX_V_80_RGB, %%mm1;    /* Subtract 128 from v 0x000000vv00vv0000 */
-- 	pmullw mpeg3_MMX_V_COEF_RGB, %%mm1; /* Multiply v coeffs 0x0000vvvvvvvv0000 */
-- 	psubw mpeg3_MMX_U_80_RGB, %%mm2;    /* Subtract 128 from u 0x0000000000uu00uu */
-- 	pmullw mpeg3_MMX_U_COEF_RGB, %%mm2; /* Multiply u coeffs 0x0000uuuuuuuuuuuu */
--
--/* mm0: 0x000000yy00yy00yy mm1: 0x0000vvvvvvvv0000 mm2: 0x00000000uuuuuuuu */
--	paddsw %%mm1, %%mm0;        /* Add v to result */
--	paddsw %%mm2, %%mm0;        /* Add u to result 0x0000bbbbggggrrrr */
--	psraw $6, %%mm0;           /* Demote precision */
--	packuswb %%mm0, %%mm0;     /* Pack into RGBA 0x0000000000bbggrr */
--	movd %%mm0, (%3);          /* Store output */
-+asm("\n\
-+/* Output will be 0x00bbggrr with the 00 trailing so this can also be used */\n\
-+/* for rgb24. */\n\
-+	movd (%0), %%mm0;          /* Load y   0x00000000000000yy */\n\
-+	psubsw mpeg3_MMX_601_Y_DIFF, %%mm0;      /* Subtract 16 from y */\n\
-+	movd (%1), %%mm1;          /* Load v    0x00000000000000vv */\n\
-+	movq %%mm0, %%mm3;         /* Copy y to temp */\n\
-+	psllq $16, %%mm1;          /* Shift v   0x0000000000vv0000 */\n\
-+	movd (%2), %%mm2;          /* Load u    0x00000000000000uu */\n\
-+	psllq $16, %%mm3;          /* Shift y */\n\
-+	movq %%mm1, %%mm4;         /* Copy v to temp */\n\
-+	por %%mm3, %%mm0;          /* Overlay new y byte 0x0000000000yy00yy */\n\
-+	psllq $16, %%mm4;          /* Shift v */\n\
-+	movq %%mm2, %%mm5;         /* Copy u to temp */\n\
-+	psllq $16, %%mm3;          /* Shift y  */\n\
-+	por %%mm4, %%mm1;          /* Overlay new v byte 0x000000vv00vv0000 */\n\
-+	psllq $16, %%mm5;          /* Shift u  */\n\
-+	por %%mm3, %%mm0;          /* Overlay new y byte 0x000000yy00yy00yy */\n\
-+	por %%mm5, %%mm2;          /* Overlay new u byte 0x0000000000uu00uu */\n\
-+\n\
-+/* mm0: 0x000000yy00yy00yy     mm1: 0x000000vv00vv0000     mm2: 0x0000000000uu00uu */\n\
-+	pmullw mpeg3_MMX_601_Y_COEF, %%mm0;     /* Scale y coeffs */\n\
-+ 	psubw mpeg3_MMX_V_80_RGB, %%mm1;    /* Subtract 128 from v 0x000000vv00vv0000 */\n\
-+ 	pmullw mpeg3_MMX_V_COEF_RGB, %%mm1; /* Multiply v coeffs 0x0000vvvvvvvv0000 */\n\
-+ 	psubw mpeg3_MMX_U_80_RGB, %%mm2;    /* Subtract 128 from u 0x0000000000uu00uu */\n\
-+ 	pmullw mpeg3_MMX_U_COEF_RGB, %%mm2; /* Multiply u coeffs 0x0000uuuuuuuuuuuu */\n\
-+\n\
-+/* mm0: 0x000000yy00yy00yy mm1: 0x0000vvvvvvvv0000 mm2: 0x00000000uuuuuuuu */\n\
-+	paddsw %%mm1, %%mm0;        /* Add v to result */\n\
-+	paddsw %%mm2, %%mm0;        /* Add u to result 0x0000bbbbggggrrrr */\n\
-+	psraw $6, %%mm0;           /* Demote precision */\n\
-+	packuswb %%mm0, %%mm0;     /* Pack into RGBA 0x0000000000bbggrr */\n\
-+	movd %%mm0, (%3);          /* Store output */\n\
- 	"
- :
- : "r" (&y), "r" (&v), "r" (&u), "r" (output));
diff --git a/multimedia/libogg/DESCR b/multimedia/libogg/DESCR
deleted file mode 100644
index 27ddc5e244a..00000000000
--- a/multimedia/libogg/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-Provides static and shared Ogg libraries and documentation.
-Ogg is a public domain, patent-free bitstream format.
-Ogg project codecs use the Ogg bitstream format to arrange the raw,
-compressed bitstream into a more robust, useful form.  For example,
-the Ogg bitstream makes seeking, time stamping and error recovery
-possible, as well as mixing several separate, concurrent media
-streams into a single physical bitstream.
diff --git a/multimedia/libogg/Makefile b/multimedia/libogg/Makefile
deleted file mode 100644
index 4048807f1d3..00000000000
--- a/multimedia/libogg/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2005/08/10 20:56:20 jlam Exp $
-#
-
-DISTNAME=	libogg-1.1.2
-PKGREVISION=	1
-CATEGORIES=	multimedia devel
-MASTER_SITES=	http://downloads.xiph.org/releases/ogg/
-
-MAINTAINER=	lukem@NetBSD.org
-HOMEPAGE=	http://www.xiph.org/ogg/
-COMMENT=	Ogg project codecs library
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
-USE_TOOLS+=	pkg-config
-GNU_CONFIGURE=	YES
-USE_LIBTOOL=	YES
-
-GCC_REQD+=	2.95.3
-
-PLIST_SUBST+=	DISTNAME=${DISTNAME}
-
-PKGCONFIG_OVERRIDE+=	ogg.pc.in
-
-TEST_TARGET=	check
-
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/libogg/PLIST b/multimedia/libogg/PLIST
deleted file mode 100644
index 6f053cd7dc6..00000000000
--- a/multimedia/libogg/PLIST
+++ /dev/null
@@ -1,82 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/24 12:33:16 wiz Exp $
-include/ogg/config_types.h
-include/ogg/ogg.h
-include/ogg/os_types.h
-lib/libogg.la
-lib/pkgconfig/ogg.pc
-share/aclocal/ogg.m4
-share/doc/${DISTNAME}/framing.html
-share/doc/${DISTNAME}/index.html
-share/doc/${DISTNAME}/ogg/bitpacking.html
-share/doc/${DISTNAME}/ogg/datastructures.html
-share/doc/${DISTNAME}/ogg/decoding.html
-share/doc/${DISTNAME}/ogg/encoding.html
-share/doc/${DISTNAME}/ogg/general.html
-share/doc/${DISTNAME}/ogg/index.html
-share/doc/${DISTNAME}/ogg/ogg_packet.html
-share/doc/${DISTNAME}/ogg/ogg_packet_clear.html
-share/doc/${DISTNAME}/ogg/ogg_page.html
-share/doc/${DISTNAME}/ogg/ogg_page_bos.html
-share/doc/${DISTNAME}/ogg/ogg_page_checksum_set.html
-share/doc/${DISTNAME}/ogg/ogg_page_continued.html
-share/doc/${DISTNAME}/ogg/ogg_page_eos.html
-share/doc/${DISTNAME}/ogg/ogg_page_granulepos.html
-share/doc/${DISTNAME}/ogg/ogg_page_packets.html
-share/doc/${DISTNAME}/ogg/ogg_page_pageno.html
-share/doc/${DISTNAME}/ogg/ogg_page_serialno.html
-share/doc/${DISTNAME}/ogg/ogg_page_version.html
-share/doc/${DISTNAME}/ogg/ogg_stream_clear.html
-share/doc/${DISTNAME}/ogg/ogg_stream_destroy.html
-share/doc/${DISTNAME}/ogg/ogg_stream_eos.html
-share/doc/${DISTNAME}/ogg/ogg_stream_flush.html
-share/doc/${DISTNAME}/ogg/ogg_stream_init.html
-share/doc/${DISTNAME}/ogg/ogg_stream_packetin.html
-share/doc/${DISTNAME}/ogg/ogg_stream_packetout.html
-share/doc/${DISTNAME}/ogg/ogg_stream_pagein.html
-share/doc/${DISTNAME}/ogg/ogg_stream_pageout.html
-share/doc/${DISTNAME}/ogg/ogg_stream_reset.html
-share/doc/${DISTNAME}/ogg/ogg_stream_state.html
-share/doc/${DISTNAME}/ogg/ogg_sync_buffer.html
-share/doc/${DISTNAME}/ogg/ogg_sync_clear.html
-share/doc/${DISTNAME}/ogg/ogg_sync_destroy.html
-share/doc/${DISTNAME}/ogg/ogg_sync_init.html
-share/doc/${DISTNAME}/ogg/ogg_sync_pageout.html
-share/doc/${DISTNAME}/ogg/ogg_sync_pageseek.html
-share/doc/${DISTNAME}/ogg/ogg_sync_reset.html
-share/doc/${DISTNAME}/ogg/ogg_sync_state.html
-share/doc/${DISTNAME}/ogg/ogg_sync_wrote.html
-share/doc/${DISTNAME}/ogg/oggpack_adv.html
-share/doc/${DISTNAME}/ogg/oggpack_adv1.html
-share/doc/${DISTNAME}/ogg/oggpack_bits.html
-share/doc/${DISTNAME}/ogg/oggpack_buffer.html
-share/doc/${DISTNAME}/ogg/oggpack_bytes.html
-share/doc/${DISTNAME}/ogg/oggpack_get_buffer.html
-share/doc/${DISTNAME}/ogg/oggpack_look.html
-share/doc/${DISTNAME}/ogg/oggpack_look1.html
-share/doc/${DISTNAME}/ogg/oggpack_read.html
-share/doc/${DISTNAME}/ogg/oggpack_read1.html
-share/doc/${DISTNAME}/ogg/oggpack_readinit.html
-share/doc/${DISTNAME}/ogg/oggpack_reset.html
-share/doc/${DISTNAME}/ogg/oggpack_write.html
-share/doc/${DISTNAME}/ogg/oggpack_writeclear.html
-share/doc/${DISTNAME}/ogg/oggpack_writeinit.html
-share/doc/${DISTNAME}/ogg/overview.html
-share/doc/${DISTNAME}/ogg/reference.html
-share/doc/${DISTNAME}/ogg/style.css
-share/doc/${DISTNAME}/ogg/vorbis_comment.html
-share/doc/${DISTNAME}/ogg/vorbis_info.html
-share/doc/${DISTNAME}/oggstream.html
-share/doc/${DISTNAME}/stream.png
-share/doc/${DISTNAME}/white-ogg.png
-share/doc/${DISTNAME}/white-xifish.png
-share/doc/${PKGNAME}/ogg/ogg_stream_packetpeek.html
-share/doc/${PKGNAME}/ogg/ogg_stream_reset_serialno.html
-share/doc/${PKGNAME}/ogg/oggpack_writealign.html
-share/doc/${PKGNAME}/ogg/oggpack_writecopy.html
-share/doc/${PKGNAME}/ogg/oggpack_writetrunc.html
-share/doc/${PKGNAME}/rfc3533.txt
-share/doc/${PKGNAME}/rfc3534.txt
-share/doc/${PKGNAME}/vorbisword2.png
-@dirrm share/doc/${DISTNAME}/ogg
-@dirrm share/doc/${DISTNAME}
-@dirrm include/ogg
diff --git a/multimedia/libogg/buildlink3.mk b/multimedia/libogg/buildlink3.mk
deleted file mode 100644
index 2bd05df2637..00000000000
--- a/multimedia/libogg/buildlink3.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:03 tv Exp $
-#
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBOGG_BUILDLINK3_MK:=	${LIBOGG_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libogg
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibogg}
-BUILDLINK_PACKAGES+=	libogg
-
-.if !empty(LIBOGG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libogg+=	libogg>=1.1
-BUILDLINK_RECOMMENDED.libogg+=	libogg>=1.1.2nb1
-BUILDLINK_PKGSRCDIR.libogg?=	../../multimedia/libogg
-.endif	# LIBOGG_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/libogg/distinfo b/multimedia/libogg/distinfo
deleted file mode 100644
index 9576da3cd91..00000000000
--- a/multimedia/libogg/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 11:24:03 agc Exp $
-
-SHA1 (libogg-1.1.2.tar.gz) = 518569a6be397f3903d86ca8c83b943ec0e4e713
-RMD160 (libogg-1.1.2.tar.gz) = d0f3240ef1a69ae9b8e6ce4e18ade97de16d115d
-Size (libogg-1.1.2.tar.gz) = 419959 bytes
diff --git a/multimedia/libtheora/DESCR b/multimedia/libtheora/DESCR
deleted file mode 100644
index 6274004bdd8..00000000000
--- a/multimedia/libtheora/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-Theora is Xiph.Org's first publicly released video codec, intended for
-use within the Ogg's project's Ogg multimedia streaming system.  Theora
-is derived directly from On2's VP3 codec; currently the two are nearly
-identical, varying only in encapsulating decoder tables in the bitstream
-headers, but Theora will make use of this extra freedom in the future to
-improve over what is possible with VP3.
diff --git a/multimedia/libtheora/Makefile b/multimedia/libtheora/Makefile
deleted file mode 100644
index bf337b28e0e..00000000000
--- a/multimedia/libtheora/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2005/10/12 21:59:42 wiz Exp $
-#
-
-DISTNAME=	libtheora-1.0alpha5
-CATEGORIES=	multimedia
-MASTER_SITES=	http://downloads.xiph.org/releases/theora/
-EXTRACT_SUFX=	.tar.bz2
-
-MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://www.theora.org/
-COMMENT=	Video codec for Ogg multimedia streaming
-
-GNU_CONFIGURE=		YES
-PKGCONFIG_OVERRIDE=	theora.pc.in
-USE_LIBTOOL=		YES
-TEST_TARGET=		check
-
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../multimedia/libogg/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/libtheora/PLIST b/multimedia/libtheora/PLIST
deleted file mode 100644
index 24f96021b81..00000000000
--- a/multimedia/libtheora/PLIST
+++ /dev/null
@@ -1,9 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2005/10/12 21:59:42 wiz Exp $
-include/theora/theora.h
-lib/libtheora.la
-lib/pkgconfig/theora.pc
-share/doc/${PKGNAME}/color.html
-share/doc/${PKGNAME}/doxygen-build.stamp
-share/doc/${PKGNAME}/vp3-format.txt
-@dirrm share/doc/${PKGNAME}
-@dirrm include/theora
diff --git a/multimedia/libtheora/buildlink3.mk b/multimedia/libtheora/buildlink3.mk
deleted file mode 100644
index 7462ae368b5..00000000000
--- a/multimedia/libtheora/buildlink3.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:13:03 tv Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBTHEORA_BUILDLINK3_MK:=	${LIBTHEORA_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libtheora
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibtheora}
-BUILDLINK_PACKAGES+=	libtheora
-
-.if !empty(LIBTHEORA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libtheora+=	libtheora>=1.0alpha3
-BUILDLINK_RECOMMENDED.libtheora+=	libtheora>=1.0alpha3nb1
-BUILDLINK_PKGSRCDIR.libtheora?=	../../multimedia/libtheora
-.endif	# LIBTHEORA_BUILDLINK3_MK
-
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../multimedia/libogg/buildlink3.mk"
-
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/libtheora/distinfo b/multimedia/libtheora/distinfo
deleted file mode 100644
index d0d915757be..00000000000
--- a/multimedia/libtheora/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.6 2005/10/12 21:59:42 wiz Exp $
-
-SHA1 (libtheora-1.0alpha5.tar.bz2) = 8e740ccd7219861de83ac17ecceb13c02ed7e24a
-RMD160 (libtheora-1.0alpha5.tar.bz2) = 47317a42ef6165a167dc45bb697d6528e1209469
-Size (libtheora-1.0alpha5.tar.bz2) = 1765512 bytes
-SHA1 (patch-aa) = 7a0642c237d6e8a438a1fa2d2449c9ec0087a57b
-SHA1 (patch-ab) = c98e9acac047fb51c4835b782906ecfe02b92e01
-SHA1 (patch-ac) = 37f60ea4ea3292f8302417eed52ef9b549f05947
diff --git a/multimedia/libtheora/patches/patch-aa b/multimedia/libtheora/patches/patch-aa
deleted file mode 100644
index 4104b23d131..00000000000
--- a/multimedia/libtheora/patches/patch-aa
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2005/10/12 21:59:42 wiz Exp $
-
---- configure.orig	2005-08-20 20:44:13.000000000 +0200
-+++ configure
-@@ -20102,6 +20102,8 @@ fi
- HAVE_SDL=no
- 
- 
-+# SDL is only used for the sample player; disable it
-+if false; then
- # Check whether --with-sdl-prefix or --without-sdl-prefix was given.
- if test "${with_sdl_prefix+set}" = set; then
-   withval="$with_sdl_prefix"
-@@ -20394,6 +20396,7 @@ echo "$as_me: WARNING: *** Unable to fin
- 
- 
-   rm -f conf.sdltest
-+fi
- 
- 
- HAVE_OSS=no
-@@ -20401,6 +20404,8 @@ HAVE_OSS=no
- 
- 
- 
-+# OSS is only used by the sample player; disable it.
-+if false; then
- for ac_header in sys/soundcard.h soundcard.h machine/soundcard.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-@@ -20556,7 +20561,7 @@ if test x$HAVE_OSS != xyes; then
-   { echo "$as_me:$LINENO: WARNING: OSS audio support not found -- not compiling player_example" >&5
- echo "$as_me: WARNING: OSS audio support not found -- not compiling player_example" >&2;}
- fi
--
-+fi
- 
- 
- ac_enable_float=yes
diff --git a/multimedia/libtheora/patches/patch-ab b/multimedia/libtheora/patches/patch-ab
deleted file mode 100644
index edefd8b44b8..00000000000
--- a/multimedia/libtheora/patches/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2005/10/12 21:59:42 wiz Exp $
-
---- examples/Makefile.am.orig	2005-05-01 19:03:32.000000000 +0200
-+++ examples/Makefile.am
-@@ -11,10 +11,12 @@ AM_CFLAGS = $(SDL_CFLAGS) $(OGG_CFLAGS)
- LDADD = ../lib/libtheora.la $(OGG_LIBS)
- 
- dump_video_SOURCES = dump_video.c
--dump_video_LDADD = $(LDADD)
-+dump_video_LDADD = $(GETOPT_OBJS) $(LDADD)
-+dump_video_DEPENDENCIES = $(GETOPT_OBJS)
- 
- player_example_SOURCES = player_example.c
--player_example_LDADD = $(LDADD) $(SDL_LIBS) $(VORBIS_LIBS)
-+player_example_LDADD = $(GETOPT_OBJS) $(LDADD) $(SDL_LIBS) $(VORBIS_LIBS)
-+dump_video_DEPENDENCIES = $(GETOPT_OBJS)
- 
- encoder_example_SOURCES = encoder_example.c
- EXTRA_encoder_example_SOURCES = getopt.c getopt1.c getopt.h
diff --git a/multimedia/libtheora/patches/patch-ac b/multimedia/libtheora/patches/patch-ac
deleted file mode 100644
index 465e30ae353..00000000000
--- a/multimedia/libtheora/patches/patch-ac
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2005/10/12 21:59:42 wiz Exp $
-
---- examples/Makefile.in.orig	2005-08-20 21:30:41.000000000 +0200
-+++ examples/Makefile.in
-@@ -225,9 +225,11 @@ INCLUDES = -I$(top_srcdir)/include 
- AM_CFLAGS = $(SDL_CFLAGS) $(OGG_CFLAGS)
- LDADD = ../lib/libtheora.la $(OGG_LIBS)
- dump_video_SOURCES = dump_video.c
--dump_video_LDADD = $(LDADD)
-+dump_video_LDADD = $(GETOPT_OBJS) $(LDADD)
-+dump_video_DEPENDENCIES = $(GETOPT_OBJS)
- player_example_SOURCES = player_example.c
--player_example_LDADD = $(LDADD) $(SDL_LIBS) $(VORBIS_LIBS)
-+player_example_LDADD = $(GETOPT_OBJS) $(LDADD) $(SDL_LIBS) $(VORBIS_LIBS)
-+player_example_DEPENDENCIES = $(GETOPT_OBJS)
- encoder_example_SOURCES = encoder_example.c
- EXTRA_encoder_example_SOURCES = getopt.c getopt1.c getopt.h
- encoder_example_LDADD = $(GETOPT_OBJS) $(LDADD) $(VORBIS_LIBS) $(VORBISENC_LIBS)
diff --git a/multimedia/lsdvd/DESCR b/multimedia/lsdvd/DESCR
deleted file mode 100644
index f909b5c79fb..00000000000
--- a/multimedia/lsdvd/DESCR
+++ /dev/null
@@ -1,11 +0,0 @@
-lsdvd is an application that reads the contents of a DVD and prints them
-to your terminal.
-
-lsdvd will tell you the following:
-* The name of the disc
-* The number of tracks
-* The length, format, and aspect of each track
-* The format, language, number of channels, contents, etc. of each audio
-  track
-* The language and contents of each subtitle
-* The longest track
diff --git a/multimedia/lsdvd/Makefile b/multimedia/lsdvd/Makefile
deleted file mode 100644
index 4fe4e710cdf..00000000000
--- a/multimedia/lsdvd/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:42 tv Exp $
-
-DISTNAME=	lsdvd-0.10
-PKGREVISION=	1
-CATEGORIES=	multimedia
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=acidrip/}
-
-MAINTAINER=	snj@NetBSD.org
-HOMEPAGE=	http://acidrip.thirtythreeandathird.net/lsdvd.html
-COMMENT=	Application displaying the contents of DVDs
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
-GNU_CONFIGURE=		YES
-
-.include "../../multimedia/libdvdread/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/lsdvd/PLIST b/multimedia/lsdvd/PLIST
deleted file mode 100644
index 52284cc1ad6..00000000000
--- a/multimedia/lsdvd/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/04/11 02:50:51 snj Exp $
-bin/lsdvd
diff --git a/multimedia/lsdvd/distinfo b/multimedia/lsdvd/distinfo
deleted file mode 100644
index 26e7ff9bbac..00000000000
--- a/multimedia/lsdvd/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 11:24:03 agc Exp $
-
-SHA1 (lsdvd-0.10.tar.gz) = 910bab96300dade7b07baa7cb2037ef473c035d6
-RMD160 (lsdvd-0.10.tar.gz) = a3c718dba1f6556a8e03d66f453483f3e50f2027
-Size (lsdvd-0.10.tar.gz) = 36206 bytes
diff --git a/multimedia/mencoder/DESCR b/multimedia/mencoder/DESCR
deleted file mode 100644
index d073da77b7e..00000000000
--- a/multimedia/mencoder/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-mencoder (MPlayer's Movie Encoder) is a simple movie encoder, designed to
-encode MPlayer-playable movies (AVI/ASF/OGG/DVD/VCD/VOB/MPG/MOV/VIV/FLI/
-RM/NUV/NET) to other MPlayer-playable formats. It encodes to DivX4 (1,
-2 or 3 passes), XviD, codecs of libavcodec, PCM/MP3/VBRMP3 audio. It also
-has stream copying abilities, a powerful plugin system (crop, expand,
-flip, postprocess, rotate, scale, rgb/yuv conversion) and more.
diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile
deleted file mode 100644
index 3c11004cc87..00000000000
--- a/multimedia/mencoder/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: Makefile,v 1.22 2005/08/27 06:59:52 dogcow Exp $
-
-PKGNAME=	mencoder-${MPLAYER_PKG_VERSION}
-PKGREVISION=	1
-
-COMMENT=	Simple movie encoder for MPlayer-playable movies
-
-.include "../../multimedia/mplayer-share/Makefile.common"
-
-CONFIGURE_ARGS+=	--confdir=${PREFIX}/share/mplayer
-
-BUILD_TARGET=	mencoder
-
-MANCOMPRESSED_IF_MANZ=	1
-INSTALLATION_DIRS=	bin man/man1
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/mencoder ${PREFIX}/bin
-	if [ X"${MANZ}" = X"" ]; then \
-		${LN} -s -f ${PREFIX}/man/man1/mplayer.1 \
-			${PREFIX}/man/man1/mencoder.1; \
-	else \
-		${LN} -s -f ${PREFIX}/man/man1/mplayer.1.gz \
-			${PREFIX}/man/man1/mencoder.1.gz; \
-	fi
-
-.include "../../multimedia/mplayer-share/Makefile.depends"
-
-.include "../../mk/bsd.pkg.mk"
-.include "../../multimedia/mplayer-share/Makefile.cflags"
diff --git a/multimedia/mencoder/PLIST b/multimedia/mencoder/PLIST
deleted file mode 100644
index 966cc45fe04..00000000000
--- a/multimedia/mencoder/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/01/26 12:11:15 jmmv Exp $
-bin/mencoder
-man/man1/mencoder.1
diff --git a/multimedia/ming/DESCR b/multimedia/ming/DESCR
deleted file mode 100644
index 855ec482d23..00000000000
--- a/multimedia/ming/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Ming is a C library for generating SWF ("Flash") format movies, plus a
-set of wrappers for using the library from C++ and popular scripting
-languages like PHP, Python, and Ruby.
diff --git a/multimedia/ming/Makefile b/multimedia/ming/Makefile
deleted file mode 100644
index bc25cdfcc44..00000000000
--- a/multimedia/ming/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/11/04 02:59:54 minskim Exp $
-#
-
-DISTNAME=		${MING_DISTNAME}
-PKGNAME=		${MING_PKGNAME}
-CATEGORIES=		multimedia
-MASTER_SITES=		${MING_MASTER_SITES}
-EXTRACT_SUFX=		${MING_EXTRACT_SUFX}
-
-MAINTAINER=		tech-pkg@NetBSD.org
-HOMEPAGE=		http://ming.sourceforge.net/
-COMMENT=		Create SWF (Macromedia Flash) files with this library
-
-.include "../../multimedia/ming/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/ming/Makefile.common b/multimedia/ming/Makefile.common
deleted file mode 100644
index 9421a1c335d..00000000000
--- a/multimedia/ming/Makefile.common
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2005/11/04 02:59:54 minskim Exp $
-#
-
-MING_DISTNAME=		ming-0.2a
-MING_PKGNAME=		ming-0.2
-MING_MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ming/}
-MING_EXTRACT_SUFX=	.tgz
-
-DISTINFO_FILE?=		${.CURDIR}/../../multimedia/ming/distinfo
-COMMON_FILESDIR?=	${.CURDIR}/../../multimedia/ming/files
-PATCHDIR?=		${.CURDIR}/../../multimedia/ming/patches
diff --git a/multimedia/ming/PLIST b/multimedia/ming/PLIST
deleted file mode 100644
index 0ac9d9a9f98..00000000000
--- a/multimedia/ming/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/11/04 02:59:54 minskim Exp $
-include/ming.h
-include/mingpp.h
-lib/libming.a
-lib/libming.so
-lib/libming.so.0
-lib/libming.so.0.2
diff --git a/multimedia/ming/buildlink3.mk b/multimedia/ming/buildlink3.mk
deleted file mode 100644
index 7e92ab657bf..00000000000
--- a/multimedia/ming/buildlink3.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/11/04 02:59:54 minskim Exp $
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-MING_BUILDLINK3_MK:=	${MING_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	ming
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nming}
-BUILDLINK_PACKAGES+=	ming
-
-.if !empty(MING_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ming+=	ming>=0.2
-BUILDLINK_PKGSRCDIR.ming?=	../../multimedia/ming
-.endif	# MING_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/ming/distinfo b/multimedia/ming/distinfo
deleted file mode 100644
index b18b34c86f0..00000000000
--- a/multimedia/ming/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/11/04 02:59:54 minskim Exp $
-
-SHA1 (ming-0.2a.tgz) = 9f8b4d9afcee51351b326e6f072352cc8ac013f5
-RMD160 (ming-0.2a.tgz) = 2dc888ca8ffda1e219002081973de8855b3faf61
-Size (ming-0.2a.tgz) = 316447 bytes
-SHA1 (patch-aa) = ac4794d4d8684475d0166707f112cfb263defacb
-SHA1 (patch-ab) = 82ce4f817902e0a589bf1bb0db5e5a1e4018eae6
diff --git a/multimedia/ming/patches/patch-aa b/multimedia/ming/patches/patch-aa
deleted file mode 100644
index 4653d2fd8cd..00000000000
--- a/multimedia/ming/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/11/04 02:59:54 minskim Exp $
-
---- Makefile.orig	Fri Aug 17 19:05:49 2001
-+++ Makefile	Sat Jan  3 22:31:08 2004
-@@ -1,15 +1,15 @@
- #CC = gcc -g -pg -a	# profiling flags
- #CC = gcc -O5
--CC = gcc -g -Wall
-+#CC = gcc -g -Wall
- 
- #PREFIX = /usr/local
--PREFIX = /usr
-+#PREFIX = /usr
- LIBDIR = ${PREFIX}/lib
- INCLUDEDIR = ${PREFIX}/include
- 
--all: dynamic #static
-+all: dynamic static
- 
--install: install-common install-dynamic #install-static
-+install: install-common install-dynamic install-static
- 
- install-common:
- 	install -d ${LIBDIR}
diff --git a/multimedia/ming/patches/patch-ab b/multimedia/ming/patches/patch-ab
deleted file mode 100644
index 794e20753d3..00000000000
--- a/multimedia/ming/patches/patch-ab
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/11/04 02:59:54 minskim Exp $
-
---- py_ext/Makefile.orig	2001-08-18 02:05:55.000000000 +0900
-+++ py_ext/Makefile
-@@ -7,7 +7,7 @@ PYLIBDIR = /usr/local/lib/python2.0
- all:
- 
- mingcmodule.so: ming_wrap.o
--	gcc -g -Wall -shared -o mingcmodule.so ming_wrap.o -lming
-+	${CC} ${LDFLAGS} -shared -o mingcmodule.so ming_wrap.o -lming
- 
- mingc.pyd: ming_wrap.o
- 	dllwrap --dllname mingc.pyd --driver-name gcc --def mingc.def \
-@@ -15,7 +15,7 @@ mingc.pyd: ming_wrap.o
- 	  --target=i386-mingw32 -Llib/ -lpython15
- 
- ming_wrap.o: ming_wrap.c
--	gcc -g -Wall -I .. -I ${PYINCDIR} -fpic -c ming_wrap.c
-+	${CC} ${CFLAGS} -I .. -fpic -c ming_wrap.c
- 
- ../libming.a:
- 	cd ..; make static
-@@ -27,4 +27,4 @@ clean:
- 	rm -f mingcmodule.so core *~ *.o ming.pyc
- 
- install:
--	cp mingcmodule.so ming.py ${PYLIBDIR}/site-packages
-+	${BSD_INSTALL_DATA} mingcmodule.so ming.py ${PREFIX}/${PYSITELIB}
diff --git a/multimedia/mjpegtools/DESCR b/multimedia/mjpegtools/DESCR
deleted file mode 100644
index e644c00ea5c..00000000000
--- a/multimedia/mjpegtools/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-Programs for MJPEG recording and playback and simple cut-and-paste
-editing and MPEG compression of audio and video.
diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile
deleted file mode 100644
index aef88cea225..00000000000
--- a/multimedia/mjpegtools/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# $NetBSD: Makefile,v 1.17 2005/06/15 22:42:38 hubertf Exp $
-
-DISTNAME=	mjpegtools-1.6.2
-PKGREVISION=	5
-CATEGORIES=	multimedia
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mjpeg/}
-
-MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://mjpeg.sourceforge.net/
-COMMENT=	Programs for compressing video streams
-
-DEPENDS+=		toolame>=02l:../../audio/toolame
-BUILD_DEPENDS+=		nasm>=0.98:../../devel/nasm
-
-USE_TOOLS+=		gmake
-
-USE_LIBTOOL=		yes
-SHLIBTOOL_OVERRIDE=	libtool
-PKGCONFIG_OVERRIDE=	mjpegtools.pc.in
-
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--enable-large-file
-CONFIGURE_ARGS+=	--with-lame-includes=${BUILDLINK_PREFIX.lame}
-
-.include "options.mk"
-
-INFO_FILES=		mjpeg-howto.info
-
-.include "../../audio/lame/buildlink3.mk"
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../graphics/ImageMagick/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
-# GTK+ support is disabled to avoid a dependency on GTK+ when building GNOME2.
-# This only disables the "glav" program.  If you really need it, please add an
-# external package for it.
-#.include "../../x11/gtk/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/mjpegtools/PLIST b/multimedia/mjpegtools/PLIST
deleted file mode 100644
index 43632a2a111..00000000000
--- a/multimedia/mjpegtools/PLIST
+++ /dev/null
@@ -1,121 +0,0 @@
-@comment $NetBSD: PLIST,v 1.6 2005/02/03 23:04:40 reed Exp $
-bin/jpeg2yuv
-bin/lav2avi.sh
-bin/lav2mpeg
-bin/lav2wav
-bin/lav2yuv
-bin/lavaddwav
-bin/lavinfo
-bin/lavpipe
-bin/lavplay
-bin/lavtrans
-bin/matteblend.flt
-bin/mjpegtools-config
-bin/mp2enc
-bin/mpeg2enc
-bin/mpegtranscode
-bin/mplex
-bin/multiblend.flt
-bin/pgmtoy4m
-bin/png2yuv
-bin/ppmtoy4m
-bin/transist.flt
-bin/y4mblack
-bin/y4mcolorbars
-bin/y4mshift
-bin/y4mtoppm
-bin/y4mtoyuv
-bin/ypipe
-bin/yuv2lav
-bin/yuv4mpeg
-bin/yuvcorrect
-bin/yuvcorrect_tune
-bin/yuvdenoise
-bin/yuvfps
-bin/yuvinactive
-bin/yuvkineco
-bin/yuvmedianfilter
-bin/yuvplay
-bin/yuvscaler
-bin/yuvycsnoise
-include/mjpegtools/audiolib.h
-include/mjpegtools/avilib.h
-include/mjpegtools/editlist.h
-include/mjpegtools/format_codes.h
-include/mjpegtools/frequencies.h
-include/mjpegtools/jpegutils.h
-include/mjpegtools/lav_io.h
-include/mjpegtools/liblavplay.h
-include/mjpegtools/liblavrec.h
-include/mjpegtools/mjpeg_logging.h
-include/mjpegtools/mjpeg_types.h
-include/mjpegtools/mpeg2enc/elemstrmwriter.hh
-include/mjpegtools/mpeg2enc/encoderparams.hh
-include/mjpegtools/mpeg2enc/macroblock.hh
-include/mjpegtools/mpeg2enc/mpeg2coder.hh
-include/mjpegtools/mpeg2enc/mpeg2encoder.hh
-include/mjpegtools/mpeg2enc/mpeg2encoptions.hh
-include/mjpegtools/mpeg2enc/mpeg2encparams.h
-include/mjpegtools/mpeg2enc/picture.hh
-include/mjpegtools/mpeg2enc/picturereader.hh
-include/mjpegtools/mpeg2enc/predict_ref.h
-include/mjpegtools/mpeg2enc/quantize.hh
-include/mjpegtools/mpeg2enc/quantize_ref.h
-include/mjpegtools/mpeg2enc/ratectl.hh
-include/mjpegtools/mpeg2enc/seqencoder.hh
-include/mjpegtools/mpeg2enc/synchrolib.h
-include/mjpegtools/mpeg2enc/syntaxconsts.h
-include/mjpegtools/mpegconsts.h
-include/mjpegtools/mpegtimecode.h
-include/mjpegtools/mplex/audiostrm.hpp
-include/mjpegtools/mplex/aunit.hpp
-include/mjpegtools/mplex/bits.hpp
-include/mjpegtools/mplex/buffer.hpp
-include/mjpegtools/mplex/inputstrm.hpp
-include/mjpegtools/mplex/interact.hpp
-include/mjpegtools/mplex/mplexconsts.hpp
-include/mjpegtools/mplex/multiplexor.hpp
-include/mjpegtools/mplex/outputstrm.hpp
-include/mjpegtools/mplex/padstrm.hpp
-include/mjpegtools/mplex/stillsstream.hpp
-include/mjpegtools/mplex/stream_params.hpp
-include/mjpegtools/mplex/systems.hpp
-include/mjpegtools/mplex/vector.hpp
-include/mjpegtools/mplex/videostrm.hpp
-include/mjpegtools/yuv4mpeg.h
-lib/liblavfile.la
-lib/liblavjpeg.la
-lib/liblavplay.la
-lib/libmjpegutils.la
-lib/libmpeg2encpp.la
-lib/libmplex2.la
-lib/pkgconfig/mjpegtools.pc
-man/man1/jpeg2yuv.1
-man/man1/lav2mpeg.1
-man/man1/lav2wav.1
-man/man1/lav2yuv.1
-man/man1/lavpipe.1
-man/man1/lavplay.1
-man/man1/lavrec.1
-man/man1/lavtrans.1
-man/man1/mjpegtools.1
-man/man1/mp2enc.1
-man/man1/mpeg2enc.1
-man/man1/mplex.1
-man/man1/pgmtoy4m.1
-man/man1/ppmtoy4m.1
-man/man1/y4mcolorbars.1
-man/man1/y4mtoppm.1
-man/man1/yuv2lav.1
-man/man1/yuvdenoise.1
-man/man1/yuvfps.1
-man/man1/yuvinactive.1
-man/man1/yuvkineco.1
-man/man1/yuvmedianfilter.1
-man/man1/yuvplay.1
-man/man1/yuvscaler.1
-man/man1/yuvycsnoise.1
-man/man5/yuv4mpeg.5
-@dirrm include/mjpegtools/mplex
-@dirrm include/mjpegtools/mpeg2enc
-@dirrm include/mjpegtools
diff --git a/multimedia/mjpegtools/buildlink3.mk b/multimedia/mjpegtools/buildlink3.mk
deleted file mode 100644
index 14a57350c53..00000000000
--- a/multimedia/mjpegtools/buildlink3.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/10/03 00:13:03 tv Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-MJPEGTOOLS_BUILDLINK3_MK:=	${MJPEGTOOLS_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	mjpegtools
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmjpegtools}
-BUILDLINK_PACKAGES+=	mjpegtools
-
-.if !empty(MJPEGTOOLS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.mjpegtools+=		mjpegtools>=1.6.1.90nb3
-BUILDLINK_RECOMMENDED.mjpegtools+=	mjpegtools>=1.6.2nb2
-BUILDLINK_PKGSRCDIR.mjpegtools?=	../../multimedia/mjpegtools
-.endif	# MJPEGTOOLS_BUILDLINK3_MK
-
-.include "../../audio/lame/buildlink3.mk"
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../graphics/ImageMagick/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
-
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/mjpegtools/distinfo b/multimedia/mjpegtools/distinfo
deleted file mode 100644
index 2bf03cf1cb5..00000000000
--- a/multimedia/mjpegtools/distinfo
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: distinfo,v 1.8 2005/06/06 19:10:44 jmmv Exp $
-
-SHA1 (mjpegtools-1.6.2.tar.gz) = c69ce6cd8a37c133c92d677f21650ae541c86575
-RMD160 (mjpegtools-1.6.2.tar.gz) = 48d4e6fa037f18973bae7d22ac14412182361c23
-Size (mjpegtools-1.6.2.tar.gz) = 1256280 bytes
-SHA1 (patch-aa) = 503728c18cc066b78877a7fbe73e42976cea7530
-SHA1 (patch-ab) = 5a97e966ac42b85e4f81e7a278b6953249b5aa79
-SHA1 (patch-ac) = 0297beecec5947ae153b60a43891c9d373255af5
-SHA1 (patch-ad) = f5f0b017be1fdec1613f256487be1cbb5ba4bea8
-SHA1 (patch-ae) = 63594acbbf05b724183dfb9c25357faebea0b72a
-SHA1 (patch-af) = 2771056cc4d54dd22db6d04ef1ac62cd0a786171
-SHA1 (patch-ag) = ff2e38db476d48e14a97216c7c9816ef6066483f
-SHA1 (patch-ah) = 8941e4c28fe959614e5197813219121ba6b42b0e
-SHA1 (patch-ai) = cd2efe44271ecb8ef68107cb55b5be2697e5b985
-SHA1 (patch-aj) = b5021ec3a21e972b42f8625dbb49ac2eb5bb0b1d
-SHA1 (patch-ak) = 2f60a7f0fcdba89d1c796ef5a42c3f057c24eb02
-SHA1 (patch-al) = ce7412f0bf1b9028257767751cbbd63d4239a327
-SHA1 (patch-am) = e5d3813884036d3f26938bebd6e039c1ff532739
-SHA1 (patch-an) = 0f16df6a3e0ad870162ca394b9aa57dce2854230
-SHA1 (patch-ao) = 4fe99c5d321e8d41b9b2790c515da68e9b0bdf03
-SHA1 (patch-ap) = 0d57387658ddffef2cf69a4349570b1f2ef6b5b8
-SHA1 (patch-aq) = 39ab8e3f77488f1e5fa8e523e5ca96afbf925d99
-SHA1 (patch-ar) = 803856b6f8c02ca0255e4c7e60964301df8fa69b
-SHA1 (patch-as) = 553134147c0f98b4a3effd1f3c735b8516068c94
diff --git a/multimedia/mjpegtools/hacks.mk b/multimedia/mjpegtools/hacks.mk
deleted file mode 100644
index c30b7f7cee5..00000000000
--- a/multimedia/mjpegtools/hacks.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-#	$NetBSD: hacks.mk,v 1.2 2005/07/29 01:15:16 grant Exp $
-
-.if !defined(MJPEGTOOLS_HACKS_MK)
-MJPEGTOOLS_HACKS_MK= defined
-
-### Hack to work around MacOS X 4.x (and probably other)'s gcc 4.x 
-### which does not understand -fmove-all-movables. Remove that option
-### if gcc-4 is used.
-###
-.include "../../mk/compiler.mk"
-
-.if !empty(CC_VERSION:Mgcc-4.*)
-BUILDLINK_TRANSFORM+=   rm:-fmove-all-movables
-.endif
-
-.endif	# MJPEGTOOLS_HACKS_MK
diff --git a/multimedia/mjpegtools/options.mk b/multimedia/mjpegtools/options.mk
deleted file mode 100644
index 1ee2ef8645c..00000000000
--- a/multimedia/mjpegtools/options.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2005/06/07 21:23:04 wiz Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.mjpegtools
-PKG_SUPPORTED_OPTIONS=	mjpegtools-cmov
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mmjpegtools-cmov)
-CONFIGURE_ARGS+=	--enable-cmov-extension
-.else
-CONFIGURE_ARGS+=	--disable-cmov-extension
-.endif
diff --git a/multimedia/mjpegtools/patches/patch-aa b/multimedia/mjpegtools/patches/patch-aa
deleted file mode 100644
index 0e8e544f2db..00000000000
--- a/multimedia/mjpegtools/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2004/05/07 12:06:47 cjep Exp $
---- ./mplex/Makefile.in.orig	2004-02-04 07:58:31.000000000 +0900
-+++ ./mplex/Makefile.in	2004-04-17 10:57:01.000000000 +0900
-@@ -267,7 +267,7 @@
- 
- 
- libmplex2_la_LIBADD = \
--	$(top_builddir)/utils/libmjpegutils.a
-+	$(top_builddir)/utils/libmjpegutils.la
- 
- 
- libmplex2_la_CXXFLAGS = $(ZALPHA_FLAGS)
-@@ -285,7 +285,7 @@
- CONFIG_CLEAN_FILES =
- LTLIBRARIES = $(lib_LTLIBRARIES)
- 
--libmplex2_la_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a
-+libmplex2_la_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la
- am__libmplex2_la_SOURCES_DIST = ac3strm_in.cpp audiostrm_out.cpp \
- 	bits.cpp buffer.cpp dtsstrm_in.cpp inputstrm.cpp interact.cpp \
- 	lpcmstrm_in.cpp mpastrm_in.cpp multiplexor.cpp padstrm.cpp \
diff --git a/multimedia/mjpegtools/patches/patch-ab b/multimedia/mjpegtools/patches/patch-ab
deleted file mode 100644
index 2eb327f681b..00000000000
--- a/multimedia/mjpegtools/patches/patch-ab
+++ /dev/null
@@ -1,348 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2004/05/07 12:06:47 cjep Exp $
---- ./lavtools/Makefile.in.orig	2004-04-17 11:15:14.000000000 +0900
-+++ ./lavtools/Makefile.in	2004-04-17 11:11:41.000000000 +0900
-@@ -319,122 +319,122 @@
- 
- 
- ypipe_SOURCES = ypipe.c
--ypipe_LDADD = $(top_builddir)/utils/libmjpegutils.a
-+ypipe_LDADD = $(top_builddir)/utils/libmjpegutils.la
- 
- yuv2lav_SOURCES = yuv2lav.c
--yuv2lav_LDADD = $(top_builddir)/utils/libmjpegutils.a \
-+yuv2lav_LDADD = $(top_builddir)/utils/libmjpegutils.la \
- 		 liblavfile.la liblavjpeg.la ${LIBM_LIBS}
- 
- 
- transist_flt_SOURCES = transist.flt.c
--transist_flt_LDADD = $(top_builddir)/utils/libmjpegutils.a
-+transist_flt_LDADD = $(top_builddir)/utils/libmjpegutils.la
- 
- matteblend_flt_SOURCES = matteblend.flt.c
--matteblend_flt_LDADD = $(top_builddir)/utils/libmjpegutils.a
-+matteblend_flt_LDADD = $(top_builddir)/utils/libmjpegutils.la
- 
- multiblend_flt_SOURCES = multiblend.flt.c
--multiblend_flt_LDADD = $(top_builddir)/utils/libmjpegutils.a
-+multiblend_flt_LDADD = $(top_builddir)/utils/libmjpegutils.la
- 
- @HAVE_X_TRUE@LAVPLAY_X_LIBS = $(X_LIBS) -lX11
- 
- lavplay_SOURCES = lavplay.c
--lavplay_LDADD = $(top_builddir)/utils/libmjpegutils.a \
-+lavplay_LDADD = $(top_builddir)/utils/libmjpegutils.la \
- 	liblavplay.la liblavjpeg.la liblavfile.la \
--	@LIBGETOPT_LIB@ ${PTHREAD_LIBS} ${SDL_LIBS} $(LAVPLAY_X_LIBS)
-+	@LIBGETOPT_LIB@ ${PTHREAD_LIBS} ${SDL_LIBS} $(LAVPLAY_X_LIBS) $(LIBOSSAUDIO)
- 
- 
- lavrec_SOURCES = lavrec.c
--lavrec_LDADD = $(top_builddir)/utils/libmjpegutils.a \
-+lavrec_LDADD = $(top_builddir)/utils/libmjpegutils.la \
- 	liblavrec.la liblavfile.la liblavjpeg.la \
- 	@LIBGETOPT_LIB@ $(PTHREAD_LIBS)
- 
- 
- testrec_SOURCES = testrec.c audiolib.c
--testrec_LDADD = $(PTHREAD_LIBS) $(top_builddir)/utils/libmjpegutils.a
-+testrec_LDADD = $(PTHREAD_LIBS) $(top_builddir)/utils/libmjpegutils.la
- 
- lav2yuv_SOURCES = lav2yuv.c lav_common.c
--lav2yuv_LDADD = $(top_builddir)/utils/libmjpegutils.a \
-+lav2yuv_LDADD = $(top_builddir)/utils/libmjpegutils.la \
- 		liblavfile.la liblavjpeg.la $(DV_LIBS)
- 
- 
- jpeg2yuv_SOURCES = jpeg2yuv.c
--jpeg2yuv_LDADD = $(top_builddir)/utils/libmjpegutils.a liblavjpeg.la
-+jpeg2yuv_LDADD = $(top_builddir)/utils/libmjpegutils.la liblavjpeg.la
- 
- png2yuv_SOURCES = png2yuv.c colorspace.c subsample.c
--png2yuv_LDADD = $(top_builddir)/utils/libmjpegutils.a -lpng -lz -lm
-+png2yuv_LDADD = $(top_builddir)/utils/libmjpegutils.la -lpng -lz -lm
- 
- lavpipe_SOURCES = lavpipe.c pipelist.c
--lavpipe_LDADD = $(top_builddir)/utils/libmjpegutils.a
-+lavpipe_LDADD = $(top_builddir)/utils/libmjpegutils.la
- 
- yuvmedianfilter_SOURCES = yuvmedianfilter.c
--yuvmedianfilter_LDADD = $(top_builddir)/utils/libmjpegutils.a
-+yuvmedianfilter_LDADD = $(top_builddir)/utils/libmjpegutils.la
- 
- lav2wav_SOURCES = lav2wav.c
--lav2wav_LDADD = $(top_builddir)/utils/libmjpegutils.a \
-+lav2wav_LDADD = $(top_builddir)/utils/libmjpegutils.la \
- 	 liblavfile.la
- 
- 
- lavtrans_SOURCES = lavtrans.c
--lavtrans_LDADD = $(top_builddir)/utils/libmjpegutils.a \
-+lavtrans_LDADD = $(top_builddir)/utils/libmjpegutils.la \
- 	 liblavfile.la
- 
- 
- lavaddwav_SOURCES = lavaddwav.c
--lavaddwav_LDADD = $(top_builddir)/utils/libmjpegutils.a \
-+lavaddwav_LDADD = $(top_builddir)/utils/libmjpegutils.la \
- 	 liblavfile.la
- 
- 
- glav_SOURCES = glav.c glav_main.c
--glav_LDADD = $(top_builddir)/utils/libmjpegutils.a ${GTK_LIBS}
-+glav_LDADD = $(top_builddir)/utils/libmjpegutils.la ${GTK_LIBS}
- 
- lavvideo_SOURCES = lavvideo.c frequencies.c
- 
- yuvscaler_SOURCES = yuvscaler.c yuvscaler_resample.c yuvscaler_bicubic.c
--yuvscaler_LDADD = $(top_builddir)/utils/libmjpegutils.a $(LIBM_LIBS)
-+yuvscaler_LDADD = $(top_builddir)/utils/libmjpegutils.la $(LIBM_LIBS)
- 
- yuvcorrect_SOURCES = yuvcorrect.c yuvcorrect_functions.c
--yuvcorrect_LDADD = $(top_builddir)/utils/libmjpegutils.a $(LIBM_LIBS)
-+yuvcorrect_LDADD = $(top_builddir)/utils/libmjpegutils.la $(LIBM_LIBS)
- 
- yuvcorrect_tune_SOURCES = yuvcorrect_tune.c yuvcorrect_functions.c
--yuvcorrect_tune_LDADD = $(top_builddir)/utils/libmjpegutils.a $(LIBM_LIBS)
-+yuvcorrect_tune_LDADD = $(top_builddir)/utils/libmjpegutils.la $(LIBM_LIBS)
- 
- yuvplay_SOURCES = yuvplay.c
--yuvplay_LDADD = $(SDL_LIBS) $(PTHREAD_LIBS) $(top_builddir)/utils/libmjpegutils.a
-+yuvplay_LDADD = $(SDL_LIBS) $(PTHREAD_LIBS) $(top_builddir)/utils/libmjpegutils.la
- 
- ppmtoy4m_SOURCES = ppmtoy4m.c colorspace.c subsample.c
--ppmtoy4m_LDADD = $(top_builddir)/utils/libmjpegutils.a
-+ppmtoy4m_LDADD = $(top_builddir)/utils/libmjpegutils.la
- 
- pgmtoy4m_SOURCES = pgmtoy4m.c
--pgmtoy4m_LDADD = $(top_builddir)/utils/libmjpegutils.a
-+pgmtoy4m_LDADD = $(top_builddir)/utils/libmjpegutils.la
- 
- y4mtoppm_SOURCES = y4mtoppm.c colorspace.c subsample.c
--y4mtoppm_LDADD = $(top_builddir)/utils/libmjpegutils.a
-+y4mtoppm_LDADD = $(top_builddir)/utils/libmjpegutils.la
- 
- y4mcolorbars_SOURCES = y4mcolorbars.c colorspace.c subsample.c
--y4mcolorbars_LDADD = $(top_builddir)/utils/libmjpegutils.a
-+y4mcolorbars_LDADD = $(top_builddir)/utils/libmjpegutils.la
- 
- lavinfo_SOURCES = lavinfo.c
--lavinfo_LDADD = $(top_builddir)/utils/libmjpegutils.a \
-+lavinfo_LDADD = $(top_builddir)/utils/libmjpegutils.la \
- 	liblavfile.la
- 
- 
- y4mshift_SOURCES = y4mshift.c
--y4mshift_LDADD = $(top_builddir)/utils/libmjpegutils.a
-+y4mshift_LDADD = $(top_builddir)/utils/libmjpegutils.la
- 
- y4mblack_SOURCES = y4mblack.c
--y4mblack_LDADD = $(top_builddir)/utils/libmjpegutils.a
-+y4mblack_LDADD = $(top_builddir)/utils/libmjpegutils.la
- 
- y4mtoyuv_SOURCES = y4mtoyuv.c
--y4mtoyuv_LDADD = $(top_builddir)/utils/libmjpegutils.a
-+y4mtoyuv_LDADD = $(top_builddir)/utils/libmjpegutils.la
- 
- yuv4mpeg_SOURCES = yuv4mpeg.c
--yuv4mpeg_LDADD = $(top_builddir)/utils/libmjpegutils.a
-+yuv4mpeg_LDADD = $(top_builddir)/utils/libmjpegutils.la
- 
- yuvfps_SOURCES = yuvfps.c
--yuvfps_LDADD = ${top_builddir}/utils/libmjpegutils.a
-+yuvfps_LDADD = ${top_builddir}/utils/libmjpegutils.la
- 
- yuvinactive_SOURCES = yuvinactive.c
--yuvinactive_LDADD = ${top_builddir}/utils/libmjpegutils.a
-+yuvinactive_LDADD = ${top_builddir}/utils/libmjpegutils.la
- subdir = lavtools
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -1436,54 +1436,54 @@
- 
- am_glav_OBJECTS = glav.$(OBJEXT) glav_main.$(OBJEXT)
- glav_OBJECTS = $(am_glav_OBJECTS)
--glav_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a
-+glav_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la
- glav_LDFLAGS =
- am_jpeg2yuv_OBJECTS = jpeg2yuv.$(OBJEXT)
- jpeg2yuv_OBJECTS = $(am_jpeg2yuv_OBJECTS)
--jpeg2yuv_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a \
-+jpeg2yuv_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la \
- 	liblavjpeg.la
- jpeg2yuv_LDFLAGS =
- am_lav2wav_OBJECTS = lav2wav.$(OBJEXT)
- lav2wav_OBJECTS = $(am_lav2wav_OBJECTS)
--lav2wav_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a \
-+lav2wav_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la \
- 	liblavfile.la
- lav2wav_LDFLAGS =
- am_lav2yuv_OBJECTS = lav2yuv.$(OBJEXT) lav_common.$(OBJEXT)
- lav2yuv_OBJECTS = $(am_lav2yuv_OBJECTS)
--lav2yuv_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a \
-+lav2yuv_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la \
- 	liblavfile.la liblavjpeg.la
- lav2yuv_LDFLAGS =
- am_lavaddwav_OBJECTS = lavaddwav.$(OBJEXT)
- lavaddwav_OBJECTS = $(am_lavaddwav_OBJECTS)
--lavaddwav_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a \
-+lavaddwav_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la \
- 	liblavfile.la
- lavaddwav_LDFLAGS =
- am_lavinfo_OBJECTS = lavinfo.$(OBJEXT)
- lavinfo_OBJECTS = $(am_lavinfo_OBJECTS)
--lavinfo_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a \
-+lavinfo_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la \
- 	liblavfile.la
- lavinfo_LDFLAGS =
- am_lavpipe_OBJECTS = lavpipe.$(OBJEXT) pipelist.$(OBJEXT)
- lavpipe_OBJECTS = $(am_lavpipe_OBJECTS)
--lavpipe_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a
-+lavpipe_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la
- lavpipe_LDFLAGS =
- am_lavplay_OBJECTS = lavplay.$(OBJEXT)
- lavplay_OBJECTS = $(am_lavplay_OBJECTS)
- @HAVE_X_TRUE@lavplay_DEPENDENCIES = \
--@HAVE_X_TRUE@	$(top_builddir)/utils/libmjpegutils.a \
-+@HAVE_X_TRUE@	$(top_builddir)/utils/libmjpegutils.la \
- @HAVE_X_TRUE@	liblavplay.la liblavjpeg.la liblavfile.la
- @HAVE_X_FALSE@lavplay_DEPENDENCIES = \
--@HAVE_X_FALSE@	$(top_builddir)/utils/libmjpegutils.a \
-+@HAVE_X_FALSE@	$(top_builddir)/utils/libmjpegutils.la \
- @HAVE_X_FALSE@	liblavplay.la liblavjpeg.la liblavfile.la
- lavplay_LDFLAGS =
- am_lavrec_OBJECTS = lavrec.$(OBJEXT)
- lavrec_OBJECTS = $(am_lavrec_OBJECTS)
--lavrec_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a liblavrec.la \
--	liblavfile.la liblavjpeg.la
-+lavrec_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la \
-+	liblavrec.la liblavfile.la liblavjpeg.la
- lavrec_LDFLAGS =
- am_lavtrans_OBJECTS = lavtrans.$(OBJEXT)
- lavtrans_OBJECTS = $(am_lavtrans_OBJECTS)
--lavtrans_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a \
-+lavtrans_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la \
- 	liblavfile.la
- lavtrans_LDFLAGS =
- am_lavvideo_OBJECTS = lavvideo.$(OBJEXT) frequencies.$(OBJEXT)
-@@ -1493,99 +1493,99 @@
- lavvideo_LDFLAGS =
- am_matteblend_flt_OBJECTS = matteblend.flt.$(OBJEXT)
- matteblend_flt_OBJECTS = $(am_matteblend_flt_OBJECTS)
--matteblend_flt_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a
-+matteblend_flt_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la
- matteblend_flt_LDFLAGS =
- am_multiblend_flt_OBJECTS = multiblend.flt.$(OBJEXT)
- multiblend_flt_OBJECTS = $(am_multiblend_flt_OBJECTS)
--multiblend_flt_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a
-+multiblend_flt_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la
- multiblend_flt_LDFLAGS =
- am_pgmtoy4m_OBJECTS = pgmtoy4m.$(OBJEXT)
- pgmtoy4m_OBJECTS = $(am_pgmtoy4m_OBJECTS)
--pgmtoy4m_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a
-+pgmtoy4m_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la
- pgmtoy4m_LDFLAGS =
- am_png2yuv_OBJECTS = png2yuv.$(OBJEXT) colorspace.$(OBJEXT) \
- 	subsample.$(OBJEXT)
- png2yuv_OBJECTS = $(am_png2yuv_OBJECTS)
--png2yuv_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a
-+png2yuv_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la
- png2yuv_LDFLAGS =
- am_ppmtoy4m_OBJECTS = ppmtoy4m.$(OBJEXT) colorspace.$(OBJEXT) \
- 	subsample.$(OBJEXT)
- ppmtoy4m_OBJECTS = $(am_ppmtoy4m_OBJECTS)
--ppmtoy4m_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a
-+ppmtoy4m_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la
- ppmtoy4m_LDFLAGS =
- am_testrec_OBJECTS = testrec.$(OBJEXT) audiolib.$(OBJEXT)
- testrec_OBJECTS = $(am_testrec_OBJECTS)
--testrec_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a
-+testrec_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la
- testrec_LDFLAGS =
- am_transist_flt_OBJECTS = transist.flt.$(OBJEXT)
- transist_flt_OBJECTS = $(am_transist_flt_OBJECTS)
--transist_flt_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a
-+transist_flt_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la
- transist_flt_LDFLAGS =
- am_y4mblack_OBJECTS = y4mblack.$(OBJEXT)
- y4mblack_OBJECTS = $(am_y4mblack_OBJECTS)
--y4mblack_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a
-+y4mblack_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la
- y4mblack_LDFLAGS =
- am_y4mcolorbars_OBJECTS = y4mcolorbars.$(OBJEXT) colorspace.$(OBJEXT) \
- 	subsample.$(OBJEXT)
- y4mcolorbars_OBJECTS = $(am_y4mcolorbars_OBJECTS)
--y4mcolorbars_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a
-+y4mcolorbars_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la
- y4mcolorbars_LDFLAGS =
- am_y4mshift_OBJECTS = y4mshift.$(OBJEXT)
- y4mshift_OBJECTS = $(am_y4mshift_OBJECTS)
--y4mshift_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a
-+y4mshift_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la
- y4mshift_LDFLAGS =
- am_y4mtoppm_OBJECTS = y4mtoppm.$(OBJEXT) colorspace.$(OBJEXT) \
- 	subsample.$(OBJEXT)
- y4mtoppm_OBJECTS = $(am_y4mtoppm_OBJECTS)
--y4mtoppm_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a
-+y4mtoppm_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la
- y4mtoppm_LDFLAGS =
- am_y4mtoyuv_OBJECTS = y4mtoyuv.$(OBJEXT)
- y4mtoyuv_OBJECTS = $(am_y4mtoyuv_OBJECTS)
--y4mtoyuv_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a
-+y4mtoyuv_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la
- y4mtoyuv_LDFLAGS =
- am_ypipe_OBJECTS = ypipe.$(OBJEXT)
- ypipe_OBJECTS = $(am_ypipe_OBJECTS)
--ypipe_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a
-+ypipe_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la
- ypipe_LDFLAGS =
- am_yuv2lav_OBJECTS = yuv2lav.$(OBJEXT)
- yuv2lav_OBJECTS = $(am_yuv2lav_OBJECTS)
--yuv2lav_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a \
-+yuv2lav_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la \
- 	liblavfile.la liblavjpeg.la
- yuv2lav_LDFLAGS =
- am_yuv4mpeg_OBJECTS = yuv4mpeg.$(OBJEXT)
- yuv4mpeg_OBJECTS = $(am_yuv4mpeg_OBJECTS)
--yuv4mpeg_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a
-+yuv4mpeg_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la
- yuv4mpeg_LDFLAGS =
- am_yuvcorrect_OBJECTS = yuvcorrect.$(OBJEXT) \
- 	yuvcorrect_functions.$(OBJEXT)
- yuvcorrect_OBJECTS = $(am_yuvcorrect_OBJECTS)
--yuvcorrect_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a
-+yuvcorrect_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la
- yuvcorrect_LDFLAGS =
- am_yuvcorrect_tune_OBJECTS = yuvcorrect_tune.$(OBJEXT) \
- 	yuvcorrect_functions.$(OBJEXT)
- yuvcorrect_tune_OBJECTS = $(am_yuvcorrect_tune_OBJECTS)
--yuvcorrect_tune_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a
-+yuvcorrect_tune_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la
- yuvcorrect_tune_LDFLAGS =
- am_yuvfps_OBJECTS = yuvfps.$(OBJEXT)
- yuvfps_OBJECTS = $(am_yuvfps_OBJECTS)
--yuvfps_DEPENDENCIES = ${top_builddir}/utils/libmjpegutils.a
-+yuvfps_DEPENDENCIES = ${top_builddir}/utils/libmjpegutils.la
- yuvfps_LDFLAGS =
- am_yuvinactive_OBJECTS = yuvinactive.$(OBJEXT)
- yuvinactive_OBJECTS = $(am_yuvinactive_OBJECTS)
--yuvinactive_DEPENDENCIES = ${top_builddir}/utils/libmjpegutils.a
-+yuvinactive_DEPENDENCIES = ${top_builddir}/utils/libmjpegutils.la
- yuvinactive_LDFLAGS =
- am_yuvmedianfilter_OBJECTS = yuvmedianfilter.$(OBJEXT)
- yuvmedianfilter_OBJECTS = $(am_yuvmedianfilter_OBJECTS)
--yuvmedianfilter_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a
-+yuvmedianfilter_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la
- yuvmedianfilter_LDFLAGS =
- am_yuvplay_OBJECTS = yuvplay.$(OBJEXT)
- yuvplay_OBJECTS = $(am_yuvplay_OBJECTS)
--yuvplay_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a
-+yuvplay_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la
- yuvplay_LDFLAGS =
- am_yuvscaler_OBJECTS = yuvscaler.$(OBJEXT) yuvscaler_resample.$(OBJEXT) \
- 	yuvscaler_bicubic.$(OBJEXT)
- yuvscaler_OBJECTS = $(am_yuvscaler_OBJECTS)
--yuvscaler_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a
-+yuvscaler_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la
- yuvscaler_LDFLAGS =
- 
- DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
diff --git a/multimedia/mjpegtools/patches/patch-ac b/multimedia/mjpegtools/patches/patch-ac
deleted file mode 100644
index 34cdb7110b6..00000000000
--- a/multimedia/mjpegtools/patches/patch-ac
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/01/26 12:44:06 jmmv Exp $
-
---- lavtools/audiolib.c.orig	Mon Dec  8 13:28:32 2003
-+++ lavtools/audiolib.c	Sun Jan 25 15:47:33 2004
-@@ -665,7 +665,9 @@
-    const char *audio_dev_name;
- 
- #ifndef FORK_NOT_THREAD
-+#if !defined(__NetBSD__) || __NetBSD_Version__ >= 106130000	/* 1.6M */
-    struct sched_param schedparam;
-+#endif
-    sigset_t blocked_signals;
- 
-    /* Set the capture thread in a reasonable state - cancellation enabled
-@@ -862,7 +864,8 @@
-          memset(buf+nbset*info.fragsize,0,info.fragsize);
-    }
- 
--#ifndef FORK_NOT_THREAD
-+#if !defined(FORK_NOT_THREAD) && \
-+    (!defined(__NetBSD__) || __NetBSD_Version__ >= 106130000)	/* 1.6M */
-    /* Now we're ready to go move to Real-time scheduling... */
-    schedparam.sched_priority = 1;
- 
diff --git a/multimedia/mjpegtools/patches/patch-ad b/multimedia/mjpegtools/patches/patch-ad
deleted file mode 100644
index de51adb900c..00000000000
--- a/multimedia/mjpegtools/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2004/04/04 11:04:59 mrg Exp $
-
---- utils/altivec/amber.c.orig	2002-11-17 14:43:59.000000000 +1100
-+++ utils/altivec/amber.c	2004-04-04 18:29:17.000000000 +1000
-@@ -29,7 +29,7 @@
- #ifdef HAVE_SYS_TYPES_H
- #include <sys/types.h>
- #endif
--#include <sys/errno.h>
-+#include <errno.h>
- #include <sys/stat.h>
- #include <dirent.h>
- 
diff --git a/multimedia/mjpegtools/patches/patch-ae b/multimedia/mjpegtools/patches/patch-ae
deleted file mode 100644
index 6fdf8955e4b..00000000000
--- a/multimedia/mjpegtools/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2004/04/11 08:31:55 taca Exp $
-
---- utils/altivec/sub_mean_reduction_ppc.S.orig	2002-11-17 12:43:59.000000000 +0900
-+++ utils/altivec/sub_mean_reduction_ppc.S
-@@ -18,7 +18,7 @@
-  */
- 
- /* register, local label and global macros */
--#ifdef __linux__
-+#if defined(__linux__) || defined(__NetBSD__)
- #define R(register_number) register_number
- #define L(label_name) .L##label_name
- #define G(global_name) global_name
diff --git a/multimedia/mjpegtools/patches/patch-af b/multimedia/mjpegtools/patches/patch-af
deleted file mode 100644
index 788554a8d13..00000000000
--- a/multimedia/mjpegtools/patches/patch-af
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-af,v 1.2 2004/05/07 12:06:47 cjep Exp $
---- ./aenc/Makefile.am.orig	2003-11-25 19:36:30.000000000 +0900
-+++ ./aenc/Makefile.am	2004-04-17 10:57:01.000000000 +0900
-@@ -27,4 +27,4 @@
- 	table_th.h \
- 	wav_io.h
- 
--mp2enc_LDADD = $(top_builddir)/utils/libmjpegutils.a $(LIBM_LIBS)
-+mp2enc_LDADD = $(top_builddir)/utils/libmjpegutils.la $(LIBM_LIBS)
diff --git a/multimedia/mjpegtools/patches/patch-ag b/multimedia/mjpegtools/patches/patch-ag
deleted file mode 100644
index 326d17386ab..00000000000
--- a/multimedia/mjpegtools/patches/patch-ag
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2004/05/07 12:06:47 cjep Exp $
---- ./aenc/Makefile.in.orig	2004-02-04 07:58:28.000000000 +0900
-+++ ./aenc/Makefile.in	2004-04-17 10:57:01.000000000 +0900
-@@ -229,7 +229,7 @@
- 	wav_io.h
- 
- 
--mp2enc_LDADD = $(top_builddir)/utils/libmjpegutils.a $(LIBM_LIBS)
-+mp2enc_LDADD = $(top_builddir)/utils/libmjpegutils.la $(LIBM_LIBS)
- subdir = aenc
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -242,7 +242,7 @@
- 	musicin.$(OBJEXT) psy.$(OBJEXT) subs.$(OBJEXT) tables.$(OBJEXT) \
- 	tonal.$(OBJEXT) wav_io.$(OBJEXT)
- mp2enc_OBJECTS = $(am_mp2enc_OBJECTS)
--mp2enc_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a
-+mp2enc_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la
- mp2enc_LDFLAGS =
- 
- DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
diff --git a/multimedia/mjpegtools/patches/patch-ah b/multimedia/mjpegtools/patches/patch-ah
deleted file mode 100644
index d99f755dc5f..00000000000
--- a/multimedia/mjpegtools/patches/patch-ah
+++ /dev/null
@@ -1,149 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2004/05/07 12:06:47 cjep Exp $
---- ./lavtools/Makefile.am.orig	2004-01-02 04:59:55.000000000 +0900
-+++ ./lavtools/Makefile.am	2004-04-17 10:57:01.000000000 +0900
-@@ -133,113 +133,113 @@
- 	yuvcorrect.h
- 
- ypipe_SOURCES = ypipe.c
--ypipe_LDADD = $(top_builddir)/utils/libmjpegutils.a
-+ypipe_LDADD = $(top_builddir)/utils/libmjpegutils.la
- 
- yuv2lav_SOURCES = yuv2lav.c
--yuv2lav_LDADD = $(top_builddir)/utils/libmjpegutils.a \
-+yuv2lav_LDADD = $(top_builddir)/utils/libmjpegutils.la \
- 		 liblavfile.la liblavjpeg.la ${LIBM_LIBS}
- 
- transist_flt_SOURCES = transist.flt.c
--transist_flt_LDADD = $(top_builddir)/utils/libmjpegutils.a
-+transist_flt_LDADD = $(top_builddir)/utils/libmjpegutils.la
- 
- matteblend_flt_SOURCES = matteblend.flt.c
--matteblend_flt_LDADD = $(top_builddir)/utils/libmjpegutils.a
-+matteblend_flt_LDADD = $(top_builddir)/utils/libmjpegutils.la
- 
- multiblend_flt_SOURCES = multiblend.flt.c
--multiblend_flt_LDADD = $(top_builddir)/utils/libmjpegutils.a
-+multiblend_flt_LDADD = $(top_builddir)/utils/libmjpegutils.la
- 
- if HAVE_X
-   LAVPLAY_X_LIBS = $(X_LIBS) -lX11
- endif
- 
- lavplay_SOURCES = lavplay.c
--lavplay_LDADD = $(top_builddir)/utils/libmjpegutils.a \
-+lavplay_LDADD = $(top_builddir)/utils/libmjpegutils.la \
- 	liblavplay.la liblavjpeg.la liblavfile.la \
- 	@LIBGETOPT_LIB@ ${PTHREAD_LIBS} ${SDL_LIBS} $(LAVPLAY_X_LIBS)
- 
- lavrec_SOURCES = lavrec.c
--lavrec_LDADD = $(top_builddir)/utils/libmjpegutils.a \
-+lavrec_LDADD = $(top_builddir)/utils/libmjpegutils.la \
- 	liblavrec.la liblavfile.la liblavjpeg.la \
- 	@LIBGETOPT_LIB@ $(PTHREAD_LIBS)
- 
- testrec_SOURCES = testrec.c audiolib.c
--testrec_LDADD = $(PTHREAD_LIBS) $(top_builddir)/utils/libmjpegutils.a
-+testrec_LDADD = $(PTHREAD_LIBS) $(top_builddir)/utils/libmjpegutils.la
- 
- lav2yuv_SOURCES = lav2yuv.c lav_common.c
--lav2yuv_LDADD = $(top_builddir)/utils/libmjpegutils.a \
-+lav2yuv_LDADD = $(top_builddir)/utils/libmjpegutils.la \
- 		liblavfile.la liblavjpeg.la $(DV_LIBS)
- 
- jpeg2yuv_SOURCES = jpeg2yuv.c
--jpeg2yuv_LDADD = $(top_builddir)/utils/libmjpegutils.a liblavjpeg.la
-+jpeg2yuv_LDADD = $(top_builddir)/utils/libmjpegutils.la liblavjpeg.la
- 
- png2yuv_SOURCES = png2yuv.c colorspace.c subsample.c
--png2yuv_LDADD = $(top_builddir)/utils/libmjpegutils.a -lpng -lz -lm
-+png2yuv_LDADD = $(top_builddir)/utils/libmjpegutils.la -lpng -lz -lm
- 
- lavpipe_SOURCES = lavpipe.c pipelist.c
--lavpipe_LDADD = $(top_builddir)/utils/libmjpegutils.a
-+lavpipe_LDADD = $(top_builddir)/utils/libmjpegutils.la
- 
- yuvmedianfilter_SOURCES = yuvmedianfilter.c
--yuvmedianfilter_LDADD = $(top_builddir)/utils/libmjpegutils.a
-+yuvmedianfilter_LDADD = $(top_builddir)/utils/libmjpegutils.la
- 
- lav2wav_SOURCES = lav2wav.c
--lav2wav_LDADD = $(top_builddir)/utils/libmjpegutils.a \
-+lav2wav_LDADD = $(top_builddir)/utils/libmjpegutils.la \
- 	 liblavfile.la
- 
- lavtrans_SOURCES = lavtrans.c
--lavtrans_LDADD = $(top_builddir)/utils/libmjpegutils.a \
-+lavtrans_LDADD = $(top_builddir)/utils/libmjpegutils.la \
- 	 liblavfile.la
- 
- lavaddwav_SOURCES = lavaddwav.c
--lavaddwav_LDADD = $(top_builddir)/utils/libmjpegutils.a \
-+lavaddwav_LDADD = $(top_builddir)/utils/libmjpegutils.la \
- 	 liblavfile.la
- 
- glav_SOURCES = glav.c glav_main.c
--glav_LDADD = $(top_builddir)/utils/libmjpegutils.a ${GTK_LIBS}
-+glav_LDADD = $(top_builddir)/utils/libmjpegutils.la ${GTK_LIBS}
- 
- lavvideo_SOURCES = lavvideo.c frequencies.c
- 
- yuvscaler_SOURCES = yuvscaler.c yuvscaler_resample.c yuvscaler_bicubic.c
--yuvscaler_LDADD = $(top_builddir)/utils/libmjpegutils.a $(LIBM_LIBS)
-+yuvscaler_LDADD = $(top_builddir)/utils/libmjpegutils.la $(LIBM_LIBS)
- 
- yuvcorrect_SOURCES = yuvcorrect.c yuvcorrect_functions.c
--yuvcorrect_LDADD = $(top_builddir)/utils/libmjpegutils.a $(LIBM_LIBS)
-+yuvcorrect_LDADD = $(top_builddir)/utils/libmjpegutils.la $(LIBM_LIBS)
- 
- yuvcorrect_tune_SOURCES = yuvcorrect_tune.c yuvcorrect_functions.c
--yuvcorrect_tune_LDADD = $(top_builddir)/utils/libmjpegutils.a $(LIBM_LIBS)
-+yuvcorrect_tune_LDADD = $(top_builddir)/utils/libmjpegutils.la $(LIBM_LIBS)
- 
- yuvplay_SOURCES = yuvplay.c
--yuvplay_LDADD = $(SDL_LIBS) $(PTHREAD_LIBS) $(top_builddir)/utils/libmjpegutils.a
-+yuvplay_LDADD = $(SDL_LIBS) $(PTHREAD_LIBS) $(top_builddir)/utils/libmjpegutils.la
- 
- ppmtoy4m_SOURCES = ppmtoy4m.c colorspace.c subsample.c
--ppmtoy4m_LDADD = $(top_builddir)/utils/libmjpegutils.a
-+ppmtoy4m_LDADD = $(top_builddir)/utils/libmjpegutils.la
- 
- pgmtoy4m_SOURCES = pgmtoy4m.c
--pgmtoy4m_LDADD = $(top_builddir)/utils/libmjpegutils.a
-+pgmtoy4m_LDADD = $(top_builddir)/utils/libmjpegutils.la
- 
- y4mtoppm_SOURCES = y4mtoppm.c colorspace.c subsample.c
--y4mtoppm_LDADD = $(top_builddir)/utils/libmjpegutils.a
-+y4mtoppm_LDADD = $(top_builddir)/utils/libmjpegutils.la
- 
- y4mcolorbars_SOURCES = y4mcolorbars.c colorspace.c subsample.c
--y4mcolorbars_LDADD = $(top_builddir)/utils/libmjpegutils.a
-+y4mcolorbars_LDADD = $(top_builddir)/utils/libmjpegutils.la
- 
- lavinfo_SOURCES = lavinfo.c
--lavinfo_LDADD = $(top_builddir)/utils/libmjpegutils.a \
-+lavinfo_LDADD = $(top_builddir)/utils/libmjpegutils.la \
- 	liblavfile.la
- 
- y4mshift_SOURCES = y4mshift.c
--y4mshift_LDADD = $(top_builddir)/utils/libmjpegutils.a
-+y4mshift_LDADD = $(top_builddir)/utils/libmjpegutils.la
- 
- y4mblack_SOURCES = y4mblack.c
--y4mblack_LDADD = $(top_builddir)/utils/libmjpegutils.a
-+y4mblack_LDADD = $(top_builddir)/utils/libmjpegutils.la
- 
- y4mtoyuv_SOURCES = y4mtoyuv.c
--y4mtoyuv_LDADD = $(top_builddir)/utils/libmjpegutils.a
-+y4mtoyuv_LDADD = $(top_builddir)/utils/libmjpegutils.la
- 
- yuv4mpeg_SOURCES = yuv4mpeg.c
--yuv4mpeg_LDADD = $(top_builddir)/utils/libmjpegutils.a
-+yuv4mpeg_LDADD = $(top_builddir)/utils/libmjpegutils.la
- 
- yuvfps_SOURCES = yuvfps.c
--yuvfps_LDADD = ${top_builddir}/utils/libmjpegutils.a
-+yuvfps_LDADD = ${top_builddir}/utils/libmjpegutils.la
- 
- yuvinactive_SOURCES = yuvinactive.c
--yuvinactive_LDADD = ${top_builddir}/utils/libmjpegutils.a
-+yuvinactive_LDADD = ${top_builddir}/utils/libmjpegutils.la
diff --git a/multimedia/mjpegtools/patches/patch-ai b/multimedia/mjpegtools/patches/patch-ai
deleted file mode 100644
index 37bc129dc20..00000000000
--- a/multimedia/mjpegtools/patches/patch-ai
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2004/05/07 12:06:47 cjep Exp $
---- ./mpeg2enc/Makefile.am.orig	2003-12-21 02:33:38.000000000 +0900
-+++ ./mpeg2enc/Makefile.am	2004-04-17 10:57:01.000000000 +0900
-@@ -113,24 +113,24 @@
- 	-export-dynamic 
- 
- libmpeg2encpp_la_DEPENDENCIES = \
--	$(top_builddir)/utils/libmjpegutils.a \
-+	$(top_builddir)/utils/libmjpegutils.la \
- 	$(top_builddir)/utils/libcpuaccel.la \
- 	$(top_builddir)/utils/libmotion.la \
- 	$(LIBSIMDASM_LIB)
- 
- libmpeg2encpp_la_LIBADD = \
--	$(top_builddir)/utils/libmjpegutils.a \
-+	$(top_builddir)/utils/libmjpegutils.la \
- 	$(top_builddir)/utils/libcpuaccel.la \
- 	$(top_builddir)/utils/libmotion.la \
- 	$(LIBSIMDASM_LIB)
- 
- mpeg2enc_DEPENDENCIES = \
--	$(top_builddir)/utils/libmjpegutils.a \
-+	$(top_builddir)/utils/libmjpegutils.la \
- 	$(top_builddir)/mpeg2enc/libmpeg2encpp.la
- 
- mpeg2enc_LDADD = \
- 	$(top_builddir)/mpeg2enc/libmpeg2encpp.la \
--	$(top_builddir)/utils/libmjpegutils.a \
-+	$(top_builddir)/utils/libmjpegutils.la \
- 	@PTHREAD_LIBS@ @LIBGETOPT_LIB@ $(LIBM_LIBS)
- 
- # VITAL: Override default compilation rules generated by automake...
diff --git a/multimedia/mjpegtools/patches/patch-aj b/multimedia/mjpegtools/patches/patch-aj
deleted file mode 100644
index 6ce781356b7..00000000000
--- a/multimedia/mjpegtools/patches/patch-aj
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-aj,v 1.2 2004/05/07 12:06:47 cjep Exp $
---- ./mpeg2enc/Makefile.in.orig	2004-02-04 07:58:31.000000000 +0900
-+++ ./mpeg2enc/Makefile.in	2004-04-17 10:57:01.000000000 +0900
-@@ -319,27 +319,27 @@
- 
- 
- libmpeg2encpp_la_DEPENDENCIES = \
--	$(top_builddir)/utils/libmjpegutils.a \
-+	$(top_builddir)/utils/libmjpegutils.la \
- 	$(top_builddir)/utils/libcpuaccel.la \
- 	$(top_builddir)/utils/libmotion.la \
- 	$(LIBSIMDASM_LIB)
- 
- 
- libmpeg2encpp_la_LIBADD = \
--	$(top_builddir)/utils/libmjpegutils.a \
-+	$(top_builddir)/utils/libmjpegutils.la \
- 	$(top_builddir)/utils/libcpuaccel.la \
- 	$(top_builddir)/utils/libmotion.la \
- 	$(LIBSIMDASM_LIB)
- 
- 
- mpeg2enc_DEPENDENCIES = \
--	$(top_builddir)/utils/libmjpegutils.a \
-+	$(top_builddir)/utils/libmjpegutils.la \
- 	$(top_builddir)/mpeg2enc/libmpeg2encpp.la
- 
- 
- mpeg2enc_LDADD = \
- 	$(top_builddir)/mpeg2enc/libmpeg2encpp.la \
--	$(top_builddir)/utils/libmjpegutils.a \
-+	$(top_builddir)/utils/libmjpegutils.la \
- 	@PTHREAD_LIBS@ @LIBGETOPT_LIB@ $(LIBM_LIBS)
- 
- 
diff --git a/multimedia/mjpegtools/patches/patch-ak b/multimedia/mjpegtools/patches/patch-ak
deleted file mode 100644
index 4bc1b37a7bd..00000000000
--- a/multimedia/mjpegtools/patches/patch-ak
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2004/05/07 12:06:47 cjep Exp $
---- ./mplex/Makefile.am.orig	2003-12-21 02:33:38.000000000 +0900
-+++ ./mplex/Makefile.am	2004-04-17 10:57:01.000000000 +0900
-@@ -67,7 +67,7 @@
- 	-export-dynamic 
- 
- libmplex2_la_LIBADD = \
--	$(top_builddir)/utils/libmjpegutils.a
-+	$(top_builddir)/utils/libmjpegutils.la
- 
- libmplex2_la_CXXFLAGS = $(ZALPHA_FLAGS)
- 
diff --git a/multimedia/mjpegtools/patches/patch-al b/multimedia/mjpegtools/patches/patch-al
deleted file mode 100644
index 73624cddc92..00000000000
--- a/multimedia/mjpegtools/patches/patch-al
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-al,v 1.2 2004/05/07 12:06:47 cjep Exp $
---- ./utils/Makefile.am.orig	2003-12-21 02:33:38.000000000 +0900
-+++ ./utils/Makefile.am	2004-04-17 10:57:01.000000000 +0900
-@@ -15,16 +15,21 @@
- 
- noinst_LTLIBRARIES = libmotion.la libcpuaccel.la
- 
--# FIXME: make this libtool (but static-only!) too
--lib_LIBRARIES = libmjpegutils.a
-+# transcode depends on a shared libmjpegutils
-+lib_LTLIBRARIES = libmjpegutils.la
- 
--libmjpegutils_a_SOURCES = \
-+libmjpegutils_la_SOURCES = \
- 	mjpeg_logging.c \
- 	mpegconsts.c \
- 	mpegtimecode.c \
- 	yuv4mpeg.c \
- 	yuv4mpeg_ratio.c
- 
-+libmjpegutils_la_LDFLAGS = \
-+	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-+	-release $(LT_RELEASE) \
-+	-export-dynamic 
-+
- noinst_HEADERS = \
- 	attributes.h \
- 	cpu_accel.h \
diff --git a/multimedia/mjpegtools/patches/patch-am b/multimedia/mjpegtools/patches/patch-am
deleted file mode 100644
index 2c4a992d646..00000000000
--- a/multimedia/mjpegtools/patches/patch-am
+++ /dev/null
@@ -1,245 +0,0 @@
-$NetBSD: patch-am,v 1.2 2004/05/07 12:06:47 cjep Exp $
---- ./utils/Makefile.in.orig	2004-02-04 07:58:32.000000000 +0900
-+++ ./utils/Makefile.in	2004-04-17 10:57:01.000000000 +0900
-@@ -209,10 +209,10 @@
- 
- noinst_LTLIBRARIES = libmotion.la libcpuaccel.la
- 
--# FIXME: make this libtool (but static-only!) too
--lib_LIBRARIES = libmjpegutils.a
-+# transcode depends on a shared libmjpegutils
-+lib_LTLIBRARIES = libmjpegutils.la
- 
--libmjpegutils_a_SOURCES = \
-+libmjpegutils_la_SOURCES = \
- 	mjpeg_logging.c \
- 	mpegconsts.c \
- 	mpegtimecode.c \
-@@ -220,6 +220,12 @@
- 	yuv4mpeg_ratio.c
- 
- 
-+libmjpegutils_la_LDFLAGS = \
-+	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-+	-release $(LT_RELEASE) \
-+	-export-dynamic 
-+
-+
- noinst_HEADERS = \
- 	attributes.h \
- 	cpu_accel.h \
-@@ -258,15 +264,7 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
--LIBRARIES = $(lib_LIBRARIES)
--
--libmjpegutils_a_AR = $(AR) cru
--libmjpegutils_a_LIBADD =
--am_libmjpegutils_a_OBJECTS = mjpeg_logging.$(OBJEXT) \
--	mpegconsts.$(OBJEXT) mpegtimecode.$(OBJEXT) yuv4mpeg.$(OBJEXT) \
--	yuv4mpeg_ratio.$(OBJEXT)
--libmjpegutils_a_OBJECTS = $(am_libmjpegutils_a_OBJECTS)
--LTLIBRARIES = $(noinst_LTLIBRARIES)
-+LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
- 
- libcpuaccel_la_LDFLAGS =
- @HAVE_ALTIVEC_FALSE@@HAVE_ASM_MMX_FALSE@@HAVE_ASM_NASM_TRUE@libcpuaccel_la_DEPENDENCIES =
-@@ -285,6 +283,10 @@
- @HAVE_ALTIVEC_TRUE@@HAVE_ASM_MMX_TRUE@@HAVE_ASM_NASM_FALSE@	$(top_builddir)/utils/altivec/libaltivec.la
- am_libcpuaccel_la_OBJECTS = cpu_accel.lo
- libcpuaccel_la_OBJECTS = $(am_libcpuaccel_la_OBJECTS)
-+libmjpegutils_la_LIBADD =
-+am_libmjpegutils_la_OBJECTS = mjpeg_logging.lo mpegconsts.lo \
-+	mpegtimecode.lo yuv4mpeg.lo yuv4mpeg_ratio.lo
-+libmjpegutils_la_OBJECTS = $(am_libmjpegutils_la_OBJECTS)
- libmotion_la_LDFLAGS =
- libmotion_la_LIBADD =
- am_libmotion_la_OBJECTS = motionsearch.lo
-@@ -294,11 +296,12 @@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cpu_accel.Plo \
--@AMDEP_TRUE@	./$(DEPDIR)/mjpeg_logging.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/mjpeg_logging.Plo \
- @AMDEP_TRUE@	./$(DEPDIR)/motionsearch.Plo \
--@AMDEP_TRUE@	./$(DEPDIR)/mpegconsts.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/mpegtimecode.Po ./$(DEPDIR)/yuv4mpeg.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/yuv4mpeg_ratio.Po
-+@AMDEP_TRUE@	./$(DEPDIR)/mpegconsts.Plo \
-+@AMDEP_TRUE@	./$(DEPDIR)/mpegtimecode.Plo \
-+@AMDEP_TRUE@	./$(DEPDIR)/yuv4mpeg.Plo \
-+@AMDEP_TRUE@	./$(DEPDIR)/yuv4mpeg_ratio.Plo
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-@@ -306,7 +309,7 @@
- CCLD = $(CC)
- LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
--DIST_SOURCES = $(libmjpegutils_a_SOURCES) $(libcpuaccel_la_SOURCES) \
-+DIST_SOURCES = $(libcpuaccel_la_SOURCES) $(libmjpegutils_la_SOURCES) \
- 	$(libmotion_la_SOURCES)
- HEADERS = $(noinst_HEADERS) $(pkginclude_HEADERS)
- 
-@@ -318,7 +321,7 @@
- 	check-recursive installcheck-recursive
- DIST_COMMON = $(noinst_HEADERS) $(pkginclude_HEADERS) \
- 	$(srcdir)/Makefile.in Makefile.am
--SOURCES = $(libmjpegutils_a_SOURCES) $(libcpuaccel_la_SOURCES) $(libmotion_la_SOURCES)
-+SOURCES = $(libcpuaccel_la_SOURCES) $(libmjpegutils_la_SOURCES) $(libmotion_la_SOURCES)
- 
- all: all-recursive
- 
-@@ -329,40 +332,34 @@
- 	  $(AUTOMAKE) --gnu  utils/Makefile
- Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
- 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
--libLIBRARIES_INSTALL = $(INSTALL_DATA)
--install-libLIBRARIES: $(lib_LIBRARIES)
-+libLTLIBRARIES_INSTALL = $(INSTALL)
-+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
- 	$(mkinstalldirs) $(DESTDIR)$(libdir)
--	@list='$(lib_LIBRARIES)'; for p in $$list; do \
-+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f="`echo $$p | sed -e 's|^.*/||'`"; \
--	    echo " $(libLIBRARIES_INSTALL) $$p $(DESTDIR)$(libdir)/$$f"; \
--	    $(libLIBRARIES_INSTALL) $$p $(DESTDIR)$(libdir)/$$f; \
--	  else :; fi; \
--	done
--	@$(POST_INSTALL)
--	@list='$(lib_LIBRARIES)'; for p in $$list; do \
--	  if test -f $$p; then \
--	    p="`echo $$p | sed -e 's|^.*/||'`"; \
--	    echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
--	    $(RANLIB) $(DESTDIR)$(libdir)/$$p; \
-+	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
-+	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
- 	  else :; fi; \
- 	done
- 
--uninstall-libLIBRARIES:
-+uninstall-libLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(lib_LIBRARIES)'; for p in $$list; do \
-+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- 	  p="`echo $$p | sed -e 's|^.*/||'`"; \
--	  echo " rm -f $(DESTDIR)$(libdir)/$$p"; \
--	  rm -f $(DESTDIR)$(libdir)/$$p; \
-+	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
-+	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
- 	done
- 
--clean-libLIBRARIES:
--	-test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES)
--libmjpegutils.a: $(libmjpegutils_a_OBJECTS) $(libmjpegutils_a_DEPENDENCIES) 
--	-rm -f libmjpegutils.a
--	$(libmjpegutils_a_AR) libmjpegutils.a $(libmjpegutils_a_OBJECTS) $(libmjpegutils_a_LIBADD)
--	$(RANLIB) libmjpegutils.a
-+clean-libLTLIBRARIES:
-+	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-+	  test "$$dir" = "$$p" && dir=.; \
-+	  echo "rm -f \"$${dir}/so_locations\""; \
-+	  rm -f "$${dir}/so_locations"; \
-+	done
- 
- clean-noinstLTLIBRARIES:
- 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-@@ -374,6 +371,8 @@
- 	done
- libcpuaccel.la: $(libcpuaccel_la_OBJECTS) $(libcpuaccel_la_DEPENDENCIES) 
- 	$(LINK)  $(libcpuaccel_la_LDFLAGS) $(libcpuaccel_la_OBJECTS) $(libcpuaccel_la_LIBADD) $(LIBS)
-+libmjpegutils.la: $(libmjpegutils_la_OBJECTS) $(libmjpegutils_la_DEPENDENCIES) 
-+	$(LINK) -rpath $(libdir) $(libmjpegutils_la_LDFLAGS) $(libmjpegutils_la_OBJECTS) $(libmjpegutils_la_LIBADD) $(LIBS)
- libmotion.la: $(libmotion_la_OBJECTS) $(libmotion_la_DEPENDENCIES) 
- 	$(LINK)  $(libmotion_la_LDFLAGS) $(libmotion_la_OBJECTS) $(libmotion_la_LIBADD) $(LIBS)
- 
-@@ -384,12 +383,12 @@
- 	-rm -f *.tab.c
- 
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu_accel.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mjpeg_logging.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mjpeg_logging.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/motionsearch.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpegconsts.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpegtimecode.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yuv4mpeg.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yuv4mpeg_ratio.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpegconsts.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpegtimecode.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yuv4mpeg.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yuv4mpeg_ratio.Plo@am__quote@
- 
- .c.o:
- @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@@ -622,7 +621,7 @@
- 	done
- check-am: all-am
- check: check-recursive
--all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(HEADERS)
-+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
- installdirs: installdirs-recursive
- installdirs-am:
- 	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(pkgincludedir)
-@@ -654,12 +653,11 @@
- 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
- clean: clean-recursive
- 
--clean-am: clean-generic clean-libLIBRARIES clean-libtool \
-+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
- 	clean-noinstLTLIBRARIES mostlyclean-am
- 
- distclean: distclean-recursive
--	-rm -rf ./$(DEPDIR)
--	-rm -f Makefile
-+	-rm -rf ./$(DEPDIR)	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
- 	distclean-libtool distclean-tags
- 
-@@ -673,7 +671,7 @@
- 
- install-data-am: install-pkgincludeHEADERS
- 
--install-exec-am: install-libLIBRARIES
-+install-exec-am: install-libLTLIBRARIES
- 
- install-info: install-info-recursive
- 
-@@ -699,13 +697,13 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am uninstall-libLIBRARIES \
-+uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
- 	uninstall-pkgincludeHEADERS
- 
- uninstall-info: uninstall-info-recursive
- 
- .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
--	clean-generic clean-libLIBRARIES clean-libtool \
-+	clean-generic clean-libLTLIBRARIES clean-libtool \
- 	clean-noinstLTLIBRARIES clean-recursive ctags ctags-recursive \
- 	distclean distclean-compile distclean-generic distclean-libtool \
- 	distclean-recursive distclean-tags distdir dvi dvi-am \
-@@ -713,7 +711,7 @@
- 	install-data install-data-am install-data-recursive \
- 	install-exec install-exec-am install-exec-recursive \
- 	install-info install-info-am install-info-recursive \
--	install-libLIBRARIES install-man install-pkgincludeHEADERS \
-+	install-libLTLIBRARIES install-man install-pkgincludeHEADERS \
- 	install-recursive install-strip installcheck installcheck-am \
- 	installdirs installdirs-am installdirs-recursive \
- 	maintainer-clean maintainer-clean-generic \
-@@ -721,7 +719,7 @@
- 	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
- 	pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \
- 	tags-recursive uninstall uninstall-am uninstall-info-am \
--	uninstall-info-recursive uninstall-libLIBRARIES \
-+	uninstall-info-recursive uninstall-libLTLIBRARIES \
- 	uninstall-pkgincludeHEADERS uninstall-recursive
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/multimedia/mjpegtools/patches/patch-an b/multimedia/mjpegtools/patches/patch-an
deleted file mode 100644
index 89cbe4d7ded..00000000000
--- a/multimedia/mjpegtools/patches/patch-an
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-an,v 1.2 2004/05/07 12:06:47 cjep Exp $
---- ./yuvdenoise/Makefile.am.orig	2003-12-21 02:33:39.000000000 +0900
-+++ ./yuvdenoise/Makefile.am	2004-04-17 10:57:01.000000000 +0900
-@@ -25,5 +25,5 @@
- 
- yuvdenoise_LDADD = \
- 	$(top_builddir)/utils/libcpuaccel.la \
--	$(top_builddir)/utils/libmjpegutils.a \
-+	$(top_builddir)/utils/libmjpegutils.la \
- 	@LIBM_LIBS@
diff --git a/multimedia/mjpegtools/patches/patch-ao b/multimedia/mjpegtools/patches/patch-ao
deleted file mode 100644
index 315c336dd15..00000000000
--- a/multimedia/mjpegtools/patches/patch-ao
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ao,v 1.2 2004/05/07 12:06:47 cjep Exp $
---- ./yuvdenoise/Makefile.in.orig	2004-02-04 07:58:33.000000000 +0900
-+++ ./yuvdenoise/Makefile.in	2004-04-17 10:57:01.000000000 +0900
-@@ -228,7 +228,7 @@
- 
- yuvdenoise_LDADD = \
- 	$(top_builddir)/utils/libcpuaccel.la \
--	$(top_builddir)/utils/libmjpegutils.a \
-+	$(top_builddir)/utils/libmjpegutils.la \
- 	@LIBM_LIBS@
- 
- subdir = yuvdenoise
-@@ -243,7 +243,7 @@
- 	main.$(OBJEXT) motion.$(OBJEXT)
- yuvdenoise_OBJECTS = $(am_yuvdenoise_OBJECTS)
- yuvdenoise_DEPENDENCIES = $(top_builddir)/utils/libcpuaccel.la \
--	$(top_builddir)/utils/libmjpegutils.a
-+	$(top_builddir)/utils/libmjpegutils.la
- yuvdenoise_LDFLAGS =
- 
- DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
diff --git a/multimedia/mjpegtools/patches/patch-ap b/multimedia/mjpegtools/patches/patch-ap
deleted file mode 100644
index 3a94e9f3a38..00000000000
--- a/multimedia/mjpegtools/patches/patch-ap
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ap,v 1.2 2004/05/07 12:06:47 cjep Exp $
---- ./yuvfilters/Makefile.in.orig	2004-02-04 07:58:34.000000000 +0900
-+++ ./yuvfilters/Makefile.in	2004-04-17 10:57:01.000000000 +0900
-@@ -206,7 +206,7 @@
- noinst_LTLIBRARIES = libyuvfilters.la
- 
- AM_CPPFLAGS = -I$(top_srcdir)/utils
--MJPEGLIB = $(top_builddir)/utils/libmjpegutils.a
-+MJPEGLIB = $(top_builddir)/utils/libmjpegutils.la
- 
- libyuvfilters_la_SOURCES = \
- 	addtask.c \
-@@ -249,12 +249,12 @@
- am_yuvkineco_OBJECTS = yuvkineco-main.$(OBJEXT)
- yuvkineco_OBJECTS = $(am_yuvkineco_OBJECTS)
- yuvkineco_DEPENDENCIES = libyuvfilters.la \
--	$(top_builddir)/utils/libmjpegutils.a
-+	$(top_builddir)/utils/libmjpegutils.la
- yuvkineco_LDFLAGS =
- am_yuvycsnoise_OBJECTS = yuvycsnoise-main.$(OBJEXT)
- yuvycsnoise_OBJECTS = $(am_yuvycsnoise_OBJECTS)
- yuvycsnoise_DEPENDENCIES = libyuvfilters.la \
--	$(top_builddir)/utils/libmjpegutils.a
-+	$(top_builddir)/utils/libmjpegutils.la
- yuvycsnoise_LDFLAGS =
- 
- DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
diff --git a/multimedia/mjpegtools/patches/patch-aq b/multimedia/mjpegtools/patches/patch-aq
deleted file mode 100644
index 50dcc024be4..00000000000
--- a/multimedia/mjpegtools/patches/patch-aq
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2005/05/28 00:05:39 reed Exp $
-error: label at end of compound statement
-
---- ./lavtools/lavpipe.c.orig	Fri May 27 15:55:09 2005
-+++ ./lavtools/lavpipe.c	Fri May 27 15:55:55 2005
-@@ -582,6 +582,7 @@
-       mjpeg_info( "closing input %d (source %d)", i, current_index);
-       decommission_pipe_source(source);
-     KEEP_SOURCE:
-+	;
-     }
-   }
- }
diff --git a/multimedia/mjpegtools/patches/patch-ar b/multimedia/mjpegtools/patches/patch-ar
deleted file mode 100644
index 4e0323acbc7..00000000000
--- a/multimedia/mjpegtools/patches/patch-ar
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2005/05/28 00:05:39 reed Exp $
-error: array bound forbidden after parenthesized type-id
-
---- ./mpeg2enc/picture.cc.orig	Fri May 27 16:01:27 2005
-+++ ./mpeg2enc/picture.cc	Fri May 27 16:01:57 2005
-@@ -83,9 +83,9 @@
-     }
- 
- 
--	curref = new (uint8_t *)[5];
--	curorg = new (uint8_t *)[5];
--	pred   = new (uint8_t *)[5];
-+	curref = new uint8_t *[5];
-+	curorg = new uint8_t *[5];
-+	pred   = new uint8_t *[5];
- 
- 	for( i = 0 ; i<3; i++)
- 	{
diff --git a/multimedia/mjpegtools/patches/patch-as b/multimedia/mjpegtools/patches/patch-as
deleted file mode 100644
index 7afdbece162..00000000000
--- a/multimedia/mjpegtools/patches/patch-as
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-as,v 1.1 2005/06/06 19:10:44 jmmv Exp $
-
---- configure.orig	2004-02-03 22:58:37.000000000 +0000
-+++ configure
-@@ -22481,9 +22481,10 @@ else
- echo "${ECHO_T}no" >&6
- fi
- 
--# FreeBSD and OpenBSD have neither -lpthread nor integrated pthreads in libc.
-+# DragonFly, FreeBSD and OpenBSD have neither -lpthread nor integrated
-+# pthreads in libc.
- # Instead -pthread is used to the compiler/linker to get pthreads working right.
--if test x$OS_ARCH = xFreeBSD -o x$OS_ARCH = xOpenBSD; then
-+if test x$OS_ARCH = xFreeBSD -o x$OS_ARCH = xOpenBSD -o x$OS_ARCH = xDragonFly; then
-    CFLAGS="$CFLAGS -pthread"
-    CXXFLAGS="$CXXFLAGS -pthread"
- fi
diff --git a/multimedia/mkvtoolnix/DESCR b/multimedia/mkvtoolnix/DESCR
deleted file mode 100644
index e38b55d687a..00000000000
--- a/multimedia/mkvtoolnix/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-MKVtoolnix is a set of tools to create, alter and inspect Matroska files.
-
-With these tools one can get information about (mkvinfo) Matroska files,
-extract tracks/data from (mkvextract) Matroska files and create (mkvmerge)
-Matroska files from other media files.
diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
deleted file mode 100644
index 74f1e8eb976..00000000000
--- a/multimedia/mkvtoolnix/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:22 jlam Exp $
-#
-
-.include "../../multimedia/mkvtoolnix/Makefile.dist"
-
-MAINTAINER=	salo@NetBSD.org
-HOMEPAGE=	http://www.bunkus.org/videotools/mkvtoolnix/
-COMMENT=	Set of tools to create, alter and inspect Matroska files
-
-GNU_CONFIGURE=	yes
-USE_TOOLS+=	gmake
-USE_LANGUAGES=	c c++
-
-CONFIGURE_ARGS+=	--disable-gui
-
-.include "../../archivers/bzip2/buildlink3.mk"
-.include "../../archivers/liblzo/buildlink3.mk"
-.include "../../audio/flac/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/libebml/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../multimedia/libmatroska/buildlink3.mk"
-.include "../../multimedia/libogg/buildlink3.mk"
-.include "../../textproc/expat/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/mkvtoolnix/Makefile.dist b/multimedia/mkvtoolnix/Makefile.dist
deleted file mode 100644
index b348e434976..00000000000
--- a/multimedia/mkvtoolnix/Makefile.dist
+++ /dev/null
@@ -1,6 +0,0 @@
-# $NetBSD: Makefile.dist,v 1.15 2005/10/23 20:15:07 rillig Exp $
-
-DISTNAME=	mkvtoolnix-1.4.2
-CATEGORIES=	multimedia
-MASTER_SITES=	http://www.bunkus.org/videotools/mkvtoolnix/sources/
-EXTRACT_SUFX=	.tar.bz2
diff --git a/multimedia/mkvtoolnix/PLIST b/multimedia/mkvtoolnix/PLIST
deleted file mode 100644
index 67fefbb7938..00000000000
--- a/multimedia/mkvtoolnix/PLIST
+++ /dev/null
@@ -1,9 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/04/10 12:44:31 salo Exp $
-bin/base64tool
-bin/mkvextract
-bin/mkvinfo
-bin/mkvmerge
-man/man1/base64tool.1
-man/man1/mkvextract.1
-man/man1/mkvinfo.1
-man/man1/mkvmerge.1
diff --git a/multimedia/mkvtoolnix/distinfo b/multimedia/mkvtoolnix/distinfo
deleted file mode 100644
index 25935e46e37..00000000000
--- a/multimedia/mkvtoolnix/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.19 2005/04/18 01:32:50 salo Exp $
-
-SHA1 (mkvtoolnix-1.4.2.tar.bz2) = a5a01a0fc2f73d718fbf9c51138364d70460703f
-RMD160 (mkvtoolnix-1.4.2.tar.bz2) = 3d998b0d1997fc9732ffd64b9a31c17e4a38930c
-Size (mkvtoolnix-1.4.2.tar.bz2) = 638250 bytes
diff --git a/multimedia/mmg/DESCR b/multimedia/mmg/DESCR
deleted file mode 100644
index f7280b530e7..00000000000
--- a/multimedia/mmg/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-mmg is a GUI for mkvmerge from MKVtoolnix.  mkvmerge is a tool to create
-Matroska files from other media files.
diff --git a/multimedia/mmg/Makefile b/multimedia/mmg/Makefile
deleted file mode 100644
index 72f9d527cbb..00000000000
--- a/multimedia/mmg/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# $NetBSD: Makefile,v 1.15 2005/08/07 11:34:22 wiz Exp $
-#
-
-.include "../../multimedia/mkvtoolnix/Makefile.dist"
-PKGNAME=        ${DISTNAME:S/mkvtoolnix/mmg/}
-PKGREVISION=	1
-
-MAINTAINER=	salo@NetBSD.org
-HOMEPAGE=	http://www.bunkus.org/videotools/mkvtoolnix/doc/mkvmerge-gui.html
-COMMENT=        MKVtoolnix mkvmerge GUI
-
-DEPENDS+=	${DISTNAME}:../../multimedia/mkvtoolnix
-
-GNU_CONFIGURE=	yes
-USE_TOOLS+=	gmake
-USE_LANGUAGES=	c++
-
-BUILD_TARGET=	src/mmg/mmg
-
-SUBST_CLASSES=		man help
-
-SUBST_STAGE.man=	pre-configure
-SUBST_FILES.man=	doc/mmg.1
-SUBST_SED.man=		's,(doc/,(${PREFIX}/share/doc/html/mmg/,g'
-SUBST_MESSAGE.man=	"Fixing paths in manual page."
-
-SUBST_STAGE.help=	pre-configure
-SUBST_FILES.help=	src/mmg/mmg.cpp
-SUBST_SED.help=		's,@HELPDIR@,${PREFIX}/share/doc/html/mmg,'
-SUBST_MESSAGE.help=	"Fixing path to help data."
-
-INSTALLATION_DIRS=	bin man/man1
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/mmg/mmg ${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/doc/mmg.1 ${PREFIX}/man/man1/
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/mmg/images/
-	${INSTALL_DATA} ${WRKSRC}/doc/images/*.gif \
-		${PREFIX}/share/doc/html/mmg/images/
-	${INSTALL_DATA} ${WRKSRC}/doc/mkvmerge-gui.* \
-		${PREFIX}/share/doc/html/mmg/
-
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/libebml/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../multimedia/libmatroska/buildlink3.mk"
-.include "../../textproc/expat/buildlink3.mk"
-.include "../../x11/wxGTK/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/mmg/PLIST b/multimedia/mmg/PLIST
deleted file mode 100644
index ae11fadce09..00000000000
--- a/multimedia/mmg/PLIST
+++ /dev/null
@@ -1,21 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2005/03/23 16:58:39 salo Exp $
-bin/mmg
-man/man1/mmg.1
-share/doc/html/mmg/images/addingremovingattachments.gif
-share/doc/html/mmg/images/addremovefiles.gif
-share/doc/html/mmg/images/attachmentoptions.gif
-share/doc/html/mmg/images/audiotrackoptions.gif
-share/doc/html/mmg/images/chaptereditor.gif
-share/doc/html/mmg/images/jobmanager.gif
-share/doc/html/mmg/images/movietitle.gif
-share/doc/html/mmg/images/muxingwindow.gif
-share/doc/html/mmg/images/selectmkvmergeexecutable.gif
-share/doc/html/mmg/images/splitting.gif
-share/doc/html/mmg/images/textsubtitlestrackoptions.gif
-share/doc/html/mmg/images/trackselection.gif
-share/doc/html/mmg/images/videotrackoptions.gif
-share/doc/html/mmg/mkvmerge-gui.hhc
-share/doc/html/mmg/mkvmerge-gui.hhp
-share/doc/html/mmg/mkvmerge-gui.html
-@dirrm share/doc/html/mmg/images
-@dirrm share/doc/html/mmg
diff --git a/multimedia/mmg/distinfo b/multimedia/mmg/distinfo
deleted file mode 100644
index bb0d0c9938c..00000000000
--- a/multimedia/mmg/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.16 2005/04/18 01:32:50 salo Exp $
-
-SHA1 (mkvtoolnix-1.4.2.tar.bz2) = a5a01a0fc2f73d718fbf9c51138364d70460703f
-RMD160 (mkvtoolnix-1.4.2.tar.bz2) = 3d998b0d1997fc9732ffd64b9a31c17e4a38930c
-Size (mkvtoolnix-1.4.2.tar.bz2) = 638250 bytes
-SHA1 (patch-aa) = 19177b4a75ed8a27b746e2d1825c23fe59f95a77
-SHA1 (patch-ab) = 0d25c873351f183059ac2434ddf1d7129844c27d
diff --git a/multimedia/mmg/patches/patch-aa b/multimedia/mmg/patches/patch-aa
deleted file mode 100644
index b6623622952..00000000000
--- a/multimedia/mmg/patches/patch-aa
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2004/10/14 17:13:28 salo Exp $
-
---- configure.orig	2004-10-08 00:20:08.000000000 +0200
-+++ configure	2004-10-14 17:40:18.000000000 +0200
-@@ -5461,7 +5461,7 @@
-   if test "$ogg_found" = "no"; then
-     { { echo "$as_me:$LINENO: error: Could not find the Ogg library" >&5
- echo "$as_me: error: Could not find the Ogg library" >&2;}
--   { (exit 1); exit 1; }; }
-+   { (true); true; }; }
-   fi
- 
- for ac_header in ogg/ogg.h
-@@ -5617,7 +5617,7 @@
-   if test "$ogg_found" = "no"; then
-     { { echo "$as_me:$LINENO: error: Could not find the Ogg header files" >&5
- echo "$as_me: error: Could not find the Ogg header files" >&2;}
--   { (exit 1); exit 1; }; }
-+   { (true); true; }; }
-   fi
- 
- 
-@@ -5697,7 +5697,7 @@
-   if test "$vorbis_found" = "no"; then
-     { { echo "$as_me:$LINENO: error: Could not find the Vorbis library" >&5
- echo "$as_me: error: Could not find the Vorbis library" >&2;}
--   { (exit 1); exit 1; }; }
-+   { (true); true; }; }
-   fi
- 
- for ac_header in vorbis/codec.h
-@@ -5853,7 +5853,7 @@
-   if test "$vorbis_found" = "no"; then
-     { { echo "$as_me:$LINENO: error: Could not find the Vorbis header files" >&5
- echo "$as_me: error: Could not find the Vorbis header files" >&2;}
--   { (exit 1); exit 1; }; }
-+   { (true); true; }; }
-   fi
- 
- 
diff --git a/multimedia/mmg/patches/patch-ab b/multimedia/mmg/patches/patch-ab
deleted file mode 100644
index 71951945d69..00000000000
--- a/multimedia/mmg/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2005/03/23 16:58:39 salo Exp $
-
---- src/mmg/mmg.cpp.orig	2005-03-02 22:34:35.000000000 +0100
-+++ src/mmg/mmg.cpp	2005-03-23 17:27:01.000000000 +0100
-@@ -1153,7 +1153,7 @@
-     wxConfigBase *cfg;
-     bool first;
- 
--    help_path = wxGetCwd();
-+    help_path = "@HELPDIR@";
-     cfg = wxConfigBase::Get();
-     cfg->SetPath(wxT("/GUI"));
-     if (!cfg->Read(wxT("help_path"), &help_path))
diff --git a/multimedia/moz-bin-flash/DESCR b/multimedia/moz-bin-flash/DESCR
deleted file mode 100644
index b8770609f95..00000000000
--- a/multimedia/moz-bin-flash/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-This is the official Flash Player 6 from Macromedia. This plugin
-enables you to see .swf and .spl files on the 'net using the
-mozilla-linux package.
diff --git a/multimedia/moz-bin-flash/Makefile b/multimedia/moz-bin-flash/Makefile
deleted file mode 100644
index 5f34b022c80..00000000000
--- a/multimedia/moz-bin-flash/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2005/06/17 03:50:23 jlam Exp $
-#
-
-DISTNAME=	install_flash_player_6_linux
-PKGNAME=	moz-bin-flash-${VERSION}
-CATEGORIES=	multimedia www
-MASTER_SITES=	http://download.macromedia.com/pub/shockwave/flash/english/linux/6.0r69/
-
-MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://www.macromedia.com/
-COMMENT=	Flash player for the linux version of mozilla (binary pkg)
-
-DEPENDS+=	mozilla-bin-[0-9]*:../../www/mozilla-bin
-
-CONFLICTS+=	mozilla-flash-bin-[0-9]*
-
-VERSION=	6.0.69
-
-NO_CONFIGURE=	YES
-NO_BUILD=	YES
-
-WRKSRC=		${WRKDIR}/install_flash_player_6_linux
-
-DOCDIR=		share/doc/moz-bin-flash
-PLIST_SUBST+=	DOCDIR="${DOCDIR}"
-
-INSTALLATION_DIRS=	lib/mozilla-linux/components lib/mozilla-linux/plugins
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/libflashplayer.so ${PREFIX}/lib/mozilla-linux/plugins
-	${INSTALL_DATA} ${WRKSRC}/flashplayer.xpt ${PREFIX}/lib/mozilla-linux/components
-
-	${INSTALL_DATA_DIR} ${PREFIX}/${DOCDIR}
-	${INSTALL_DATA}	${WRKSRC}/readme.txt ${PREFIX}/${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/ReadMe.htm ${PREFIX}/${DOCDIR}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/moz-bin-flash/PLIST b/multimedia/moz-bin-flash/PLIST
deleted file mode 100644
index 1a150fa6cf2..00000000000
--- a/multimedia/moz-bin-flash/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/01/26 14:46:49 jmmv Exp $
-lib/mozilla-linux/components/flashplayer.xpt
-lib/mozilla-linux/plugins/libflashplayer.so
-${DOCDIR}/readme.txt
-${DOCDIR}/ReadMe.htm
-@dirrm ${DOCDIR}
diff --git a/multimedia/moz-bin-flash/distinfo b/multimedia/moz-bin-flash/distinfo
deleted file mode 100644
index 1b06b76d9ea..00000000000
--- a/multimedia/moz-bin-flash/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 11:24:03 agc Exp $
-
-SHA1 (install_flash_player_6_linux.tar.gz) = ecddda28954ce26882cea0f6578af326d7c6e76c
-RMD160 (install_flash_player_6_linux.tar.gz) = 3b0e0b86a78bb2687207b99d5c9c325dffe42a0f
-Size (install_flash_player_6_linux.tar.gz) = 706066 bytes
diff --git a/multimedia/moz-flash/DESCR b/multimedia/moz-flash/DESCR
deleted file mode 100644
index c627423043c..00000000000
--- a/multimedia/moz-flash/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-A flash plugin for Gecko based browers, including Netscape 6.x,
-Mozilla, and Gaelon.  Shockwave is NOT supported.  Audio support
-is currently broken.
diff --git a/multimedia/moz-flash/Makefile b/multimedia/moz-flash/Makefile
deleted file mode 100644
index e91665ffff5..00000000000
--- a/multimedia/moz-flash/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2005/06/01 18:03:06 jlam Exp $
-#
-
-.include "../../multimedia/libflash/Makefile.common"
-
-PKGNAME=	moz-flash-1.0
-PKGREVISION=	5
-CATEGORIES+=	www
-
-MAINTAINER=	joda@NetBSD.org
-COMMENT=	Mozilla open source Flash(tm) plugin
-
-DEPENDS+=	mozilla>=0.9.9:../../www/mozilla
-
-USE_LIBTOOL=	YES
-
-BUILD_DIRS=	${WRKSRC}/Plugin
-CPPFLAGS+=	-DDEV_DSP="\"${DEVOSSSOUND}\""
-MAKE_ENV+=	SHLIBTOOL="${SHLIBTOOL}"
-MAKE_ENV+=	MOZ_PLUGDIR="${MOZ_PLUGDIR}"
-
-MOZ_PLUGDIR=	${PREFIX}/lib/mozilla/plugins
-
-do-install:
-	${INSTALL_DATA_DIR} ${MOZ_PLUGDIR}
-	cd ${WRKSRC}/Plugin && \
-		${INSTALL_PROGRAM} .libs/npflash.so ${MOZ_PLUGDIR}
-
-.include "../../multimedia/libflash/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/moz-flash/PLIST b/multimedia/moz-flash/PLIST
deleted file mode 100644
index 0595fc13be2..00000000000
--- a/multimedia/moz-flash/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/01/26 14:48:23 jmmv Exp $
-lib/mozilla/plugins/npflash.so
diff --git a/multimedia/mpeg-lib/DESCR b/multimedia/mpeg-lib/DESCR
deleted file mode 100644
index 7c6d4e25b07..00000000000
--- a/multimedia/mpeg-lib/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-The MPEG Library is a collection of C routines to decode MPEG movies
-and dither them in a variety of colour schemes.  Most of the code in
-the library comes directly from the Berkely MPEG player, an
-X11-specific implementation that works fine, but suffers from minimal
-documentation and a lack of modularity.  A front end to the Berkeley
-decoding engine was developed by Greg Ward at the Montreal
-Neurological Institute in May/June 1994 to facilitate the development
-of an MPEG player specifically for Silicon Graphics workstations; the
-decoding engine together with the MNI front end constitute the MPEG
-Library.
diff --git a/multimedia/mpeg-lib/Makefile b/multimedia/mpeg-lib/Makefile
deleted file mode 100644
index 7c651aade3f..00000000000
--- a/multimedia/mpeg-lib/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:42 tv Exp $
-#
-
-DISTNAME=	mpeg_lib-1.3.1
-PKGNAME=	mpeg-1.3.1
-PKGREVISION=	1
-CATEGORIES=	multimedia
-MASTER_SITES=	ftp://ftp.mni.mcgill.ca/pub/mpeg/ \
-		ftp://ftp.fu-berlin.de/unix/X11/graphics/gimp/libs/ \
-		ftp://ftp.gimp.org/pub/gimp/libs/
-
-MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://starship.python.net/~gward/mpeglib/
-COMMENT=	Library for decoding MPEG movies
-
-USE_LIBTOOL=	YES
-GNU_CONFIGURE=	YES
-
-BUILD_TARGET=	libmpeg_lib.la
-
-CONFIGURE_ENV+=	OPTIMIZE="${CFLAGS}" EXTRA_LDFLAGS="${LDFLAGS}"	\
-		EXTRA_CPPFLAGS="${CPPFLAGS}"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/mpeg-lib/PLIST b/multimedia/mpeg-lib/PLIST
deleted file mode 100644
index 3f3985622ae..00000000000
--- a/multimedia/mpeg-lib/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:46 jlam Exp $
-include/mpeg.h
-lib/libmpeg_lib.la
diff --git a/multimedia/mpeg-lib/buildlink3.mk b/multimedia/mpeg-lib/buildlink3.mk
deleted file mode 100644
index a1ae987dc4e..00000000000
--- a/multimedia/mpeg-lib/buildlink3.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:03 tv Exp $
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-MPEG_BUILDLINK3_MK:=	${MPEG_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	mpeg
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmpeg}
-BUILDLINK_PACKAGES+=	mpeg
-
-.if !empty(MPEG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.mpeg+=	mpeg>=1.3.1
-BUILDLINK_RECOMMENDED.mpeg+=	mpeg>=1.3.1nb1
-BUILDLINK_PKGSRCDIR.mpeg?=	../../multimedia/mpeg-lib
-.endif	# MPEG_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/mpeg-lib/distinfo b/multimedia/mpeg-lib/distinfo
deleted file mode 100644
index df4d1137c79..00000000000
--- a/multimedia/mpeg-lib/distinfo
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 11:24:03 agc Exp $
-
-SHA1 (mpeg_lib-1.3.1.tar.gz) = 0ea4f8b31e4f316d99c2034d76619988f75147dc
-RMD160 (mpeg_lib-1.3.1.tar.gz) = 27df1f6568c763df41beeed6382af88377da3e38
-Size (mpeg_lib-1.3.1.tar.gz) = 152092 bytes
-SHA1 (patch-aa) = 6f43a8a94c8efa3f241891fe479a1b93406d2266
-SHA1 (patch-ab) = a97c3c8b411975ee51ef25cd6a0a66aa967ac064
-SHA1 (patch-ac) = 20b8e16bcbcd183441855a9277b9042d2ec7bcf0
-SHA1 (patch-ad) = 822fcd6a1908b4b0c31b9a565929bbd0f37f31af
-SHA1 (patch-ae) = 79ff90b04dc9e9b1a55bb5800263f29d193d0abe
-SHA1 (patch-af) = b4cbba0e6e08ee5b9e72f7ff8ede0fc3f615aab0
-SHA1 (patch-ag) = fbc47b594a0c7184d46a72f748109b3114e94234
-SHA1 (patch-ah) = 9c9460a86c6384955016c42e58b0f4e66743650e
-SHA1 (patch-ai) = 9573d9b58fa55ead4d51ede01f4f3fe24121408a
-SHA1 (patch-aj) = 5fbff44803b11344fde25f94f3466f4af3e40633
-SHA1 (patch-ak) = e6dd6f3e902ee774d06aa93cfa6ac5ead9df7aa9
-SHA1 (patch-al) = f63df4035b3f33ac778e7bde1e478434826c34ba
-SHA1 (patch-am) = b2f7afdd74c28bd6345f1ac291577103bf8196f3
-SHA1 (patch-an) = 3b23f238fcdc1321d17d19be74c7e670b249c5fc
-SHA1 (patch-ao) = 84caaa6c7b9cb5eb7f7455323767aa6753e92ff7
-SHA1 (patch-ap) = 2d7536517bcf3e9ed52fdc09ab5a5f721aab6c5d
diff --git a/multimedia/mpeg-lib/patches/patch-aa b/multimedia/mpeg-lib/patches/patch-aa
deleted file mode 100644
index 7992e3aa633..00000000000
--- a/multimedia/mpeg-lib/patches/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2004/06/26 18:27:23 grant Exp $
-
---- wrapper.c.orig	Sun Aug  8 20:22:14 1999
-+++ wrapper.c	Mon Sep 15 22:50:34 2003
-@@ -44,7 +44,6 @@
- ---------------------------------------------------------------------------- */
- 
- #include <config.h>
--#include <malloc.h>
- #include <memory.h>
- #include <stdio.h>
- #include <errno.h>
-@@ -55,6 +54,9 @@
- #include "globals.h"
- #include "my_dmalloc.h"
- 
-+#include <stdlib.h>
-+#include <string.h>
-+
- #define BUF_LENGTH 80000
- 
- 
-@@ -341,7 +343,7 @@
- @CREATED    : 94/6/17, Greg Ward.
- @MODIFIED   : 95/3/18, GW: added MPEG_CMAP_INDEX option.
- ---------------------------------------------------------------------------- */
--void SetMPEGOption (MPEGOptionEnum Option, int Value)
-+void SetMPEGOption (MPEGOptionEnum Option, long Value)
- {
-    switch (Option)
-    {
diff --git a/multimedia/mpeg-lib/patches/patch-ab b/multimedia/mpeg-lib/patches/patch-ab
deleted file mode 100644
index ae5a7d9a21a..00000000000
--- a/multimedia/mpeg-lib/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2004/06/26 18:27:23 grant Exp $
-
---- globals.c.orig	Sat Jul 31 20:17:20 1999
-+++ globals.c
-@@ -63,6 +63,7 @@
- #include "globals.h"
- #include "my_dmalloc.h"
- 
-+#include <string.h>
- 
- /* Universal global variables -- those needed by the decoding engine: */
- 
diff --git a/multimedia/mpeg-lib/patches/patch-ac b/multimedia/mpeg-lib/patches/patch-ac
deleted file mode 100644
index fea118f46f5..00000000000
--- a/multimedia/mpeg-lib/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2004/06/26 18:27:23 grant Exp $
-
---- 24bit.c.orig	Fri Jul 23 23:59:25 1999
-+++ 24bit.c	Mon Sep 15 22:49:14 2003
-@@ -30,7 +30,8 @@
- #include "dither.h"
- #include "proto.h"
- #include <time.h>
--#include <malloc.h>
-+#include <stdlib.h>
-+
- #include "my_dmalloc.h"
- 
- /*
diff --git a/multimedia/mpeg-lib/patches/patch-ad b/multimedia/mpeg-lib/patches/patch-ad
deleted file mode 100644
index a07403c7329..00000000000
--- a/multimedia/mpeg-lib/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2004/06/26 18:27:23 grant Exp $
-
---- gdith.c.orig	Sat Jul 24 00:04:42 1999
-+++ gdith.c	Mon Sep 15 22:49:55 2003
-@@ -21,8 +21,8 @@
- 
- 
- #include <config.h>
--#include <malloc.h>
- #include <memory.h>
-+#include <stdlib.h>
- #include "mpeg.h"
- #include "dither.h"
- #include "video.h"
diff --git a/multimedia/mpeg-lib/patches/patch-ae b/multimedia/mpeg-lib/patches/patch-ae
deleted file mode 100644
index 423c0f5669e..00000000000
--- a/multimedia/mpeg-lib/patches/patch-ae
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2004/06/26 18:27:23 grant Exp $
-
---- fs2.c.orig	Fri Jul 23 23:40:17 1999
-+++ fs2.c	Mon Sep 15 22:49:38 2003
-@@ -19,10 +19,10 @@
-  * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-  */
- #include <config.h>
--#include <malloc.h>
- #include <memory.h>
- #include "video.h"
- #include "dither.h"
-+#include <stdlib.h>
- #include "fs2.h"
- #include "proto.h"
- #include "my_dmalloc.h"
diff --git a/multimedia/mpeg-lib/patches/patch-af b/multimedia/mpeg-lib/patches/patch-af
deleted file mode 100644
index b062d62eb9b..00000000000
--- a/multimedia/mpeg-lib/patches/patch-af
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-af,v 1.1 2004/06/26 18:27:23 grant Exp $
-
---- fs2fast.c.orig	Fri Jul 23 23:59:24 1999
-+++ fs2fast.c	Mon Sep 15 22:49:44 2003
-@@ -19,9 +19,9 @@
-  * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-  */
- #include <config.h>
--#include <malloc.h>
- #include <memory.h>
- #include "video.h"
-+#include <stdlib.h>
- #include "proto.h"
- #include "dither.h"
- #include "my_dmalloc.h"
diff --git a/multimedia/mpeg-lib/patches/patch-ag b/multimedia/mpeg-lib/patches/patch-ag
deleted file mode 100644
index eeb84b078bd..00000000000
--- a/multimedia/mpeg-lib/patches/patch-ag
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2004/06/26 18:27:23 grant Exp $
-
---- fs4.c.orig	Fri Jul 23 23:59:24 1999
-+++ fs4.c	Mon Sep 15 22:49:49 2003
-@@ -21,10 +21,10 @@
- /* This file contains C code to do YCrCb -> colormap space. */
- 
- #include <config.h>
--#include <malloc.h>
- #include <memory.h>
- #include "fs4.h"
- #include "video.h"
-+#include <stdlib.h>
- #include "proto.h"
- #include "dither.h"
- #include "my_dmalloc.h"
diff --git a/multimedia/mpeg-lib/patches/patch-ah b/multimedia/mpeg-lib/patches/patch-ah
deleted file mode 100644
index ccd292e7b8a..00000000000
--- a/multimedia/mpeg-lib/patches/patch-ah
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2004/06/26 18:27:23 grant Exp $
-
---- hybrid.c.orig	Fri Jul 23 23:50:51 1999
-+++ hybrid.c	Mon Sep 15 22:50:01 2003
-@@ -21,9 +21,9 @@
- /* This file contains C code to implement an ordered dither. */
- 
- #include <config.h>
--#include <malloc.h>
- #include <memory.h>
- #include "video.h"
-+#include <stdlib.h>
- #include "proto.h"
- #include "dither.h"
- #include "my_dmalloc.h"
diff --git a/multimedia/mpeg-lib/patches/patch-ai b/multimedia/mpeg-lib/patches/patch-ai
deleted file mode 100644
index ce12be8142d..00000000000
--- a/multimedia/mpeg-lib/patches/patch-ai
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2004/06/26 18:27:23 grant Exp $
-
---- hybriderr.c.orig	Sat Jul 31 20:05:24 1999
-+++ hybriderr.c	Mon Sep 15 22:50:05 2003
-@@ -24,8 +24,8 @@
- 
- #include <config.h>
- #include <memory.h>
--#include <malloc.h>
- #include "video.h"
-+#include <stdlib.h>
- #include "proto.h"
- #include "dither.h"
- #include "my_dmalloc.h"
diff --git a/multimedia/mpeg-lib/patches/patch-aj b/multimedia/mpeg-lib/patches/patch-aj
deleted file mode 100644
index 43d2203dfd4..00000000000
--- a/multimedia/mpeg-lib/patches/patch-aj
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2004/06/26 18:27:23 grant Exp $
-
---- 2x2.c.orig	Sat Jul 24 00:06:22 1999
-+++ 2x2.c	Mon Sep 15 22:49:32 2003
-@@ -21,8 +21,8 @@
- 
- #include <config.h>
- #include <stdlib.h>
--#include <malloc.h>
- #include "video.h"
-+#include <stdlib.h>
- #include "dither.h"
- #include "proto.h"
- #include "my_dmalloc.h"
diff --git a/multimedia/mpeg-lib/patches/patch-ak b/multimedia/mpeg-lib/patches/patch-ak
deleted file mode 100644
index 6f66cb53ca7..00000000000
--- a/multimedia/mpeg-lib/patches/patch-ak
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2004/06/26 18:27:23 grant Exp $
-
---- mono.c.orig	Fri Jul 23 23:59:22 1999
-+++ mono.c	Mon Sep 15 22:50:16 2003
-@@ -24,9 +24,9 @@
-  */
- 
- #include <config.h>
--#include <malloc.h>
- #include <memory.h>
- #include "video.h"
-+#include <stdlib.h>
- #include "proto.h"
- #include "dither.h"
- #include "my_dmalloc.h"
diff --git a/multimedia/mpeg-lib/patches/patch-al b/multimedia/mpeg-lib/patches/patch-al
deleted file mode 100644
index 3b7536ca9bd..00000000000
--- a/multimedia/mpeg-lib/patches/patch-al
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-al,v 1.1 2004/06/26 18:27:23 grant Exp $
-
---- ordered.c.orig	Fri Jul 23 23:53:40 1999
-+++ ordered.c	Mon Sep 15 22:50:21 2003
-@@ -21,9 +21,9 @@
- /* This file contains C code to implement an ordered dither. */
- 
- #include <config.h>
--#include <malloc.h>
- #include <memory.h>
- #include "video.h"
-+#include <stdlib.h>
- #include "proto.h"
- #include "dither.h"
- #include "my_dmalloc.h"
diff --git a/multimedia/mpeg-lib/patches/patch-am b/multimedia/mpeg-lib/patches/patch-am
deleted file mode 100644
index d6b1259e0c5..00000000000
--- a/multimedia/mpeg-lib/patches/patch-am
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-am,v 1.1 2004/06/26 18:27:23 grant Exp $
-
---- ordered2.c.orig	Fri Jul 23 23:54:01 1999
-+++ ordered2.c	Mon Sep 15 22:50:25 2003
-@@ -21,9 +21,9 @@
- /* This file contains C code to implement an ordered dither. */
- 
- #include <config.h>
--#include <malloc.h>
- #include <memory.h>
- #include "video.h"
-+#include <stdlib.h>
- #include "proto.h"
- #include "dither.h"
- #include "my_dmalloc.h"
diff --git a/multimedia/mpeg-lib/patches/patch-an b/multimedia/mpeg-lib/patches/patch-an
deleted file mode 100644
index 8ebfa240891..00000000000
--- a/multimedia/mpeg-lib/patches/patch-an
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-an,v 1.1 2004/06/26 18:27:23 grant Exp $
-
---- mb_ordered.c.orig	Fri Jul 23 23:53:08 1999
-+++ mb_ordered.c	Mon Sep 15 22:50:11 2003
-@@ -21,9 +21,9 @@
- /* This file contains C code to implement an ordered dither. */
- 
- #include <config.h>
--#include <malloc.h>
- #include <memory.h>
- #include "video.h"
-+#include <stdlib.h>
- #include "proto.h"
- #include "dither.h"
- #include "my_dmalloc.h"
diff --git a/multimedia/mpeg-lib/patches/patch-ao b/multimedia/mpeg-lib/patches/patch-ao
deleted file mode 100644
index 4d21db9560f..00000000000
--- a/multimedia/mpeg-lib/patches/patch-ao
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2004/06/26 18:27:23 grant Exp $
-
---- mpeg.h.orig	Sat Jul 24 00:32:06 1999
-+++ mpeg.h
-@@ -109,7 +109,7 @@
- Boolean OpenMPEG PROTO((FILE *MPEGfile, ImageDesc *ImgInfo));
- void    CloseMPEG PROTO((void));
- Boolean RewindMPEG PROTO((FILE *MPEGfile, ImageDesc *Image));
--void    SetMPEGOption PROTO((MPEGOptionEnum Option, int value));
-+void    SetMPEGOption PROTO((MPEGOptionEnum Option, long value));
- Boolean GetMPEGFrame PROTO((char *Frame));
- 
- #ifdef __cplusplus
diff --git a/multimedia/mpeg-lib/patches/patch-ap b/multimedia/mpeg-lib/patches/patch-ap
deleted file mode 100644
index 90c429c44c0..00000000000
--- a/multimedia/mpeg-lib/patches/patch-ap
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2004/06/26 18:27:23 grant Exp $
-
---- Makefile.in.orig	Thu Nov 26 17:03:29 1998
-+++ Makefile.in	Mon Aug  6 16:54:52 2001
-@@ -11,7 +11,7 @@
- EXTRA_CFLAGS  = @EXTRA_CFLAGS@
- INCLUDE_DIRS  = -I. @INCLUDE_DIRS@
- DEFINES       = @DEFINES@
--CFLAGS        = $(OPTIMIZE) $(EXTRA_CFLAGS)
-+CFLAGS        += $(OPTIMIZE) $(EXTRA_CFLAGS)
- CPPFLAGS      = $(INCLUDE_DIRS) $(DEFINES)
- 
- # Installation directories (and install program)
-@@ -41,14 +41,14 @@
- 
- # Other files of interest
- 
--LIBRARY       = libmpeg.a
-+LIBRARY       = libmpeg_lib.la
- SHLIB         = libmpeg.so
- HEADER        = mpeg.h
- EXTRAS        = @extras@
- 
- # Implicit targets
- .c.o:
--		$(CC) -c $(CFLAGS) $(CPPFLAGS) $<
-+		${LIBTOOL} --mode=compile $(CC) -c $(CFLAGS) $(CPPFLAGS) $<
- 
- 
- # Library/cleanup targets: 
-@@ -60,16 +60,18 @@
- shlib:          $(SHLIB)
- 
- $(LIBRARY):	$(LIBOBJ)
--		$(AR) $(ARFLAGS) $(LIBRARY) $(LIBOBJ)
--		$(RANLIB) $(LIBRARY)
-+		${LIBTOOL} --mode=link $(CC) -o $(LIBRARY) $(LIBOBJ:.o=.lo)		\
-+			-rpath ${PREFIX}/lib -version-info 1:3
-+
- 
- $(SHLIB):	$(LIBOBJ)
- 		$(CC) -shared -o $(SHLIB) $(LIBOBJ)
- 
- install:	$(LIBRARY)
--		$(INSTALL) -d $(INSTALL_INCLUDE) $(INSTALL_LIBRARY)
-+		$(INSTALL) -d $(INSTALL_INCLUDE)
-+		$(INSTALL) -d $(INSTALL_LIBRARY)
- 		$(INSTALL) -m 0644 $(HEADER) $(INSTALL_INCLUDE)/$(HEADER)
--		$(INSTALL) -m 0644 $(LIBRARY) $(INSTALL_LIBRARY)/$(LIBRARY)
-+		${LIBTOOL} --mode=install $(INSTALL) -m 0644 $(LIBRARY) $(INSTALL_LIBRARY)/$(LIBRARY)
- 		@if test -f $(SHLIB) ; then echo "warning: $(SHLIB) *not* installed (installing shared libraries is too system-specific)" ; fi
- 
- clean:
diff --git a/multimedia/mpeg_encode/DESCR b/multimedia/mpeg_encode/DESCR
deleted file mode 100644
index f1d129b6c31..00000000000
--- a/multimedia/mpeg_encode/DESCR
+++ /dev/null
@@ -1,14 +0,0 @@
-The primary focus of MPEG encoding algorithms is 1) To create fast
-and efficient motion vector search techniques and 2) To find "good"
-encoding parameters that provide a balance of encoding speed,
-compression and quality.
-
-The Berkeley encoder accelerates the process by parallelizing in
-the temporal direction. The overall organization of the encoder is
-shown in Figure 2. The Master server is the overall coordinator.
-It allocates groups of frames to the Slave servers for encoding.
-The sharing of the files is achieved best, if the directories
-containing the video files are NFS mounted and accessible uniformly
-to all processors (alternatively they can be sent out though sockets
-by the Master). The various activities are managed by inter process
-communication through sockets.
diff --git a/multimedia/mpeg_encode/Makefile b/multimedia/mpeg_encode/Makefile
deleted file mode 100644
index 2a08bd6a019..00000000000
--- a/multimedia/mpeg_encode/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2005/10/05 11:45:46 salo Exp $
-#
-
-DISTNAME=	mpeg_encode-1.5b-src
-PKGNAME=	${DISTNAME:S/-src//}
-PKGREVISION=	3
-CATEGORIES=	multimedia net
-MASTER_SITES=	ftp://mm-ftp.cs.berkeley.edu/pub/multimedia/mpeg/encode/
-
-MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://bmrc.berkeley.edu/frame/research/mpeg/mpeg_encode.html
-COMMENT=	The Parallel Berkeley MPEG Encoder
-
-WRKSRC=			${WRKDIR}/mpeg_encode
-USE_TOOLS+=		gmake
-INSTALLATION_DIRS=	bin man/man1
-
-post-build:
-	@cd ${WRKSRC}/convert && \
-		${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS}
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/mpeg_encode ${PREFIX}/bin
-.for i in eyuvtojpeg jmovie2jpeg mpeg_demux
-	${INSTALL_PROGRAM} ${WRKSRC}/convert/${i} ${PREFIX}/bin
-.endfor
-	${INSTALL_DATA_DIR}  ${PREFIX}/share/doc/mpeg_encode
-.for i in EXTENSIONS INPUT.FORMAT mpeg_encode.1 parallel.param param-summary \
-		template.param users-guide.fm users-guide.mif users-guide.ps
-	${INSTALL_DATA}  ${WRKSRC}/docs/${i} ${PREFIX}/share/doc/mpeg_encode
-.endfor
-	${INSTALL_DATA_DIR}  ${PREFIX}/share/examples/mpeg_encode
-	cd ${WRKSRC}/examples ; for i in * ; do \
-		${INSTALL_DATA} $$i ${PREFIX}/share/examples/mpeg_encode; \
-	done
-	${INSTALL_MAN} ${WRKSRC}/docs/mpeg_encode.1 ${PREFIX}/man/man1
-
-.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/mpeg_encode/PLIST b/multimedia/mpeg_encode/PLIST
deleted file mode 100644
index a6a5117ab7f..00000000000
--- a/multimedia/mpeg_encode/PLIST
+++ /dev/null
@@ -1,168 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/02/24 21:47:25 jmmv Exp $
-bin/eyuvtojpeg
-bin/jmovie2jpeg
-bin/mpeg_demux
-bin/mpeg_encode
-man/man1/mpeg_encode.1
-share/doc/mpeg_encode/EXTENSIONS
-share/doc/mpeg_encode/INPUT.FORMAT
-share/doc/mpeg_encode/mpeg_encode.1
-share/doc/mpeg_encode/parallel.param
-share/doc/mpeg_encode/param-summary
-share/doc/mpeg_encode/template.param
-share/doc/mpeg_encode/users-guide.fm
-share/doc/mpeg_encode/users-guide.mif
-share/doc/mpeg_encode/users-guide.ps
-share/examples/mpeg_encode/basicspeed.param
-share/examples/mpeg_encode/decoded.test
-share/examples/mpeg_encode/decoded2.test
-share/examples/mpeg_encode/decorig.param
-share/examples/mpeg_encode/default.param
-share/examples/mpeg_encode/fastspeed.param
-share/examples/mpeg_encode/foobar.param
-share/examples/mpeg_encode/frame.test
-share/examples/mpeg_encode/gop.combine
-share/examples/mpeg_encode/gop.test
-share/examples/mpeg_encode/gop1.param
-share/examples/mpeg_encode/hello.param
-share/examples/mpeg_encode/i.test
-share/examples/mpeg_encode/ispeed.jpeg.param
-share/examples/mpeg_encode/ispeed.param
-share/examples/mpeg_encode/jpeg.test
-share/examples/mpeg_encode/jpeg19.param
-share/examples/mpeg_encode/jpegout19.param
-share/examples/mpeg_encode/localdisk.param
-share/examples/mpeg_encode/localremote.test
-share/examples/mpeg_encode/luxo.param
-share/examples/mpeg_encode/luxo18.param
-share/examples/mpeg_encode/luxo19.5.param
-share/examples/mpeg_encode/luxo19.param
-share/examples/mpeg_encode/luxo2.param
-share/examples/mpeg_encode/luxo48.param
-share/examples/mpeg_encode/luxo49.param
-share/examples/mpeg_encode/luxo50.param
-share/examples/mpeg_encode/luxo52.5.param
-share/examples/mpeg_encode/luxo52.param
-share/examples/mpeg_encode/luxo53.param
-share/examples/mpeg_encode/luxobug.param
-share/examples/mpeg_encode/luxoskip.param
-share/examples/mpeg_encode/med.param
-share/examples/mpeg_encode/med18.param
-share/examples/mpeg_encode/medspeed.param
-share/examples/mpeg_encode/nametest.param
-share/examples/mpeg_encode/nosearch.param
-share/examples/mpeg_encode/par3.param
-share/examples/mpeg_encode/par4.param
-share/examples/mpeg_encode/par5.param
-share/examples/mpeg_encode/parallel.2
-share/examples/mpeg_encode/parallel.param
-share/examples/mpeg_encode/parallel.test
-share/examples/mpeg_encode/param.template
-share/examples/mpeg_encode/payam.param
-share/examples/mpeg_encode/payam18.param
-share/examples/mpeg_encode/pnm.param
-share/examples/mpeg_encode/ppm.param
-share/examples/mpeg_encode/prof.b.param
-share/examples/mpeg_encode/prof.bhalf.param
-share/examples/mpeg_encode/prof.param
-share/examples/mpeg_encode/prof.ss.param
-share/examples/mpeg_encode/prof2.param
-share/examples/mpeg_encode/prof3.param
-share/examples/mpeg_encode/prof4.param
-share/examples/mpeg_encode/remote.test
-share/examples/mpeg_encode/search1.param
-share/examples/mpeg_encode/search10.param
-share/examples/mpeg_encode/search11.param
-share/examples/mpeg_encode/search12.param
-share/examples/mpeg_encode/search13.param
-share/examples/mpeg_encode/search14.param
-share/examples/mpeg_encode/search15.param
-share/examples/mpeg_encode/search16.param
-share/examples/mpeg_encode/search17.param
-share/examples/mpeg_encode/search18.param
-share/examples/mpeg_encode/search19.5.param
-share/examples/mpeg_encode/search19.param
-share/examples/mpeg_encode/search2.param
-share/examples/mpeg_encode/search20.param
-share/examples/mpeg_encode/search21.param
-share/examples/mpeg_encode/search22.param
-share/examples/mpeg_encode/search23.param
-share/examples/mpeg_encode/search24.param
-share/examples/mpeg_encode/search25.param
-share/examples/mpeg_encode/search26.param
-share/examples/mpeg_encode/search27.param
-share/examples/mpeg_encode/search28.param
-share/examples/mpeg_encode/search29.param
-share/examples/mpeg_encode/search3.param
-share/examples/mpeg_encode/search30.param
-share/examples/mpeg_encode/search31.param
-share/examples/mpeg_encode/search32.param
-share/examples/mpeg_encode/search33.param
-share/examples/mpeg_encode/search34.param
-share/examples/mpeg_encode/search35.param
-share/examples/mpeg_encode/search36.param
-share/examples/mpeg_encode/search37.param
-share/examples/mpeg_encode/search38.param
-share/examples/mpeg_encode/search39.param
-share/examples/mpeg_encode/search4.param
-share/examples/mpeg_encode/search40.param
-share/examples/mpeg_encode/search41.param
-share/examples/mpeg_encode/search42.param
-share/examples/mpeg_encode/search43.param
-share/examples/mpeg_encode/search44.param
-share/examples/mpeg_encode/search45.param
-share/examples/mpeg_encode/search46.param
-share/examples/mpeg_encode/search47.param
-share/examples/mpeg_encode/search48.param
-share/examples/mpeg_encode/search49.param
-share/examples/mpeg_encode/search5.param
-share/examples/mpeg_encode/search50.param
-share/examples/mpeg_encode/search51.param
-share/examples/mpeg_encode/search52.5.param
-share/examples/mpeg_encode/search52.param
-share/examples/mpeg_encode/search53.param
-share/examples/mpeg_encode/search6.param
-share/examples/mpeg_encode/search7.param
-share/examples/mpeg_encode/search8.param
-share/examples/mpeg_encode/search9.param
-share/examples/mpeg_encode/seq.param
-share/examples/mpeg_encode/sequoia.param
-share/examples/mpeg_encode/sequoia19.param
-share/examples/mpeg_encode/sequoia2.param
-share/examples/mpeg_encode/slice.param
-share/examples/mpeg_encode/slimed.param
-share/examples/mpeg_encode/slowspeed.param
-share/examples/mpeg_encode/stanford.param
-share/examples/mpeg_encode/subtest.param
-share/examples/mpeg_encode/temp.param
-share/examples/mpeg_encode/template.param
-share/examples/mpeg_encode/tennis.param
-share/examples/mpeg_encode/tennis18.param
-share/examples/mpeg_encode/tennis19.5.param
-share/examples/mpeg_encode/tennis19.param
-share/examples/mpeg_encode/tennis48.param
-share/examples/mpeg_encode/tennis49.param
-share/examples/mpeg_encode/tennis50.param
-share/examples/mpeg_encode/tennis52.5.param
-share/examples/mpeg_encode/tennis52.param
-share/examples/mpeg_encode/tennis53.param
-share/examples/mpeg_encode/tennisbug.param
-share/examples/mpeg_encode/testp.param
-share/examples/mpeg_encode/walk.param
-share/examples/mpeg_encode/walk1.param
-share/examples/mpeg_encode/walk18.param
-share/examples/mpeg_encode/walk19.5.param
-share/examples/mpeg_encode/walk19.param
-share/examples/mpeg_encode/walk2.param
-share/examples/mpeg_encode/walk3.param
-share/examples/mpeg_encode/walk4.param
-share/examples/mpeg_encode/walk48.param
-share/examples/mpeg_encode/walk49.param
-share/examples/mpeg_encode/walk5.param
-share/examples/mpeg_encode/walk50.param
-share/examples/mpeg_encode/walk52.5.param
-share/examples/mpeg_encode/walk52.param
-share/examples/mpeg_encode/walk53.param
-share/examples/mpeg_encode/walk93.param
-@dirrm share/examples/mpeg_encode
-@dirrm share/doc/mpeg_encode
diff --git a/multimedia/mpeg_encode/distinfo b/multimedia/mpeg_encode/distinfo
deleted file mode 100644
index 778fd55b505..00000000000
--- a/multimedia/mpeg_encode/distinfo
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/10/05 11:45:46 salo Exp $
-
-SHA1 (mpeg_encode-1.5b-src.tar.gz) = 853cd175f73b8064ce28deb256e4b81159a684ed
-RMD160 (mpeg_encode-1.5b-src.tar.gz) = 24c0a1090076630c292936639c5fb275778f6470
-Size (mpeg_encode-1.5b-src.tar.gz) = 2028724 bytes
-SHA1 (patch-aa) = 04221eb3d4cf85b206d27a2f425719ed7c4a5ec1
-SHA1 (patch-ab) = f2cdf02d49b726b4fb7fb210074e7ba53b9b380b
-SHA1 (patch-ac) = 8f89257bd93584cd028b659bb8c3379d713339da
-SHA1 (patch-ad) = 670a244680d09cb9f558a8777ec8f189145342f8
-SHA1 (patch-ae) = 414b8c45c65892b9e161c285c5c0327103f8f474
-SHA1 (patch-ag) = 8cc4ffab9263f33e4a7da6779cdbbb59d010b475
-SHA1 (patch-ah) = 3df51a25ecc5abdb1821958183e087a9a9345e8a
-SHA1 (patch-ai) = 62f74749d2d4652222c1d0d96c1136af25ffae2e
-SHA1 (patch-aj) = 56031b467679ce4e2ae6bcddbdb129cd8cead479
-SHA1 (patch-ak) = f28929b16bb804c691565adbe3f4c1814154ced7
-SHA1 (patch-al) = be13795b7db10224974f222ce174fb1305d0e582
-SHA1 (patch-am) = 983546e7384fc96f0f182ae23bf5ddd19f7a0008
-SHA1 (patch-an) = 69e70b75b558637b3a2afb612871f7d4a8538c92
diff --git a/multimedia/mpeg_encode/patches/patch-aa b/multimedia/mpeg_encode/patches/patch-aa
deleted file mode 100644
index 2fb3f989b20..00000000000
--- a/multimedia/mpeg_encode/patches/patch-aa
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/02/24 21:47:25 jmmv Exp $
-
---- Makefile.orig	Thu Aug 17 00:16:56 1995
-+++ Makefile
-@@ -36,9 +36,9 @@
- ##############
- # JPEG STUFF #
- ##############
--JPEG_LIB = jpeg/libjpeg.a
--JPEG_DIR = -Ijpeg
--JPEG_LIB_DIR = -Ljpeg
-+JPEG_LIB = -ljpeg
-+JPEG_DIR = 
-+JPEG_LIB_DIR = 
- MP_JPEG_OBJS = jpeg.o
- MP_JPEG_SRCS = jpeg.c
- 
-@@ -57,7 +57,7 @@
- #################
- # INCLUDE FILES # 
- #################
--INCLUDEDIR = -Iheaders -I/usr/include $(JPEG_DIR)
-+INCLUDEDIR = -Iheaders $(JPEG_DIR)
- 
- ############################################################################
- # LIBRARIES # specify library directories; need jpg lib and maybe pbm	   #
-@@ -203,7 +203,7 @@
- ############
- 
- mpeg_encode: $(MP_ALL_OBJS) $(JPEG_LIB)
--	$(PURIFY) $(CC) $(CFLAGS) -o $@ $(MP_ALL_OBJS) $(LIBDIRS) $(LIBS)
-+	$(PURIFY) $(CC) $(LDFLAGS) -o $@ $(MP_ALL_OBJS) $(LIBDIRS) $(LIBS)
- 	strip mpeg_encode
- 
- profile: $(MP_ALL_OBJS)
diff --git a/multimedia/mpeg_encode/patches/patch-ab b/multimedia/mpeg_encode/patches/patch-ab
deleted file mode 100644
index 52806afd68e..00000000000
--- a/multimedia/mpeg_encode/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/02/24 21:47:25 jmmv Exp $
-
---- jpeg.c.orig	Sat Aug  5 01:35:07 1995
-+++ jpeg.c
-@@ -77,7 +77,7 @@
- 
- /* make it happier.... */
- #undef DCTSIZE2
--#include "jpeg/jpeglib.h"
-+#include "jpeglib.h"	/* Use system header! */
- 
- 
- #define HEADER_SIZE 607   /*JFIF header size used on output images*/
diff --git a/multimedia/mpeg_encode/patches/patch-ac b/multimedia/mpeg_encode/patches/patch-ac
deleted file mode 100644
index 87286cc1460..00000000000
--- a/multimedia/mpeg_encode/patches/patch-ac
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/02/24 21:47:25 jmmv Exp $
-
---- libpnmrw.c.orig	Thu Aug 17 00:24:26 1995
-+++ libpnmrw.c
-@@ -28,6 +28,9 @@
- #endif
- 
- #include <stdio.h>
-+#ifdef __NetBSD__
-+#  include <errno.h>
-+#endif
- #include "libpnmrw.h"
- 
- /* if don't have string.h, try strings.h */
-@@ -126,8 +129,10 @@
-   pm_perror( reason )
- char* reason;
- {
-+#ifndef __NetBSD__
-   extern char* sys_errlist[];
-   extern int errno;
-+#endif
-   char* e;
- 
-   e = sys_errlist[errno];
diff --git a/multimedia/mpeg_encode/patches/patch-ad b/multimedia/mpeg_encode/patches/patch-ad
deleted file mode 100644
index a2cd5e696a5..00000000000
--- a/multimedia/mpeg_encode/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2004/02/24 21:47:25 jmmv Exp $
-
---- docs/mpeg_encode.1.orig	Thu Mar 30 00:15:09 1995
-+++ docs/mpeg_encode.1
-@@ -368,6 +368,8 @@
- This is version 1.5 it contins new features and bug fixes from version 1.3.
- .SH BUGS
- No known bugs, but if you find any, report them to mpeg-bugs@plateau.cs.berkeley.edu.
-+If you experience problems in the jpeg code, it is advisable to use another
-+input format. This problem is documented in NetBSD PR pkg/14043.
- .HP
- .SH AUTHORS
- .HP
diff --git a/multimedia/mpeg_encode/patches/patch-ae b/multimedia/mpeg_encode/patches/patch-ae
deleted file mode 100644
index 14ae906fd68..00000000000
--- a/multimedia/mpeg_encode/patches/patch-ae
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2005/10/05 11:45:46 salo Exp $
-
---- ../convert/jmovie2jpeg.c.orig	1995-01-20 00:29:24.000000000 +0000
-+++ ../convert/jmovie2jpeg.c
-@@ -283,12 +283,12 @@ static char inbuffer[300000] = {    
-     if (fread (&(image_offset),sizeof(int),1,inFile) != 1)
-     {
- 	perror("Error in reading image offset");
--	exit();
-+	exit(1);
-     }
-     if (fread (&(audio_tracks),sizeof(int),1,inFile) != 1)
-     {
- 	perror("Error in reading audio tracks");
--	exit();
-+	exit(1);
-     }
-     if (audio_tracks != 1) 
-       { 
diff --git a/multimedia/mpeg_encode/patches/patch-ag b/multimedia/mpeg_encode/patches/patch-ag
deleted file mode 100644
index 0b15f5ef4ed..00000000000
--- a/multimedia/mpeg_encode/patches/patch-ag
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2005/04/06 16:30:18 wiz Exp $
-
---- opts.c.orig	1995-08-15 20:34:09.000000000 +0200
-+++ opts.c
-@@ -37,9 +37,9 @@
- 
- #include <stdio.h>
- #include <string.h>
--#include "opts.h"
- #include <malloc.h>
- #include <math.h>
-+#include "opts.h"
- 
- /*==============*
-  * EXTERNALS    *
diff --git a/multimedia/mpeg_encode/patches/patch-ah b/multimedia/mpeg_encode/patches/patch-ah
deleted file mode 100644
index b187426010c..00000000000
--- a/multimedia/mpeg_encode/patches/patch-ah
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2005/10/05 11:45:46 salo Exp $
-
-Fix for SA17008, from Gentoo.
-
---- ../convert/eyuvtojpeg.c.orig	1995-04-14 23:16:52.000000000 +0200
-+++ ../convert/eyuvtojpeg.c	2005-10-05 13:20:02.000000000 +0200
-@@ -24,6 +24,7 @@
-  *==============*/
- #include <stdio.h>
- #include <stdlib.h>
-+#include <unistd.h>
- #include <malloc.h>
- 
- typedef unsigned char uint8;
-@@ -46,8 +47,9 @@
- void	main(int argc, char **argv)
- {
-     FILE *fpointer;
--    char command[256];
--    char src[256], dest[256];
-+    char command[4096];
-+    char src[4096], dest[4096], tempfile[4096];
-+    int ret;
- 
-     if ((strcmp(argv[1],"-?") == 0) ||
- 	(strcmp(argv[1],"-h") == 0) ||
-@@ -98,13 +100,16 @@
-     YUVtoPPM();
- 
-     fprintf(stdout, "Writing PPM\n");
--    fpointer = fopen("/tmp/foobar", "w");
-+    sprintf(tempfile, "%s.tmp", dest);
-+    fpointer = fopen(tempfile, "w");
-     WritePPM(fpointer);
-     fclose(fpointer);
- 
-     fprintf(stdout, "Converting to JPEG %s\n", dest);
--    sprintf(command, "cjpeg /tmp/foobar > %s", dest);
--    system(command);
-+    sprintf(command, "cjpeg %s > %s", tempfile, dest);
-+    ret = system(command);
-+    unlink(tempfile);
-+    return ret;
- }
- 
- 
diff --git a/multimedia/mpeg_encode/patches/patch-ai b/multimedia/mpeg_encode/patches/patch-ai
deleted file mode 100644
index 9a004a58f60..00000000000
--- a/multimedia/mpeg_encode/patches/patch-ai
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2005/10/05 11:45:46 salo Exp $
-
-Fix for SA17008, from Gentoo.
-
---- ../convert/eyuvtoppm.c.orig	1995-04-14 23:16:52.000000000 +0200
-+++ ../convert/eyuvtoppm.c	2005-10-05 13:16:27.000000000 +0200
-@@ -99,13 +99,9 @@
-     fpointer = fopen(dest, "w");
-     if (fpointer == NULL) {
-       fprintf(stderr, "Problems opening %s!\n", dest);
--      fprintf(stderr, "Trying /tmp/foobar instead\n");
--      strcpy(dest, "/tmp/foobar");
--      fpointer = fopen(dest, "w");
--      if (fpointer == NULL) {
--	fprintf(stderr, "Nope, exiting.\n");
-+      perror("");
- 	exit(1);
--      }}
-+    }
- 
-     WritePPM(fpointer);
-     fclose(fpointer);
diff --git a/multimedia/mpeg_encode/patches/patch-aj b/multimedia/mpeg_encode/patches/patch-aj
deleted file mode 100644
index 20ab82b2d9a..00000000000
--- a/multimedia/mpeg_encode/patches/patch-aj
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2005/10/05 11:45:46 salo Exp $
-
-Fix for SA17008, from Gentoo.
-
---- ../convert/vidtoeyuv.c.orig	1995-01-20 04:25:39.000000000 +0100
-+++ ../convert/vidtoeyuv.c	2005-10-05 13:16:27.000000000 +0200
-@@ -125,9 +125,9 @@
-   XImage *ximage;
-   char *tdata;
-   char *obase;
--  char ofname[256];
-+  char ofname[4096], tempfile[4096];
-   int height, width;
--  char command[256];
-+  char command[4096];
-   int nth;
- 
-   if ((argc != 7) && (argc != 8))usage (argv[0]);
-@@ -223,9 +223,11 @@
- 
- 
-     sprintf(ofname, "%s%d.yuv", obase, i);
--    outFile = fopen("/tmp/foobar", "w");
-+    sprintf(tempfile, "%s%d.yuv.tmp", obase, i);
-+    outFile = fopen(tempfile, "w");
-     if (!outFile) {
-       perror("Couldn't open output file.");
-+      exit(1);
-     }
- 
-     for (r=0; r<height; r++) {
-@@ -241,9 +243,10 @@
- 
-     free(tdata);
- 
--    sprintf(command, "rawtoppm %d %d < /tmp/foobar | ppmtoyuv > %s",
--	    width, height, ofname);
-+    sprintf(command, "rawtoppm %d %d < %s | ppmtoyuv > %s",
-+	    width, height, tempfile, ofname);
-     system(command);
-+    unlink(tempfile);
- 
-       for (j=0; j<nth-1; j++) {
- 	if (read (fd, &image, sizeof(image)) != sizeof(image)) {
diff --git a/multimedia/mpeg_encode/patches/patch-ak b/multimedia/mpeg_encode/patches/patch-ak
deleted file mode 100644
index 1febc77357c..00000000000
--- a/multimedia/mpeg_encode/patches/patch-ak
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2005/10/05 11:45:46 salo Exp $
-
-Fix for SA17008, from Gentoo.
-
---- ../convert/vidtojpeg.c.orig	1995-01-20 04:25:40.000000000 +0100
-+++ ../convert/vidtojpeg.c	2005-10-05 13:16:27.000000000 +0200
-@@ -123,9 +123,9 @@
-   XImage *ximage;
-   char *tdata;
-   char *obase;
--  char ofname[256];
-+  char ofname[4096], tempfile[4096];
-   int height, width;
--  char command[256];
-+  char command[4096];
- 
- 
-   if ((argc != 7) && (argc != 8))usage (argv[0]);
-@@ -221,9 +221,11 @@
- 
- 
-     sprintf(ofname, "%s.%d.jpeg", obase, i);
--    outFile = fopen("/tmp/foobar", "w");
-+    sprintf(tempfile, "%s.%d.jpeg.tmp", obase, i);
-+    outFile = fopen(tempfile, "w");
-     if (!outFile) {
-       perror("Couldn't open output file.");
-+      exit(1);
-     }
- 
-     for (r=0; r<height; r++) {
-@@ -239,9 +241,10 @@
- 
-     free(tdata);
- 
--    sprintf(command, "rawtoppm %d %d < /tmp/foobar | cjpeg > %s",
--	    width, height, ofname);
-+    sprintf(command, "rawtoppm %d %d < %s | cjpeg > %s",
-+	    width, height, tempfile, ofname);
-     system(command);
-+    unlink(tempfile);
-   }
- }
- 
diff --git a/multimedia/mpeg_encode/patches/patch-al b/multimedia/mpeg_encode/patches/patch-al
deleted file mode 100644
index e5aa0e7e014..00000000000
--- a/multimedia/mpeg_encode/patches/patch-al
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-al,v 1.1 2005/10/05 11:45:46 salo Exp $
-
-Fix for SA17008, from Gentoo.
-
---- ../convert/vidtoppm.c.orig	1995-01-20 04:25:40.000000000 +0100
-+++ ../convert/vidtoppm.c	2005-10-05 13:16:27.000000000 +0200
-@@ -220,9 +220,11 @@
- 
- 
-     sprintf(ofname, "%s%d.ppm", obase, i);
--    outFile = fopen("/tmp/foobar", "w");
-+    sprintf(tempfile, "%s%d.ppm.tmp", obase, i);
-+    outFile = fopen(tempfile, "w");
-     if (!outFile) {
-       perror("Couldn't open output file.");
-+      exit(1);
-     }
- 
-     for (r=0; r<height; r++) {
-@@ -238,8 +240,9 @@
- 
-     free(tdata);
- 
--    sprintf(command, "rawtoppm %d %d < /tmp/foobar > %s",
--	    width, height, ofname);
-+    sprintf(command, "rawtoppm %d %d < %s > %s",
-+	    width, height, tempfile, ofname);
-     system(command);
-+    unlink(tempfile);
-   }
- }
diff --git a/multimedia/mpeg_encode/patches/patch-am b/multimedia/mpeg_encode/patches/patch-am
deleted file mode 100644
index 80d50d42c86..00000000000
--- a/multimedia/mpeg_encode/patches/patch-am
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-am,v 1.1 2005/10/05 11:45:46 salo Exp $
-
-Fix for SA17008, from Gentoo.
-
---- parallel.c.orig	1995-08-16 20:22:11.000000000 +0200
-+++ parallel.c	2005-10-05 13:25:40.000000000 +0200
-@@ -586,6 +586,8 @@
-  * SIDE EFFECTS:    none
-  *
-  *===========================================================================*/
-+/* internal hook into the ReadFrame function */
-+void _ReadFrame(MpegFrame *frame, char *fileName, FILE *fileHook, char *conversion, boolean addPath);
- void
-   GetRemoteFrame(frame, frameNumber)
- MpegFrame *frame;
-@@ -615,8 +617,13 @@
- 
-   if ( frameNumber != -1 ) {
-     if ( separateConversion ) {
--      sprintf(fileName, "/tmp/foobar%d", machineNumber);
--      filePtr = fopen(fileName, "wb");
-+      int fd;
-+      snprintf(fileName, sizeof(fileName), "/tmp/mpeg_encode_foobar%dXXXXXX", machineNumber);
-+      fd = mkstemp(fileName);
-+      if (fd == -1 || (filePtr = fdopen(fd, "wb")) == NULL) {
-+	perror("ERROR: mpeg_encode->GetRemoteFrame");
-+	exit(1);
-+      }
- 
-       /* read in stuff, SafeWrite to file, perform local conversion */
-       do {
-@@ -628,10 +635,12 @@
- 	fwrite(smallBuffer, 1, numBytes, filePtr);
-       } while ( numBytes == 1000 );
-       fflush(filePtr);
--      fclose(filePtr);
-+      rewind(filePtr);
- 
-       /* now do slave conversion */
--      ReadFrame(frame, fileName, slaveConversion, FALSE);
-+      _ReadFrame(frame, NULL, filePtr, slaveConversion, FALSE);
-+      /* _ReadFrame() will close the file pointer for us */
-+      /* fclose(filePtr); */
-     } else {
-       Frame_AllocYCC(frame);
- 
diff --git a/multimedia/mpeg_encode/patches/patch-an b/multimedia/mpeg_encode/patches/patch-an
deleted file mode 100644
index 041ec73ba89..00000000000
--- a/multimedia/mpeg_encode/patches/patch-an
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-an,v 1.1 2005/10/05 11:45:46 salo Exp $
-
-Fix for SA17008, from Gentoo.
-
---- readframe.c.orig	1995-08-15 00:31:58.000000000 +0200
-+++ readframe.c	2005-10-05 13:25:40.000000000 +0200
-@@ -227,14 +227,22 @@
-  * SIDE EFFECTS:    none
-  *
-  *===========================================================================*/
-+void _ReadFrame(MpegFrame *frame, char *fileName, FILE *fileHook, char *conversion, boolean addPath);
-+
-+void ReadFrame(MpegFrame *frame, char *fileName, char *conversion, boolean addPath)
-+{
-+    _ReadFrame(frame, fileName, NULL, conversion, addPath);
-+}
-+
- void
--ReadFrame(frame, fileName, conversion, addPath)
-+_ReadFrame(frame, fileName, fileHook, conversion, addPath)
-     MpegFrame *frame;
-     char *fileName;
-+    FILE *fileHook;
-     char *conversion;
-     boolean addPath;
- {
--    FILE    *ifp;
-+    FILE    *ifp = fileHook;
-     char    command[1024];
-     char    fullFileName[1024];
-     MpegFrame    tempFrame;
-@@ -274,6 +282,9 @@
-     }
- #endif
- 
-+    if (fileHook)
-+      goto file_is_already_opened;
-+
-     if ( fileType == ANY_FILE_TYPE ) {
-     char *convertPtr, *commandPtr, *charPtr;
- 
-@@ -325,6 +336,7 @@
-       exit(1);
-     }
- 
-+file_is_already_opened:
-     switch(baseFormat) {
-     case YUV_FILE_TYPE:
- 
diff --git a/multimedia/mpeg_play/DESCR b/multimedia/mpeg_play/DESCR
deleted file mode 100644
index dbef6ffd249..00000000000
--- a/multimedia/mpeg_play/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-This is mpeg_play, which will let you view mpeg movies on X window
-displays.
diff --git a/multimedia/mpeg_play/Makefile b/multimedia/mpeg_play/Makefile
deleted file mode 100644
index 30d30a49fb6..00000000000
--- a/multimedia/mpeg_play/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2005/03/24 21:12:58 wiz Exp $
-
-DISTNAME=	mpeg_play-2.4-patched
-PKGNAME=	mpeg_play-2.4patched
-PKGREVISION=	1
-CATEGORIES=	multimedia
-MASTER_SITES=	ftp://mm-ftp.cs.berkeley.edu/pub/multimedia/mpeg/play/
-EXTRACT_SUFX=	-src.tar.gz
-
-MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://bmrc.berkeley.edu/projects/mpeg/mpeg_play.html
-COMMENT=	Program to play mpeg movies on X displays
-
-WRKSRC=		${WRKDIR}/mpeg_play
-USE_IMAKE=	yes
-
-pre-configure:
-	${MV} -f ${WRKSRC}/Imakefile.proto ${WRKSRC}/Imakefile
-	${MV} -f ${WRKSRC}/mpeg_play.1 ${WRKSRC}/mpeg_play.man
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/mpeg_play/PLIST b/multimedia/mpeg_play/PLIST
deleted file mode 100644
index 0d1a82910f6..00000000000
--- a/multimedia/mpeg_play/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/02/24 21:49:22 jmmv Exp $
-bin/mpeg_play
-${IMAKE_MAN_DIR}/mpeg_play.${IMAKE_MANNEWSUFFIX}
diff --git a/multimedia/mpeg_play/distinfo b/multimedia/mpeg_play/distinfo
deleted file mode 100644
index 6bb53964274..00000000000
--- a/multimedia/mpeg_play/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 11:24:04 agc Exp $
-
-SHA1 (mpeg_play-2.4-patched-src.tar.gz) = c73bfee6b9ea4ae12678bce28dd617fd53728241
-RMD160 (mpeg_play-2.4-patched-src.tar.gz) = 2a763142cd3b3c24223df3870470e9f4275c2fc4
-Size (mpeg_play-2.4-patched-src.tar.gz) = 146696 bytes
-SHA1 (patch-aa) = b9538234c58dd7e671e61bc4e0ed14efb1f3e733
-SHA1 (patch-ab) = 104053d82635859c66d4a968c08110e5b33d88de
diff --git a/multimedia/mpeg_play/patches/patch-aa b/multimedia/mpeg_play/patches/patch-aa
deleted file mode 100644
index 8dc062ae187..00000000000
--- a/multimedia/mpeg_play/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/02/24 21:49:23 jmmv Exp $
-
---- ./Imakefile.proto.orig	Tue Feb  6 23:37:51 1996
-+++ ./Imakefile.proto	Wed Feb  7 00:05:59 1996
-@@ -1,9 +1,9 @@
- /* See Makefile.proto for flags to define */
--        DESTDIR = /usr/pkg/video
-+        /* DESTDIR = /usr/pkg/video */
-         NDEBUG  = /* -DNDEBUG */
-        /*ANALYSIS = -DANALYSIS */
-           SHMEM = -DSH_MEM
--  EXTRA_DEFINES = $(NDEBUG) $(ANALYSIS) $(SHMEM)
-+  EXTRA_DEFINES = $(NDEBUG) $(ANALYSIS) $(SHMEM) -DSIG_ONE_PARAM
-         DEPLIBS = $(DEPXLIB)
- LOCAL_LIBRARIES = $(XLIB)
- SYS_LIBRARIES   = -lm -lc
diff --git a/multimedia/mpeg_play/patches/patch-ab b/multimedia/mpeg_play/patches/patch-ab
deleted file mode 100644
index 33842465eda..00000000000
--- a/multimedia/mpeg_play/patches/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/02/24 21:49:23 jmmv Exp $
-
---- video.h.orig	Tue Oct  6 22:06:33 1998
-+++ video.h	Tue Oct  6 22:06:40 1998
-@@ -388,6 +388,15 @@
- extern unsigned int cacheMiss[8][8];
- #endif
- 
-+#ifdef __NetBSD__
-+#include <machine/endian.h>
-+#if BYTE_ORDER == LITTLE_ENDIAN
-+#define LITTLE_ENDIAN_ARCHITECTURE 1
-+#else
-+#define BIG_ENDIAN_ARCHITECTURE 1
-+#endif
-+#endif
-+
- #if !defined(__MIPSEL__) && (defined(MIPSEL) || defined(__MIPSEL) || defined(__MIPSEL__) || defined(__mipsel) || defined(__mipsel__))
- #define __MIPSEL__ 1
- #endif
diff --git a/multimedia/mplayer-plugin-firefox-gtk1/Makefile b/multimedia/mplayer-plugin-firefox-gtk1/Makefile
deleted file mode 100644
index 53b11f8bd1a..00000000000
--- a/multimedia/mplayer-plugin-firefox-gtk1/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/04/19 15:36:59 wiz Exp $
-#
-
-BROWSER=	firefox-gtk1
-
-CONFIGURE_ARGS+=	--disable-gtk2
-CONFIGURE_ARGS+=	--enable-gtk1
-
-.include "../../multimedia/mplayer-plugin-firefox/Makefile.common"
-.include "../../www/firefox-gtk1/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/mplayer-plugin-firefox/DESCR b/multimedia/mplayer-plugin-firefox/DESCR
deleted file mode 100644
index de1b542053c..00000000000
--- a/multimedia/mplayer-plugin-firefox/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-Plugin for Gecko based browsers that uses mplayer to play videos from
-websites.
diff --git a/multimedia/mplayer-plugin-firefox/Makefile b/multimedia/mplayer-plugin-firefox/Makefile
deleted file mode 100644
index 7a292111d59..00000000000
--- a/multimedia/mplayer-plugin-firefox/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2005/04/19 15:36:23 wiz Exp $
-#
-
-PKGREVISION=	3
-BROWSER=	firefox
-
-CONFIGURE_ARGS+=	--disable-gtk1
-
-.include "Makefile.common"
-.include "../../www/firefox/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/mplayer-plugin-firefox/Makefile.common b/multimedia/mplayer-plugin-firefox/Makefile.common
deleted file mode 100644
index c9ce766aeda..00000000000
--- a/multimedia/mplayer-plugin-firefox/Makefile.common
+++ /dev/null
@@ -1,69 +0,0 @@
-# $NetBSD: Makefile.common,v 1.8 2005/08/10 20:56:20 jlam Exp $
-#
-
-DISTNAME=		mplayerplug-in-2.70
-PKGNAME=		mplayer-plugin-${BROWSER}-2.70
-CATEGORIES=		multimedia
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=mplayerplug-in/}
-
-MAINTAINER=		xtraeme@NetBSD.org
-HOMEPAGE=		http://mplayerplug-in.sourceforge.net/
-COMMENT=		Mplayer plug-in for ${BROWSER}
-
-DEPENDS+=		mplayer>=0.92:../../multimedia/mplayer
-
-WRKSRC=			${WRKDIR}/mplayerplug-in
-GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake pkg-config
-USE_LANGUAGES+=		c++
-USE_PKGINSTALL=		yes
-
-FILESDIR=	${.CURDIR}/../../multimedia/mplayer-plugin-firefox/files
-PATCHDIR=	${.CURDIR}/../../multimedia/mplayer-plugin-firefox/patches
-DISTINFO_FILE=	${.CURDIR}/../../multimedia/mplayer-plugin-firefox/distinfo
-PLIST_SRC=	${.CURDIR}/../../multimedia/mplayer-plugin-firefox/PLIST
-DESCR_SRC=	${.CURDIR}/../../multimedia/mplayer-plugin-firefox/DESCR
-
-PLIST_SUBST+=	BROWSER=${BROWSER}
-
-post-extract:
-.for f in nspr xpcom plugin
-	@${SED} \
-		-e "s|@PREFIX@|${PREFIX}|g"			\
-		-e "s|@LIBDIR@|${PREFIX}/lib/${BROWSER}|g"	\
-		-e "s|@INCDIR@|${PREFIX}/include/${BROWSER}|g"	\
-		-e "s|@X11BASELIB@|${X11BASE}/lib|g"		\
-		${FILESDIR}/mozilla-${f}.pc.in > ${WRKSRC}/mozilla-${f}.pc
-.endfor
-
-post-wrapper:
-	@${MKDIR} ${BUILDLINK_DIR}/lib/pkgconfig
-	@${CP} ${WRKSRC}/*.pc ${BUILDLINK_DIR}/lib/pkgconfig
-
-SUBST_CLASSES+=		conf
-SUBST_STAGE.conf=	post-patch
-SUBST_FILES.conf=	Source/plugin-setup.cpp
-SUBST_SED.conf=		-e "s|/etc/|${PKG_SYSCONFDIR}/|g"
-SUBST_MESSAGE.conf=	"Fixing harcoded paths."
-
-EGDIR=		${PREFIX}/share/examples/mplayer-plugin-${BROWSER}
-CONF_FILES=	# empty
-.for f in conf types
-CONF_FILES+=	${EGDIR}/mplayerplug-in.${f} \
-		${PKG_SYSCONFDIR}/mplayerplug-in.${f}
-.endfor
-
-do-install:
-	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/mplayerplug-in.conf ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/mplayerplug-in.types ${EGDIR}
-.if !exists(${PREFIX}/lib/${BROWSER}/plugins)
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/${BROWSER}/plugins
-.endif
-	${INSTALL_LIB} ${WRKSRC}/mplayerplug-in.so	\
-		${PREFIX}/lib/${BROWSER}/plugins
-	${INSTALL_DATA} ${WRKSRC}/mplayerplug-in.xpt	\
-		${PREFIX}/lib/${BROWSER}/plugins
-
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
diff --git a/multimedia/mplayer-plugin-firefox/PLIST b/multimedia/mplayer-plugin-firefox/PLIST
deleted file mode 100644
index a8f761019e7..00000000000
--- a/multimedia/mplayer-plugin-firefox/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/04/19 15:12:38 wiz Exp $
-lib/${BROWSER}/plugins/mplayerplug-in.so
-lib/${BROWSER}/plugins/mplayerplug-in.xpt
-share/examples/mplayer-plugin-${BROWSER}/mplayerplug-in.conf
-share/examples/mplayer-plugin-${BROWSER}/mplayerplug-in.types
-@dirrm share/examples/mplayer-plugin-${BROWSER}
diff --git a/multimedia/mplayer-plugin-firefox/distinfo b/multimedia/mplayer-plugin-firefox/distinfo
deleted file mode 100644
index a6066e9dcae..00000000000
--- a/multimedia/mplayer-plugin-firefox/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 11:24:04 agc Exp $
-
-SHA1 (mplayerplug-in-2.70.tar.gz) = cc5d34060f64cea07f5696c5ad273f24b7fd4259
-RMD160 (mplayerplug-in-2.70.tar.gz) = 9606d093d8ecd6f71c69ed11ff69cce5d7f95ff8
-Size (mplayerplug-in-2.70.tar.gz) = 167973 bytes
-SHA1 (patch-aa) = 2a6724f536ad8a08c7766dfb269458df12bb3603
-SHA1 (patch-ab) = 950bec845ef3120e8b63a2343e79d5ded99a8bfa
-SHA1 (patch-ac) = caf4406c81b624dd9e05f0547d8a2ac700341454
-SHA1 (patch-ad) = 06699a71bb0f8da969d11a812a544e3aefa4d9a7
-SHA1 (patch-ae) = c5a073ba5895a3474b6aaaae2cc7f82e0e040ef3
diff --git a/multimedia/mplayer-plugin-firefox/files/mozilla-nspr.pc.in b/multimedia/mplayer-plugin-firefox/files/mozilla-nspr.pc.in
deleted file mode 100644
index 459f8f3ec3b..00000000000
--- a/multimedia/mplayer-plugin-firefox/files/mozilla-nspr.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@PREFIX@
-exec_prefix=@PREFIX@
-libdir=@LIBDIR@
-includedir=@INCDIR@
-
-Name: NSPR
-Description: The Netscape Portable Runtime
-Version: 0.1
-Libs: -L${libdir} -Wl,-R${libdir} -L@X11BASELIB@ -Wl,-R@X11BASELIB@ \
-	-lplds4 -lplc4 -lnspr4
-Cflags: -I${includedir}/nspr
diff --git a/multimedia/mplayer-plugin-firefox/files/mozilla-plugin.pc.in b/multimedia/mplayer-plugin-firefox/files/mozilla-plugin.pc.in
deleted file mode 100644
index 5e8f9a3a677..00000000000
--- a/multimedia/mplayer-plugin-firefox/files/mozilla-plugin.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@PREFIX@
-exec_prefix=@PREFIX@
-libdir=@LIBDIR@
-includedir=@INCDIR@
-
-Name: Mozilla Plug-In API
-Description: Mozilla Plug-In API
-Version: 0.1
-Requires: mozilla-xpcom = 0.1
-Cflags: -I${includedir}/java -I${includedir}/plugin
diff --git a/multimedia/mplayer-plugin-firefox/files/mozilla-xpcom.pc.in b/multimedia/mplayer-plugin-firefox/files/mozilla-xpcom.pc.in
deleted file mode 100644
index ae51f9e6c23..00000000000
--- a/multimedia/mplayer-plugin-firefox/files/mozilla-xpcom.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@PREFIX@
-exec_prefix=@PREFIX@
-libdir=@LIBDIR@
-includedir=@INCDIR@
-
-Name: XPCOM
-Description: The Mozilla Cross Platform Component Library
-Version: 0.1
-Requires: mozilla-nspr = 0.1
-Libs: -L${libdir} -lxpcom
-Cflags: -I${includedir}/xpcom -I${includedir}/string
diff --git a/multimedia/mplayer-plugin-firefox/patches/patch-aa b/multimedia/mplayer-plugin-firefox/patches/patch-aa
deleted file mode 100644
index f2e82c1da3d..00000000000
--- a/multimedia/mplayer-plugin-firefox/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/11/17 02:31:34 xtraeme Exp $
-
---- Source/plugin.cpp.orig	2004-11-17 02:27:11.000000000 +0100
-+++ Source/plugin.cpp	2004-11-17 02:27:25.000000000 +0100
-@@ -34,6 +34,7 @@
-  *
-  * ***** END LICENSE BLOCK ***** */
- 
-+#include <string.h>
- #include "plugin.h"
- #include "nsIServiceManager.h"
- #include "nsIMemory.h"
diff --git a/multimedia/mplayer-plugin-firefox/patches/patch-ab b/multimedia/mplayer-plugin-firefox/patches/patch-ab
deleted file mode 100644
index 435c420b7e8..00000000000
--- a/multimedia/mplayer-plugin-firefox/patches/patch-ab
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/11/17 02:31:34 xtraeme Exp $
-
---- Source/plugin-support.cpp.orig	2004-11-17 02:28:45.000000000 +0100
-+++ Source/plugin-support.cpp	2004-11-17 02:29:03.000000000 +0100
-@@ -1,3 +1,4 @@
-+#include <string.h>
- #include "plugin.h"
- #include <strings.h>
- #include <errno.h>
diff --git a/multimedia/mplayer-plugin-firefox/patches/patch-ac b/multimedia/mplayer-plugin-firefox/patches/patch-ac
deleted file mode 100644
index 0e85b53e727..00000000000
--- a/multimedia/mplayer-plugin-firefox/patches/patch-ac
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/11/17 02:31:34 xtraeme Exp $
-
---- Source/plugin-setup.cpp.orig	2004-11-17 02:30:00.000000000 +0100
-+++ Source/plugin-setup.cpp	2004-11-17 02:30:12.000000000 +0100
-@@ -1,3 +1,4 @@
-+#include <string.h>
- #include "plugin.h"
- 
- #ifndef STATICDECLS
diff --git a/multimedia/mplayer-plugin-firefox/patches/patch-ad b/multimedia/mplayer-plugin-firefox/patches/patch-ad
deleted file mode 100644
index 639d2e11ff6..00000000000
--- a/multimedia/mplayer-plugin-firefox/patches/patch-ad
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2004/11/17 02:31:34 xtraeme Exp $
-
---- Source/plugin-list.cpp.orig	2004-11-17 02:32:12.000000000 +0100
-+++ Source/plugin-list.cpp	2004-11-17 02:32:32.000000000 +0100
-@@ -1,3 +1,4 @@
-+#include <string.h>
- #include "plugin.h"
- #include <errno.h>
- #ifndef _GNU_SOURCE
diff --git a/multimedia/mplayer-plugin-firefox/patches/patch-ae b/multimedia/mplayer-plugin-firefox/patches/patch-ae
deleted file mode 100644
index 3a9676f1ac2..00000000000
--- a/multimedia/mplayer-plugin-firefox/patches/patch-ae
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2004/11/17 02:31:35 xtraeme Exp $
-
---- Source/plugin-threads.cpp.orig	2004-11-17 02:33:15.000000000 +0100
-+++ Source/plugin-threads.cpp	2004-11-17 02:34:59.000000000 +0100
-@@ -1,3 +1,4 @@
-+#include <string.h>
- #include "plugin.h"
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -6,6 +7,7 @@
- #include <fcntl.h>
- #include <signal.h>
- #include <sys/wait.h>
-+#include <sys/param.h>
- 
- extern int DEBUG;
- 
-@@ -202,7 +204,9 @@
- 	// make the operations on the control pipe non-blocking
- 	flags = fcntl(*control, F_GETFL, 0);
- 	flags |= O_NONBLOCK;
-+#ifndef BSD
- 	flags |= O_NDELAY;
-+#endif
- 	fcntl(*control, F_SETFL, flags);
- 
- 	return fdopen(filedesr[0], "r");
diff --git a/multimedia/mplayer-plugin-mozilla-gtk2/Makefile b/multimedia/mplayer-plugin-mozilla-gtk2/Makefile
deleted file mode 100644
index 87cba12b944..00000000000
--- a/multimedia/mplayer-plugin-mozilla-gtk2/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2005/03/27 15:43:38 wiz Exp $
-#
-
-BROWSER=	mozilla-gtk2
-PKGREVISION=	1
-
-CONFIGURE_ARGS+=	--disable-gtk1
-
-.include "../mplayer-plugin-firefox/Makefile.common"
-.include "../../www/mozilla-gtk2/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/mplayer-plugin-mozilla/Makefile b/multimedia/mplayer-plugin-mozilla/Makefile
deleted file mode 100644
index 918c6768f43..00000000000
--- a/multimedia/mplayer-plugin-mozilla/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2005/03/27 15:43:38 wiz Exp $
-#
-
-BROWSER=	mozilla
-PKGREVISION=	1
-
-CONFIGURE_ARGS+=	--disable-gtk2
-CONFIGURE_ARGS+=	--enable-gtk1
-
-.include "../mplayer-plugin-firefox/Makefile.common"
-.include "../../www/mozilla/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/mplayer-share/DESCR b/multimedia/mplayer-share/DESCR
deleted file mode 100644
index 3a81d317e26..00000000000
--- a/multimedia/mplayer-share/DESCR
+++ /dev/null
@@ -1,14 +0,0 @@
-MPlayer is a movie player for LINUX (runs on many other Unices,
-and non-x86 CPUs). It plays most MPEG, VOB, AVI, VIVO, ASF/WMV,
-QT/MOV, FLI, RM, NuppelVideo, yuv4mpeg, FILM, RoQ files, supported
-by many native, XAnim, and Win32 DLL codecs. You can watch VideoCD,
-SVCD, DVD, 3ivx, and even DivX movies too. The another big feature
-of mplayer is the wide range of supported output drivers. It works
-with X11, Xv, DGA, OpenGL, SVGAlib, fbdev, AAlib, DirectFB, but
-you can use GGI and SDL (and this way all their drivers) and some
-lowlevel card-specific drivers (for Matrox, 3Dfx, and Radeon) too!
-Most of them support software or hardware scaling, so you can
-enjoy movies in fullscreen. It also sports nice big antialiased
-shaded subtitles (10 supported types) with european/ISO 8859-1,
-2 (hungarian, english, czech, etc), cyrillic, korean fonts, and
-OSD.
diff --git a/multimedia/mplayer-share/Makefile b/multimedia/mplayer-share/Makefile
deleted file mode 100644
index fbb9e4b5f6c..00000000000
--- a/multimedia/mplayer-share/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2005/10/02 11:23:08 wiz Exp $
-
-.include "Makefile.common"
-
-PKGNAME=	mplayer-share-${MPLAYER_PKG_VERSION}
-PKGREVISION=	1
-COMMENT=	Documentation and fonts used by mplayer and gmplayer
-
-NO_BUILD=	YES
-NO_CONFIGURE=	YES
-
-MP_FONTS=	font-arial-iso-8859-1.tar.bz2 \
-		font-arial-iso-8859-2.tar.bz2 \
-		font-arial-cp1250.tar.bz2
-FONT_DIRS=	font-arial-cp1250 font-arial-iso-8859-1 font-arial-iso-8859-2
-
-.for font in ${MP_FONTS}
-SITES_${font}=	http://ftp5.mplayerhq.hu/mplayer/releases/fonts/ \
-		http://www4.mplayerhq.hu/MPlayer/releases/fonts/ \
-		ftp://ftp2.mplayerhq.hu/MPlayer/releases/fonts/ \
-		ftp://ftp1.mplayerhq.hu/MPlayer/releases/fonts \
-		ftp://ftp5.mplayerhq.hu/mplayer/releases/fonts/ \
-		http://www1.mplayerhq.hu/MPlayer/releases/fonts/ \
-		http://www2.mplayerhq.hu/MPlayer/releases/fonts/
-.endfor
-
-DISTFILES+=	${DISTNAME}${EXTRACT_SUFX}
-DISTFILES+=	${MP_FONTS}
-
-.include "../../mk/bsd.prefs.mk"
-
-INSTALLATION_DIRS=	man/man1
-
-do-install:
-	${INSTALL_MAN} ${WRKSRC}/DOCS/man/en/mplayer.1 ${PREFIX}/man/man1
-	${INSTALL_DATA_DIR} ${PREFIX}/share/mplayer
-	${INSTALL_DATA_DIR} ${PREFIX}/share/mplayer/DOCS
-	${INSTALL_DATA_DIR} ${PREFIX}/share/mplayer/fonts
-	${INSTALL_DATA} ${WRKSRC}/etc/codecs.conf ${PREFIX}/share/mplayer
-	${INSTALL_DATA} ${WRKSRC}/etc/input.conf ${PREFIX}/share/mplayer
-	(cd ${WRKSRC}/DOCS && \
-		${PAX} -rwpppm * ${PREFIX}/share/mplayer/DOCS); \
-	${FIND} ${PREFIX}/share/mplayer/DOCS -type d -exec ${CHMOD} \
-     		${PKGDIRMODE} \{\} \;
-	${FIND} ${PREFIX}/share/mplayer/DOCS -type f -exec ${CHMOD} \
-  		${SHAREMODE} \{\} \;
-	for D in ${FONT_DIRS}; do \
-		(cd ${WRKDIR}/$$D && \
-			${PAX} -rwpppm * ${PREFIX}/share/mplayer/fonts); \
-	done
-	${LN} -s ${PREFIX}/share/mplayer/fonts/font-arial-18-iso-8859-1 \
-		${PREFIX}/share/mplayer/font
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/mplayer-share/Makefile.cflags b/multimedia/mplayer-share/Makefile.cflags
deleted file mode 100644
index 78ddb83a652..00000000000
--- a/multimedia/mplayer-share/Makefile.cflags
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile.cflags,v 1.2 2005/06/02 16:00:56 dillo Exp $
-
-# This must be included after everything else to truly clear ${CFLAGS}
-# in the non-runtime-cpu-detection case. If ${CFLAGS} is non-empty, the
-# configure script refuses to add any optimizations at all.
-
-.if !empty(PKG_OPTIONS:Mmplayer-runtime-cpudetection)
-.  if ${MACHINE_ARCH} == i386
-# Schedule for the typical machine fast enough to run mplayer. This
-# is nearly optimal for K6-2 as well. Anything slowler will still run
-# (but would probably benefit greatly from turning off the run-time
-# cpu detection).
-CFLAGS=		-O3 -ffast-math -fomit-frame-pointer -mcpu=pentiumpro
-.  else
-CFLAGS=		-O3 -ffast-math -fomit-frame-pointer
-.  endif
-.else
-CFLAGS=		# Let "configure" do its thing.
-.endif
diff --git a/multimedia/mplayer-share/Makefile.common b/multimedia/mplayer-share/Makefile.common
deleted file mode 100644
index 3a19555128d..00000000000
--- a/multimedia/mplayer-share/Makefile.common
+++ /dev/null
@@ -1,57 +0,0 @@
-# $NetBSD: Makefile.common,v 1.23 2005/09/15 13:27:34 wiz Exp $
-
-MPLAYER_DIST_VERSION=	1.0pre7
-
-# This variable is used in all packages which depend on this package
-MPLAYER_PKG_VERSION=	1.0rc7
-
-DISTNAME=		MPlayer-${MPLAYER_DIST_VERSION}
-CATEGORIES?=		multimedia
-MASTER_SITES=		http://www1.mplayerhq.hu/MPlayer/releases/ \
-			http://ftp5.mplayerhq.hu/mplayer/releases/ \
-			http://www4.mplayerhq.hu/MPlayer/releases/ \
-			ftp://ftp2.mplayerhq.hu/MPlayer/releases/ \
-			ftp://ftp5.mplayerhq.hu/mplayer/releases/
-EXTRACT_SUFX=		.tar.bz2
-DIST_SUBDIR=		mplayer-${MPLAYER_PKG_VERSION}
-
-MAINTAINER?=		tech-pkg@NetBSD.org
-HOMEPAGE?=		http://www.mplayerhq.hu/
-
-#
-# NOTE: gmplayer has its own distinfo file. if you are also updating
-# gmplayer, you must ensure that *both* distinfo files contain the
-# correct, up-to-date files and checksums.
-#
-# NOTE: patches are shared between mplayer and gmplayer!
-#
-
-PATCHDIR=		${.CURDIR}/../../multimedia/mplayer-share/patches
-DISTINFO_FILE=		${.CURDIR}/../../multimedia/mplayer-share/distinfo
-
-NO_BIN_ON_CD=		"a dependency is restricted"
-NO_BIN_ON_FTP=		"a dependency is restricted"
-NO_SRC_ON_FTP=		"prohibited by USAs DMCA"
-
-USE_TOOLS+=		gmake
-HAS_CONFIGURE=		YES
-
-PTHREAD_OPTS+=		require
-
-CONFIGURE_ARGS+=	--prefix="${PREFIX}" \
-			--with-extraincdir="${LOCALBASE}/include" \
-			--with-extralibdir="${LOCALBASE}/lib" \
-			--with-x11incdir="${X11BASE}/include" \
-			--with-x11libdir="${X11BASE}/lib" \
-			--disable-mpdvdkit
-
-ONLY_FOR_COMPILER=	gcc
-
-# The configure script attempts to test-execute compiled programs in /tmp,
-# but that directory may be mounted as noexec; work this around by setting
-# TMPDIR to ${WRKDIR}
-CONFIGURE_ENV+=		TMPDIR=${WRKDIR}
-
-.include "../../mk/bsd.prefs.mk"
-
-.include "../../multimedia/mplayer-share/options.mk"
diff --git a/multimedia/mplayer-share/Makefile.depends b/multimedia/mplayer-share/Makefile.depends
deleted file mode 100644
index 7feea1cc1a6..00000000000
--- a/multimedia/mplayer-share/Makefile.depends
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: Makefile.depends,v 1.14 2005/06/01 18:45:46 jmmv Exp $
-#
-
-DEPENDS+=	mplayer-share>=${MPLAYER_PKG_VERSION}:../../multimedia/mplayer-share
-
-GCC_REQD+=	2.95.3
-
-.if ${OPSYS} == "NetBSD"
-.  include "../../devel/binutils/buildlink3.mk"
-.endif
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
diff --git a/multimedia/mplayer-share/PLIST b/multimedia/mplayer-share/PLIST
deleted file mode 100644
index fa6a0ca85e1..00000000000
--- a/multimedia/mplayer-share/PLIST
+++ /dev/null
@@ -1,836 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2005/04/18 17:49:41 drochner Exp $
-man/man1/mplayer.1
-share/mplayer/DOCS/HTML/cs/amiga.html
-share/mplayer/DOCS/HTML/cs/aspect.html
-share/mplayer/DOCS/HTML/cs/audio.html
-share/mplayer/DOCS/HTML/cs/bsd.html
-share/mplayer/DOCS/HTML/cs/bugreports.html
-share/mplayer/DOCS/HTML/cs/bugreports_advusers.html
-share/mplayer/DOCS/HTML/cs/bugreports_fix.html
-share/mplayer/DOCS/HTML/cs/bugreports_report.html
-share/mplayer/DOCS/HTML/cs/bugreports_what.html
-share/mplayer/DOCS/HTML/cs/bugreports_where.html
-share/mplayer/DOCS/HTML/cs/bugs-audio.html
-share/mplayer/DOCS/HTML/cs/bugs-special.html
-share/mplayer/DOCS/HTML/cs/bugs.html
-share/mplayer/DOCS/HTML/cs/cd-dvd.html
-share/mplayer/DOCS/HTML/cs/codecs.html
-share/mplayer/DOCS/HTML/cs/commandline.html
-share/mplayer/DOCS/HTML/cs/control.html
-share/mplayer/DOCS/HTML/cs/custommatrices.html
-share/mplayer/DOCS/HTML/cs/default.css
-share/mplayer/DOCS/HTML/cs/drives.html
-share/mplayer/DOCS/HTML/cs/dvd.html
-share/mplayer/DOCS/HTML/cs/edl.html
-share/mplayer/DOCS/HTML/cs/faq.html
-share/mplayer/DOCS/HTML/cs/features.html
-share/mplayer/DOCS/HTML/cs/formats.html
-share/mplayer/DOCS/HTML/cs/gcc-296.html
-share/mplayer/DOCS/HTML/cs/gui.html
-share/mplayer/DOCS/HTML/cs/history.html
-share/mplayer/DOCS/HTML/cs/howtoread.html
-share/mplayer/DOCS/HTML/cs/hp-ux.html
-share/mplayer/DOCS/HTML/cs/index.html
-share/mplayer/DOCS/HTML/cs/install.html
-share/mplayer/DOCS/HTML/cs/intro.html
-share/mplayer/DOCS/HTML/cs/irix.html
-share/mplayer/DOCS/HTML/cs/joe-barr.html
-share/mplayer/DOCS/HTML/cs/linux.html
-share/mplayer/DOCS/HTML/cs/macos.html
-share/mplayer/DOCS/HTML/cs/mailinglists.html
-share/mplayer/DOCS/HTML/cs/menc-feat-dvd-mpeg4.html
-share/mplayer/DOCS/HTML/cs/menc-feat-enc-images.html
-share/mplayer/DOCS/HTML/cs/menc-feat-enc-libavcodec.html
-share/mplayer/DOCS/HTML/cs/menc-feat-extractsub.html
-share/mplayer/DOCS/HTML/cs/menc-feat-mpeg.html
-share/mplayer/DOCS/HTML/cs/menc-feat-mpeg4.html
-share/mplayer/DOCS/HTML/cs/menc-feat-rescale.html
-share/mplayer/DOCS/HTML/cs/menc-feat-streamcopy.html
-share/mplayer/DOCS/HTML/cs/menc-feat-telecine.html
-share/mplayer/DOCS/HTML/cs/mencoder.html
-share/mplayer/DOCS/HTML/cs/mplayer-binary.html
-share/mplayer/DOCS/HTML/cs/mpst.html
-share/mplayer/DOCS/HTML/cs/nvidia-opinions.html
-share/mplayer/DOCS/HTML/cs/patches.html
-share/mplayer/DOCS/HTML/cs/ports.html
-share/mplayer/DOCS/HTML/cs/qnx.html
-share/mplayer/DOCS/HTML/cs/rtc.html
-share/mplayer/DOCS/HTML/cs/skin-file.html
-share/mplayer/DOCS/HTML/cs/skin-fonts.html
-share/mplayer/DOCS/HTML/cs/skin-gui.html
-share/mplayer/DOCS/HTML/cs/skin-overview.html
-share/mplayer/DOCS/HTML/cs/skin.html
-share/mplayer/DOCS/HTML/cs/solaris.html
-share/mplayer/DOCS/HTML/cs/streaming.html
-share/mplayer/DOCS/HTML/cs/subosd.html
-share/mplayer/DOCS/HTML/cs/tv-input.html
-share/mplayer/DOCS/HTML/cs/usage.html
-share/mplayer/DOCS/HTML/cs/users-vs-dev.html
-share/mplayer/DOCS/HTML/cs/vcd.html
-share/mplayer/DOCS/HTML/cs/video.html
-share/mplayer/DOCS/HTML/cs/windows.html
-share/mplayer/DOCS/HTML/en/amiga.html
-share/mplayer/DOCS/HTML/en/aspect.html
-share/mplayer/DOCS/HTML/en/audio.html
-share/mplayer/DOCS/HTML/en/bsd.html
-share/mplayer/DOCS/HTML/en/bugreports.html
-share/mplayer/DOCS/HTML/en/bugreports_advusers.html
-share/mplayer/DOCS/HTML/en/bugreports_fix.html
-share/mplayer/DOCS/HTML/en/bugreports_report.html
-share/mplayer/DOCS/HTML/en/bugreports_what.html
-share/mplayer/DOCS/HTML/en/bugreports_where.html
-share/mplayer/DOCS/HTML/en/bugs-audio.html
-share/mplayer/DOCS/HTML/en/bugs-special.html
-share/mplayer/DOCS/HTML/en/bugs.html
-share/mplayer/DOCS/HTML/en/cd-dvd.html
-share/mplayer/DOCS/HTML/en/codecs.html
-share/mplayer/DOCS/HTML/en/commandline.html
-share/mplayer/DOCS/HTML/en/control.html
-share/mplayer/DOCS/HTML/en/custommatrices.html
-share/mplayer/DOCS/HTML/en/default.css
-share/mplayer/DOCS/HTML/en/drives.html
-share/mplayer/DOCS/HTML/en/dvd.html
-share/mplayer/DOCS/HTML/en/edl.html
-share/mplayer/DOCS/HTML/en/faq.html
-share/mplayer/DOCS/HTML/en/features.html
-share/mplayer/DOCS/HTML/en/formats.html
-share/mplayer/DOCS/HTML/en/gcc-296.html
-share/mplayer/DOCS/HTML/en/gui.html
-share/mplayer/DOCS/HTML/en/history.html
-share/mplayer/DOCS/HTML/en/howtoread.html
-share/mplayer/DOCS/HTML/en/hp-ux.html
-share/mplayer/DOCS/HTML/en/index.html
-share/mplayer/DOCS/HTML/en/install.html
-share/mplayer/DOCS/HTML/en/intro.html
-share/mplayer/DOCS/HTML/en/irix.html
-share/mplayer/DOCS/HTML/en/joe-barr.html
-share/mplayer/DOCS/HTML/en/linux.html
-share/mplayer/DOCS/HTML/en/macos.html
-share/mplayer/DOCS/HTML/en/mailinglists.html
-share/mplayer/DOCS/HTML/en/menc-feat-dvd-mpeg4.html
-share/mplayer/DOCS/HTML/en/menc-feat-enc-images.html
-share/mplayer/DOCS/HTML/en/menc-feat-enc-libavcodec.html
-share/mplayer/DOCS/HTML/en/menc-feat-extractsub.html
-share/mplayer/DOCS/HTML/en/menc-feat-mpeg.html
-share/mplayer/DOCS/HTML/en/menc-feat-mpeg4.html
-share/mplayer/DOCS/HTML/en/menc-feat-rescale.html
-share/mplayer/DOCS/HTML/en/menc-feat-streamcopy.html
-share/mplayer/DOCS/HTML/en/menc-feat-telecine.html
-share/mplayer/DOCS/HTML/en/mencoder.html
-share/mplayer/DOCS/HTML/en/mplayer-binary.html
-share/mplayer/DOCS/HTML/en/mpst.html
-share/mplayer/DOCS/HTML/en/nvidia-opinions.html
-share/mplayer/DOCS/HTML/en/patches.html
-share/mplayer/DOCS/HTML/en/ports.html
-share/mplayer/DOCS/HTML/en/qnx.html
-share/mplayer/DOCS/HTML/en/rtc.html
-share/mplayer/DOCS/HTML/en/skin-file.html
-share/mplayer/DOCS/HTML/en/skin-fonts.html
-share/mplayer/DOCS/HTML/en/skin-gui.html
-share/mplayer/DOCS/HTML/en/skin-overview.html
-share/mplayer/DOCS/HTML/en/skin.html
-share/mplayer/DOCS/HTML/en/solaris.html
-share/mplayer/DOCS/HTML/en/streaming.html
-share/mplayer/DOCS/HTML/en/subosd.html
-share/mplayer/DOCS/HTML/en/tv-input.html
-share/mplayer/DOCS/HTML/en/usage.html
-share/mplayer/DOCS/HTML/en/users-vs-dev.html
-share/mplayer/DOCS/HTML/en/vcd.html
-share/mplayer/DOCS/HTML/en/video.html
-share/mplayer/DOCS/HTML/en/windows.html
-share/mplayer/DOCS/HTML/es/amiga.html
-share/mplayer/DOCS/HTML/es/aspect.html
-share/mplayer/DOCS/HTML/es/bsd.html
-share/mplayer/DOCS/HTML/es/bugreports.html
-share/mplayer/DOCS/HTML/es/bugreports_advusers.html
-share/mplayer/DOCS/HTML/es/bugreports_fix.html
-share/mplayer/DOCS/HTML/es/bugreports_report.html
-share/mplayer/DOCS/HTML/es/bugreports_what.html
-share/mplayer/DOCS/HTML/es/bugreports_where.html
-share/mplayer/DOCS/HTML/es/bugs-audio.html
-share/mplayer/DOCS/HTML/es/bugs-special.html
-share/mplayer/DOCS/HTML/es/bugs.html
-share/mplayer/DOCS/HTML/es/cd-dvd.html
-share/mplayer/DOCS/HTML/es/codecs.html
-share/mplayer/DOCS/HTML/es/commandline.html
-share/mplayer/DOCS/HTML/es/control.html
-share/mplayer/DOCS/HTML/es/custommatrices.html
-share/mplayer/DOCS/HTML/es/default.css
-share/mplayer/DOCS/HTML/es/devices.html
-share/mplayer/DOCS/HTML/es/drives.html
-share/mplayer/DOCS/HTML/es/dvd.html
-share/mplayer/DOCS/HTML/es/edl.html
-share/mplayer/DOCS/HTML/es/faq.html
-share/mplayer/DOCS/HTML/es/features.html
-share/mplayer/DOCS/HTML/es/formats.html
-share/mplayer/DOCS/HTML/es/gcc-296.html
-share/mplayer/DOCS/HTML/es/gui.html
-share/mplayer/DOCS/HTML/es/history.html
-share/mplayer/DOCS/HTML/es/howtoread.html
-share/mplayer/DOCS/HTML/es/hpux.html
-share/mplayer/DOCS/HTML/es/index.html
-share/mplayer/DOCS/HTML/es/install.html
-share/mplayer/DOCS/HTML/es/intro.html
-share/mplayer/DOCS/HTML/es/irix.html
-share/mplayer/DOCS/HTML/es/joe-barr.html
-share/mplayer/DOCS/HTML/es/linux.html
-share/mplayer/DOCS/HTML/es/macos.html
-share/mplayer/DOCS/HTML/es/mailinglists.html
-share/mplayer/DOCS/HTML/es/menc-feat-divx4.html
-share/mplayer/DOCS/HTML/es/menc-feat-dvd-mpeg4.html
-share/mplayer/DOCS/HTML/es/menc-feat-enc-images.html
-share/mplayer/DOCS/HTML/es/menc-feat-enc-libavcodec.html
-share/mplayer/DOCS/HTML/es/menc-feat-extractsub.html
-share/mplayer/DOCS/HTML/es/menc-feat-fix-avi.html
-share/mplayer/DOCS/HTML/es/menc-feat-mpeg.html
-share/mplayer/DOCS/HTML/es/menc-feat-rescale.html
-share/mplayer/DOCS/HTML/es/menc-feat-streamcopy.html
-share/mplayer/DOCS/HTML/es/menc-feat-telecine.html
-share/mplayer/DOCS/HTML/es/mencoder.html
-share/mplayer/DOCS/HTML/es/mplayer-binary.html
-share/mplayer/DOCS/HTML/es/mpst.html
-share/mplayer/DOCS/HTML/es/nvidia-opinions.html
-share/mplayer/DOCS/HTML/es/patches.html
-share/mplayer/DOCS/HTML/es/ports.html
-share/mplayer/DOCS/HTML/es/qnx.html
-share/mplayer/DOCS/HTML/es/rtc.html
-share/mplayer/DOCS/HTML/es/skin-file.html
-share/mplayer/DOCS/HTML/es/skin-fonts.html
-share/mplayer/DOCS/HTML/es/skin-gui.html
-share/mplayer/DOCS/HTML/es/skin-overview.html
-share/mplayer/DOCS/HTML/es/skin.html
-share/mplayer/DOCS/HTML/es/solaris.html
-share/mplayer/DOCS/HTML/es/streaming.html
-share/mplayer/DOCS/HTML/es/subosd.html
-share/mplayer/DOCS/HTML/es/tv-input.html
-share/mplayer/DOCS/HTML/es/usage.html
-share/mplayer/DOCS/HTML/es/users-vs-dev.html
-share/mplayer/DOCS/HTML/es/vcd.html
-share/mplayer/DOCS/HTML/es/windows.html
-share/mplayer/DOCS/HTML/fr/amiga.html
-share/mplayer/DOCS/HTML/fr/aspect.html
-share/mplayer/DOCS/HTML/fr/audio.html
-share/mplayer/DOCS/HTML/fr/bsd.html
-share/mplayer/DOCS/HTML/fr/bugreports.html
-share/mplayer/DOCS/HTML/fr/bugreports_advusers.html
-share/mplayer/DOCS/HTML/fr/bugreports_fix.html
-share/mplayer/DOCS/HTML/fr/bugreports_report.html
-share/mplayer/DOCS/HTML/fr/bugreports_what.html
-share/mplayer/DOCS/HTML/fr/bugreports_where.html
-share/mplayer/DOCS/HTML/fr/bugs-audio.html
-share/mplayer/DOCS/HTML/fr/bugs-special.html
-share/mplayer/DOCS/HTML/fr/bugs.html
-share/mplayer/DOCS/HTML/fr/cd-dvd.html
-share/mplayer/DOCS/HTML/fr/codecs.html
-share/mplayer/DOCS/HTML/fr/commandline.html
-share/mplayer/DOCS/HTML/fr/control.html
-share/mplayer/DOCS/HTML/fr/custommatrices.html
-share/mplayer/DOCS/HTML/fr/default.css
-share/mplayer/DOCS/HTML/fr/drives.html
-share/mplayer/DOCS/HTML/fr/dvd.html
-share/mplayer/DOCS/HTML/fr/edl.html
-share/mplayer/DOCS/HTML/fr/faq.html
-share/mplayer/DOCS/HTML/fr/features.html
-share/mplayer/DOCS/HTML/fr/formats.html
-share/mplayer/DOCS/HTML/fr/gcc-296.html
-share/mplayer/DOCS/HTML/fr/gui.html
-share/mplayer/DOCS/HTML/fr/history.html
-share/mplayer/DOCS/HTML/fr/howtoread.html
-share/mplayer/DOCS/HTML/fr/hpux.html
-share/mplayer/DOCS/HTML/fr/index.html
-share/mplayer/DOCS/HTML/fr/install.html
-share/mplayer/DOCS/HTML/fr/intro.html
-share/mplayer/DOCS/HTML/fr/irix.html
-share/mplayer/DOCS/HTML/fr/joe-barr.html
-share/mplayer/DOCS/HTML/fr/linux.html
-share/mplayer/DOCS/HTML/fr/macos.html
-share/mplayer/DOCS/HTML/fr/mailinglists.html
-share/mplayer/DOCS/HTML/fr/menc-feat-divx4.html
-share/mplayer/DOCS/HTML/fr/menc-feat-dvd-mpeg4.html
-share/mplayer/DOCS/HTML/fr/menc-feat-enc-images.html
-share/mplayer/DOCS/HTML/fr/menc-feat-enc-libavcodec.html
-share/mplayer/DOCS/HTML/fr/menc-feat-extractsub.html
-share/mplayer/DOCS/HTML/fr/menc-feat-fix-avi.html
-share/mplayer/DOCS/HTML/fr/menc-feat-mpeg.html
-share/mplayer/DOCS/HTML/fr/menc-feat-rescale.html
-share/mplayer/DOCS/HTML/fr/menc-feat-streamcopy.html
-share/mplayer/DOCS/HTML/fr/menc-feat-telecine.html
-share/mplayer/DOCS/HTML/fr/mencoder.html
-share/mplayer/DOCS/HTML/fr/mplayer-binary.html
-share/mplayer/DOCS/HTML/fr/mpst.html
-share/mplayer/DOCS/HTML/fr/nvidia-opinions.html
-share/mplayer/DOCS/HTML/fr/patches.html
-share/mplayer/DOCS/HTML/fr/ports.html
-share/mplayer/DOCS/HTML/fr/qnx.html
-share/mplayer/DOCS/HTML/fr/rtc.html
-share/mplayer/DOCS/HTML/fr/skin-file.html
-share/mplayer/DOCS/HTML/fr/skin-fonts.html
-share/mplayer/DOCS/HTML/fr/skin-gui.html
-share/mplayer/DOCS/HTML/fr/skin-overview.html
-share/mplayer/DOCS/HTML/fr/skin.html
-share/mplayer/DOCS/HTML/fr/solaris.html
-share/mplayer/DOCS/HTML/fr/streaming.html
-share/mplayer/DOCS/HTML/fr/subosd.html
-share/mplayer/DOCS/HTML/fr/tv-input.html
-share/mplayer/DOCS/HTML/fr/usage.html
-share/mplayer/DOCS/HTML/fr/users-vs-dev.html
-share/mplayer/DOCS/HTML/fr/vcd.html
-share/mplayer/DOCS/HTML/fr/video.html
-share/mplayer/DOCS/HTML/fr/windows.html
-share/mplayer/DOCS/HTML/hu/amiga.html
-share/mplayer/DOCS/HTML/hu/aspect.html
-share/mplayer/DOCS/HTML/hu/audio.html
-share/mplayer/DOCS/HTML/hu/bsd.html
-share/mplayer/DOCS/HTML/hu/bugreports.html
-share/mplayer/DOCS/HTML/hu/bugreports_advusers.html
-share/mplayer/DOCS/HTML/hu/bugreports_fix.html
-share/mplayer/DOCS/HTML/hu/bugreports_report.html
-share/mplayer/DOCS/HTML/hu/bugreports_what.html
-share/mplayer/DOCS/HTML/hu/bugreports_where.html
-share/mplayer/DOCS/HTML/hu/bugs-audio.html
-share/mplayer/DOCS/HTML/hu/bugs-special.html
-share/mplayer/DOCS/HTML/hu/bugs.html
-share/mplayer/DOCS/HTML/hu/cd-dvd.html
-share/mplayer/DOCS/HTML/hu/codecs.html
-share/mplayer/DOCS/HTML/hu/commandline.html
-share/mplayer/DOCS/HTML/hu/control.html
-share/mplayer/DOCS/HTML/hu/custommatrices.html
-share/mplayer/DOCS/HTML/hu/default.css
-share/mplayer/DOCS/HTML/hu/drives.html
-share/mplayer/DOCS/HTML/hu/dvd.html
-share/mplayer/DOCS/HTML/hu/edl.html
-share/mplayer/DOCS/HTML/hu/faq.html
-share/mplayer/DOCS/HTML/hu/features.html
-share/mplayer/DOCS/HTML/hu/formats.html
-share/mplayer/DOCS/HTML/hu/gcc-296.html
-share/mplayer/DOCS/HTML/hu/gui.html
-share/mplayer/DOCS/HTML/hu/history.html
-share/mplayer/DOCS/HTML/hu/howtoread.html
-share/mplayer/DOCS/HTML/hu/hp-ux.html
-share/mplayer/DOCS/HTML/hu/index.html
-share/mplayer/DOCS/HTML/hu/install.html
-share/mplayer/DOCS/HTML/hu/intro.html
-share/mplayer/DOCS/HTML/hu/irix.html
-share/mplayer/DOCS/HTML/hu/joe-barr.html
-share/mplayer/DOCS/HTML/hu/linux.html
-share/mplayer/DOCS/HTML/hu/macos.html
-share/mplayer/DOCS/HTML/hu/mailinglists.html
-share/mplayer/DOCS/HTML/hu/menc-feat-dvd-mpeg4.html
-share/mplayer/DOCS/HTML/hu/menc-feat-enc-images.html
-share/mplayer/DOCS/HTML/hu/menc-feat-enc-libavcodec.html
-share/mplayer/DOCS/HTML/hu/menc-feat-extractsub.html
-share/mplayer/DOCS/HTML/hu/menc-feat-mpeg.html
-share/mplayer/DOCS/HTML/hu/menc-feat-mpeg4.html
-share/mplayer/DOCS/HTML/hu/menc-feat-rescale.html
-share/mplayer/DOCS/HTML/hu/menc-feat-streamcopy.html
-share/mplayer/DOCS/HTML/hu/menc-feat-telecine.html
-share/mplayer/DOCS/HTML/hu/mencoder.html
-share/mplayer/DOCS/HTML/hu/mplayer-binary.html
-share/mplayer/DOCS/HTML/hu/mpst.html
-share/mplayer/DOCS/HTML/hu/nvidia-opinions.html
-share/mplayer/DOCS/HTML/hu/patches.html
-share/mplayer/DOCS/HTML/hu/ports.html
-share/mplayer/DOCS/HTML/hu/qnx.html
-share/mplayer/DOCS/HTML/hu/rtc.html
-share/mplayer/DOCS/HTML/hu/skin-file.html
-share/mplayer/DOCS/HTML/hu/skin-fonts.html
-share/mplayer/DOCS/HTML/hu/skin-gui.html
-share/mplayer/DOCS/HTML/hu/skin-overview.html
-share/mplayer/DOCS/HTML/hu/skin.html
-share/mplayer/DOCS/HTML/hu/solaris.html
-share/mplayer/DOCS/HTML/hu/streaming.html
-share/mplayer/DOCS/HTML/hu/subosd.html
-share/mplayer/DOCS/HTML/hu/tv-input.html
-share/mplayer/DOCS/HTML/hu/usage.html
-share/mplayer/DOCS/HTML/hu/users-vs-dev.html
-share/mplayer/DOCS/HTML/hu/vcd.html
-share/mplayer/DOCS/HTML/hu/video.html
-share/mplayer/DOCS/HTML/hu/windows.html
-share/mplayer/DOCS/HTML/pl/amiga.html
-share/mplayer/DOCS/HTML/pl/aspect.html
-share/mplayer/DOCS/HTML/pl/audio.html
-share/mplayer/DOCS/HTML/pl/bsd.html
-share/mplayer/DOCS/HTML/pl/bugreports.html
-share/mplayer/DOCS/HTML/pl/bugreports_advusers.html
-share/mplayer/DOCS/HTML/pl/bugreports_fix.html
-share/mplayer/DOCS/HTML/pl/bugreports_report.html
-share/mplayer/DOCS/HTML/pl/bugreports_what.html
-share/mplayer/DOCS/HTML/pl/bugreports_where.html
-share/mplayer/DOCS/HTML/pl/bugs-audio.html
-share/mplayer/DOCS/HTML/pl/bugs-special.html
-share/mplayer/DOCS/HTML/pl/bugs.html
-share/mplayer/DOCS/HTML/pl/cd-dvd.html
-share/mplayer/DOCS/HTML/pl/codecs.html
-share/mplayer/DOCS/HTML/pl/commandline.html
-share/mplayer/DOCS/HTML/pl/control.html
-share/mplayer/DOCS/HTML/pl/custommatrices.html
-share/mplayer/DOCS/HTML/pl/default.css
-share/mplayer/DOCS/HTML/pl/drives.html
-share/mplayer/DOCS/HTML/pl/dvd.html
-share/mplayer/DOCS/HTML/pl/edl.html
-share/mplayer/DOCS/HTML/pl/faq.html
-share/mplayer/DOCS/HTML/pl/features.html
-share/mplayer/DOCS/HTML/pl/formats.html
-share/mplayer/DOCS/HTML/pl/gcc-296.html
-share/mplayer/DOCS/HTML/pl/gui.html
-share/mplayer/DOCS/HTML/pl/history.html
-share/mplayer/DOCS/HTML/pl/howtoread.html
-share/mplayer/DOCS/HTML/pl/hp-ux.html
-share/mplayer/DOCS/HTML/pl/index.html
-share/mplayer/DOCS/HTML/pl/install.html
-share/mplayer/DOCS/HTML/pl/intro.html
-share/mplayer/DOCS/HTML/pl/irix.html
-share/mplayer/DOCS/HTML/pl/joe-barr.html
-share/mplayer/DOCS/HTML/pl/linux.html
-share/mplayer/DOCS/HTML/pl/macos.html
-share/mplayer/DOCS/HTML/pl/mailinglists.html
-share/mplayer/DOCS/HTML/pl/menc-feat-dvd-mpeg4.html
-share/mplayer/DOCS/HTML/pl/menc-feat-enc-images.html
-share/mplayer/DOCS/HTML/pl/menc-feat-enc-libavcodec.html
-share/mplayer/DOCS/HTML/pl/menc-feat-extractsub.html
-share/mplayer/DOCS/HTML/pl/menc-feat-fix-avi.html
-share/mplayer/DOCS/HTML/pl/menc-feat-mpeg.html
-share/mplayer/DOCS/HTML/pl/menc-feat-mpeg4.html
-share/mplayer/DOCS/HTML/pl/menc-feat-rescale.html
-share/mplayer/DOCS/HTML/pl/menc-feat-streamcopy.html
-share/mplayer/DOCS/HTML/pl/menc-feat-telecine.html
-share/mplayer/DOCS/HTML/pl/mencoder.html
-share/mplayer/DOCS/HTML/pl/mplayer-binary.html
-share/mplayer/DOCS/HTML/pl/mpst.html
-share/mplayer/DOCS/HTML/pl/nvidia-opinions.html
-share/mplayer/DOCS/HTML/pl/patches.html
-share/mplayer/DOCS/HTML/pl/ports.html
-share/mplayer/DOCS/HTML/pl/qnx.html
-share/mplayer/DOCS/HTML/pl/rtc.html
-share/mplayer/DOCS/HTML/pl/skin-file.html
-share/mplayer/DOCS/HTML/pl/skin-fonts.html
-share/mplayer/DOCS/HTML/pl/skin-gui.html
-share/mplayer/DOCS/HTML/pl/skin-overview.html
-share/mplayer/DOCS/HTML/pl/skin.html
-share/mplayer/DOCS/HTML/pl/solaris.html
-share/mplayer/DOCS/HTML/pl/streaming.html
-share/mplayer/DOCS/HTML/pl/subosd.html
-share/mplayer/DOCS/HTML/pl/tv-input.html
-share/mplayer/DOCS/HTML/pl/usage.html
-share/mplayer/DOCS/HTML/pl/users-vs-dev.html
-share/mplayer/DOCS/HTML/pl/vcd.html
-share/mplayer/DOCS/HTML/pl/video.html
-share/mplayer/DOCS/HTML/pl/windows.html
-share/mplayer/DOCS/HTML/ru/amiga.html
-share/mplayer/DOCS/HTML/ru/aspect.html
-share/mplayer/DOCS/HTML/ru/audio.html
-share/mplayer/DOCS/HTML/ru/bsd.html
-share/mplayer/DOCS/HTML/ru/bugreports.html
-share/mplayer/DOCS/HTML/ru/bugreports_advusers.html
-share/mplayer/DOCS/HTML/ru/bugreports_fix.html
-share/mplayer/DOCS/HTML/ru/bugreports_report.html
-share/mplayer/DOCS/HTML/ru/bugreports_what.html
-share/mplayer/DOCS/HTML/ru/bugreports_where.html
-share/mplayer/DOCS/HTML/ru/bugs-audio.html
-share/mplayer/DOCS/HTML/ru/bugs-special.html
-share/mplayer/DOCS/HTML/ru/bugs.html
-share/mplayer/DOCS/HTML/ru/cd-dvd.html
-share/mplayer/DOCS/HTML/ru/codecs.html
-share/mplayer/DOCS/HTML/ru/commandline.html
-share/mplayer/DOCS/HTML/ru/control.html
-share/mplayer/DOCS/HTML/ru/custommatrices.html
-share/mplayer/DOCS/HTML/ru/default.css
-share/mplayer/DOCS/HTML/ru/drives.html
-share/mplayer/DOCS/HTML/ru/dvd.html
-share/mplayer/DOCS/HTML/ru/edl.html
-share/mplayer/DOCS/HTML/ru/faq.html
-share/mplayer/DOCS/HTML/ru/features.html
-share/mplayer/DOCS/HTML/ru/formats.html
-share/mplayer/DOCS/HTML/ru/gcc-296.html
-share/mplayer/DOCS/HTML/ru/gui.html
-share/mplayer/DOCS/HTML/ru/history.html
-share/mplayer/DOCS/HTML/ru/howtoread.html
-share/mplayer/DOCS/HTML/ru/hp-ux.html
-share/mplayer/DOCS/HTML/ru/index.html
-share/mplayer/DOCS/HTML/ru/install.html
-share/mplayer/DOCS/HTML/ru/intro.html
-share/mplayer/DOCS/HTML/ru/joe-barr.html
-share/mplayer/DOCS/HTML/ru/linux.html
-share/mplayer/DOCS/HTML/ru/macos.html
-share/mplayer/DOCS/HTML/ru/mailinglists.html
-share/mplayer/DOCS/HTML/ru/menc-feat-dvd-mpeg4.html
-share/mplayer/DOCS/HTML/ru/menc-feat-enc-images.html
-share/mplayer/DOCS/HTML/ru/menc-feat-enc-libavcodec.html
-share/mplayer/DOCS/HTML/ru/menc-feat-extractsub.html
-share/mplayer/DOCS/HTML/ru/menc-feat-mpeg.html
-share/mplayer/DOCS/HTML/ru/menc-feat-mpeg4.html
-share/mplayer/DOCS/HTML/ru/menc-feat-rescale.html
-share/mplayer/DOCS/HTML/ru/menc-feat-streamcopy.html
-share/mplayer/DOCS/HTML/ru/menc-feat-telecine.html
-share/mplayer/DOCS/HTML/ru/mencoder.html
-share/mplayer/DOCS/HTML/ru/mplayer-binary.html
-share/mplayer/DOCS/HTML/ru/mpst.html
-share/mplayer/DOCS/HTML/ru/nvidia-opinions.html
-share/mplayer/DOCS/HTML/ru/patches.html
-share/mplayer/DOCS/HTML/ru/ports.html
-share/mplayer/DOCS/HTML/ru/qnx.html
-share/mplayer/DOCS/HTML/ru/rtc.html
-share/mplayer/DOCS/HTML/ru/sgi.html
-share/mplayer/DOCS/HTML/ru/skin-file.html
-share/mplayer/DOCS/HTML/ru/skin-fonts.html
-share/mplayer/DOCS/HTML/ru/skin-gui.html
-share/mplayer/DOCS/HTML/ru/skin-overview.html
-share/mplayer/DOCS/HTML/ru/skin.html
-share/mplayer/DOCS/HTML/ru/solaris.html
-share/mplayer/DOCS/HTML/ru/streaming.html
-share/mplayer/DOCS/HTML/ru/subosd.html
-share/mplayer/DOCS/HTML/ru/tv-input.html
-share/mplayer/DOCS/HTML/ru/usage.html
-share/mplayer/DOCS/HTML/ru/users-vs-dev.html
-share/mplayer/DOCS/HTML/ru/vcd.html
-share/mplayer/DOCS/HTML/ru/video.html
-share/mplayer/DOCS/HTML/ru/windows.html
-share/mplayer/DOCS/README
-share/mplayer/DOCS/de/bugreports.html
-share/mplayer/DOCS/de/cd-dvd.html
-share/mplayer/DOCS/de/codecs.html
-share/mplayer/DOCS/de/documentation.html
-share/mplayer/DOCS/de/encoding.html
-share/mplayer/DOCS/de/faq.html
-share/mplayer/DOCS/de/formats.html
-share/mplayer/DOCS/de/sound.html
-share/mplayer/DOCS/de/users_against_developers.html
-share/mplayer/DOCS/de/video.html
-share/mplayer/DOCS/default.css
-share/mplayer/DOCS/it/bugreports.html
-share/mplayer/DOCS/it/cd-dvd.html
-share/mplayer/DOCS/it/codecs.html
-share/mplayer/DOCS/it/documentation.html
-share/mplayer/DOCS/it/encoding.html
-share/mplayer/DOCS/it/faq.html
-share/mplayer/DOCS/it/formats.html
-share/mplayer/DOCS/it/skin.html
-share/mplayer/DOCS/it/sound.html
-share/mplayer/DOCS/it/users_against_developers.html
-share/mplayer/DOCS/it/video.html
-share/mplayer/DOCS/man/cs/mplayer.1
-share/mplayer/DOCS/man/de/mplayer.1
-share/mplayer/DOCS/man/en/mplayer.1
-share/mplayer/DOCS/man/es/mplayer.1
-share/mplayer/DOCS/man/fr/mplayer.1
-share/mplayer/DOCS/man/hu/mplayer.1
-share/mplayer/DOCS/man/it/mplayer.1
-share/mplayer/DOCS/man/pl/mplayer.1
-share/mplayer/DOCS/man/sv/mplayer.1
-share/mplayer/DOCS/man/zh/mplayer.1
-share/mplayer/DOCS/tech/Doxyfile
-share/mplayer/DOCS/tech/MAINTAINERS
-share/mplayer/DOCS/tech/TODO
-share/mplayer/DOCS/tech/binary-packaging.txt
-share/mplayer/DOCS/tech/code-documentation.txt
-share/mplayer/DOCS/tech/codec-devel.txt
-share/mplayer/DOCS/tech/codecs-in.html
-share/mplayer/DOCS/tech/codecs.conf.txt
-share/mplayer/DOCS/tech/colorspaces.txt
-share/mplayer/DOCS/tech/cvs-howto.txt
-share/mplayer/DOCS/tech/dr-methods.txt
-share/mplayer/DOCS/tech/encoding-tips.txt
-share/mplayer/DOCS/tech/formats.txt
-share/mplayer/DOCS/tech/general.txt
-share/mplayer/DOCS/tech/hwac3.txt
-share/mplayer/DOCS/tech/libao2.txt
-share/mplayer/DOCS/tech/libmpcodecs.txt
-share/mplayer/DOCS/tech/libvo.txt
-share/mplayer/DOCS/tech/libvo2.txt
-share/mplayer/DOCS/tech/manpage.txt
-share/mplayer/DOCS/tech/mncf.txt
-share/mplayer/DOCS/tech/mpcf.txt
-share/mplayer/DOCS/tech/mpsub.sub
-share/mplayer/DOCS/tech/osd.txt
-share/mplayer/DOCS/tech/patches.txt
-share/mplayer/DOCS/tech/playtree
-share/mplayer/DOCS/tech/playtree-hun
-share/mplayer/DOCS/tech/porting-status.txt
-share/mplayer/DOCS/tech/realcodecs/TODO
-share/mplayer/DOCS/tech/realcodecs/audio-codecs.txt
-share/mplayer/DOCS/tech/realcodecs/streaming.txt
-share/mplayer/DOCS/tech/realcodecs/video-codecs.txt
-share/mplayer/DOCS/tech/release-howto.txt
-share/mplayer/DOCS/tech/slave.txt
-share/mplayer/DOCS/tech/snow.txt
-share/mplayer/DOCS/tech/subcp.txt
-share/mplayer/DOCS/tech/swscaler_filters.txt
-share/mplayer/DOCS/tech/swscaler_methods.txt
-share/mplayer/DOCS/tech/translations.txt
-share/mplayer/DOCS/tech/vidix.txt
-share/mplayer/DOCS/tech/wishlist
-share/mplayer/DOCS/xml/Makefile
-share/mplayer/DOCS/xml/Makefile.inc
-share/mplayer/DOCS/xml/README
-share/mplayer/DOCS/xml/README.maintainers
-share/mplayer/DOCS/xml/configure
-share/mplayer/DOCS/xml/cs/Makefile
-share/mplayer/DOCS/xml/cs/audio.xml
-share/mplayer/DOCS/xml/cs/bugreports.xml
-share/mplayer/DOCS/xml/cs/bugs.xml
-share/mplayer/DOCS/xml/cs/cd-dvd.xml
-share/mplayer/DOCS/xml/cs/codecs.xml
-share/mplayer/DOCS/xml/cs/documentation.xml
-share/mplayer/DOCS/xml/cs/faq.xml
-share/mplayer/DOCS/xml/cs/features.xml
-share/mplayer/DOCS/xml/cs/formats.xml
-share/mplayer/DOCS/xml/cs/history.xml
-share/mplayer/DOCS/xml/cs/install.xml
-share/mplayer/DOCS/xml/cs/tvinput.xml
-share/mplayer/DOCS/xml/cs/usage.xml
-share/mplayer/DOCS/xml/default.css
-share/mplayer/DOCS/xml/en/Makefile
-share/mplayer/DOCS/xml/en/audio.xml
-share/mplayer/DOCS/xml/en/bugreports.xml
-share/mplayer/DOCS/xml/en/bugs.xml
-share/mplayer/DOCS/xml/en/cd-dvd.xml
-share/mplayer/DOCS/xml/en/codecs.xml
-share/mplayer/DOCS/xml/en/documentation.xml
-share/mplayer/DOCS/xml/en/faq.xml
-share/mplayer/DOCS/xml/en/features.xml
-share/mplayer/DOCS/xml/en/formats.xml
-share/mplayer/DOCS/xml/en/history.xml
-share/mplayer/DOCS/xml/en/install.xml
-share/mplayer/DOCS/xml/en/mail-lists.xml
-share/mplayer/DOCS/xml/en/mencoder.xml
-share/mplayer/DOCS/xml/en/patches.xml
-share/mplayer/DOCS/xml/en/ports.xml
-share/mplayer/DOCS/xml/en/skin.xml
-share/mplayer/DOCS/xml/en/tvinput.xml
-share/mplayer/DOCS/xml/en/usage.xml
-share/mplayer/DOCS/xml/en/users-vs-dev.xml
-share/mplayer/DOCS/xml/en/video.xml
-share/mplayer/DOCS/xml/es/Makefile
-share/mplayer/DOCS/xml/es/audio.xml
-share/mplayer/DOCS/xml/es/bugreports.xml
-share/mplayer/DOCS/xml/es/bugs.xml
-share/mplayer/DOCS/xml/es/cd-dvd.xml
-share/mplayer/DOCS/xml/es/codecs.xml
-share/mplayer/DOCS/xml/es/documentation.xml
-share/mplayer/DOCS/xml/es/faq.xml
-share/mplayer/DOCS/xml/es/features.xml
-share/mplayer/DOCS/xml/es/formats.xml
-share/mplayer/DOCS/xml/es/history.xml
-share/mplayer/DOCS/xml/es/install.xml
-share/mplayer/DOCS/xml/es/mail-lists.xml
-share/mplayer/DOCS/xml/es/mencoder.xml
-share/mplayer/DOCS/xml/es/patches.xml
-share/mplayer/DOCS/xml/es/ports.xml
-share/mplayer/DOCS/xml/es/skin.xml
-share/mplayer/DOCS/xml/es/tvinput.xml
-share/mplayer/DOCS/xml/es/usage.xml
-share/mplayer/DOCS/xml/es/users-vs-dev.xml
-share/mplayer/DOCS/xml/es/video.xml
-share/mplayer/DOCS/xml/fr/Makefile
-share/mplayer/DOCS/xml/fr/audio.xml
-share/mplayer/DOCS/xml/fr/bugreports.xml
-share/mplayer/DOCS/xml/fr/bugs.xml
-share/mplayer/DOCS/xml/fr/cd-dvd.xml
-share/mplayer/DOCS/xml/fr/codecs.xml
-share/mplayer/DOCS/xml/fr/documentation.xml
-share/mplayer/DOCS/xml/fr/faq.xml
-share/mplayer/DOCS/xml/fr/features.xml
-share/mplayer/DOCS/xml/fr/formats.xml
-share/mplayer/DOCS/xml/fr/history.xml
-share/mplayer/DOCS/xml/fr/install.xml
-share/mplayer/DOCS/xml/fr/mail-lists.xml
-share/mplayer/DOCS/xml/fr/mencoder.xml
-share/mplayer/DOCS/xml/fr/patches.xml
-share/mplayer/DOCS/xml/fr/ports.xml
-share/mplayer/DOCS/xml/fr/skin.xml
-share/mplayer/DOCS/xml/fr/tvinput.xml
-share/mplayer/DOCS/xml/fr/usage.xml
-share/mplayer/DOCS/xml/fr/users-vs-dev.xml
-share/mplayer/DOCS/xml/fr/video.xml
-share/mplayer/DOCS/xml/html-common.xsl
-share/mplayer/DOCS/xml/hu/Makefile
-share/mplayer/DOCS/xml/hu/audio.xml
-share/mplayer/DOCS/xml/hu/bugreports.xml
-share/mplayer/DOCS/xml/hu/bugs.xml
-share/mplayer/DOCS/xml/hu/cd-dvd.xml
-share/mplayer/DOCS/xml/hu/codecs.xml
-share/mplayer/DOCS/xml/hu/documentation.xml
-share/mplayer/DOCS/xml/hu/faq.xml
-share/mplayer/DOCS/xml/hu/features.xml
-share/mplayer/DOCS/xml/hu/formats.xml
-share/mplayer/DOCS/xml/hu/history.xml
-share/mplayer/DOCS/xml/hu/install.xml
-share/mplayer/DOCS/xml/hu/mail-lists.xml
-share/mplayer/DOCS/xml/hu/patches.xml
-share/mplayer/DOCS/xml/hu/ports.xml
-share/mplayer/DOCS/xml/hu/tvinput.xml
-share/mplayer/DOCS/xml/hu/usage.xml
-share/mplayer/DOCS/xml/hu/video.xml
-share/mplayer/DOCS/xml/ldp.dsl
-share/mplayer/DOCS/xml/pl/Makefile
-share/mplayer/DOCS/xml/pl/audio.xml
-share/mplayer/DOCS/xml/pl/bugreports.xml
-share/mplayer/DOCS/xml/pl/bugs.xml
-share/mplayer/DOCS/xml/pl/cd-dvd.xml
-share/mplayer/DOCS/xml/pl/codecs.xml
-share/mplayer/DOCS/xml/pl/documentation.xml
-share/mplayer/DOCS/xml/pl/faq.xml
-share/mplayer/DOCS/xml/pl/features.xml
-share/mplayer/DOCS/xml/pl/formats.xml
-share/mplayer/DOCS/xml/pl/history.xml
-share/mplayer/DOCS/xml/pl/html-chunk.xsl
-share/mplayer/DOCS/xml/pl/html-common.xsl
-share/mplayer/DOCS/xml/pl/html-single.xsl
-share/mplayer/DOCS/xml/pl/install.xml
-share/mplayer/DOCS/xml/pl/mail-lists.xml
-share/mplayer/DOCS/xml/pl/mencoder.xml
-share/mplayer/DOCS/xml/pl/patches.xml
-share/mplayer/DOCS/xml/pl/ports.xml
-share/mplayer/DOCS/xml/pl/skin.xml
-share/mplayer/DOCS/xml/pl/tvinput.xml
-share/mplayer/DOCS/xml/pl/usage.xml
-share/mplayer/DOCS/xml/pl/users-vs-dev.xml
-share/mplayer/DOCS/xml/pl/video.xml
-share/mplayer/DOCS/xml/ru/Makefile
-share/mplayer/DOCS/xml/ru/bugreports.xml
-share/mplayer/DOCS/xml/ru/bugs.xml
-share/mplayer/DOCS/xml/ru/cd-dvd.xml
-share/mplayer/DOCS/xml/ru/codecs.xml
-share/mplayer/DOCS/xml/ru/documentation.xml
-share/mplayer/DOCS/xml/ru/features.xml
-share/mplayer/DOCS/xml/ru/formats.xml
-share/mplayer/DOCS/xml/ru/history.xml
-share/mplayer/DOCS/xml/ru/html-chunk.xsl
-share/mplayer/DOCS/xml/ru/html-common.xsl
-share/mplayer/DOCS/xml/ru/html-single.xsl
-share/mplayer/DOCS/xml/ru/install.xml
-share/mplayer/DOCS/xml/ru/mail-lists.xml
-share/mplayer/DOCS/xml/ru/patches.xml
-share/mplayer/DOCS/xml/ru/ports.xml
-share/mplayer/DOCS/xml/ru/tvinput.xml
-share/mplayer/DOCS/xml/ru/usage.xml
-share/mplayer/DOCS/xml/ru/users-vs-dev.xml
-share/mplayer/DOCS/xml/xsl/ldp-html-chunk.xsl
-share/mplayer/DOCS/xml/xsl/ldp-html-common.xsl
-share/mplayer/DOCS/xml/xsl/ldp-html.xsl
-share/mplayer/DOCS/xml/xsl/ldp-print.xsl
-share/mplayer/DOCS/zh/bugreports.html
-share/mplayer/DOCS/zh/cd-dvd.html
-share/mplayer/DOCS/zh/codecs.html
-share/mplayer/DOCS/zh/documentation.html
-share/mplayer/DOCS/zh/encoding.html
-share/mplayer/DOCS/zh/faq.html
-share/mplayer/DOCS/zh/formats.html
-share/mplayer/DOCS/zh/skin.html
-share/mplayer/DOCS/zh/sound.html
-share/mplayer/DOCS/zh/users_against_developers.html
-share/mplayer/DOCS/zh/video.html
-share/mplayer/codecs.conf
-share/mplayer/font
-share/mplayer/fonts/README-arial-cp1250
-share/mplayer/fonts/README-arial-iso-8859-1
-share/mplayer/fonts/README-arial-iso-8859-2
-share/mplayer/fonts/font-arial-14-cp1250/cp1250-a.raw
-share/mplayer/fonts/font-arial-14-cp1250/cp1250-b.raw
-share/mplayer/fonts/font-arial-14-cp1250/font.desc
-share/mplayer/fonts/font-arial-14-cp1250/osd-mplayer-a.raw
-share/mplayer/fonts/font-arial-14-cp1250/osd-mplayer-b.raw
-share/mplayer/fonts/font-arial-14-iso-8859-1/font.desc
-share/mplayer/fonts/font-arial-14-iso-8859-1/iso-8859-1-a.raw
-share/mplayer/fonts/font-arial-14-iso-8859-1/iso-8859-1-b.raw
-share/mplayer/fonts/font-arial-14-iso-8859-1/osd-mplayer-a.raw
-share/mplayer/fonts/font-arial-14-iso-8859-1/osd-mplayer-b.raw
-share/mplayer/fonts/font-arial-14-iso-8859-2/font.desc
-share/mplayer/fonts/font-arial-14-iso-8859-2/iso-8859-2-a.raw
-share/mplayer/fonts/font-arial-14-iso-8859-2/iso-8859-2-b.raw
-share/mplayer/fonts/font-arial-14-iso-8859-2/osd-mplayer-a.raw
-share/mplayer/fonts/font-arial-14-iso-8859-2/osd-mplayer-b.raw
-share/mplayer/fonts/font-arial-18-cp1250/cp1250-a.raw
-share/mplayer/fonts/font-arial-18-cp1250/cp1250-b.raw
-share/mplayer/fonts/font-arial-18-cp1250/font.desc
-share/mplayer/fonts/font-arial-18-cp1250/osd-mplayer-a.raw
-share/mplayer/fonts/font-arial-18-cp1250/osd-mplayer-b.raw
-share/mplayer/fonts/font-arial-18-iso-8859-1/font.desc
-share/mplayer/fonts/font-arial-18-iso-8859-1/iso-8859-1-a.raw
-share/mplayer/fonts/font-arial-18-iso-8859-1/iso-8859-1-b.raw
-share/mplayer/fonts/font-arial-18-iso-8859-1/osd-mplayer-a.raw
-share/mplayer/fonts/font-arial-18-iso-8859-1/osd-mplayer-b.raw
-share/mplayer/fonts/font-arial-18-iso-8859-2/font.desc
-share/mplayer/fonts/font-arial-18-iso-8859-2/iso-8859-2-a.raw
-share/mplayer/fonts/font-arial-18-iso-8859-2/iso-8859-2-b.raw
-share/mplayer/fonts/font-arial-18-iso-8859-2/osd-mplayer-a.raw
-share/mplayer/fonts/font-arial-18-iso-8859-2/osd-mplayer-b.raw
-share/mplayer/fonts/font-arial-24-cp1250/cp1250-a.raw
-share/mplayer/fonts/font-arial-24-cp1250/cp1250-b.raw
-share/mplayer/fonts/font-arial-24-cp1250/font.desc
-share/mplayer/fonts/font-arial-24-cp1250/osd-mplayer-a.raw
-share/mplayer/fonts/font-arial-24-cp1250/osd-mplayer-b.raw
-share/mplayer/fonts/font-arial-24-iso-8859-1/font.desc
-share/mplayer/fonts/font-arial-24-iso-8859-1/iso-8859-1-a.raw
-share/mplayer/fonts/font-arial-24-iso-8859-1/iso-8859-1-b.raw
-share/mplayer/fonts/font-arial-24-iso-8859-1/osd-mplayer-a.raw
-share/mplayer/fonts/font-arial-24-iso-8859-1/osd-mplayer-b.raw
-share/mplayer/fonts/font-arial-24-iso-8859-2/font.desc
-share/mplayer/fonts/font-arial-24-iso-8859-2/iso-8859-2-a.raw
-share/mplayer/fonts/font-arial-24-iso-8859-2/iso-8859-2-b.raw
-share/mplayer/fonts/font-arial-24-iso-8859-2/osd-mplayer-a.raw
-share/mplayer/fonts/font-arial-24-iso-8859-2/osd-mplayer-b.raw
-share/mplayer/fonts/font-arial-28-cp1250/cp1250-a.raw
-share/mplayer/fonts/font-arial-28-cp1250/cp1250-b.raw
-share/mplayer/fonts/font-arial-28-cp1250/font.desc
-share/mplayer/fonts/font-arial-28-cp1250/osd-mplayer-a.raw
-share/mplayer/fonts/font-arial-28-cp1250/osd-mplayer-b.raw
-share/mplayer/fonts/font-arial-28-iso-8859-1/font.desc
-share/mplayer/fonts/font-arial-28-iso-8859-1/iso-8859-1-a.raw
-share/mplayer/fonts/font-arial-28-iso-8859-1/iso-8859-1-b.raw
-share/mplayer/fonts/font-arial-28-iso-8859-1/osd-mplayer-a.raw
-share/mplayer/fonts/font-arial-28-iso-8859-1/osd-mplayer-b.raw
-share/mplayer/fonts/font-arial-28-iso-8859-2/font.desc
-share/mplayer/fonts/font-arial-28-iso-8859-2/iso-8859-2-a.raw
-share/mplayer/fonts/font-arial-28-iso-8859-2/iso-8859-2-b.raw
-share/mplayer/fonts/font-arial-28-iso-8859-2/osd-mplayer-a.raw
-share/mplayer/fonts/font-arial-28-iso-8859-2/osd-mplayer-b.raw
-share/mplayer/input.conf
-@dirrm share/mplayer/fonts/font-arial-28-iso-8859-2
-@dirrm share/mplayer/fonts/font-arial-28-iso-8859-1
-@dirrm share/mplayer/fonts/font-arial-28-cp1250
-@dirrm share/mplayer/fonts/font-arial-24-iso-8859-2
-@dirrm share/mplayer/fonts/font-arial-24-iso-8859-1
-@dirrm share/mplayer/fonts/font-arial-24-cp1250
-@dirrm share/mplayer/fonts/font-arial-18-iso-8859-2
-@dirrm share/mplayer/fonts/font-arial-18-iso-8859-1
-@dirrm share/mplayer/fonts/font-arial-18-cp1250
-@dirrm share/mplayer/fonts/font-arial-14-iso-8859-2
-@dirrm share/mplayer/fonts/font-arial-14-iso-8859-1
-@dirrm share/mplayer/fonts/font-arial-14-cp1250
-@dirrm share/mplayer/fonts
-@dirrm share/mplayer/DOCS/zh
-@dirrm share/mplayer/DOCS/xml/xsl
-@dirrm share/mplayer/DOCS/xml/ru
-@dirrm share/mplayer/DOCS/xml/pl
-@dirrm share/mplayer/DOCS/xml/hu
-@dirrm share/mplayer/DOCS/xml/fr
-@dirrm share/mplayer/DOCS/xml/es
-@dirrm share/mplayer/DOCS/xml/en
-@dirrm share/mplayer/DOCS/xml/cs
-@dirrm share/mplayer/DOCS/xml
-@dirrm share/mplayer/DOCS/tech/realcodecs
-@dirrm share/mplayer/DOCS/tech
-@dirrm share/mplayer/DOCS/man/zh
-@dirrm share/mplayer/DOCS/man/sv
-@dirrm share/mplayer/DOCS/man/pl
-@dirrm share/mplayer/DOCS/man/it
-@dirrm share/mplayer/DOCS/man/hu
-@dirrm share/mplayer/DOCS/man/fr
-@dirrm share/mplayer/DOCS/man/es
-@dirrm share/mplayer/DOCS/man/en
-@dirrm share/mplayer/DOCS/man/de
-@dirrm share/mplayer/DOCS/man/cs
-@dirrm share/mplayer/DOCS/man
-@dirrm share/mplayer/DOCS/it
-@dirrm share/mplayer/DOCS/de
-@dirrm share/mplayer/DOCS/HTML/ru
-@dirrm share/mplayer/DOCS/HTML/pl
-@dirrm share/mplayer/DOCS/HTML/hu
-@dirrm share/mplayer/DOCS/HTML/fr
-@dirrm share/mplayer/DOCS/HTML/es
-@dirrm share/mplayer/DOCS/HTML/en
-@dirrm share/mplayer/DOCS/HTML/cs
-@dirrm share/mplayer/DOCS/HTML
-@dirrm share/mplayer/DOCS
-@dirrm share/mplayer
diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo
deleted file mode 100644
index 259fbb054c6..00000000000
--- a/multimedia/mplayer-share/distinfo
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: distinfo,v 1.24 2005/10/24 19:46:05 minskim Exp $
-
-SHA1 (mplayer-1.0rc7/MPlayer-1.0pre7.tar.bz2) = df1e8d4f2f44d72c6f7989932f3b272e815ecb80
-RMD160 (mplayer-1.0rc7/MPlayer-1.0pre7.tar.bz2) = a4bac10df287c4b134ea49b3bc9bf7fb0126cae6
-Size (mplayer-1.0rc7/MPlayer-1.0pre7.tar.bz2) = 6868877 bytes
-SHA1 (mplayer-1.0rc7/font-arial-iso-8859-1.tar.bz2) = 152c40bf20de34aa8802d7f80d34d673b0b67212
-RMD160 (mplayer-1.0rc7/font-arial-iso-8859-1.tar.bz2) = 666697cd5efd9387057a898c714175e7c2aacbcd
-Size (mplayer-1.0rc7/font-arial-iso-8859-1.tar.bz2) = 234242 bytes
-SHA1 (mplayer-1.0rc7/font-arial-iso-8859-2.tar.bz2) = 7b99bbe0e9ba89a57eccbea8f93c453c4f268181
-RMD160 (mplayer-1.0rc7/font-arial-iso-8859-2.tar.bz2) = 562d4d92c4f5f3d537340fde3ad8d1495ac41acb
-Size (mplayer-1.0rc7/font-arial-iso-8859-2.tar.bz2) = 222208 bytes
-SHA1 (mplayer-1.0rc7/font-arial-cp1250.tar.bz2) = ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68
-RMD160 (mplayer-1.0rc7/font-arial-cp1250.tar.bz2) = a2fc7ae07b0d80936ea58e168e1047efccb9eb91
-Size (mplayer-1.0rc7/font-arial-cp1250.tar.bz2) = 249705 bytes
-SHA1 (patch-aa) = d77cd903d735d7a88336e0aff309f8508cafed94
-SHA1 (patch-ab) = 1a08f717e326d83b355eee26e1be9c0636b735c5
-SHA1 (patch-ac) = 3b9ae32e6e656ec4b58b7e51a1c2eaa280384f3e
-SHA1 (patch-ad) = d705dd315e913593223b83e533c60a9620d34cc8
-SHA1 (patch-ae) = 601808d8c89cba68156fb3c95fe9fcfb8da4fca0
-SHA1 (patch-af) = 6eab8572b239f6ac7afc03ad6254a7c97f90663e
-SHA1 (patch-ag) = 9bc3466ef24970e3f26fc64601d9f2c27fa394d2
-SHA1 (patch-ah) = 744f073e791257768e5ec7da8e321d2f25d1fb2c
-SHA1 (patch-da) = be092da4f854708c1ef47f10c26e361c095a6799
-SHA1 (patch-dc) = b11ef06a89f13e2ae5e013d569aa5acc99c770aa
-SHA1 (patch-dd) = e5b23b73a1e53e3185ecbac26042432395cd5e63
-SHA1 (patch-de) = 923814d978a3ed2b00494cf7f7fd17acd72aa610
-SHA1 (patch-df) = 0a85d1d8fbbbc1a86436e7364b72619a9a32e2d7
-SHA1 (patch-dg) = 1633dfd61c83796ce148ede22bafbe01f67d2bd4
-SHA1 (patch-dh) = 639638d871af2462945d8c5e454cae291a15e939
-SHA1 (patch-di) = 5b4c7d96537882422fb648181a93ec9ba9e13c7e
-SHA1 (patch-dj) = e72e08dda9f3eb97bf5e63751bf18999f1689434
-SHA1 (patch-dk) = 744911451794b554f9754b4cd77cf24520ed0f8e
-SHA1 (patch-dm) = b57da36cce0b896b51ca1ff2eef3c58ed95e2b68
-SHA1 (patch-do) = dbd4705c81ee4e6fa7cefc93dc187733a739d710
diff --git a/multimedia/mplayer-share/options.mk b/multimedia/mplayer-share/options.mk
deleted file mode 100644
index 1ac288e07d5..00000000000
--- a/multimedia/mplayer-share/options.mk
+++ /dev/null
@@ -1,225 +0,0 @@
-# $NetBSD: options.mk,v 1.9 2005/11/05 17:21:01 rillig Exp $
-
-.if defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*)
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.${PKGBASE}
-
-.include "../../mk/bsd.prefs.mk"
-
-# -------------------------------------------------------------------------
-# Define PKG_SUPPORTED_OPTIONS based on the current package and system.
-# -------------------------------------------------------------------------
-
-# Options supported by both mplayer* or mencoder*.
-PKG_SUPPORTED_OPTIONS=	gif jpeg mad dv dvdread oss png theora vorbis
-
-# Set options based on the specific package being built.
-.if !empty(PKGNAME:M*mplayer*)
-PKG_SUPPORTED_OPTIONS+=	aalib esound ggi mplayer-menu nas sdl
-
-.  if ${OPSYS} != "SunOS"
-PKG_SUPPORTED_OPTIONS+=	arts
-.  endif
-.elif !empty(PKGNAME:M*mencoder*)
-PKG_SUPPORTED_OPTIONS+=	lame
-.endif
-
-# OS-specific options.
-.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux" || ${OPSYS} == "NetBSD"
-PKG_SUPPORTED_OPTIONS+=	cdparanoia
-.elif ${OPSYS} == "SunOS"
-PKG_SUPPORTED_OPTIONS+=	mlib
-.endif
-
-# Platform-specific options.
-.if ${MACHINE_ARCH} == "i386"
-PKG_SUPPORTED_OPTIONS+= mplayer-runtime-cpudetection mplayer-win32 \
-			xvid
-.endif
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \
-    ${MACHINE_ARCH} == "alpha"
-PKG_SUPPORTED_OPTIONS+=	mplayer-real
-.endif
-
-# -------------------------------------------------------------------------
-# Define PKG_SUGGESTED_OPTIONS.
-# -------------------------------------------------------------------------
-
-.for _o_ in aalib arts cdparanoia dv dvdread esound gif jpeg \
-	    lame mad mplayer-menu mplayer-real \
-	    mplayer-runtime-cpudetection mplayer-win32 \
-	    nas oss png sdl theora vorbis xvid
-.  if !empty(PKG_SUPPORTED_OPTIONS:M${_o_})
-PKG_SUGGESTED_OPTIONS+=	${_o_}
-.  endif
-.endfor
-
-# -------------------------------------------------------------------------
-# Handle chosen options.
-# -------------------------------------------------------------------------
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Maalib)
-.  include "../../graphics/aalib-x11/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Marts)
-CONFIGURE_ARGS+=	--enable-arts
-.  include "../../audio/arts/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--disable-arts
-.endif
-
-.if !empty(PKG_OPTIONS:Mcdparanoia)
-CONFIGURE_ARGS+=	--enable-cdparanoia
-CONFIGURE_ARGS+=	--with-cdparanoiaincdir="${BUILDLINK_PREFIX.cdparanoia}/include/cdparanoia"
-.  include "../../audio/cdparanoia/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--disable-cdparanoia
-.endif
-
-.if !empty(PKG_OPTIONS:Mdv)
-CONFIGURE_ARGS+=	--enable-libdv
-.  include "../../multimedia/libdv/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--disable-libdv
-.endif
-
-.if !empty(PKG_OPTIONS:Mdvdread)
-CONFIGURE_ARGS+=	--enable-dvdread
-.  include "../../multimedia/libdvdread/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--disable-dvdread
-.endif
-
-.if !empty(PKG_OPTIONS:Mesound)
-CONFIGURE_ARGS+=	--enable-esd
-.  include "../../audio/esound/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--disable-esd
-.endif
-
-.if !empty(PKG_OPTIONS:Mggi)
-CONFIGURE_ARGS+=	--enable-ggi
-.  include "../../graphics/libggi/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--disable-ggi
-.endif
-
-.if !empty(PKG_OPTIONS:Mgif)
-CONFIGURE_ARGS+=	--enable-gif
-.  include "../../graphics/libungif/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--disable-gif
-.endif
-
-.if !empty(PKG_OPTIONS:Mjpeg)
-CONFIGURE_ARGS+=	--enable-jpeg
-.  include "../../graphics/jpeg/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--disable-jpeg
-.endif
-
-.if !empty(PKG_OPTIONS:Mlame)
-#CONFIGURE_ARGS+=	--enable-toolame
-.  include "../../audio/lame/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--disable-toolame
-.endif
-
-.if !empty(PKG_OPTIONS:Mmad)
-CONFIGURE_ARGS+=	--enable-mad
-.  include "../../audio/libmad/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--disable-mad
-.endif
-
-.if !empty(PKG_OPTIONS:Mmlib)
-CONFIGURE_ARGS+=	--enable-mlib
-.else
-CONFIGURE_ARGS+=	--disable-mlib
-.endif
-
-.if !empty(PKG_OPTIONS:Mmplayer-menu)
-CONFIGURE_ARGS+=	--enable-menu
-.else
-CONFIGURE_ARGS+=	--disable-menu
-.endif
-
-.if !empty(PKG_OPTIONS:Mmplayer-real)
-EVAL_PREFIX+=		PREFIX.realplayer-codecs=realplayer-codecs
-PREFIX.realplayer-codecs_DEFAULT=	${LOCALBASE}
-CONFIGURE_ARGS+=	--enable-real
-CONFIGURE_ARGS+=	--with-reallibdir="${PREFIX.realplayer-codecs}/lib/RealPlayer8-Codecs"
-DEPENDS+=		realplayer-codecs>=8nb2:../../multimedia/realplayer-codecs
-.else
-CONFIGURE_ARGS+=	--disable-real
-.endif
-
-.if !empty(PKG_OPTIONS:Mmplayer-runtime-cpudetection)
-CONFIGURE_ARGS+=	--enable-runtime-cpudetection
-.else
-CONFIGURE_ARGS+=	--disable-runtime-cpudetection
-.endif
-
-.if !empty(PKG_OPTIONS:Mmplayer-win32)
-EVAL_PREFIX+=		PREFIX.win32-codecs=win32-codecs
-PREFIX.win32-codecs_DEFAULT=	${LOCALBASE}
-CONFIGURE_ARGS+=	--enable-win32
-CONFIGURE_ARGS+=	--with-win32libdir="${PREFIX.win32-codecs}/lib/win32"
-DEPENDS+=		win32-codecs>=011227:../../multimedia/win32-codecs
-.else
-CONFIGURE_ARGS+=	--disable-win32
-.endif
-
-.if !empty(PKG_OPTIONS:Mnas)
-CONFIGURE_ARGS+=	--enable-nas
-.  include "../../audio/nas/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--disable-nas
-.endif
-
-.if !empty(PKG_OPTIONS:Moss)
-CONFIGURE_ARGS+=	--enable-ossaudio
-.  include "../../mk/ossaudio.buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--disable-ossaudio
-.endif
-
-.if !empty(PKG_OPTIONS:Mpng)
-CONFIGURE_ARGS+=	--enable-png
-.  include "../../graphics/png/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--disable-png
-.endif
-
-.if !empty(PKG_OPTIONS:Msdl)
-CONFIGURE_ARGS+=	--enable-sdl
-.  include "../../devel/SDL/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--disable-sdl
-.endif
-
-.if !empty(PKG_OPTIONS:Mtheora)
-CONFIGURE_ARGS+=	--enable-theora
-.  include "../../multimedia/libtheora/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--disable-theora
-.endif
-
-.if !empty(PKG_OPTIONS:Mvorbis)
-CONFIGURE_ARGS+=	--enable-vorbis
-.  include "../../audio/libvorbis/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--disable-vorbis
-.endif
-
-.if !empty(PKG_OPTIONS:Mxvid)
-CONFIGURE_ARGS+=	--enable-xvid
-.  include "../../multimedia/xvidcore/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--disable-xvid
-.endif
-
-.endif # defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*)
diff --git a/multimedia/mplayer-share/patches/patch-aa b/multimedia/mplayer-share/patches/patch-aa
deleted file mode 100644
index 12a92b614d0..00000000000
--- a/multimedia/mplayer-share/patches/patch-aa
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-aa,v 1.12 2005/07/21 14:24:48 wiz Exp $
-
---- configure.orig	2005-04-13 13:46:35.000000000 +0200
-+++ configure
-@@ -408,7 +408,7 @@ for ac_option do
-     _inc_extra=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
-     ;;
-   --with-extralibdir=*)
--    _ld_extra=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
-+    _ld_extra="${_ld_extra} -Wl,-R"`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -Wl\,-R,g'`" -L"`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
-     ;;
-   --enable-runtime-cpudetection)
-     _runtime_cpudetection=yes
-@@ -596,7 +596,7 @@ if test "$_skip_cc_check" != yes ; then
-   echocheck "$_cc version"
-   cc_vendor=gnu
-   cc_name=`( $_cc -v ) 2>&1 | _tail 1 | cut -d ' ' -f 1`
--  cc_version=`( $_cc -dumpversion ) 2>&1`
-+  cc_version=`( $_cc -dumpversion | sed -e 's/-nb[0-9]//' ) 2>&1`
-   if test "$?" -gt 0; then
-     cc_version="not found"
-   fi
-@@ -743,7 +743,7 @@ case "$host_arch" in
- 
-   pname=`$_cpuinfo | grep 'model name' | cut -d ':' -f 2 | _head 1`
-   pvendor=`$_cpuinfo | grep 'vendor_id' | cut -d ':' -f 2  | cut -d ' ' -f 2 | _head 1`
--  pfamily=`$_cpuinfo | grep 'cpu family' | cut -d ':' -f 2 | cut -d ' ' -f 2 | _head 1`
-+  pfamily=`$_cpuinfo | grep -i 'cpu family' | cut -d ':' -f 2 | cut -d ' ' -f 2 | _head 1`
-   pmodel=`$_cpuinfo | grep -v 'model name' | grep 'model' | cut -d ':' -f 2 | cut -d ' ' -f 2 | _head 1`
-   pstepping=`$_cpuinfo | grep 'stepping' | cut -d ':' -f 2 | cut -d ' ' -f 2 | _head 1`
- 
-@@ -1797,7 +1797,8 @@ for ac_option do
-     _inc_x11=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
-     ;;
-   --with-x11libdir=*)
--    _ld_x11=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
-+#    _ld_x11=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
-+    _ld_x11="${_ld_x11} -Wl,-R"`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -Wl\,-R,g'`" -L"`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
-     ;;
-   --with-dxr2incdir=*)
-     _inc_dxr2=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
-@@ -2382,7 +2383,7 @@ echores "$_posix4"
- echocheck "lrintf"
- cat > $TMPC << EOF
- #include <math.h>
--int main(void) { (void) lrintf(0.0); return 0; }
-+int main(void) { long (*foo)(double); foo = lrintf; (void)(*foo)(0.0); return 0; }
- EOF
- _lrintf=no
- cc_check $_ld_lm && _lrintf=yes
-@@ -3788,7 +3789,7 @@ fi
- if test "$_aa" = yes ; then
-   _def_aa='#define HAVE_AA 1'
-   if cygwin ; then
--    _ld_aa=`aalib-config --libs | cut -d " " -f 2,5,6`
-+    _ld_aa=`${AALIB_CONFIG} --libs | cut -d " " -f 2,5,6`
-   fi
-   _vosrc="$_vosrc vo_aa.c"
-   _vomodules="aa $_vomodules"
diff --git a/multimedia/mplayer-share/patches/patch-ab b/multimedia/mplayer-share/patches/patch-ab
deleted file mode 100644
index dec1592039b..00000000000
--- a/multimedia/mplayer-share/patches/patch-ab
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2005/05/31 19:15:11 jmmv Exp $
-
---- loader/win32.c.orig	2005-04-15 22:17:12.000000000 +0200
-+++ loader/win32.c
-@@ -451,8 +451,10 @@ static int my_release(void* memory)
- 
-     if (last_alloc)
- 	pthread_mutex_unlock(&memmut);
--    else
-+    else {
-+	pthread_mutex_unlock(&memmut);
- 	pthread_mutex_destroy(&memmut);
-+    }
- 
-     //if (alccnt < 40000) printf("MY_RELEASE: %p\t%ld    (%d)\n", header, header->size, alccnt);
- #else
-@@ -993,7 +995,7 @@
- 
- /* disable cpuid based detection (mplayer's cpudetect.c does this - see above) */
- #ifndef MPLAYER
--#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__svr4__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__svr4__) || defined(__DragonFly__)
-     do_cpuid(1, regs);
-     switch ((regs[0] >> 8) & 0xf) {			// cpu family
-     case 3: cachedsi.dwProcessorType = PROCESSOR_INTEL_386;
diff --git a/multimedia/mplayer-share/patches/patch-ac b/multimedia/mplayer-share/patches/patch-ac
deleted file mode 100644
index ed64a9ddbae..00000000000
--- a/multimedia/mplayer-share/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2005/05/30 12:43:30 wiz Exp $
-
---- libfaad2/common.h.orig	2005-02-19 03:19:21.000000000 +0100
-+++ libfaad2/common.h
-@@ -344,7 +344,7 @@ char *strchr(), *strrchr();
-   #elif (defined(__i386__) && defined(__GNUC__)) && !defined(__MINGW32__)
-     #define HAS_LRINTF
-     // from http://www.stereopsis.com/FPU.html
--    static INLINE int lrintf(float f)
-+    static INLINE long int lrintf(float f)
-     {
-         int i;
-         __asm__ __volatile__ (
diff --git a/multimedia/mplayer-share/patches/patch-ad b/multimedia/mplayer-share/patches/patch-ad
deleted file mode 100644
index 51389c92ed6..00000000000
--- a/multimedia/mplayer-share/patches/patch-ad
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2005/04/18 17:49:41 drochner Exp $
-
---- mp_msg.c.orig	2005-01-20 14:22:52.000000000 +0100
-+++ mp_msg.c
-@@ -34,15 +34,19 @@ void mp_msg_init(){
- #ifdef MP_DEBUG
-     fprintf(stdout, "Using GNU internationalization\n");
-     fprintf(stdout, "Original domain: %s\n", textdomain(NULL));
-+#if 0
-     fprintf(stdout, "Original dirname: %s\n", bindtextdomain(textdomain(NULL),NULL));
- #endif
-     bindtextdomain("mplayer", PREFIX"/share/locale");
-     textdomain("mplayer");
- #ifdef MP_DEBUG
-     fprintf(stdout, "Current domain: %s\n", textdomain(NULL));
-+#if 0
-     fprintf(stdout, "Current dirname: %s\n\n", bindtextdomain(textdomain(NULL),NULL));
- #endif
- #endif
-+#endif
-+#endif
-     mp_msg_set_level(MSGL_STATUS);
- }
- 
diff --git a/multimedia/mplayer-share/patches/patch-ae b/multimedia/mplayer-share/patches/patch-ae
deleted file mode 100644
index 6574e155ce6..00000000000
--- a/multimedia/mplayer-share/patches/patch-ae
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2005/05/31 19:15:11 jmmv Exp $
-
---- cpudetect.c.orig	2005-01-12 22:56:25.000000000 +0100
-+++ cpudetect.c	2005-05-20 20:00:44.000000000 +0200
-@@ -20,7 +20,7 @@
- #include <machine/cpu.h>
- #endif
- 
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
- #include <sys/types.h>
- #include <sys/sysctl.h>
- #endif
-@@ -169,7 +169,7 @@
- #endif
- 
- 		/* FIXME: Does SSE2 need more OS support, too? */
--#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__CYGWIN__) || defined(__OpenBSD__)
-+#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__CYGWIN__) || defined(__OpenBSD__) || defined(__DragonFly__)
- 		if (caps->hasSSE)
- 			check_os_katmai_support();
- 		if (!caps->hasSSE)
-@@ -324,7 +324,7 @@
- #ifdef ARCH_X86_64
-    gCpuCaps.hasSSE=1;
-    gCpuCaps.hasSSE2=1;
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
-    int has_sse=0, ret;
-    size_t len=sizeof(has_sse);
- 
-@@ -334,6 +334,10 @@
- 
- #elif defined(__NetBSD__) || defined (__OpenBSD__)
- #if __NetBSD_Version__ >= 105250000 || (defined __OpenBSD__)
-+#ifdef __x86_64__
-+   gCpuCaps.hasSSE=1;
-+   gCpuCaps.hasSSE2=1;
-+#else
-    int has_sse, has_sse2, ret, mib[2];
-    size_t varlen;
- 
-@@ -362,6 +366,7 @@ static void check_os_katmai_support( voi
-       gCpuCaps.hasSSE2=1;
-       mp_msg(MSGT_CPUDETECT,MSGL_V, "yes!\n" );
-    }
-+#endif /* x86_64 */
- #else
-    gCpuCaps.hasSSE = 0;
-    mp_msg(MSGT_CPUDETECT,MSGL_WARN, "No OS support for SSE, disabling to be safe.\n" );
diff --git a/multimedia/mplayer-share/patches/patch-af b/multimedia/mplayer-share/patches/patch-af
deleted file mode 100644
index 86c186d74d3..00000000000
--- a/multimedia/mplayer-share/patches/patch-af
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-af,v 1.1 2005/05/30 12:44:09 wiz Exp $
-
---- etc/codecs.conf.orig	2005-04-10 18:44:29.000000000 +0200
-+++ etc/codecs.conf
-@@ -2188,6 +2188,7 @@ audiocodec faad
-   fourcc mp4a,MP4A
-   fourcc "AAC " ; Used in NSV
-   format 0xff
-+  format 0x706d
-   driver faad
-   dll libfaad2
- 
diff --git a/multimedia/mplayer-share/patches/patch-ag b/multimedia/mplayer-share/patches/patch-ag
deleted file mode 100644
index a5c11769c9c..00000000000
--- a/multimedia/mplayer-share/patches/patch-ag
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2005/08/27 06:59:52 dogcow Exp $
-
---- libmpcodecs/ad_pcm.c	2005/07/28 13:43:24	1.18
-+++ libmpcodecs/ad_pcm.c	2005/08/25 19:46:20	1.19
-@@ -98,8 +98,8 @@
- 
- static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen)
- {
--  int len=sh_audio->channels*sh_audio->samplesize-1;
--  len=(minlen+len)&(~len); // sample align
-+  unsigned len = sh_audio->channels*sh_audio->samplesize;
-+  len = maxlen - maxlen % len; // sample align
-   len=demux_read_data(sh_audio->ds,buf,len);
-   return len;
- }
-
diff --git a/multimedia/mplayer-share/patches/patch-ah b/multimedia/mplayer-share/patches/patch-ah
deleted file mode 100644
index 3addd3ee64d..00000000000
--- a/multimedia/mplayer-share/patches/patch-ah
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2005/10/24 19:46:05 minskim Exp $
-
---- subreader.c.orig	2005-02-04 10:31:03.000000000 -0800
-+++ subreader.c
-@@ -73,10 +73,10 @@ static int eol(char p) {
- /* Remove leading and trailing space */
- static void trail_space(char *s) {
- 	int i = 0;
--	while (isspace(s[i])) ++i;
-+	while (isspace((unsigned char)s[i])) ++i;
- 	if (i) strcpy(s, s + i);
- 	i = strlen(s) - 1;
--	while (i > 0 && isspace(s[i])) s[i--] = '\0';
-+	while (i > 0 && isspace((unsigned char)s[i])) s[i--] = '\0';
- }
- 
- static char *stristr(const char *haystack, const char *needle) {
-@@ -627,7 +627,7 @@ subtitle *sub_read_line_pjs(FILE *fd,sub
-     if (!fgets (line, LINE_LEN, fd))
- 	return NULL;
-     /* skip spaces */
--    for (s=line; *s && isspace(*s); s++);
-+    for (s=line; *s && isspace(*(unsigned char*)s); s++);
-     /* allow empty lines at the end of the file */
-     if (*s==0)
- 	return NULL;
-@@ -680,7 +680,7 @@ subtitle *sub_read_line_mpsub(FILE *fd, 
- 			else return current;
- 		}
- 		p=line;
--		while (isspace(*p)) p++;
-+		while (isspace(*(unsigned char*)p)) p++;
- 		if (eol(*p) && num > 0) return current;
- 		if (eol(*p)) return NULL;
- 
diff --git a/multimedia/mplayer-share/patches/patch-da b/multimedia/mplayer-share/patches/patch-da
deleted file mode 100644
index cc21ff5452a..00000000000
--- a/multimedia/mplayer-share/patches/patch-da
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-da,v 1.2 2005/08/25 14:42:26 wiz Exp $
---- libdha/pci.c.orig	2005-05-20 20:00:58.000000000 +0200
-+++ libdha/pci.c	2005-05-20 20:01:07.000000000 +0200
-@@ -62,7 +62,7 @@
- /* OS depended stuff */
- #if defined (linux)
- #include "sysdep/pci_linux.c"
--#elif defined (__FreeBSD__)
-+#elif defined (__FreeBSD__) || defined(__DragonFly__)
- #include "sysdep/pci_freebsd.c"
- #elif defined (__386BSD__)
- #include "sysdep/pci_386bsd.c"
diff --git a/multimedia/mplayer-share/patches/patch-dc b/multimedia/mplayer-share/patches/patch-dc
deleted file mode 100644
index 90b0f5b3948..00000000000
--- a/multimedia/mplayer-share/patches/patch-dc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-dc,v 1.2 2005/08/25 14:42:26 wiz Exp $
---- libmpcodecs/ad_realaud.c.orig	2005-05-20 20:01:46.000000000 +0200
-+++ libmpcodecs/ad_realaud.c	2005-05-20 20:01:52.000000000 +0200
-@@ -35,7 +35,7 @@
- 	free(ize);
- }
- 
--#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
- void *__ctype_b=NULL;
- #endif
- 
diff --git a/multimedia/mplayer-share/patches/patch-dd b/multimedia/mplayer-share/patches/patch-dd
deleted file mode 100644
index 53bae34ba19..00000000000
--- a/multimedia/mplayer-share/patches/patch-dd
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-dd,v 1.2 2005/08/25 14:42:26 wiz Exp $
---- libmpcodecs/vd_realvid.c.orig	2005-05-20 20:04:14.000000000 +0200
-+++ libmpcodecs/vd_realvid.c	2005-05-20 20:04:24.000000000 +0200
-@@ -79,7 +79,7 @@
- //	exit(1);
- }
- 
--#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
- void ___brk_addr(void) {exit(0);}
- char **__environ={NULL};
- #undef stderr
diff --git a/multimedia/mplayer-share/patches/patch-de b/multimedia/mplayer-share/patches/patch-de
deleted file mode 100644
index bb531c365ee..00000000000
--- a/multimedia/mplayer-share/patches/patch-de
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-de,v 1.2 2005/08/25 14:42:26 wiz Exp $
---- libmpdemux/cddb.c.orig	2005-05-20 20:04:55.000000000 +0200
-+++ libmpdemux/cddb.c	2005-05-20 20:05:16.000000000 +0200
-@@ -30,7 +30,7 @@
- 
- #if defined(__linux__)
- 	#include <linux/cdrom.h>
--#elif defined(__FreeBSD__) || defined(__bsdi__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#elif defined(__FreeBSD__) || defined(__bsdi__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
- 	#include <sys/cdio.h>
- #endif
- 
-@@ -82,7 +82,7 @@
- 	return tochdr.cdth_trk1;
- }
- 
--#elif defined(__FreeBSD__) || defined(__bsdi__)
-+#elif defined(__FreeBSD__) || defined(__bsdi__) || defined(__DragonFly__)
- int 
- read_toc(const char *dev) {
- 	int drive;
diff --git a/multimedia/mplayer-share/patches/patch-df b/multimedia/mplayer-share/patches/patch-df
deleted file mode 100644
index dd2ec49b9df..00000000000
--- a/multimedia/mplayer-share/patches/patch-df
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-df,v 1.2 2005/08/25 14:42:26 wiz Exp $
---- libmpdemux/stream_vcd.c.orig	2005-05-20 20:10:45.000000000 +0200
-+++ libmpdemux/stream_vcd.c	2005-05-20 20:10:59.000000000 +0200
-@@ -14,7 +14,7 @@
- #include <sys/ioctl.h>
- #include <errno.h>
- 
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
- #include <sys/cdrio.h>
- #include "vcd_read_fbsd.h" 
- #elif defined(__NetBSD__) || defined (__OpenBSD__)
diff --git a/multimedia/mplayer-share/patches/patch-dg b/multimedia/mplayer-share/patches/patch-dg
deleted file mode 100644
index 3b89c0f7235..00000000000
--- a/multimedia/mplayer-share/patches/patch-dg
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-dg,v 1.2 2005/08/25 14:42:26 wiz Exp $
---- libmpdemux/tvi_bsdbt848.c.orig	2005-05-20 20:11:15.000000000 +0200
-+++ libmpdemux/tvi_bsdbt848.c	2005-05-20 20:11:56.000000000 +0200
-@@ -43,6 +43,9 @@
- #ifdef __NetBSD__
- #include <dev/ic/bt8xx.h>
- #include <sys/audioio.h>
-+#elif defined(__DragonFly__)
-+#include <dev/video/meteor/ioctl_meteor.h>
-+#include <dev/video/bktr/ioctl_bt848.h>
- #elif __FreeBSD_version >= 502100
- #include <dev/bktr/ioctl_meteor.h>
- #include <dev/bktr/ioctl_bt848.h>
diff --git a/multimedia/mplayer-share/patches/patch-dh b/multimedia/mplayer-share/patches/patch-dh
deleted file mode 100644
index 278af1c22bc..00000000000
--- a/multimedia/mplayer-share/patches/patch-dh
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-dh,v 1.2 2005/08/25 14:42:26 wiz Exp $
---- libmpdvdkit2/bswap.h.orig	2005-05-20 20:12:12.000000000 +0200
-+++ libmpdvdkit2/bswap.h	2005-05-20 20:13:32.000000000 +0200
-@@ -88,12 +88,17 @@
- }
- #define B2N_64(x) x = bswap_64(x)
- 
-+#elif defined(__DragonFly__)
-+#include <sys/endian.h>
-+#define B2N_16(x) x = be16toh(x)
-+#define B2N_32(x) x = be32toh(x)
-+#define B2N_64(x) x = be64toh(x)
-+
- /* This is a slow but portable implementation, it has multiple evaluation 
-  * problems so beware.
-  * FreeBSD and Solaris don't have <byteswap.h> or any other such 
-  * functionality! 
-  */
--
- #elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined(__CYGWIN__)
- #define B2N_16(x) \
-  x = ((((x) & 0xff00) >> 8) | \
diff --git a/multimedia/mplayer-share/patches/patch-di b/multimedia/mplayer-share/patches/patch-di
deleted file mode 100644
index abb7feae0a5..00000000000
--- a/multimedia/mplayer-share/patches/patch-di
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-di,v 1.2 2005/08/25 14:42:26 wiz Exp $
---- libmpdvdkit2/dvd_reader.c.orig	2005-05-20 20:13:48.000000000 +0200
-+++ libmpdvdkit2/dvd_reader.c	2005-05-20 20:13:55.000000000 +0200
-@@ -35,7 +35,7 @@
- #include <limits.h>
- #include <dirent.h>
-  
--#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__bsdi__)|| defined(__DARWIN__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__bsdi__)|| defined(__DARWIN__) || defined(__DragonFly__)
- #define SYS_BSD 1
- #endif
- 
diff --git a/multimedia/mplayer-share/patches/patch-dj b/multimedia/mplayer-share/patches/patch-dj
deleted file mode 100644
index c5426dd98cb..00000000000
--- a/multimedia/mplayer-share/patches/patch-dj
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-dj,v 1.2 2005/08/25 14:42:26 wiz Exp $
---- loader/ldt_keeper.c.orig	2005-05-20 20:14:38.000000000 +0200
-+++ loader/ldt_keeper.c	2005-05-20 20:16:22.000000000 +0200
-@@ -50,7 +50,7 @@
- }
- #endif
- #else
--#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
-+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
- #include <machine/segments.h>
- #include <machine/sysarch.h>
- #endif
-@@ -165,7 +165,7 @@
- #endif
- #endif
- 
--#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
-+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
- static void LDT_EntryToBytes( unsigned long *buffer, const struct modify_ldt_ldt_s *content )
- {
-     *buffer++ = ((content->base_addr & 0x0000ffff) << 16) |
-@@ -227,7 +227,7 @@
-     }
- #endif /*linux*/
- 
--#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
-+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
-     {
-         unsigned long d[2];
- 
-@@ -246,7 +246,7 @@
-             printf("Did you reconfigure the kernel with \"options USER_LDT\"?\n");
-         }
-     }
--#endif  /* __NetBSD__ || __FreeBSD__ || __OpenBSD__ */
-+#endif  /* __NetBSD__ || __FreeBSD__ || __OpenBSD__ || __DragonFly__ */
- 
- #if defined(__svr4__)
-     {
diff --git a/multimedia/mplayer-share/patches/patch-dk b/multimedia/mplayer-share/patches/patch-dk
deleted file mode 100644
index e0d4485104e..00000000000
--- a/multimedia/mplayer-share/patches/patch-dk
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-dk,v 1.2 2005/08/25 14:42:26 wiz Exp $
---- loader/pe_image.c.orig	2005-05-20 20:16:31.000000000 +0200
-+++ loader/pe_image.c	2005-05-20 20:16:45.000000000 +0200
-@@ -905,7 +905,7 @@
-  */
- static void __attribute__((noinline)) extend_stack_for_dll_alloca(void)
- {
--#ifndef __FreeBSD__
-+#if !defined(__FreeBSD__) && !defined(__DragonFly__)
-     volatile int* mem=alloca(0x20000);
-     *mem=0x1234;
- #endif
diff --git a/multimedia/mplayer-share/patches/patch-dm b/multimedia/mplayer-share/patches/patch-dm
deleted file mode 100644
index 63e2036431f..00000000000
--- a/multimedia/mplayer-share/patches/patch-dm
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-dm,v 1.2 2005/08/25 14:42:26 wiz Exp $
---- osdep/getch2.c.orig	2005-05-20 20:17:34.000000000 +0200
-+++ osdep/getch2.c	2005-05-20 20:17:57.000000000 +0200
-@@ -220,7 +220,7 @@
- struct termios tio_new;
- #if defined(__NetBSD__) || defined(__svr4__) || defined(__CYGWIN__) || defined(__OS2__) || defined(__GLIBC__)
-     tcgetattr(0,&tio_orig);
--#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__)
-+#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__) || defined(__DragonFly__)
-     ioctl(0,TIOCGETA,&tio_orig);
- #else
-     ioctl(0,TCGETS,&tio_orig);
-@@ -231,7 +231,7 @@
-     tio_new.c_cc[VTIME] = 0;
- #if defined(__NetBSD__) || defined(__svr4__) || defined(__CYGWIN__) || defined(__OS2__) || defined(__GLIBC__)
-     tcsetattr(0,TCSANOW,&tio_new);
--#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__)
-+#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__) || defined(__DragonFly__)
-     ioctl(0,TIOCSETA,&tio_new);
- #else
-     ioctl(0,TCSETS,&tio_new);
-@@ -245,7 +245,7 @@
- #ifdef HAVE_TERMIOS
- #if defined(__NetBSD__) || defined(__svr4__) || defined(__CYGWIN__) || defined(__OS2__) || defined(__GLIBC__)
-     tcsetattr(0,TCSANOW,&tio_orig);
--#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__)
-+#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__) || defined(__DragonFly__)
-     ioctl(0,TIOCSETA,&tio_orig);
- #else
-     ioctl(0,TCSETS,&tio_orig);
diff --git a/multimedia/mplayer-share/patches/patch-do b/multimedia/mplayer-share/patches/patch-do
deleted file mode 100644
index d738b90403b..00000000000
--- a/multimedia/mplayer-share/patches/patch-do
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-do,v 1.1 2005/05/31 19:15:11 jmmv Exp $
-
---- libdha/sysdep/pci_freebsd.c.orig	2002-05-03 14:56:29.000000000 +0200
-+++ libdha/sysdep/pci_freebsd.c	2005-05-20 21:15:13.000000000 +0200
-@@ -8,7 +8,7 @@
- /* machine/console.h seems to be outdated by recent FreeBSD *
-  * however pcvt_ioctl.h seems to exist for very long time   */
- /* #include <machine/console.h>*/
--#include <machine/pcvt_ioctl.h>
-+#include <sys/kbio.h>
- #ifndef GCCUSESGAS
- #define GCCUSESGAS
- #endif
diff --git a/multimedia/mplayer/DESCR b/multimedia/mplayer/DESCR
deleted file mode 100644
index 3a81d317e26..00000000000
--- a/multimedia/mplayer/DESCR
+++ /dev/null
@@ -1,14 +0,0 @@
-MPlayer is a movie player for LINUX (runs on many other Unices,
-and non-x86 CPUs). It plays most MPEG, VOB, AVI, VIVO, ASF/WMV,
-QT/MOV, FLI, RM, NuppelVideo, yuv4mpeg, FILM, RoQ files, supported
-by many native, XAnim, and Win32 DLL codecs. You can watch VideoCD,
-SVCD, DVD, 3ivx, and even DivX movies too. The another big feature
-of mplayer is the wide range of supported output drivers. It works
-with X11, Xv, DGA, OpenGL, SVGAlib, fbdev, AAlib, DirectFB, but
-you can use GGI and SDL (and this way all their drivers) and some
-lowlevel card-specific drivers (for Matrox, 3Dfx, and Radeon) too!
-Most of them support software or hardware scaling, so you can
-enjoy movies in fullscreen. It also sports nice big antialiased
-shaded subtitles (10 supported types) with european/ISO 8859-1,
-2 (hungarian, english, czech, etc), cyrillic, korean fonts, and
-OSD.
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
deleted file mode 100644
index dfe4bdb63d8..00000000000
--- a/multimedia/mplayer/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.22 2005/10/24 19:46:05 minskim Exp $
-
-PKGNAME=	mplayer-${MPLAYER_PKG_VERSION}
-PKGREVISION=	4
-
-COMMENT=	Software-only MPEG-1/2/4 video decoder
-
-.include "../../multimedia/mplayer-share/Makefile.common"
-
-CONFIGURE_ARGS+=	--disable-mencoder
-CONFIGURE_ARGS+=	--confdir=${PREFIX}/share/mplayer
-
-INSTALLATION_DIRS+=	bin
-
-.include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/mplayer ${PREFIX}/bin
-
-.include "../../multimedia/mplayer-share/Makefile.depends"
-
-.include "../../mk/bsd.pkg.mk"
-
-.include "../../multimedia/mplayer-share/Makefile.cflags"
diff --git a/multimedia/mplayer/PLIST b/multimedia/mplayer/PLIST
deleted file mode 100644
index b95a1b84944..00000000000
--- a/multimedia/mplayer/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/01/26 12:08:12 jmmv Exp $
-bin/mplayer
diff --git a/multimedia/mplex/DESCR b/multimedia/mplex/DESCR
deleted file mode 100644
index cb425039c23..00000000000
--- a/multimedia/mplex/DESCR
+++ /dev/null
@@ -1,17 +0,0 @@
-The mplex multiplexes MPEG audio and video streams into system layers.
-
-From INSTRUCT (in the mplex source):
->
-> Please note that I do not have a comprehensive instruction manual for this
-> release. I suggest you try the program out with some default values and
-> learn something more about ISO/IEC 11172-1 (aka MPEG1/Systems).
->
->
-> Christoph.
-> moar@heaven.zfe.siemens.de
-> +---------------------------------------+--------------------------------+
-> | http://www.informatik.tu-muenchen.de/ |                 Christoph Moar |
-> | cgi-bin/nph-gateway/hphalle6/~moar/   |                Kaulbachstr.29a |
-> | index.html                            |                   80539 Munich |
-> | email:moar@informatik.tu-muenchen.de  |   voice: ++49 - 89 -  23862874 |
-> +---------------------------------------+--------------------------------+
diff --git a/multimedia/mplex/Makefile b/multimedia/mplex/Makefile
deleted file mode 100644
index 9807cad0be1..00000000000
--- a/multimedia/mplex/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2005/06/17 03:50:23 jlam Exp $
-
-DISTNAME=	mjpegtools-1.6.2
-PKGNAME=	mplex-1.6.2
-PKGREVISION=	1
-CATEGORIES=	multimedia
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mjpeg/}
-
-MAINTAINER=	ben@NetBSD.org
-HOMEPAGE=	http://mjpeg.sourceforge.net/
-COMMENT=	Multiplexes MPEG component streams into system layers
-
-BUILD_DEPENDS+=	nasm>=0.98:../../devel/nasm
-
-GNU_CONFIGURE=	yes
-USE_TOOLS+=	gmake
-USE_LANGUAGES=	c c++
-USE_LIBTOOL=	yes
-
-INSTALLATION_DIRS=	bin lib
-
-do-build:
-	cd ${WRKSRC}/utils && ${GMAKE}
-	cd ${WRKSRC}/mplex && ${GMAKE}
-
-do-install:
-	cd ${WRKSRC}/mplex && \
-		${LIBTOOL} --mode=install ${INSTALL_DATA} libmplex2.la \
-			${PREFIX}/lib && \
-		${LIBTOOL} --mode=install ${INSTALL_PROGRAM} mplex ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mplex
-	for FILE in COPYING INSTRUCT README; do \
-	  ${INSTALL_DATA} ${WRKSRC}/mplex/$$FILE ${PREFIX}/share/doc/mplex; \
-	done
-
-.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/mplex/PLIST b/multimedia/mplex/PLIST
deleted file mode 100644
index 400e519a62b..00000000000
--- a/multimedia/mplex/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:46 jlam Exp $
-bin/mplex
-lib/libmplex2.la
-share/doc/mplex/COPYING
-share/doc/mplex/INSTRUCT
-share/doc/mplex/README
-@dirrm share/doc/mplex
diff --git a/multimedia/mplex/distinfo b/multimedia/mplex/distinfo
deleted file mode 100644
index f9ca27f9890..00000000000
--- a/multimedia/mplex/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 11:24:04 agc Exp $
-
-SHA1 (mjpegtools-1.6.2.tar.gz) = c69ce6cd8a37c133c92d677f21650ae541c86575
-RMD160 (mjpegtools-1.6.2.tar.gz) = 48d4e6fa037f18973bae7d22ac14412182361c23
-Size (mjpegtools-1.6.2.tar.gz) = 1256280 bytes
-SHA1 (patch-aa) = 6394ea0296e3b1e238c2fc51b77b6712c172bb1d
diff --git a/multimedia/mplex/patches/patch-aa b/multimedia/mplex/patches/patch-aa
deleted file mode 100644
index 6bc92899404..00000000000
--- a/multimedia/mplex/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2004/03/30 19:53:44 ben Exp $
-
---- mplex/Makefile.in.orig	Tue Feb  3 14:58:31 2004
-+++ mplex/Makefile.in
-@@ -276,6 +276,7 @@ mplex_SOURCES = main.cpp 
- 
- mplex_LDADD = \
- 	$(top_builddir)/mplex/libmplex2.la \
-+	$(top_builddir)/utils/libmjpegutils.a \
- 	@LIBGETOPT_LIB@ $(LIBM_LIBS) 
- 
- subdir = mplex
diff --git a/multimedia/ns-flash/DESCR b/multimedia/ns-flash/DESCR
deleted file mode 100644
index b8731dc730c..00000000000
--- a/multimedia/ns-flash/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Experience animation and entertainment on the web with Flash, the web
-standard for vector graphics and animation. View the best web content,
-including cartoons, games, and news from many leading-edge companies.
diff --git a/multimedia/ns-flash/Makefile b/multimedia/ns-flash/Makefile
deleted file mode 100644
index 7d681694096..00000000000
--- a/multimedia/ns-flash/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:42 tv Exp $
-
-CATEGORIES=		multimedia www
-MASTER_SITES=		http://fpdownload.macromedia.com/get/shockwave/flash/english/${DISTUNAME}/${FLASH_VERS}/
-
-MAINTAINER=		tech-pkg@NetBSD.org
-HOMEPAGE=		http://www.flash.com/
-COMMENT=		MacroMedia Flash Player Netscape plugin
-
-ONLY_FOR_PLATFORM=      *-*-i386 SunOS-*-sparc
-NOT_FOR_PLATFORM=	SunOS-*-i386
-
-WRKSRC=			${WRKDIR}/${WRKNAME}
-DIST_SUBDIR=		flash/${FLASH_VERS}
-WRKNAME=		install_flash_player_7_${DISTUNAME}
-
-.include "../../mk/bsd.prefs.mk"
-
-.if (${MACHINE_ARCH} == "i386")
-FLASH_VERS=		7.0r25
-DEPENDS+=		suse_compat>=6.3:../../emulators/${SUSE_DIR_PREFIX}_compat
-DEPENDS+=		suse_x11>=6.3:../../emulators/${SUSE_DIR_PREFIX}_x11
-DISTUNAME=		linux
-DISTNAME=		install_flash_player_7_${DISTUNAME}
-.elif ${MACHINE_ARCH} == "sparc" && ${OPSYS} == "SunOS"
-FLASH_VERS=		7.0r53
-DISTUNAME=		solaris
-DISTNAME=		flash_player_7_${DISTUNAME}_sparc_r53
-.else
-# Defaults so lintpkgsrc is happy
-FLASH_VERS=		5.0
-DISTNAME=		flash_player
-.endif
-PKGNAME=		ns-flash-${FLASH_VERS:S/r/./}
-
-# Must update communicator/navigator to at least 4.76nb1
-CONFLICTS+=		communicator<=4.76nb1
-CONFLICTS+=		navigator<=4.76nb1
-
-RESTRICTED=             "Redistribution not permitted"
-NO_SRC_ON_FTP=		${RESTRICTED}
-NO_SRC_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_FTP=		${RESTRICTED}
-NO_BIN_ON_CDROM=	${RESTRICTED}
-
-NO_CONFIGURE=		yes
-NO_BUILD=		yes
-CHECK_SHLIBS=		no
-CRYPTO=			yes
-
-NS_PLUGINS_DIR=		${PREFIX}/lib/netscape/plugins
-
-do-install:
-	${INSTALL_DATA_DIR} ${NS_PLUGINS_DIR}
-	${INSTALL_DATA} ${WRKSRC}/flashplayer.xpt ${NS_PLUGINS_DIR}
-	${INSTALL_DATA} ${WRKSRC}/libflashplayer.so ${NS_PLUGINS_DIR}
-
-.if ${OPSYS} != "SunOS"
-.include "../../emulators/suse_linux/Makefile.application"
-.endif
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/ns-flash/PLIST b/multimedia/ns-flash/PLIST
deleted file mode 100644
index 737b873bf7f..00000000000
--- a/multimedia/ns-flash/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/10/05 18:54:53 jdolecek Exp $
-lib/netscape/plugins/flashplayer.xpt
-lib/netscape/plugins/libflashplayer.so
-@unexec ${RMDIR} %D/lib/netscape/plugins 2>/dev/null || ${TRUE}
diff --git a/multimedia/ns-flash/distinfo b/multimedia/ns-flash/distinfo
deleted file mode 100644
index 97539569614..00000000000
--- a/multimedia/ns-flash/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 11:24:04 agc Exp $
-
-SHA1 (flash/7.0r25/install_flash_player_7_linux.tar.gz) = ae252d5b7b421d2f617f5b9ebb7acea210ecc37c
-RMD160 (flash/7.0r25/install_flash_player_7_linux.tar.gz) = 49010826264193fa44f12eb08fb130d51a1232f2
-Size (flash/7.0r25/install_flash_player_7_linux.tar.gz) = 987452 bytes
-SHA1 (flash/7.0r53/flash_player_7_solaris_sparc_r53.tar.gz) = c93a8109c6abb5647548112b177e32571955afb1
-Size (flash/7.0r53/flash_player_7_solaris_sparc_r53.tar.gz) = 1015384 bytes
diff --git a/multimedia/ogle/DESCR b/multimedia/ogle/DESCR
deleted file mode 100644
index 456137b1f26..00000000000
--- a/multimedia/ogle/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Ogle is a open source DVD player that supports DVD menus and navigation.
-You should be able to play DVDs directly from the device, a mounted fs, an
-image file or a copy on your harddrive.  There are keyboard commands for
-navigation in both player modes.
diff --git a/multimedia/ogle/MESSAGE.NetBSD b/multimedia/ogle/MESSAGE.NetBSD
deleted file mode 100644
index 77818243ed1..00000000000
--- a/multimedia/ogle/MESSAGE.NetBSD
+++ /dev/null
@@ -1,9 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.NetBSD,v 1.2 2005/03/15 15:47:18 wiz Exp $
-
-You may need to increase the value of SHMMAXPGS in your kernel
-configuration to use ${PKGBASE}, e.g.
-
-	options SHMMAXPGS=32768
-
-===========================================================================
diff --git a/multimedia/ogle/Makefile b/multimedia/ogle/Makefile
deleted file mode 100644
index a72f376763d..00000000000
--- a/multimedia/ogle/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# $NetBSD: Makefile,v 1.14 2005/06/01 18:03:06 jlam Exp $
-
-DISTNAME=	ogle-0.9.2
-PKGREVISION=	2
-CATEGORIES=	multimedia
-MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/
-
-MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://www.dtek.chalmers.se/groups/dvd/
-COMMENT=	DVD player with menus
-
-ONLY_FOR_PLATFORM=	NetBSD-1.5.[23]*-i386 NetBSD-1.5[Y-Z]*-i386
-ONLY_FOR_PLATFORM+=	NetBSD-1.6*-i386 NetBSD-[2-9]*-i386
-ONLY_FOR_PLATFORM+=	NetBSD-1.6[D-Z]*-powerpc
-ONLY_FOR_PLATFORM+=	NetBSD-[2-9]*-powerpc
-ONLY_FOR_PLATFORM+=	NetBSD-1.6Z*-alpha NetBSD-[2-9]*-alpha
-ONLY_FOR_PLATFORM+=	NetBSD-1.6Z*-sparc64 NetBSD-[2-9]*-sparc64
-ONLY_FOR_PLATFORM+=	NetBSD-*-x86_64
-ONLY_FOR_PLATFORM+=	Linux-*-*
-ONLY_FOR_PLATFORM+=	SunOS-*-*
-
-USE_TOOLS+=		gmake
-USE_LIBTOOL=		yes
-
-GNU_CONFIGURE=		yes
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
-#CONFIGURE_ARGS+=	--enable-obsdaudio
-#CONFIGURE_ARGS+=	--disable-sunaudio
-
-GCC_REQD+=		2.95.3
-
-MESSAGE_SUBST+=		PKGBASE=${PKGBASE}
-
-.include "../../audio/liba52/buildlink3.mk"
-.include "../../audio/libmad/buildlink3.mk"
-.include "../../devel/binutils/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../multimedia/libdvdread/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/ogle/PLIST b/multimedia/ogle/PLIST
deleted file mode 100644
index 4f9d24fec6d..00000000000
--- a/multimedia/ogle/PLIST
+++ /dev/null
@@ -1,33 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:46 jlam Exp $
-bin/ifo_dump
-bin/ogle
-include/ogle/dvd.h
-include/ogle/dvdbookmarks.h
-include/ogle/dvdcontrol.h
-include/ogle/dvdevents.h
-include/ogle/msgevents.h
-lib/ogle/libdvdcontrol.la
-lib/ogle/libmsgevents.la
-lib/ogle/ogle_ac3_p
-lib/ogle/ogle_audio
-lib/ogle/ogle_audio_debug
-lib/ogle/ogle_cli
-lib/ogle/ogle_cli_debug
-lib/ogle/ogle_ctrl
-lib/ogle/ogle_ctrl_debug
-lib/ogle/ogle_gui_debug
-lib/ogle/ogle_mpeg_ps
-lib/ogle/ogle_mpeg_ps_debug
-lib/ogle/ogle_mpeg_vs
-lib/ogle/ogle_mpeg_vs_debug
-lib/ogle/ogle_nav
-lib/ogle/ogle_nav_debug
-lib/ogle/ogle_vout
-lib/ogle/ogle_vout_debug
-man/man1/ogle.1
-man/man5/oglerc.5
-share/ogle/ogle_conf.dtd
-share/ogle/oglerc
-@dirrm share/ogle
-@dirrm include/ogle
-@dirrm lib/ogle
diff --git a/multimedia/ogle/buildlink3.mk b/multimedia/ogle/buildlink3.mk
deleted file mode 100644
index d5c367b843b..00000000000
--- a/multimedia/ogle/buildlink3.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:03 tv Exp $
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-OGLE_BUILDLINK3_MK:=	${OGLE_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	ogle
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nogle}
-BUILDLINK_PACKAGES+=	ogle
-
-.if !empty(OGLE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ogle+=	ogle>=0.9.2
-BUILDLINK_RECOMMENDED.ogle+=	ogle>=0.9.2nb2
-BUILDLINK_PKGSRCDIR.ogle?=	../../multimedia/ogle
-.endif	# OGLE_BUILDLINK3_MK
-
-.include "../../textproc/libxml2/buildlink3.mk"
-
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/ogle/distinfo b/multimedia/ogle/distinfo
deleted file mode 100644
index 813c1ee2b01..00000000000
--- a/multimedia/ogle/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 11:24:04 agc Exp $
-
-SHA1 (ogle-0.9.2.tar.gz) = bf44e835d04634b4e52fb50bab2a1b78e69391eb
-RMD160 (ogle-0.9.2.tar.gz) = 16055614b5a3b336aa42a96efc0456bf88f37129
-Size (ogle-0.9.2.tar.gz) = 488984 bytes
diff --git a/multimedia/ogle_gui/DESCR b/multimedia/ogle_gui/DESCR
deleted file mode 100644
index 1fe7b3833a3..00000000000
--- a/multimedia/ogle_gui/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-ogle_gui is the gtk based frontend for the ogle DVD player.
diff --git a/multimedia/ogle_gui/Makefile b/multimedia/ogle_gui/Makefile
deleted file mode 100644
index af373c535ad..00000000000
--- a/multimedia/ogle_gui/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2005/06/01 18:03:06 jlam Exp $
-
-DISTNAME=	ogle_gui-0.9.2
-PKGREVISION=	4
-CATEGORIES=	multimedia
-MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/
-
-MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://www.dtek.chalmers.se/groups/dvd/
-COMMENT=	GUI for the Ogle DVD player
-
-USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake
-USE_LIBTOOL=		yes
-
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--bindir=${PREFIX}/lib/ogle
-
-GCC_REQD+=		2.95.3
-
-.include "../../devel/binutils/buildlink3.mk"
-.include "../../devel/libglade/buildlink3.mk"
-.include "../../multimedia/ogle/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/ogle_gui/PLIST b/multimedia/ogle_gui/PLIST
deleted file mode 100644
index 3edad9b2ef1..00000000000
--- a/multimedia/ogle_gui/PLIST
+++ /dev/null
@@ -1,32 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2004/02/03 04:34:06 grant Exp $
-lib/ogle/ogle_gui
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/ogle_gui.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/ogle_gui.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/ogle_gui.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/ogle_gui.mo
-${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/ogle_gui.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/ogle_gui.mo
-share/ogle_gui/angle.xpm
-share/ogle_gui/enter.xpm
-share/ogle_gui/fastforward.xpm
-share/ogle_gui/go_up.xpm
-share/ogle_gui/menus.xpm
-share/ogle_gui/ogle.xpm
-share/ogle_gui/ogle_gui.glade
-share/ogle_gui/ogle_gui.glade2
-share/ogle_gui/rewind.xpm
-share/ogle_gui/skip_backwards.xpm
-share/ogle_gui/skip_forwards.xpm
-share/ogle_gui/stock_down_arrow.xpm
-share/ogle_gui/stock_first.xpm
-share/ogle_gui/stock_last.xpm
-share/ogle_gui/stock_left_arrow.xpm
-share/ogle_gui/stock_pause.xpm
-share/ogle_gui/stock_right_arrow.xpm
-share/ogle_gui/stock_stop.xpm
-share/ogle_gui/stock_timer.xpm
-share/ogle_gui/stock_timer_stopped.xpm
-share/ogle_gui/stock_up_arrow.xpm
-share/ogle_gui/stock_volume.xpm
-share/ogle_gui/subpicture.xpm
-@dirrm share/ogle_gui
diff --git a/multimedia/ogle_gui/distinfo b/multimedia/ogle_gui/distinfo
deleted file mode 100644
index e122dc585c0..00000000000
--- a/multimedia/ogle_gui/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 11:24:04 agc Exp $
-
-SHA1 (ogle_gui-0.9.2.tar.gz) = 0d73ec30852b9cd2a9714b5088f6ab6deecf097d
-RMD160 (ogle_gui-0.9.2.tar.gz) = a08906940019c0ced828a15b6c220b594a006a3f
-Size (ogle_gui-0.9.2.tar.gz) = 396673 bytes
-SHA1 (patch-aa) = 818777c5474f6a99fbaa732f77c632dad4e12a22
-SHA1 (patch-ab) = 05916e5699a6e43f70a27a0b048b95989c4a4c69
-SHA1 (patch-ac) = 2aa173ace19f55d56d9d996b74db2dd59e4e0ef2
diff --git a/multimedia/ogle_gui/patches/patch-aa b/multimedia/ogle_gui/patches/patch-aa
deleted file mode 100644
index 009eff42634..00000000000
--- a/multimedia/ogle_gui/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2004/02/03 04:34:06 grant Exp $
-
---- configure.orig	2003-11-05 23:02:32.000000000 +0100
-+++ configure
-@@ -11554,7 +11554,7 @@ _ACEOF
-       *)
- 
- cat >>confdefs.h <<_ACEOF
--#define LIBGLADE_LIB "libglade.so.0"
-+#define LIBGLADE_LIB "libglade.so"
- _ACEOF
- 
- 	;;
diff --git a/multimedia/ogle_gui/patches/patch-ab b/multimedia/ogle_gui/patches/patch-ab
deleted file mode 100644
index 2b10b900c28..00000000000
--- a/multimedia/ogle_gui/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2004/03/29 23:31:30 wiz Exp $
-
---- src/my_glade.c.orig	Wed Nov  5 20:06:51 2003
-+++ src/my_glade.c
-@@ -38,6 +38,10 @@ static void *my_dlsym(void *handle, char
-   new_symbol = g_strdup(symbol);
- #endif
- 
-+#ifdef __NetBSD__
-+  /* clear error -- workaround for PR 19024 on 1.6.x and earlier */
-+  error = dlerror();
-+#endif
-   fun = dlsym(handle, new_symbol);
-   error = dlerror();
-   if(error != NULL) {
diff --git a/multimedia/ogle_gui/patches/patch-ac b/multimedia/ogle_gui/patches/patch-ac
deleted file mode 100644
index 1466b121da8..00000000000
--- a/multimedia/ogle_gui/patches/patch-ac
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2004/02/03 04:34:06 grant Exp $
-
---- src/debug_print.h.orig	2003-11-05 20:06:50.000000000 +0100
-+++ src/debug_print.h
-@@ -5,20 +5,25 @@
- 
- #if defined(__GNUC__) && ( __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 95))
- 
--#define FATAL(str, args...) \
--fprintf(stderr, "FATAL[%s]: " str, program_name, ## args)
--
--#define ERROR(str, args...) \
--fprintf(stderr, "ERROR[%s]: " str, program_name, ## args)
--
--#define WARNING(str, ...) \
--fprintf(stderr, "WARNING[%s]: " str, program_name, ## args)
--
--#define NOTE(str, args...) \
--fprintf(stderr, "Note[%s]: " str, program_name, ## args)
--
--#define DNOTE(str, args...) \
--fprintf(stderr, "Debug[%s]: " str, program_name, ## args)
-+#define FATAL(str...) _FATAL( , ##str)
-+#define _FATAL(str, args...) \
-+fprintf(stderr, "FATAL[%s]: " str, program_name, ##args)
-+
-+#define ERROR(str...) _ERROR( , ##str)
-+#define _ERROR(str, args...) \
-+fprintf(stderr, "ERROR[%s]: " str, program_name, ##args)
-+
-+#define WARNING(str...) _WARNING( , ##str)
-+#define _WARNING(str, args...) \
-+fprintf(stderr, "WARNING[%s]: " str, program_name, ##args)
-+
-+#define NOTE(str...) _NOTE(, ##str)
-+#define _NOTE(str, args...) \
-+fprintf(stderr, "Note[%s]: " str, program_name, ##args)
-+
-+#define DNOTE(str...) _DNOTE( , ##str)
-+#define _DNOTE(str, args...) \
-+fprintf(stderr, "Debug[%s]: " str, program_name, ##args)
- 
- 
- #else /* __GNUC__ < 2 */
diff --git a/multimedia/ogmtools/DESCR b/multimedia/ogmtools/DESCR
deleted file mode 100644
index bc97d736d0d..00000000000
--- a/multimedia/ogmtools/DESCR
+++ /dev/null
@@ -1,16 +0,0 @@
-ogmtools are a set of utilities for Ogg Media files (OGM) manipulation,
-written by Moritz Bunkuns.
-
-Ogg is a container format that can contains much more than a simple
-Vorbis sound stream: notably, you can have a video stream, subtitles,
-etc.
-
-ogmtools are not meant to encode or decode anything, but will be used
-complementary to mplayer/mencoder or any other media encoding utility.
-ogmmerge will produce an OGM file from separated components, like an
-audio track and a video track, and ogmdemux will have the inverse
-behaviour.  ogmsplit will cut a file into several parts, and ogminfo
-will print information about the file.  The last tool, dvdxchap is
-used in combination with ogmmerge to add some special comments into
-the resulting OGM file to provide chaptering with the player that
-support it (the OggDS Windows filter takes advantage of that).
diff --git a/multimedia/ogmtools/Makefile b/multimedia/ogmtools/Makefile
deleted file mode 100644
index 95b035c3410..00000000000
--- a/multimedia/ogmtools/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:46:42 tv Exp $
-#
-
-DISTNAME=	ogmtools-1.5
-CATEGORIES=	multimedia
-MASTER_SITES=	http://www.bunkus.org/videotools/ogmtools/
-EXTRACT_SUFX=	.tar.bz2
-
-MAINTAINER=	cube@NetBSD.org
-HOMEPAGE=	http://www.bunkus.org/videotools/ogmtools/
-COMMENT=	Ogg Media files manipulation tools
-
-USE_LANGUAGES=	c c++
-GNU_CONFIGURE=	YES
-
-CONFIGURE_ARGS+=	--with-dvdread-includes=${BUILDLINK_DIR}
-
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../multimedia/libdvdread/buildlink3.mk"
-.include "../../multimedia/libogg/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/ogmtools/PLIST b/multimedia/ogmtools/PLIST
deleted file mode 100644
index 2512d12cea4..00000000000
--- a/multimedia/ogmtools/PLIST
+++ /dev/null
@@ -1,13 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/04/12 21:47:02 salo Exp $
-bin/dvdxchap
-bin/ogmcat
-bin/ogmdemux
-bin/ogminfo
-bin/ogmmerge
-bin/ogmsplit
-man/man1/dvdxchap.1
-man/man1/ogmcat.1
-man/man1/ogmdemux.1
-man/man1/ogminfo.1
-man/man1/ogmmerge.1
-man/man1/ogmsplit.1
diff --git a/multimedia/ogmtools/distinfo b/multimedia/ogmtools/distinfo
deleted file mode 100644
index 4057c843ecc..00000000000
--- a/multimedia/ogmtools/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 11:24:04 agc Exp $
-
-SHA1 (ogmtools-1.5.tar.bz2) = a23ba7e6ac490ffb60e8fb739e790b7a020a444c
-RMD160 (ogmtools-1.5.tar.bz2) = 58b917795fcc08904d6dfdcfb6be82d1cd8cb4ca
-Size (ogmtools-1.5.tar.bz2) = 214934 bytes
diff --git a/multimedia/openquicktime/DESCR b/multimedia/openquicktime/DESCR
deleted file mode 100644
index 67965439f6c..00000000000
--- a/multimedia/openquicktime/DESCR
+++ /dev/null
@@ -1,14 +0,0 @@
-  OpenQuicktime aims to be a portable library for handling Apple's
-QuickTime(TM) popular media files on Unix-like environments.  Its aim is
-to provide encoding, authoring and editing support as well as video
-playback.
-
-  This library is based on an enhanced version of the Quicktime 4 Linux
-library.  It features decoding and encoding QuickTime files, support for
-standard audio and video codecs (including MP3 audio) and a plug-in support
-so that non-open source codecs can be used with OpenQuicktime.
-
-  OpenQuicktime could be used by any Unix players or encoders wanting to
-support the Quicktime format.  OpenQuicktime is still young but is already
-used by some applications.  The most promising application using
-OpenQuicktime is GStreamer.
diff --git a/multimedia/openquicktime/Makefile b/multimedia/openquicktime/Makefile
deleted file mode 100644
index 6d8fc19f78d..00000000000
--- a/multimedia/openquicktime/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2005/08/10 20:56:20 jlam Exp $
-#
-
-DISTNAME=		${PKGNAME_NOREV}-src
-PKGNAME=		openquicktime-1.0
-PKGREVISION=		3
-CATEGORIES=		multimedia
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=openquicktime/}
-EXTRACT_SUFX=		.tgz
-
-MAINTAINER=		tech-pkg@NetBSD.org
-HOMEPAGE=		http://www.openquicktime.org/
-COMMENT=		Portable library for handling QuickTime(TM) media files
-
-USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake pkg-config
-GNU_CONFIGURE=		yes
-
-CONFIGURE_ENV+=		my_cv_comment=""
-
-pre-configure:
-	${ECHO} '#!${SH}' > ${BUILDLINK_DIR}/bin/glib-config-2.0
-	${ECHO} '${PREFIX}/bin/pkg-config glib-2.0 "$$@"'		\
-		>> ${BUILDLINK_DIR}/bin/glib-config-2.0
-	${CHMOD} +x ${BUILDLINK_DIR}/bin/glib-config-2.0
-
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/openquicktime/PLIST b/multimedia/openquicktime/PLIST
deleted file mode 100644
index 217fb287717..00000000000
--- a/multimedia/openquicktime/PLIST
+++ /dev/null
@@ -1,16 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/03/06 11:09:44 jmmv Exp $
-bin/dechunk
-bin/make_streamable
-bin/qtdump
-bin/qtinfo
-bin/recover
-include/openquicktime/codecs.h
-include/openquicktime/colormodels.h
-include/openquicktime/config.h
-include/openquicktime/openquicktime.h
-include/openquicktime/private.h
-lib/libopenquicktime.so
-lib/quicktime_codec_.mp3.so
-lib/quicktime_codec_jpeg.so
-lib/quicktime_codec_ms.so
-@dirrm include/openquicktime
diff --git a/multimedia/openquicktime/buildlink3.mk b/multimedia/openquicktime/buildlink3.mk
deleted file mode 100644
index 977f9fc35f8..00000000000
--- a/multimedia/openquicktime/buildlink3.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:13 jlam Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-OPENQUICKTIME_BUILDLINK3_MK:=	${OPENQUICKTIME_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	openquicktime
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nopenquicktime}
-BUILDLINK_PACKAGES+=	openquicktime
-
-.if !empty(OPENQUICKTIME_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.openquicktime+=	openquicktime>=1.0nb2
-BUILDLINK_PKGSRCDIR.openquicktime?=	../../multimedia/openquicktime
-.endif	# OPENQUICKTIME_BUILDLINK3_MK
-
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
-
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/openquicktime/distinfo b/multimedia/openquicktime/distinfo
deleted file mode 100644
index c46306ec27d..00000000000
--- a/multimedia/openquicktime/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 11:24:04 agc Exp $
-
-SHA1 (openquicktime-1.0-src.tgz) = 1304ac28acb953351780dd3626fdb6a73f23c97f
-RMD160 (openquicktime-1.0-src.tgz) = 53c36cf87e48855460106cec8442ad004681be5c
-Size (openquicktime-1.0-src.tgz) = 320144 bytes
diff --git a/multimedia/p5-xmltv/DESCR b/multimedia/p5-xmltv/DESCR
deleted file mode 100644
index d2b1a4328f9..00000000000
--- a/multimedia/p5-xmltv/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-XMLTV is a set of utilities to manage your TV viewing. They work
-with TV listings stored in the XMLTV format, which is based on XML.
-The idea is to separate out the backend (getting the listings) from
-the frontend (displaying them for the user), and to implement useful
-operations like picking out your favourite programmes as filters
-that read and write XML documents.
diff --git a/multimedia/p5-xmltv/Makefile b/multimedia/p5-xmltv/Makefile
deleted file mode 100644
index 149203161ed..00000000000
--- a/multimedia/p5-xmltv/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-# $NetBSD: Makefile,v 1.13 2005/08/06 06:19:24 jlam Exp $
-
-DISTNAME=	xmltv-0.5.40
-PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	1
-CATEGORIES=	multimedia perl5
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xmltv/}
-EXTRACT_SUFX=	.tar.bz2
-
-MAINTAINER=	adrianp@NetBSD.org
-HOMEPAGE=	http://membled.com/work/apps/xmltv/
-COMMENT=	Set of utilities to manage your TV viewing
-
-# needed
-DEPENDS+=	p5-XML-Parser>=2.34:../../textproc/p5-XML-Parser
-DEPENDS+=	p5-XML-Twig>=3.10:../../textproc/p5-XML-Twig
-DEPENDS+=	p5-Date-Manip>=5.42a:../../devel/p5-Date-Manip
-DEPENDS+=	p5-XML-Writer>=0.4.6:../../textproc/p5-XML-Writer
-DEPENDS+=	p5-Memoize-[0-9]*:../../devel/p5-Memoize
-DEPENDS+=	p5-Storable>=2.04:../../devel/p5-Storable
-# recommended
-DEPENDS+=	p5-Lingua-EN-Numbers-Ordinate-[0-9]*:../../textproc/p5-Lingua-EN-Numbers-Ordinate
-DEPENDS+=	p5-Lingua-Preferred>=0.2.4:../../textproc/p5-Lingua-Preferred
-DEPENDS+=	p5-Term-ProgressBar>=2.03:../../devel/p5-Term-ProgressBar
-DEPENDS+=	p5-Unicode-String-[0-9]*:../../converters/p5-Unicode-String
-# needed by se, uk grabbers
-DEPENDS+=	p5-IO-stringy-[0-9]*:../../devel/p5-IO-stringy
-# needed by uk grabber
-DEPENDS+=	p5-Archive-Zip-[0-9]*:../../archivers/p5-Archive-Zip
-# needed by us grabbers
-DEPENDS+=	p5-SOAP-Lite-[0-9]*:../../net/p5-SOAP-Lite
-DEPENDS+=	p5-Term-ReadKey-[0-9]*:../../devel/p5-Term-ReadKey
-DEPENDS+=	p5-HTML-TableExtract-[0-9]*:../../www/p5-HTML-TableExtract
-DEPENDS+=	p5-WWW-Mechanize>=1.02:../../www/p5-WWW-Mechanize
-# needed by de, dk, es, fi, fr, huro, jp, nl, pt grabbers
-DEPENDS+=	p5-HTML-Tree-[0-9]*:../../www/p5-HTML-Tree
-# needed by jp grabber
-DEPENDS+=	p5-Text-Kakasi-[0-9]*:../../textproc/p5-Text-Kakasi
-# needed by se grabber
-DEPENDS+=	p5-XML-LibXML-[0-9]*:../../textproc/p5-XML-LibXML
-DEPENDS+=	p5-Compress-Zlib-[0-9]*:../../devel/p5-Compress-Zlib
-DEPENDS+=	p5-HTTP-Cache-Transparent-[0-9]*:../../www/p5-HTTP-Cache-Transparent
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
-PERL5_PACKLIST=	auto/XMLTV/.packlist
-
-MAKE_PARAMS+=	PREFIX=${PREFIX:Q}
-PLIST_SUBST+=	DISTNAME=${DISTNAME}
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/p5-xmltv/PLIST b/multimedia/p5-xmltv/PLIST
deleted file mode 100644
index 158921cd965..00000000000
--- a/multimedia/p5-xmltv/PLIST
+++ /dev/null
@@ -1,18 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2005/06/24 21:14:36 wiz Exp $
-share/doc/${DISTNAME}/COPYING
-share/doc/${DISTNAME}/QuickStart
-share/doc/${DISTNAME}/README
-share/doc/${DISTNAME}/README.win32
-share/xmltv/tv_grab_be/channel_ids_fr
-share/xmltv/tv_grab_be/channel_ids_nl
-share/xmltv/tv_grab_de_tvtoday/channel_ids
-share/xmltv/tv_grab_it/channel_ids
-share/xmltv/tv_grab_uk_bleb/icon_urls
-share/xmltv/tv_grab_uk_rt/channel_ids
-@dirrm share/doc/${DISTNAME}
-@dirrm share/xmltv/tv_grab_de_tvtoday
-@dirrm share/xmltv/tv_grab_uk_bleb
-@dirrm share/xmltv/tv_grab_uk_rt
-@dirrm share/xmltv/tv_grab_it
-@dirrm share/xmltv/tv_grab_be
-@dirrm share/xmltv
diff --git a/multimedia/p5-xmltv/distinfo b/multimedia/p5-xmltv/distinfo
deleted file mode 100644
index 56fc03cb4e5..00000000000
--- a/multimedia/p5-xmltv/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.6 2005/06/24 21:14:36 wiz Exp $
-
-SHA1 (xmltv-0.5.40.tar.bz2) = 877cae16a0a096c4544301790d25deb85e2b39e5
-RMD160 (xmltv-0.5.40.tar.bz2) = 8aa142f3e2695f42ee0aec84d3486ad669e2e33b
-Size (xmltv-0.5.40.tar.bz2) = 441187 bytes
-SHA1 (patch-aa) = b198091168841e5f770ca332772b7351b44bef0b
diff --git a/multimedia/p5-xmltv/patches/patch-aa b/multimedia/p5-xmltv/patches/patch-aa
deleted file mode 100644
index 3b1d964807f..00000000000
--- a/multimedia/p5-xmltv/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/10/20 18:56:28 adrianp Exp $
-
---- Makefile.PL.orig	2004-09-27 22:10:51.000000000 +0100
-+++ Makefile.PL	2004-10-20 19:42:34.000000000 +0100
-@@ -473,7 +473,7 @@
- 		      "\n");
-     }
-     print STDERR "\n";
--    if (not ask(0, 'Do you want to proceed with this configuration?', 1)) {
-+    if (1 == 0) {
- 	# Need to set {install} for each component by prompting.
- 	foreach my $info (@opt_components) {
- 	    my $missing = $info->{missing};
diff --git a/multimedia/php-ming/DESCR b/multimedia/php-ming/DESCR
deleted file mode 100644
index 799c6fb0060..00000000000
--- a/multimedia/php-ming/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-PHP extension for ming library; see multimedia/ming for details.
diff --git a/multimedia/php-ming/Makefile b/multimedia/php-ming/Makefile
deleted file mode 100644
index e69518b9ca7..00000000000
--- a/multimedia/php-ming/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/11/04 04:53:16 minskim Exp $
-
-MODNAME=		ming
-CATEGORIES+=		multimedia
-
-MAINTAINER=		obata@lins.jp
-COMMENT=		PHP extension for Ming library
-
-CONFIGURE_ARGS+=	--with-${MODNAME}=${BUILDLINK_PREFIX.ming}
-
-.include "../../lang/php/ext.mk"
-.include "../../multimedia/ming/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/py-ming/DESCR b/multimedia/py-ming/DESCR
deleted file mode 100644
index 6d6d2325134..00000000000
--- a/multimedia/py-ming/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Python bindings for ming library; see multimedia/ming for details.
diff --git a/multimedia/py-ming/Makefile b/multimedia/py-ming/Makefile
deleted file mode 100644
index a4c8ed24bb4..00000000000
--- a/multimedia/py-ming/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/11/04 04:29:14 minskim Exp $
-#
-
-DISTNAME=		${MING_DISTNAME}
-PKGNAME=		${PYPKGPREFIX}-${MING_PKGNAME}
-CATEGORIES=		multimedia
-MASTER_SITES=		${MING_MASTER_SITES}
-EXTRACT_SUFX=		${MING_EXTRACT_SUFX}
-
-MAINTAINER=		tech-pkg@NetBSD.org
-HOMEPAGE=		http://ming.sourceforge.net/
-COMMENT=		Python bindings for Ming library
-
-PY_PATCHPLIST=		yes
-PYBINMODULE=		yes
-
-BUILD_TARGET=		mingcmodule.so
-BUILD_DIRS=		${WRKSRC}/py_ext
-
-MAKE_ENV+=		PYSITELIB=${PYSITELIB}
-
-PYCOMPILEALL=	${BUILDLINK_PREFIX.${PYPACKAGE}}/${PYLIB}/compileall.py
-
-.include "../../multimedia/ming/buildlink3.mk"
-.include "../../multimedia/ming/Makefile.common"
-.include "../../lang/python/extension.mk"
-
-post-build:
-	${PYTHONBIN} ${PYCOMPILEALL} ${WRKSRC}/py_ext
-
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/py_ext/ming.pyc ${PREFIX}/${PYSITELIB}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/py-ming/PLIST b/multimedia/py-ming/PLIST
deleted file mode 100644
index ca26c984e15..00000000000
--- a/multimedia/py-ming/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/11/04 04:29:14 minskim Exp $
-${PYSITELIB}/ming.py
-${PYSITELIB}/ming.pyc
-${PYSITELIB}/mingcmodule.so
diff --git a/multimedia/realplayer-codecs/DESCR b/multimedia/realplayer-codecs/DESCR
deleted file mode 100644
index 22a821ad60e..00000000000
--- a/multimedia/realplayer-codecs/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-RealPlayer8 Codecs for use by MPlayer, without having to install RealPlayer8
-itself.  This contains several Real codecs (all the ones MPlayer supports.)
-
-This package supports i386, powerpc and alpha platforms.
diff --git a/multimedia/realplayer-codecs/MESSAGE.common b/multimedia/realplayer-codecs/MESSAGE.common
deleted file mode 100644
index 150c12161ee..00000000000
--- a/multimedia/realplayer-codecs/MESSAGE.common
+++ /dev/null
@@ -1,7 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.common,v 1.1.1.1 2004/01/26 12:04:15 jmmv Exp $
-
-For all systems, to use the "sipr" codec, a "libm.so.6" is required.  It is
-not yet known if the libm on your system will suit this functionality or
-not.
-===========================================================================
diff --git a/multimedia/realplayer-codecs/MESSAGE.powerpc b/multimedia/realplayer-codecs/MESSAGE.powerpc
deleted file mode 100644
index 2c0759828af..00000000000
--- a/multimedia/realplayer-codecs/MESSAGE.powerpc
+++ /dev/null
@@ -1,16 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.powerpc,v 1.1.1.1 2004/01/26 12:04:15 jmmv Exp $
-
-This package requires a special hack to run on PowerPC systems, and to
-enable one codec on all systems.
-
-For PowerPC, these shared libraries are linked agained glibc6, the need a
-"libc.so.6" file.  Fortunately, only a few simple functions (malloc, free,
-memset, memcpy) are needed and these work from the NetBSD libc and could
-work on other systems as well.  As root, you need to run this command to
-complete this installation (this *is* ugly, but for now it is our best
-solution):
-
-	# cd /usr/lib
-	# ln -s libc.so libc.so.6
-===========================================================================
diff --git a/multimedia/realplayer-codecs/Makefile b/multimedia/realplayer-codecs/Makefile
deleted file mode 100644
index 710e4e40d71..00000000000
--- a/multimedia/realplayer-codecs/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2005/10/02 15:35:33 recht Exp $
-#
-
-DISTNAME=	rp8codecs${RP_ARCH}-20050115
-PKGNAME=	realplayer-codecs-8.20050115
-CATEGORIES=	multimedia
-MASTER_SITES=	http://www4.mplayerhq.hu/MPlayer/releases/codecs/ \
-		http://ftp5.mplayerhq.hu/mplayer/releases/codecs/ \
-		ftp://ftp2.mplayerhq.hu/MPlayer/releases/codecs/ \
-		ftp://ftp5.mplayerhq.hu/mplayer/releases/codecs/ \
-		http://www1.mplayerhq.hu/MPlayer/releases/codecs/ \
-		http://www2.mplayerhq.hu/MPlayer/releases/codecs/
-EXTRACT_SUFX=	.tar.bz2
-# for easier 'make mdi'
-#DISTFILES=	rp8codecs-20040626.tar.bz2 rp8codecs-ppc-20050115.tar.bz2 rp8codecs-alpha-20050115.tar.bz2
-
-MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://mplayerhq.hu/MPlayer/releases/codecs/
-COMMENT=	RealPlayer 8 shared libraries, primarily for use with MPlayer
-
-ONLY_FOR_PLATFORM=	*-*-i386 *-*-powerpc *-*-alpha
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${MACHINE_ARCH} == "i386"
-RP_ARCH=
-# The distfile has not been updated.
-DISTFILES=	rp8codecs-20040626.tar.bz2
-WRKSRC=		${WRKDIR}/rp8codecs-20040626
-.elif ${MACHINE_ARCH} == "powerpc"
-RP_ARCH=	-ppc
-.elif ${MACHINE_ARCH} == "alpha"
-RP_ARCH=	-alpha
-.endif
-
-NO_BUILD=	YES
-
-RESTRICTED=	"Unsure of codec's license"
-NO_BIN_ON_CDROM=${RESTRICTED}
-NO_BIN_ON_FTP=	${RESTRICTED}
-NO_SRC_ON_CDROM=${RESTRICTED}
-NO_SRC_ON_FTP=	${RESTRICTED}
-
-do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/RealPlayer8-Codecs
-	${INSTALL_DATA} ${WRKSRC}/*.so.*.* ${PREFIX}/lib/RealPlayer8-Codecs
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/realplayer-codecs/PLIST b/multimedia/realplayer-codecs/PLIST
deleted file mode 100644
index b12a73d2305..00000000000
--- a/multimedia/realplayer-codecs/PLIST
+++ /dev/null
@@ -1,13 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/01/26 12:04:15 jmmv Exp $
-lib/RealPlayer8-Codecs/14_4.so.6.0
-lib/RealPlayer8-Codecs/28_8.so.6.0
-lib/RealPlayer8-Codecs/atrc.so.6.0
-lib/RealPlayer8-Codecs/cook.so.6.0
-lib/RealPlayer8-Codecs/ddnt.so.6.0
-lib/RealPlayer8-Codecs/dnet.so.6.0
-lib/RealPlayer8-Codecs/drv2.so.6.0
-lib/RealPlayer8-Codecs/drv3.so.6.0
-lib/RealPlayer8-Codecs/dspr.so.6.0
-lib/RealPlayer8-Codecs/sipr.so.6.0
-lib/RealPlayer8-Codecs/tokr.so.6.0
-@dirrm lib/RealPlayer8-Codecs
diff --git a/multimedia/realplayer-codecs/distinfo b/multimedia/realplayer-codecs/distinfo
deleted file mode 100644
index 806ea53f1e7..00000000000
--- a/multimedia/realplayer-codecs/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/03/17 13:55:42 wiz Exp $
-
-SHA1 (rp8codecs-20040626.tar.bz2) = 5fe332e68d482b1cea8e52fee3491cab429fbe39
-RMD160 (rp8codecs-20040626.tar.bz2) = 15c809755e950055d44d419cc912203deb8b4dc2
-Size (rp8codecs-20040626.tar.bz2) = 388962 bytes
-SHA1 (rp8codecs-ppc-20050115.tar.bz2) = 12ce04765bdf96e6ad386de1ef637b471d947796
-RMD160 (rp8codecs-ppc-20050115.tar.bz2) = 8d3feedca9ef50a25c5b7560dd5bca9184c1dd01
-Size (rp8codecs-ppc-20050115.tar.bz2) = 537143 bytes
-SHA1 (rp8codecs-alpha-20050115.tar.bz2) = a2f465095ae726669035641e0cf351f35f1b9273
-RMD160 (rp8codecs-alpha-20050115.tar.bz2) = 48875d54318817c398fdaf0d69631446237dc523
-Size (rp8codecs-alpha-20050115.tar.bz2) = 532935 bytes
diff --git a/multimedia/regionset/DESCR b/multimedia/regionset/DESCR
deleted file mode 100644
index 7d0898c42dc..00000000000
--- a/multimedia/regionset/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-regionset allows for DVD drives to have their firmware region
-setting read and changed, provided the limited number of
-permitted user changes has not been exhausted.
diff --git a/multimedia/regionset/Makefile b/multimedia/regionset/Makefile
deleted file mode 100644
index 90bd46583a6..00000000000
--- a/multimedia/regionset/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2005/04/21 14:44:24 minskim Exp $
-#
-
-DISTNAME=		regionset-0.1
-CATEGORIES=		multimedia
-MASTER_SITES=		http://linvdr.org/download/regionset/
-
-MAINTAINER=		rumble@NetBSD.org
-HOMEPAGE=		http://linvdr.org/download/regionset/
-COMMENT=		Read and modify DVD drive region code
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
-ONLY_FOR_PLATFORM+=	NetBSD-*-* OpenBSD-*-* Linux-*-*
-
-INSTALLATION_DIRS=	bin
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/regionset ${PREFIX}/bin
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/regionset/PLIST b/multimedia/regionset/PLIST
deleted file mode 100644
index c3ec5a83efc..00000000000
--- a/multimedia/regionset/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/04/16 06:51:26 rumble Exp $
-bin/regionset
diff --git a/multimedia/regionset/distinfo b/multimedia/regionset/distinfo
deleted file mode 100644
index ff850ad7731..00000000000
--- a/multimedia/regionset/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/06/19 10:42:27 hira Exp $
-
-SHA1 (regionset-0.1.tar.gz) = c60b973f44288264234d07be1fb418b6e7bf61a5
-RMD160 (regionset-0.1.tar.gz) = 2061fae73b8b948135a91b33eaacd77590507306
-Size (regionset-0.1.tar.gz) = 17095 bytes
-SHA1 (patch-aa) = 4a7085cc9bf693a93e871914346bcc4c959e606c
-SHA1 (patch-ab) = edbe06718024e855e41d8aea54c268c89450a222
diff --git a/multimedia/regionset/patches/patch-aa b/multimedia/regionset/patches/patch-aa
deleted file mode 100644
index 6ec80fae3f6..00000000000
--- a/multimedia/regionset/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2005/06/19 10:42:27 hira Exp $
-
---- dvd_udf.c.old	2003-10-30 07:30:33.000000000 -0500
-+++ dvd_udf.c	2005-04-16 02:21:37.000000000 -0400
-@@ -37,7 +37,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- 
--#if defined(__OpenBSD__)
-+#if defined(__NetBSD__) || defined(__OpenBSD__)
- # include <sys/dvdio.h>
- #elif defined(__linux__)
- # include <linux/cdrom.h>
diff --git a/multimedia/regionset/patches/patch-ab b/multimedia/regionset/patches/patch-ab
deleted file mode 100644
index cf5ea7e0662..00000000000
--- a/multimedia/regionset/patches/patch-ab
+++ /dev/null
@@ -1,57 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2005/06/19 10:42:27 hira Exp $
-
---- regionset.c.old	2003-10-30 07:32:34.000000000 -0500
-+++ regionset.c	2005-04-16 02:42:40.000000000 -0400
-@@ -27,7 +27,11 @@
- #include <stdio.h>
- #include "dvd_udf.h"
- 
-+#if defined(__NetBSD__) || defined(__OpenBSD__)
-+#define DEFAULTDEVICE "/dev/cd0a"
-+#else /* linux */
- #define DEFAULTDEVICE "/dev/dvd"
-+#endif
- #define VERSION "0.1"
- 
- int main (int argc, char* argv[]) 
-@@ -39,8 +43,9 @@
- 	if (argc>1) err=UDFOpenDisc(argv[1]);
- 	else err=UDFOpenDisc(DEFAULTDEVICE);
- 	if (err<0) {
--		printf("ERROR: Could not open disc \"%s\"!\n",((argc>=1)?argv[1]:DEFAULTDEVICE));
-+		printf("ERROR: Could not open disc \"%s\"!\n",((argc>=2)?argv[1]:DEFAULTDEVICE));
-                 printf("Ensure that there is any readable CD or DVD in the drive.\n");
-+		printf("usage: regionset [dvd-device-node]\n");
- 		return 1;
- 	}
- 	if (UDFRPCGet(&type,&vra,&ucca,&region_mask,&rpc_scheme)) {
-@@ -60,6 +65,20 @@
- 	printf("Would you like to change the region setting of your drive? [y/n]:");
- 	fgets(ch,3,stdin);
- 	if ((ch[0]=='y') || (ch[0]=='Y')) {
-+		printf("Choices include (not complete list):\n");
-+		printf(" 0: Regionless DVDs only\n");
-+		printf(" 1: USA, Canada, US Territories\n");
-+		printf(" 2: W. Europe, Greenland, S. Africa, Lesotho, "
-+		    "Swaziland, Japan, Egypt, Mid-East\n");
-+		printf(" 3: Southeast Asia, South Korea, Hong Kong, Macau, "
-+		    "Taiwan\n");
-+		printf(" 4: Australia, New Zealand, Oceania, Mexico, Central "
-+		    "America\n");
-+		printf(" 5: Russia (& former Soviet Union), E. Europe, Indian "
-+		    "subcontinent, Mongolia\n    N. Korea, rest of Africa\n");
-+		printf(" 6: People's Republic of China\n");
-+		printf(" 7: reserved\n");
-+		printf(" 8: International Venues\n");
- 		printf("Enter the new region number for your drive [1..8]:");
- 		fgets(ch,3,stdin);
- 		if ((ch[0]<'0') || (ch[0]>'8')) {
-@@ -72,7 +91,7 @@
- 			printf("Identical region code already set, aborting!\n");
- 			goto ERROR;
- 		}
--		printf("New mask: 0x%02X, correct? [y/n]:",i);
-+		printf("New mask: 0x%02X, correct? [y/n]:",i & 0xff);
- 		fgets(ch,3,stdin);
- 		if ((ch[0]=='y') || (ch[0]=='Y')) {
- 			if (UDFRPCSet(i)) {
diff --git a/multimedia/ruby-ming/DESCR b/multimedia/ruby-ming/DESCR
deleted file mode 100644
index 26ab76c3970..00000000000
--- a/multimedia/ruby-ming/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-Ming/Ruby is an extension library which wraps Ming, a C library for
-generating SWF format movie (a.k.a. "Macromedia Flash").
diff --git a/multimedia/ruby-ming/Makefile b/multimedia/ruby-ming/Makefile
deleted file mode 100644
index 43237f56f54..00000000000
--- a/multimedia/ruby-ming/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/11/04 04:35:42 minskim Exp $
-
-DISTNAME=	ming-ruby-${VER}
-PKGNAME=	${RUBY_PKGPREFIX}-ming-${VER}
-CATEGORIES=	multimedia
-MASTER_SITES=	http://madscientist.jp/~ikegami/sources/
-
-MAINTAINER=	rasputnik@hellooperator.net
-HOMEPAGE=	http://madscientist.jp/~ikegami/ruby/ming/
-COMMENT=	Ruby extension to drive the Ming SWF library
-
-USE_RUBY_SETUP=	yes
-VER=		0.1.6
-
-EXAMPLES=		README action.rb button.rb drag.rb \
-			gradient.rb gradientxform.rb keypress.rb \
-			mousetrack.rb newbutton.rb shape.rb sparks.rb \
-			sprite.rb
-REPLACE_RUBY_DIRS=	${WRKSRC}/examples
-
-post-install:
-		${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/ming
-.for f in ${EXAMPLES}
-		${INSTALL_DATA} ${WRKSRC}/examples/${f} ${RUBY_EXAMPLESDIR}/ming
-.endfor
-
-.include "../../multimedia/ming/buildlink3.mk"
-.include "../../lang/ruby/modules.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/ruby-ming/PLIST b/multimedia/ruby-ming/PLIST
deleted file mode 100644
index 69f175edb22..00000000000
--- a/multimedia/ruby-ming/PLIST
+++ /dev/null
@@ -1,16 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/11/04 04:35:42 minskim Exp $
-${RUBY_SITEARCHLIBDIR}/ming/ming.${RUBY_DLEXT}
-@dirrm ${RUBY_SITEARCHLIBDIR}/ming
-${RUBY_EXAMPLESDIR}/ming/README
-${RUBY_EXAMPLESDIR}/ming/action.rb
-${RUBY_EXAMPLESDIR}/ming/button.rb
-${RUBY_EXAMPLESDIR}/ming/drag.rb
-${RUBY_EXAMPLESDIR}/ming/gradient.rb
-${RUBY_EXAMPLESDIR}/ming/gradientxform.rb
-${RUBY_EXAMPLESDIR}/ming/keypress.rb
-${RUBY_EXAMPLESDIR}/ming/mousetrack.rb
-${RUBY_EXAMPLESDIR}/ming/newbutton.rb
-${RUBY_EXAMPLESDIR}/ming/shape.rb
-${RUBY_EXAMPLESDIR}/ming/sparks.rb
-${RUBY_EXAMPLESDIR}/ming/sprite.rb
-@dirrm ${RUBY_EXAMPLESDIR}/ming
diff --git a/multimedia/ruby-ming/distinfo b/multimedia/ruby-ming/distinfo
deleted file mode 100644
index a739e6d6b77..00000000000
--- a/multimedia/ruby-ming/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/11/04 04:35:42 minskim Exp $
-
-SHA1 (ruby/ming-ruby-0.1.6.tar.gz) = 6b0bbd536548e53dbd3d40c344b34f4a1a9f7cf8
-RMD160 (ruby/ming-ruby-0.1.6.tar.gz) = 751e4fb5a83ea1a772e3c4da0f040472caabe7a2
-Size (ruby/ming-ruby-0.1.6.tar.gz) = 42844 bytes
diff --git a/multimedia/smpeg-xmms/DESCR b/multimedia/smpeg-xmms/DESCR
deleted file mode 100644
index 9fe0266a56d..00000000000
--- a/multimedia/smpeg-xmms/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-MPEG video plugin for XMMS, using SDL/smpeg as backend. Supports hardware
-acceleration in XFree 4.x (if available), fullscreen, resizeable window,
-VCD support, aspected ratio when resizing the window, etc.
diff --git a/multimedia/smpeg-xmms/Makefile b/multimedia/smpeg-xmms/Makefile
deleted file mode 100644
index a2af77c4b06..00000000000
--- a/multimedia/smpeg-xmms/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:22 jlam Exp $
-#
-
-DISTNAME=	smpeg-xmms-0.3.5
-PKGREVISION=	5
-CATEGORIES=	multimedia
-MASTER_SITES=	ftp://ftp.xmms.org/xmms/plugins/smpeg-xmms/
-
-MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://www.xmms.org/
-COMMENT=	MPEG video plugin using SDL/smpeg as the backend
-
-GNU_CONFIGURE=		YES
-USE_TOOLS+=		gmake
-USE_LIBTOOL=		YES
-
-.include "../../multimedia/smpeg/buildlink3.mk"
-.include "../../devel/glib/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../audio/xmms/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/smpeg-xmms/PLIST b/multimedia/smpeg-xmms/PLIST
deleted file mode 100644
index d06adbcb047..00000000000
--- a/multimedia/smpeg-xmms/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:46 jlam Exp $
-lib/xmms/Input/libsmpeg_xmms.la
-@comment in xmms: @dirrm lib/xmms/Input
diff --git a/multimedia/smpeg-xmms/distinfo b/multimedia/smpeg-xmms/distinfo
deleted file mode 100644
index 8aa331b0e58..00000000000
--- a/multimedia/smpeg-xmms/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 11:24:04 agc Exp $
-
-SHA1 (smpeg-xmms-0.3.5.tar.gz) = e67a22cf99a9238be0652fe503b2fa37ae0c1379
-RMD160 (smpeg-xmms-0.3.5.tar.gz) = 038580713079090866b0c45cbdc857c4e2251adb
-Size (smpeg-xmms-0.3.5.tar.gz) = 141182 bytes
-SHA1 (patch-aa) = 506d41ca8e6b197526fc913c92a529046178cad3
diff --git a/multimedia/smpeg-xmms/patches/patch-aa b/multimedia/smpeg-xmms/patches/patch-aa
deleted file mode 100644
index 9b38232603f..00000000000
--- a/multimedia/smpeg-xmms/patches/patch-aa
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2004/06/26 18:10:20 grant Exp $
-
---- configure.orig	2004-03-11 21:16:37.000000000 -0800
-+++ configure	2004-03-11 21:17:54.000000000 -0800
-@@ -2701,16 +2701,16 @@ int main (int argc, char *argv[])
-     }
-   else
-     {
--      printf("\n*** 'smpeg-config --version' returned %d.%d.%d, but the 
--minimum version\n", $smpeg_major_version, $smpeg_minor_version, 
-+      printf("\n*** 'smpeg-config --version' returned %d.%d.%d, but the "
-+"minimum version\n", $smpeg_major_version, $smpeg_minor_version, 
- $smpeg_micro_version);
--      printf("*** of SMPEG required is %d.%d.%d. If smpeg-config is 
--correct, then it is\n", major, minor, micro);
-+      printf("*** of SMPEG required is %d.%d.%d. If smpeg-config is "
-+"correct, then it is\n", major, minor, micro);
-       printf("*** best to upgrade to the required version.\n");
--      printf("*** If smpeg-config was wrong, set the environment variable 
--SMPEG_CONFIG\n");
--      printf("*** to point to the correct copy of smpeg-config, and remove 
--the file\n");
-+      printf("*** If smpeg-config was wrong, set the environment variable "
-+"SMPEG_CONFIG\n");
-+      printf("*** to point to the correct copy of smpeg-config, and remove "
-+"the file\n");
-       printf("*** config.cache before re-running configure\n");
-       return 1;
-     }
diff --git a/multimedia/smpeg/DESCR b/multimedia/smpeg/DESCR
deleted file mode 100644
index 9ef2c6159be..00000000000
--- a/multimedia/smpeg/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-SMPEG is based on UC Berkeley's mpeg_play software MPEG decoder
-and SPLAY, an MPEG audio decoder created by Woo-jae Jung.  The
-current version is capable of playing back MPEG video and sound on
-Pentium II based systems.
diff --git a/multimedia/smpeg/Makefile b/multimedia/smpeg/Makefile
deleted file mode 100644
index 668947d55d4..00000000000
--- a/multimedia/smpeg/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2005/09/04 05:20:05 xtraeme Exp $
-#
-
-DISTNAME=	smpeg-0.4.4
-PKGREVISION=	10
-CATEGORIES=	devel multimedia
-MASTER_SITES=	ftp://sunsite.auc.dk/pub/os/linux/loki/open-source/smpeg/ \
-		ftp://ftp.linuxgames.com/loki/open-source/smpeg/
-
-MAINTAINER=	wulf@NetBSD.org
-HOMEPAGE=	http://www.lokigames.com/development/smpeg.php3
-COMMENT=	SDL MPEG Player Library
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
-USE_TOOLS+=	gmake
-GNU_CONFIGURE=	yes
-USE_LANGUAGES+=	c++
-USE_LIBTOOL=	yes
-
-CPPFLAGS+=	-Dunix=1
-
-# smpeg sources (glmovie.c & glmovie-tile.c) assume <malloc.h> exists.
-# Create a fake one for platforms that don't have it.
-#
-post-wrapper:
-	if ${TEST} ! -f /usr/include/malloc.h; then			\
-		${ECHO} "#include <stdlib.h>"				\
-			> ${BUILDLINK_DIR}/include/malloc.h;		\
-	fi
-
-.if ${MACHINE_ARCH} == "i386"
-CONFIGURE_ARGS+=	--enable-mmx
-.endif
-
-.include "options.mk"
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/smpeg/PLIST b/multimedia/smpeg/PLIST
deleted file mode 100644
index 588184d07a0..00000000000
--- a/multimedia/smpeg/PLIST
+++ /dev/null
@@ -1,21 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2005/09/04 05:20:05 xtraeme Exp $
-${OPENGL_PLAYER}bin/glmovie
-${GTK_PLAYER}bin/gtv
-bin/plaympeg
-bin/smpeg-config
-include/smpeg/MPEG.h
-include/smpeg/MPEGaction.h
-include/smpeg/MPEGaudio.h
-include/smpeg/MPEGerror.h
-include/smpeg/MPEGfilter.h
-include/smpeg/MPEGlist.h
-include/smpeg/MPEGring.h
-include/smpeg/MPEGstream.h
-include/smpeg/MPEGsystem.h
-include/smpeg/MPEGvideo.h
-include/smpeg/smpeg.h
-lib/libsmpeg.la
-${GTK_PLAYER}man/man1/gtv.1
-man/man1/plaympeg.1
-share/aclocal/smpeg.m4
-@dirrm include/smpeg
diff --git a/multimedia/smpeg/buildlink3.mk b/multimedia/smpeg/buildlink3.mk
deleted file mode 100644
index 2c4f2632ac0..00000000000
--- a/multimedia/smpeg/buildlink3.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/10/07 16:36:47 tv Exp $
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-SPMEG_BUILDLINK3_MK:=	${SPMEG_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	smpeg
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsmpeg}
-BUILDLINK_PACKAGES+=	smpeg
-
-.if !empty(SPMEG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.smpeg+=	smpeg>=0.4.4nb3
-BUILDLINK_RECOMMENDED.smpeg+=	smpeg>=0.4.4nb8
-BUILDLINK_PKGSRCDIR.smpeg?=	../../multimedia/smpeg
-.endif	# SMPEG_BUILDLINK3_MK
-
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/smpeg/distinfo b/multimedia/smpeg/distinfo
deleted file mode 100644
index a5bdf55f364..00000000000
--- a/multimedia/smpeg/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/09/04 05:20:05 xtraeme Exp $
-
-SHA1 (smpeg-0.4.4.tar.gz) = 6d7f4449472e6270ab435b2224f3fad951c35259
-RMD160 (smpeg-0.4.4.tar.gz) = d55249ad53417fa0df3d925aed0e83d2204e28b7
-Size (smpeg-0.4.4.tar.gz) = 315054 bytes
-SHA1 (patch-aa) = 0a691663e1966dbd5d37225b11b6f5f6d9ad0bf0
-SHA1 (patch-ab) = f0c168dc631149f14c92d2cd6cb5462af9869461
-SHA1 (patch-ac) = 60a8cd16216f4d2ec64b2727fa020d18dda7bec7
-SHA1 (patch-ad) = 021ffc5024723173c8a6cda04ae6f70add974faa
diff --git a/multimedia/smpeg/options.mk b/multimedia/smpeg/options.mk
deleted file mode 100644
index 0809af00571..00000000000
--- a/multimedia/smpeg/options.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: options.mk,v 1.2 2005/11/04 17:22:08 rillig Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.smpeg
-PKG_SUPPORTED_OPTIONS=	gtk-player opengl-player
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mgtk-player)
-PLIST_SUBST+=		GTK_PLAYER=
-CONFIGURE_ARGS+=	--enable-gtk-player
-.  include "../../x11/gtk/buildlink3.mk"
-.else
-PLIST_SUBST+=		GTK_PLAYER="@comment "
-CONFIGURE_ARGS+=	--disable-gtk-player --disable-gtk-test
-.endif
-
-.if !empty(PKG_OPTIONS:Mopengl-player)
-PLIST_SUBST+=		OPENGL_PLAYER=
-CONFIGURE_ARGS+=	--enable-opengl-player
-.  include "../../graphics/glu/buildlink3.mk"
-.else
-PLIST_SUBST+=		OPENGL_PLAYER="@comment "
-CONFIGURE_ARGS+=	--disable-opengl-player
-.endif
diff --git a/multimedia/smpeg/patches/patch-aa b/multimedia/smpeg/patches/patch-aa
deleted file mode 100644
index 697bd22594b..00000000000
--- a/multimedia/smpeg/patches/patch-aa
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2004/06/26 09:16:10 grant Exp $
-
---- plaympeg.c.orig	Tue Feb  4 15:59:22 2003
-+++ plaympeg.c	Tue Feb  4 15:59:48 2003
-@@ -492,6 +492,7 @@
-     int fd;
-     char buf[32];
-     int status;
-+    int (*audio_init)();
- 
-     /* Get the command line options */
-     use_audio = 1;
-@@ -600,7 +601,12 @@
- 	}
- 	
- 	if ( use_audio ) {
--	  if ((SDL_Init(SDL_INIT_AUDIO) < 0) || !SDL_AudioDriverName(buf, 1)) {
-+	  if ( use_video )
-+	    audio_init = SDL_InitSubSystem;
-+	  else
-+	    audio_init = SDL_Init;
-+
-+          if ((audio_init(SDL_INIT_AUDIO) < 0) || !SDL_AudioDriverName(buf, 1)) {
- 	    fprintf(stderr, "Warning: Couldn't init SDL audio: %s\n",
- 		    SDL_GetError());
- 	    fprintf(stderr, "Will ignore audio stream\n");
diff --git a/multimedia/smpeg/patches/patch-ab b/multimedia/smpeg/patches/patch-ab
deleted file mode 100644
index 7d5a0fd5c2e..00000000000
--- a/multimedia/smpeg/patches/patch-ab
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2005/09/04 05:20:05 xtraeme Exp $
-
---- Makefile.in.orig	2001-06-18 22:59:14.000000000 +0200
-+++ Makefile.in	2005-09-04 07:16:04.000000000 +0200
-@@ -120,7 +120,7 @@
- bin_PROGRAMS = plaympeg $(GTK_PLAYER) $(OPENGL_PLAYER)
- 
- # Sources for plaympeg
--man_MANS = plaympeg.1 gtv.1
-+man_MANS = plaympeg.1 @HAVE_GTK_TRUE@gtv.1
- plaympeg_SOURCES = plaympeg.c
- plaympeg_LDADD = libsmpeg.la
- 
-@@ -310,15 +310,15 @@
- 
- plaympeg: $(plaympeg_OBJECTS) $(plaympeg_DEPENDENCIES)
- 	@rm -f plaympeg
--	$(LINK) $(plaympeg_LDFLAGS) $(plaympeg_OBJECTS) $(plaympeg_LDADD) $(LIBS)
-+	$(CXXLINK) $(plaympeg_LDFLAGS) $(plaympeg_OBJECTS) $(plaympeg_LDADD) $(LIBS)
- 
- gtv: $(gtv_OBJECTS) $(gtv_DEPENDENCIES)
- 	@rm -f gtv
--	$(LINK) $(gtv_LDFLAGS) $(gtv_OBJECTS) $(gtv_LDADD) $(LIBS)
-+	$(CXXLINK) $(gtv_LDFLAGS) $(gtv_OBJECTS) $(gtv_LDADD) $(LIBS)
- 
- glmovie: $(glmovie_OBJECTS) $(glmovie_DEPENDENCIES)
- 	@rm -f glmovie
--	$(LINK) $(glmovie_LDFLAGS) $(glmovie_OBJECTS) $(glmovie_LDADD) $(LIBS)
-+	$(CXXLINK) $(glmovie_LDFLAGS) $(glmovie_OBJECTS) $(glmovie_LDADD) $(LIBS)
- 
- install-binSCRIPTS: $(bin_SCRIPTS)
- 	@$(NORMAL_INSTALL)
diff --git a/multimedia/smpeg/patches/patch-ac b/multimedia/smpeg/patches/patch-ac
deleted file mode 100644
index 7af7271bd57..00000000000
--- a/multimedia/smpeg/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2004/06/26 09:16:10 grant Exp $
-
---- video/video.h.orig	2004-03-01 02:14:39.000000000 +0100
-+++ video/video.h	2004-03-01 02:16:02.000000000 +0100
-@@ -413,7 +413,7 @@
- #define __SCO__ 1
- #endif
- 
--#if defined(__i386__) || defined(__VAX__) || defined(__MIPSEL__) || defined(__alpha__) || defined(__SCO__)
-+#if defined(__x86_64__) || defined(__i386__) || defined(__VAX__) || defined(__MIPSEL__) || defined(__alpha__) || defined(__SCO__)
- #undef  BIG_ENDIAN_ARCHITECTURE
- #define LITTLE_ENDIAN_ARCHITECTURE 1
- #endif
diff --git a/multimedia/smpeg/patches/patch-ad b/multimedia/smpeg/patches/patch-ad
deleted file mode 100644
index b617543a797..00000000000
--- a/multimedia/smpeg/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2005/04/27 11:06:39 wiz Exp $
-
---- smpeg.m4.orig	2001-04-04 22:28:14.000000000 +0200
-+++ smpeg.m4
-@@ -10,7 +10,7 @@ dnl AM_PATH_SMPEG([MINIMUM-VERSION, [ACT
- ACTION-IF-NOT-FOUND]]])
- dnl Test for SMPEG, and define SMPEG_CFLAGS and SMPEG_LIBS
- dnl
--AC_DEFUN(AM_PATH_SMPEG,
-+AC_DEFUN([AM_PATH_SMPEG],
- [dnl
- dnl Get the cflags and libraries from the smpeg-config script
- dnl
diff --git a/multimedia/swfdec-gtk2/DESCR b/multimedia/swfdec-gtk2/DESCR
deleted file mode 100644
index 8ca0443a1ac..00000000000
--- a/multimedia/swfdec-gtk2/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-Swfdec is a library for rendering Flash(R) animations and games.  It was
-originally designed as a basis library for creating Flash plugins for
-GStreamer, but it is a fully standalone library which only use the libart
-library for drawing.  Swfdec is released under the LGPL.
-
-This package provides an SWF based pixbuf-loader for GTK.
diff --git a/multimedia/swfdec-gtk2/Makefile b/multimedia/swfdec-gtk2/Makefile
deleted file mode 100644
index 253845524e2..00000000000
--- a/multimedia/swfdec-gtk2/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2005/06/04 10:41:42 jmmv Exp $
-#
-
-PKGREVISION=		2
-
-.include "../../multimedia/swfdec/Makefile.common"
-
-PKGNAME=		${DISTNAME:S/-/-gtk2-/}
-COMMENT+=		(GTK2 modules)
-
-CONFIGURE_ARGS+=	--enable-pixbuf-loader
-
-BUILD_DIRS=		${WRKSRC}/pixbuf-loader
-INSTALL_DIRS=		${WRKSRC}/pixbuf-loader
-
-GTK2_LOADERS=		YES
-
-.include "../../multimedia/swfdec/buildlink3.mk"
-.include "../../x11/gtk2/modules.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/swfdec-gtk2/PLIST b/multimedia/swfdec-gtk2/PLIST
deleted file mode 100644
index c3df5572860..00000000000
--- a/multimedia/swfdec-gtk2/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2005/06/04 10:41:42 jmmv Exp $
-lib/gtk-2.0/2.4.0/loaders/swf_loader.la
-@comment in gtk2: @dirrm lib/gtk-2.0/2.4.0/loaders
diff --git a/multimedia/swfdec/DESCR b/multimedia/swfdec/DESCR
deleted file mode 100644
index dca3b18623c..00000000000
--- a/multimedia/swfdec/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-Swfdec is a library for rendering Flash(R) animations and games.  It was
-originally designed as a basis library for creating Flash plugins for
-GStreamer, but it is a fully standalone library which only use the libart
-library for drawing.  Swfdec is released under the LGPL.
-
-This package provides the swfdec library, as well as an standalone SWF
-player.
diff --git a/multimedia/swfdec/MESSAGE b/multimedia/swfdec/MESSAGE
deleted file mode 100644
index f9ca13935de..00000000000
--- a/multimedia/swfdec/MESSAGE
+++ /dev/null
@@ -1,7 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2005/06/04 10:41:42 jmmv Exp $
-
-You should install the swfdec-gtk2 package, which provides an SWF
-gdk-pixbuf loader for the GTK2 toolkit.
-
-===========================================================================
diff --git a/multimedia/swfdec/Makefile b/multimedia/swfdec/Makefile
deleted file mode 100644
index 9fd0f2846a8..00000000000
--- a/multimedia/swfdec/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2005/06/04 10:41:42 jmmv Exp $
-#
-
-PKGREVISION=		2
-
-.include "Makefile.common"
-
-CONFIGURE_ARGS+=	--disable-pixbuf-loader
-
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/swfdec/Makefile.common b/multimedia/swfdec/Makefile.common
deleted file mode 100644
index cded6a94a66..00000000000
--- a/multimedia/swfdec/Makefile.common
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile.common,v 1.4 2005/08/10 20:56:21 jlam Exp $
-#
-
-DISTNAME=		swfdec-0.2.2
-CATEGORIES=		multimedia
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=swfdec/}
-
-MAINTAINER=		jmmv@NetBSD.org
-HOMEPAGE=		http://swfdec.sourceforge.net/
-COMMENT=		Library for rendering Flash(R) animations and games
-
-DISTINFO_FILE=		${.CURDIR}/../../multimedia/swfdec/distinfo
-PATCHDIR=		${.CURDIR}/../../multimedia/swfdec/patches
-
-USE_TOOLS+=		pkg-config
-GNU_CONFIGURE=		yes
-USE_PKGINSTALL=		yes
-USE_PKGLOCALEDIR=	yes
-USE_LIBTOOL=		yes
-
-PKGCONFIG_OVERRIDE=	swfdec.pc.in
-
-BUILDLINK_TRANSFORM+=	rm:-Werror
-
-pre-install:
-	${ECHO} "install:" >${WRKSRC}/plugin/Makefile
-
diff --git a/multimedia/swfdec/PLIST b/multimedia/swfdec/PLIST
deleted file mode 100644
index 352138ca491..00000000000
--- a/multimedia/swfdec/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2005/06/04 10:41:42 jmmv Exp $
-bin/swf_play
-include/swfdec/swf.h
-include/swfdec/swfdec.h
-lib/libswfdec.la
-lib/pkgconfig/swfdec.pc
-@dirrm include/swfdec
diff --git a/multimedia/swfdec/buildlink3.mk b/multimedia/swfdec/buildlink3.mk
deleted file mode 100644
index 870594b27d2..00000000000
--- a/multimedia/swfdec/buildlink3.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.2 2005/06/05 17:50:51 jmmv Exp $
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-SWFDEC_BUILDLINK3_MK:=	${SWFDEC_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	swfdec
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nswfdec}
-BUILDLINK_PACKAGES+=	swfdec
-
-.if !empty(SWFDEC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.swfdec+=	swfdec>=0.2.2
-BUILDLINK_RECOMMENDED.swfdec+=	swfdec>=0.2.2nb1
-BUILDLINK_PKGSRCDIR.swfdec?=	../../multimedia/swfdec
-.endif	# SWFDEC_BUILDLINK3_MK
-
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/swfdec/distinfo b/multimedia/swfdec/distinfo
deleted file mode 100644
index 311ad4c2a6a..00000000000
--- a/multimedia/swfdec/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.1 2005/06/04 10:41:42 jmmv Exp $
-
-SHA1 (swfdec-0.2.2.tar.gz) = f3cbc3fec455117d554d37ac4dda1d99fb592661
-RMD160 (swfdec-0.2.2.tar.gz) = e44e1d5890fd1b8e6b73fa0ed5d645dbb6203c88
-Size (swfdec-0.2.2.tar.gz) = 332280 bytes
-SHA1 (patch-aa) = ae2cd8ffb34d09c709378cc3b45510cb5d738305
-SHA1 (patch-ab) = 2a2a6b335ddb0ebce2aee38eb004d4b6e26f19b7
-SHA1 (patch-ac) = 96a9a5275e297088f326b729fde3feef79b323aa
diff --git a/multimedia/swfdec/patches/patch-aa b/multimedia/swfdec/patches/patch-aa
deleted file mode 100644
index 2aff0e8cff2..00000000000
--- a/multimedia/swfdec/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2005/06/04 10:41:42 jmmv Exp $
-
---- libswfdec/mpglib/clipconv_f32_s16.h.orig	2002-11-06 17:11:48.000000000 +1000
-+++ libswfdec/mpglib/clipconv_f32_s16.h
-@@ -34,7 +34,6 @@ Half integers may be rounded to either n
- //#include <sl_altivec.h>
- #define f32 float
- #define s16 short
--#define HAVE_IEEE754_H
- 
- 
- /* storage class */
diff --git a/multimedia/swfdec/patches/patch-ab b/multimedia/swfdec/patches/patch-ab
deleted file mode 100644
index 4b980a44235..00000000000
--- a/multimedia/swfdec/patches/patch-ab
+++ /dev/null
@@ -1,65 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2005/06/04 10:41:42 jmmv Exp $
-
---- player/swf_play.c.orig	Wed Feb  5 20:19:27 2003
-+++ player/swf_play.c	Mon May 12 11:43:12 2003
-@@ -15,6 +15,8 @@
- #include <signal.h>
- #include <sys/wait.h>
- #include <sys/time.h>
-+#include <sys/signal.h>
-+#include <errno.h>
- #include <time.h>
- #include <string.h>
- 
-@@ -72,6 +74,15 @@
- static gboolean render_idle(gpointer data);
- 
- /* fault handling stuff */
-+#ifndef SI_USER
-+typedef struct {
-+        char *si_addr;
-+        int si_signo;
-+        int si_errno;
-+        int si_code;
-+} siginfo_t;
-+#endif
-+
- void fault_handler(int signum, siginfo_t *si, void *misc);
- void fault_restore(void);
- void fault_setup(void);
-@@ -539,6 +550,20 @@
- 	_exit(0);
- }
- 
-+#ifndef SI_USER
-+void si_handler(int sig, int code, struct sigcontext *scp)
-+{
-+	siginfo_t si;
-+
-+	si.si_addr = NULL;
-+	si.si_signo = sig;
-+	si.si_errno = errno;
-+	si.si_code = code;
-+
-+	fault_handler(sig, &si, scp);
-+}
-+#endif
-+
- void fault_restore(void)
- {
- 	struct sigaction action;
-@@ -555,8 +580,13 @@
- 	struct sigaction action;
- 
- 	memset(&action,0,sizeof(action));
-+#ifdef SI_USER
- 	action.sa_sigaction = fault_handler;
--	action.sa_flags = SA_SIGINFO;
-+	action.sa_flags = 0;
-+#else
-+	action.sa_handler = (void (*)(int))si_handler;
-+	action.sa_flags = 0;
-+#endif
- 
- 	sigaction(SIGSEGV, &action, NULL);
- 	sigaction(SIGQUIT, &action, NULL);
diff --git a/multimedia/swfdec/patches/patch-ac b/multimedia/swfdec/patches/patch-ac
deleted file mode 100644
index 3619296298e..00000000000
--- a/multimedia/swfdec/patches/patch-ac
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/06/04 10:41:42 jmmv Exp $
-
---- pixbuf-loader/Makefile.in.orig	2003-02-05 21:37:46.000000000 +0100
-+++ pixbuf-loader/Makefile.in
-@@ -102,7 +102,7 @@ SDL_CFLAGS = @SDL_CFLAGS@
- SDL_LIBS = @SDL_LIBS@
- STRIP = @STRIP@
- SWF_CFLAGS = @SWF_CFLAGS@
--SWF_LIBS = @SWF_LIBS@
-+SWF_LIBS = `pkg-config --libs swfdec glib-2.0` -lz
- VERSION = @VERSION@
- X_CFLAGS = @X_CFLAGS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -391,10 +391,6 @@ uninstall-am: uninstall-info-am uninstal
- 
- 
- install-data-local: 
--	if [ -z "$(DESTDIR)" ] ; then \
--	  $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
--	  $(QUERYLOADERS) > $(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders ; \
--	fi
- # 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.
- .NOEXPORT:
diff --git a/multimedia/totem-xine/DESCR b/multimedia/totem-xine/DESCR
deleted file mode 100644
index 372068ad194..00000000000
--- a/multimedia/totem-xine/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Totem is simple movie player for the GNOME desktop based on GStreamer and
-Xine.  It features a playlist, a full-screen mode, seek and volume controls,
-as well as a pretty complete keyboard navigation.
-
-This package is built using the Xine backend.
diff --git a/multimedia/totem-xine/Makefile b/multimedia/totem-xine/Makefile
deleted file mode 100644
index 58e5439bc60..00000000000
--- a/multimedia/totem-xine/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/03/22 16:37:51 jmmv Exp $
-#
-
-.include "../../multimedia/totem/Makefile.common"
-
-PKGNAME=	${DISTNAME:S/-/-xine-/}
-
-COMMENT+=	(using Xine)
-
-CONFLICTS+=	totem-[0-9]*
-
-.include "../../multimedia/xine-lib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/totem/DESCR b/multimedia/totem/DESCR
deleted file mode 100644
index f0c763b46c5..00000000000
--- a/multimedia/totem/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Totem is simple movie player for the GNOME desktop based on GStreamer and
-Xine.  It features a playlist, a full-screen mode, seek and volume controls,
-as well as a pretty complete keyboard navigation.
-
-This package is built using the GStreamer backend.
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
deleted file mode 100644
index 7d1cb4b41e4..00000000000
--- a/multimedia/totem/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/03/22 16:37:32 jmmv Exp $
-#
-
-.include "Makefile.common"
-
-COMMENT+=	(using GStreamer)
-
-CONFLICTS+=	totem-xine-[0-9]*
-
-BUILDLINK_DEPENDS.gstreamer+=	gstreamer>=0.8.6.1
-
-.include "../../multimedia/gst-plugins/buildlink3.mk"
-.include "../../multimedia/gstreamer/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/totem/Makefile.common b/multimedia/totem/Makefile.common
deleted file mode 100644
index f30c562bbd3..00000000000
--- a/multimedia/totem/Makefile.common
+++ /dev/null
@@ -1,55 +0,0 @@
-# $NetBSD: Makefile.common,v 1.10 2005/10/16 12:14:13 jmmv Exp $
-#
-
-DISTNAME=	totem-1.2.0
-CATEGORIES=	multimedia gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/totem/1.2/}
-
-MAINTAINER=	jmmv@NetBSD.org
-HOMEPAGE=	http://www.hadess.net/totem.php3
-COMMENT=	Movie player for the GNOME Desktop
-
-DISTINFO_FILE=	${.CURDIR}/../../multimedia/totem/distinfo
-PATCHDIR=	${.CURDIR}/../../multimedia/totem/patches
-PLIST_SRC=	${.CURDIR}/../../multimedia/totem/PLIST
-
-GNU_CONFIGURE=		YES
-USE_DIRS+=		gnome2-1.5
-USE_TOOLS+=		gmake pkg-config
-USE_LIBTOOL=		YES
-USE_PKGLOCALEDIR=	YES
-
-PKGCONFIG_OVERRIDE=	totem-plparser.pc.in
-
-GCONF2_SCHEMAS=		totem.schemas
-GCONF2_SCHEMAS+=	totem-handlers.schemas
-GCONF2_SCHEMAS+=	totem-video-thumbnail.schemas
-
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.6.3
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.totem
-.include "../../www/mozilla/gecko-options.mk"
-.include "../../mk/bsd.options.mk"
-
-BUILDLINK_DEPENDS.gnome-icon-theme+=	gnome-icon-theme>=2.10.0
-BUILDLINK_DEPENDS.gstreamer+=		gstreamer>=0.8.4.1
-BUILDLINK_DEPENDS.gst-plugins+=		gstreamer>=0.8.4.1
-
-.include "../../audio/musicbrainz/buildlink3.mk"
-.include "../../devel/GConf2/schemas.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../graphics/gnome-icon-theme/buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../sysutils/gnome-vfs2/buildlink3.mk"
-.include "../../sysutils/nautilus/buildlink3.mk"
-.include "../../textproc/gnome-doc-utils/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
-.include "../../textproc/iso-codes/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
-.include "../../www/mozilla/gecko-depends.mk"
-.include "../../x11/gnome-desktop/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
diff --git a/multimedia/totem/PLIST b/multimedia/totem/PLIST
deleted file mode 100644
index 2fc4c748524..00000000000
--- a/multimedia/totem/PLIST
+++ /dev/null
@@ -1,174 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2005/10/16 12:14:13 jmmv Exp $
-bin/totem
-bin/totem-video-thumbnailer
-include/totem/1/plparser/totem-disc.h
-include/totem/1/plparser/totem-pl-parser-builtins.h
-include/totem/1/plparser/totem-pl-parser.h
-lib/libtotem-plparser.la
-lib/nautilus/extensions-1.0/libtotem-properties-page.la
-lib/pkgconfig/totem-plparser.pc
-man/man1/totem-video-thumbnailer.1
-man/man1/totem.1
-share/applications/totem.desktop
-share/gconf/schemas/totem-handlers.schemas
-share/gconf/schemas/totem-video-thumbnail.schemas
-share/gconf/schemas/totem.schemas
-share/gnome/help/totem/C/figures/totem_next_button.png
-share/gnome/help/totem/C/figures/totem_pause_button.png
-share/gnome/help/totem/C/figures/totem_play_button.png
-share/gnome/help/totem/C/figures/totem_previous_button.png
-share/gnome/help/totem/C/figures/totem_show_playlist_button.png
-share/gnome/help/totem/C/figures/totem_start_window.png
-share/gnome/help/totem/C/figures/totem_volume_maximum_button.png
-share/gnome/help/totem/C/figures/totem_volume_mute_button.png
-share/gnome/help/totem/C/legal.xml
-share/gnome/help/totem/C/totem.xml
-share/gnome/help/totem/de/figures/totem_next_button.png
-share/gnome/help/totem/de/figures/totem_pause_button.png
-share/gnome/help/totem/de/figures/totem_play_button.png
-share/gnome/help/totem/de/figures/totem_previous_button.png
-share/gnome/help/totem/de/figures/totem_show_playlist_button.png
-share/gnome/help/totem/de/figures/totem_start_window.png
-share/gnome/help/totem/de/figures/totem_volume_maximum_button.png
-share/gnome/help/totem/de/figures/totem_volume_mute_button.png
-share/gnome/help/totem/de/legal.xml
-share/gnome/help/totem/de/totem.xml
-share/gnome/help/totem/es/figures/totem_next_button.png
-share/gnome/help/totem/es/figures/totem_pause_button.png
-share/gnome/help/totem/es/figures/totem_play_button.png
-share/gnome/help/totem/es/figures/totem_previous_button.png
-share/gnome/help/totem/es/figures/totem_show_playlist_button.png
-share/gnome/help/totem/es/figures/totem_start_window.png
-share/gnome/help/totem/es/figures/totem_volume_maximum_button.png
-share/gnome/help/totem/es/figures/totem_volume_mute_button.png
-share/gnome/help/totem/es/legal.xml
-share/gnome/help/totem/es/totem.xml
-share/gnome/help/totem/fr/figures/totem_next_button.png
-share/gnome/help/totem/fr/figures/totem_pause_button.png
-share/gnome/help/totem/fr/figures/totem_play_button.png
-share/gnome/help/totem/fr/figures/totem_previous_button.png
-share/gnome/help/totem/fr/figures/totem_show_playlist_button.png
-share/gnome/help/totem/fr/figures/totem_start_window.png
-share/gnome/help/totem/fr/figures/totem_volume_maximum_button.png
-share/gnome/help/totem/fr/figures/totem_volume_mute_button.png
-share/gnome/help/totem/fr/legal.xml
-share/gnome/help/totem/fr/totem.xml
-share/gnome/help/totem/ru/figures/totem_screenshot.png
-share/gnome/help/totem/ru/figures/totem_start_window.png
-share/gnome/help/totem/ru/legal.xml
-share/gnome/help/totem/ru/totem.xml
-${PKGLOCALEDIR}/locale/am/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/az/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/be/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/bn/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/el/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/et/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/gu/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/he/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/id/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/is/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/ne/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/rw/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/te/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/th/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/ug/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/xh/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/totem.mo
-${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/totem.mo
-share/omf/totem/totem-C.omf
-share/omf/totem/totem-de.omf
-share/omf/totem/totem-es.omf
-share/omf/totem/totem-fr.omf
-share/omf/totem/totem-ru.omf
-share/pixmaps/media-player-48.png
-share/pixmaps/vanity.png
-share/totem/filmholes-big-left.png
-share/totem/filmholes-big-right.png
-share/totem/filmholes.png
-share/totem/media-player-48.png
-share/totem/mozilla-viewer.glade
-share/totem/playlist-playing.png
-share/totem/playlist.glade
-share/totem/popup.glade
-share/totem/properties.glade
-share/totem/rhythmbox-volume-max.png
-share/totem/rhythmbox-volume-zero.png
-share/totem/screenshot.glade
-share/totem/skip_to.glade
-share/totem/stock-tool-brightness-contrast-22.png
-share/totem/stock_media_next.png
-share/totem/stock_media_pause.png
-share/totem/stock_media_play.png
-share/totem/stock_media_previous.png
-share/totem/totem.glade
-share/totem/totem_logo.png
-share/totem/uri.glade
-share/totem/vanity.glade
-share/totem/vanity.png
-@dirrm share/totem
-@comment in xdg-dirs: @dirrm share/pixmaps
-@dirrm share/omf/totem
-@comment in scrollkeeper: @dirrm share/omf
-@dirrm share/gnome/help/totem/ru/figures
-@dirrm share/gnome/help/totem/ru
-@dirrm share/gnome/help/totem/fr/figures
-@dirrm share/gnome/help/totem/fr
-@dirrm share/gnome/help/totem/es/figures
-@dirrm share/gnome/help/totem/es
-@dirrm share/gnome/help/totem/de/figures
-@dirrm share/gnome/help/totem/de
-@dirrm share/gnome/help/totem/C/figures
-@dirrm share/gnome/help/totem/C
-@dirrm share/gnome/help/totem
-@comment in gnome2-dirs: @dirrm share/gnome/help
-@comment in GConf2: @dirrm share/gconf/schemas
-@comment in xdg-dirs: @dirrm share/applications
-@comment in nautilus: @dirrm lib/nautilus/extensions-1.0
-@dirrm include/totem/1/plparser
-@dirrm include/totem/1
-@dirrm include/totem
diff --git a/multimedia/totem/distinfo b/multimedia/totem/distinfo
deleted file mode 100644
index 91fdbd52135..00000000000
--- a/multimedia/totem/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/10/16 12:14:13 jmmv Exp $
-
-SHA1 (totem-1.2.0.tar.gz) = b5bec35f48f411f0ff2088991eb8dccecf4d8017
-RMD160 (totem-1.2.0.tar.gz) = 5883997379f553be135303df4f2c9fc8c737990b
-Size (totem-1.2.0.tar.gz) = 2440616 bytes
-SHA1 (patch-aa) = bc3190e61faf561b6a009b8e0c2046f4937ade24
-SHA1 (patch-ab) = c2eafbc95048b51c1aa0750755755f54dad9c28b
diff --git a/multimedia/totem/patches/patch-aa b/multimedia/totem/patches/patch-aa
deleted file mode 100644
index c80a44df8dd..00000000000
--- a/multimedia/totem/patches/patch-aa
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/10/16 12:14:13 jmmv Exp $
-
---- src/plparse/totem-disc.c.orig	2005-03-13 14:37:57.000000000 +0100
-+++ src/plparse/totem-disc.c
-@@ -34,7 +34,6 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <errno.h>
--#include <mntent.h>
- #include <string.h>
- 
- #include <sys/ioctl.h>
-@@ -44,7 +43,31 @@
- #include <glib/gi18n.h>
- #include <libgnomevfs/gnome-vfs.h>
- 
-+#if defined(__linux__)
- #include <linux/cdrom.h>
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#include <sys/cdio.h>
-+#include <sys/disklabel.h>
-+
-+#define CDROM_DRIVE_STATUS    0x5326
-+#define CDROM_DISC_STATUS     0x5327
-+#define CDS_AUDIO             100
-+#define CDS_MIXED             105
-+#define CDS_DATA_1            101
-+#define CDS_DATA_2            102
-+#define CDS_NO_INFO           0       /* if not implemented */
-+#define CDS_NO_DISC           1
-+#define CDS_TRAY_OPEN         2
-+#define CDS_DRIVE_NOT_READY   3
-+#define CDS_DISC_OK           4
-+#define CDS_XA_2_1            103
-+#define CDS_XA_2_2            104
-+#define CDC_DVD                       0x8000
-+#define ENOMEDIUM ENODEV
-+#define CDROM_GET_CAPABILITY CDIOCCLRDEBUG
-+#else
-+#error "No support to access the CD in this platform."
-+#endif
- 
- #include "totem-disc.h"
- 
diff --git a/multimedia/totem/patches/patch-ab b/multimedia/totem/patches/patch-ab
deleted file mode 100644
index cd040e12e00..00000000000
--- a/multimedia/totem/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2005/10/16 12:14:13 jmmv Exp $
-
---- src/Makefile.in.orig	2005-09-05 12:12:20.000000000 +0200
-+++ src/Makefile.in
-@@ -645,7 +645,8 @@ clean-noinstLTLIBRARIES:
- 	  echo "rm -f \"$${dir}/so_locations\""; \
- 	  rm -f "$${dir}/so_locations"; \
- 	done
--install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
-+install-pluginLTLIBRARIES:
-+do-not-install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
- 	test -z "$(plugindir)" || $(mkdir_p) "$(DESTDIR)$(plugindir)"
- 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
diff --git a/multimedia/transcode/DESCR b/multimedia/transcode/DESCR
deleted file mode 100644
index 46833d2b385..00000000000
--- a/multimedia/transcode/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-transcode is a command line video-stream processing tool.
-It supports elementary video and audio frame transformations.
-Some example modules are included to enable import of MPEG-1/2,
-Digital Video, and other formats.  It also includes export
-modules for writing to AVI files with DivX, OpenDivX, XviD,
-Digital Video or other codecs.  Direct DVD transcoding is also
-supported.  A set of tools is available to extract and decode
-the sources into raw video/audio streams for import and to
-enable post-processing of AVI files.
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
deleted file mode 100644
index fddf5825ca2..00000000000
--- a/multimedia/transcode/Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-# $NetBSD: Makefile,v 1.14 2005/06/01 20:08:01 jlam Exp $
-
-DISTNAME=	transcode-0.6.12
-PKGREVISION=	6
-CATEGORIES=	multimedia
-MASTER_SITES=	http://dl.fkb.wormulon.net/transcode/ \
-		http://dl.kel.wormulon.net/transcode/
-
-MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://www.transcoding.org/cgi-bin/transcode
-COMMENT=	Command line video-stream processing tool
-
-BUILD_DEPENDS+=		nasm>=0.98.36:../../devel/nasm
-
-USE_TOOLS+=		automake gmake
-
-USE_LIBTOOL=		yes
-SHLIBTOOL_OVERRIDE=	libtool
-
-.include "../../mk/bsd.prefs.mk"
-
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--disable-qt
-# when libmpeg3 is a shlib.
-CONFIGURE_ARGS+=	--without-libmpeg3
-CONFIGURE_ARGS+=	--with-default-xvid=xvid4
-CONFIGURE_ARGS+=	--with-ft-prefix=${BUILDLINK_PREFIX.freetype2}
-
-# this used to operate on acinclude.m4 and run aclocal, but running
-# aclocal here breaks due to missing DLFCN checking
-post-patch:
-	-cd ${WRKSRC} && aclocal && autoconf && automake
-	cd ${WRKSRC} && \
-	${SED} "s|/usr/local|${PREFIX}|g; s|include/libmpeg3|include/mpeg3|g; s|-ldl -lm|-lm|g" configure > configure.new && \
-	${MV} configure.new configure && ${CHMOD} a+x configure
-	${CP} ${FILESDIR}/strip_fPIC.sh ${WRKSRC}
-
-.if ${MACHINE_ARCH} == "i386"
-post-install:
-	${LN} -sf ../libxvidcore.so.4.0  ${PREFIX}/lib/transcode/libxvidcore.so.4
-.endif
-
-.include "../../archivers/liblzo/buildlink3.mk"
-.include "../../audio/liba52/buildlink3.mk"
-.include "../../audio/lame/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../multimedia/libmpeg3/buildlink3.mk"
-.include "../../graphics/ImageMagick/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-# depends on a much later avifile than the one in pkgsrc
-#.include "../../multimedia/avifile/buildlink3.mk"
-.include "../../multimedia/libdvdread/buildlink3.mk"
-.include "../../multimedia/libogg/buildlink3.mk"
-.include "../../multimedia/mjpegtools/buildlink3.mk"
-.include "../../multimedia/xvidcore/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/transcode/PLIST b/multimedia/transcode/PLIST
deleted file mode 100644
index 0577bd9a6dd..00000000000
--- a/multimedia/transcode/PLIST
+++ /dev/null
@@ -1,246 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2005/02/27 12:03:09 veego Exp $
-bin/avifix
-bin/aviindex
-bin/avimerge
-bin/avisplit
-bin/avisync
-bin/tccat
-bin/tcdecode
-bin/tcdemux
-bin/tcextract
-bin/tcmodinfo
-bin/tcmp3cut
-bin/tcmplex
-bin/tcprobe
-bin/tcrequant
-bin/tcscan
-bin/tcxmlcheck
-bin/tcxpm2rgb
-bin/transcode
-lib/transcode/a52_decore.la
-lib/transcode/af6_decore.la
-lib/transcode/export_ac3.la
-lib/transcode/export_af6.conf
-lib/transcode/export_debugppm.la
-lib/transcode/export_divx4.la
-lib/transcode/export_divx4raw.la
-lib/transcode/export_divx5.la
-lib/transcode/export_divx5raw.la
-lib/transcode/export_ffmpeg.la
-lib/transcode/export_im.la
-lib/transcode/export_jpg.la
-lib/transcode/export_lame.la
-lib/transcode/export_lzo.la
-lib/transcode/export_mjpeg.la
-lib/transcode/export_mp2enc.la
-lib/transcode/export_mp1e.la
-lib/transcode/export_mpeg.la
-lib/transcode/export_mpeg2enc.la
-lib/transcode/export_net.la
-lib/transcode/export_null.la
-lib/transcode/export_ogg.la
-lib/transcode/export_pcm.la
-lib/transcode/export_ppm.la
-lib/transcode/export_raw.la
-lib/transcode/export_toolame.la
-lib/transcode/export_wav.la
-lib/transcode/export_xvid.so
-lib/transcode/export_xvid2.la
-lib/transcode/export_xvid3.la
-lib/transcode/export_xvid4.la
-lib/transcode/export_yuv4mpeg.la
-lib/transcode/filter_29to23.la
-lib/transcode/filter_32detect.la
-lib/transcode/filter_32drop.la
-lib/transcode/filter_aclip.la
-lib/transcode/filter_astat.la
-lib/transcode/filter_clone.la
-lib/transcode/filter_compare.la
-lib/transcode/filter_control.la
-lib/transcode/filter_cpaudio.la
-lib/transcode/filter_cshift.la
-lib/transcode/filter_cut.la
-lib/transcode/filter_decimate.la
-lib/transcode/filter_denoise3d.la
-lib/transcode/filter_detectclipping.la
-lib/transcode/filter_detectsilence.la
-lib/transcode/filter_dilyuvmmx.la
-lib/transcode/filter_divxkey.la
-lib/transcode/filter_dnr.la
-lib/transcode/filter_doublefps.la
-lib/transcode/filter_extsub.la
-lib/transcode/filter_extsub2.la
-lib/transcode/filter_fields.la
-lib/transcode/filter_fps.la
-lib/transcode/filter_hqdn3d.la
-lib/transcode/filter_invert.la
-lib/transcode/filter_ivtc.la
-lib/transcode/filter_list.awk
-lib/transcode/filter_logo.la
-lib/transcode/filter_logoaway.la
-lib/transcode/filter_lowpass.la
-lib/transcode/filter_mask.la
-lib/transcode/filter_modfps.la
-lib/transcode/filter_msharpen.la
-lib/transcode/filter_nored.la
-lib/transcode/filter_normalize.la
-lib/transcode/filter_null.la
-lib/transcode/filter_pp.la
-lib/transcode/filter_pv.la
-lib/transcode/filter_resample.la
-lib/transcode/filter_skip.la
-lib/transcode/filter_slowmo.la
-lib/transcode/filter_smartbob.la
-lib/transcode/filter_smartdeinter.la
-lib/transcode/filter_smartyuv.la
-lib/transcode/filter_smooth.la
-lib/transcode/filter_subtitler.la
-lib/transcode/filter_tc_audio.la
-lib/transcode/filter_tc_video.la
-lib/transcode/filter_test.la
-lib/transcode/filter_testframe.la
-lib/transcode/filter_text.la
-lib/transcode/filter_unsharp.la
-lib/transcode/filter_videocore.la
-lib/transcode/filter_whitebalance.la
-lib/transcode/filter_xsharpen.la
-lib/transcode/filter_yuvdenoise.la
-lib/transcode/filter_yuvmedian.la
-lib/transcode/filter_yuy2toyv12.la
-lib/transcode/import_ac3.la
-lib/transcode/import_avi.la
-lib/transcode/import_divx.la
-lib/transcode/import_dv.la
-lib/transcode/import_dvd.la
-lib/transcode/import_ffmpeg.la
-lib/transcode/import_fraps.la
-lib/transcode/import_im.la
-lib/transcode/import_imlist.la
-lib/transcode/import_lav.la
-lib/transcode/import_lzo.la
-lib/transcode/import_mp3.la
-lib/transcode/import_mpeg2.la
-lib/transcode/import_mplayer.la
-lib/transcode/import_net.la
-lib/transcode/import_null.la
-lib/transcode/import_nuv.la
-lib/transcode/import_nvrec.la
-lib/transcode/import_ogg.la
-lib/transcode/import_raw.la
-lib/transcode/import_rawlist.la
-lib/transcode/import_sh.la
-lib/transcode/import_vdrac3.la
-lib/transcode/import_vnc.la
-lib/transcode/import_vob.la
-lib/transcode/import_xml.la
-lib/transcode/import_xvid.la
-lib/transcode/import_yuv.la
-lib/transcode/import_yuv4mpeg.la
-lib/transcode/parse_csv.awk
-lib/transcode/xvid2.cfg
-lib/transcode/xvid3.cfg
-lib/transcode/xvid4.cfg
-man/man1/avifix.1
-man/man1/aviindex.1
-man/man1/avimerge.1
-man/man1/avisplit.1
-man/man1/avisync.1
-man/man1/tccat.1
-man/man1/tcdecode.1
-man/man1/tcdemux.1
-man/man1/tcextract.1
-man/man1/tcmodinfo.1
-man/man1/tcprobe.1
-man/man1/tcpvmexportd.1
-man/man1/tcscan.1
-man/man1/tcxmlcheck.1
-man/man1/transcode.1
-share/doc/transcode/ChangeLog
-share/doc/transcode/OPTIMIZERS
-share/doc/transcode/README.Inverse.Telecine.txt
-share/doc/transcode/README.cluster
-share/doc/transcode/README.filter.modfps
-share/doc/transcode/README.rip
-share/doc/transcode/README.sync
-share/doc/transcode/README.vcd
-share/doc/transcode/README.xvid-credits
-share/doc/transcode/architecture.txt
-share/doc/transcode/avi_comments.txt
-share/doc/transcode/clone.txt
-share/doc/transcode/export-API.txt
-share/doc/transcode/export_ffmpeg.txt
-share/doc/transcode/export_mpeg.txt
-share/doc/transcode/export_pvm.txt
-share/doc/transcode/filter-API.txt
-share/doc/transcode/filter-socket.txt
-share/doc/transcode/filter_dnr.txt
-share/doc/transcode/filter_logo.txt
-share/doc/transcode/filter_logoaway.txt
-share/doc/transcode/filter_text.txt
-share/doc/transcode/filter_yuvdenoise.txt
-share/doc/transcode/framerate.txt
-share/doc/transcode/html/about.html
-share/doc/transcode/html/anim.html
-share/doc/transcode/html/cluster_guide.txt
-share/doc/transcode/html/core.html
-share/doc/transcode/html/dv.html
-share/doc/transcode/html/dvd.html
-share/doc/transcode/html/export_af6.html
-share/doc/transcode/html/export_divx.html
-share/doc/transcode/html/export_divx4.php
-share/doc/transcode/html/export_divx5.php
-share/doc/transcode/html/export_fame.php
-share/doc/transcode/html/export_iv50.html
-share/doc/transcode/html/export_null.html
-share/doc/transcode/html/export_ogg.php
-share/doc/transcode/html/export_opendivx.php
-share/doc/transcode/html/export_raw.html
-share/doc/transcode/html/export_xvid.php
-share/doc/transcode/html/faq.html
-share/doc/transcode/html/filter.html
-share/doc/transcode/html/import_ac3.html
-share/doc/transcode/html/import_avi.html
-share/doc/transcode/html/import_dv.html
-share/doc/transcode/html/import_dvd.html
-share/doc/transcode/html/import_mp3.html
-share/doc/transcode/html/import_mpeg2.html
-share/doc/transcode/html/import_mpeg3.html
-share/doc/transcode/html/import_null.html
-share/doc/transcode/html/import_nuv.html
-share/doc/transcode/html/import_ogg.php
-share/doc/transcode/html/import_raw.html
-share/doc/transcode/html/import_vob.html
-share/doc/transcode/html/import_yuv4mpeg.html
-share/doc/transcode/html/index.html
-share/doc/transcode/html/intro.html
-share/doc/transcode/html/mes0-00000.png
-share/doc/transcode/html/mes4-00000.png
-share/doc/transcode/html/mes5-00000.png
-share/doc/transcode/html/mes6-00000.png
-share/doc/transcode/html/mes7-00000.png
-share/doc/transcode/html/misc.html
-share/doc/transcode/html/modules.html
-share/doc/transcode/html/mpeg.html
-share/doc/transcode/html/new.png
-share/doc/transcode/html/options.html
-share/doc/transcode/html/other.html
-share/doc/transcode/html/post.html
-share/doc/transcode/html/pre.html
-share/doc/transcode/html/smart.html
-share/doc/transcode/html/sorry.html
-share/doc/transcode/html/sub0-00000.png
-share/doc/transcode/html/sub1-00000.png
-share/doc/transcode/html/sub2-00000.png
-share/doc/transcode/html/sub3-00000.png
-share/doc/transcode/html/subtitles.html
-share/doc/transcode/html/table.php
-share/doc/transcode/html/tc.png
-share/doc/transcode/import-API.txt
-share/doc/transcode/import-xml.txt
-share/doc/transcode/import_nvrec.txt
-share/doc/transcode/import_v4l2.txt
-share/doc/transcode/pvm.cfg
-share/doc/transcode/template.cfg.txt
-@dirrm share/doc/transcode/html
-@dirrm share/doc/transcode
-@dirrm lib/transcode
diff --git a/multimedia/transcode/PLIST.i386 b/multimedia/transcode/PLIST.i386
deleted file mode 100644
index 98c1e1fd300..00000000000
--- a/multimedia/transcode/PLIST.i386
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.i386,v 1.1 2005/02/27 12:03:09 veego Exp $
-lib/transcode/libxvidcore.so.4
diff --git a/multimedia/transcode/distinfo b/multimedia/transcode/distinfo
deleted file mode 100644
index 01538fab544..00000000000
--- a/multimedia/transcode/distinfo
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: distinfo,v 1.7 2005/10/10 21:23:24 joerg Exp $
-
-SHA1 (transcode-0.6.12.tar.gz) = 3d9b223f804253a6a76d9645feb86609b0a2499a
-RMD160 (transcode-0.6.12.tar.gz) = 81d2d70fdb9398f97aa5b59b31ff4243c8f31b2f
-Size (transcode-0.6.12.tar.gz) = 3454807 bytes
-SHA1 (patch-ad) = dc3777cbfd86eba3d62c0bfa947e9877c6c44fea
-SHA1 (patch-ae) = f49a155b84edbeb3c93705e6ab15e80f48adbdb1
-SHA1 (patch-af) = 88d2209445c4011f400ae2dd79d9e285aecd3f0a
-SHA1 (patch-ag) = 85c3f8cd84ce0cfaf3aa70c044ba5eaa96267ea4
-SHA1 (patch-ah) = 7c401876c7f74dfd62edfb39575eebbf130cad42
-SHA1 (patch-ai) = 8437ea9d0bd0b08f0e8156e373f338084d68f2cd
-SHA1 (patch-aj) = f62d0e1e23868b290221cffc367c3f0a5cc5cbc6
-SHA1 (patch-ak) = add9a293ddb73e3f82982d2021a6310f742e45f1
-SHA1 (patch-al) = 797bd770565263452d47e2f4d8942974ef153553
-SHA1 (patch-an) = ee416096f1fc6b8ff74f80f93cc5e40d4ad49223
-SHA1 (patch-ao) = e6f1006e5aa4663259e1e2fd2355dbfc32bda8f5
-SHA1 (patch-ap) = fb393e3400423a5d4225fb31afabfbcaa265a35b
-SHA1 (patch-as) = d673ec6009d96f55afcf8382f834edc2cadd2ae3
-SHA1 (patch-at) = f598541e1ea9c7e6fcd93d7f2704397b5bdb5cd8
-SHA1 (patch-au) = 0e9731f693f209d1c2bd4b28e71c03cab94020ea
-SHA1 (patch-av) = 54ddd6059718a25ec9fdd6635c320f9e22d3ba1e
-SHA1 (patch-aw) = 67eec98cc21459a133cae1d0a3297201e93657e9
-SHA1 (patch-ax) = 6392a3c76ca1bd83cea9b41966820f159ff33a50
-SHA1 (patch-ay) = 1e827c6f88d8347521e8b16629b013d87d3539ec
-SHA1 (patch-ba) = 65d1dfbbce181941d145359ef32f8d8c28adce3e
-SHA1 (patch-bb) = 2bec18cdca63ef4d0cc6c1caf8837890c9e116c6
-SHA1 (patch-bc) = f6a0f0dd550d798bb8919f40dea7df899beac3a1
-SHA1 (patch-bd) = ffca7a74422e0dac82d1a728b9c6ceef24f744cb
-SHA1 (patch-be) = 05bece81e5d45fd493ce6d5cbeda97226f363237
-SHA1 (patch-bf) = b0a7e5353578ef82f8113b4938ecf81708bf2b8a
diff --git a/multimedia/transcode/files/strip_fPIC.sh b/multimedia/transcode/files/strip_fPIC.sh
deleted file mode 100755
index 007c94fb0a5..00000000000
--- a/multimedia/transcode/files/strip_fPIC.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-#
-# libtool assumes that the compiler can handle the -fPIC flag
-# This isn't always true (for example, nasm can't handle it)
-command=""
-while [ $# -gt 0 ]; do
-    case "$1" in
-        -?PIC)
-            # Ignore -fPIC and -DPIC options
-            ;;
-        *)
-            command="$command $1"
-            ;;
-    esac
-    shift
-done
-echo $command
-exec $command
diff --git a/multimedia/transcode/patches/patch-ad b/multimedia/transcode/patches/patch-ad
deleted file mode 100644
index 3414245e3ec..00000000000
--- a/multimedia/transcode/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2004/05/10 13:47:08 wiz Exp $
-
-diff -rcp filter/yuvdenoise/mjpeg_types.h filter/yuvdenoise/mjpeg_types.h
-*** filter/yuvdenoise/mjpeg_types.h	Fri Mar 14 22:12:41 2003
---- filter/yuvdenoise/mjpeg_types.h	Mon Jun  9 17:48:25 2003
-*************** typedef u_int64_t uint64_t;
-*** 58,64 ****
-  /* fixme */
-  #endif /* HAVE_STDINT_H */
-  
-! #if defined(__FreeBSD__)
-  #include <sys/types.h> /* FreeBSD - ssize_t */
-  #endif
-  
---- 58,64 ----
-  /* fixme */
-  #endif /* HAVE_STDINT_H */
-  
-! #if defined(__FreeBSD__)|| defined(__NetBSD__)
-  #include <sys/types.h> /* FreeBSD - ssize_t */
-  #endif
-  
diff --git a/multimedia/transcode/patches/patch-ae b/multimedia/transcode/patches/patch-ae
deleted file mode 100644
index 23bfd21d4f4..00000000000
--- a/multimedia/transcode/patches/patch-ae
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2004/05/10 13:47:08 wiz Exp $
-
-diff -rcp import/import_divx.c import/import_divx.c
-*** import/import_divx.c	Mon May 12 16:46:50 2003
---- import/import_divx.c	Mon Jun  9 17:46:50 2003
-*************** static unsigned char *bufalloc(size_t si
-*** 158,164 ****
-  }
-  
-  static int divx_init(char *path) {
-! #ifdef __FreeBSD__
-      const
-  #endif    
-      char *error;
---- 158,164 ----
-  }
-  
-  static int divx_init(char *path) {
-! #if defined(__FreeBSD__) || defined(__NetBSD__)
-      const
-  #endif    
-      char *error;
diff --git a/multimedia/transcode/patches/patch-af b/multimedia/transcode/patches/patch-af
deleted file mode 100644
index 3559faba71d..00000000000
--- a/multimedia/transcode/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2004/05/10 13:47:08 wiz Exp $
-
---- import/import_xvid.c	2004-03-26 19:12:32.000000000 +0000
-+++ import/import_xvid.c	2004-03-26 19:12:42.000000000 +0000
-@@ -67,7 +67,7 @@
- #define XVID_SHARED_LIB_NAME "libxvidcore.so"
- 
- static int xvid2_init(char *path) {
--#if defined(__FreeBSD__) || defined(__APPLE__)
-+#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__NetBSD__)
- 	const
- #endif    
- 		char *error;
diff --git a/multimedia/transcode/patches/patch-ag b/multimedia/transcode/patches/patch-ag
deleted file mode 100644
index 53e5f9f5243..00000000000
--- a/multimedia/transcode/patches/patch-ag
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2005/10/10 21:23:24 joerg Exp $
-
-diff -rcp import/iodump.c import/iodump.c
-*** import/iodump.c	Wed Apr  2 19:03:05 2003
---- import/iodump.c	Mon Jun  9 17:47:23 2003
-***************
-*** 37,43 ****
-  #include "dvd_reader.h"
-  #endif
-  
-! #if defined(__bsdi__) || defined(__FreeBSD__) || defined(__APPLE__)
-  typedef	off_t off64_t;
-  #define	lseek64 lseek
-  #endif
---- 37,43 ----
-  #include "dvd_reader.h"
-  #endif
-  
-! #if defined(__bsdi__) || defined(__FreeBSD__) || defined(__APPLE__) || defined(__NetBSD__) || defined(__DragonFly__)
-  typedef	off_t off64_t;
-  #define	lseek64 lseek
-  #endif
diff --git a/multimedia/transcode/patches/patch-ah b/multimedia/transcode/patches/patch-ah
deleted file mode 100644
index 5099edd2a05..00000000000
--- a/multimedia/transcode/patches/patch-ah
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2005/10/10 21:23:24 joerg Exp $
-
-diff -rcp import/nuv/rtjpeg_aud_plugin.c import/nuv/rtjpeg_aud_plugin.c
-*** import/nuv/rtjpeg_aud_plugin.c	Tue Apr  8 20:50:11 2003
---- import/nuv/rtjpeg_aud_plugin.c	Mon Jun  9 17:47:33 2003
-*************** int rtjpeg_aud_open(char *tplorg)
-*** 108,114 ****
-      regions[0].end   = -1;
-    }
-  
-! #if defined(__FreeBSD__) || defined(__APPLE__) 
-    rtjpeg_aud_file=open(tplorg, O_RDONLY);
-  #else 
-    rtjpeg_aud_file=open(tplorg, O_RDONLY|O_LARGEFILE);
---- 108,114 ----
-      regions[0].end   = -1;
-    }
-  
-! #if defined(__FreeBSD__) || defined(__APPLE__) || defined(__NetBSD__) || defined(__DragonFly__)
-    rtjpeg_aud_file=open(tplorg, O_RDONLY);
-  #else 
-    rtjpeg_aud_file=open(tplorg, O_RDONLY|O_LARGEFILE);
diff --git a/multimedia/transcode/patches/patch-ai b/multimedia/transcode/patches/patch-ai
deleted file mode 100644
index a8c2fbf45ff..00000000000
--- a/multimedia/transcode/patches/patch-ai
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2005/10/10 21:23:24 joerg Exp $
-
-diff -rcp import/nuv/rtjpeg_vid_plugin.c import/nuv/rtjpeg_vid_plugin.c
-*** import/nuv/rtjpeg_vid_plugin.c	Tue Apr  8 20:50:11 2003
---- import/nuv/rtjpeg_vid_plugin.c	Mon Jun  9 17:47:40 2003
-*************** int rtjpeg_vid_open(char *tplorg)
-*** 108,114 ****
-      regions[0].end   = -1;
-    }
-  
-! #if defined(__FreeBSD__) || defined(__APPLE__) 
-    rtjpeg_vid_file=open(tplorg, O_RDONLY);
-  #else 
-    rtjpeg_vid_file=open(tplorg, O_RDONLY|O_LARGEFILE);
---- 108,114 ----
-      regions[0].end   = -1;
-    }
-  
-! #if defined(__FreeBSD__) || defined(__APPLE__) || defined(__NetBSD__) || defined(__DragonFly__)
-    rtjpeg_vid_file=open(tplorg, O_RDONLY);
-  #else 
-    rtjpeg_vid_file=open(tplorg, O_RDONLY|O_LARGEFILE);
diff --git a/multimedia/transcode/patches/patch-aj b/multimedia/transcode/patches/patch-aj
deleted file mode 100644
index 99152d60581..00000000000
--- a/multimedia/transcode/patches/patch-aj
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aj,v 1.1.1.1 2004/05/10 13:47:08 wiz Exp $
-
-diff -rcp src/dl_loader.c src/dl_loader.c
-*** src/dl_loader.c	Wed Apr 30 18:14:28 2003
---- src/dl_loader.c	Mon Jun  9 17:45:34 2003
-*************** int tca_import(int opt, void *para1, voi
-*** 128,134 ****
-  
-  void *load_module(char *mod_name, int mode)
-  {
-! #if defined(__FreeBSD__) || defined (__APPLE__)
-    const
-  #endif  
-    char *error;
---- 128,134 ----
-  
-  void *load_module(char *mod_name, int mode)
-  {
-! #if defined(__FreeBSD__) || defined (__APPLE__) || defined(__NetBSD__)
-    const
-  #endif  
-    char *error;
diff --git a/multimedia/transcode/patches/patch-ak b/multimedia/transcode/patches/patch-ak
deleted file mode 100644
index a6eb4f54924..00000000000
--- a/multimedia/transcode/patches/patch-ak
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ak,v 1.1.1.1 2004/05/10 13:47:08 wiz Exp $
-
-diff -rcp src/filter.c src/filter.c
-*** src/filter.c	Mon May 12 05:03:00 2003
---- src/filter.c	Mon Jun  9 17:45:39 2003
-*************** int filter_unquote_options(char *options
-*** 127,133 ****
-  }
-  
-  int load_plugin(char *path) {
-! #if defined(__FreeBSD__) || defined (__APPLE__)
-    const
-  #endif    
-    char *error;
---- 127,133 ----
-  }
-  
-  int load_plugin(char *path) {
-! #if defined(__FreeBSD__) || defined (__APPLE__) || defined(__NetBSD__)
-    const
-  #endif    
-    char *error;
diff --git a/multimedia/transcode/patches/patch-al b/multimedia/transcode/patches/patch-al
deleted file mode 100644
index 926f66304db..00000000000
--- a/multimedia/transcode/patches/patch-al
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-al,v 1.1.1.1 2004/05/10 13:47:08 wiz Exp $
-
-diff -rcp src/iodir.c src/iodir.c
-*** src/iodir.c	Sun Mar  9 00:42:49 2003
---- src/iodir.c	Mon Jun  9 17:45:31 2003
-***************
-*** 25,31 ****
-  #include <dirent.h>
-  #include "ioaux.h"
-  
-! #if defined(__bsdi__) || defined(__FreeBSD__)
-  typedef	off_t off64_t;
-  #define	lseek64 lseek
-  #endif
---- 25,31 ----
-  #include <dirent.h>
-  #include "ioaux.h"
-  
-! #if defined(__bsdi__) || defined(__FreeBSD__) || defined(__NetBSD__)
-  typedef	off_t off64_t;
-  #define	lseek64 lseek
-  #endif
diff --git a/multimedia/transcode/patches/patch-an b/multimedia/transcode/patches/patch-an
deleted file mode 100644
index 01df579f652..00000000000
--- a/multimedia/transcode/patches/patch-an
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-an,v 1.1.1.1 2004/05/10 13:47:08 wiz Exp $
-
-diff -rcp tools/tcmodinfo.c tools/tcmodinfo.c
-*** tools/tcmodinfo.c	Mon May 12 19:44:12 2003
---- tools/tcmodinfo.c	Mon Jun  9 17:48:49 2003
-*************** void tc_error(char *string)
-*** 102,108 ****
-  
-  void *load_module(char *mod_name, char *mod_path, int mode)
-  {
-! #if defined(__FreeBSD__) || defined (__APPLE__)
-    const
-  #endif  
-    char *error;
---- 102,108 ----
-  
-  void *load_module(char *mod_name, char *mod_path, int mode)
-  {
-! #if defined(__FreeBSD__) || defined (__APPLE__) || defined(__NetBSD__)
-    const
-  #endif  
-    char *error;
-*************** void *load_module(char *mod_name, char *
-*** 186,192 ****
-  
-  
-  int load_plugin(char *path, int id) {
-! #if defined(__FreeBSD__) || defined(__APPLE__)
-    const
-  #endif    
-    char *error;
---- 186,192 ----
-  
-  
-  int load_plugin(char *path, int id) {
-! #if defined(__FreeBSD__) || defined(__APPLE__) || defined(__NetBSD__)
-    const
-  #endif    
-    char *error;
diff --git a/multimedia/transcode/patches/patch-ao b/multimedia/transcode/patches/patch-ao
deleted file mode 100644
index 94e7bbb718c..00000000000
--- a/multimedia/transcode/patches/patch-ao
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ao,v 1.1.1.1 2004/05/10 13:47:08 wiz Exp $
-
---- avilib/Makefile.am	2004-03-26 19:14:20.000000000 +0000
-+++ avilib/Makefile.am	2004-03-26 19:14:30.000000000 +0000
-@@ -3,12 +3,12 @@
- AUTOMAKE_OPTIONS = 1.3 foreign
- DEFAULT_INCLUDES = -I$(top_srcdir) -I$(srcdir) -I$(top_builddir) -I.
- 
--noinst_LIBRARIES = libavi.a
-+noinst_LTLIBRARIES = libavi.la
- 
- INCLUDES = -I./
- 
- CFLAGS=-funroll-loops -ffast-math -DLINUX -Wall @CFLAGS@
--libavi_a_SOURCES = avilib.c avidump.c avimisc.c
-+libavi_la_SOURCES = avilib.c avidump.c avimisc.c
- 
- EXTRA_DIST = avilib.h README.avilib os.h
- 
diff --git a/multimedia/transcode/patches/patch-ap b/multimedia/transcode/patches/patch-ap
deleted file mode 100644
index 62b884e9049..00000000000
--- a/multimedia/transcode/patches/patch-ap
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ap,v 1.1.1.1 2004/05/10 13:47:08 wiz Exp $
-
---- ffmpeg/libavcodec/Makefile.am	2004-03-26 19:15:46.000000000 +0000
-+++ ffmpeg/libavcodec/Makefile.am	2004-03-26 19:15:58.000000000 +0000
-@@ -34,9 +34,9 @@
- 
- AM_CFLAGS = -O2 -g -Wall -ffast-math $(ALTIVEC) $(X86) $(MMX) -DHAVE_AV_CONFIG_H -D_GNU_SOURCE --include=$(top_srcdir)/ffmpeg/av_config.h
- 
--noinst_LIBRARIES = libtcavcodec.a
-+noinst_LTLIBRARIES = libtcavcodec.la
- 
--libtcavcodec_a_SOURCES = \
-+libtcavcodec_la_SOURCES = \
-       common.c utils.c mem.c allcodecs.c \
-       mpegvideo.c jrevdct.c jfdctfst.c jfdctint.c \
-       mpegaudio.c ac3enc.c mjpeg.c resample.c dsputil.c \
diff --git a/multimedia/transcode/patches/patch-as b/multimedia/transcode/patches/patch-as
deleted file mode 100644
index 45a67428be4..00000000000
--- a/multimedia/transcode/patches/patch-as
+++ /dev/null
@@ -1,55 +0,0 @@
-$NetBSD: patch-as,v 1.1.1.1 2004/05/10 13:47:09 wiz Exp $
-
---- src/decoder.c.orig	2003-12-20 11:49:22.000000000 +0000
-+++ src/decoder.c	2004-03-28 09:16:35.000000000 +0000
-@@ -119,16 +119,12 @@
-   }
- 
-   //wait for threads to terminate
--#ifdef BROKEN_PTHREADS // Used to be MacOSX specific; kernel 2.6 as well?
-   pthread_cond_signal(&vframe_list_full_cv);
--#endif
-   cc1=pthread_join(vthread, &status);
-   
-   if(verbose & TC_DEBUG) fprintf(stderr, "(%s) video thread exit (ret_code=%d) (status_code=%d)\n", __FILE__, cc1, (int) status);
-   
--#ifdef BROKEN_PTHREADS // Used to be MacOSX specific; kernel 2.6 as well?
-   pthread_cond_signal(&aframe_list_full_cv);
--#endif
-   cc2=pthread_join(athread, &status);
-   
-   if(verbose & TC_DEBUG) fprintf(stderr, "(%s) audio thread exit (ret_code=%d) (status_code=%d)\n", __FILE__, cc2, (int) status);
-@@ -467,6 +463,7 @@
-     pthread_testcancel();
- 
-     //check buffer fill level
-+    pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
-     pthread_mutex_lock(&vframe_list_lock);
-     
-     while(vframe_fill_level(TC_BUFFER_FULL)) {
-@@ -481,7 +478,9 @@
- 	  pthread_exit( (int *) 11);
- 	}
-     }
-+
-     pthread_mutex_unlock(&vframe_list_lock);
-+    pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
-     
-     // get a frame buffer or wait
-     while((ptr = vframe_register(i))==NULL) {
-@@ -655,6 +654,7 @@
-     pthread_testcancel();
-     
-     //check buffer fill level
-+    pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
-     pthread_mutex_lock(&aframe_list_lock);
-     
-     while(aframe_fill_level(TC_BUFFER_FULL)) {
-@@ -671,6 +671,7 @@
-     }
-     
-     pthread_mutex_unlock(&aframe_list_lock);
-+    pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
-     
-     // get a frame buffer or wait
-     while((ptr = aframe_register(i))==NULL) {
diff --git a/multimedia/transcode/patches/patch-at b/multimedia/transcode/patches/patch-at
deleted file mode 100644
index 89ca3d9e45b..00000000000
--- a/multimedia/transcode/patches/patch-at
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-at,v 1.1 2004/05/12 16:19:32 drochner Exp $
-
---- bbmpeg/Makefile.am.orig	2003-09-15 16:30:20.000000000 +0200
-+++ bbmpeg/Makefile.am	2004-05-12 18:38:26.000000000 +0200
-@@ -3,7 +3,7 @@
- AUTOMAKE_OPTIONS = 1.3 foreign
- DEFAULT_INCLUDES = -I$(top_srcdir) -I$(srcdir) -I$(top_builddir) -I. 
- 
--noinst_LIBRARIES = libbbmpeg.a
-+noinst_LTLIBRARIES = libbbmpeg.la
- 
- if HAVE_ASM_NASM
- BB_SRC2 = fdct_mmx.s idct_mmx.s quant_mmx.s motion_mmx.s variance_mmx.s
-@@ -20,7 +20,7 @@
- 
- CFLAGS = -funroll-loops -ffast-math @CFLAGS@ $(MMX)
- 
--libbbmpeg_a_SOURCES = dovideo.c params.c bits.c puthdr.c putpic.c putmpg.c putvlc.c stats.c quantize.c predict.c ratectl.c idct.c motion.c transfrm.c fdctref.c resize.c $(BB_SRC1) $(BB_SRC2) $(BB_SRC3)
-+libbbmpeg_la_SOURCES = dovideo.c params.c bits.c puthdr.c putpic.c putmpg.c putvlc.c stats.c quantize.c predict.c ratectl.c idct.c motion.c transfrm.c fdctref.c resize.c $(BB_SRC1) $(BB_SRC2) $(BB_SRC3)
- 
- noinst_HEADERS = mtable.h mplex.h mmx.h main.h imgresample.h gmo_read.h encaudio.h consts.h consts1.h common.h bbencode.h 
- 
-@@ -60,7 +60,9 @@
- ASM = @NASM@
- ASMFLAGS = @NASMFLAGS@
- 
--%.o: %.s ;	$(ASM) -g $(ASMFLAGS) -o $@ $<
-+STRIP_FPIC = sh $(top_srcdir)/strip_fPIC.sh
-+
-+%.lo: %.s ;	$(LIBTOOL) --tag=CC --mode=compile $(STRIP_FPIC) $(ASM) $(ASMFLAGS) -o $@ $<
- 
- 
- 
diff --git a/multimedia/transcode/patches/patch-au b/multimedia/transcode/patches/patch-au
deleted file mode 100644
index edf7804d0d0..00000000000
--- a/multimedia/transcode/patches/patch-au
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-au,v 1.1 2004/05/12 16:19:32 drochner Exp $
-
---- aclib/Makefile.am.orig	2003-09-15 16:30:20.000000000 +0200
-+++ aclib/Makefile.am	2004-05-12 18:27:06.000000000 +0200
-@@ -2,7 +2,7 @@
- 
- AUTOMAKE_OPTIONS = 1.3 foreign
- 
--noinst_LIBRARIES = libac.a
-+noinst_LTLIBRARIES = libac.la
- 
- if HAVE_ASM_NASM
- ASM_SRC = memcpy.s rescale.s average.s swap.s asm_io.s
-@@ -10,7 +10,7 @@
- 
- CFLAGS = -funroll-loops -ffast-math -DLINUX @CFLAGS@
- 
--libac_a_SOURCES = cputest.c $(ASM_SRC)
-+libac_la_SOURCES = cputest.c $(ASM_SRC)
- 
- EXTRA_DIST = \
-   ac.h \
-@@ -26,5 +26,7 @@
- ASM = @NASM@
- ASMFLAGS = @NASMFLAGS@ -g
- 
--%.o: %.s ;	$(ASM) $(ASMFLAGS) -o $@ $<
-+STRIP_FPIC = sh $(top_srcdir)/strip_fPIC.sh
-+
-+%.lo: %.s ;	$(LIBTOOL) --tag=CC --mode=compile $(STRIP_FPIC) $(ASM) $(ASMFLAGS) -o $@ $<
- 
diff --git a/multimedia/transcode/patches/patch-av b/multimedia/transcode/patches/patch-av
deleted file mode 100644
index 488d5604e74..00000000000
--- a/multimedia/transcode/patches/patch-av
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-av,v 1.1 2004/06/06 02:28:33 sekiya Exp $
-
---- filter/filter_modfps.c.orig	2003-08-19 01:08:57.000000000 +0900
-+++ filter/filter_modfps.c	2004-06-02 21:26:24.000000000 +0900
-@@ -77,6 +77,13 @@
- #include "framebuffer.h"
- #include "optstr.h"
- 
-+#if !defined(HAVE_LRINTF)
-+static inline long int lrint(double x)
-+{
-+    return (long)(rint(x));
-+}
-+#endif
-+
- static int show_results=0;
- 
- /*-------------------------------------------------
diff --git a/multimedia/transcode/patches/patch-aw b/multimedia/transcode/patches/patch-aw
deleted file mode 100644
index 6e5d3fa738d..00000000000
--- a/multimedia/transcode/patches/patch-aw
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-aw,v 1.2 2005/06/19 10:39:23 hira Exp $
-
---- import/Makefile.am.orig	2003-12-20 20:49:13.000000000 +0900
-+++ import/Makefile.am	2004-08-29 09:15:09.000000000 +0900
-@@ -124,11 +124,11 @@
- 
- import_ac3_la_SOURCES = import_ac3.c ioaux.c ac3scan.c
- import_ac3_la_LDFLAGS =  -module -avoid-version 
--import_ac3_la_LIBADD  = $(AC3_LIB) -lm
-+import_ac3_la_LIBADD  = -lm
- 
- import_vdrac3_la_SOURCES = import_vdrac3.c ioaux.c ac3scan.c
- import_vdrac3_la_LDFLAGS =  -module -avoid-version 
--import_vdrac3_la_LIBADD  = $(AC3_LIB) -lm
-+import_vdrac3_la_LIBADD  = -lm
- 
- a52_decore_la_SOURCES = a52_decore.c ioaux.c
- a52_decore_la_LDFLAGS =  -module -avoid-version 
-@@ -148,11 +148,11 @@
- 
- import_vob_la_SOURCES = import_vob.c ac3scan.c clone.c ioaux.c frame_info.c ivtc.c
- import_vob_la_LDFLAGS =	 -module -avoid-version 
--import_vob_la_LIBADD = $(AC3_LIB) -lm
-+import_vob_la_LIBADD = -lm
- 
- import_dvd_la_SOURCES = import_dvd.c ac3scan.c dvd_reader.c clone.c ioaux.c frame_info.c ivtc.c
- import_dvd_la_LDFLAGS =  -module -avoid-version 
--import_dvd_la_LIBADD =  @DVDREAD_LIBS@ $(AC3_LIB) -lm
-+import_dvd_la_LIBADD =  @DVDREAD_LIBS@ -lm
- 
- import_dv_la_SOURCES = import_dv.c 
- import_dv_la_LDFLAGS =  -module -avoid-version 
diff --git a/multimedia/transcode/patches/patch-ax b/multimedia/transcode/patches/patch-ax
deleted file mode 100644
index f06b7f33e1f..00000000000
--- a/multimedia/transcode/patches/patch-ax
+++ /dev/null
@@ -1,141 +0,0 @@
-$NetBSD: patch-ax,v 1.2 2005/06/19 10:39:23 hira Exp $
-
---- export/Makefile.am.orig	2003-12-20 20:49:11.000000000 +0900
-+++ export/Makefile.am	2004-08-29 09:25:46.000000000 +0900
-@@ -3,7 +3,6 @@
- AUTOMAKE_OPTIONS = 1.3 foreign
- DEFAULT_INCLUDES = -I$(top_srcdir) -I$(srcdir) -I$(top_builddir) -I.
- 
--AC3_LIB=-L../libac3 -lac3_tc
- AC3_INC=-I../libac3 -I$(srcdir)/../libac3
- 
- INCLUDES = -I./ -I../ -I$(srcdir)/.. -I../src -I$(srcdir)/../src -I../avilib -I$(srcdir)/../avilib @AVIFILE_CFLAGS@ @LAME_CFLAGS@ $(AC3_INC) @QT_CFLAGS@ -Wall @DV_CFLAGS@ -I../libvo -I$(srcdir)/../libvo @MJPEG_CFLAGS@ @LIBFAME_CFLAGS@ @MAGICK_CFLAGS@ @LIBJPEG_CFLAGS@ -I../libioaux -I$(srcdir)/../libioaux @LZO_CFLAGS@ @PVM3_CFLAGS@ -I../pvm3
-@@ -106,7 +105,7 @@
- 
- export_mp1e_la_SOURCES = export_mp1e.c vid_aux.c
- export_mp1e_la_LDFLAGS =  -module -avoid-version 
--export_mp1e_la_LIBADD  = -L../libvo -lvout -lm
-+export_mp1e_la_LIBADD  = -lm
- 
- export_ogg_la_SOURCES = export_ogg.c
- export_ogg_la_LDFLAGS =  -module -avoid-version 
-@@ -129,7 +128,7 @@
- 
- export_fame_la_SOURCES = export_fame.c aud_aux.c
- export_fame_la_LDFLAGS =  -module -avoid-version 
--export_fame_la_LIBADD = @LAME_LIBS@ @LIBFAME_LIBS@ $(AC3_LIB) -lm
-+export_fame_la_LIBADD = @LAME_LIBS@ @LIBFAME_LIBS@ -lm
- 
- export_lame_la_SOURCES = export_lame.c
- export_lame_la_LDFLAGS =  -module -avoid-version 
-@@ -137,55 +136,55 @@
- 
- export_af6_la_SOURCES = export_af6.cpp af6_aux.cpp aud_aux.c
- export_af6_la_LDFLAGS =  -module -avoid-version 
--export_af6_la_LIBADD = @LAME_LIBS@ @AVIFILE_LIBS@ -lstdc++ $(AC3_LIB) -lm 
-+export_af6_la_LIBADD = @LAME_LIBS@ @AVIFILE_LIBS@ -lstdc++ -lm 
- 
- export_divx4_la_SOURCES = export_divx4.c aud_aux.c divx4_vbr.c
- export_divx4_la_LDFLAGS =  -module -avoid-version 
--export_divx4_la_LIBADD = @LAME_LIBS@ $(AC3_LIB) -lm
-+export_divx4_la_LIBADD = @LAME_LIBS@ -lm
- 
- export_divx5_la_SOURCES = export_divx5.c aud_aux.c divx4_vbr.c
- export_divx5_la_LDFLAGS =  -module -avoid-version 
--export_divx5_la_LIBADD = @LAME_LIBS@ $(AC3_LIB) -lm
-+export_divx5_la_LIBADD = @LAME_LIBS@ -lm
- 
- export_divx5raw_la_SOURCES = export_divx5raw.c aud_aux.c divx4_vbr.c
- export_divx5raw_la_LDFLAGS =  -module -avoid-version 
--export_divx5raw_la_LIBADD = @LAME_LIBS@ $(AC3_LIB) -lm
-+export_divx5raw_la_LIBADD = @LAME_LIBS@ -lm
- 
- export_ffmpeg_la_SOURCES = export_ffmpeg.c aud_aux.c ffmpeg_cfg.c vid_aux.c
- export_ffmpeg_la_LDFLAGS =  -module -avoid-version 
--export_ffmpeg_la_LIBADD = @LAME_LIBS@ -L../libvo -lvout $(AC3_LIB) -lm
-+export_ffmpeg_la_LIBADD = @LAME_LIBS@ -lm
- 
- export_divx4raw_la_SOURCES = export_divx4raw.c aud_aux.c divx4_vbr.c
- export_divx4raw_la_LDFLAGS =  -module -avoid-version 
--export_divx4raw_la_LIBADD =  @LAME_LIBS@ $(AC3_LIB) -lm
-+export_divx4raw_la_LIBADD =  @LAME_LIBS@ -lm
- 
- export_xvid2_la_SOURCES = export_xvid2.c aud_aux.c xvid_vbr.c
- export_xvid2_la_LDFLAGS =  -module -avoid-version 
--export_xvid2_la_LIBADD = @LAME_LIBS@ $(AC3_LIB) -lm
-+export_xvid2_la_LIBADD = @LAME_LIBS@ -lm
- 
- export_xvid3_la_SOURCES = export_xvid3.c aud_aux.c xvid_vbr.c
- export_xvid3_la_LDFLAGS =  -module -avoid-version 
--export_xvid3_la_LIBADD = @LAME_LIBS@ $(AC3_LIB) -lm
-+export_xvid3_la_LIBADD = @LAME_LIBS@ -lm
- 
- export_xvid4_la_SOURCES = export_xvid4.c aud_aux.c
- export_xvid4_la_LDFLAGS =  -module -avoid-version 
--export_xvid4_la_LIBADD = @LAME_LIBS@ $(AC3_LIB) -lm
-+export_xvid4_la_LIBADD = @LAME_LIBS@ -lm
- 
- export_raw_la_SOURCES = export_raw.c aud_aux.c
- export_raw_la_LDFLAGS =  -module -avoid-version 
--export_raw_la_LIBADD = @LAME_LIBS@ $(AC3_LIB) -lm
-+export_raw_la_LIBADD = @LAME_LIBS@ -lm
- 
- export_lzo_la_SOURCES = export_lzo.c aud_aux.c
- export_lzo_la_LDFLAGS =  -module -avoid-version 
--export_lzo_la_LIBADD = @LAME_LIBS@ @LZO_LIBS@ $(AC3_LIB) -lm
-+export_lzo_la_LIBADD = @LAME_LIBS@ @LZO_LIBS@ -lm
- 
- export_debugppm_la_SOURCES = export_debugppm.c aud_aux.c
- export_debugppm_la_LDFLAGS =  -module -avoid-version 
--export_debugppm_la_LIBADD = @LAME_LIBS@ $(AC3_LIB) -L../libvo -lvout -lm
-+export_debugppm_la_LIBADD = @LAME_LIBS@ -lm
- 
- export_ppm_la_SOURCES = export_ppm.c aud_aux.c
- export_ppm_la_LDFLAGS =  -module -avoid-version 
--export_ppm_la_LIBADD = @LAME_LIBS@ $(AC3_LIB) -L../libvo -lvout -lm
-+export_ppm_la_LIBADD = @LAME_LIBS@ -lm
- 
- export_mov_la_SOURCES = export_mov.c 
- export_mov_la_LDFLAGS =  -module -avoid-version 
-@@ -193,34 +192,34 @@
- 
- export_dvraw_la_SOURCES = export_dvraw.c vid_aux.c
- export_dvraw_la_LDFLAGS =  -module -avoid-version 
--export_dvraw_la_LIBADD = -L../libdvenc -ldvenc @DV_LIBS@ -L../libvo -lvout -lm
-+export_dvraw_la_LIBADD = -L../libdvenc -ldvenc @DV_LIBS@ -lm
- 
- export_dv_la_SOURCES = export_dv.c aud_aux.c vid_aux.c
- export_dv_la_LDFLAGS =  -module -avoid-version 
--export_dv_la_LIBADD = @LAME_LIBS@ -L../libdvenc -ldvenc @DV_LIBS@ $(AC3_LIB)  -L../libvo -lvout -lm 
-+export_dv_la_LIBADD = @LAME_LIBS@ -L../libdvenc -ldvenc @DV_LIBS@ -lm 
- 
- export_yuv4mpeg_la_SOURCES = export_yuv4mpeg.c aud_aux.c vid_aux.c
- export_yuv4mpeg_la_LDFLAGS =  -module -avoid-version 
--export_yuv4mpeg_la_LIBADD = @LAME_LIBS@ @MJPEG_LIBS@ -L../libvo -lvout $(AC3_LIB) -lm
-+export_yuv4mpeg_la_LIBADD = @LAME_LIBS@ @MJPEG_LIBS@ -lm
- 
- export_mpeg_la_SOURCES = export_mpeg.c vid_aux.c
- export_mpeg_la_LDFLAGS =  -module -avoid-version 
--export_mpeg_la_LIBADD = -L../bbmpeg -lbbmpeg -L../ffmpeg/libavcodec/ -ltcavcodec -L../libvo -lvout -lm
-+export_mpeg_la_LIBADD = -L../bbmpeg -lbbmpeg -L../ffmpeg/libavcodec/ -ltcavcodec -lm
- 
- export_pvm_la_SOURCES = export_pvm.c ../pvm3/pvm_interface.c ../pvm3/pvm_parser.c ../pvm3/external_codec.c ../pvm3/vob_pack_unpack.c
- export_pvm_la_LDFLAGS =  -module -avoid-version
- 
- export_mjpeg_la_SOURCES = export_mjpeg.c vid_aux.c aud_aux.c 
- export_mjpeg_la_LDFLAGS =  -module -avoid-version 
--export_mjpeg_la_LIBADD = @LIBJPEG_LIBS@ @LAME_LIBS@ -L../libvo -lvout $(AC3_LIB) -lm
-+export_mjpeg_la_LIBADD = @LIBJPEG_LIBS@ @LAME_LIBS@ -lm
- 
- export_mpeg2enc_la_SOURCES = export_mpeg2enc.c vid_aux.c
- export_mpeg2enc_la_LDFLAGS =  -module -avoid-version 
--export_mpeg2enc_la_LIBADD = @MJPEG_LIBS@ -L../libvo -lvout -lm
-+export_mpeg2enc_la_LIBADD = @MJPEG_LIBS@ -lm
- 
- export_im_la_SOURCES = export_im.c vid_aux.c
- export_im_la_LDFLAGS =  -module -avoid-version 
--export_im_la_LIBADD = @MAGICK_LIBS@ -L../libvo -lvout -lm 
-+export_im_la_LIBADD = @MAGICK_LIBS@ -lm 
- 
- pkg_DATA = export_af6.conf xvid2.cfg xvid3.cfg xvid4.cfg
- 
diff --git a/multimedia/transcode/patches/patch-ay b/multimedia/transcode/patches/patch-ay
deleted file mode 100644
index 2005ea70710..00000000000
--- a/multimedia/transcode/patches/patch-ay
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ay,v 1.2 2005/06/19 10:39:23 hira Exp $
-
---- import/Makefile.in.orig	2004-01-07 05:39:15.000000000 +0900
-+++ import/Makefile.in	2004-08-29 09:15:42.000000000 +0900
-@@ -413,11 +413,11 @@
- 
- import_ac3_la_SOURCES = import_ac3.c ioaux.c ac3scan.c
- import_ac3_la_LDFLAGS = -module -avoid-version 
--import_ac3_la_LIBADD = $(AC3_LIB) -lm
-+import_ac3_la_LIBADD = -lm
- 
- import_vdrac3_la_SOURCES = import_vdrac3.c ioaux.c ac3scan.c
- import_vdrac3_la_LDFLAGS = -module -avoid-version 
--import_vdrac3_la_LIBADD = $(AC3_LIB) -lm
-+import_vdrac3_la_LIBADD = -lm
- 
- a52_decore_la_SOURCES = a52_decore.c ioaux.c
- a52_decore_la_LDFLAGS = -module -avoid-version 
-@@ -437,11 +437,11 @@
- 
- import_vob_la_SOURCES = import_vob.c ac3scan.c clone.c ioaux.c frame_info.c ivtc.c
- import_vob_la_LDFLAGS = -module -avoid-version 
--import_vob_la_LIBADD = $(AC3_LIB) -lm
-+import_vob_la_LIBADD = -lm
- 
- import_dvd_la_SOURCES = import_dvd.c ac3scan.c dvd_reader.c clone.c ioaux.c frame_info.c ivtc.c
- import_dvd_la_LDFLAGS = -module -avoid-version 
--import_dvd_la_LIBADD = @DVDREAD_LIBS@ $(AC3_LIB) -lm
-+import_dvd_la_LIBADD = @DVDREAD_LIBS@ -lm
- 
- import_dv_la_SOURCES = import_dv.c 
- import_dv_la_LDFLAGS = -module -avoid-version 
diff --git a/multimedia/transcode/patches/patch-ba b/multimedia/transcode/patches/patch-ba
deleted file mode 100644
index c119afc6d2d..00000000000
--- a/multimedia/transcode/patches/patch-ba
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-ba,v 1.2 2005/06/19 10:39:23 hira Exp $
-
---- filter/Makefile.am.orig	2004-08-29 09:04:39.000000000 +0900
-+++ filter/Makefile.am	2004-08-29 09:05:27.000000000 +0900
-@@ -168,11 +168,11 @@
- 
- filter_smartbob_la_SOURCES = filter_smartbob.c
- filter_smartbob_la_LDFLAGS =  -module -avoid-version 
--filter_smartbob_la_LIBADD = -L../libvo -lvout ../export/vid_aux.lo
-+filter_smartbob_la_LIBADD = ../export/vid_aux.lo
- 
- filter_smartdeinter_la_SOURCES = filter_smartdeinter.c
- filter_smartdeinter_la_LDFLAGS =  -module -avoid-version 
--filter_smartdeinter_la_LIBADD = -L../libvo -lvout ../export/vid_aux.lo
-+filter_smartdeinter_la_LIBADD = ../export/vid_aux.lo
- 
- filter_normalize_la_SOURCES = filter_normalize.c
- filter_normalize_la_LDFLAGS =  -module -avoid-version 
-@@ -180,18 +180,18 @@
- 
- filter_compare_la_SOURCES = filter_compare.c
- filter_compare_la_LDFLAGS =  -module -avoid-version
--filter_compare_la_LIBADD = @MAGICK_LIBS@ -L../libvo -lvout ../export/vid_aux.lo
-+filter_compare_la_LIBADD = @MAGICK_LIBS@ ../export/vid_aux.lo
- 
- filter_logo_la_SOURCES = filter_logo.c
- filter_logo_la_LDFLAGS =  -module -avoid-version
--filter_logo_la_LIBADD = @MAGICK_LIBS@ -L../libvo -lvout ../export/vid_aux.lo
-+filter_logo_la_LIBADD = @MAGICK_LIBS@ ../export/vid_aux.lo
- 
- filter_xsharpen_la_SOURCES = filter_xsharpen.c
- filter_xsharpen_la_LDFLAGS =  -module -avoid-version 
- 
- filter_msharpen_la_SOURCES = filter_msharpen.c
- filter_msharpen_la_LDFLAGS = -module -avoid-version
--filter_msharpen_la_LIBADD = -L../libvo -lvout ../export/vid_aux.lo
-+filter_msharpen_la_LIBADD = ../export/vid_aux.lo
- 
- filter_logoaway_la_SOURCES = filter_logoaway.c
- filter_logoaway_la_LDFLAGS =  -module -avoid-version 
-@@ -217,7 +217,7 @@
- 
- filter_whitebalance_la_SOURCES = filter_whitebalance.c
- filter_whitebalance_la_LDFLAGS = -module -avoid-version
--filter_whitebalance_la_LIBADD = -L../libvo -lvout ../export/vid_aux.lo -lm
-+filter_whitebalance_la_LIBADD = ../export/vid_aux.lo -lm
- 
- EXTRA_DIST =  parse_csv.awk filter_list.awk mmx.h
- 
diff --git a/multimedia/transcode/patches/patch-bb b/multimedia/transcode/patches/patch-bb
deleted file mode 100644
index e64adda7c6c..00000000000
--- a/multimedia/transcode/patches/patch-bb
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-bb,v 1.2 2005/06/19 10:39:23 hira Exp $
-
---- filter/Makefile.in.orig	2004-08-29 09:04:45.000000000 +0900
-+++ filter/Makefile.in	2004-08-29 09:05:59.000000000 +0900
-@@ -468,11 +468,11 @@
- 
- filter_smartbob_la_SOURCES = filter_smartbob.c
- filter_smartbob_la_LDFLAGS = -module -avoid-version 
--filter_smartbob_la_LIBADD = -L../libvo -lvout ../export/vid_aux.lo
-+filter_smartbob_la_LIBADD = ../export/vid_aux.lo
- 
- filter_smartdeinter_la_SOURCES = filter_smartdeinter.c
- filter_smartdeinter_la_LDFLAGS = -module -avoid-version 
--filter_smartdeinter_la_LIBADD = -L../libvo -lvout ../export/vid_aux.lo
-+filter_smartdeinter_la_LIBADD = ../export/vid_aux.lo
- 
- filter_normalize_la_SOURCES = filter_normalize.c
- filter_normalize_la_LDFLAGS = -module -avoid-version 
-@@ -480,18 +480,18 @@
- 
- filter_compare_la_SOURCES = filter_compare.c
- filter_compare_la_LDFLAGS = -module -avoid-version
--filter_compare_la_LIBADD = @MAGICK_LIBS@ -L../libvo -lvout ../export/vid_aux.lo
-+filter_compare_la_LIBADD = @MAGICK_LIBS@ ../export/vid_aux.lo
- 
- filter_logo_la_SOURCES = filter_logo.c
- filter_logo_la_LDFLAGS = -module -avoid-version
--filter_logo_la_LIBADD = @MAGICK_LIBS@ -L../libvo -lvout ../export/vid_aux.lo
-+filter_logo_la_LIBADD = @MAGICK_LIBS@ ../export/vid_aux.lo
- 
- filter_xsharpen_la_SOURCES = filter_xsharpen.c
- filter_xsharpen_la_LDFLAGS = -module -avoid-version 
- 
- filter_msharpen_la_SOURCES = filter_msharpen.c
- filter_msharpen_la_LDFLAGS = -module -avoid-version
--filter_msharpen_la_LIBADD = -L../libvo -lvout ../export/vid_aux.lo
-+filter_msharpen_la_LIBADD = ../export/vid_aux.lo
- 
- filter_logoaway_la_SOURCES = filter_logoaway.c
- filter_logoaway_la_LDFLAGS = -module -avoid-version 
-@@ -517,7 +517,7 @@
- 
- filter_whitebalance_la_SOURCES = filter_whitebalance.c
- filter_whitebalance_la_LDFLAGS = -module -avoid-version
--filter_whitebalance_la_LIBADD = -L../libvo -lvout ../export/vid_aux.lo -lm
-+filter_whitebalance_la_LIBADD = ../export/vid_aux.lo -lm
- 
- EXTRA_DIST = parse_csv.awk filter_list.awk mmx.h
- 
diff --git a/multimedia/transcode/patches/patch-bc b/multimedia/transcode/patches/patch-bc
deleted file mode 100644
index cd987e8bbf4..00000000000
--- a/multimedia/transcode/patches/patch-bc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bc,v 1.2 2005/06/19 10:39:23 hira Exp $
-
---- src/Makefile.am.orig	2004-08-29 09:10:05.000000000 +0900
-+++ src/Makefile.am	2004-08-29 09:11:20.000000000 +0900
-@@ -13,7 +13,7 @@
- 
- #AM_LDFLAGS=`ar t ../ffmpeg/libavcodec/libtcavcodec.a | sed -e '/^__/d' -e 's@^@../ffmpeg/libavcodec/@' | tr '\n' ' '` `ar t ../avilib/libavi.a | sed -e '/^__/d' -e 's@^@../avilib/@' | tr '\n' ' '`
- 
--transcode_LDADD= @DLDARWINLIB@ @SUPPORTLIB@ -L../libioaux -ltcioaux -L../aclib -lac -L../ffmpeg/libavcodec -ltcavcodec -L../avilib -lavi -L../libvo -lvout -lm 
-+transcode_LDADD= @DLDARWINLIB@ @SUPPORTLIB@ -L../libioaux -ltcioaux -L../aclib -lac -L../ffmpeg/libavcodec -ltcavcodec -L../avilib -lavi -L../libvo -lvout -L../libac3 -lac3_tc -lm
- 
- EXTRA_DIST =  \
-    audio_trans.h \
diff --git a/multimedia/transcode/patches/patch-bd b/multimedia/transcode/patches/patch-bd
deleted file mode 100644
index 6cb280e9d1c..00000000000
--- a/multimedia/transcode/patches/patch-bd
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bd,v 1.2 2005/06/19 10:39:23 hira Exp $
-
---- src/Makefile.in.orig	2004-08-29 09:10:12.000000000 +0900
-+++ src/Makefile.in	2004-08-29 09:11:41.000000000 +0900
-@@ -321,7 +321,7 @@
- 
- 
- #AM_LDFLAGS=`ar t ../ffmpeg/libavcodec/libtcavcodec.a | sed -e '/^__/d' -e 's@^@../ffmpeg/libavcodec/@' | tr '\n' ' '` `ar t ../avilib/libavi.a | sed -e '/^__/d' -e 's@^@../avilib/@' | tr '\n' ' '`
--transcode_LDADD = @DLDARWINLIB@ @SUPPORTLIB@ -L../libioaux -ltcioaux -L../aclib -lac -L../ffmpeg/libavcodec -ltcavcodec -L../avilib -lavi -L../libvo -lvout -lm 
-+transcode_LDADD = @DLDARWINLIB@ @SUPPORTLIB@ -L../libioaux -ltcioaux -L../aclib -lac -L../ffmpeg/libavcodec -ltcavcodec -L../avilib -lavi -L../libvo -lvout -L../libac3 -lac3_tc -lm 
- 
- EXTRA_DIST = \
-    audio_trans.h \
diff --git a/multimedia/transcode/patches/patch-be b/multimedia/transcode/patches/patch-be
deleted file mode 100644
index 490de1b81e1..00000000000
--- a/multimedia/transcode/patches/patch-be
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-be,v 1.1 2005/10/10 21:23:24 joerg Exp $
-
---- configure.in.orig	2005-07-10 17:19:18.000000000 +0000
-+++ configure.in
-@@ -147,7 +147,7 @@ AC_CHECK_LIB(m, lrintf, AC_DEFINE([HAVE_
- 
- dnl Replace `main' with a function in pthread libs:
-  case "$host" in
--   *-*-freebsd*)
-+   *-*-freebsd* | *-*-dragonfly*)
-     pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
-     pthread_lib="-pthread"
-     ;;
-@@ -350,7 +350,7 @@ if test x$have_x86cpu = xtrue ; then
-  AC_MSG_CHECKING(for CMOV support)
-  if test "$enable_cmov_extension" != "no" ; then
-  case "$host" in
-- *-*-freebsd*)
-+ *-*-freebsd* | *-*-dragonfly*)
-   cpu_features=`grep -l CMOV /var/run/dmesg.boot`
-   if test X"$cpu_features" = X"/var/run/dmesg.boot" ; then
-     have_cmov=true
diff --git a/multimedia/transcode/patches/patch-bf b/multimedia/transcode/patches/patch-bf
deleted file mode 100644
index d4edcde2c9d..00000000000
--- a/multimedia/transcode/patches/patch-bf
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-bf,v 1.1 2005/10/10 21:23:24 joerg Exp $
-
---- filter/subtitler/frame_list.c.orig	2005-07-10 17:53:50.000000000 +0000
-+++ filter/subtitler/frame_list.c
-@@ -15,7 +15,7 @@ Foundation, Inc., 675 Mass Ave, Cambridg
- */
- 
- #include "subtitler.h"
--
-+#include <stdlib.h>
- 
- int hash(s)/* form hash value for string s */
- char *s;
-@@ -33,7 +33,7 @@ return(hashval % FRAME_HASH_SIZE);
- 
- char *strsave(char *s) /*save char array s somewhere*/
- {
--char *p, *malloc();
-+char *p;
- if(p = malloc( strlen(s) +  1) ) strcpy(p, s);
- return(p);
- }
diff --git a/multimedia/vlc/DESCR b/multimedia/vlc/DESCR
deleted file mode 100644
index 6ea7f1224c6..00000000000
--- a/multimedia/vlc/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-VideoLAN is a project of French students from the Ecole Centrale Paris
-and developers from all over the world. Its main goals is MPEG streaming
-on a network, but it also features a standalone multimedia player. The
-VideoLAN Server can stream video read from a hard disk, a DVD player,
-a satellite card or an MPEG 2 compression card, and unicast or multicast
-it on a network. The VideoLAN Client can read the stream from the network
-and display it. It can also be used to display video read locally on
-the computer : DVDs, VCDs, MPEG and DivX files and from a satellite
-card. It is multi-plaform : Linux, Windows, Mac OS X, BeOS, BSD, Solaris,
-QNX, iPaq... The VideoLAN Client and Server now have a full IPv6 support.
diff --git a/multimedia/vlc/MESSAGE.NetBSD b/multimedia/vlc/MESSAGE.NetBSD
deleted file mode 100644
index 190e5eb07b6..00000000000
--- a/multimedia/vlc/MESSAGE.NetBSD
+++ /dev/null
@@ -1,9 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.NetBSD,v 1.1.1.1 2004/03/29 10:30:29 grant Exp $
-
-You may need to increase the maximum number of shared memory pages
-(SHMMAXPGS) in your kernel to run ${PKGNAME}. One possible setting is:
-
-	options		SHMMAXPGS=32768
-
-===========================================================================
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
deleted file mode 100644
index 49833d5fdf4..00000000000
--- a/multimedia/vlc/Makefile
+++ /dev/null
@@ -1,101 +0,0 @@
-# $NetBSD: Makefile,v 1.21 2005/08/07 11:34:22 wiz Exp $
-#
-
-DISTNAME=		vlc-${VLC_VER}
-PKGREVISION=		4
-CATEGORIES=		multimedia
-MASTER_SITES=		http://download.videolan.org/pub/videolan/vlc/${VLC_VER}/
-EXTRACT_SUFX=		.tar.bz2
-
-MAINTAINER=		tech-pkg@NetBSD.org
-HOMEPAGE=		http://www.videolan.org/
-COMMENT=		VideoLAN Client
-
-USE_TOOLS+=		gmake
-USE_PKGLOCALEDIR=	yes
-GNU_CONFIGURE=		yes
-PTHREAD_OPTS+=		require
-
-VLC_VER=		0.7.2
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-CONFIGURE_ARGS+=        --disable-vcd
-.endif
-BUILDLINK_DEPENDS.vcdimager+=	vcdimager>=0.7.20nb1
-BUILDLINK_DEPENDS.ffmpeg+=	ffmpeg>=0.4.8nb1 # Postprocess fix
-
-CONFIGURE_ARGS+=	--disable-skins2
-CONFIGURE_ARGS+=	--disable-speex # needs unstable 1.1.x branch
-
-CONFIGURE_ARGS+=	--enable-dvb
-CONFIGURE_ARGS+=	--enable-flac
-CONFIGURE_ARGS+=	--disable-gtk
-CONFIGURE_ARGS+=	--with-ffmpeg-tree=${BUILDLINK_PREFIX.ffmpeg}/lib
-
-BUILD_DEFS+=		WITH_DVDCSS
-
-.if defined(WITH_DVDCSS) && !empty(WITH_DVDCSS:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=	--with-dvdcss=${BUILDLINK_PREFIX.libdvdcss}
-.include "../../multimedia/libdvdcss/buildlink3.mk"
-PLIST_SUBST+=		DVDCSS=
-.else
-CONFIGURE_ARGS+=	--disable-dvd
-PLIST_SUBST+=		DVDCSS="@comment "
-.endif
-
-pre-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/http/admin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/skins/default
-	${INSTALL_DATA} ${WRKSRC}/doc/vlc.1 ${PREFIX}/man/man1
-	${INSTALL_DATA} ${WRKSRC}/doc/vlc-config.1 ${PREFIX}/man/man1
-
-ORIGFNT=		/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf
-DEFAULT_FONT?=		${X11BASE}/lib/X11/fonts/TTF/luximb.ttf
-
-SUBST_CLASSES+=         oss fnt libav
-SUBST_STAGE.oss=        post-patch
-SUBST_SED.oss=		-e "s,/dev/dsp,${DEVOSSAUDIO},g"
-SUBST_FILES.oss+=	modules/access/v4l/v4l.c
-SUBST_FILES.oss+=	modules/audio_output/oss.c
-SUBST_FILES.oss+=	modules/gui/pda/pda_interface.c
-SUBST_FILES.oss+=	modules/gui/pda/pda.glade
-SUBST_FILES.oss+=	modules/gui/wxwindows/v4l.cpp
-SUBST_MESSAGE.oss=	"Fixing harcoded audio device."
-SUBST_STAGE.fnt=	post-patch
-SUBST_SED.fnt=		-e "s,${ORIGFNT},${DEFAULT_FONT},"
-SUBST_FILES.fnt=	modules/misc/freetype.c
-SUBST_MESSAGE.fnt=	"Fixing harcoded paths."
-SUBST_STAGE.libav=	post-patch
-SUBST_FILES.libav=	configure
-SUBST_SED.libav=	-e "s,libavcodec/libavcodec.a,libavcodec.a,g"
-
-BUILDLINK_TRANSFORM.ffmpeg+=	-e "s,include/ffmpeg,include/,g"
-
-.include "../../audio/flac/buildlink3.mk"
-.include "../../audio/lame/buildlink3.mk"
-.include "../../audio/liba52/buildlink3.mk"
-.include "../../audio/libcddb/buildlink3.mk"
-.include "../../audio/libid3tag/buildlink3.mk"
-.include "../../audio/libmad/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../converters/fribidi/buildlink3.mk"
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../misc/libcdio/buildlink3.mk"
-.include "../../multimedia/ffmpeg/buildlink3.mk"
-.include "../../multimedia/libdvdplay/buildlink3.mk"
-.include "../../multimedia/libdvbpsi/buildlink3.mk"
-.include "../../multimedia/libdvdread/buildlink3.mk"
-.include "../../multimedia/libmatroska/buildlink3.mk"
-.include "../../multimedia/libmpeg2/buildlink3.mk"
-.include "../../multimedia/libogg/buildlink3.mk"
-.include "../../net/openslp/buildlink3.mk"
-.include "../../sysutils/vcdimager-devel/buildlink3.mk"
-.include "../../x11/wxGTK/buildlink3.mk"
-
-.include "../../mk/ossaudio.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/vlc/PLIST.Linux-i386 b/multimedia/vlc/PLIST.Linux-i386
deleted file mode 100644
index 7f69a99c23a..00000000000
--- a/multimedia/vlc/PLIST.Linux-i386
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.Linux-i386,v 1.1 2005/03/05 14:24:48 grant Exp $
-lib/vlc/video_output/libfb_plugin.so
diff --git a/multimedia/vlc/PLIST.common b/multimedia/vlc/PLIST.common
deleted file mode 100644
index bad1a5d8784..00000000000
--- a/multimedia/vlc/PLIST.common
+++ /dev/null
@@ -1,274 +0,0 @@
-@comment $NetBSD: PLIST.common,v 1.1 2005/02/21 21:04:06 veego Exp $
-bin/vlc
-bin/vlc-config
-bin/wxvlc
-include/vlc/aout.h
-include/vlc/decoder.h
-include/vlc/input.h
-include/vlc/intf.h
-include/vlc/sout.h
-include/vlc/vlc.h
-include/vlc/vout.h
-lib/libvlc.a
-lib/vlc/access/libaccess_directory_plugin.so
-lib/vlc/access/libaccess_file_plugin.so
-lib/vlc/access/libaccess_ftp_plugin.so
-lib/vlc/access/libaccess_http_plugin.so
-lib/vlc/access/libaccess_mms_plugin.so
-lib/vlc/access/libaccess_tcp_plugin.so
-lib/vlc/access/libaccess_udp_plugin.so
-lib/vlc/access/libcddax_plugin.so
-${DVDCSS}lib/vlc/access/libdvd_plugin.so
-lib/vlc/access/libdvdplay_plugin.so
-lib/vlc/access/libdvdread_plugin.so
-lib/vlc/access/libslp_plugin.so
-lib/vlc/access/libvcdx_plugin.so
-lib/vlc/access_output/libaccess_output_dummy_plugin.so
-lib/vlc/access_output/libaccess_output_file_plugin.so
-lib/vlc/access_output/libaccess_output_http_plugin.so
-lib/vlc/access_output/libaccess_output_udp_plugin.so
-lib/vlc/audio_filter/liba52tofloat32_plugin.so
-lib/vlc/audio_filter/liba52tospdif_plugin.so
-lib/vlc/audio_filter/libbandlimited_resampler_plugin.so
-lib/vlc/audio_filter/libdtstospdif_plugin.so
-lib/vlc/audio_filter/libfixed32tofloat32_plugin.so
-lib/vlc/audio_filter/libfixed32tos16_plugin.so
-lib/vlc/audio_filter/libfloat32tos16_plugin.so
-lib/vlc/audio_filter/libfloat32tos8_plugin.so
-lib/vlc/audio_filter/libfloat32tou16_plugin.so
-lib/vlc/audio_filter/libfloat32tou8_plugin.so
-lib/vlc/audio_filter/libheadphone_channel_mixer_plugin.so
-lib/vlc/audio_filter/liblinear_resampler_plugin.so
-lib/vlc/audio_filter/libmpgatofixed32_plugin.so
-lib/vlc/audio_filter/libs16tofixed32_plugin.so
-lib/vlc/audio_filter/libs16tofloat32_plugin.so
-lib/vlc/audio_filter/libs16tofloat32swab_plugin.so
-lib/vlc/audio_filter/libs8tofloat32_plugin.so
-lib/vlc/audio_filter/libtrivial_channel_mixer_plugin.so
-lib/vlc/audio_filter/libtrivial_resampler_plugin.so
-lib/vlc/audio_filter/libu8tofixed32_plugin.so
-lib/vlc/audio_filter/libu8tofloat32_plugin.so
-lib/vlc/audio_filter/libugly_resampler_plugin.so
-lib/vlc/audio_mixer/libfloat32_mixer_plugin.so
-lib/vlc/audio_mixer/libspdif_mixer_plugin.so
-lib/vlc/audio_mixer/libtrivial_mixer_plugin.so
-lib/vlc/audio_output/libaout_file_plugin.so
-lib/vlc/audio_output/libaout_sdl_plugin.so
-lib/vlc/audio_output/liboss_plugin.so
-lib/vlc/codec/liba52_plugin.so
-lib/vlc/codec/libadpcm_plugin.so
-lib/vlc/codec/libaraw_plugin.so
-lib/vlc/codec/libcinepak_plugin.so
-lib/vlc/codec/libcmml_plugin.so
-lib/vlc/codec/libcvdsub_plugin.so
-lib/vlc/codec/libdts_plugin.so
-lib/vlc/codec/libdvbsub_plugin.so
-lib/vlc/codec/libflacdec_plugin.so
-lib/vlc/codec/liblibmpeg2_plugin.so
-lib/vlc/codec/liblpcm_plugin.so
-lib/vlc/codec/libmpeg_audio_plugin.so
-lib/vlc/codec/librawvideo_plugin.so
-lib/vlc/codec/libspudec_plugin.so
-lib/vlc/codec/libsubsdec_plugin.so
-lib/vlc/codec/libsvcdsub_plugin.so
-lib/vlc/codec/libvorbis_plugin.so
-lib/vlc/control/libgestures_plugin.so
-lib/vlc/control/libhotkeys_plugin.so
-lib/vlc/control/libhttp_plugin.so
-lib/vlc/control/librc_plugin.so
-lib/vlc/control/libtelnet_plugin.so
-lib/vlc/demux/liba52sys_plugin.so
-lib/vlc/demux/libaac_plugin.so
-lib/vlc/demux/libaiff_plugin.so
-lib/vlc/demux/libasf_plugin.so
-lib/vlc/demux/libau_plugin.so
-lib/vlc/demux/libavi_plugin.so
-lib/vlc/demux/libdemux2_plugin.so
-lib/vlc/demux/libdemuxdump_plugin.so
-lib/vlc/demux/libdemuxsub_plugin.so
-lib/vlc/demux/libdtssys_plugin.so
-lib/vlc/demux/libflac_plugin.so
-lib/vlc/demux/libh264_plugin.so
-lib/vlc/demux/libid3_plugin.so
-lib/vlc/demux/libid3tag_plugin.so
-lib/vlc/demux/libm3u_plugin.so
-lib/vlc/demux/libm4v_plugin.so
-lib/vlc/demux/libmp4_plugin.so
-lib/vlc/demux/libmpeg_system_plugin.so
-lib/vlc/demux/libmpga_plugin.so
-lib/vlc/demux/libmpgv_plugin.so
-lib/vlc/demux/libnsv_plugin.so
-lib/vlc/demux/libogg_plugin.so
-lib/vlc/demux/libplaylist_plugin.so
-lib/vlc/demux/libps2_plugin.so
-lib/vlc/demux/libps_plugin.so
-lib/vlc/demux/libpva_plugin.so
-lib/vlc/demux/librawdv_plugin.so
-lib/vlc/demux/libreal_plugin.so
-lib/vlc/demux/libsgimb_plugin.so
-lib/vlc/demux/libts2_plugin.so
-lib/vlc/demux/libts_dvbpsi_plugin.so
-lib/vlc/demux/libts_plugin.so
-lib/vlc/demux/libwav_plugin.so
-lib/vlc/gui/libwxwindows_plugin.so
-lib/vlc/libffmpeg.a
-lib/vlc/libmkv.a
-lib/vlc/libstream_out_transcode.a
-lib/vlc/misc/libdummy_plugin.so
-lib/vlc/misc/libexport_plugin.so
-lib/vlc/misc/libfreetype_plugin.so
-lib/vlc/misc/libipv4_plugin.so
-lib/vlc/misc/libipv6_plugin.so
-lib/vlc/misc/liblogger_plugin.so
-lib/vlc/misc/libmemcpy_plugin.so
-lib/vlc/misc/libsap_plugin.so
-lib/vlc/misc/libscreensaver_plugin.so
-lib/vlc/mux/libmux_asf_plugin.so
-lib/vlc/mux/libmux_avi_plugin.so
-lib/vlc/mux/libmux_dummy_plugin.so
-lib/vlc/mux/libmux_mp4_plugin.so
-lib/vlc/mux/libmux_ogg_plugin.so
-lib/vlc/mux/libmux_ps_plugin.so
-lib/vlc/mux/libmux_ts_dvbpsi_plugin.so
-lib/vlc/mux/libmux_ts_plugin.so
-lib/vlc/packetizer/libpacketizer_copy_plugin.so
-lib/vlc/packetizer/libpacketizer_h264_plugin.so
-lib/vlc/packetizer/libpacketizer_mpeg4audio_plugin.so
-lib/vlc/packetizer/libpacketizer_mpeg4video_plugin.so
-lib/vlc/packetizer/libpacketizer_mpegvideo_plugin.so
-lib/vlc/stream_out/libstream_out_display_plugin.so
-lib/vlc/stream_out/libstream_out_dummy_plugin.so
-lib/vlc/stream_out/libstream_out_duplicate_plugin.so
-lib/vlc/stream_out/libstream_out_es_plugin.so
-lib/vlc/stream_out/libstream_out_gather_plugin.so
-lib/vlc/stream_out/libstream_out_rtp_plugin.so
-lib/vlc/stream_out/libstream_out_standard_plugin.so
-lib/vlc/video_chroma/libi420_rgb_plugin.so
-lib/vlc/video_chroma/libi420_ymga_plugin.so
-lib/vlc/video_chroma/libi420_yuy2_plugin.so
-lib/vlc/video_chroma/libi422_yuy2_plugin.so
-lib/vlc/video_filter/libadjust_plugin.so
-lib/vlc/video_filter/libclone_plugin.so
-lib/vlc/video_filter/libcrop_plugin.so
-lib/vlc/video_filter/libdeinterlace_plugin.so
-lib/vlc/video_filter/libdistort_plugin.so
-lib/vlc/video_filter/libinvert_plugin.so
-lib/vlc/video_filter/liblogo_plugin.so
-lib/vlc/video_filter/libmotionblur_plugin.so
-lib/vlc/video_filter/libtransform_plugin.so
-lib/vlc/video_filter/libwall_plugin.so
-lib/vlc/video_output/libvout_sdl_plugin.so
-lib/vlc/video_output/libx11_plugin.so
-lib/vlc/video_output/libxvideo_plugin.so
-lib/vlc/visualization/libvisual_plugin.so
-man/man1/vlc-config.1
-man/man1/vlc.1
-share/doc/vlc/bugreport-howto.txt
-share/doc/vlc/fortunes.txt
-share/doc/vlc/intf-cdda.txt
-share/doc/vlc/intf-vcd.txt
-share/doc/vlc/vlc-howto.sgml
-share/doc/vlc/web-streaming.html
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/vlc.mo
-${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/vlc.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/vlc.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/vlc.mo
-${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/vlc.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/vlc.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/vlc.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/vlc.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/vlc.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/vlc.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/vlc.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/vlc.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/vlc.mo
-share/vlc/familiar-forwardb16x16.xpm
-share/vlc/familiar-openb16x16.xpm
-share/vlc/familiar-pauseb16x16.xpm
-share/vlc/familiar-playb16x16.xpm
-share/vlc/familiar-playlistb16x16.xpm
-share/vlc/familiar-preferencesb16x16.xpm
-share/vlc/familiar-rewindb16x16.xpm
-share/vlc/familiar-stopb16x16.xpm
-share/vlc/gnome-vlc16x16.png
-share/vlc/gnome-vlc32x32.png
-share/vlc/gnome-vlc32x32.xpm
-share/vlc/gnome-vlc48x48.png
-share/vlc/gvlc16x16.png
-share/vlc/gvlc32x32.png
-share/vlc/gvlc32x32.xpm
-share/vlc/gvlc48x48.ico
-share/vlc/gvlc48x48.png
-share/vlc/http/admin/.access
-share/vlc/http/admin/browse.html
-share/vlc/http/admin/dboxfiles.html
-share/vlc/http/admin/index.html
-share/vlc/http/index.html
-share/vlc/http/info.html
-share/vlc/http/style.css
-share/vlc/kvlc16x16.png
-share/vlc/kvlc32x32.png
-share/vlc/kvlc32x32.xpm
-share/vlc/kvlc48x48.png
-share/vlc/pda-forwardb16x16.xpm
-share/vlc/pda-openb16x16.xpm
-share/vlc/pda-pauseb16x16.xpm
-share/vlc/pda-playb16x16.xpm
-share/vlc/pda-playlistb16x16.xpm
-share/vlc/pda-preferencesb16x16.xpm
-share/vlc/pda-rewindb16x16.xpm
-share/vlc/pda-stopb16x16.xpm
-share/vlc/qvlc16x16.png
-share/vlc/qvlc32x32.png
-share/vlc/qvlc32x32.xpm
-share/vlc/qvlc48x48.png
-share/vlc/skins/default/add1.bmp
-share/vlc/skins/default/add2.bmp
-share/vlc/skins/default/add3.bmp
-share/vlc/skins/default/body.bmp
-share/vlc/skins/default/del1.bmp
-share/vlc/skins/default/del2.bmp
-share/vlc/skins/default/del3.bmp
-share/vlc/skins/default/next1.bmp
-share/vlc/skins/default/next2.bmp
-share/vlc/skins/default/next3.bmp
-share/vlc/skins/default/next4.bmp
-share/vlc/skins/default/open1.bmp
-share/vlc/skins/default/open2.bmp
-share/vlc/skins/default/open3.bmp
-share/vlc/skins/default/pause1.bmp
-share/vlc/skins/default/pause2.bmp
-share/vlc/skins/default/pause3.bmp
-share/vlc/skins/default/pause4.bmp
-share/vlc/skins/default/play1.bmp
-share/vlc/skins/default/play2.bmp
-share/vlc/skins/default/play3.bmp
-share/vlc/skins/default/play4.bmp
-share/vlc/skins/default/playlist1.bmp
-share/vlc/skins/default/playlist2.bmp
-share/vlc/skins/default/playlist3.bmp
-share/vlc/skins/default/playlist_body.bmp
-share/vlc/skins/default/prefs1.bmp
-share/vlc/skins/default/prefs2.bmp
-share/vlc/skins/default/prefs3.bmp
-share/vlc/skins/default/prev1.bmp
-share/vlc/skins/default/prev2.bmp
-share/vlc/skins/default/prev3.bmp
-share/vlc/skins/default/prev4.bmp
-share/vlc/skins/default/quit1.bmp
-share/vlc/skins/default/quit2.bmp
-share/vlc/skins/default/quit3.bmp
-share/vlc/skins/default/slider1.bmp
-share/vlc/skins/default/slider2.bmp
-share/vlc/skins/default/stop1.bmp
-share/vlc/skins/default/stop2.bmp
-share/vlc/skins/default/stop3.bmp
-share/vlc/skins/default/stop4.bmp
-share/vlc/skins/default/theme.xml
-share/vlc/ui.rc
-share/vlc/vlc16x16.png
-share/vlc/vlc16x16.xpm
-share/vlc/vlc32x32.png
-share/vlc/vlc32x32.xpm
-share/vlc/vlc48x48.ico
-share/vlc/vlc48x48.png
diff --git a/multimedia/vlc/PLIST.common_end b/multimedia/vlc/PLIST.common_end
deleted file mode 100644
index abf755676cd..00000000000
--- a/multimedia/vlc/PLIST.common_end
+++ /dev/null
@@ -1,26 +0,0 @@
-@comment $NetBSD: PLIST.common_end,v 1.1 2005/02/21 21:04:06 veego Exp $
-@dirrm share/vlc/skins/default
-@dirrm share/vlc/skins
-@dirrm share/vlc/http/admin
-@dirrm share/vlc/http
-@dirrm share/vlc
-@dirrm share/doc/vlc
-@dirrm lib/vlc/visualization
-@dirrm lib/vlc/video_output
-@dirrm lib/vlc/video_filter
-@dirrm lib/vlc/video_chroma
-@dirrm lib/vlc/stream_out
-@dirrm lib/vlc/packetizer
-@dirrm lib/vlc/mux
-@dirrm lib/vlc/misc
-@dirrm lib/vlc/gui
-@dirrm lib/vlc/demux
-@dirrm lib/vlc/control
-@dirrm lib/vlc/codec
-@dirrm lib/vlc/audio_output
-@dirrm lib/vlc/audio_mixer
-@dirrm lib/vlc/audio_filter
-@dirrm lib/vlc/access_output
-@dirrm lib/vlc/access
-@dirrm lib/vlc
-@dirrm include/vlc
diff --git a/multimedia/vlc/PLIST.i386 b/multimedia/vlc/PLIST.i386
deleted file mode 100644
index 451926c6dcb..00000000000
--- a/multimedia/vlc/PLIST.i386
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST.i386,v 1.2 2004/12/02 12:54:26 ben Exp $
-lib/vlc/libi420_rgb_mmx.a
-lib/vlc/libi420_ymga_mmx.a
-lib/vlc/libi420_yuy2_mmx.a
-lib/vlc/libi422_yuy2_mmx.a
-lib/vlc/libmemcpy3dn.a
-lib/vlc/libmemcpymmx.a
-lib/vlc/libmemcpymmxext.a
diff --git a/multimedia/vlc/PLIST.powerpc b/multimedia/vlc/PLIST.powerpc
deleted file mode 100644
index 3e838029776..00000000000
--- a/multimedia/vlc/PLIST.powerpc
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.powerpc,v 1.2 2004/12/02 12:54:26 ben Exp $
-lib/vlc/libi420_yuy2_altivec.a
-lib/vlc/libmemcpyaltivec.a
diff --git a/multimedia/vlc/buildlink3.mk b/multimedia/vlc/buildlink3.mk
deleted file mode 100644
index c8e91355562..00000000000
--- a/multimedia/vlc/buildlink3.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/06/20 18:43:26 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use vlc.
-#
-# This file was created automatically using createbuildlink-3.0.
-#
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-VLC_BUILDLINK3_MK:=	${VLC_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	vlc
-.endif
-
-.if !empty(VLC_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=		vlc
-BUILDLINK_DEPENDS.vlc?=		vlc>=0.7.1
-BUILDLINK_PKGSRCDIR.vlc?=	../../multimedia/vlc
-.endif # VLC_BUILDLINK3_MK
-
-.include "../../multimedia/libdvdcss/buildlink3.mk"
-.include "../../audio/flac/buildlink3.mk"
-.include "../../audio/lame/buildlink3.mk"
-.include "../../audio/liba52/buildlink3.mk"
-.include "../../audio/libcddb/buildlink3.mk"
-.include "../../audio/libid3tag/buildlink3.mk"
-.include "../../audio/libmad/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../converters/fribidi/buildlink3.mk"
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../misc/libcdio/buildlink3.mk"
-.include "../../multimedia/ffmpeg/buildlink3.mk"
-.include "../../multimedia/libdvdplay/buildlink3.mk"
-.include "../../multimedia/libdvbpsi/buildlink3.mk"
-.include "../../multimedia/libdvdread/buildlink3.mk"
-.include "../../multimedia/libmatroska/buildlink3.mk"
-.include "../../multimedia/libmpeg2/buildlink3.mk"
-.include "../../multimedia/libogg/buildlink3.mk"
-.include "../../net/openslp/buildlink3.mk"
-.include "../../sysutils/vcdimager-devel/buildlink3.mk"
-.include "../../x11/wxGTK/buildlink3.mk"
-
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo
deleted file mode 100644
index 88b53271e40..00000000000
--- a/multimedia/vlc/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 11:24:04 agc Exp $
-
-SHA1 (vlc-0.7.2.tar.bz2) = 938eaea128af02451fcbf0305c84ce290c9d8c21
-RMD160 (vlc-0.7.2.tar.bz2) = 05e35e0b9080581cfbc730212fc756cb46bd3257
-Size (vlc-0.7.2.tar.bz2) = 4516835 bytes
-SHA1 (patch-aa) = 21a4e5da2ca4f758be1be48e23f28a764a38f1d0
diff --git a/multimedia/vlc/hacks.mk b/multimedia/vlc/hacks.mk
deleted file mode 100644
index 6d5a2c06d80..00000000000
--- a/multimedia/vlc/hacks.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-# $NetBSD: hacks.mk,v 1.1 2005/08/03 04:18:31 grant Exp $
-
-# the autoconf test for the Darwin linker wrongly succeeds when using
-# icc/Linux because icc ignores unknown flags. override this brain
-# damage.
-.if ${OPSYS} != "Darwin"
-CONFIGURE_ENV+=		ac_cv_ld_darwin=no
-.endif
diff --git a/multimedia/vlc/patches/patch-aa b/multimedia/vlc/patches/patch-aa
deleted file mode 100644
index 3df16e4a37b..00000000000
--- a/multimedia/vlc/patches/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2004/07/29 19:04:58 wiz Exp $
-
---- modules/misc/network/ipv4.c.orig	Tue Jul 27 19:01:35 2004
-+++ modules/misc/network/ipv4.c	Tue Jul 27 19:02:52 2004
-@@ -405,9 +405,13 @@
- #if !defined( UNDER_CE ) && !defined( SYS_BEOS )
-         if( IN_MULTICAST( ntohl(inet_addr(psz_server_addr) ) ) )
-         {
-             /* set the time-to-live */
-+#ifdef __NetBSD__
-+            unsigned char ttl = p_socket->i_ttl;
-+#else
-             int ttl = p_socket->i_ttl;
-+#endif
-             if( ttl < 1 )
-             {
-                 ttl = config_GetInt( p_this, "ttl" );
-             }
-
diff --git a/multimedia/vls/DESCR b/multimedia/vls/DESCR
deleted file mode 100644
index 9d32372ef1b..00000000000
--- a/multimedia/vls/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-VLS is part of the VideoLAN project, a full client/server video over IP
-solution. The VideoLAN Server aims at broadcasting MPEG (1/2/4, PS/TS)
-video streams over any IP network.
diff --git a/multimedia/vls/Makefile b/multimedia/vls/Makefile
deleted file mode 100644
index 86b053e80d6..00000000000
--- a/multimedia/vls/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:23 jlam Exp $
-#
-
-DISTNAME=		vls-0.5.6
-PKGREVISION=	1
-CATEGORIES=		net
-MASTER_SITES=		http://download.videolan.org/pub/videolan/vls/0.5.6/
-
-MAINTAINER=		tech-pkg@NetBSD.org
-HOMEPAGE=		http://www.videolan.org/
-COMMENT=		VideoLAN Server
-
-USE_TOOLS+=		gmake
-USE_PKGINSTALL=		yes
-GNU_CONFIGURE=		yes
-
-CONFIGURE_ARGS+=	--with-dvbpsi=${BUILDLINK_PREFIX.libdvbpsi}
-
-EGDIR=			${PREFIX}/share/examples/vls
-CONF_FILES=		${EGDIR}/vls.cfg ${PKG_SYSCONFDIR}/vls.cfg
-
-.include "../../multimedia/libdvdplay/buildlink3.mk"
-.include "../../multimedia/libdvbpsi/buildlink3.mk"
-.include "../../multimedia/libdvdread/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/vls/PLIST b/multimedia/vls/PLIST
deleted file mode 100644
index 2814bf7d5f5..00000000000
--- a/multimedia/vls/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/03/29 20:29:23 xtraeme Exp $
-bin/vls
-bin/vlsd
-lib/videolan/vls/dvdreader.so
-share/examples/vls/vls.cfg
-@dirrm share/examples/vls
-@dirrm lib/videolan/vls
diff --git a/multimedia/vls/distinfo b/multimedia/vls/distinfo
deleted file mode 100644
index ec5b96744aa..00000000000
--- a/multimedia/vls/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/04/29 18:45:00 kristerw Exp $
-
-SHA1 (vls-0.5.6.tar.gz) = 830df3a353d36453e622474b7813448c439f9d71
-RMD160 (vls-0.5.6.tar.gz) = 4f88c59b4fd96df1ea4d46b66467fa3287776c2c
-Size (vls-0.5.6.tar.gz) = 802915 bytes
-SHA1 (patch-aa) = cadf79b4a1244492d48def104590468b52098527
-SHA1 (patch-ab) = 30b9ba716e80972a7d4cb0cf75efc715086812b1
-SHA1 (patch-ac) = bcc44065d4c45db8c96b5ddd307d61242d70f002
-SHA1 (patch-ad) = 1a75b2990c60afdbe47575bfe745be0d86a379c0
diff --git a/multimedia/vls/patches/patch-aa b/multimedia/vls/patches/patch-aa
deleted file mode 100644
index 65bc8b52787..00000000000
--- a/multimedia/vls/patches/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/03/29 20:29:23 xtraeme Exp $
-
---- Makefile.opts.in.orig	2004-01-16 10:33:13.000000000 +0100
-+++ Makefile.opts.in	2004-01-16 10:33:47.000000000 +0100
-@@ -76,12 +76,12 @@
- CCFLAGS+=-Wall
- CCFLAGS+=-D_REENTRANT
- CCFLAGS+=-D_FILE_OFFSET_BITS=64
--LCFLAGS+=-D_REENTRANT
-+LCFLAGS+=-D_REENTRANT $(LDFLAGS)
- 
- #
- # Specific flags
- #
--CCFLAGS+=-DCONFIG_PATH='"$(sysconfdir)/videolan/vls"'
-+CCFLAGS+=-DCONFIG_PATH='"$(sysconfdir)"'
- 
- VLS_LCFLAGS		= @VLS_LCFLAGS@
- VLS_LIB			= @VLS_LIB@
diff --git a/multimedia/vls/patches/patch-ab b/multimedia/vls/patches/patch-ab
deleted file mode 100644
index bb3d8d368f1..00000000000
--- a/multimedia/vls/patches/patch-ab
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/03/29 20:29:23 xtraeme Exp $
-
---- Makefile.orig	2004-01-16 10:27:30.000000000 +0100
-+++ Makefile	2004-01-16 10:30:19.000000000 +0100
-@@ -168,15 +168,15 @@
- 			( cd src/modules/$$module && $(MAKE) distclean ) ; done
- 
- install:
--	mkdir -p $(DESTDIR)$(bindir)
-+	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(bindir)
- 	$(INSTALL) bin/vls $(DESTDIR)$(bindir)
- 	$(INSTALL) bin/vlsd $(DESTDIR)$(bindir)
--	mkdir -p $(DESTDIR)$(libdir)/videolan/vls
-+	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(libdir)/videolan/vls
- ifneq (,$(PLUGINS))
--	$(INSTALL) -m 644 $(PLUGINS:%=bin/%.so) $(DESTDIR)$(libdir)/videolan/vls
-+	$(BSD_INSTALL_DATA) $(PLUGINS:%=bin/%.so) $(DESTDIR)$(libdir)/videolan/vls
- endif
--	mkdir -p $(DESTDIR)$(sysconfdir)/videolan/vls
--	test -r $(DESTDIR)$(sysconfdir)/videolan/vls/vls.cfg || $(INSTALL) -m 644 vls.cfg $(DESTDIR)$(sysconfdir)/videolan/vls
-+	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(datadir)/examples/vls
-+	test -r $(DESTDIR)$(datadir)/examples/vls/vls.cfg || $(BSD_INSTALL_DATA) vls.cfg $(DESTDIR)$(datadir)/examples/vls
- 	@echo "Installation succeeded."
- 
- uninstall:
-@@ -195,7 +195,6 @@
- 		@test -d bin || mkdir -p bin
- 		$(CXX) $(LCFLAGS) -o bin/$@$(EXEEXT) $(OBJ) $(C_OBJ) $(BUILTINS:%=obj/%.a) $(VLS_LIB)
- 		@test -f bin/vlsd$(EXEEXT) || ln -s $@ bin/$@d$(EXEEXT)
--		chmod 755 bin/$@$(EXEEXT)
- 
- dep/server/vls.dpp:	src/server/vls_builtins.cpp
- 
diff --git a/multimedia/vls/patches/patch-ac b/multimedia/vls/patches/patch-ac
deleted file mode 100644
index 759d711a8fd..00000000000
--- a/multimedia/vls/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/04/29 18:45:00 kristerw Exp $
-
---- src/core/core.h.orig	Fri Apr 29 20:25:38 2005
-+++ src/core/core.h	Fri Apr 29 20:26:17 2005
-@@ -51,7 +51,9 @@
- 
- #ifdef PTHREAD_COND_T_IN_PTHREAD_H
- #include <pthread.h>                                          // For... thread.h
-+# ifdef USE_SEM_T
- #include <semaphore.h>                                           // For thread.h
-+# endif
- #endif
- 
- #ifdef HAVE_DLFCN_H
diff --git a/multimedia/vls/patches/patch-ad b/multimedia/vls/patches/patch-ad
deleted file mode 100644
index 77d944ad678..00000000000
--- a/multimedia/vls/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2005/04/29 18:45:00 kristerw Exp $
-
---- src/core/thread.cpp.orig	Fri Apr 29 20:24:01 2005
-+++ src/core/thread.cpp	Fri Apr 29 20:25:20 2005
-@@ -32,7 +32,9 @@
- 
- #ifdef PTHREAD_COND_T_IN_PTHREAD_H
- #include <pthread.h>
-+# ifdef USE_SEM_T
- #include <semaphore.h>
-+# endif
- #include <errno.h>
- #elif defined WIN32
- #include <windows.h>
diff --git a/multimedia/win32-codecs/DESCR b/multimedia/win32-codecs/DESCR
deleted file mode 100644
index b13157d9a45..00000000000
--- a/multimedia/win32-codecs/DESCR
+++ /dev/null
@@ -1,23 +0,0 @@
-A huge compilation of Win32 codecs:
-
-Video:
-- Win32 VfW DLLs:
-    Indeo Video 3.2 and 4.1, Microsoft MPEG-4 v1 & v2 beta, Microsoft
-    MPEG-4 v3 (also known as DivX ;-)), Cinepak Video, ATI VCR-2, I263
-- Win32 DirectShow filters, decompression-only support:
-    Microsoft MPEG-4 v3 (this decoder is slower than VfW one, but
-    offers wider range of picture control features), Windows Media
-    Video 7, Indeo Video 5.0, Motion JPEG (using Morgan Multimedia
-    shareware codec)
-- Open-source plugins:
-    Motion JPEG (using libjpeg, very slow)
-
-Audio:
-- Win32 ACM DLLs, decompression-only support:
-    Windows Media Audio (also known as DivX ;-) Audio), MS ADPCM
-    Intel Music Codec
-- Open-source plugins, decompression-only support:
-    PCM, AC3, IMA ADPCM, MPEG Layer-1,2,3 (compression into MP3 is
-    also supported), MSN Audio, GSM 6.1 Audio
-- Win32 DirectShow filters, untested decompression-only support:
-    Voxware Metasound, ACELP.net
diff --git a/multimedia/win32-codecs/Makefile b/multimedia/win32-codecs/Makefile
deleted file mode 100644
index a0cfd3c456d..00000000000
--- a/multimedia/win32-codecs/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# $NetBSD: Makefile,v 1.18 2005/10/02 11:23:08 wiz Exp $
-#
-
-DISTNAME=	windows-all-20050412
-PKGNAME=	win32-codecs-050412
-CATEGORIES=	multimedia
-MASTER_SITES=	http://www4.mplayerhq.hu/MPlayer/releases/codecs/ \
-		http://ftp5.mplayerhq.hu/mplayer/releases/codecs/ \
-		ftp://ftp2.mplayerhq.hu/MPlayer/releases/codecs/ \
-		http://www1.mplayerhq.hu/MPlayer/releases/codecs/ \
-		ftp://ftp5.mplayerhq.hu/mplayer/releases/codecs/
-EXTRACT_SUFX=	.zip
-DISTFILES+=	${DISTNAME}${EXTRACT_SUFX}
-DISTFILES+=	qtextras-20041107.tar.bz2
-DISTFILES+=	rp9codecs-win32-20050115.tar.bz2
-
-MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://mplayerhq.hu/MPlayer/releases/codecs/
-COMMENT=	Huge compilation of Win32 binary codecs
-
-USE_LANGUAGES=	# empty
-
-ONLY_FOR_PLATFORM=	*-*-i386
-
-NO_BUILD=	yes
-NO_CONFIGURE=	yes
-
-RESTRICTED=	"Unsure of codec's license"
-NO_BIN_ON_CDROM=${RESTRICTED}
-NO_BIN_ON_FTP=  ${RESTRICTED}
-NO_SRC_ON_CDROM=${RESTRICTED}
-NO_SRC_ON_FTP=	${RESTRICTED}
-
-do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/win32
-	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/* ${PREFIX}/lib/win32
-	${INSTALL_DATA} ${WRKDIR}/qtextras-20041107/* ${PREFIX}/lib/win32
-	${INSTALL_DATA} ${WRKDIR}/rp9codecs-win32-20050115/*.dll ${PREFIX}/lib/win32
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/win32-codecs/PLIST b/multimedia/win32-codecs/PLIST
deleted file mode 100644
index 4c90aea3b9d..00000000000
--- a/multimedia/win32-codecs/PLIST
+++ /dev/null
@@ -1,116 +0,0 @@
-@comment $NetBSD: PLIST,v 1.9 2005/04/17 12:14:13 salo Exp $
-lib/win32/3ivX.qtx
-lib/win32/ACTLComponent.qtx
-lib/win32/AvidQTAVUICodec.qtx
-lib/win32/BeHereiVideo.qtx
-lib/win32/CLRVIDDC.DLL
-lib/win32/CtWbJpg.DLL
-lib/win32/DECVW_32.DLL
-lib/win32/Indeo4.qtx
-lib/win32/LCodcCMP.dll
-lib/win32/On2_VP3.qtx
-lib/win32/QuickTime.qts
-lib/win32/QuickTimeEssentials.qtx
-lib/win32/QuickTimeInternetExtras.qtx
-lib/win32/Readme.txt
-lib/win32/VDODEC32.dll
-lib/win32/ZyGoVideo.qtx
-lib/win32/acelpdec.ax
-lib/win32/alf2cd.acm
-lib/win32/aslcodec_vfw.dll
-lib/win32/asusasv2.dll
-lib/win32/asusasvd.dll
-lib/win32/ativcr2.dll
-lib/win32/atrac3.acm
-lib/win32/atrc3260.dll
-lib/win32/avimszh.dll
-lib/win32/avizlib.dll
-lib/win32/clrviddd.dll
-lib/win32/cook3260.dll
-lib/win32/ctadp32.acm
-lib/win32/divx.dll
-lib/win32/divx_c32.ax
-lib/win32/divxa32.acm
-lib/win32/divxc32.dll
-lib/win32/divxdec.ax
-lib/win32/drv13260.dll
-lib/win32/drv23260.dll
-lib/win32/drv33260.dll
-lib/win32/drv43260.dll
-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/ir50_32.dll
-lib/win32/ivvideo.dll
-lib/win32/jp2avi.dll
-lib/win32/l3codeca.acm
-lib/win32/l3codecx.ax
-lib/win32/lhacm.acm
-lib/win32/lsvxdec.dll
-lib/win32/m3jp2k32.dll
-lib/win32/m3jpeg32.dll
-lib/win32/m3jpegdec.ax
-lib/win32/mcdvd_32.dll
-lib/win32/mcmjpg32.dll
-lib/win32/mi-sc4.acm
-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/nsrt2432.acm
-lib/win32/pclepim1.dll
-lib/win32/pncrt.dll
-lib/win32/qdv.dll
-lib/win32/qpeg32.dll
-lib/win32/qtmlClient.dll
-lib/win32/rt32dcmp.dll
-lib/win32/scg726.acm
-lib/win32/sipr3260.dll
-lib/win32/sp5x_32.dll
-lib/win32/tm20dec.ax
-lib/win32/tokr3260.dll
-lib/win32/tsccvid.dll
-lib/win32/tssoft32.acm
-lib/win32/tvqdec.dll
-lib/win32/ubv263d+.ax
-lib/win32/ubvmp4d.dll
-lib/win32/ultimo.dll
-lib/win32/vdowave.drv
-lib/win32/vgpix32d.dll
-lib/win32/vivog723.acm
-lib/win32/vmnc.dll
-lib/win32/voxmsdec.ax
-lib/win32/vp31vfw.dll
-lib/win32/vp4vfw.dll
-lib/win32/vp5vfw.dll
-lib/win32/vp6vfw.dll
-lib/win32/vssh264.dll
-lib/win32/vssh264core.dll
-lib/win32/vssh264dec.dll
-lib/win32/vsslight.dll
-lib/win32/vsswlt.dll
-lib/win32/wma9dmod.dll
-lib/win32/wmadmod.dll
-lib/win32/wmsdmod.dll
-lib/win32/wmspdmod.dll
-lib/win32/wmv8ds32.ax
-lib/win32/wmv9dmod.dll
-lib/win32/wmvadvd.dll
-lib/win32/wmvdmod.dll
-lib/win32/wmvds32.ax
-lib/win32/wnvplay1.dll
-lib/win32/wnvwinx.dll
-@dirrm lib/win32
diff --git a/multimedia/win32-codecs/distinfo b/multimedia/win32-codecs/distinfo
deleted file mode 100644
index 90b8a6d6c53..00000000000
--- a/multimedia/win32-codecs/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.14 2005/04/17 12:14:13 salo Exp $
-
-SHA1 (windows-all-20050412.zip) = 4db34beb85f4638855a8f775180d8e6e971ad7c5
-RMD160 (windows-all-20050412.zip) = bcd9b3440a25e0c0e9c966c138d49877bf610b5d
-Size (windows-all-20050412.zip) = 12144310 bytes
-SHA1 (qtextras-20041107.tar.bz2) = e3ff8124fab7bdd46ab393d59245a281867c4687
-RMD160 (qtextras-20041107.tar.bz2) = 93980e0c878568851eb244270965ee7378ca3669
-Size (qtextras-20041107.tar.bz2) = 974913 bytes
-SHA1 (rp9codecs-win32-20050115.tar.bz2) = 926f9b85747a4076882d98e4f808aa36771262e3
-RMD160 (rp9codecs-win32-20050115.tar.bz2) = e768685ce05149f34c500c29289539ee6198ecca
-Size (rp9codecs-win32-20050115.tar.bz2) = 540641 bytes
diff --git a/multimedia/xanim/DESCR b/multimedia/xanim/DESCR
deleted file mode 100644
index bfc9f89b69c..00000000000
--- a/multimedia/xanim/DESCR
+++ /dev/null
@@ -1,24 +0,0 @@
-XAnim  is a program that can display animations of various
-formats on systems running X11.  XAnim currently  supports
-the following animation types:
-
-       +  FLI animations.
-       +  FLC animations.
-       +  IFF  animations.
-       +  GIF87a and GIF89a files.
-       +  GIF89a animation extension support.
-       +  a  kludgy  text file listing gifs and what order
-          to show them in.
-       +  DL animations. Formats 1, 2 and partial 3.
-       +  Amiga   MovieSetter  animations(For  those  Eric
-          Schwartz fans).
-       +  Utah Raster Toolkit RLE images and anims.
-       +  AVI animations.
-       +  MPEG  animations.
-       +  WAV audio files may have their  sound  added  to
-          any  animation  type  that  doesn't already have
-          audio, by specifying the  .wav  file  after  the
-          animation  file  on  the command line. Currently
-          only the PCM audio codec is supported.
-       +  any combination of the above on the same command
-          line.
diff --git a/multimedia/xanim/Makefile b/multimedia/xanim/Makefile
deleted file mode 100644
index 5624616b166..00000000000
--- a/multimedia/xanim/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2005/10/11 10:06:35 tron Exp $
-
-DISTNAME=	xanim2920
-PKGNAME=	xanim-2.92.0
-CATEGORIES=	multimedia x11
-MASTER_SITES=	ftp://ftp.informatik.uni-hamburg.de/pub/soft/graphics/xanim/ \
-		ftp://ftp.informatik.uni-hamburg.de/pub/soft/graphics/xanim/modules/
-DISTFILES=	${EXTRACT_ONLY} ${CODEC_FILES}
-
-MAINTAINER=	tech-pkg@NetBSD.org
-COMMENT=	Play most popular animation formats and show pictures
-
-EXTRACT_ONLY=   ${DISTNAME}${EXTRACT_SUFX}
-
-.include "Makefile.codecs"
-
-USE_IMAKE=	YES
-USE_TOOLS+=	gunzip
-
-.include "../../mk/bsd.prefs.mk"
-
-MAKE_ENV+=		${XANIM_AUDIO.${OPSYS}}
-XANIM_AUDIO.Linux=	XA_AUDIO_DEFS="-DXA_LINUX_AUDIO"		\
-			XA_AUDIO_LIBS="-lc"
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.xanim
-PKG_SUPPORTED_OPTIONS=	oss
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Moss)
-XANIM_AUDIO.NetBSD=	XA_AUDIO_DEFS="-DXA_LINUX_AUDIO"		\
-			XA_AUDIO_LIBS="${LIBOSSAUDIO}"
-.else
-XANIM_AUDIO.NetBSD=	XA_AUDIO_DEFS="-DXA_NetBSD_AUDIO"
-.endif
-
-XANIM_AUDIO.SunOS=	XA_AUDIO_DEFS="-DXA_SPARC_AUDIO -DSVR4 -DXA_SELECT"
-
-post-extract:
-	@${LN} -s docs/xanim.man ${WRKSRC}
-	@${MKDIR} ${WRKSRC}/mods
-.if defined(CODEC_FILES) && !empty(CODEC_FILES)
-	@for file in ${CODEC_FILES}; do					\
-		${CP} ${DISTDIR}/$$file ${WRKSRC}/mods;			\
-		${GUNZIP_CMD} ${WRKSRC}/mods/$$file;			\
-	done
-.endif
-
-.include "../../mk/ossaudio.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/xanim/Makefile.codecs b/multimedia/xanim/Makefile.codecs
deleted file mode 100644
index ba48347eaf5..00000000000
--- a/multimedia/xanim/Makefile.codecs
+++ /dev/null
@@ -1,67 +0,0 @@
-# $NetBSD: Makefile.codecs,v 1.2 2005/10/11 10:06:35 tron Exp $
-
-.include "../../mk/bsd.prefs.mk"
-
-# cvid	Radius Cinepak video decompression for AVI and Quicktime
-# cyuv	Creative CYUV video decompression for AVI
-# iv32	Intel YVU9 and Indeo 3.2 decompression for AVI and Quicktime
-#
-XANIM_CODECS?=			${_XANIM_UNRESTRICTED_CODECS}
-#XANIM_CODECS?=			${_XANIM_UNRESTRICTED_CODECS} ${_XANIM_RESTRICTED_CODECS}
-_XANIM_RESTRICTED_CODECS=	cyuv iv32
-_XANIM_UNRESTRICTED_CODECS=	cvid
-
-_XANIM_CODEC.cvid.i386-a.out=	xa2.0_cvid_netbsd386.o.gz
-_XANIM_CODEC.cyuv.i386-a.out=	xa1.0_cyuv_netbsd386.o.gz
-_XANIM_CODEC.iv32.i386-a.out=	xa2.0_iv32_netbsd386.o.gz
-
-_XANIM_CODEC.cvid.m68k-a.out=	xa2.0_cvid_netbsd68k.o.gz
-_XANIM_CODEC.cyuv.m68k-a.out=	xa1.0_cyuv_netbsd68k.o.gz
-_XANIM_CODEC.iv32.m68k-a.out=	xa2.0_iv32_netbsd68k.o.gz
-
-_XANIM_CODEC.cvid.i386-ELF=	xa2.0_cvid_linuxELF.o.gz
-_XANIM_CODEC.cyuv.i386-ELF=	xa1.0_cyuv_linuxELF.o.gz
-_XANIM_CODEC.iv32.i386-ELF=	xa2.0_iv32_linuxELF.o.gz
-
-_XANIM_CODEC.cvid.sparc-a.out=	xa2.0_cvid_sparcCOFF.o.gz
-_XANIM_CODEC.cyuv.sparc-a.out=	xa1.0_cyuv_sparcAOUT.o.gz
-_XANIM_CODEC.iv32.sparc-a.out=	xa2.0_iv32_sparcCOFF.o.gz
-
-_XANIM_CODEC.cvid.sparc-ELF=	xa2.0_cvid_sparcELF.o.gz
-_XANIM_CODEC.cyuv.sparc-ELF=	xa1.0_cyuv_sparcELF.o.gz
-_XANIM_CODEC.iv32.sparc-ELF=	xa2.0_iv32_sparcELF.o.gz
-
-_XANIM_CODEC.cvid.powerpc-ELF=	xa2.0_cvid_linuxPPC.o.gz
-_XANIM_CODEC.cyuv.powerpc-ELF=	xa1.0_cyuv_linuxPPC.o.gz
-
-_XANIM_DEF.cvid=	XA_CVID_DEF="-DXA_CVID"
-_XANIM_DEF.cyuv=	XA_CYUV_DEF="-DXA_CYUV"
-_XANIM_DEF.iv32=	XA_IV32_DEF="-DXA_IV32"
-
-_XANIM_LIB.cvid=	XA_CVID_LIB
-_XANIM_LIB.cyuv=	XA_CYUV_LIB
-_XANIM_LIB.iv32=	XA_IV32_LIB
-
-_XANIM_MACH_TYPE=	${MACHINE_ARCH}-${OBJECT_FMT}
-
-.for _codec_ in ${XANIM_CODECS}
-.  if defined(_XANIM_CODEC.${_codec_}.${_XANIM_MACH_TYPE})
-CODECS+=	${_codec_}
-CODEC_FILES+=	${_XANIM_CODEC.${_codec_}.${_XANIM_MACH_TYPE}}
-MAKE_ENV+=	${_XANIM_DEF.${_codec_}}
-MAKE_ENV+=	${_XANIM_LIB.${_codec_}}="mods/${_XANIM_CODEC.${_codec_}.${_XANIM_MACH_TYPE}:S/.gz$//}"
-.    if !empty(_XANIM_RESTRICTED_CODECS:M${_codec_})
-_RESTRICTED_CODECS+=	${_codec_}
-.    endif
-.  endif
-.endfor
-
-BUILD_DEFS+=	CODECS
-
-.if defined(_RESTRICTED_CODECS)
-RESTRICTED=	"Can't mirror/distribute object modules: ${_RESTRICTED_CODECS}"
-NO_SRC_ON_FTP=		${RESTRICTED}
-NO_SRC_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_FTP=		${RESTRICTED}
-NO_BIN_ON_CDROM=	${RESTRICTED}
-.endif
diff --git a/multimedia/xanim/PLIST b/multimedia/xanim/PLIST
deleted file mode 100644
index 0bbc8a04586..00000000000
--- a/multimedia/xanim/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/01/26 15:19:52 jmmv Exp $
-bin/xanim
-${IMAKE_MAN_DIR}/xanim.${IMAKE_MANNEWSUFFIX}
diff --git a/multimedia/xanim/distinfo b/multimedia/xanim/distinfo
deleted file mode 100644
index b9f98213beb..00000000000
--- a/multimedia/xanim/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/10/11 10:06:35 tron Exp $
-
-SHA1 (xanim2920.tar.gz) = 8adb5948cc6fd9bba5417aee4d319b5f041830e8
-RMD160 (xanim2920.tar.gz) = dae33cdbd9f20388a067df8269b625f2594cdfb9
-Size (xanim2920.tar.gz) = 431258 bytes
-SHA1 (xa2.0_cvid_linuxELF.o.gz) = ee89eac0b33bcee81093464824eed75aa52213f3
-RMD160 (xa2.0_cvid_linuxELF.o.gz) = a3835a5f07b5eaeafcc8dea9766c8e0d49a60746
-Size (xa2.0_cvid_linuxELF.o.gz) = 3174 bytes
-SHA1 (patch-ab) = 09b48077c2d7e524727aee911e8346b2a391a53a
-SHA1 (patch-ae) = 6023e76bc0471a0810b0789cd24355c06eac02b8
diff --git a/multimedia/xanim/patches/patch-ab b/multimedia/xanim/patches/patch-ab
deleted file mode 100644
index c8363d72d18..00000000000
--- a/multimedia/xanim/patches/patch-ab
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2005/10/11 10:06:35 tron Exp $
-
---- Imakefile.orig	2002-04-21 00:25:06.000000000 +0100
-+++ Imakefile	2005-10-11 10:56:41.000000000 +0100
-@@ -120,14 +120,14 @@
- XCOMM XA_DLL_LIB = -ldl
- XCOMM
- XCOMM HP/UX should use the following:
--XA_DLL_DEF = -DXA_HPDLL
--XA_DLL_LIB = -Wl,-E -ldld
-+XCOMM XA_DLL_DEF = -DXA_HPDLL
-+XCOMM XA_DLL_LIB = -Wl,-E -ldld
- XCOMM
- XCOMM
- XCOMM If you'd like to change the default directory that XAnim searches while
- XCOMM looking for dlls, then change the directory below.
- XCOMM
--XA_DLL_PATH = /usr/local/xanim/mods
-+XA_DLL_PATH = ${PREFIX}/lib/xanim
- 
- 
- XCOMM #########################################################################
-@@ -351,9 +351,9 @@
- XCOMM  XA_AUDIO_LIBS = -lAlib
- XCOMM  --
- XCOMM  -- HP/UX 10.x AServer
--XA_AUDIO_DEFS = -DXA_HP_AUDIO -DXA_HP10
--XA_AUDIO_LIBS = -L/opt/audio/lib -lAlib
--XA_AUDIO_INCS = -I/opt/audio/include
-+XCOMM  XA_AUDIO_DEFS = -DXA_HP_AUDIO -DXA_HP10
-+XCOMM  XA_AUDIO_LIBS = -L/opt/audio/lib -lAlib
-+XCOMM  XA_AUDIO_INCS = -I/opt/audio/include
- XCOMM 
- XCOMM  ------ AF (AudioFile) Support ------------------------------------------
- XCOMM  -- You need to indicate where the AF libraries libAFUtil.a and libAF.a
-@@ -470,7 +470,7 @@
- 
- PROGRAMS = $(XANIM)
- 
--INCLUDES = -I$(INCDIR) $(XA_INCS)
-+INCLUDES = -I$(INCDIR) -I$(X11BASE)/include/X11 $(XA_INCS)
- 
-    LIBS1 = $(XA_LIBS) $(EXTENSIONLIB) $(XTOOLLIB) $(XLIB) -lm
- DEPLIBS1 = $(DEPEXTENSIONLIB) $(DEPXTOOLLIB) $(DEPXLIB)
diff --git a/multimedia/xanim/patches/patch-ae b/multimedia/xanim/patches/patch-ae
deleted file mode 100644
index 0f254810f44..00000000000
--- a/multimedia/xanim/patches/patch-ae
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2004/01/26 15:19:53 jmmv Exp $
-
---- xa_audio.c.orig	Sun Mar 21 14:36:25 1999
-+++ xa_audio.c
-@@ -4665,7 +4665,19 @@ void NetBSD_Audio_Init()
- 
-   a_info.mode = AUMODE_PLAY | AUMODE_PLAY_ALL;
-   ioctl(devAudio, AUDIO_SETINFO, &a_info);
--#ifdef AUDIO_ENCODING_SLINEAR
-+#ifdef AUDIO_ENCODING_SLINEAR_LE
-+  /* Use new encoding names */
-+  AUDIO_INITINFO(&a_info);
-+  a_info.play.encoding = AUDIO_ENCODING_SLINEAR_LE;
-+  a_info.play.precision = 16;
-+  if ( ioctl(devAudio, AUDIO_SETINFO, &a_info) < 0)
-+  {
-+    AUDIO_INITINFO(&a_info);
-+    a_info.play.encoding = AUDIO_ENCODING_ULINEAR;
-+    a_info.play.precision = 8;
-+    ioctl(devAudio, AUDIO_SETINFO, &a_info);
-+  }
-+#elif defined(AUDIO_ENCODING_SLINEAR)
-   /* Use new encoding names */
-   AUDIO_INITINFO(&a_info);
-   a_info.play.encoding = AUDIO_ENCODING_SLINEAR;
diff --git a/multimedia/xawtv/DESCR b/multimedia/xawtv/DESCR
deleted file mode 100644
index 7f8ea2f0c15..00000000000
--- a/multimedia/xawtv/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-xawtv is a set of utilities to manage the video4linux interface (and BSD's
-bktr driver too).  The main component of the suite is xawtv itself, which
-is a X11 application to watch the TV.
-
-The package includes the following main utilities:
-* xawtv: a nice X11 application for watching TV.
-* v4lctl: a command line tool to set video4linux parameters.
-* streamer: a command line tool for capturing still images and AVI videos
-  (with sound).
-* radio: a simple, curses-based radio app.
-* webcam: captures images and uploads them with FTP to a Web-Server in an
-  endless loop.
diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile
deleted file mode 100644
index 9053dfa3696..00000000000
--- a/multimedia/xawtv/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# $NetBSD: Makefile,v 1.13 2005/10/04 19:18:42 wiz Exp $
-#
-
-DISTNAME=	xawtv-3.95
-CATEGORIES=	multimedia
-MASTER_SITES=	http://dl.bytesex.org/releases/xawtv/
-
-MAINTAINER=	jmmv@NetBSD.org
-HOMEPAGE=	http://linux.bytesex.org/xawtv/
-COMMENT=	TV application for Brooktree 848 compatible cards
-
-WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
-GNU_CONFIGURE=		YES
-USE_TOOLS+=		gmake perl
-
-CONFIGURE_ARGS+=	--disable-aalib
-CONFIGURE_ARGS+=	--disable-motif
-
-LDFLAGS+=		${LIBOSSAUDIO}
-
-SUBST_CLASSES+=		devoss
-SUBST_MESSAGE.devoss=	"Fixing path to OSS audio device."
-SUBST_STAGE.devoss=	pre-configure
-SUBST_FILES.devoss=	console/record.c libng/devices.c x11/pia.c
-SUBST_FILES.devoss+=	man/motv.1 man/record.1 man/streamer.1 man/xawtv.1
-SUBST_FILES.devoss+=	man/es/streamer.1 man/es/xawtv.1 man/fr/xawtv.1
-SUBST_SED.devoss=	-e 's|/dev/dsp|${DEVOSSAUDIO}|g'
-
-.include "../../mk/bsd.prefs.mk"
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.xawtv
-.if ${MACHINE_ARCH} == "i386"
-PKG_SUPPORTED_OPTIONS=	mmx
-.endif
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mmmx)
-CONFIGURE_ARGS+=	--enable-mmx
-.endif
-
-.include "../../devel/ncurses/buildlink3.mk"
-.include "../../fonts/Xft2/buildlink3.mk"
-.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
-.include "../../x11/Xaw3d/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/xawtv/PLIST b/multimedia/xawtv/PLIST
deleted file mode 100644
index 650f954974a..00000000000
--- a/multimedia/xawtv/PLIST
+++ /dev/null
@@ -1,93 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/01/26 11:39:14 jmmv Exp $
-bin/dump-mixers
-bin/ntsc-cc
-bin/pia
-bin/propwatch
-bin/record
-bin/rootv
-bin/showqt
-bin/showriff
-bin/streamer
-bin/subtitles
-bin/v4lctl
-bin/webcam
-bin/xawtv
-bin/xawtv-remote
-lib/X11/app-defaults/Xawtv
-lib/xawtv/bilinear.so
-lib/xawtv/conv-mjpeg.so
-lib/xawtv/cubic.so
-lib/xawtv/drv0-bsd.so
-lib/xawtv/flt-disor.so
-lib/xawtv/flt-gamma.so
-lib/xawtv/flt-invert.so
-lib/xawtv/flt-smooth.so
-lib/xawtv/linear-blend.so
-lib/xawtv/linedoubler.so
-lib/xawtv/read-avi.so
-lib/xawtv/snd-oss.so
-lib/xawtv/write-avi.so
-man/es/man1/fbtv.1
-man/es/man1/rootv.1
-man/es/man1/scantv.1
-man/es/man1/streamer.1
-man/es/man1/subtitles.1
-man/es/man1/ttv.1
-man/es/man1/v4lctl.1
-man/es/man1/xawtv-remote.1
-man/es/man1/xawtv.1
-man/es/man5/xawtvrc.5
-man/es/man8/v4l-conf.8
-man/fr/man1/xawtv.1
-man/man1/alevtd.1
-man/man1/dump-mixers.1
-man/man1/fbtv.1
-man/man1/motv.1
-man/man1/mtt.1
-man/man1/ntsc-cc.1
-man/man1/pia.1
-man/man1/propwatch.1
-man/man1/radio.1
-man/man1/record.1
-man/man1/rootv.1
-man/man1/scantv.1
-man/man1/showriff.1
-man/man1/streamer.1
-man/man1/subtitles.1
-man/man1/ttv.1
-man/man1/v4l-info.1
-man/man1/v4lctl.1
-man/man1/webcam.1
-man/man1/xawtv-remote.1
-man/man1/xawtv.1
-man/man5/xawtvrc.5
-man/man8/v4l-conf.8
-share/xawtv/Index.map
-share/xawtv/argentina.list
-share/xawtv/ccir-h.list
-share/xawtv/ccir-i-iii.list
-share/xawtv/ccir-sl-sh.list
-share/xawtv/europe-east.list
-share/xawtv/europe-west.list
-share/xawtv/ntsc-bcast-jp.list
-share/xawtv/ntsc-bcast.list
-share/xawtv/ntsc-cable-ca.list
-share/xawtv/ntsc-cable-jp.list
-share/xawtv/ntsc-cable.list
-share/xawtv/ntsc-hrc.list
-share/xawtv/oirt-h.list
-share/xawtv/oirt-i-iii.list
-share/xawtv/oirt-sl-sh.list
-share/xawtv/pal-australia-optus.list
-share/xawtv/pal-australia.list
-share/xawtv/pal-bcast-cn.list
-share/xawtv/pal-bcast-za.list
-share/xawtv/pal-ireland.list
-share/xawtv/pal-italy.list
-share/xawtv/pal-newzealand.list
-share/xawtv/secam-france.list
-share/xawtv/secam-russia.list
-share/xawtv/uhf.list
-@dirrm share/xawtv
-@dirrm lib/xawtv
-@unexec ${RMDIR} %D/lib/X11/app-defaults 2>/dev/null || ${TRUE}
diff --git a/multimedia/xawtv/distinfo b/multimedia/xawtv/distinfo
deleted file mode 100644
index 3a1ff020599..00000000000
--- a/multimedia/xawtv/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/10/04 19:18:42 wiz Exp $
-
-SHA1 (xawtv-3.95.tar.gz) = 0b0743fc06aae4f1a03c8572bcf2baa9b869ff52
-RMD160 (xawtv-3.95.tar.gz) = 1dc7b564bec0515cc409c723904ec9c6f8dae998
-Size (xawtv-3.95.tar.gz) = 555731 bytes
-SHA1 (patch-aa) = 926173ec69b3acb8fd3b32143c9a03ef2f59cdf6
-SHA1 (patch-ab) = bd6e07044155ba7fbfc45c3cab5c4ea2c57ac2e5
-SHA1 (patch-ac) = 7c244761e5174674366aba979506965da7ba9ae6
diff --git a/multimedia/xawtv/patches/patch-aa b/multimedia/xawtv/patches/patch-aa
deleted file mode 100644
index 35b06418575..00000000000
--- a/multimedia/xawtv/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/01/26 11:39:14 jmmv Exp $
-
---- configure.orig	2003-04-12 19:43:47.000000000 +0200
-+++ configure
-@@ -6071,10 +6071,7 @@ echo "${ECHO_T}$x11conf" >&6
- 
- echo "$as_me:$LINENO: checking for X11 app-defaults directory" >&5
- echo $ECHO_N "checking for X11 app-defaults directory... $ECHO_C" >&6
--resdir=/usr/X11R6/lib/X11
--if test -d /etc/X11/app-defaults; then
--	resdir=/etc/X11
--fi
-+resdir=$prefix/lib/X11
- echo "$as_me:$LINENO: result: $resdir/app-defaults" >&5
- echo "${ECHO_T}$resdir/app-defaults" >&6
- 
diff --git a/multimedia/xawtv/patches/patch-ab b/multimedia/xawtv/patches/patch-ab
deleted file mode 100644
index b2d6f3eaa50..00000000000
--- a/multimedia/xawtv/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/01/26 11:39:14 jmmv Exp $
-
---- Makefile.in.orig	2003-04-12 20:00:30.000000000 +0200
-+++ Makefile.in
-@@ -84,7 +84,7 @@ CXXFLAGS := $(CFLAGS)
- %.so : CXXFLAGS += -fPIC
- 
- # libraries
--LDLIBS  := @LDLIBS@
-+LDLIBS  := @LDLIBS@ @LDFLAGS@
- 
- 
- #########################################################
diff --git a/multimedia/xawtv/patches/patch-ac b/multimedia/xawtv/patches/patch-ac
deleted file mode 100644
index 896391db481..00000000000
--- a/multimedia/xawtv/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/01/26 11:39:14 jmmv Exp $
-
---- x11/Subdir.mk.orig	2003-03-28 12:52:49.000000000 +0100
-+++ x11/Subdir.mk
-@@ -100,7 +100,7 @@ x11/motv         : LDLIBS  += \
- 	$(MOTIF_LIBS) $(VBI_LIBS) $(GL_LIBS) -ljpeg -lm
- x11/mtt          : LDLIBS  += $(THREAD_LIBS) $(MOTIF_LIBS) $(VBI_LIBS) -ljpeg
- x11/v4lctl       : LDLIBS  += $(THREAD_LIBS) $(ATHENA_LIBS) -ljpeg -lm
--x11/pia          : LDLIBS  += $(ATHENA_LIBS) $(GL_LIBS) -ljpeg -lm
-+x11/pia          : LDLIBS  += $(THREAD_LIBS) $(ATHENA_LIBS) $(GL_LIBS) -ljpeg -lm
- x11/rootv        : LDLIBS  += $(ATHENA_LIBS)
- x11/xawtv-remote : LDLIBS  += $(ATHENA_LIBS)
- x11/propwatch    : LDLIBS  += $(ATHENA_LIBS)
diff --git a/multimedia/xfmedia/DESCR b/multimedia/xfmedia/DESCR
deleted file mode 100644
index 310680744c7..00000000000
--- a/multimedia/xfmedia/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Xfmedia is a simple, easy-to-use media player based on the xine
-engine.  The GTK+ and Xfce4 GUI focuses on playing and managing audio
-files, but, being based on xine, supports video as well.
diff --git a/multimedia/xfmedia/Makefile b/multimedia/xfmedia/Makefile
deleted file mode 100644
index 3a30e3c39ef..00000000000
--- a/multimedia/xfmedia/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/10/19 04:48:28 minskim Exp $
-#
-
-DISTNAME=		xfmedia-0.9.1
-CATEGORIES=		multimedia
-MASTER_SITES=		http://spuriousinterrupt.org/projects/xfmedia/files/
-EXTRACT_SUFX=           .tar.bz2
-
-MAINTAINER=		dhowland@users.sourceforge.net
-HOMEPAGE=		http://spuriousinterrupt.org/projects/xfmedia/
-COMMENT=		Xfce media player based on xine
-
-BUILD_USES_MSGFMT=	yes
-GNU_CONFIGURE=          yes
-USE_DIRS+=		xdg-1.2
-USE_LIBTOOL=            yes
-USE_PKGINSTALL=         yes
-USE_PKGLOCALEDIR=       yes
-USE_TOOLS+=             gmake pkg-config
-
-OWN_DIRS=	${PKG_SYSCONFDIR}/xdg/xfmedia
-
-CONF_FILES=	${PREFIX}/share/xfmedia/keybindings.rc \
-		${PKG_SYSCONFDIR}/xdg/xfmedia/keybindings.rc
-
-post-install:
-	${INSTALL} ${WRKSRC}/src/keybindings.rc \
-	    ${PREFIX}/share/xfmedia/keybindings.rc
-
-.include "../../audio/taglib/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
-.include "../../multimedia/xine-lib/buildlink3.mk"
-.include "../../sysutils/dbus-glib/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
-.include "../../x11/libexo/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/xfmedia/PLIST b/multimedia/xfmedia/PLIST
deleted file mode 100644
index 6a6359f9440..00000000000
--- a/multimedia/xfmedia/PLIST
+++ /dev/null
@@ -1,58 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/10/19 04:48:28 minskim Exp $
-bin/xfmedia
-bin/xfmedia-remote
-include/xfmedia/xfmedia-interface.h
-include/xfmedia/xfmedia-playlist-queue.h
-include/xfmedia/xfmedia-playlist.h
-include/xfmedia/xfmedia-plugin.h
-include/xfmedia/xfmedia-remote-client.h
-include/xfmedia/xfmedia-remote-common.h
-include/xfmedia/xfmedia-settings.h
-lib/pkgconfig/xfmedia-plugin.pc
-lib/xfmedia/plugins/xfmedia-infopipe.la
-share/applications/xfmedia.desktop
-share/icons/hicolor/22x22/actions/xfmedia-repeat.png
-share/icons/hicolor/22x22/actions/xfmedia-shuffle.png
-share/icons/hicolor/48x48/apps/xfmedia.png
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/xfmedia.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/xfmedia.mo
-${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/xfmedia.mo
-${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/xfmedia.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/xfmedia.mo
-${PKGLOCALEDIR}/locale/gu/LC_MESSAGES/xfmedia.mo
-${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/xfmedia.mo
-${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/xfmedia.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/xfmedia.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/xfmedia.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/xfmedia.mo
-${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/xfmedia.mo
-${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/xfmedia.mo
-share/xfmedia/doc/C/ch01.html
-share/xfmedia/doc/C/ch01s02.html
-share/xfmedia/doc/C/ch01s03.html
-share/xfmedia/doc/C/ch02.html
-share/xfmedia/doc/C/ch03.html
-share/xfmedia/doc/C/ch03s02.html
-share/xfmedia/doc/C/ch03s03.html
-share/xfmedia/doc/C/ch04.html
-share/xfmedia/doc/C/ch04s02.html
-share/xfmedia/doc/C/images/mainwin.png
-share/xfmedia/doc/C/images/mediamarks-add.png
-share/xfmedia/doc/C/images/mediamarks-editor.png
-share/xfmedia/doc/C/images/prefs-audiovis.png
-share/xfmedia/doc/C/images/prefs-keybindings.png
-share/xfmedia/doc/C/images/prefs-options.png
-share/xfmedia/doc/C/index.html
-share/xfmedia/doc/xfce.css
-share/xfmedia/keybindings.rc
-@dirrm share/xfmedia/doc/C/images
-@dirrm share/xfmedia/doc/C
-@dirrm share/xfmedia/doc
-@dirrm share/xfmedia
-@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
-@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/actions
-@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22
-@comment in xdg-dirs: @dirrm share/applications
-@dirrm lib/xfmedia/plugins
-@dirrm lib/xfmedia
-@dirrm include/xfmedia
diff --git a/multimedia/xfmedia/distinfo b/multimedia/xfmedia/distinfo
deleted file mode 100644
index f5a40f04b76..00000000000
--- a/multimedia/xfmedia/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/10/19 04:48:28 minskim Exp $
-
-SHA1 (xfmedia-0.9.1.tar.bz2) = 92eff43fb180b07039d243d1cc720aed0e4163ad
-RMD160 (xfmedia-0.9.1.tar.bz2) = 71576ca7b58eb32bffb2fdaa8bcc75c4fb78f794
-Size (xfmedia-0.9.1.tar.bz2) = 806692 bytes
-SHA1 (patch-aa) = faf57dee99db3f228d89bae17cd40879881a5198
diff --git a/multimedia/xfmedia/patches/patch-aa b/multimedia/xfmedia/patches/patch-aa
deleted file mode 100644
index f29b26877bc..00000000000
--- a/multimedia/xfmedia/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/10/19 04:48:28 minskim Exp $
-
---- src/Makefile.in.orig	2005-09-14 05:04:31.000000000 -0400
-+++ src/Makefile.in
-@@ -403,7 +403,7 @@ xfmedia_remote_LDADD =  \
- 	$(top_builddir)/xfmedia/libxfmedia-remote-client.la \
- 	@GETOPT_LONG_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@ $(am__append_2)
- configdir = $(sysconfdir)/xdg/xfmedia
--config_DATA = keybindings.rc
-+config_DATA = 
- EXTRA_DIST = $(config_DATA)
- all: all-am
- 
diff --git a/multimedia/xine-lib/DESCR b/multimedia/xine-lib/DESCR
deleted file mode 100644
index e01207ee909..00000000000
--- a/multimedia/xine-lib/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-  Xine is a free multimedia player library for playing back CDs, DVDs,
-and VCDs.  It also decodes multimedia files like AVI, MOV, WMV, and MP3
-from local disk drives, and displays multimedia streamed over the
-Internet.  It interprets many of the most common multimedia formats
-available -- and some of the most uncommon formats, too.
diff --git a/multimedia/xine-lib/MESSAGE.i386 b/multimedia/xine-lib/MESSAGE.i386
deleted file mode 100644
index 2e8f8849a77..00000000000
--- a/multimedia/xine-lib/MESSAGE.i386
+++ /dev/null
@@ -1,13 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.i386,v 1.1 2005/05/10 00:16:42 reed Exp $
-
-To watch or listen to Windows Media (.asf/.wmv/.wma), such as MS
-WMV 8 or 9 ASF video, or Quicktime files or streams, install the
-multimedia/win32-codecs package.  It is not required by default
-due to unclear licensing.
-
-The win32-codecs package is not needed for MS Windows Media Audio 2
-and MS Windows Media 7 ASF video, because xine-lib already supports
-these formats using built-in ffmpeg.
-
-===========================================================================
diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile
deleted file mode 100644
index 2386fc200ad..00000000000
--- a/multimedia/xine-lib/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# $NetBSD: Makefile,v 1.27 2005/11/01 06:20:42 reed Exp $
-
-.include "Makefile.common"
-
-PKGREVISION=		1
-
-COMMENT=		Multimedia player library
-
-BUILDLINK_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1
-
-SUBST_CLASSES+=		oss w32path
-
-SUBST_STAGE.oss=	post-patch
-SUBST_FILES.oss=	src/audio_out/audio_oss_out.c
-SUBST_SED.oss=		-e "s,/dev/dsp,${DEVOSSAUDIO},g"
-.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD"
-SUBST_SED.oss+=		-e "s,\"dsp\",\"audio\",g"
-.endif
-SUBST_MESSAGE.oss=	"Fixing hardcoded audio device."
-
-SUBST_STAGE.w32path=	post-patch
-SUBST_FILES.w32path=	src/libw32dll/wine/module.c
-SUBST_SED.w32path=	-e "s,@W32PATH@,${PREFIX}/lib/win32,"
-SUBST_MESSAGE.w32path=	"Fixing win32 dll path."
-
-.include "../../audio/flac/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../audio/speex/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../graphics/Mesa/buildlink3.mk"
-.include "../../graphics/aalib/buildlink3.mk"
-.include "../../graphics/mng/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../misc/libcdio/buildlink3.mk"
-.include "../../sysutils/vcdimager-devel/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common
deleted file mode 100644
index aaacea066ea..00000000000
--- a/multimedia/xine-lib/Makefile.common
+++ /dev/null
@@ -1,48 +0,0 @@
-# $NetBSD: Makefile.common,v 1.28 2005/10/13 10:48:01 jmmv Exp $
-#
-
-DISTNAME=		xine-lib-1.0.3a
-XINE_PKGNAME=		xine-lib-1.0.3a
-PKGNAME?=		${XINE_PKGNAME}
-CATEGORIES?=		multimedia
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xine/}
-
-MAINTAINER=		jmmv@NetBSD.org
-HOMEPAGE=		http://xinehq.de/
-
-DISTINFO_FILE=		${.CURDIR}/../../multimedia/xine-lib/distinfo
-PATCHDIR=		${.CURDIR}/../../multimedia/xine-lib/patches
-
-BUILD_USES_MSGFMT=	YES
-
-GNU_CONFIGURE=		YES
-USE_PKGLOCALEDIR=	YES
-USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	libtool libtool-nofpic
-PKGCONFIG_OVERRIDE=	misc/libxine.pc.in
-USE_TOOLS+=		autoconf gmake pkg-config
-WRKSRC=			${WRKDIR}/xine-lib-1.0.3
-
-CONFIGURE_ARGS+=	--with-w32-path='${PREFIX}/lib/win32'
-CONFIGURE_ARGS+=	--without-external-ffmpeg --disable-ffmpegtest
-CONFIGURE_ENV+=		have_libpng="yes"
-CONFIGURE_ENV+=		PNG_CFLAGS="-I${PREFIX}/include"
-CONFIGURE_ENV+=		PNG_LIBS="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lpng"
-BUILD_ENV+=		"mkdir_p"="mkdir -p"
-
-.include "../../mk/bsd.prefs.mk"
-
-.if !exists(${X11BASE}/lib/libXv.so)
-PLIST_SUBST+=		HAVE_XV="@comment "
-.else
-CONFIGURE_ARGS+=	--with-xv-path='${X11BASE}/lib'
-PLIST_SUBST+=		HAVE_XV=
-.endif
-
-pre-configure:
-	cd ${WRKSRC} && autoconf
-
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
diff --git a/multimedia/xine-lib/PLIST.DragonFly b/multimedia/xine-lib/PLIST.DragonFly
deleted file mode 100644
index ffe2b587c6d..00000000000
--- a/multimedia/xine-lib/PLIST.DragonFly
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.DragonFly,v 1.1 2005/11/01 06:20:42 reed Exp $
-lib/xine/plugins/1.0.3/xineplug_ao_out_oss.so
-lib/xine/plugins/1.0.3/xineplug_ao_out_oss.a
diff --git a/multimedia/xine-lib/PLIST.FreeBSD b/multimedia/xine-lib/PLIST.FreeBSD
deleted file mode 100644
index 2684c3f75af..00000000000
--- a/multimedia/xine-lib/PLIST.FreeBSD
+++ /dev/null
@@ -1,29 +0,0 @@
-@comment $NetBSD: PLIST.FreeBSD,v 1.2 2005/10/13 10:48:01 jmmv Exp $
-lib/xine/plugins/1.0.3/vidix/cyberblade_vid.a
-lib/xine/plugins/1.0.3/vidix/cyberblade_vid.so
-lib/xine/plugins/1.0.3/vidix/mach64_vid.a
-lib/xine/plugins/1.0.3/vidix/mach64_vid.so
-lib/xine/plugins/1.0.3/vidix/mga_crtc2_vid.a
-lib/xine/plugins/1.0.3/vidix/mga_crtc2_vid.so
-lib/xine/plugins/1.0.3/vidix/mga_vid.a
-lib/xine/plugins/1.0.3/vidix/mga_vid.so
-lib/xine/plugins/1.0.3/vidix/nvidia_vid.a
-lib/xine/plugins/1.0.3/vidix/nvidia_vid.so
-lib/xine/plugins/1.0.3/vidix/pm2_vid.a
-lib/xine/plugins/1.0.3/vidix/pm2_vid.so
-lib/xine/plugins/1.0.3/vidix/pm3_vid.a
-lib/xine/plugins/1.0.3/vidix/pm3_vid.so
-lib/xine/plugins/1.0.3/vidix/radeon_vid.a
-lib/xine/plugins/1.0.3/vidix/radeon_vid.so
-lib/xine/plugins/1.0.3/vidix/rage128_vid.a
-lib/xine/plugins/1.0.3/vidix/rage128_vid.so
-lib/xine/plugins/1.0.3/vidix/savage_vid.a
-lib/xine/plugins/1.0.3/vidix/savage_vid.so
-lib/xine/plugins/1.0.3/vidix/sis_vid.a
-lib/xine/plugins/1.0.3/vidix/sis_vid.so
-lib/xine/plugins/1.0.3/vidix/unichrome_vid.a
-lib/xine/plugins/1.0.3/vidix/unichrome_vid.so
-lib/xine/plugins/1.0.3/xineplug_ao_out_oss.a
-lib/xine/plugins/1.0.3/xineplug_ao_out_oss.so
-lib/xine/plugins/1.0.3/xineplug_vo_out_vidix.a
-lib/xine/plugins/1.0.3/xineplug_vo_out_vidix.so
diff --git a/multimedia/xine-lib/PLIST.Linux b/multimedia/xine-lib/PLIST.Linux
deleted file mode 100644
index a1b431a2e1e..00000000000
--- a/multimedia/xine-lib/PLIST.Linux
+++ /dev/null
@@ -1,35 +0,0 @@
-@comment $NetBSD: PLIST.Linux,v 1.7 2005/10/13 10:48:01 jmmv Exp $
-lib/xine/plugins/1.0.3/vidix/cyberblade_vid.a
-lib/xine/plugins/1.0.3/vidix/cyberblade_vid.so
-lib/xine/plugins/1.0.3/vidix/mach64_vid.a
-lib/xine/plugins/1.0.3/vidix/mach64_vid.so
-lib/xine/plugins/1.0.3/vidix/mga_crtc2_vid.a
-lib/xine/plugins/1.0.3/vidix/mga_crtc2_vid.so
-lib/xine/plugins/1.0.3/vidix/mga_vid.a
-lib/xine/plugins/1.0.3/vidix/mga_vid.so
-lib/xine/plugins/1.0.3/vidix/pm2_vid.a
-lib/xine/plugins/1.0.3/vidix/pm2_vid.so
-lib/xine/plugins/1.0.3/vidix/pm3_vid.a
-lib/xine/plugins/1.0.3/vidix/pm3_vid.so
-lib/xine/plugins/1.0.3/vidix/radeon_vid.a
-lib/xine/plugins/1.0.3/vidix/radeon_vid.so
-lib/xine/plugins/1.0.3/vidix/rage128_vid.a
-lib/xine/plugins/1.0.3/vidix/rage128_vid.so
-lib/xine/plugins/1.0.3/vidix/sis_vid.a
-lib/xine/plugins/1.0.3/vidix/sis_vid.so
-lib/xine/plugins/1.0.3/xineplug_ao_out_oss.a
-lib/xine/plugins/1.0.3/xineplug_ao_out_oss.so
-lib/xine/plugins/1.0.3/xineplug_decode_dxr3_spu.a
-lib/xine/plugins/1.0.3/xineplug_decode_dxr3_spu.so
-lib/xine/plugins/1.0.3/xineplug_decode_dxr3_video.a
-lib/xine/plugins/1.0.3/xineplug_decode_dxr3_video.so
-lib/xine/plugins/1.0.3/xineplug_inp_pvr.a
-lib/xine/plugins/1.0.3/xineplug_inp_pvr.so
-lib/xine/plugins/1.0.3/xineplug_inp_v4l.a
-lib/xine/plugins/1.0.3/xineplug_inp_v4l.so
-lib/xine/plugins/1.0.3/xineplug_vo_out_dxr3.a
-lib/xine/plugins/1.0.3/xineplug_vo_out_dxr3.so
-lib/xine/plugins/1.0.3/xineplug_vo_out_fb.a
-lib/xine/plugins/1.0.3/xineplug_vo_out_fb.so
-lib/xine/plugins/1.0.3/xineplug_vo_out_vidix.a
-lib/xine/plugins/1.0.3/xineplug_vo_out_vidix.so
diff --git a/multimedia/xine-lib/PLIST.NetBSD b/multimedia/xine-lib/PLIST.NetBSD
deleted file mode 100644
index da8833210e2..00000000000
--- a/multimedia/xine-lib/PLIST.NetBSD
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST.NetBSD,v 1.6 2005/10/13 10:48:01 jmmv Exp $
-lib/xine/plugins/1.0.3/xineplug_ao_out_oss.a
-lib/xine/plugins/1.0.3/xineplug_ao_out_oss.so
-lib/xine/plugins/1.0.3/xineplug_ao_out_sun.a
-lib/xine/plugins/1.0.3/xineplug_ao_out_sun.so
diff --git a/multimedia/xine-lib/PLIST.SunOS b/multimedia/xine-lib/PLIST.SunOS
deleted file mode 100644
index c58589db78c..00000000000
--- a/multimedia/xine-lib/PLIST.SunOS
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.SunOS,v 1.2 2005/10/13 10:48:01 jmmv Exp $
-lib/xine/plugins/1.0.3/xineplug_ao_out_sun.a
-lib/xine/plugins/1.0.3/xineplug_ao_out_sun.so
diff --git a/multimedia/xine-lib/PLIST.common b/multimedia/xine-lib/PLIST.common
deleted file mode 100644
index 76d47bf330c..00000000000
--- a/multimedia/xine-lib/PLIST.common
+++ /dev/null
@@ -1,259 +0,0 @@
-@comment $NetBSD: PLIST.common,v 1.13 2005/10/13 10:48:01 jmmv Exp $
-bin/xine-config
-include/xine.h
-include/xine/attributes.h
-include/xine/audio_decoder.h
-include/xine/audio_out.h
-include/xine/broadcaster.h
-include/xine/buffer.h
-include/xine/compat.h
-include/xine/configfile.h
-include/xine/demux.h
-include/xine/info_helper.h
-include/xine/input_plugin.h
-include/xine/io_helper.h
-include/xine/metronom.h
-include/xine/os_types.h
-include/xine/osd.h
-include/xine/plugin_catalog.h
-include/xine/post.h
-include/xine/refcounter.h
-include/xine/resample.h
-include/xine/scratch.h
-include/xine/spu_decoder.h
-include/xine/video_decoder.h
-include/xine/video_out.h
-include/xine/video_overlay.h
-include/xine/vo_scale.h
-include/xine/xine_buffer.h
-include/xine/xine_internal.h
-include/xine/xine_plugin.h
-include/xine/xineintl.h
-include/xine/xineutils.h
-include/xine/xmllexer.h
-include/xine/xmlparser.h
-lib/libxine.la
-lib/pkgconfig/libxine.pc
-lib/xine/plugins/1.0.3/post/xineplug_post_audio_filters.a
-lib/xine/plugins/1.0.3/post/xineplug_post_audio_filters.so
-lib/xine/plugins/1.0.3/post/xineplug_post_goom.a
-lib/xine/plugins/1.0.3/post/xineplug_post_goom.so
-lib/xine/plugins/1.0.3/post/xineplug_post_mosaico.a
-lib/xine/plugins/1.0.3/post/xineplug_post_mosaico.so
-lib/xine/plugins/1.0.3/post/xineplug_post_planar.a
-lib/xine/plugins/1.0.3/post/xineplug_post_planar.so
-lib/xine/plugins/1.0.3/post/xineplug_post_switch.a
-lib/xine/plugins/1.0.3/post/xineplug_post_switch.so
-lib/xine/plugins/1.0.3/post/xineplug_post_tvtime.a
-${HAVE_XV}lib/xine/plugins/1.0.3/post/xineplug_post_tvtime.so
-lib/xine/plugins/1.0.3/post/xineplug_post_visualizations.a
-lib/xine/plugins/1.0.3/post/xineplug_post_visualizations.so
-lib/xine/plugins/1.0.3/xineplug_ao_out_file.a
-lib/xine/plugins/1.0.3/xineplug_ao_out_file.so
-lib/xine/plugins/1.0.3/xineplug_ao_out_none.a
-lib/xine/plugins/1.0.3/xineplug_ao_out_none.so
-lib/xine/plugins/1.0.3/xineplug_decode_a52.a
-lib/xine/plugins/1.0.3/xineplug_decode_a52.so
-lib/xine/plugins/1.0.3/xineplug_decode_bitplane.a
-lib/xine/plugins/1.0.3/xineplug_decode_bitplane.so
-lib/xine/plugins/1.0.3/xineplug_decode_dts.a
-lib/xine/plugins/1.0.3/xineplug_decode_dts.so
-lib/xine/plugins/1.0.3/xineplug_decode_dvaudio.a
-lib/xine/plugins/1.0.3/xineplug_decode_dvaudio.so
-lib/xine/plugins/1.0.3/xineplug_decode_faad.a
-lib/xine/plugins/1.0.3/xineplug_decode_faad.so
-lib/xine/plugins/1.0.3/xineplug_decode_ff.a
-lib/xine/plugins/1.0.3/xineplug_decode_ff.so
-lib/xine/plugins/1.0.3/xineplug_decode_gsm610.a
-lib/xine/plugins/1.0.3/xineplug_decode_gsm610.so
-lib/xine/plugins/1.0.3/xineplug_decode_image.a
-lib/xine/plugins/1.0.3/xineplug_decode_image.so
-lib/xine/plugins/1.0.3/xineplug_decode_lpcm.a
-lib/xine/plugins/1.0.3/xineplug_decode_lpcm.so
-lib/xine/plugins/1.0.3/xineplug_decode_mad.a
-lib/xine/plugins/1.0.3/xineplug_decode_mad.so
-lib/xine/plugins/1.0.3/xineplug_decode_mpc.a
-lib/xine/plugins/1.0.3/xineplug_decode_mpc.so
-lib/xine/plugins/1.0.3/xineplug_decode_mpeg2.a
-lib/xine/plugins/1.0.3/xineplug_decode_mpeg2.so
-lib/xine/plugins/1.0.3/xineplug_decode_nsf.a
-lib/xine/plugins/1.0.3/xineplug_decode_nsf.so
-lib/xine/plugins/1.0.3/xineplug_decode_real.a
-lib/xine/plugins/1.0.3/xineplug_decode_real.so
-lib/xine/plugins/1.0.3/xineplug_decode_real_audio.a
-lib/xine/plugins/1.0.3/xineplug_decode_real_audio.so
-lib/xine/plugins/1.0.3/xineplug_decode_rgb.a
-lib/xine/plugins/1.0.3/xineplug_decode_rgb.so
-lib/xine/plugins/1.0.3/xineplug_decode_speex.a
-lib/xine/plugins/1.0.3/xineplug_decode_speex.so
-lib/xine/plugins/1.0.3/xineplug_decode_spu.a
-lib/xine/plugins/1.0.3/xineplug_decode_spu.so
-lib/xine/plugins/1.0.3/xineplug_decode_spucc.a
-lib/xine/plugins/1.0.3/xineplug_decode_spucc.so
-lib/xine/plugins/1.0.3/xineplug_decode_spucmml.a
-lib/xine/plugins/1.0.3/xineplug_decode_spucmml.so
-lib/xine/plugins/1.0.3/xineplug_decode_spudvb.a
-lib/xine/plugins/1.0.3/xineplug_decode_spudvb.so
-lib/xine/plugins/1.0.3/xineplug_decode_sputext.a
-lib/xine/plugins/1.0.3/xineplug_decode_sputext.so
-lib/xine/plugins/1.0.3/xineplug_decode_vorbis.a
-lib/xine/plugins/1.0.3/xineplug_decode_vorbis.so
-lib/xine/plugins/1.0.3/xineplug_decode_yuv.a
-lib/xine/plugins/1.0.3/xineplug_decode_yuv.so
-lib/xine/plugins/1.0.3/xineplug_dmx_asf.a
-lib/xine/plugins/1.0.3/xineplug_dmx_asf.so
-lib/xine/plugins/1.0.3/xineplug_dmx_audio.a
-lib/xine/plugins/1.0.3/xineplug_dmx_audio.so
-lib/xine/plugins/1.0.3/xineplug_dmx_avi.a
-lib/xine/plugins/1.0.3/xineplug_dmx_avi.so
-lib/xine/plugins/1.0.3/xineplug_dmx_fli.a
-lib/xine/plugins/1.0.3/xineplug_dmx_fli.so
-lib/xine/plugins/1.0.3/xineplug_dmx_flv.a
-lib/xine/plugins/1.0.3/xineplug_dmx_flv.so
-lib/xine/plugins/1.0.3/xineplug_dmx_games.a
-lib/xine/plugins/1.0.3/xineplug_dmx_games.so
-lib/xine/plugins/1.0.3/xineplug_dmx_iff.a
-lib/xine/plugins/1.0.3/xineplug_dmx_iff.so
-lib/xine/plugins/1.0.3/xineplug_dmx_image.a
-lib/xine/plugins/1.0.3/xineplug_dmx_image.so
-lib/xine/plugins/1.0.3/xineplug_dmx_matroska.a
-lib/xine/plugins/1.0.3/xineplug_dmx_matroska.so
-lib/xine/plugins/1.0.3/xineplug_dmx_mng.a
-lib/xine/plugins/1.0.3/xineplug_dmx_mng.so
-lib/xine/plugins/1.0.3/xineplug_dmx_mpeg.a
-lib/xine/plugins/1.0.3/xineplug_dmx_mpeg.so
-lib/xine/plugins/1.0.3/xineplug_dmx_mpeg_block.a
-lib/xine/plugins/1.0.3/xineplug_dmx_mpeg_block.so
-lib/xine/plugins/1.0.3/xineplug_dmx_mpeg_elem.a
-lib/xine/plugins/1.0.3/xineplug_dmx_mpeg_elem.so
-lib/xine/plugins/1.0.3/xineplug_dmx_mpeg_pes.a
-lib/xine/plugins/1.0.3/xineplug_dmx_mpeg_pes.so
-lib/xine/plugins/1.0.3/xineplug_dmx_mpeg_ts.a
-lib/xine/plugins/1.0.3/xineplug_dmx_mpeg_ts.so
-lib/xine/plugins/1.0.3/xineplug_dmx_nsv.a
-lib/xine/plugins/1.0.3/xineplug_dmx_nsv.so
-lib/xine/plugins/1.0.3/xineplug_dmx_ogg.a
-lib/xine/plugins/1.0.3/xineplug_dmx_ogg.so
-lib/xine/plugins/1.0.3/xineplug_dmx_pva.a
-lib/xine/plugins/1.0.3/xineplug_dmx_pva.so
-lib/xine/plugins/1.0.3/xineplug_dmx_qt.a
-lib/xine/plugins/1.0.3/xineplug_dmx_qt.so
-lib/xine/plugins/1.0.3/xineplug_dmx_rawdv.a
-lib/xine/plugins/1.0.3/xineplug_dmx_rawdv.so
-lib/xine/plugins/1.0.3/xineplug_dmx_real.a
-lib/xine/plugins/1.0.3/xineplug_dmx_real.so
-lib/xine/plugins/1.0.3/xineplug_dmx_slave.a
-lib/xine/plugins/1.0.3/xineplug_dmx_slave.so
-lib/xine/plugins/1.0.3/xineplug_dmx_sputext.a
-lib/xine/plugins/1.0.3/xineplug_dmx_sputext.so
-lib/xine/plugins/1.0.3/xineplug_dmx_yuv4mpeg2.a
-lib/xine/plugins/1.0.3/xineplug_dmx_yuv4mpeg2.so
-lib/xine/plugins/1.0.3/xineplug_dmx_yuv_frames.a
-lib/xine/plugins/1.0.3/xineplug_dmx_yuv_frames.so
-lib/xine/plugins/1.0.3/xineplug_flac.a
-lib/xine/plugins/1.0.3/xineplug_flac.so
-lib/xine/plugins/1.0.3/xineplug_inp_cdda.a
-lib/xine/plugins/1.0.3/xineplug_inp_cdda.so
-lib/xine/plugins/1.0.3/xineplug_inp_dvb.a
-lib/xine/plugins/1.0.3/xineplug_inp_dvb.so
-lib/xine/plugins/1.0.3/xineplug_inp_dvd.a
-lib/xine/plugins/1.0.3/xineplug_inp_dvd.so
-lib/xine/plugins/1.0.3/xineplug_inp_file.a
-lib/xine/plugins/1.0.3/xineplug_inp_file.so
-lib/xine/plugins/1.0.3/xineplug_inp_http.a
-lib/xine/plugins/1.0.3/xineplug_inp_http.so
-lib/xine/plugins/1.0.3/xineplug_inp_mms.a
-lib/xine/plugins/1.0.3/xineplug_inp_mms.so
-lib/xine/plugins/1.0.3/xineplug_inp_net.a
-lib/xine/plugins/1.0.3/xineplug_inp_net.so
-lib/xine/plugins/1.0.3/xineplug_inp_pnm.a
-lib/xine/plugins/1.0.3/xineplug_inp_pnm.so
-lib/xine/plugins/1.0.3/xineplug_inp_rtp.a
-lib/xine/plugins/1.0.3/xineplug_inp_rtp.so
-lib/xine/plugins/1.0.3/xineplug_inp_rtsp.a
-lib/xine/plugins/1.0.3/xineplug_inp_rtsp.so
-lib/xine/plugins/1.0.3/xineplug_inp_stdin_fifo.a
-lib/xine/plugins/1.0.3/xineplug_inp_stdin_fifo.so
-lib/xine/plugins/1.0.3/xineplug_inp_vcd.a
-lib/xine/plugins/1.0.3/xineplug_inp_vcd.so
-lib/xine/plugins/1.0.3/xineplug_inp_vcdo.a
-lib/xine/plugins/1.0.3/xineplug_inp_vcdo.so
-lib/xine/plugins/1.0.3/xineplug_vo_out_aa.a
-lib/xine/plugins/1.0.3/xineplug_vo_out_aa.so
-lib/xine/plugins/1.0.3/xineplug_vo_out_none.a
-lib/xine/plugins/1.0.3/xineplug_vo_out_none.so
-lib/xine/plugins/1.0.3/xineplug_vo_out_opengl.a
-lib/xine/plugins/1.0.3/xineplug_vo_out_opengl.so
-lib/xine/plugins/1.0.3/xineplug_vo_out_sdl.a
-lib/xine/plugins/1.0.3/xineplug_vo_out_sdl.so
-lib/xine/plugins/1.0.3/xineplug_vo_out_xshm.a
-lib/xine/plugins/1.0.3/xineplug_vo_out_xshm.so
-${HAVE_XV}lib/xine/plugins/1.0.3/xineplug_vo_out_xv.a
-${HAVE_XV}lib/xine/plugins/1.0.3/xineplug_vo_out_xv.so
-man/man1/xine-config.1
-man/man5/xine.5
-share/aclocal/xine.m4
-share/doc/xine/README
-share/doc/xine/README.MINGWCROSS
-share/doc/xine/README.WIN32
-share/doc/xine/README.dvb
-share/doc/xine/README.dxr3
-share/doc/xine/README.freebsd
-share/doc/xine/README.irix
-share/doc/xine/README.network_dvd
-share/doc/xine/README.opengl
-share/doc/xine/README.solaris
-share/doc/xine/README.syncfb
-share/doc/xine/README_xxmc.html
-share/doc/xine/faq/faq.html
-share/doc/xine/faq/faq.txt
-share/doc/xine/hackersguide/architecture.png
-share/doc/xine/hackersguide/hackersguide.html
-share/doc/xine/hackersguide/library.png
-share/doc/xine/hackersguide/overlays.png
-share/doc/xine/hackersguide/post_frame.png
-${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/libxine1.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/libxine1.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/libxine1.mo
-${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/libxine1.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/libxine1.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/libxine1.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/libxine1.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/libxine1.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/libxine1.mo
-share/xine/libxine1/fonts/cc-16.xinefont.gz
-share/xine/libxine1/fonts/cc-20.xinefont.gz
-share/xine/libxine1/fonts/cc-24.xinefont.gz
-share/xine/libxine1/fonts/cc-32.xinefont.gz
-share/xine/libxine1/fonts/cc-48.xinefont.gz
-share/xine/libxine1/fonts/cc-64.xinefont.gz
-share/xine/libxine1/fonts/cci-16.xinefont.gz
-share/xine/libxine1/fonts/cci-20.xinefont.gz
-share/xine/libxine1/fonts/cci-24.xinefont.gz
-share/xine/libxine1/fonts/cci-32.xinefont.gz
-share/xine/libxine1/fonts/cci-48.xinefont.gz
-share/xine/libxine1/fonts/cci-64.xinefont.gz
-share/xine/libxine1/fonts/cetus-16.xinefont.gz
-share/xine/libxine1/fonts/cetus-20.xinefont.gz
-share/xine/libxine1/fonts/cetus-24.xinefont.gz
-share/xine/libxine1/fonts/cetus-32.xinefont.gz
-share/xine/libxine1/fonts/cetus-48.xinefont.gz
-share/xine/libxine1/fonts/cetus-64.xinefont.gz
-share/xine/libxine1/fonts/mono-16.xinefont.gz
-share/xine/libxine1/fonts/mono-20.xinefont.gz
-share/xine/libxine1/fonts/mono-24.xinefont.gz
-share/xine/libxine1/fonts/mono-32.xinefont.gz
-share/xine/libxine1/fonts/mono-48.xinefont.gz
-share/xine/libxine1/fonts/mono-64.xinefont.gz
-share/xine/libxine1/fonts/sans-16.xinefont.gz
-share/xine/libxine1/fonts/sans-20.xinefont.gz
-share/xine/libxine1/fonts/sans-24.xinefont.gz
-share/xine/libxine1/fonts/sans-32.xinefont.gz
-share/xine/libxine1/fonts/sans-48.xinefont.gz
-share/xine/libxine1/fonts/sans-64.xinefont.gz
-share/xine/libxine1/fonts/serif-16.xinefont.gz
-share/xine/libxine1/fonts/serif-20.xinefont.gz
-share/xine/libxine1/fonts/serif-24.xinefont.gz
-share/xine/libxine1/fonts/serif-32.xinefont.gz
-share/xine/libxine1/fonts/serif-48.xinefont.gz
-share/xine/libxine1/fonts/serif-64.xinefont.gz
diff --git a/multimedia/xine-lib/PLIST.common_end b/multimedia/xine-lib/PLIST.common_end
deleted file mode 100644
index 8ac479b135d..00000000000
--- a/multimedia/xine-lib/PLIST.common_end
+++ /dev/null
@@ -1,14 +0,0 @@
-@comment $NetBSD: PLIST.common_end,v 1.5 2005/10/13 10:48:01 jmmv Exp $
-@dirrm share/xine/libxine1/fonts
-@dirrm share/xine/libxine1
-@dirrm share/xine
-@dirrm share/doc/xine/hackersguide
-@dirrm share/doc/xine/faq
-@dirrm share/doc/xine
-@exec ${MKDIR} %D/lib/xine/plugins/1.0.3/vidix
-@dirrm lib/xine/plugins/1.0.3/vidix
-@dirrm lib/xine/plugins/1.0.3/post
-@dirrm lib/xine/plugins/1.0.3
-@dirrm lib/xine/plugins
-@dirrm lib/xine
-@dirrm include/xine
diff --git a/multimedia/xine-lib/PLIST.i386 b/multimedia/xine-lib/PLIST.i386
deleted file mode 100644
index e2bf591d1d5..00000000000
--- a/multimedia/xine-lib/PLIST.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST.i386,v 1.4 2005/10/13 10:48:01 jmmv Exp $
-lib/xine/plugins/1.0.3/xineplug_decode_qt.a
-lib/xine/plugins/1.0.3/xineplug_decode_qt.so
-lib/xine/plugins/1.0.3/xineplug_decode_w32dll.a
-lib/xine/plugins/1.0.3/xineplug_decode_w32dll.so
diff --git a/multimedia/xine-lib/buildlink3.mk b/multimedia/xine-lib/buildlink3.mk
deleted file mode 100644
index dab8d21aaee..00000000000
--- a/multimedia/xine-lib/buildlink3.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.11 2005/10/13 10:48:01 jmmv Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-XINE_LIB_BUILDLINK3_MK:=	${XINE_LIB_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	xine-lib
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxine-lib}
-BUILDLINK_PACKAGES+=	xine-lib
-
-.if !empty(XINE_LIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xine-lib+=	xine-lib>=1rc3c
-BUILDLINK_RECOMMENDED.xine-lib+=xine-lib>=1.0.3a
-BUILDLINK_PKGSRCDIR.xine-lib?=	../../multimedia/xine-lib
-.endif	# XINE_LIB_BUILDLINK3_MK
-
-.include "../../audio/flac/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../graphics/Mesa/buildlink3.mk"
-.include "../../graphics/aalib/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/mng/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo
deleted file mode 100644
index 2c1db51898a..00000000000
--- a/multimedia/xine-lib/distinfo
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: distinfo,v 1.26 2005/11/01 06:15:33 reed Exp $
-
-SHA1 (xine-lib-1.0.3a.tar.gz) = 2efe9bc3d85659731e8c679d2c60901a6101f17b
-RMD160 (xine-lib-1.0.3a.tar.gz) = 335abfaa46c4592a22246f75c3a455cd87b7cdc4
-Size (xine-lib-1.0.3a.tar.gz) = 7295526 bytes
-SHA1 (patch-aa) = 8218d6415878fb99ebf533eb9d60c9ffebbed274
-SHA1 (patch-ab) = c83f1826eabbc53e868ea4a532efda7f7ac8a4b7
-SHA1 (patch-ac) = 7959d6d3599c9debe79b1b4a5749b6af714588a0
-SHA1 (patch-ad) = 94aaac03f74c72a1ca753d1320aac07d1bb8a846
-SHA1 (patch-ae) = cf7486ed50a782fcfb17ad0985e76a7ae09a2938
-SHA1 (patch-af) = f190e1595e1644b844bdc3d9e19975c03e73bb55
-SHA1 (patch-ag) = 5ad6e5e40d1fb8eeb3bf06e406ab4c67e69df3b1
-SHA1 (patch-ah) = 3f9b23c4a7994259056b73209a9e194db759f06d
-SHA1 (patch-ai) = f51423976056637f92366d9ccee6b97837ffc934
-SHA1 (patch-aj) = 4215c3bc37cf636e563a509f9a391081ed8e773b
-SHA1 (patch-ak) = 34b41bf29efeb1d0fa29b22d419d7665e33d2cb2
-SHA1 (patch-al) = f78b16bb84b3748c01c50d258c24fccfb19910b4
-SHA1 (patch-am) = 10f6433a8549bdce60ace5dcbd51df85eaa7ea16
-SHA1 (patch-ao) = c5bbffceb34516951d2f19558bb6e082376ab195
-SHA1 (patch-ap) = aaf63024c1049c1f2175d9974367a6b84ac3028f
-SHA1 (patch-ar) = c0053ebca44544c42e39aab775e8441b6e9faa30
-SHA1 (patch-as) = ad09d98ba79cdaa0367589658d7fa05a78d075ba
-SHA1 (patch-av) = 56f462e6091a72e87544ece689557d60fbb749aa
-SHA1 (patch-ba) = c4a5fbe9d88d21a90fe01359ace7831f2a865c86
-SHA1 (patch-bb) = 40978e50dcb060a2b8314b310a68684e62e90bc2
-SHA1 (patch-bd) = 5352293022da25b08598d42655af2524ff99b28a
-SHA1 (patch-be) = 78dc9f32b5861fbe6195c26d56aefea6684610e9
-SHA1 (patch-bg) = c905cbac881a8f623bb0f465194673dcdaf373c0
-SHA1 (patch-bh) = ad36e3953ef1b91751ec6668af3135b449dade72
-SHA1 (patch-bi) = 7433089dc41b6f1633b23edb56881d27d68e6ff8
-SHA1 (patch-cb) = 654779bd2f41f3fae1ff074f260b3a5f5e8ecda2
-SHA1 (patch-cd) = a080c745d08ded46db7c1173fe55350c1eb9ff33
-SHA1 (patch-ce) = 2e3abf3d88977d88c7fc8ffd3d2ead57969620d6
diff --git a/multimedia/xine-lib/patches/patch-aa b/multimedia/xine-lib/patches/patch-aa
deleted file mode 100644
index e347569f249..00000000000
--- a/multimedia/xine-lib/patches/patch-aa
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2005/10/13 10:48:01 jmmv Exp $
-
---- src/xine-engine/video_decoder.c.orig	2005-10-08 15:57:49.000000000 +0200
-+++ src/xine-engine/video_decoder.c
-@@ -43,6 +43,10 @@
- 
- #define SPU_SLEEP_INTERVAL (90000/2)
- 
-+#ifndef SCHED_OTHER
-+#define SCHED_OTHER 0
-+#endif
-+
- 
- static void update_spu_decoder (xine_stream_t *stream, int type) {
- 
-@@ -472,7 +476,9 @@ void _x_video_decoder_init (xine_stream_
-   } else {
-      
-     pthread_attr_t       pth_attrs;
-+#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
-     struct sched_param   pth_params;
-+#endif
-     int		       err, num_buffers;
-     /* The fifo size is based on dvd playback where buffers are filled
-      * with 2k of data. With 500 buffers and a typical video data rate
-@@ -496,10 +502,12 @@ void _x_video_decoder_init (xine_stream_
-     stream->spu_track_map_entries = 0;
-   
-     pthread_attr_init(&pth_attrs);
-+#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
-     pthread_attr_getschedparam(&pth_attrs, &pth_params);
-     pth_params.sched_priority = sched_get_priority_min(SCHED_OTHER);
-     pthread_attr_setschedparam(&pth_attrs, &pth_params);
-     pthread_attr_setscope(&pth_attrs, PTHREAD_SCOPE_SYSTEM);
-+#endif
- 
-     stream->video_thread_created = 1;
-     if ((err = pthread_create (&stream->video_thread,
diff --git a/multimedia/xine-lib/patches/patch-ab b/multimedia/xine-lib/patches/patch-ab
deleted file mode 100644
index 0b5a82a218d..00000000000
--- a/multimedia/xine-lib/patches/patch-ab
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2005/10/13 10:48:01 jmmv Exp $
-
---- src/xine-engine/audio_decoder.c.orig	2005-10-08 15:57:49.000000000 +0200
-+++ src/xine-engine/audio_decoder.c
-@@ -448,7 +448,9 @@ static void *audio_decoder_loop (void *s
- void _x_audio_decoder_init (xine_stream_t *stream) {
- 
-   pthread_attr_t       pth_attrs;
-+#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
-   struct sched_param   pth_params;
-+#endif
-   int                  err;
- 
-   if (stream->audio_out == NULL) {
-@@ -486,10 +488,12 @@ void _x_audio_decoder_init (xine_stream_
-      */
- 
-     pthread_attr_init(&pth_attrs);
-+#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
-     pthread_attr_getschedparam(&pth_attrs, &pth_params);
-     pth_params.sched_priority = sched_get_priority_min(SCHED_OTHER);
-     pthread_attr_setschedparam(&pth_attrs, &pth_params);
-     pthread_attr_setscope(&pth_attrs, PTHREAD_SCOPE_SYSTEM);
-+#endif
-  
-     stream->audio_thread_created = 1; 
-     if ((err = pthread_create (&stream->audio_thread,
diff --git a/multimedia/xine-lib/patches/patch-ac b/multimedia/xine-lib/patches/patch-ac
deleted file mode 100644
index 9f0459159f1..00000000000
--- a/multimedia/xine-lib/patches/patch-ac
+++ /dev/null
@@ -1,118 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2004/03/11 17:26:02 jmmv Exp $
-
---- src/audio_out/audio_sun_out.c.orig	2003-12-14 23:13:22.000000000 +0100
-+++ src/audio_out/audio_sun_out.c
-@@ -41,6 +41,11 @@
- #ifdef	__svr4__
- #include <stropts.h>
- #endif
-+#include <sys/param.h>
-+
-+#if (defined(BSD) && BSD >= 199306)
-+typedef unsigned uint_t;
-+#endif
- 
- #include "xine_internal.h"
- #include "xineutils.h"
-@@ -89,7 +94,9 @@ typedef struct sun_driver_s {
-   uint32_t       num_channels;
-   int		 bytes_per_frame;
- 
-+#ifndef __NetBSD__
-   uint32_t       frames_in_buffer;     /* number of frames writen to audio hardware   */
-+#endif
- 
-   enum {
-       RTSC_UNKNOWN = 0,
-@@ -113,12 +120,14 @@ typedef struct sun_driver_s {
-   unsigned	 buf_len;
- #endif
- 
-+#ifndef __NetBSD__
- #if	SW_SAMPLE_COUNT
-   struct timeval tv0;
-   uint_t	 sample0;
- #endif
- 
-   uint_t	 last_samplecnt;
-+#endif
- } sun_driver_t;
- 
- 
-@@ -128,6 +137,7 @@ typedef struct sun_driver_s {
-  */
- static int realtime_samplecounter_available(xine_t *xine, char *dev)
- {
-+#ifndef __NetBSD__
-   int fd = -1;
-   audio_info_t info;
-   int rtsc_ok = RTSC_DISABLED;
-@@ -246,6 +256,9 @@ error:
-   }
- 
-   return rtsc_ok;
-+#else
-+  return RTSC_ENABLED;
-+#endif
- }
- 
- 
-@@ -429,7 +442,9 @@ static int ao_sun_open(ao_driver_t *this
-   
-   this->mode			= mode;
-   this->input_sample_rate	= rate;
-+#ifndef __NetBSD__
-   this->frames_in_buffer	= 0;
-+#endif
- 
-   /*
-    * open audio device
-@@ -461,6 +476,9 @@ static int ao_sun_open(ao_driver_t *this
-       info.play.sample_rate = this->input_sample_rate;
-       info.play.eof = 0;
-       info.play.samples = 0;
-+#ifdef __NetBSD__
-+      info.blocksize = 1024;
-+#endif
- 
-       this->convert_u8_s8 = 0;
- 
-@@ -522,7 +540,9 @@ static int ao_sun_open(ao_driver_t *this
-       return 0;
-   }
- 
-+#ifndef __NetBSD__
-   this->last_samplecnt = 0;
-+#endif
- 
-   this->output_sample_rate = info.play.sample_rate;
-   this->num_channels = info.play.channels;
-@@ -563,6 +583,7 @@ static int ao_sun_delay(ao_driver_t *thi
-   sun_driver_t *this = (sun_driver_t *) this_gen;
-   audio_info_t info;
- 
-+#ifndef __NetBSD__
-   if (ioctl(this->audio_fd, AUDIO_GETINFO, &info) == 0 &&
-       (this->frames_in_buffer == 0 || info.play.samples > 0)) {
- 
-@@ -609,6 +630,10 @@ static int ao_sun_delay(ao_driver_t *thi
-     }
- #endif
-   }
-+#else
-+  if (ioctl(this->audio_fd, AUDIO_GETINFO, &info) == 0)
-+    return info.play.seek / this->bytes_per_frame;
-+#endif
-   return NOT_REAL_TIME;
- }
- 
-@@ -717,7 +742,9 @@ static int ao_sun_write(ao_driver_t *thi
-   if (num_written > 0) {
-     int buffered_samples;
- 
-+#ifndef __NetBSD__
-     this->frames_in_buffer += num_written / this->bytes_per_frame;
-+#endif
- 
-     /* 
-      * Avoid storing too much data in the sound driver's buffers.
diff --git a/multimedia/xine-lib/patches/patch-ad b/multimedia/xine-lib/patches/patch-ad
deleted file mode 100644
index 6f82c90010c..00000000000
--- a/multimedia/xine-lib/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2004/03/28 20:14:22 mycroft Exp $
-
---- src/input/libdvdnav/vm.c.orig	2004-03-16 20:21:22.000000000 +0000
-+++ src/input/libdvdnav/vm.c	2004-03-28 02:03:44.000000000 +0000
-@@ -36,6 +36,7 @@
- #include <assert.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <sys/param.h>
- #include <fcntl.h>
- 
- #include "ifo_types.h"
diff --git a/multimedia/xine-lib/patches/patch-ae b/multimedia/xine-lib/patches/patch-ae
deleted file mode 100644
index 7710b9c7768..00000000000
--- a/multimedia/xine-lib/patches/patch-ae
+++ /dev/null
@@ -1,86 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $
-
---- src/input/input_vcd.c.orig	2003-04-07 02:17:07.000000000 +1000
-+++ src/input/input_vcd.c
-@@ -32,6 +32,7 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <sys/ioctl.h>
-+#include <sys/param.h>
- #include <string.h>
- #ifdef HAVE_LINUX_CDROM_H
- # include <linux/cdrom.h>
-@@ -94,7 +95,7 @@ typedef struct {
- #if defined (__linux__) || defined(__sun)
-   struct cdrom_tochdr    tochdr;
-   struct cdrom_tocentry  tocent[100];
--#elif defined (__FreeBSD__)
-+#elif (defined(BSD) && BSD >= 199306)
-   struct ioc_toc_header  tochdr;
-   struct cd_toc_entry    *tocent;
-   off_t                  cur_sec;
-@@ -119,7 +120,7 @@ typedef struct {
- 
-   int                    cur_track;
- 
--#if defined (__linux__) || defined(__sun) || defined(__FreeBSD__)
-+#if defined (__linux__) || defined(__sun) || (defined(BSD) && BSD >= 199306)
-   uint8_t                cur_min, cur_sec, cur_frame;
- #endif
- 
-@@ -176,7 +177,7 @@ static int input_vcd_read_toc (vcd_input
- 
-   return 0;
- }
--#elif defined (__FreeBSD__)
-+#elif (defined(BSD) && BSD >= 199306)
- static int input_vcd_read_toc (vcd_input_class_t *this, int fd) {
- 
-   struct ioc_read_toc_entry te;
-@@ -388,7 +389,7 @@ static off_t vcd_plugin_read (input_plug
-   memcpy (buf, data.data, VCDSECTORSIZE); /* FIXME */
-   return VCDSECTORSIZE;
- }
--#elif defined (__FreeBSD__)
-+#elif (defined(BSD) && BSD >= 199306)
- static off_t vcd_plugin_read (input_plugin_t *this_gen, 
- 				char *buf, off_t nlen) {
-   vcd_input_plugin_t *this = (vcd_input_plugin_t *) this_gen;
-@@ -526,7 +527,7 @@ static buf_element_t *vcd_plugin_read_bl
-   memcpy (buf->mem, data.data, VCDSECTORSIZE); /* FIXME */
-   return buf;
- }
--#elif defined (__FreeBSD__)
-+#elif (defined(BSD) && BSD >= 199306)
- static buf_element_t *vcd_plugin_read_block (input_plugin_t *this_gen, 
- 					     fifo_buffer_t *fifo, off_t nlen) {
-   
-@@ -684,7 +685,7 @@ static off_t vcd_plugin_seek (input_plug
- 
-   return offset ; /* FIXME */
- }
--#elif defined (__FreeBSD__)
-+#elif (defined(BSD) && BSD >= 199306)
- static off_t vcd_plugin_seek (input_plugin_t *this_gen, 
- 				off_t offset, int origin) {
- 
-@@ -758,7 +759,7 @@ static off_t vcd_plugin_get_length (inpu
- 
-   return (off_t) 0;
- }
--#elif defined (__FreeBSD__)
-+#elif (defined(BSD) && BSD >= 199306)
- static off_t vcd_plugin_get_length (input_plugin_t *this_gen) {
-   vcd_input_plugin_t *this = (vcd_input_plugin_t *) this_gen;
-   off_t len ;
-@@ -886,6 +887,10 @@ static input_plugin_t *open_plugin (inpu
-   this->cur_min   = this->cls->tocent[this->cur_track].cdte_addr.msf.minute;
-   this->cur_sec   = this->cls->tocent[this->cur_track].cdte_addr.msf.second;
-   this->cur_frame = this->cls->tocent[this->cur_track].cdte_addr.msf.frame;
-+#elif defined(__NetBSD__)
-+  this->cur_min   = this->cls->tocent[this->cur_track+1 - this->cls->tochdr.starting_track].addr.msf.minute;
-+  this->cur_sec   = this->cls->tocent[this->cur_track+1 - this->cls->tochdr.starting_track].addr.msf.second;
-+  this->cur_frame = this->cls->tocent[this->cur_track+1 - this->cls->tochdr.starting_track].addr.msf.frame;
- #elif defined (__FreeBSD__)
-   {
-     int bsize = 2352;
diff --git a/multimedia/xine-lib/patches/patch-af b/multimedia/xine-lib/patches/patch-af
deleted file mode 100644
index e79376c1a0a..00000000000
--- a/multimedia/xine-lib/patches/patch-af
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-af,v 1.3 2005/05/26 22:47:22 reed Exp $
-
---- src/video_out/video_out_sdl.c.orig	Sat May  7 11:04:14 2005
-+++ src/video_out/video_out_sdl.c	Sat May  7 11:04:27 2005
-@@ -47,11 +47,7 @@
- #include <string.h>
- #include <inttypes.h>
- #include <math.h>
--#if defined (__FreeBSD__)
--# include <SDL11/SDL.h>
--#else
--# include <SDL.h>
--#endif
-+#include <SDL.h>
- 
- #define LOG_MODULE "video_out_sdl"
- #define LOG_VERBOSE
diff --git a/multimedia/xine-lib/patches/patch-ag b/multimedia/xine-lib/patches/patch-ag
deleted file mode 100644
index 508e8e1abdb..00000000000
--- a/multimedia/xine-lib/patches/patch-ag
+++ /dev/null
@@ -1,112 +0,0 @@
-$NetBSD: patch-ag,v 1.11 2005/11/01 05:39:53 reed Exp $
-
---- configure.ac.orig	2005-10-08 16:08:37.000000000 +0200
-+++ configure.ac
-@@ -200,7 +200,7 @@ AC_ARG_WITH(pthread-prefix, 
-   [pthread_prefix="no"])
- 
- case "$host" in
--  *-*-freebsd*)
-+  *-*-freebsd* | *-*-dragonfly*)
-     if test x"$pthread_prefix" = "xno"; then
-       pthread_prefix="/usr/local"
-     fi
-@@ -437,6 +437,9 @@ AC_CHECK_LIB(socket, socket, NET_LIBS="-
- AC_CHECK_LIB(nsl, gethostbyname, NET_LIBS="-lnsl $NET_LIBS",)
- AC_SUBST(NET_LIBS)
- 
-+WINE_LIBS=""
-+AC_CHECK_LIB(i386, i386_set_ldt, WINE_LIBS="-li386 $WINE_LIBS",)
-+AC_SUBST(WINE_LIBS)
- 
- dnl ---------------------------------------------
- dnl socklen_t
-@@ -630,7 +633,7 @@ XXMC_LIB="-L$xxmc_path -l$xxmc_stub"
- AC_MSG_CHECKING(whether to enable the xxmc plugin with vld extensions)
- AC_MSG_RESULT()
- dnl Check if vld "extended" XvMC is available
--if test x$xxmc_stub == "xXvMCW"; then
-+if test x$xxmc_stub = "xXvMCW"; then
- 	AC_CHECK_LIB($xxmc_stub, XvMCPutSlice,
-              	     ac_have_xxmc="yes",
- 	             [ac_have_xxmc="no"
-@@ -660,7 +663,7 @@ if test x$ac_have_xxmc = "xyes"; then
- fi
- dnl Try fallback to standard XvMC if vld failed
- if test x$ac_have_xxmc = "xno"; then
--  if test x$xxmc_stub == "xXvMCW"; then
-+  if test x$xxmc_stub = "xXvMCW"; then
- 	  AC_CHECK_LIB($xxmc_stub, XvMCCreateContext,
-                ac_have_xxmc="yes",
- 	       [ac_have_xxmc="no"
-@@ -714,7 +717,7 @@ saved_libs="$LIBS"
- XVMC_LIB="-L$xvmc_path -l$xvmc_stub"
- AC_MSG_CHECKING(whether to enable the xvmc plugin)
- AC_MSG_RESULT()
--if test x$xvmc_stub == "xXvMCW"; then
-+if test x$xvmc_stub = "xXvMCW"; then
- 	AC_CHECK_LIB($xvmc_stub, XvMCCreateContext,
-              ac_have_xvmc="yes",
- 	     [ac_have_xvmc="no"
-@@ -754,8 +757,7 @@ dnl Checks for Xinerama extension
- dnl ---------------------------------------------
- 
- AC_CHECK_LIB(Xinerama, XineramaQueryExtension, 
--             [X_LIBS="$X_LIBS -lXinerama"
--              AC_DEFINE(HAVE_XINERAMA,1,[Define this if you have libXinerama installed])
-+             [AC_DEFINE(HAVE_XINERAMA,1,[Define this if you have libXinerama installed])
-               ac_have_xinerama="yes"],,
-              [$X_LIBS $X_PRE_LIBS -lXext $X_EXTRA_LIBS])
- dnl AM_CONDITIONAL(HAVE_XINERAMA, test x$ac_have_xinerama = "xyes")
-@@ -1194,9 +1196,19 @@ dnl ------------------------------------
- dnl OSS style audio interface
- dnl ---------------------------------------------
- 
-+case "$host" in
-+       *-*-netbsd*|*-*-openbsd*)
-+	OSS_LIBS="-lossaudio"
-+	;;
-+	*)
-+	OSS_LIBS=""
-+	;;
-+esac
-+
- AC_MSG_CHECKING(for OSS audio support)
- have_ossaudio=no
- AC_TRY_COMPILE([
-+	    #include <sys/ioctl.h>
- 	    #ifdef __NetBSD__
- 	    #include <soundcard.h>
- 	    #else
-@@ -1209,7 +1221,7 @@ AC_TRY_COMPILE([
- 	])
- AC_MSG_RESULT($have_ossaudio)
- AM_CONDITIONAL(HAVE_OSS, test x"$have_ossaudio" = "xyes")
--
-+AC_SUBST(OSS_LIBS)
- 
- dnl ---------------------------------------------
- dnl Alsa support
-@@ -1250,9 +1262,10 @@ dnl ------------------------------------
- dnl gnome-vfs support
- dnl ---------------------------------------------
- 
--PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0,
--                no_gnome_vfs=no,
--		no_gnome_vfs=yes)
-+dnl PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0,
-+dnl                 no_gnome_vfs=no,
-+dnl 		no_gnome_vfs=yes)
-+no_gnome_vfs=yes
- AC_SUBST(GNOME_VFS_CFLAGS)
- AC_SUBST(GNOME_VFS_LIBS)
- if test x"$no_gnome_vfs" != "xyes"; then
-@@ -1568,7 +1581,7 @@ int has_timeout=sizeof(test.timeout);],
-      	    AC_DEFINE([HAVE_WIN32_CDROM], [1], 
-                       [Define 1 if you have MinGW CD-ROM support])
- 	 ;;
--         freebsd4.*)
-+         freebsd4.* | dragonfly*)
-      	    AC_DEFINE([HAVE_FREEBSD_CDROM], [1], 
-                       [Define 1 if you have FreeBSD CD-ROM support])
- 	 ;;
diff --git a/multimedia/xine-lib/patches/patch-ah b/multimedia/xine-lib/patches/patch-ah
deleted file mode 100644
index 10a2528c1cf..00000000000
--- a/multimedia/xine-lib/patches/patch-ah
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $
-
---- src/xine-engine/video_out.c.orig	2003-04-06 10:23:10.000000000 +1000
-+++ src/xine-engine/video_out.c
-@@ -1443,7 +1443,9 @@ xine_video_port_t *vo_new_port (xine_t *
-     this->grab_only            = 0;
-     
-     pthread_attr_init(&pth_attrs);
-+#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
-     pthread_attr_setscope(&pth_attrs, PTHREAD_SCOPE_SYSTEM);
-+#endif
-     
-     if ((err = pthread_create (&this->video_thread,
- 			       &pth_attrs, video_out_loop, this)) != 0) {
diff --git a/multimedia/xine-lib/patches/patch-ai b/multimedia/xine-lib/patches/patch-ai
deleted file mode 100644
index db3d237c58e..00000000000
--- a/multimedia/xine-lib/patches/patch-ai
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2005/10/13 10:48:01 jmmv Exp $
-
---- src/xine-engine/audio_out.c.orig	2005-10-08 15:57:49.000000000 +0200
-+++ src/xine-engine/audio_out.c
-@@ -2103,7 +2103,9 @@ xine_audio_port_t *_x_ao_new_port (xine_
-     this->audio_loop_running = 1;  
-     
-     pthread_attr_init(&pth_attrs);
-+#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
-     pthread_attr_setscope(&pth_attrs, PTHREAD_SCOPE_SYSTEM);
-+#endif
- 
-     this->audio_thread_created = 1;
-     if ((err = pthread_create (&this->audio_thread,
diff --git a/multimedia/xine-lib/patches/patch-aj b/multimedia/xine-lib/patches/patch-aj
deleted file mode 100644
index f6ad0411678..00000000000
--- a/multimedia/xine-lib/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.9 2005/11/01 06:15:33 reed Exp $
-
---- src/input/libdvdnav/bswap.h.orig	2005-10-31 21:49:47.000000000 -0800
-+++ src/input/libdvdnav/bswap.h	2005-10-31 21:53:43.000000000 -0800
-@@ -53,7 +53,7 @@
- #define B2N_32(x) x = swap32(x)
- #define B2N_64(x) x = swap64(x)
- 
--#elif defined(__FreeBSD__) && __FreeBSD_version >= 470000
-+#elif defined(__DragonFly__) || (defined(__FreeBSD__) && __FreeBSD_version >= 470000)
- #include <sys/endian.h>
- #define B2N_16(x) x = be16toh(x)
- #define B2N_32(x) x = be32toh(x)
diff --git a/multimedia/xine-lib/patches/patch-ak b/multimedia/xine-lib/patches/patch-ak
deleted file mode 100644
index 4054dd03f47..00000000000
--- a/multimedia/xine-lib/patches/patch-ak
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ak,v 1.7 2005/09/15 01:15:47 dmcmahill Exp $
-
---- src/video_out/video_out_opengl.c.orig	2005-07-17 17:50:07.000000000 -0400
-+++ src/video_out/video_out_opengl.c
-@@ -710,9 +710,11 @@ static void *getdladdr (const GLubyte *_
-   return res;
- 
- #elif defined (__sun) || defined (__sgi)
--   static void *handle = dlopen (NULL, RTLD_LAZY);
-+   {
-+   static void *handle;
-+   handle = dlopen (NULL, RTLD_LAZY);
-    return dlsym (handle, funcName);
--    
-+   } 
- #else /* all other Un*xes */
-   return dlsym (0, funcName);
- 
diff --git a/multimedia/xine-lib/patches/patch-al b/multimedia/xine-lib/patches/patch-al
deleted file mode 100644
index a2f36db5954..00000000000
--- a/multimedia/xine-lib/patches/patch-al
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-al,v 1.5 2005/09/20 12:10:53 dmcmahill Exp $
-
---- src/xine-utils/xineutils.h.orig	2004-12-12 08:51:30.000000000 -0500
-+++ src/xine-utils/xineutils.h
-@@ -666,7 +666,13 @@ void xine_strdupa(char *dest, char *src)
- 
- /* compatibility macros */
- #define xine_strpbrk(S, ACCEPT) strpbrk((S), (ACCEPT))
-+
-+#ifndef HAVE_STRSEP
-+#define strsep(STRINGP, DELIM) _xine_private_strsep((STRINGP), (DELIM))
-+char *_xine_private_strsep(char **stringp, const char *delim);
-+#endif
- #define xine_strsep(STRINGP, DELIM) strsep((STRINGP), (DELIM))
-+
- #define xine_setenv(NAME, VAL, XX) setenv((NAME), (VAL), (XX))
- 
- /*
diff --git a/multimedia/xine-lib/patches/patch-am b/multimedia/xine-lib/patches/patch-am
deleted file mode 100644
index c87336b0ba2..00000000000
--- a/multimedia/xine-lib/patches/patch-am
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-am,v 1.3 2004/06/21 15:55:55 drochner Exp $
-
---- src/libw32dll/wine/ldt_keeper.c.orig	2004-06-13 01:19:56.000000000 +0200
-+++ src/libw32dll/wine/ldt_keeper.c
-@@ -155,18 +155,9 @@ void Setup_FS_Segment(void)
- 
- void Check_FS_Segment(void)
- {
--    int fs;
--     __asm__ __volatile__(
--	"movw %%fs,%%ax; mov %%eax,%0" : "=r" (fs) :: "%eax"
-+    __asm__ __volatile__(
-+	"movl %0,%%eax; movw %%ax, %%fs" : : "r" (teb_sel) : "%eax"
-     );
--    fs = fs & 0xffff;
--    
--    if( fs != teb_sel ) {
--      printf("ldt_keeper: FS segment is not set or has being lost!\n");
--      printf("            Please report this error to xine-devel@lists.sourceforge.net\n");
--      printf("            Aborting....\n");
--      abort();
--    }
- }
- 
- #if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
diff --git a/multimedia/xine-lib/patches/patch-ao b/multimedia/xine-lib/patches/patch-ao
deleted file mode 100644
index 49e4524ee15..00000000000
--- a/multimedia/xine-lib/patches/patch-ao
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ao,v 1.9 2005/10/13 10:48:01 jmmv Exp $
-
---- src/libw32dll/wine/Makefile.in.orig	2005-10-09 13:28:12.000000000 +0200
-+++ src/libw32dll/wine/Makefile.in
-@@ -238,6 +238,7 @@ VORBIS_LIBS = @VORBIS_LIBS@
- W32DLL_DEP = @W32DLL_DEP@
- W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
- WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
-+WINE_LIBS = @WINE_LIBS@
- XINE_ACFLAGS = @XINE_ACFLAGS@
- XINE_BIN_AGE = @XINE_BIN_AGE@
- XINE_BUILD_CC = @XINE_BUILD_CC@
-@@ -355,7 +356,7 @@ CONFIG_CLEAN_FILES =
- LTLIBRARIES = $(noinst_LTLIBRARIES)
- 
- libwine_la_LDFLAGS =
--libwine_la_LIBADD =
-+libwine_la_LIBADD = ${WINE_LIBS}
- am_libwine_la_OBJECTS = afl.lo driver.lo elfdll.lo ext.lo ldt_keeper.lo \
- 	module.lo pe_image.lo pe_resource.lo resource.lo registry.lo \
- 	vfl.lo win32.lo stubs.lo wrapper.lo
diff --git a/multimedia/xine-lib/patches/patch-ap b/multimedia/xine-lib/patches/patch-ap
deleted file mode 100644
index fb47a5fd0ab..00000000000
--- a/multimedia/xine-lib/patches/patch-ap
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ap,v 1.2 2004/03/11 17:26:02 jmmv Exp $
-
---- src/dxr3/Makefile.am.orig	2003-09-13 16:21:09.000000000 +0200
-+++ src/dxr3/Makefile.am
-@@ -18,6 +18,9 @@ endif
- if HAVE_LIBRTE
- link_rte = -lrte
- endif
-+if HAVE_XINERAMA
-+link_xinerama = -lXinerama
-+endif
- 
- lib_LTLIBRARIES = $(dxr3_modules) 
- 
-@@ -43,7 +46,7 @@ xineplug_vo_out_dxr3_la_SOURCES = \
- 	dxr3_scr.c \
- 	video_out_dxr3.c 
- 
--xineplug_vo_out_dxr3_la_LIBADD = $(link_fame) $(link_rte) $(link_x_libs) $(XINE_LIB)
-+xineplug_vo_out_dxr3_la_LIBADD = $(link_fame) $(link_rte) $(link_xinerama) $(link_x_libs) $(XINE_LIB)
- xineplug_vo_out_dxr3_la_LDFLAGS = -avoid-version -module
- 
- noinst_HEADERS = \
diff --git a/multimedia/xine-lib/patches/patch-ar b/multimedia/xine-lib/patches/patch-ar
deleted file mode 100644
index 2a06db104e9..00000000000
--- a/multimedia/xine-lib/patches/patch-ar
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ar,v 1.2 2004/03/11 17:26:02 jmmv Exp $
-
---- src/video_out/video_out_aa.c.orig	2003-12-14 23:13:25.000000000 +0100
-+++ src/video_out/video_out_aa.c
-@@ -113,6 +113,8 @@ static vo_frame_t *aa_alloc_frame(vo_dri
-   if (!frame)
-     return NULL;
- 
-+  pthread_mutex_init (&frame->vo_frame.mutex, NULL);
-+
-   frame->vo_frame.proc_slice = NULL;
-   frame->vo_frame.proc_frame = NULL;
-   frame->vo_frame.field = aa_frame_field;
diff --git a/multimedia/xine-lib/patches/patch-as b/multimedia/xine-lib/patches/patch-as
deleted file mode 100644
index 034689a6808..00000000000
--- a/multimedia/xine-lib/patches/patch-as
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-as,v 1.2 2004/03/11 17:26:02 jmmv Exp $
-
---- src/video_out/video_out_none.c.orig	2003-12-14 23:13:25.000000000 +0100
-+++ src/video_out/video_out_none.c
-@@ -65,6 +65,8 @@ typedef struct {
- 
- 
- static void free_framedata(none_frame_t* frame) {
-+  pthread_mutex_init (&frame->vo_frame.mutex, NULL);
-+
-   if(frame->vo_frame.base[0]) {
-     free(frame->vo_frame.base[0]);
-     frame->vo_frame.base[0] = NULL;
diff --git a/multimedia/xine-lib/patches/patch-av b/multimedia/xine-lib/patches/patch-av
deleted file mode 100644
index 74a9b4bf4a5..00000000000
--- a/multimedia/xine-lib/patches/patch-av
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-av,v 1.1 2004/03/28 20:14:22 mycroft Exp $
-
---- src/libreal/xine_decoder.c.orig	2004-03-16 20:21:33.000000000 +0000
-+++ src/libreal/xine_decoder.c	2004-03-28 05:20:49.000000000 +0000
-@@ -99,6 +99,15 @@
- } rv_init_t;
- 
- 
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+void *__ctype_b=NULL;
-+void ___brk_addr(void) {exit(0);}
-+char **__environ={NULL};
-+#undef stderr
-+FILE *stderr=NULL;
-+#endif
-+
-+
- void *__builtin_vec_new(uint32_t size);
- void __builtin_vec_delete(void *mem);
- void __pure_virtual(void);
-@@ -574,8 +583,7 @@
-  * exported plugin catalog entry
-  */
- 
--static uint32_t supported_types[] = { BUF_VIDEO_RV20,
--                                      BUF_VIDEO_RV30,
-+static uint32_t supported_types[] = { BUF_VIDEO_RV30,
-                                       BUF_VIDEO_RV40,
-                                       0 };
- 
diff --git a/multimedia/xine-lib/patches/patch-ba b/multimedia/xine-lib/patches/patch-ba
deleted file mode 100644
index 22c8777247e..00000000000
--- a/multimedia/xine-lib/patches/patch-ba
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ba,v 1.3 2005/07/29 16:09:11 drochner Exp $
-
---- src/input/vcd/xineplug_inp_vcd.c.orig	2005-07-17 23:50:00.000000000 +0200
-+++ src/input/vcd/xineplug_inp_vcd.c
-@@ -999,7 +999,7 @@ vcd_class_get_description (input_class_t
- static const char *
- vcd_class_get_identifier (input_class_t *this_gen) {
-   dbg_print((INPUT_DBG_CALL|INPUT_DBG_EXT), "called\n");
--  return SHORT_PLUGIN_NAME;
-+  return strdup(SHORT_PLUGIN_NAME);
- }
- 
- /* HACK until we put modify and put in vcdplayer. */
diff --git a/multimedia/xine-lib/patches/patch-bb b/multimedia/xine-lib/patches/patch-bb
deleted file mode 100644
index 99cd7de99c1..00000000000
--- a/multimedia/xine-lib/patches/patch-bb
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-bb,v 1.2 2004/12/21 18:56:44 drochner Exp $
-
---- m4/ffmpeg.m4.orig	2004-12-16 00:57:33.000000000 +0100
-+++ m4/ffmpeg.m4
-@@ -50,14 +50,6 @@ if test x"$external_ffmpeg" != "xno"; th
-         CPPFLAGS="${FFMPEG_CPPFLAGS} ${ac_save_CPPFLAGS}"
-         LDFLAGS="${FFMPEG_LIBS} ${ac_save_LDFLAGS}"
-   
--        dnl drop the cache
--        for i in "ac_cv_header_avcodec_h" "ac_cv_header_postprocess_h" \
--                 "ac_cv_lib_avcodec_pp_get_context" \
--                 "ac_cv_lib_postproc_pp_get_context" \
--                 "ac_cv_lib_avcodec_register_avcodec"; do
--          $as_unset $i || test "${$i+set}" != set || { $i=; export $i; }
--        done
--
-         dnl look for headers
-         AC_CHECK_HEADER(avcodec.h, , continue)
-         AC_CHECK_HEADER(postprocess.h, , continue)
diff --git a/multimedia/xine-lib/patches/patch-bd b/multimedia/xine-lib/patches/patch-bd
deleted file mode 100644
index 84fbbe5a3f1..00000000000
--- a/multimedia/xine-lib/patches/patch-bd
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-bd,v 1.1 2004/12/23 03:05:53 xtraeme Exp $
-
---- src/audio_out/audio_oss_out.c.orig	2004-12-23 01:13:26.000000000 +0100
-+++ src/audio_out/audio_oss_out.c	2004-12-23 01:15:23.000000000 +0100
-@@ -419,6 +419,7 @@
-     }
-     this->last_getoptr = info.bytes;
-     break;
-+#ifndef __NetBSD__
-   case OSS_SYNC_GETODELAY:
-     if (ioctl (this->audio_fd, SNDCTL_DSP_GETODELAY, &bytes_left)) {
-       perror ("audio_oss_out: DSP_GETODELAY ioctl():");
-@@ -429,6 +430,7 @@
-     lprintf ("%d bytes left\n", bytes_left);
- 
-     break;
-+#endif
-   }
- 
-   return bytes_left / this->bytes_per_frame;
-@@ -833,10 +835,13 @@
-      * check if SNDCTL_DSP_GETODELAY works. if so, using it is preferred.
-      */
- 
-+#ifndef __NetBSD__
-     if (ioctl(audio_fd, SNDCTL_DSP_GETODELAY, &info) != -1) {
-       xprintf(class->xine, XINE_VERBOSITY_DEBUG, "audio_oss_out: using SNDCTL_DSP_GETODELAY\n");
-       this->sync_method = OSS_SYNC_GETODELAY;
--    } else if (ioctl(audio_fd, SNDCTL_DSP_GETOPTR, &info) != -1) {
-+    }
-+#endif
-+    if (ioctl(audio_fd, SNDCTL_DSP_GETOPTR, &info) != -1) {
-       xprintf(class->xine, XINE_VERBOSITY_DEBUG, "audio_oss_out: using SNDCTL_DSP_GETOPTR\n");
-       this->sync_method = OSS_SYNC_GETOPTR;
-     } else {
diff --git a/multimedia/xine-lib/patches/patch-be b/multimedia/xine-lib/patches/patch-be
deleted file mode 100644
index 1f1409861b8..00000000000
--- a/multimedia/xine-lib/patches/patch-be
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-be,v 1.5 2005/10/13 10:48:01 jmmv Exp $
-
---- src/audio_out/Makefile.in.orig	2005-10-09 13:28:00.000000000 +0200
-+++ src/audio_out/Makefile.in
-@@ -197,6 +197,7 @@ OGG_CFLAGS = @OGG_CFLAGS@
- OGG_LIBS = @OGG_LIBS@
- OPENGL_CFLAGS = @OPENGL_CFLAGS@
- OPENGL_LIBS = @OPENGL_LIBS@
-+OSS_LIBS = @OSS_LIBS@
- PACKAGE = @PACKAGE@
- PASS1_CFLAGS = @PASS1_CFLAGS@
- PASS2_CFLAGS = @PASS2_CFLAGS@
-@@ -337,7 +338,7 @@ xineplug_ao_out_file_la_LIBADD = $(XINE_
- xineplug_ao_out_file_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
- 
- xineplug_ao_out_oss_la_SOURCES = audio_oss_out.c
--xineplug_ao_out_oss_la_LIBADD = $(XINE_LIB)
-+xineplug_ao_out_oss_la_LIBADD = $(XINE_LIB) $(OSS_LIBS)
- xineplug_ao_out_oss_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
- 
- xineplug_ao_out_alsa_la_SOURCES = audio_alsa_out.c
diff --git a/multimedia/xine-lib/patches/patch-bg b/multimedia/xine-lib/patches/patch-bg
deleted file mode 100644
index f780fd10faa..00000000000
--- a/multimedia/xine-lib/patches/patch-bg
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-bg,v 1.1 2005/04/13 16:54:03 rillig Exp $
-
-All files in $(DESTDIR) may be marked read-only, so better use the
-INSTALL_HEADER tools to overwrite them correctly.
-
---- include/Makefile.in.orig	Sat Dec 25 23:34:48 2004
-+++ include/Makefile.in	Tue Apr 12 11:04:43 2005
-@@ -727,7 +727,8 @@ maintainer-clean-generic:
- 	-rm -f Makefile.in
- 
- install-data-local: install-includeHEADERS
--	sed -e '/^\/\*_x_/d' xine.h > $(DESTDIR)$(includedir)/xine.h
-+	sed -e '/^\/\*_x_/d' xine.h > installed-xine.h
-+	$(INSTALL_HEADER) installed-xine.h $(DESTDIR)$(includedir)/xine.h
- # 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.
- .NOEXPORT:
diff --git a/multimedia/xine-lib/patches/patch-bh b/multimedia/xine-lib/patches/patch-bh
deleted file mode 100644
index ed658f22dc6..00000000000
--- a/multimedia/xine-lib/patches/patch-bh
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bh,v 1.1 2005/09/20 12:11:37 dmcmahill Exp $
-
---- src/video_out/Makefile.am.orig	2005-04-25 10:43:15.000000000 -0400
-+++ src/video_out/Makefile.am
-@@ -124,7 +124,7 @@ xineplug_vo_out_pgx64_la_SOURCES = alpha
- xineplug_vo_out_pgx64_la_LIBADD = $(X_LIBS) $(SUNDGA_LIBS)
- xineplug_vo_out_pgx64_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
- 
--xineplug_vo_out_pgx32_la_SOURCES = video_out_pgx32.c
-+xineplug_vo_out_pgx32_la_SOURCES = alphablend.c video_out_pgx32.c
- xineplug_vo_out_pgx32_la_LIBADD = $(X_LIBS) $(SUNDGA_LIBS)
- xineplug_vo_out_pgx32_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
- 
diff --git a/multimedia/xine-lib/patches/patch-bi b/multimedia/xine-lib/patches/patch-bi
deleted file mode 100644
index 6a2323d9040..00000000000
--- a/multimedia/xine-lib/patches/patch-bi
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-bi,v 1.2 2005/10/13 10:48:01 jmmv Exp $
-
---- src/video_out/Makefile.in.orig	2005-10-09 13:28:16.000000000 +0200
-+++ src/video_out/Makefile.in
-@@ -370,7 +370,7 @@ xineplug_vo_out_pgx64_la_SOURCES = alpha
- xineplug_vo_out_pgx64_la_LIBADD = $(X_LIBS) $(SUNDGA_LIBS)
- xineplug_vo_out_pgx64_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
- 
--xineplug_vo_out_pgx32_la_SOURCES = video_out_pgx32.c
-+xineplug_vo_out_pgx32_la_SOURCES = alphablend.c video_out_pgx32.c
- xineplug_vo_out_pgx32_la_LIBADD = $(X_LIBS) $(SUNDGA_LIBS)
- xineplug_vo_out_pgx32_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
- 
-@@ -479,7 +479,7 @@ am_xineplug_vo_out_opengl_la_OBJECTS = y
- xineplug_vo_out_opengl_la_OBJECTS = \
- 	$(am_xineplug_vo_out_opengl_la_OBJECTS)
- xineplug_vo_out_pgx32_la_DEPENDENCIES =
--am_xineplug_vo_out_pgx32_la_OBJECTS = video_out_pgx32.lo
-+am_xineplug_vo_out_pgx32_la_OBJECTS = alphablend.lo video_out_pgx32.lo
- xineplug_vo_out_pgx32_la_OBJECTS = \
- 	$(am_xineplug_vo_out_pgx32_la_OBJECTS)
- xineplug_vo_out_pgx64_la_DEPENDENCIES =
diff --git a/multimedia/xine-lib/patches/patch-cb b/multimedia/xine-lib/patches/patch-cb
deleted file mode 100644
index b5ef2e1f58b..00000000000
--- a/multimedia/xine-lib/patches/patch-cb
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-cb,v 1.1 2005/05/02 11:29:35 drochner Exp $
-
---- src/libw32dll/wine/module.c.orig	2005-04-30 23:33:18.000000000 +0200
-+++ src/libw32dll/wine/module.c
-@@ -362,7 +362,7 @@ static WIN_BOOL MODULE_FreeLibrary( WINE
- HMODULE WINAPI LoadLibraryExA(LPCSTR libname, HANDLE hfile, DWORD flags)
- {
- 	WINE_MODREF *wm = 0;
--	char* listpath[] = { "", "", "/usr/lib/win32", "/usr/local/lib/win32", 0 };
-+	char* listpath[] = { "", "", "@W32PATH@", 0 };
- 	char path[512];
- 	char checked[2000];
-         int i = -1;
diff --git a/multimedia/xine-lib/patches/patch-cd b/multimedia/xine-lib/patches/patch-cd
deleted file mode 100644
index 574c1b183fe..00000000000
--- a/multimedia/xine-lib/patches/patch-cd
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-cd,v 1.1 2005/10/10 22:51:04 joerg Exp $
-
---- src/video_out/libdha/sysdep/pci_freebsd.c.orig	2005-07-10 21:02:09.000000000 +0000
-+++ src/video_out/libdha/sysdep/pci_freebsd.c
-@@ -8,7 +8,7 @@
- /* machine/console.h seems to be outdated by recent FreeBSD *
-  * however pcvt_ioctl.h seems to exist for very long time   */
- /* #include <machine/console.h>*/
--#include <machine/pcvt_ioctl.h>
-+#include <sys/kbio.h>
- #ifndef GCCUSESGAS
- #define GCCUSESGAS
- #endif
diff --git a/multimedia/xine-lib/patches/patch-ce b/multimedia/xine-lib/patches/patch-ce
deleted file mode 100644
index 90526b57127..00000000000
--- a/multimedia/xine-lib/patches/patch-ce
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ce,v 1.1 2005/10/13 10:48:01 jmmv Exp $
-
---- aclocal.m4.orig	2005-10-09 13:27:36.000000000 +0200
-+++ aclocal.m4
-@@ -7841,7 +7841,7 @@ if test x"$external_ffmpeg" != "xno"; th
-                  "ac_cv_lib_avcodec_pp_get_context" \
-                  "ac_cv_lib_postproc_pp_get_context" \
-                  "ac_cv_lib_avcodec_register_avcodec"; do
--          $as_unset $i || test "${$i+set}" != set || { $i=; export $i; }
-+          $as_unset $i || test \"\${$i+set}\" != set || { eval $i=; export $i; }
-         done
- 
-         dnl look for headers
-@@ -7889,7 +7889,7 @@ configure option --with-external-ffmpeg.
-     else
-       dnl check specified flags
-       CPPFLAGS="${FFMPEG_CPPFLAGS} ${ac_save_CPPFLAGS}"
--      LDFLAGS="${FFMPEG_LIBS} ${FFMPEG_POSTPROC_LIBS } ${ac_save_LDFLAGS}"
-+      LDFLAGS="${FFMPEG_LIBS} ${FFMPEG_POSTPROC_LIBS} ${ac_save_LDFLAGS}"
-       AC_LINK_IFELSE([#include <avcodec.h>
- #include <postprocess.h>
-  
diff --git a/multimedia/xine-ui/DESCR b/multimedia/xine-ui/DESCR
deleted file mode 100644
index 0fa85875191..00000000000
--- a/multimedia/xine-ui/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-  This is the official, xlib-based xine frontend.  Xine is a free
-multimedia player.  It plays back CDs, DVDs, and VCDs.  It also decodes
-multimedia files like AVI, MOV, WMV, and MP3 from local disk drives, and
-displays multimedia streamed over the Internet.  It interprets many of the
-most common multimedia formats available -- and some of the most uncommon
-formats, too.
diff --git a/multimedia/xine-ui/MESSAGE.NetBSD b/multimedia/xine-ui/MESSAGE.NetBSD
deleted file mode 100644
index 75b4276eb61..00000000000
--- a/multimedia/xine-ui/MESSAGE.NetBSD
+++ /dev/null
@@ -1,9 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.NetBSD,v 1.1 2005/03/15 15:46:40 wiz Exp $
-
-You may need to increase the value of SHMMAXPGS in your kernel
-configuration to use ${PKGBASE}, e.g.
-
-	options SHMMAXPGS=32768
-
-===========================================================================
diff --git a/multimedia/xine-ui/Makefile b/multimedia/xine-ui/Makefile
deleted file mode 100644
index 900579071b5..00000000000
--- a/multimedia/xine-ui/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2005/06/01 18:03:07 jlam Exp $
-#
-
-DISTNAME=		xine-ui-0.99.2
-PKGREVISION=		2
-CATEGORIES=		multimedia
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xine/}
-
-MAINTAINER=		tech-pkg@NetBSD.org
-HOMEPAGE=		http://xinehq.de/
-COMMENT=		Skinned xlib-based xine GUI
-
-BUILD_USES_MSGFMT=	YES
-
-BUILDLINK_DEPENDS.curl=	curl>7.10.2
-
-USE_PKGLOCALEDIR=	YES
-USE_DIRS+=		xdg-1.1
-USE_LIBTOOL=		YES
-GNU_CONFIGURE=		YES
-USE_GNU_READLINE=	yes
-
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../multimedia/xine-lib/buildlink3.mk"
-.include "../../www/curl/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../devel/ncurses/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/xine-ui/PLIST b/multimedia/xine-ui/PLIST
deleted file mode 100644
index 7f4b914c0dc..00000000000
--- a/multimedia/xine-ui/PLIST
+++ /dev/null
@@ -1,131 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2004/05/12 16:42:49 drochner Exp $
-bin/aaxine
-bin/fbxine
-bin/xine
-bin/xine-bugreport
-bin/xine-check
-bin/xine-remote
-man/man1/aaxine.1
-man/man1/xine-bugreport.1
-man/man1/xine-check.1
-man/man1/xine-remote.1
-man/man1/xine.1
-share/doc/xine-ui/README.config_en
-share/doc/xine-ui/README.cs.0.Introduction
-share/doc/xine-ui/README.cs.10.Remote_control
-share/doc/xine-ui/README.cs.15.MRLs
-share/doc/xine-ui/README.cs.5.xine-ui
-share/doc/xine-ui/README.en.0.Introduction
-share/doc/xine-ui/README.en.10.Remote_control
-share/doc/xine-ui/README.en.15.MRLs
-share/doc/xine-ui/README.en.20.DVD
-share/doc/xine-ui/README.en.25.VideoCD
-share/doc/xine-ui/README.en.30.Advanced
-share/doc/xine-ui/README.en.35.Legal_issues
-share/doc/xine-ui/README.en.5.xine-ui
-share/doc/xine-ui/README_cs
-share/doc/xine-ui/README_de
-share/doc/xine-ui/README_en
-share/doc/xine-ui/README_es
-share/doc/xine-ui/README_fi
-share/doc/xine-ui/README_fr
-share/doc/xine-ui/README_it
-share/doc/xine-ui/README_pl
-share/doc/xine-ui/README_uk
-share/doc/xitk/README
-${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/xine-ui.mo
-${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/xitk.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/xine-ui.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/xitk.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/xine-ui.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/xitk.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/xine-ui.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/xitk.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/xine-ui.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/xitk.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/xine-ui.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/xitk.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/xine-ui.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/xitk.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/xine-ui.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/xitk.mo
-${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/xine-ui.mo
-${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/xitk.mo
-share/pixmaps/xine.xpm
-share/pixmaps/xine_16x16.png
-share/pixmaps/xine_22x22.png
-share/pixmaps/xine_32x32.png
-share/pixmaps/xine_48x48.png
-share/xine/desktop/xine.desktop
-share/xine/skins/black.mpv
-share/xine/skins/xine-ui_logo.mpv
-share/xine/skins/xine_splash.png
-share/xine/skins/xinetic/BigArrowDown.png
-share/xine/skins/xinetic/BigArrowLeft.png
-share/xine/skins/xinetic/BigArrowRight.png
-share/xine/skins/xinetic/BigArrowUp.png
-share/xine/skins/xinetic/CtlBg.png
-share/xine/skins/xinetic/CtlBtn.png
-share/xine/skins/xinetic/CtlDismiss.png
-share/xine/skins/xinetic/CtlDummy.png
-share/xine/skins/xinetic/CtlReset.png
-share/xine/skins/xinetic/CtlSave.png
-share/xine/skins/xinetic/Letters.png
-share/xine/skins/xinetic/Letters2.png
-share/xine/skins/xinetic/MainAutoButton.png
-share/xine/skins/xinetic/MainBg.png
-share/xine/skins/xinetic/MainCam.png
-share/xine/skins/xinetic/MainClose.png
-share/xine/skins/xinetic/MainDown.png
-share/xine/skins/xinetic/MainEject.png
-share/xine/skins/xinetic/MainFastB.png
-share/xine/skins/xinetic/MainFastF.png
-share/xine/skins/xinetic/MainFullScreen.png
-share/xine/skins/xinetic/MainMute.png
-share/xine/skins/xinetic/MainNav.png
-share/xine/skins/xinetic/MainNext.png
-share/xine/skins/xinetic/MainPause.png
-share/xine/skins/xinetic/MainPlay.png
-share/xine/skins/xinetic/MainPower.png
-share/xine/skins/xinetic/MainPrev.png
-share/xine/skins/xinetic/MainSetup.png
-share/xine/skins/xinetic/MainStop.png
-share/xine/skins/xinetic/MainUp.png
-share/xine/skins/xinetic/MainVolumeBg.png
-share/xine/skins/xinetic/MainVolumePad.png
-share/xine/skins/xinetic/MrlBg.png
-share/xine/skins/xinetic/MrlBtn.png
-share/xine/skins/xinetic/MrlDismiss.png
-share/xine/skins/xinetic/MrlFlit.png
-share/xine/skins/xinetic/MrlSelect.png
-share/xine/skins/xinetic/Onglet.png
-share/xine/skins/xinetic/PlBg.png
-share/xine/skins/xinetic/PlBtn.png
-share/xine/skins/xinetic/PlDelete.png
-share/xine/skins/xinetic/PlDeleteAll.png
-share/xine/skins/xinetic/PlDismiss.png
-share/xine/skins/xinetic/PlInputTxt.png
-share/xine/skins/xinetic/PlItemBtn.png
-share/xine/skins/xinetic/PlMoveDn.png
-share/xine/skins/xinetic/PlMoveUp.png
-share/xine/skins/xinetic/PlPlay.png
-share/xine/skins/xinetic/PlSlidHBg.png
-share/xine/skins/xinetic/SkItemBtn.png
-share/xine/skins/xinetic/SkSlidBG.png
-share/xine/skins/xinetic/SkSlidHBg.png
-share/xine/skins/xinetic/SkSlidHPad.png
-share/xine/skins/xinetic/SlidHPad.png
-share/xine/skins/xinetic/SliderHBg.png
-share/xine/skins/xinetic/SliderHPad.png
-share/xine/skins/xinetic/SliderVBg.png
-share/xine/skins/xinetic/SliderVPad.png
-share/xine/skins/xinetic/SmallArrowDown.png
-share/xine/skins/xinetic/SmallArrowUp.png
-share/xine/skins/xinetic/skinconfig
-share/xine/visuals/default.avi
-@dirrm share/xine/visuals
-@dirrm share/xine/skins/xinetic
-@dirrm share/xine/skins
-@dirrm share/xine/desktop
-@dirrm share/doc/xitk
-@dirrm share/doc/xine-ui
diff --git a/multimedia/xine-ui/distinfo b/multimedia/xine-ui/distinfo
deleted file mode 100644
index c89dc57673b..00000000000
--- a/multimedia/xine-ui/distinfo
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: distinfo,v 1.8 2005/10/10 22:52:44 joerg Exp $
-
-SHA1 (xine-ui-0.99.2.tar.gz) = 0815f3b660e50a3a69bac1d54bdf8036e9ff57e2
-RMD160 (xine-ui-0.99.2.tar.gz) = ccfd667417a9aa51561a132ab86e3fb1d3349694
-Size (xine-ui-0.99.2.tar.gz) = 2374176 bytes
-SHA1 (patch-aa) = 2e32fd05f1c47fd5edd1be6997840cfc04e0b448
-SHA1 (patch-ab) = 7f3a44781d0a0418f277c082486e606058fa5357
-SHA1 (patch-ac) = 6b25785ab06d40d49acf0fd4c748e7b8e081c91f
-SHA1 (patch-ad) = d5bfdfe1714d1c00a15a5da6b6b392329a277c86
-SHA1 (patch-ae) = baf9bf2a9f2c375208fce090b9030e938b5ba428
-SHA1 (patch-ag) = dddbea5257a5b21e3a7ba21207661f4a47a9fa7e
-SHA1 (patch-ah) = 9d61282de803459e4b9c49814796dcc97658849d
-SHA1 (patch-ai) = 78228fa174cb0d455a9debec18125d9ee13d34dd
-SHA1 (patch-aj) = 48deb40db11492858245b8affca709f11a6c240f
-SHA1 (patch-ak) = 21d6d048502b71a703365e3fab136b096c4575d3
-SHA1 (patch-al) = d00f3ad348450e209d55ba69c1c053fce7d359b3
-SHA1 (patch-am) = 55f13b6288a2ef06ed3d82bec6e28be3d65620ee
-SHA1 (patch-ao) = 09e83615b88dffbdfeb0b0bad07dcdc60024ba67
diff --git a/multimedia/xine-ui/patches/patch-aa b/multimedia/xine-ui/patches/patch-aa
deleted file mode 100644
index 82d30900440..00000000000
--- a/multimedia/xine-ui/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2004/07/06 21:12:58 drochner Exp $
-
---- doc/man/Makefile.in.orig	2004-07-04 18:26:01.000000000 +0200
-+++ doc/man/Makefile.in
-@@ -251,7 +251,7 @@ target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--SUBDIRS = fr es en pl de
-+SUBDIRS = en
- subdir = doc/man
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/multimedia/xine-ui/patches/patch-ab b/multimedia/xine-ui/patches/patch-ab
deleted file mode 100644
index 4d49e899153..00000000000
--- a/multimedia/xine-ui/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/01/26 13:04:47 jmmv Exp $
-
---- src/xitk/xine-toolkit/label.c.orig	Tue Mar  4 00:43:46 2003
-+++ src/xitk/xine-toolkit/label.c
-@@ -294,7 +294,7 @@ static void label_setup_label(xitk_widge
-     
-     if(label_len > private_data->length) {
-       pthread_attr_t       pth_attrs;
--#if ! defined (__OpenBSD__)
-+#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
-       struct sched_param   pth_params;
- #endif
-       
-@@ -303,7 +303,7 @@ static void label_setup_label(xitk_widge
-       pthread_attr_init(&pth_attrs);
- 
-       /* this won't work on linux, freebsd 5.0 */
--#if ! defined (__OpenBSD__)
-+#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
-       pthread_attr_getschedparam(&pth_attrs, &pth_params);
-       pth_params.sched_priority = sched_get_priority_min(SCHED_OTHER);
-       pthread_attr_setschedparam(&pth_attrs, &pth_params);
diff --git a/multimedia/xine-ui/patches/patch-ac b/multimedia/xine-ui/patches/patch-ac
deleted file mode 100644
index 970d4444f97..00000000000
--- a/multimedia/xine-ui/patches/patch-ac
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2004/07/06 21:12:58 drochner Exp $
-
---- src/xitk/xine-toolkit/tips.c.orig	2004-07-02 15:23:31.000000000 +0200
-+++ src/xitk/xine-toolkit/tips.c
-@@ -87,6 +87,10 @@ static void *_tips_loop_thread(void *dat
-     gettimeofday(&tv, NULL);
-     ts.tv_sec  = tv.tv_sec;
-     ts.tv_nsec = (tv.tv_usec + 300000) * 1000;      
-+    while (ts.tv_nsec >= 1000000000) {
-+	    ts.tv_nsec -= 1000000000;
-+	    ts.tv_sec ++;
-+    }
-     
-     result = pthread_cond_timedwait(&tips.prewait_cond, &tips.prewait_mutex, &ts);
-     tips.prewait = 0;
-@@ -208,6 +212,10 @@ static void *_tips_loop_thread(void *dat
-       gettimeofday(&tv, NULL);
-       ts.tv_sec  = tv.tv_sec;
-       ts.tv_nsec = (tv.tv_usec + (tips.widget->tips_timeout * 10000)) * 1000;      
-+      while (ts.tv_nsec >= 1000000000) {
-+	      ts.tv_nsec -= 1000000000;
-+	      ts.tv_sec ++;
-+      }
- 
-       pthread_mutex_lock(&tips.timer_mutex);
-       pthread_cond_timedwait(&tips.timer_cond, &tips.timer_mutex, &ts);
-@@ -239,7 +247,7 @@ void xitk_tips_init(Display *disp) {
-   
-   if(!tips.running) {
-     pthread_attr_t       pth_attrs;
--#if ! defined (__OpenBSD__)
-+#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
-     struct sched_param   pth_params;
- #endif
- 
-@@ -258,7 +266,7 @@ void xitk_tips_init(Display *disp) {
-     pthread_cond_init(&tips.prewait_cond, NULL);
-     
-     pthread_attr_init(&pth_attrs);
--#if ! defined (__OpenBSD__)
-+#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
-     pthread_attr_getschedparam(&pth_attrs, &pth_params);
-     pth_params.sched_priority = sched_get_priority_min(SCHED_OTHER);
-     pthread_attr_setschedparam(&pth_attrs, &pth_params);
diff --git a/multimedia/xine-ui/patches/patch-ad b/multimedia/xine-ui/patches/patch-ad
deleted file mode 100644
index 191b6b0f502..00000000000
--- a/multimedia/xine-ui/patches/patch-ad
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2005/02/22 00:44:20 wiz Exp $
-
---- src/xitk/panel.c.orig	2004-07-04 18:25:14.000000000 +0200
-+++ src/xitk/panel.c
-@@ -1525,14 +1525,14 @@ void panel_init (void) {
-   
-   {
-     pthread_attr_t       pth_attrs;
--#if !defined (__OpenBSD__)
-+#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
-     struct sched_param   pth_params;
- #endif
-     
-     pthread_attr_init(&pth_attrs);
- 
-     /* this won't work on linux, freebsd 5.0 */
--#if !defined (__OpenBSD__)
-+#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
-     pthread_attr_getschedparam(&pth_attrs, &pth_params);
-     pth_params.sched_priority = sched_get_priority_min(SCHED_OTHER);
-     pthread_attr_setschedparam(&pth_attrs, &pth_params);
diff --git a/multimedia/xine-ui/patches/patch-ae b/multimedia/xine-ui/patches/patch-ae
deleted file mode 100644
index e84d85a9e69..00000000000
--- a/multimedia/xine-ui/patches/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2005/02/22 00:44:20 wiz Exp $
-
---- src/xitk/event.c.orig	2004-07-02 23:41:02.000000000 +0200
-+++ src/xitk/event.c
-@@ -1230,7 +1230,9 @@ void gui_init (int nfiles, char *filenam
-   if (!XInitThreads ()) {
-     printf (_("\nXInitThreads failed - looks like you don't have a "
- 	    "thread-safe xlib.\n"));
-+#ifndef _PTH_PTHREAD_H_
-     exit (1);
-+#endif
-   } 
-   
-   if((gGui->display = XOpenDisplay((getenv("DISPLAY")))) == NULL) {
diff --git a/multimedia/xine-ui/patches/patch-ag b/multimedia/xine-ui/patches/patch-ag
deleted file mode 100644
index 9e9d03fb4d0..00000000000
--- a/multimedia/xine-ui/patches/patch-ag
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2005/02/22 00:44:20 wiz Exp $
-
---- src/xitk/common.h.orig	2004-07-02 23:41:02.000000000 +0200
-+++ src/xitk/common.h
-@@ -80,6 +80,14 @@
- #include <lirc/lirc_client.h>
- #endif
- 
-+#if !defined(TRUE)
-+#define TRUE 1
-+#endif
-+
-+#if !defined(FALSE)
-+#define FALSE 0
-+#endif
-+
- /*
-  * config related constants
-  */
diff --git a/multimedia/xine-ui/patches/patch-ah b/multimedia/xine-ui/patches/patch-ah
deleted file mode 100644
index bec971a4e15..00000000000
--- a/multimedia/xine-ui/patches/patch-ah
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2004/03/28 21:11:35 mycroft Exp $
-
---- src/common/utils.c.orig	2003-12-18 00:30:11.000000000 +0000
-+++ src/common/utils.c	2004-03-28 20:55:10.000000000 +0000
-@@ -34,7 +34,6 @@
- #include <sys/stat.h>
- #include <sys/wait.h>
- #include <sys/utsname.h>
--#include <alloca.h>
- 
- #ifdef HAVE_X11
- #include <X11/Xlib.h>
-@@ -47,6 +46,10 @@
- #include <X11/Xutil.h>
- #endif /* !HAVE_X11 */
- 
-+#ifdef HAVE_ALLOCA_H
-+#include <alloca.h>
-+#endif
-+
- #include <xine/xineutils.h>
- 
- #include "utils.h"
diff --git a/multimedia/xine-ui/patches/patch-ai b/multimedia/xine-ui/patches/patch-ai
deleted file mode 100644
index dd7f4e1f024..00000000000
--- a/multimedia/xine-ui/patches/patch-ai
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2004/05/12 16:42:49 drochner Exp $
-
---- src/xitk/xine-remote.c.orig	2004-05-11 23:39:22.000000000 +0200
-+++ src/xitk/xine-remote.c	2004-05-11 23:45:24.000000000 +0200
-@@ -30,6 +30,7 @@
- #endif
- /* required for strncasecmp() */
- #define _BSD_SOURCE 1
-+#define _NETBSD_SOURCE
- /* required to enable POSIX variant of getpwuid_r on solaris */
- #define _POSIX_PTHREAD_SEMANTICS 1
- 
-@@ -58,7 +59,7 @@
- #include <sys/ioctl.h>
- #include <sys/types.h>
- #include <sys/stat.h>
--#include <sys/signal.h>
-+#include <signal.h>
- #include <sys/time.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
-@@ -66,8 +67,8 @@
- #include <netdb.h>
- #include <pthread.h>
- 
--#include <readline.h>
--#include <history.h>
-+#include <readline/readline.h>
-+#include <readline/history.h>
- 
- #include "common.h"
- 
diff --git a/multimedia/xine-ui/patches/patch-aj b/multimedia/xine-ui/patches/patch-aj
deleted file mode 100644
index cb9119e8cb5..00000000000
--- a/multimedia/xine-ui/patches/patch-aj
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-aj,v 1.2 2005/02/22 00:44:20 wiz Exp $
-
---- src/xitk/actions.c.orig	2004-07-02 23:40:53.000000000 +0200
-+++ src/xitk/actions.c
-@@ -1069,6 +1069,11 @@ static void *_gui_set_current_position(v
-   
-   pthread_detach(pthread_self());
- 
-+  if (pthread_mutex_trylock(&gGui->xe_mutex)) {
-+	pthread_exit(NULL);
-+	return NULL;
-+  }
-+
-   if(gGui->logo_mode && (mediamark_get_current_mrl())) {
-     if(!xine_open(gGui->stream, (mediamark_get_current_mrl()))) {
-       gui_handle_xine_error(gGui->stream, (char *)(mediamark_get_current_mrl()));
-@@ -1200,8 +1205,6 @@ void gui_set_current_position (int pos) 
- 
-   if(gGui->new_pos == -1) {
-     
--    pthread_mutex_lock(&gGui->xe_mutex);
--
-     pthread_mutex_lock(&new_pos_mutex);
-     gGui->new_pos = pos;
-     pthread_mutex_unlock(&new_pos_mutex);
diff --git a/multimedia/xine-ui/patches/patch-ak b/multimedia/xine-ui/patches/patch-ak
deleted file mode 100644
index 69255cb6504..00000000000
--- a/multimedia/xine-ui/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2004/07/06 21:12:58 drochner Exp $
-
---- src/xitk/xine-toolkit/label.c.orig	2004-07-06 21:28:32.000000000 +0200
-+++ src/xitk/xine-toolkit/label.c
-@@ -133,6 +133,8 @@ static void notify_destroy(xitk_widget_t
-     XITK_FREE(private_data->fontname);
-     XITK_FREE(private_data->skin_element_name);
- 
-+    pthread_mutex_unlock(&private_data->paint_mutex);
-+    pthread_mutex_unlock(&private_data->change_mutex);
-     pthread_mutex_destroy(&private_data->paint_mutex);
-     pthread_mutex_destroy(&private_data->change_mutex);
- 
diff --git a/multimedia/xine-ui/patches/patch-al b/multimedia/xine-ui/patches/patch-al
deleted file mode 100644
index d248854afd9..00000000000
--- a/multimedia/xine-ui/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.1 2005/09/20 12:15:34 dmcmahill Exp $
-
---- src/xitk/Makefile.am.orig	2004-04-21 18:35:05.000000000 -0400
-+++ src/xitk/Makefile.am
-@@ -66,7 +66,7 @@ xine_LDADD = @XINE_LIBS@ $(top_builddir)
- xine_remote_SOURCES = xine-remote.c
- xine_remote_DEPENDENCIES = $(top_builddir)/src/common/libcommon.la \
- 			   xine-remote.c
--xine_remote_LDADD = $(INTLLIBS) $(NET_LIBS) $(THREAD_LIBS) $(READLINE_LIBS) $(NCURSES_LIB) \
-+xine_remote_LDADD = @XINE_LIBS@ $(INTLLIBS) $(NET_LIBS) $(THREAD_LIBS) $(READLINE_LIBS) $(NCURSES_LIB) \
- 	$(top_builddir)/src/common/libcommon.la $(DBG_LIBS)
- 
- session_ctrl_LDADD = @XINE_LIBS@ $(top_builddir)/src/common/libcommon.la $(DBG_LIBS)
diff --git a/multimedia/xine-ui/patches/patch-am b/multimedia/xine-ui/patches/patch-am
deleted file mode 100644
index 842780b0010..00000000000
--- a/multimedia/xine-ui/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.1 2005/09/20 12:15:34 dmcmahill Exp $
-
---- src/xitk/Makefile.in.orig	2004-07-04 12:26:05.000000000 -0400
-+++ src/xitk/Makefile.in
-@@ -319,7 +319,7 @@ xine_remote_SOURCES = xine-remote.c
- xine_remote_DEPENDENCIES = $(top_builddir)/src/common/libcommon.la \
- 			   xine-remote.c
- 
--xine_remote_LDADD = $(INTLLIBS) $(NET_LIBS) $(THREAD_LIBS) $(READLINE_LIBS) $(NCURSES_LIB) \
-+xine_remote_LDADD = @XINE_LIBS@ $(INTLLIBS) $(NET_LIBS) $(THREAD_LIBS) $(READLINE_LIBS) $(NCURSES_LIB) \
- 	$(top_builddir)/src/common/libcommon.la $(DBG_LIBS)
- 
- 
diff --git a/multimedia/xine-ui/patches/patch-ao b/multimedia/xine-ui/patches/patch-ao
deleted file mode 100644
index 93ad9163680..00000000000
--- a/multimedia/xine-ui/patches/patch-ao
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2005/10/10 22:52:44 joerg Exp $
-
---- configure.orig	2005-07-10 21:44:30.000000000 +0000
-+++ configure
-@@ -22988,7 +22988,7 @@ CFLAGS="$SAVE_CFLAGS"
- 
- 
- case "$host" in
--  *-*-freebsd*|*-*-openbsd*)
-+  *-*-freebsd*|*-*-openbsd* | *-*-dragonfly*)
-     THREAD_LIBS="-L/usr/local/lib -pthread"
-     THREAD_CFLAGS="-I/usr/local/include -D_THREAD_SAFE"
-     CFLAGS="-L/usr/local/lib $THREAD_CFLAGS $CFLAGS"
-@@ -28623,7 +28623,7 @@ if test "$host_or_hostalias" = ""; then
- fi
- 
- case "$host_or_hostalias" in
--  i386-*-freebsd*)
-+  i386-*-freebsd* | i386-*-dragonfly*)
-     CFLAGS="-pipe -fomit-frame-pointer $f_af $f_al $f_aj $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -finline-functions -D_REENTRANT $CFLAGS"
-     DEBUG_CFLAGS="$X_CFLAGS -D_REENTRANT -DDEBUG $DEBUG_CFLAGS"
- 
diff --git a/multimedia/xvid4conf/DESCR b/multimedia/xvid4conf/DESCR
deleted file mode 100644
index e6c1287bb84..00000000000
--- a/multimedia/xvid4conf/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-This tool creates XviD configuration files. The generated configuration
-file is meant to be read by transcode's xvid4 export module. This module
-(and the configuration file) is intended to be used with XviD 1.0
-(dev-api-4).
diff --git a/multimedia/xvid4conf/Makefile b/multimedia/xvid4conf/Makefile
deleted file mode 100644
index 67626a249c7..00000000000
--- a/multimedia/xvid4conf/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2005/08/10 20:56:21 jlam Exp $
-
-DISTNAME=	xvid4conf-1.12
-PKGREVISION=	1
-CATEGORIES=	multimedia
-MASTER_SITES=	http://zebra.fh-weingarten.de/~transcode/xvid4conf/
-
-MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://zebra.fh-weingarten.de/~transcode/
-COMMENT=	XviD Configuration Panel
-
-USE_TOOLS+=	pkg-config
-GNU_CONFIGURE=	YES
-
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/xvid4conf/PLIST b/multimedia/xvid4conf/PLIST
deleted file mode 100644
index ea1f4890925..00000000000
--- a/multimedia/xvid4conf/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/05/09 13:53:38 grant Exp $
-bin/xvid4conf
diff --git a/multimedia/xvid4conf/distinfo b/multimedia/xvid4conf/distinfo
deleted file mode 100644
index 69ee6166b1a..00000000000
--- a/multimedia/xvid4conf/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 11:24:05 agc Exp $
-
-SHA1 (xvid4conf-1.12.tar.gz) = b44e9b19bc4190c26992bc7c6a89a0a7960b3bd1
-RMD160 (xvid4conf-1.12.tar.gz) = 76be4da25e92c022834edd4d0a905bf2b811a396
-Size (xvid4conf-1.12.tar.gz) = 133494 bytes
diff --git a/multimedia/xvidcore/DESCR b/multimedia/xvidcore/DESCR
deleted file mode 100644
index c33d0f4d096..00000000000
--- a/multimedia/xvidcore/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-  XviD is an ISO MPEG-4 compliant video codec library.  It's no product,
-it's an open source project which is developed and maintained by lots of
-people from all over the world.
diff --git a/multimedia/xvidcore/Makefile b/multimedia/xvidcore/Makefile
deleted file mode 100644
index f369e7a3c0e..00000000000
--- a/multimedia/xvidcore/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.13 2005/10/21 07:41:53 xtraeme Exp $
-#
-
-DISTNAME=	xvidcore-1.0.3
-PKGREVISION=	1
-CATEGORIES=	multimedia
-MASTER_SITES=	http://downloads.xvid.org/downloads/
-EXTRACT_SUFX=	.tar.bz2
-
-MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://www.xvid.org/
-COMMENT=	ISO MPEG-4 compliant video codec
-
-ONLY_FOR_PLATFORM+=	*-*-i386
-
-BUILD_DEPENDS+=	nasm>=0.98.34:../../devel/nasm
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
-WRKSRC=		${WRKDIR}/${DISTNAME}/build/generic
-GNU_CONFIGURE=	YES
-
-MAKE_ENV+=	MKDIR="${MKDIR}"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/xvidcore/PLIST b/multimedia/xvidcore/PLIST
deleted file mode 100644
index 2acb3c02e48..00000000000
--- a/multimedia/xvidcore/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2005/10/21 07:41:53 xtraeme Exp $
-include/xvid.h
-lib/libxvidcore.a
-lib/libxvidcore.so
-lib/libxvidcore.so.4
-lib/libxvidcore.so.4.0
diff --git a/multimedia/xvidcore/buildlink3.mk b/multimedia/xvidcore/buildlink3.mk
deleted file mode 100644
index 00a96bc4436..00000000000
--- a/multimedia/xvidcore/buildlink3.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/10/19 10:36:54 grant Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-XVIDCORE_BUILDLINK3_MK:=	${XVIDCORE_BUILDLINK3_MK}+
-
-.include "../../mk/bsd.prefs.mk"
-
-# xvidcore is ONLY_FOR_PLATFORM -*-*-i386
-.if ${MACHINE_ARCH} == "i386"
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	xvidcore
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxvidcore}
-BUILDLINK_PACKAGES+=	xvidcore
-
-.if !empty(XVIDCORE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xvidcore+=	xvidcore>=1.0.0
-BUILDLINK_PKGSRCDIR.xvidcore?=	../../multimedia/xvidcore
-.endif	# XVIDCORE_BUILDLINK3_MK
-
-.endif	# MACHINE_ARCH == i386
-
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/xvidcore/distinfo b/multimedia/xvidcore/distinfo
deleted file mode 100644
index a3731d4f02c..00000000000
--- a/multimedia/xvidcore/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.10 2005/10/21 07:41:53 xtraeme Exp $
-
-SHA1 (xvidcore-1.0.3.tar.bz2) = 4b7de410e55c318cb68a829bb7e3619cbf40a1cf
-RMD160 (xvidcore-1.0.3.tar.bz2) = 96e4d46f617ebb802c2a6cacbf64502356a70741
-Size (xvidcore-1.0.3.tar.bz2) = 541841 bytes
-SHA1 (patch-aa) = b43b94cad51f3121ccb7d0a4ece497ad29393ad2
-SHA1 (patch-ab) = d0b79c482883191f99dfc4d870a90f52776366c9
diff --git a/multimedia/xvidcore/patches/patch-aa b/multimedia/xvidcore/patches/patch-aa
deleted file mode 100644
index cba5f25e116..00000000000
--- a/multimedia/xvidcore/patches/patch-aa
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2005/10/21 07:41:53 xtraeme Exp $
-
---- Makefile.orig	2004-12-19 12:38:46.000000000 +0100
-+++ Makefile	2005-10-21 08:26:37.000000000 +0200
-@@ -82,7 +82,7 @@
- 
- $(BUILD_DIR):
- 	@echo "  D: $(BUILD_DIR)"
--	@$(INSTALL) -d $(BUILD_DIR)
-+	@$(MKDIR) $(BUILD_DIR)
- 
- #-----------------------------------------------------------------------------
- # Generic assembly rule
-@@ -90,7 +90,7 @@
- 
- .$(ASSEMBLY_EXTENSION).$(OBJECT_EXTENSION):
- 	@echo "  A: $(@D)/$(<F)"
--	@$(INSTALL) -d $(BUILD_DIR)/$(@D)
-+	@$(MKDIR) $(BUILD_DIR)/$(@D)
- 	@$(AS) $(AFLAGS) $< -o $(BUILD_DIR)/$@
- 
- #-----------------------------------------------------------------------------
-@@ -99,7 +99,7 @@
- 
- .c.$(OBJECT_EXTENSION):
- 	@echo "  C: $(@D)/$(<F)"
--	@$(INSTALL) -d $(BUILD_DIR)/$(@D)
-+	@$(MKDIR) $(BUILD_DIR)/$(@D)
- 	@$(CC) -c $(ARCHITECTURE) $(BUS) $(ENDIANNESS) $(FEATURES) $(SPECIFIC_CFLAGS) $(CFLAGS) $< -o $(BUILD_DIR)/$@
- 
- #-----------------------------------------------------------------------------
-@@ -127,7 +127,7 @@
- 
- $(SHARED_LIB): $(BUILD_DIR) $(OBJECTS)
- 	@echo "  L: $(@F)"
--	@$(INSTALL) -m 644 libxvidcore.def $(BUILD_DIR)/libxvidcore.def
-+	@$(BSD_INSTALL) -m 644 libxvidcore.def $(BUILD_DIR)/libxvidcore.def
- 	@cd $(BUILD_DIR) && $(CC) $(LDFLAGS) $(OBJECTS) -o $(PRE_SHARED_LIB) $(SPECIFIC_LDFLAGS)
- 
- #-----------------------------------------------------------------------------
-@@ -139,6 +139,8 @@
- 	@$(INSTALL) -d $(libdir)
- 	@echo "  I: $(libdir)/$(SHARED_LIB)"
- 	@$(INSTALL) -m 755 $(BUILD_DIR)/$(SHARED_LIB) $(libdir)/$(SHARED_LIB)
-+	@ln -s $(libdir)/$(SHARED_LIB) $(libdir)/libxvidcore.so
-+	@ln -s $(libdir)/$(SHARED_LIB) $(libdir)/libxvidcore.so.$(API_MAJOR)
- 	@echo "  I: $(libdir)/$(STATIC_LIB)"
- 	@$(INSTALL) -m 755 $(BUILD_DIR)/$(STATIC_LIB) $(libdir)/$(STATIC_LIB)
- 	@echo "  D: $(includedir)"
diff --git a/multimedia/xvidcore/patches/patch-ab b/multimedia/xvidcore/patches/patch-ab
deleted file mode 100644
index 123ccf9e975..00000000000
--- a/multimedia/xvidcore/patches/patch-ab
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2005/05/20 12:54:54 drochner Exp $
-
---- configure.orig	2005-05-19 22:22:30.000000000 +0200
-+++ configure	2005-05-19 22:22:54.000000000 +0200
-@@ -3776,7 +3776,7 @@
- STATIC_EXTENSION=""
- OBJECT_EXTENSION=""
- case "$target_os" in
--     *bsd*|linux*|beos|irix*|solaris*)
-+     *bsd*|linux*|beos|irix*|solaris*|dragonfly*)
- 	echo "$as_me:$LINENO: result: .so .a .o" >&5
- echo "${ECHO_T}.so .a .o" >&6
- 	STATIC_EXTENSION="a"
-@@ -3819,7 +3819,7 @@
- SPECIFIC_CFLAGS=""
- PRE_SHARED_LIB=""
- case "$target_os" in
--     *bsd*|linux*|irix*|solaris*)
-+     *bsd*|linux*|irix*|solaris*|dragonfly*)
- 	echo "$as_me:$LINENO: result: ok" >&5
- echo "${ECHO_T}ok" >&6
- 	STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
-@@ -3957,7 +3957,7 @@
-                                     echo "$as_me:$LINENO: checking for nasm object format" >&5
- echo $ECHO_N "checking for nasm object format... $ECHO_C" >&6
-          case "$target_os" in
--              *bsd*|linux*|beos|irix*|solaris*)
-+              *bsd*|linux*|beos|irix*|solaris*|dragonfly*)
-                   echo "$as_me:$LINENO: result: elf" >&5
- echo "${ECHO_T}elf" >&6
-                   NASM_FORMAT="elf"
author	tv <tv>	2006-01-31 20:19:02 +0000
committer	tv <tv>	2006-01-31 20:19:02 +0000
commit	1bf85a33a7f0af352174332dac11865971217df5 (patch)
tree	ac38b597af8194f97ef08d4fd0ea67ec8fae54d6 /multimedia
parent	fb412398b2a8cd982d1920218452cdaea52847a6 (diff)
download	pkgsrc-1bf85a33a7f0af352174332dac11865971217df5.tar.gz