update to 1.1.2

This is a major update, too much to list here.

16 files changed, 71 insertions, 272 deletions

diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index 943df3d3210..166a62b96c5 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.54 2009/06/12 17:24:54 ahoka Exp $
+# $NetBSD: Makefile,v 1.55 2009/07/07 16:38:29 drochner Exp $
 
-DISTNAME=	transcode-1.0.7
-PKGREVISION=	2
+DISTNAME=	transcode-1.1.2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://download.berlios.de/tcforge/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/multimedia/transcode/PLIST b/multimedia/transcode/PLIST
index 7e10b3aa5b3..9600327f364 100644
--- a/multimedia/transcode/PLIST
+++ b/multimedia/transcode/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2009/06/14 18:08:11 joerg Exp $
+@comment $NetBSD: PLIST,v 1.14 2009/07/07 16:38:29 drochner Exp $
 bin/avifix
 bin/aviindex
 bin/avimerge
@@ -11,28 +11,20 @@ bin/tcextract
 bin/tcmodinfo
 bin/tcmp3cut
 bin/tcprobe
-bin/tcrequant
 bin/tcscan
 bin/tcxmlcheck
 bin/tcxpm2rgb
+bin/tcyait
 bin/transcode
 ${PLIST.a52}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
 ${PLIST.dv}lib/transcode/export_dv.la
 ${PLIST.dv}lib/transcode/export_dvraw.la
 lib/transcode/export_ffmpeg.la
 ${PLIST.imagemagick}lib/transcode/export_im.la
 lib/transcode/export_jpg.la
 lib/transcode/export_lame.la
-lib/transcode/export_mjpeg.la
-lib/transcode/export_mp1e.la
 lib/transcode/export_mp2.la
 ${PLIST.mjpegtools}lib/transcode/export_mp2enc.la
 ${PLIST.mjpegtools}lib/transcode/export_mpeg2enc.la
@@ -42,11 +34,10 @@ lib/transcode/export_pcm.la
 lib/transcode/export_ppm.la
 lib/transcode/export_pvn.la
 lib/transcode/export_raw.la
+lib/transcode/export_tcaud.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
 ${PLIST.mjpegtools}lib/transcode/export_yuv4mpeg.la
 lib/transcode/filter_29to23.la
@@ -55,17 +46,13 @@ lib/transcode/filter_32drop.la
 lib/transcode/filter_aclip.la
 lib/transcode/filter_ascii.la
 lib/transcode/filter_astat.la
-lib/transcode/filter_clone.la
 ${PLIST.imagemagick}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
@@ -86,11 +73,10 @@ 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
-${PLIST.dv}lib/transcode/filter_preview.la
 lib/transcode/filter_pp.la
+${PLIST.dv}lib/transcode/filter_preview.la
 lib/transcode/filter_pv.la
 lib/transcode/filter_resample.la
 lib/transcode/filter_skip.la
@@ -99,55 +85,42 @@ lib/transcode/filter_smartbob.la
 lib/transcode/filter_smartdeinter.la
 lib/transcode/filter_smartyuv.la
 lib/transcode/filter_smooth.la
-${PLIST.mpeg3}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_stabilize.la
+lib/transcode/filter_subtitler.la
 lib/transcode/filter_testframe.la
 ${PLIST.freetype2}lib/transcode/filter_text.la
 ${PLIST.i386}lib/transcode/filter_tomsmocomp.la
+lib/transcode/filter_transform.la
 lib/transcode/filter_unsharp.la
-lib/transcode/filter_videocore.la
 lib/transcode/filter_whitebalance.la
 lib/transcode/filter_xsharpen.la
+lib/transcode/filter_yait.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_bsdav.la
-lib/transcode/import_divx.la
 lib/transcode/import_dv.la
 lib/transcode/import_dvd.la
-lib/transcode/import_ffbin.la
 lib/transcode/import_ffmpeg.la
-lib/transcode/import_fraps.la
 ${PLIST.imagemagick}lib/transcode/import_im.la
 ${PLIST.imagemagick}lib/transcode/import_imlist.la
-lib/transcode/import_lav.la
 lib/transcode/import_mp3.la
 lib/transcode/import_mpeg2.la
-${PLIST.mpeg3}lib/transcode/import_mpeg3.la
 lib/transcode/import_mplayer.la
 lib/transcode/import_null.la
-lib/transcode/import_nuv.la
-lib/transcode/import_nvrec.la
 lib/transcode/import_ogg.la
 lib/transcode/import_oss.la
 lib/transcode/import_pvn.la
 lib/transcode/import_raw.la
-lib/transcode/import_rawlist.la
-lib/transcode/import_sh.la
-lib/transcode/import_vdrac3.la
+lib/transcode/import_vag.la
 lib/transcode/import_vnc.la
 lib/transcode/import_vob.la
+lib/transcode/import_x11.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
@@ -157,16 +130,20 @@ man/man1/avisync.1
 man/man1/tccat.1
 man/man1/tcdecode.1
 man/man1/tcdemux.1
+man/man1/tcexport.1
 man/man1/tcextract.1
+man/man1/tcmodchain.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
+man/man1/transcode_export.1
+man/man1/transcode_filter.1
+man/man1/transcode_import.1
 share/doc/transcode/ChangeLog
 share/doc/transcode/DV-to-DVD-HOWTO.txt
-share/doc/transcode/OPTIMIZERS
 share/doc/transcode/README.Inverse.Telecine.txt
 share/doc/transcode/README.cluster
 share/doc/transcode/README.dv
@@ -175,16 +152,11 @@ 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/RELNOTES-0.6.13
+share/doc/transcode/RELNOTES-1.1.0
 share/doc/transcode/export_ffmpeg.txt
 share/doc/transcode/export_mp2.txt
-share/doc/transcode/export_mpeg.txt
-share/doc/transcode/export_pvm.txt
 share/doc/transcode/faq
-share/doc/transcode/filter-API.txt
 share/doc/transcode/filter-socket.txt
 share/doc/transcode/filter_dnr.txt
 share/doc/transcode/filter_logo.txt
@@ -236,12 +208,26 @@ 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/ibp_support.txt
-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/import_x11.txt
 share/doc/transcode/import_yuv.txt
-share/doc/transcode/pvm.cfg
-share/doc/transcode/release-notes/README-0.6.13
+share/doc/transcode/tech/OPTIMIZERS
+share/doc/transcode/tech/architecture.txt
+share/doc/transcode/tech/avi_comments.txt
+share/doc/transcode/tech/clone.txt
+share/doc/transcode/tech/export-API.txt
+share/doc/transcode/tech/filter-API.txt
+share/doc/transcode/tech/filter_template.c
+share/doc/transcode/tech/html/index.html
+share/doc/transcode/tech/html/tc_basic.css
+share/doc/transcode/tech/html/tc_frame_buffer.html
+share/doc/transcode/tech/html/tc_input_rotation.html
+share/doc/transcode/tech/html/tc_libraries.html
+share/doc/transcode/tech/html/tc_logo.png
+share/doc/transcode/tech/ibp_support.txt
+share/doc/transcode/tech/import-API.txt
+share/doc/transcode/tech/libraries.txt
+share/doc/transcode/tech/module-system-API.txt
 share/doc/transcode/template.cfg.txt
diff --git a/multimedia/transcode/distinfo b/multimedia/transcode/distinfo
index ef7d871784f..089f8f529ec 100644
--- a/multimedia/transcode/distinfo
+++ b/multimedia/transcode/distinfo
@@ -1,17 +1,7 @@
-$NetBSD: distinfo,v 1.16 2008/11/21 17:35:12 adam Exp $
+$NetBSD: distinfo,v 1.17 2009/07/07 16:38:29 drochner Exp $
 
-SHA1 (transcode-1.0.7.tar.bz2) = 480f1997ae391f29f6493993ec7b1cdbcf8afbc6
-RMD160 (transcode-1.0.7.tar.bz2) = f302972d8cf784e356753f7c21a012a73246ae71
-Size (transcode-1.0.7.tar.bz2) = 1942127 bytes
-SHA1 (patch-aa) = d6f632f99ea8452686797aeb22928a155c1a0775
-SHA1 (patch-ab) = ce8477442d9e9bb5680fef2aacd6e496f95a5ff2
-SHA1 (patch-ac) = ab93f1f98c1788db135e62653250a474c8d6f140
-SHA1 (patch-ae) = 901c88fb1a47d9a4b084d2d3918390584cdf9c42
-SHA1 (patch-aj) = ff2d3ed5e82d4c669561ab041fb709ff3db91f75
-SHA1 (patch-ao) = 4ece2603c4d504911cb3669e10222cb5bfd95caa
-SHA1 (patch-ar) = 8e13af23fb6d5c3a3140a43387955a922f88a48b
-SHA1 (patch-as) = f52658ae005ad3d68134a33878eb634e949a269a
-SHA1 (patch-at) = 60e6c507049e3fd1723440859b90e828aac968ad
-SHA1 (patch-au) = 3d06c68c60cda13d235a440b13a07d11b8de7877
-SHA1 (patch-av) = a48a2f2389091007ed7658763ac93d694094a766
-SHA1 (patch-aw) = 8af9050101faf78fe82145400677d0a398aa7fec
+SHA1 (transcode-1.1.2.tar.bz2) = 91060d3495dbecb67eb81dddf6cb633829adb1d6
+RMD160 (transcode-1.1.2.tar.bz2) = 3208f338721327cf88b864f4058b1c31d3350845
+Size (transcode-1.1.2.tar.bz2) = 2116876 bytes
+SHA1 (patch-ac) = 0640a062611c87d8666b7983594ab93b068c6580
+SHA1 (patch-aw) = a2a118bad9e3783f98e8cbfa62cff8771118ac17
diff --git a/multimedia/transcode/options.mk b/multimedia/transcode/options.mk
index 9f812c48cc6..04e453650c2 100644
--- a/multimedia/transcode/options.mk
+++ b/multimedia/transcode/options.mk
@@ -1,11 +1,11 @@
-# $NetBSD: options.mk,v 1.5 2008/04/12 22:43:08 jlam Exp $
+# $NetBSD: options.mk,v 1.6 2009/07/07 16:38:29 drochner Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.transcode
-PKG_SUPPORTED_OPTIONS=	a52 freetype2 mjpegtools mpeg3 lzo libxml2
+PKG_SUPPORTED_OPTIONS=	a52 freetype2 mjpegtools lzo libxml2
 PKG_SUPPORTED_OPTIONS+=	dv imagemagick
 
-PKG_SUGGESTED_OPTIONS=	a52 freetype2 mjpegtools mpeg3 libxml2
+PKG_SUGGESTED_OPTIONS=	a52 freetype2 mjpegtools libxml2
 PKG_SUGGESTED_OPTIONS+=	imagemagick
 
 .include "../../mk/bsd.options.mk"
@@ -37,16 +37,6 @@ CONFIGURE_ARGS+=	--enable-mjpegtools
 CONFIGURE_ARGS+=	--disable-mjpegtools
 .endif
 
-.if !empty(PKG_OPTIONS:Mmpeg3)
-BUILDLINK_API_DEPENDS.libmpeg3+=	libmpeg3>=1.7
-.  include "../../multimedia/libmpeg3/buildlink3.mk"
-PLIST.mpeg3=		yes
-CONFIGURE_ARGS+=	--with-libmpeg3-prefix=${BUILDLINK_PREFIX.libmpeg3}
-CONFIGURE_ARGS+=	--enable-libmpeg3
-.else
-CONFIGURE_ARGS+=	--disable-libmpeg3
-.endif
-
 .if !empty(PKG_OPTIONS:Mlzo)
 .  include "../../archivers/lzo/buildlink3.mk"
 PLIST.lzo=		yes
diff --git a/multimedia/transcode/patches/patch-aa b/multimedia/transcode/patches/patch-aa
deleted file mode 100644
index 25e577ba3fb..00000000000
--- a/multimedia/transcode/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2008/11/21 17:35:12 adam Exp $
-
---- Makefile.in.orig	2008-11-15 10:57:34.000000000 +0100
-+++ Makefile.in
-@@ -321,7 +321,6 @@ AUTOMAKE_OPTIONS = foreign
- @HAVE_PVM3_TRUE@PVM3 = pvm3
- SUBDIRS = \
- 	libtc \
--	libxio \
- 	docs \
- 	contrib \
- 	libdldarwin \
diff --git a/multimedia/transcode/patches/patch-ab b/multimedia/transcode/patches/patch-ab
deleted file mode 100644
index 0faf6d07f1b..00000000000
--- a/multimedia/transcode/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/01/24 05:35:51 xtraeme Exp $
-
---- import/import_mpeg3.c.orig	2006-01-24 00:59:51.000000000 +0100
-+++ import/import_mpeg3.c	2006-01-24 01:00:04.000000000 +0100
-@@ -33,7 +33,7 @@
- #define MOD_PRE mpeg3
- #include "import_def.h"
- 
--#include <libmpeg3.h>
-+#include <mpeg3/libmpeg3.h>
- 
- 
- #define BUFSIZE 65536
diff --git a/multimedia/transcode/patches/patch-ac b/multimedia/transcode/patches/patch-ac
index 08929be09f6..02651f25a61 100644
--- a/multimedia/transcode/patches/patch-ac
+++ b/multimedia/transcode/patches/patch-ac
@@ -1,17 +1,17 @@
-$NetBSD: patch-ac,v 1.4 2008/11/21 17:35:12 adam Exp $
+$NetBSD: patch-ac,v 1.5 2009/07/07 16:38:29 drochner Exp $
 
---- configure.orig	2008-11-15 10:57:26.000000000 +0100
+--- configure.orig	2009-03-28 10:13:11.000000000 +0100
 +++ configure
-@@ -9832,7 +9832,7 @@ fi
- 
+@@ -4864,7 +4864,7 @@ cat >>confdefs.h <<\_ACEOF
+ _ACEOF
  
- case "$host_os" in
+     ;;
 -  freebsd*|openbsd*|netbsd*|bsdi*|darwin*|rhapsody*)
 +  freebsd*|openbsd*|netbsd*|bsdi*|darwin*|rhapsody*|dragonfly*)
+     is_bsd=yes
  
  cat >>confdefs.h <<\_ACEOF
- #define SYS_BSD 1
-@@ -9864,7 +9864,7 @@ case "$host" in
+@@ -21959,7 +21959,7 @@ case "$host" in
  esac
  # let user override
  if test -n "$PTHREAD_LIBS" ; then
@@ -20,38 +20,12 @@ $NetBSD: patch-ac,v 1.4 2008/11/21 17:35:12 adam Exp $
  fi
  if test -n "$PTHREAD_CFLAGS" ; then
    pthread_cflags="$PTHREAD_CFLAGS"
-@@ -41961,7 +41961,7 @@ echo "${ECHO_T}default" >&6; }
-   for l in $imagemagick_ll ; do
-     case $l in
-       -L*) lpaths="$lpaths $l" ;;
--      -l*) test x"$l" != x"-lMagick" && xlibs="$xlibs $l" ;;
-+      -l*) test x"$l" != x"-lMagickCore" && xlibs="$xlibs $l" ;;
-         *) xlf="$xlf $l" ;;
-     esac
-   done
-@@ -41977,13 +41977,13 @@ echo "${ECHO_T}default" >&6; }
-   if test x"Magick" != x"none" ; then
-     save_LDFLAGS="$LDFLAGS"
-     LDFLAGS="$LDFLAGS $imagemagick_ll"
--    { echo "$as_me:$LINENO: checking for InitializeMagick in -lMagick" >&5
--echo $ECHO_N "checking for InitializeMagick in -lMagick... $ECHO_C" >&6; }
-+    { echo "$as_me:$LINENO: checking for InitializeMagick in -lMagickCore" >&5
-+echo $ECHO_N "checking for InitializeMagick in -lMagickCore... $ECHO_C" >&6; }
- if test "${ac_cv_lib_Magick_InitializeMagick+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lMagick $IMAGEMAGICK_EXTRA_LIBS $LIBS"
-+LIBS="-lMagickCore $IMAGEMAGICK_EXTRA_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -42039,7 +42039,7 @@ fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_Magick_InitializeMagick" >&5
- echo "${ECHO_T}$ac_cv_lib_Magick_InitializeMagick" >&6; }
- if test $ac_cv_lib_Magick_InitializeMagick = yes; then
--  IMAGEMAGICK_LIBS="$imagemagick_ll -lMagick $IMAGEMAGICK_EXTRA_LIBS"
-+  IMAGEMAGICK_LIBS="$imagemagick_ll -lMagickCore $IMAGEMAGICK_EXTRA_LIBS"
- else
- 
- tc_pkg_err="yes"
+@@ -42108,7 +42108,7 @@ if test "${enable_nuv+set}" = set; then
+ echo "$as_me: error: liblzo2 is required for NuppelVideo support, try --enable-lzo" >&2;}
+    { (exit 1); exit 1; }; }
+          fi
+-    	 if test true == "$have_x86_64cpu"; then
++    	 if test true = "$have_x86_64cpu"; then
+            { echo "$as_me:$LINENO: WARNING: NuppelVideo support on x86_64 platform is ***EXPERIMENTAL***" >&5
+ echo "$as_me: WARNING: NuppelVideo support on x86_64 platform is ***EXPERIMENTAL***" >&2;}
+          elif test true != "$have_x86cpu"; then
diff --git a/multimedia/transcode/patches/patch-ae b/multimedia/transcode/patches/patch-ae
deleted file mode 100644
index 4f46e45a205..00000000000
--- a/multimedia/transcode/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2006/03/13 21:21:39 joerg Exp $
-
---- import/import_mpeg2.c.orig	2006-03-13 18:20:39.000000000 +0000
-+++ import/import_mpeg2.c
-@@ -34,7 +34,6 @@ static int capability_flag = TC_CAP_RGB 
- #include "import_def.h"
- 
- 
--extern int errno;
- char import_cmd_buf[TC_BUF_MAX];
- 
- typedef struct tbuf_t {
diff --git a/multimedia/transcode/patches/patch-aj b/multimedia/transcode/patches/patch-aj
deleted file mode 100644
index cc96409fe74..00000000000
--- a/multimedia/transcode/patches/patch-aj
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aj,v 1.3 2006/03/13 21:21:39 joerg Exp $
-
---- import/import_divx.c.orig	2006-03-13 18:28:40.000000000 +0000
-+++ import/import_divx.c
-@@ -50,7 +50,6 @@ static int capability_flag = TC_CAP_RGB 
- #endif
- 
- 
--extern int errno;
- char import_cmd_buf[TC_BUF_MAX];
- 
- static int codec, frame_size=0;
diff --git a/multimedia/transcode/patches/patch-ao b/multimedia/transcode/patches/patch-ao
deleted file mode 100644
index 4b5141e1172..00000000000
--- a/multimedia/transcode/patches/patch-ao
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ao,v 1.3 2006/03/13 21:21:39 joerg Exp $
-
---- import/tccat.c.orig	2006-03-13 19:00:13.000000000 +0000
-+++ import/tccat.c
-@@ -23,7 +23,7 @@
- 
- #include "transcode.h"
- 
--#include <sys/errno.h>
-+#include <errno.h>
- #include "xio.h"
- #include "ioaux.h"
- #include "tc.h"
-@@ -36,8 +36,6 @@ char buf[MAX_BUF];
- 
- int verbose=TC_INFO;
- 
--extern int errno;
--
- void import_exit(int code) 
- {
-   if(verbose & TC_DEBUG) import_info(code, EXE);
diff --git a/multimedia/transcode/patches/patch-ar b/multimedia/transcode/patches/patch-ar
deleted file mode 100644
index 1e7944a82a7..00000000000
--- a/multimedia/transcode/patches/patch-ar
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ar,v 1.5 2008/08/07 18:43:42 drochner Exp $
-
---- src/transcode.c.orig	2008-01-05 15:37:15.000000000 +0100
-+++ src/transcode.c
-@@ -43,12 +43,8 @@
- #include "libsupport/getopt.h"
- #endif
- 
--extern int errno;
--
- #include "usage.h"
- 
--extern int errno;
--
- // communicating with export modules to allow to set them defaults.
- #include "probe_export.h"
- unsigned int probe_export_attributes = 0;
diff --git a/multimedia/transcode/patches/patch-as b/multimedia/transcode/patches/patch-as
deleted file mode 100644
index a06042122fe..00000000000
--- a/multimedia/transcode/patches/patch-as
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-as,v 1.3 2006/03/13 21:21:39 joerg Exp $
-
---- src/filter.c.orig	2006-03-13 19:18:52.000000000 +0000
-+++ src/filter.c
-@@ -56,8 +56,6 @@ static char module[TC_BUF_MAX];
- 
- filter_t filter[MAX_FILTER];
- 
--extern int errno;
--
- int filter_next_free_id(void)
- {
-   int n;
diff --git a/multimedia/transcode/patches/patch-at b/multimedia/transcode/patches/patch-at
deleted file mode 100644
index 2b2c1480e09..00000000000
--- a/multimedia/transcode/patches/patch-at
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-at,v 1.3 2006/03/13 21:21:39 joerg Exp $
-
---- src/counter.c.orig	2006-03-13 19:19:41.000000000 +0000
-+++ src/counter.c
-@@ -30,8 +30,6 @@
- static int encoder_progress_flag=0;
- static char encoder_progress_str[ENCODER_PROG_STR_MAX];
- 
--extern int errno;
--
- void tc_encoder_progress()
- {
-     printf("%s\r", encoder_progress_str);
diff --git a/multimedia/transcode/patches/patch-au b/multimedia/transcode/patches/patch-au
deleted file mode 100644
index 2fdfaa9340d..00000000000
--- a/multimedia/transcode/patches/patch-au
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-au,v 1.3 2006/03/13 21:21:39 joerg Exp $
-
---- src/socket.c.orig	2006-03-13 19:21:07.000000000 +0000
-+++ src/socket.c
-@@ -42,8 +42,6 @@ static int socket_fd=-1;
- 
- pthread_mutex_t tc_socket_msg_lock=PTHREAD_MUTEX_INITIALIZER;
- 
--extern int errno;
--
- int s_write (int sock, void *buf, size_t count) 
- {
-     int retval=0;
diff --git a/multimedia/transcode/patches/patch-av b/multimedia/transcode/patches/patch-av
deleted file mode 100644
index 881bab7dabb..00000000000
--- a/multimedia/transcode/patches/patch-av
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-av,v 1.4 2008/11/21 17:35:12 adam Exp $
-
---- tools/Makefile.in.orig	2008-11-15 10:57:34.000000000 +0100
-+++ tools/Makefile.in
-@@ -408,7 +408,7 @@ tcmodinfo_LDADD = \
- 	$(DLDARWINLIB) \
- 	$(ACLIB_LIBS) \
- 	$(LIBTC_LIBS) \
--	-lm
-+	-lm ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
- 
- tcmodinfo_LDFLAGS = -export-dynamic 
- tcmp3cut_SOURCES = tcmp3cut.c
diff --git a/multimedia/transcode/patches/patch-aw b/multimedia/transcode/patches/patch-aw
index 982bfed063e..41a6d0a5ef7 100644
--- a/multimedia/transcode/patches/patch-aw
+++ b/multimedia/transcode/patches/patch-aw
@@ -1,18 +1,18 @@
-$NetBSD: patch-aw,v 1.4 2008/08/26 13:21:59 drochner Exp $
+$NetBSD: patch-aw,v 1.5 2009/07/07 16:38:29 drochner Exp $
 
---- ./import/nuv/import_nuv.c.orig	2008-07-12 16:49:58.000000000 +0200
+--- ./import/nuv/import_nuv.c.orig	2009-02-21 22:01:57.000000000 +0100
 +++ ./import/nuv/import_nuv.c
-@@ -16,7 +16,9 @@
- #include "libtc/libtc.h"
+@@ -15,7 +15,9 @@
  #include "aclib/ac.h"
- #include "import/magic.h"
+ #include "nuppelvideo.h"
+ #include "RTjpegN.h"
 +#ifdef HAVE_LZO
  #include "libtc/tc_lzo.h"
 +#endif
  
- 
- 
-@@ -474,6 +476,7 @@ static int nuv_decode_video(TCModuleInst
+ #define MOD_NAME        "import_nuv.so"
+ #define MOD_VERSION     "v0.9 (2006-06-03)"
+@@ -467,6 +469,7 @@ static int nuv_decode_video(TCModuleInst
      in_framesize = inframe->video_size-5-sizeof(pd->cdata);
      out_framesize = pd->width*pd->height + (pd->width/2)*(pd->height/2)*2;
  
@@ -20,7 +20,7 @@ $NetBSD: patch-aw,v 1.4 2008/08/26 13:21:59 drochner Exp $
      if (comptype == '2' || comptype == '3') {
          /* Undo LZO compression */
          uint8_t *decompressed_frame;
-@@ -496,6 +499,7 @@ static int nuv_decode_video(TCModuleInst
+@@ -489,6 +492,7 @@ static int nuv_decode_video(TCModuleInst
          /* Convert 2 -> 1, 3 -> 0 */
          comptype ^= 3;
      }