Update mjpegtools/mplex to 1.8.0.

Some changes:

* Modularised input handling for MPEG compression tools.
* movtar read/write support
* MJPEG playback in software, and experimental MJPEG hardware
   overlay playback (see mjpeg/)
* mpeg2enc _much_ improved!

27 files changed, 87 insertions, 1136 deletions

diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile
index a1d6a9e5bed..cb2cd0a46eb 100644
--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2006/01/24 07:32:27 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2006/01/25 08:09:12 xtraeme Exp $
 
-DISTNAME=	mjpegtools-1.6.2
-PKGREVISION=	8
+DISTNAME=	mjpegtools-1.8.0
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mjpeg/}
 
@@ -13,14 +12,16 @@ DEPENDS+=		toolame>=02l:../../audio/toolame
 BUILD_DEPENDS+=		nasm>=0.98:../../devel/nasm
 
 USE_TOOLS+=		gmake
-USE_TOOLS+=		bash:run
+USE_TOOLS+=		bash:run pkg-config
 
 USE_LIBTOOL=		yes
 SHLIBTOOL_OVERRIDE=	libtool
 PKGCONFIG_OVERRIDE=	mjpegtools.pc.in
 
 GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--without-libquicktime
 CONFIGURE_ARGS+=	--enable-large-file
+CONFIGURE_ARGS+=	--enable-simd
 CONFIGURE_ARGS+=	--with-lame-includes=${BUILDLINK_PREFIX.lame}
 
 .include "options.mk"
@@ -36,8 +37,8 @@ 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"
+.include "../../graphics/png/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.
diff --git a/multimedia/mjpegtools/PLIST b/multimedia/mjpegtools/PLIST
index 43632a2a111..d06efdc7742 100644
--- a/multimedia/mjpegtools/PLIST
+++ b/multimedia/mjpegtools/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.6 2005/02/03 23:04:40 reed Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/01/25 08:09:12 xtraeme Exp $
+bin/anytovcd.sh
 bin/jpeg2yuv
 bin/lav2avi.sh
 bin/lav2mpeg
@@ -10,26 +11,34 @@ bin/lavpipe
 bin/lavplay
 bin/lavtrans
 bin/matteblend.flt
-bin/mjpegtools-config
+bin/mjpeg_simd_helper
 bin/mp2enc
 bin/mpeg2enc
 bin/mpegtranscode
-bin/mplex
 bin/multiblend.flt
 bin/pgmtoy4m
 bin/png2yuv
+bin/pnmtoy4m
 bin/ppmtoy4m
 bin/transist.flt
 bin/y4mblack
 bin/y4mcolorbars
+bin/y4mdenoise
+bin/y4mhist
+bin/y4minterlace
 bin/y4mshift
+bin/y4mspatialfilter
+bin/y4mstabilizer
+bin/y4mtopnm
 bin/y4mtoppm
 bin/y4mtoyuv
+bin/y4munsharp
 bin/ypipe
 bin/yuv2lav
 bin/yuv4mpeg
 bin/yuvcorrect
 bin/yuvcorrect_tune
+bin/yuvdeinterlace
 bin/yuvdenoise
 bin/yuvfps
 bin/yuvinactive
@@ -38,6 +47,7 @@ bin/yuvmedianfilter
 bin/yuvplay
 bin/yuvscaler
 bin/yuvycsnoise
+bin/yuyvtoy4m
 include/mjpegtools/audiolib.h
 include/mjpegtools/avilib.h
 include/mjpegtools/editlist.h
@@ -51,6 +61,7 @@ include/mjpegtools/mjpeg_logging.h
 include/mjpegtools/mjpeg_types.h
 include/mjpegtools/mpeg2enc/elemstrmwriter.hh
 include/mjpegtools/mpeg2enc/encoderparams.hh
+include/mjpegtools/mpeg2enc/encodertypes.h
 include/mjpegtools/mpeg2enc/macroblock.hh
 include/mjpegtools/mpeg2enc/mpeg2coder.hh
 include/mjpegtools/mpeg2enc/mpeg2encoder.hh
@@ -63,32 +74,17 @@ include/mjpegtools/mpeg2enc/quantize.hh
 include/mjpegtools/mpeg2enc/quantize_ref.h
 include/mjpegtools/mpeg2enc/ratectl.hh
 include/mjpegtools/mpeg2enc/seqencoder.hh
+include/mjpegtools/mpeg2enc/streamstate.h
 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
@@ -101,11 +97,15 @@ 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/png2yuv.1
+man/man1/pnmtoy4m.1
 man/man1/ppmtoy4m.1
 man/man1/y4mcolorbars.1
+man/man1/y4mdenoise.1
+man/man1/y4mtopnm.1
 man/man1/y4mtoppm.1
+man/man1/y4munsharp.1
 man/man1/yuv2lav.1
 man/man1/yuvdenoise.1
 man/man1/yuvfps.1
@@ -116,6 +116,5 @@ 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
index 7a9db87ac81..c0763a8612d 100644
--- a/multimedia/mjpegtools/buildlink3.mk
+++ b/multimedia/mjpegtools/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/01/24 07:32:27 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/01/25 08:09:12 xtraeme Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 MJPEGTOOLS_BUILDLINK3_MK:=	${MJPEGTOOLS_BUILDLINK3_MK}+
@@ -11,14 +11,25 @@ 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.2nb8
+BUILDLINK_DEPENDS.mjpegtools+=		mjpegtools>=1.6.8
 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"
 
+.if !defined(PKG_BUILD_OPTIONS.mjpegtools)
+PKG_BUILD_OPTIONS.mjpegtools!=			\
+	cd ${BUILDLINK_PKGSRCDIR.apr} &&	\
+	${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS
+MAKEFLAGS+=	PKG_BUILD_OPTIONS.mjpegtools=	\
+			${PKG_BUILD_OPTIONS.mjpegtools:Q}
+.endif
+MAKEVARS+=      PKG_BUILD_OPTIONS.mjpegtools
+
+.if !empty(PKG_BUILD_OPTIONS.mjpegtools:Mdv)
+.  include "../../multimedia/libdv/buildlink3.mk"
+.endif
+
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/mjpegtools/distinfo b/multimedia/mjpegtools/distinfo
index 2bf03cf1cb5..cbbc62b7fd5 100644
--- a/multimedia/mjpegtools/distinfo
+++ b/multimedia/mjpegtools/distinfo
@@ -1,24 +1,7 @@
-$NetBSD: distinfo,v 1.8 2005/06/06 19:10:44 jmmv Exp $
+$NetBSD: distinfo,v 1.9 2006/01/25 08:09:12 xtraeme 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
+SHA1 (mjpegtools-1.8.0.tar.gz) = e11d68298a64b52f98724dbf3fd14f168e140290
+RMD160 (mjpegtools-1.8.0.tar.gz) = 4d97a6a721f29223975605e2a5e645b4d7d129b5
+Size (mjpegtools-1.8.0.tar.gz) = 1475998 bytes
+SHA1 (patch-aa) = e35a3e7e242d6e6faaf04b836dc92c312ae28fc8
+SHA1 (patch-ab) = 571eb234862b5533a23c58bd9a607c9a9abf5f89
diff --git a/multimedia/mjpegtools/options.mk b/multimedia/mjpegtools/options.mk
index 1ee2ef8645c..3b57deb4ddc 100644
--- a/multimedia/mjpegtools/options.mk
+++ b/multimedia/mjpegtools/options.mk
@@ -1,12 +1,14 @@
-# $NetBSD: options.mk,v 1.1 2005/06/07 21:23:04 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2006/01/25 08:09:12 xtraeme Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mjpegtools
-PKG_SUPPORTED_OPTIONS=	mjpegtools-cmov
+PKG_SUPPORTED_OPTIONS=	dv
+PKG_SUGGESTED_OPTIONS=	dv
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mmjpegtools-cmov)
-CONFIGURE_ARGS+=	--enable-cmov-extension
+.if !empty(PKG_OPTIONS:Mdv)
+.  include "../../multimedia/libdv/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-libdv
 .else
-CONFIGURE_ARGS+=	--disable-cmov-extension
+CONFIGURE_ARGS+=	--disable-libdv
 .endif
diff --git a/multimedia/mjpegtools/patches/patch-aa b/multimedia/mjpegtools/patches/patch-aa
index 0e8e544f2db..510f0082b6a 100644
--- a/multimedia/mjpegtools/patches/patch-aa
+++ b/multimedia/mjpegtools/patches/patch-aa
@@ -1,21 +1,12 @@
-$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 \
+$NetBSD: patch-aa,v 1.4 2006/01/25 08:09:12 xtraeme Exp $
+
+--- Makefile.in.orig	2006-01-25 08:51:27.000000000 +0100
++++ Makefile.in	2006-01-25 08:51:35.000000000 +0100
+@@ -259,7 +259,6 @@
+ 	mpeg2enc \
+ 	lavtools \
+ 	aenc \
+-	mplex \
+ 	scripts \
+ 	docs \
+ 	yuvdenoise \
diff --git a/multimedia/mjpegtools/patches/patch-ab b/multimedia/mjpegtools/patches/patch-ab
index 2eb327f681b..69223a1cd2e 100644
--- a/multimedia/mjpegtools/patches/patch-ab
+++ b/multimedia/mjpegtools/patches/patch-ab
@@ -1,348 +1,13 @@
-$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)
+$NetBSD: patch-ab,v 1.4 2006/01/25 08:09:12 xtraeme Exp $
+
+--- docs/Makefile.in.orig	2006-01-25 08:56:21.000000000 +0100
++++ docs/Makefile.in	2006-01-25 08:56:30.000000000 +0100
+@@ -216,7 +216,7 @@
+ 
+ # If the installation of man pages by you (e.g. you're a package builder)
+ # You may want to disable it
+-man_MANS = lavplay.1  lavrec.1  mjpegtools.1  mpeg2enc.1  mplex.1 \
++man_MANS = lavplay.1  lavrec.1  mjpegtools.1  mpeg2enc.1 \
+ 	yuvplay.1 lav2wav.1 lav2yuv.1 lavtrans.1 mp2enc.1 \
+ 	yuvscaler.1 lavpipe.1 yuv2lav.1 yuvdenoise.1 jpeg2yuv.1 \
+ 	png2yuv.1 \
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/mplex/Makefile b/multimedia/mplex/Makefile
index 9807cad0be1..170040f0b49 100644
--- a/multimedia/mplex/Makefile
+++ b/multimedia/mplex/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2005/06/17 03:50:23 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2006/01/25 08:09:12 xtraeme Exp $
 
-DISTNAME=	mjpegtools-1.6.2
-PKGNAME=	mplex-1.6.2
-PKGREVISION=	1
+DISTNAME=	mjpegtools-1.8.0
+PKGNAME=	mplex-1.8.0
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mjpeg/}
 
@@ -14,7 +13,7 @@ BUILD_DEPENDS+=	nasm>=0.98:../../devel/nasm
 
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	gmake
-USE_LANGUAGES=	c c++
+USE_LANGUAGES+=	c++
 USE_LIBTOOL=	yes
 
 INSTALLATION_DIRS=	bin lib
diff --git a/multimedia/mplex/distinfo b/multimedia/mplex/distinfo
index f9ca27f9890..c15b9a49d4c 100644
--- a/multimedia/mplex/distinfo
+++ b/multimedia/mplex/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 11:24:04 agc Exp $
+$NetBSD: distinfo,v 1.4 2006/01/25 08:09:12 xtraeme 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
+SHA1 (mjpegtools-1.8.0.tar.gz) = e11d68298a64b52f98724dbf3fd14f168e140290
+RMD160 (mjpegtools-1.8.0.tar.gz) = 4d97a6a721f29223975605e2a5e645b4d7d129b5
+Size (mjpegtools-1.8.0.tar.gz) = 1475998 bytes
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