11 files changed, 177 insertions, 213 deletions

diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index c1f62c650772..94441d1d6d5d 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -6,16 +6,17 @@
 #
 
 PORTNAME=	transcode
-PORTVERSION=	0.6.12
-PORTREVISION=	4
+DISTVERSION=	1.0.0beta2
 CATEGORIES=	multimedia
-MASTER_SITES=	http://www.zebra.fh-weingarten.de/~transcode/pre/
+MASTER_SITES=	http://www.jakemsr.com/transcode/
 
 MAINTAINER=	hendrik@scholz.net
 COMMENT=	A text-console utility for video stream processing
 
 LIB_DEPENDS=	dvdread.3:${PORTSDIR}/multimedia/libdvdread \
-		jpeg.9:${PORTSDIR}/graphics/jpeg
+				jpeg.9:${PORTSDIR}/graphics/jpeg
+BUILD_DEPENDS=	${LOCALBASE}/bin/ffmpeg:${PORTSDIR}/multimedia/ffmpeg \
+				iconv:${PORTSDIR}/converters/libiconv
 
 USE_GETOPT_LONG=yes
 USE_XLIB=	yes
@@ -27,6 +28,9 @@ CPPFLAGS=	-I${X11BASE}/include -I${LOCALBASE}/include
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
 		SDL_CONFIG="${LOCALBASE}/bin/sdl11-config"
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS+=	--with-ffmpeg_libs-prefix=${LOCALBASE} \
+					--with-libdvdread-prefix=${LOCALBASE} \
+					--with-libiconv-prefix=${LOCALBASE}
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL_VER=13
@@ -38,8 +42,20 @@ MAN1=	avifix.1 aviindex.1 avimerge.1 avisplit.1 avisync.1 tccat.1 tcdemux.1 \
 
 .include <bsd.port.pre.mk>
 
+.if exists(${LOCALBASE}/lib/libfreetype.so)
+WITH_FREETYPE=	yes
+.endif
+
+.if exists(${LOCALBASE}/lib/libogg.so)
+WITH_OGG=	yes
+.endif
+
+.if exists(${LOCALBASE}/lib/libvorbis.so)
+WITH_VORBIS=	yes
+.endif
+
 .if exists(${LOCALBASE}/lib/libtheora.so)
-WITH_LIBTHEORA=		yes
+WITH_THEORA=		yes
 .endif
 
 .if exists(${LOCALBASE}/lib/libMagick.so)
@@ -55,19 +71,15 @@ WITH_SDL=	yes
 .endif
 
 .if exists(${LOCALBASE}/lib/libxml2.so)
-WITH_LIBXML2=	yes
-.endif
-
-.if exists(${LOCALBASE}/bin/ffmpeg)
-WITH_FFMPEG=	yes
+WITH_XML=	yes
 .endif
 
 .if exists(${LOCALBASE}/lib/libdv.so)
 WITH_LIBDV=	yes
 .endif
 
-.if exists(${LOCALBASE}/lib/libopenquicktime.so)
-WITH_OPENQUICKTIME=	yes
+.if exists(${LOCALBASE}/lib/libquicktime.so)
+WITH_QUICKTIME=	yes
 .endif
 
 .if exists(${LOCALBASE}/lib/libfame.so)
@@ -91,14 +103,6 @@ WITH_LIBA52=	yes
 WITH_LAME=	yes
 .endif
 
-.if exists(${LOCALBASE}/lib/libogg.so)
-WITH_OGG=	yes
-.endif
-
-.if exists(${LOCALBASE}/include/mjpegtools/yuv4mpeg.h)
-WITH_MJPEG=	yes
-.endif
-
 .if exists(${LOCALBASE}/lib/liblzo.so)
 WITH_LZO=	yes
 .endif
@@ -111,21 +115,44 @@ WITH_DIVX5=	yes
 WITH_JPEGMMX=	yes
 .endif
 
-.if defined(WITH_JPEGMMX)
-WITH_NASM=	yes
+.if defined(WITH_FREETYPE)
+LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
+CONFIGURE_ARGS+=	--with-ft-prefix=${LOCALBASE} --enable-freetype2
+.else
+CONFIGURE_ARGS+=	--disable-fttest --enable-freetype=no
+.endif
+
+.if defined(WITH_OGG)
+LIB_DEPENDS+=	ogg.5:${PORTSDIR}/audio/libogg
+CONFIGURE_ARGS+=	--with-ogg-prefix=${LOCALBASE} --enable-ogg
+PLIST_SUB+=	WITH_OGG=""
+.else
+PLIST_SUB+=	WITH_OGG="@comment "
+CONFIGURE_ARGS+=	--enable-ogg=no
 .endif
 
-.if defined(WITH_LIBTHEORA)
+.if defined(WITH_VORBIS)
+LIB_DEPENDS+=	vorbis.3:${PORTSDIR}/audio/libvorbis
+CONFIGURE_ARGS+=	--with-vorbis-prefix=${LOCALBASE} --enable-vorbis
+PLIST_SUB+=	WITH_VORBIS=""
+.else
+PLIST_SUB+=	WITH_VORBIS="@comment "
+CONFIGURE_ARGS+=	--enable-vorbis=no
+.endif
+
+.if defined(WITH_THEORA)
 LIB_DEPENDS+=	theora.1:${PORTSDIR}/multimedia/libtheora
+CONFIGURE_ARGS+=	--with-theora-prefix=${LOCALBASE} --enable-theora
 .else
-CONFIGURE_ARGS+=	--with-theora=no
+CONFIGURE_ARGS+=	--enable-theora=no
 .endif
 
 .if defined(WITH_IMAGEMAGICK)
 LIB_DEPENDS+=	Magick.7:${PORTSDIR}/graphics/ImageMagick
 PLIST_SUB+=	WITH_IMAGEMAGICK=""
+CONFIGURE_ARGS+=	--enable-imagemagick --with-imagemagick-prefix=${LOCALBASE}
 .else
-CONFIGURE_ARGS+=	--with-magick-mods=no
+CONFIGURE_ARGS+=	--enable-imagemagick=no
 PLIST_SUB+=	WITH_IMAGEMAGICK="@comment "
 .endif
 
@@ -137,22 +164,13 @@ PLIST_SUB+=	WITH_JPEGMMX=""
 PLIST_SUB+=	WITH_JPEGMMX="@comment "
 .endif
 
-.if defined(WITH_NASM)
-BUILD_DEPENDS+=	${LOCALBASE}/bin/nasm:${PORTSDIR}/devel/nasm
-ONLY_FOR_ARCHS=	i386
-PLIST_SUB+=	WITH_NASM=""
-.else
-PLIST_SUB+=	WITH_NASM="@comment "
-.endif
-
 .if defined(WITH_AVIFILE)
 LIB_DEPENDS+=	aviplay:${PORTSDIR}/multimedia/avifile
 PLIST_SUB+=	WITH_AVIFILE=""
+CONFIGURE_ARGS+=	--with-avifile-prefix=${LOCALBASE} --enable-avifile
 .else
-CONFIGURE_ARGS+=	--with-avifile-mods=no \
-			--enable-avifile6=no
+CONFIGURE_ARGS+=	--enable-avifile=no
 PLIST_SUB+=	WITH_AVIFILE="@comment "
-WITHOUT_FFMPEG=	YES
 .endif
 
 .if defined(WITH_SDL)
@@ -163,47 +181,48 @@ PLIST_SUB+=	WITH_SDL=""
 PLIST_SUB+=	WITH_SDL="@comment "
 .endif
 
-.if defined(WITH_LIBXML2)
+.if defined(WITH_XML)
 LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
-PLIST_SUB+=	WITH_LIBXML2=""
-.else
-PLIST_SUB+=	WITH_LIBXML2="@comment "
-.endif
-
-.if defined(WITH_FFMPEG) && !defined(WITHOUT_FFMPEG)
-BUILD_DEPENDS+=	${LOCALBASE}/bin/ffmpeg:${PORTSDIR}/multimedia/ffmpeg
-PLIST_SUB+=	WITH_FFMPEG=""
+CONFIGURE_ARGS+=	--enable-libxml2 --with-libxml2-prefix=${LOCALBASE}
+PLIST_SUB+=	WITH_XML=""
 .else
-PLIST_SUB+=	WITH_FFMPEG="@comment "
+CONFIGURE_ARGS+=	--enable-libxml2=no
+PLIST_SUB+=	WITH_XML="@comment "
 .endif
 
 .if defined(WITH_LIBDV)
 LIB_DEPENDS+=	dv.4:${PORTSDIR}/multimedia/libdv
 PLIST_SUB+=	WITH_LIBDV=""
-CONFIGURE_ARGS+=	--with-pal-yuv=YV12
+CONFIGURE_ARGS+=	--with-pal-yuv=YV12 --enable-libdv
 .else
-CONFIGURE_ARGS+=	--with-dv=no
+CONFIGURE_ARGS+=	--enable-libdv=no
 PLIST_SUB+=	WITH_LIBDV="@comment "
 .endif
 
-.if defined(WITH_OPENQUICKTIME)
-LIB_DEPENDS+=	openquicktime.0:${PORTSDIR}/multimedia/openquicktime
+.if defined(WITH_QUICKTIME)
+LIB_DEPENDS+=	quicktime.0:${PORTSDIR}/multimedia/libquicktime
+CONFIGURE_ARGS+=	--enable-libquicktime \
+					--with-libquicktime-prefix=${LOCALBASE} \
+					--with-libquicktime-includes=${LOCALBASE}
+PLIST_SUB+=	WITH_QUICKTIME=""
 .else
-CONFIGURE_ARGS+=	--with-openqt=no
+CONFIGURE_ARGS+=	--enable-libquicktime=no
+PLIST_SUB+=	WITH_QUICKTIME="@comment "
 .endif
 
 .if defined(WITH_FAME)
 LIB_DEPENDS+=	fame-0.9:${PORTSDIR}/multimedia/libfame
+CONFIGURE_ARGS+=	--with-libfame-prefix=${LOCALBASE} --enable-libfame
 PLIST_SUB+=	WITH_FAME=""
 .else
 PLIST_SUB+=	WITH_FAME="@comment "
+CONFIGURE_ARGS+=	--enable-libfame=no
 .endif
 
 .if defined(WITH_XVID)
 LIB_DEPENDS+=	xvidcore.4:${PORTSDIR}/multimedia/xvid
 RUN_DEPENDS+=	xvid4conf:${PORTSDIR}/multimedia/xvid4conf
 PLIST_SUB+=	WITH_XVID=""
-WITH_NASM=	YES
 .else
 PLIST_SUB+=	WITH_XVID="@comment "
 .endif
@@ -220,41 +239,21 @@ PLIST_SUB+=	WITH_LIBA52="@comment "
 
 .if defined(WITH_LAME)
 LIB_DEPENDS+=	mp3lame.0:${PORTSDIR}/audio/lame
-CONFIGURE_ARGS+=	--with-lame-libs=${LOCALBASE}/lib
-PLIST_SUB+=	WITH_LAME=""
-.else
-CONFIGURE_ARGS+=	--with-lame=no
-PLIST_SUB+=	WITH_LAME="@comment "
-.endif
-
-.if defined(WITH_OGG)
-LIB_DEPENDS+=	ogg.5:${PORTSDIR}/audio/libogg
-CONFIGURE_ARGS+=	--with-ogg=yes
-PLIST_SUB+=	WITH_OGG=""
-.else
-PLIST_SUB+=	WITH_OGG="@comment "
-.endif
-
-.if defined(WITH_MJPEG)
-LIB_DEPENDS+=	lavplay-1.6.2:${PORTSDIR}/multimedia/mjpegtools
-PLIST_SUB+=	WITH_MJPEG=""
+CONFIGURE_ARGS+=	--with-lame-prefix=${LOCALBASE}
 .else
-PLIST_SUB+=	WITH_MJPEG="@comment "
+CONFIGURE_ARGS+=	--disable-lame
 .endif
 
 .if defined(WITH_LZO)
 LIB_DEPENDS+=	lzo.1:${PORTSDIR}/archivers/lzo
+CONFIGURE_ARGS+=	--enable-lzo --with-lzo-prefix=${LOCALBASE} \
+					--with-lzo-includes=${LOCALBASE}
 PLIST_SUB+=	WITH_LZO=""
 .else
+CONFIGURE_ARGS+=	--enable-lzo=no
 PLIST_SUB+=	WITH_LZO="@comment "
 .endif
 
-.if defined(WITH_SUBRIP)
-PLIST_SUB+=	WITH_SUBRIP=""
-.else
-PLIST_SUB+=	WITH_SUBRIP="@comment "
-.endif
-
 .if defined(WITH_DIVX5)
 BUILD_DEPENDS+=	${LINUXBASE}/usr/lib/libdivxdecore.so:${PORTSDIR}/multimedia/linux-divx4linux
 CONFIGURE_ENV+=	CFLAGS="-I${LINUXBASE}/usr/include/divx" CPPFLAGS="-I${LINUXBASE}/usr/include/divx"
@@ -266,13 +265,25 @@ pre-everything::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "You can enable extra optimizations by defining WITH_OPTIMIZED_CFLAGS."
 .endif
-.if !defined(WITH_JPEGMMX)
+.if !defined(WITH_FREETYPE)
 	@${ECHO_MSG}
-	@${ECHO_MSG} "You can enable JPEG with MMX by defining WITH_JPEGMMX."
+	@${ECHO_MSG} "You can enable text/subtitler modules by defining WITH_FREETYPE."
+.endif
+.if !defined(WITH_OGG)
+	@${ECHO_MSG}
+	@${ECHO_MSG} "You can enable libogg support by defining WITH_OGG."
+.endif
+.if !defined(WITH_VORBIS)
+	@${ECHO_MSG}
+	@${ECHO_MSG} "You can enable libvorbis support by defining WITH_VORBIS."
+.endif
+.if !defined(WITH_THEORA)
+	@${ECHO_MSG}
+	@${ECHO_MSG} "You can enable libtheora support by defining WITH_THEORA."
 .endif
-.if !defined(WITH_LIBTHEORA)
+.if !defined(WITH_JPEGMMX)
 	@${ECHO_MSG}
-	@${ECHO_MSG} "You can enable Libtheora by defining WITH_LIBTHEORA."
+	@${ECHO_MSG} "You can enable JPEG with MMX by defining WITH_JPEGMMX."
 .endif
 .if !defined(WITH_IMAGEMAGICK)
 	@${ECHO_MSG}
@@ -283,13 +294,9 @@ pre-everything::
 	@${ECHO_MSG} "You can enable realtime-previewing by defining WITH_SDL."
 	@${ECHO_MSG} "This implies WITH_LIBDV."
 .endif
-.if !defined(WITH_LIBXML2)
+.if !defined(WITH_XML)
 	@${ECHO_MSG}
-	@${ECHO_MSG} "You can enable libxml2-dependent modules by defining WITH_LIBXML2."
-.endif
-.if !defined(WITH_FFMPEG) || defined(WITHOUT_FFMEG)
-	@${ECHO_MSG}
-	@${ECHO_MSG} "You can enable ffmpeg-dependent modules by defining WITH_FFMPEG."
+	@${ECHO_MSG} "You can enable libxml2-dependent modules by defining WITH_XML."
 .endif
 .if !defined(WITH_LAME)
 	@${ECHO_MSG}
@@ -313,14 +320,9 @@ pre-everything::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "You can enable avifile-dependent modules by defining WITH_AVIFILE."
 .endif(WITH_AVIFILE)
-.if !defined(WITH_NASM)
-	@${ECHO_MSG}
-	@${ECHO_MSG} "You can enable nasm dependent modules by defining WITH_NASM."
-	@${ECHO_MSG} "This turns this into an i386-only port."
-.endif(WITH_NASM)
-.if !defined(WITH_OPENQUICKTIME)
+.if !defined(WITH_QUICKTIME)
 	@${ECHO_MSG}
-	@${ECHO_MSG} "You can enable openquicktime-dependent modules by defining WITH_OPENQUICKTIME."
+	@${ECHO_MSG} "You can enable openquicktime-dependent modules by defining WITH_QUICKTIME."
 .endif
 .if !defined(WITH_FAME)
 	@${ECHO_MSG}
@@ -329,26 +331,13 @@ pre-everything::
 .if !defined(WITH_XVID)
 	@${ECHO_MSG}
 	@${ECHO_MSG} "You can enable xvid support by defining WITH_XVID."
-	@${ECHO_MSG} "This implies WITH_NASM and turns this into an i386-only port."
 	@${ECHO_MSG} "You will probably want to enable this, if you plan to"
 	@${ECHO_MSG} "rip DVDs."
 .endif
-.if !defined(WITH_OGG)
-	@${ECHO_MSG}
-	@${ECHO_MSG} "You can enable libogg support by defining WITH_OGG."
-.endif
 .if !defined(WITH_LZO)
 	@${ECHO_MSG}
 	@${ECHO_MSG} "You can enable liblzo support by defining WITH_LZO."
 .endif
-.if !defined(WITH_MJPEG)
-	@${ECHO_MSG}
-	@${ECHO_MSG} "You can enable support for the MJPEG toolkit by defining WITH_MJPEG."
-.endif
-.if !defined(WITH_SUBRIP)
-	@${ECHO_MSG}
-	@${ECHO_MSG} "You can enable compilation of subtitleripper by defining WITH_SUBRIP."
-.endif
 .if !defined(WITH_DIVX5)
 	@${ECHO_MSG}
 	@${ECHO_MSG} "You can enable experimental DivX 5 support by defining WITH_DIVX5."
@@ -374,11 +363,6 @@ pre-configure:
 	@${REINPLACE_CMD} -E -e 's|-ldl||g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -E -e 's|WRKSRC|${WRKSRC}|g' ${WRKSRC}/export/Makefile.in
 
-pre-build:
-.if defined(WITH_SUBRIP)
-	@cd ${WRKSRC}/contrib/subrip; ${GMAKE} clean all
-.endif
-
 post-install:
 .if defined(WITH_XVID)
 	@${LN} -sf ${LOCALBASE}/lib/libxvidcore.so \
@@ -387,19 +371,20 @@ post-install:
 		${PREFIX}/lib/transcode/libxvidcore.so.4
 .endif
 
-.if defined(WITH_SUBRIP)
-	@cd ${WRKSRC}/contrib/subrip; \
-		${INSTALL_PROGRAM} srttool subtitle2pgm subtitle2vobsub ${PREFIX}/bin; \
-		${INSTALL_SCRIPT} pgm2txt ${PREFIX}/bin
-.endif
-
 	@${RM} ${PREFIX}/lib/transcode/*.la
 
 .if ${ARCH} == i386
-PLIST_SUB+= I386=""
+PLIST_SUB+=	I386=""
 .else
-PLIST_SUB+= I386="@comment "
+PLIST_SUB+=	I386="@comment "
 .endif
 
+.if ${OSVERSION} > 500000 && ${ARCH}=="i386"
+PLIST_SUB+=	GCC2=""
+PLIST_SUB+=	GCC3="@comment "
+.else
+PLIST_SUB+=	GCC2="@comment "
+PLIST_SUB+=	GCC3=""
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/transcode/distinfo b/multimedia/transcode/distinfo
index 084513f43ea5..a78edf529352 100644
--- a/multimedia/transcode/distinfo
+++ b/multimedia/transcode/distinfo
@@ -1,2 +1,2 @@
-MD5 (transcode-0.6.12.tar.gz) = 550214ed9f85224423ca8c7308ed96ce
-SIZE (transcode-0.6.12.tar.gz) = 3454807
+MD5 (transcode-1.0.0beta2.tar.gz) = 17c370e2b6a1e88045b9e5c8c4e70760
+SIZE (transcode-1.0.0beta2.tar.gz) = 11028480
diff --git a/multimedia/transcode/files/patch-contrib:subrip:Makefile b/multimedia/transcode/files/patch-contrib:subrip:Makefile
deleted file mode 100644
index d2b86dae318a..000000000000
--- a/multimedia/transcode/files/patch-contrib:subrip:Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
---- contrib/subrip/Makefile.orig	Mon Jun  9 13:09:32 2003
-+++ contrib/subrip/Makefile	Mon Jun  9 13:09:39 2003
-@@ -8,8 +8,8 @@
- INCLUDES :=
- 
- ### enable ppm support ###
--DEFINES  += -D_HAVE_LIB_PPM_
--LIBS     += -lppm
-+#DEFINES  += -D_HAVE_LIB_PPM_
-+#LIBS     += -lppm
- 
- ### enable zlib support ###
- DEFINES += -D_HAVE_ZLIB_
-
diff --git a/multimedia/transcode/files/patch-ffmpeg:libavcodec:i386:dsputil_mmx.c b/multimedia/transcode/files/patch-ffmpeg:libavcodec:i386:dsputil_mmx.c
deleted file mode 100644
index 4ad4f716a2e1..000000000000
--- a/multimedia/transcode/files/patch-ffmpeg:libavcodec:i386:dsputil_mmx.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- ffmpeg/libavcodec/i386/dsputil_mmx.c.orig	Wed Nov 17 17:30:15 2004
-+++ ffmpeg/libavcodec/i386/dsputil_mmx.c	Wed Nov 17 17:30:33 2004
-@@ -31,8 +31,8 @@
- static const uint64_t mm_wone __attribute__ ((aligned(8))) = 0x0001000100010001ULL;
- static const uint64_t mm_wtwo __attribute__ ((aligned(8))) = 0x0002000200020002ULL;
- 
--static const uint64_t ff_pw_20 __attribute__ ((aligned(8))) = 0x0014001400140014ULL;
--static const uint64_t ff_pw_3  __attribute__ ((aligned(8))) = 0x0003000300030003ULL;
-+static const uint64_t ff_pw_20 __attribute__ ((aligned(8), used)) = 0x0014001400140014ULL;
-+static const uint64_t ff_pw_3  __attribute__ ((aligned(8), used)) = 0x0003000300030003ULL;
- static const uint64_t ff_pw_16 __attribute__ ((aligned(8))) = 0x0010001000100010ULL;
- static const uint64_t ff_pw_15 __attribute__ ((aligned(8))) = 0x000F000F000F000FULL;
-
diff --git a/multimedia/transcode/files/patch-ffmpeg:libavcodec:i386:motion_est_mmx.c b/multimedia/transcode/files/patch-ffmpeg:libavcodec:i386:motion_est_mmx.c
deleted file mode 100644
index 40309131718a..000000000000
--- a/multimedia/transcode/files/patch-ffmpeg:libavcodec:i386:motion_est_mmx.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- ffmpeg/libavcodec/i386/motion_est_mmx.c.orig	Wed Nov 17 17:31:38 2004
-+++ ffmpeg/libavcodec/i386/motion_est_mmx.c	Wed Nov 17 17:31:47 2004
-@@ -26,7 +26,7 @@
- 0x0002000200020002ULL,
- };
- 
--static __attribute__ ((aligned(8), unused)) uint64_t bone= 0x0101010101010101LL;
-+static __attribute__ ((aligned(8), used)) uint64_t bone= 0x0101010101010101LL;
- 
- static inline void sad8_mmx(uint8_t *blk1, uint8_t *blk2, int stride, int h)
- {
-
diff --git a/multimedia/transcode/files/patch-ffmpeg:libavcodec:i386:simple_idct_mmx.c b/multimedia/transcode/files/patch-ffmpeg:libavcodec:i386:simple_idct_mmx.c
deleted file mode 100644
index 6001e63cec67..000000000000
--- a/multimedia/transcode/files/patch-ffmpeg:libavcodec:i386:simple_idct_mmx.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- ffmpeg/libavcodec/i386/simple_idct_mmx.c.orig	Wed Nov 17 17:32:21 2004
-+++ ffmpeg/libavcodec/i386/simple_idct_mmx.c	Wed Nov 17 17:32:37 2004
-@@ -45,8 +45,8 @@
- #define ROW_SHIFT 11
- #define COL_SHIFT 20 // 6
- 
--static const uint64_t __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000ULL;
--static const uint64_t __attribute__((aligned(8))) d40000= 0x0000000000040000ULL;
-+static const uint64_t __attribute__((aligned(8), used)) wm1010= 0xFFFF0000FFFF0000ULL;
-+static const uint64_t __attribute__((aligned(8), used)) d40000= 0x0000000000040000ULL;
- 
- static const int16_t __attribute__((aligned(8))) coeffs[]= {
- 	1<<(ROW_SHIFT-1), 0, 1<<(ROW_SHIFT-1), 0,
-
-
diff --git a/multimedia/transcode/files/patch-filter:subtitles:frame_list.c b/multimedia/transcode/files/patch-filter:subtitles:frame_list.c
deleted file mode 100644
index f78ab71331ad..000000000000
--- a/multimedia/transcode/files/patch-filter:subtitles:frame_list.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- filter/subtitler/frame_list.c.orig	Thu Feb 26 17:30:59 2004
-+++ filter/subtitler/frame_list.c	Thu Feb 26 17:36:19 2004
-@@ -33,8 +33,8 @@
- 
- char *strsave(char *s) /*save char array s somewhere*/
- {
--char *p, *malloc();
--if(p = malloc( strlen(s) +  1) ) strcpy(p, s);
-+char *p;
-+if(p = (char *)malloc( strlen(s) +  1) ) strcpy(p, s);
- return(p);
- }
- 
diff --git a/multimedia/transcode/files/patch-filter_Makefile.in b/multimedia/transcode/files/patch-filter_Makefile.in
new file mode 100644
index 000000000000..c968fea50b05
--- /dev/null
+++ b/multimedia/transcode/files/patch-filter_Makefile.in
@@ -0,0 +1,30 @@
+--- filter/Makefile.in.orig
++++ filter/Makefile.in	Sat Feb 19 21:30:33 2005
+@@ -335,7 +335,7 @@
+ 	uninstall-recursive
+ ETAGS = etags
+ CTAGS = ctags
+-DIST_SUBDIRS = pp divxkey extsub resample test yuvdenoise ivtc \
++DIST_SUBDIRS = divxkey extsub resample test yuvdenoise ivtc \
+ 	tomsmocomp preview subtitler
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ A52_CFLAGS = @A52_CFLAGS@
+@@ -835,7 +835,6 @@
+ 
+ @HAVE_FREETYPE2_TRUE@@HAVE_LIBICONV_TRUE@@HAVE_LIBXPM_TRUE@@HAVE_XAW_SIMPLE_TRUE@ADD2 = subtitler
+ @HAVE_X11_FALSE@SUBDIRS = \
+-@HAVE_X11_FALSE@	pp \
+ @HAVE_X11_FALSE@	divxkey \
+ @HAVE_X11_FALSE@	extsub \
+ @HAVE_X11_FALSE@	resample \
+@@ -845,7 +844,6 @@
+ @HAVE_X11_FALSE@	$(F_TOMSMOCOMP)
+ 
+ @HAVE_X11_TRUE@SUBDIRS = \
+-@HAVE_X11_TRUE@	pp \
+ @HAVE_X11_TRUE@	divxkey \
+ @HAVE_X11_TRUE@	extsub \
+ @HAVE_X11_TRUE@	resample \
+--- transcode-1.0.0beta2.diff ends here ---
+
+
diff --git a/multimedia/transcode/files/patch-libvo_yuv2rgv.c b/multimedia/transcode/files/patch-libvo_yuv2rgv.c
new file mode 100644
index 000000000000..482b1c657f9f
--- /dev/null
+++ b/multimedia/transcode/files/patch-libvo_yuv2rgv.c
@@ -0,0 +1,11 @@
+--- libvo/yuv2rgb.c.orig	Wed Feb 23 05:08:14 2005
++++ libvo/yuv2rgb.c	Wed Feb 23 05:09:12 2005
+@@ -71,7 +71,7 @@
+ void yuv2rgb_init (int bpp, int mode) 
+ {
+     yuv2rgb = NULL;
+-#if defined(ARCH_X86) || defined(ARCH_X86_64)
++#if defined(ARCH_X86)
+     if ((yuv2rgb == NULL) && (vo_mm_accel & MM_ACCEL_X86_MMXEXT)) {
+ 	yuv2rgb = yuv2rgb_init_mmxext (bpp, mode);
+ 	if (yuv2rgb != NULL)
diff --git a/multimedia/transcode/pkg-descr b/multimedia/transcode/pkg-descr
index 917d57aee78a..664ca409ab68 100644
--- a/multimedia/transcode/pkg-descr
+++ b/multimedia/transcode/pkg-descr
@@ -18,4 +18,4 @@ library. It's modular concept is intended to provide flexibility
 and easy user extensibility to include other video/audio codecs or
 filetypes.
 
-WWW: http://www.theorie.physik.uni-goettingen.de/~ostreich/transcode/
+WWW: http://www.transcoding.org/
diff --git a/multimedia/transcode/pkg-plist b/multimedia/transcode/pkg-plist
index 1bee37824330..c87f106a8a23 100644
--- a/multimedia/transcode/pkg-plist
+++ b/multimedia/transcode/pkg-plist
@@ -3,24 +3,18 @@ bin/aviindex
 bin/avimerge
 bin/avisplit
 bin/avisync
-%%WITH_SUBRIP%%bin/pgm2txt
-%%WITH_SUBRIP%%bin/srttool
-%%WITH_SUBRIP%%bin/subtitle2pgm
-%%WITH_SUBRIP%%bin/subtitle2vobsub
 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
-%%WITH_LIBA52%%lib/transcode/a52_decore.so
 lib/transcode/af6_decore.so
 lib/transcode/export_ac3.so
 lib/transcode/export_af6.conf
@@ -30,24 +24,23 @@ lib/transcode/export_divx4.so
 lib/transcode/export_divx4raw.so
 lib/transcode/export_divx5.so
 lib/transcode/export_divx5raw.so
-lib/transcode/export_ffmpeg.so
-lib/transcode/export_jpg.so
-lib/transcode/export_lame.so
 %%WITH_LIBDV%%lib/transcode/export_dv.so
 %%WITH_LIBDV%%lib/transcode/export_dvraw.so
-%%WITH_LZO%%lib/transcode/export_lzo.so
 %%WITH_FAME%%lib/transcode/export_fame.so
+lib/transcode/export_ffmpeg.so
 %%WITH_IMAGEMAGICK%%lib/transcode/export_im.so
+lib/transcode/export_jpg.so
+lib/transcode/export_lame.so
+%%WITH_LZO%%lib/transcode/export_lzo.so
 lib/transcode/export_mjpeg.so
 lib/transcode/export_mp1e.so
-%%WITH_NASM%%lib/transcode/export_mpeg.so
-%%WITH_MJPEG%%lib/transcode/export_mpeg2enc.so
-%%WITH_MJPEG%%lib/transcode/export_mp2enc.so
-lib/transcode/export_net.so
+lib/transcode/export_mp2.so
+%%WITH_QUICKTIME%%lib/transcode/export_mov.so
 lib/transcode/export_null.so
 lib/transcode/export_ogg.so
 lib/transcode/export_pcm.so
 lib/transcode/export_ppm.so
+lib/transcode/export_pvn.so
 lib/transcode/export_raw.so
 lib/transcode/export_toolame.so
 lib/transcode/export_wav.so
@@ -55,11 +48,11 @@ lib/transcode/export_xvid.so
 lib/transcode/export_xvid2.so
 lib/transcode/export_xvid3.so
 lib/transcode/export_xvid4.so
-%%WITH_MJPEG%%lib/transcode/export_yuv4mpeg.so
 lib/transcode/filter_29to23.so
 lib/transcode/filter_32detect.so
 lib/transcode/filter_32drop.so
 lib/transcode/filter_aclip.so
+lib/transcode/filter_ascii.so
 lib/transcode/filter_astat.so
 lib/transcode/filter_clone.so
 %%WITH_IMAGEMAGICK%%lib/transcode/filter_compare.so
@@ -77,11 +70,14 @@ lib/transcode/filter_doublefps.so
 lib/transcode/filter_dnr.so
 lib/transcode/filter_extsub.so
 lib/transcode/filter_extsub2.so
+lib/transcode/filter_facemask.so
+lib/transcode/filter_fieldanalysis.so
 lib/transcode/filter_fields.so
 lib/transcode/filter_fps.so
 lib/transcode/filter_invert.so
 lib/transcode/filter_ivtc.so
 lib/transcode/filter_hqdn3d.so
+lib/transcode/filter_levels.so
 %%WITH_IMAGEMAGICK%%lib/transcode/filter_logo.so
 %%WITH_IMAGEMAGICK%%lib/transcode/filter_logoaway.so
 lib/transcode/filter_lowpass.so
@@ -91,9 +87,8 @@ lib/transcode/filter_msharpen.so
 lib/transcode/filter_nored.so
 lib/transcode/filter_normalize.so
 lib/transcode/filter_null.so
-%%WITH_SDL%%lib/transcode/filter_preview.so
-lib/transcode/filter_pp.so
 lib/transcode/filter_pv.so
+%%WITH_LIBDV%%lib/transcode/filter_preview.so
 lib/transcode/filter_resample.so
 lib/transcode/filter_skip.so
 lib/transcode/filter_slowmo.so
@@ -101,12 +96,13 @@ lib/transcode/filter_smartbob.so
 lib/transcode/filter_smartdeinter.so
 lib/transcode/filter_smartyuv.so
 lib/transcode/filter_smooth.so
-lib/transcode/filter_subtitler.so
+%%GCC3%%lib/transcode/filter_subtitler.so
 lib/transcode/filter_tc_audio.so
 lib/transcode/filter_tc_video.so
 lib/transcode/filter_test.so
 lib/transcode/filter_text.so
 lib/transcode/filter_testframe.so
+%%GCC2%%lib/transcode/filter_tomsmocomp.so
 lib/transcode/filter_unsharp.so
 lib/transcode/filter_whitebalance.so
 lib/transcode/filter_xsharpen.so
@@ -122,27 +118,28 @@ lib/transcode/import_avi.so
 lib/transcode/import_divx.so
 lib/transcode/import_dv.so
 lib/transcode/import_dvd.so
-%%WITH_IMAGEMAGICK%%lib/transcode/import_im.so
-%%WITH_IMAGEMAGICK%%lib/transcode/import_imlist.so
 lib/transcode/import_ffmpeg.so
 lib/transcode/import_fraps.so
+%%WITH_IMAGEMAGICK%%lib/transcode/import_im.so
+%%WITH_IMAGEMAGICK%%lib/transcode/import_imlist.so
 lib/transcode/import_lav.so
 %%WITH_LZO%%lib/transcode/import_lzo.so
 lib/transcode/import_mpeg2.so
-%%WITH_LAME%%lib/transcode/import_mp3.so
+lib/transcode/import_mp3.so
+%%WITH_QUICKTIME%%lib/transcode/import_mov.so
 lib/transcode/import_mplayer.so
-lib/transcode/import_net.so
 lib/transcode/import_null.so
 lib/transcode/import_nuv.so
 lib/transcode/import_nvrec.so
 lib/transcode/import_ogg.so
+lib/transcode/import_pvn.so
 lib/transcode/import_raw.so
 lib/transcode/import_rawlist.so
 lib/transcode/import_sh.so
 lib/transcode/import_vdrac3.so
 lib/transcode/import_vnc.so
 lib/transcode/import_vob.so
-%%WITH_LIBXML2%%lib/transcode/import_xml.so
+%%WITH_XML%%lib/transcode/import_xml.so
 lib/transcode/import_xvid.so
 lib/transcode/import_yuv.so
 lib/transcode/import_yuv4mpeg.so
@@ -152,8 +149,10 @@ lib/transcode/xvid2.cfg
 lib/transcode/xvid3.cfg
 lib/transcode/xvid4.cfg
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/DV-to-DVD-HOWTO.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.Inverse.Telecine.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.cluster
+%%PORTDOCS%%%%DOCSDIR%%/README.dv
 %%PORTDOCS%%%%DOCSDIR%%/README.filter.modfps
 %%PORTDOCS%%%%DOCSDIR%%/README.rip
 %%PORTDOCS%%%%DOCSDIR%%/README.sync
@@ -164,9 +163,11 @@ lib/transcode/xvid4.cfg
 %%PORTDOCS%%%%DOCSDIR%%/avi_comments.txt
 %%PORTDOCS%%%%DOCSDIR%%/clone.txt
 %%PORTDOCS%%%%DOCSDIR%%/export_ffmpeg.txt
+%%PORTDOCS%%%%DOCSDIR%%/export_mp2.txt
 %%PORTDOCS%%%%DOCSDIR%%/export_mpeg.txt
 %%PORTDOCS%%%%DOCSDIR%%/export_pvm.txt
 %%PORTDOCS%%%%DOCSDIR%%/export-API.txt
+%%PORTDOCS%%%%DOCSDIR%%/faq
 %%PORTDOCS%%%%DOCSDIR%%/filter_dnr.txt
 %%PORTDOCS%%%%DOCSDIR%%/filter_logo.txt
 %%PORTDOCS%%%%DOCSDIR%%/filter_logoaway.txt
@@ -231,12 +232,16 @@ lib/transcode/xvid4.cfg
 %%PORTDOCS%%%%DOCSDIR%%/html/subtitles.html
 %%PORTDOCS%%%%DOCSDIR%%/html/table.php
 %%PORTDOCS%%%%DOCSDIR%%/html/tc.png
+%%PORTDOCS%%%%DOCSDIR%%/ibp_support.txt
 %%PORTDOCS%%%%DOCSDIR%%/import-API.txt
 %%PORTDOCS%%%%DOCSDIR%%/import-xml.txt
 %%PORTDOCS%%%%DOCSDIR%%/import_nvrec.txt
 %%PORTDOCS%%%%DOCSDIR%%/import_v4l2.txt
+%%PORTDOCS%%%%DOCSDIR%%/import_yuv.txt
 %%PORTDOCS%%%%DOCSDIR%%/pvm.cfg
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/README-0.6.13
 %%PORTDOCS%%%%DOCSDIR%%/template.cfg.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/release-notes
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/transcode