Move graphics/transcode to multimedia/transcode.

22 files changed, 5 insertions, 809 deletions

diff --git a/graphics/Makefile b/graphics/Makefile
index 6513d858297..af63c8a6290 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.312 2004/05/10 13:43:43 wiz Exp $
+# $NetBSD: Makefile,v 1.313 2004/05/10 13:48:31 wiz Exp $
 #
 
 COMMENT=	Graphics tools and libraries
@@ -230,7 +230,6 @@ SUBDIR+=	tcm
 SUBDIR+=	tgif
 SUBDIR+=	tiff
 SUBDIR+=	tkpiechart
-SUBDIR+=	transcode
 SUBDIR+=	tuxpaint
 SUBDIR+=	tuxpaint-stamps
 SUBDIR+=	urt
diff --git a/graphics/transcode/DESCR b/graphics/transcode/DESCR
deleted file mode 100644
index 46833d2b385..00000000000
--- a/graphics/transcode/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-transcode is a command line video-stream processing tool.
-It supports elementary video and audio frame transformations.
-Some example modules are included to enable import of MPEG-1/2,
-Digital Video, and other formats.  It also includes export
-modules for writing to AVI files with DivX, OpenDivX, XviD,
-Digital Video or other codecs.  Direct DVD transcoding is also
-supported.  A set of tools is available to extract and decode
-the sources into raw video/audio streams for import and to
-enable post-processing of AVI files.
diff --git a/graphics/transcode/Makefile b/graphics/transcode/Makefile
deleted file mode 100644
index e31c663ed41..00000000000
--- a/graphics/transcode/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-# $NetBSD: Makefile,v 1.32 2004/04/12 23:17:46 salo Exp $
-
-DISTNAME=	transcode-0.6.12
-PKGREVISION=	1
-CATEGORIES=	graphics
-MASTER_SITES=	http://www.zebra.fh-weingarten.de/~transcode/pre/
-
-MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://www.zebra.fh-weingarten.de/~transcode/
-COMMENT=	Command line video-stream processing tool
-
-BUILD_DEPENDS+=		nasm>=0.98.36:../../devel/nasm
-
-USE_BUILDLINK3=		yes
-USE_GNU_TOOLS+=		make
-
-USE_LIBTOOL=		yes
-SHLIBTOOL_OVERRIDE=	libtool
-
-.include "../../mk/bsd.prefs.mk"
-
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--disable-qt
-# when libmpeg3 is a shlib.
-CONFIGURE_ARGS+=	--without-libmpeg3
-CONFIGURE_ARGS+=	--with-default-xvid=xvid4
-
-.if exists(${X11BASE}/lib/libXv.so)
-PLIST_SUBST+=		FILTERPV=filter_pv.so
-.else
-PLIST_SUBST+=		FILTERPV=filter_pv.a
-.endif
-
-# this used to operate on acinclude.m4 and run aclocal, but running
-# aclocal here breaks due to missing DLFCN checking
-post-patch:
-	cd ${WRKSRC} && \
-	${SED} "s|/usr/local|${PREFIX}|g; s|include/libmpeg3|include/mpeg3|g; s|-ldl -lm|-lm|g" configure > configure.new && \
-	${MV} configure.new configure && ${CHMOD} a+x configure
-	-cd ${WRKSRC} && ${AUTOMAKE}
-
-post-install:
-	${LN} -sf ../libxvidcore.so.4.0  ${PREFIX}/lib/transcode/libxvidcore.so.4
-
-.include "../../archivers/liblzo/buildlink3.mk"
-.include "../../audio/liba52/buildlink3.mk"
-.include "../../audio/lame/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../devel/libmpeg3/buildlink3.mk"
-.include "../../graphics/ImageMagick/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-# depends on a much later avifile than the one in pkgsrc
-#.include "../../multimedia/avifile/buildlink3.mk"
-.include "../../multimedia/libdvdread/buildlink3.mk"
-.include "../../multimedia/libogg/buildlink3.mk"
-.include "../../multimedia/mjpegtools/buildlink3.mk"
-.include "../../multimedia/xvidcore/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/automake.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/transcode/PLIST b/graphics/transcode/PLIST
deleted file mode 100644
index dbfed728498..00000000000
--- a/graphics/transcode/PLIST
+++ /dev/null
@@ -1,361 +0,0 @@
-@comment $NetBSD: PLIST,v 1.11 2004/03/28 20:09:07 mycroft Exp $
-bin/avifix
-bin/aviindex
-bin/avimerge
-bin/avisplit
-bin/avisync
-bin/tccat
-bin/tcdecode
-bin/tcdemux
-bin/tcextract
-bin/tcmodinfo
-bin/tcmp3cut
-bin/tcmplex
-bin/tcprobe
-bin/tcrequant
-bin/tcscan
-bin/tcxmlcheck
-bin/tcxpm2rgb
-bin/transcode
-lib/transcode/a52_decore.la
-lib/transcode/a52_decore.so
-lib/transcode/af6_decore.la
-lib/transcode/af6_decore.so
-lib/transcode/export_ac3.la
-lib/transcode/export_ac3.so
-lib/transcode/export_af6.conf
-lib/transcode/export_debugppm.la
-lib/transcode/export_debugppm.so
-lib/transcode/export_divx4.la
-lib/transcode/export_divx4.so
-lib/transcode/export_divx4raw.la
-lib/transcode/export_divx4raw.so
-lib/transcode/export_divx5.la
-lib/transcode/export_divx5.so
-lib/transcode/export_divx5raw.la
-lib/transcode/export_divx5raw.so
-lib/transcode/export_ffmpeg.la
-lib/transcode/export_ffmpeg.so
-lib/transcode/export_im.la
-lib/transcode/export_im.so
-lib/transcode/export_jpg.la
-lib/transcode/export_jpg.so
-lib/transcode/export_lame.la
-lib/transcode/export_lame.so
-lib/transcode/export_lzo.la
-lib/transcode/export_lzo.so
-lib/transcode/export_mjpeg.la
-lib/transcode/export_mjpeg.so
-lib/transcode/export_mp2enc.la
-lib/transcode/export_mp2enc.so
-lib/transcode/export_mp1e.la
-lib/transcode/export_mp1e.so
-lib/transcode/export_mpeg.a
-lib/transcode/export_mpeg.la
-lib/transcode/export_mpeg2enc.a
-lib/transcode/export_mpeg2enc.la
-lib/transcode/export_net.la
-lib/transcode/export_net.so
-lib/transcode/export_null.la
-lib/transcode/export_null.so
-lib/transcode/export_ogg.la
-lib/transcode/export_ogg.so
-lib/transcode/export_pcm.la
-lib/transcode/export_pcm.so
-lib/transcode/export_ppm.la
-lib/transcode/export_ppm.so
-lib/transcode/export_raw.la
-lib/transcode/export_raw.so
-lib/transcode/export_toolame.la
-lib/transcode/export_toolame.so
-lib/transcode/export_wav.la
-lib/transcode/export_wav.so
-lib/transcode/export_xvid.so
-lib/transcode/export_xvid2.la
-lib/transcode/export_xvid2.so
-lib/transcode/export_xvid3.la
-lib/transcode/export_xvid3.so
-lib/transcode/export_xvid4.la
-lib/transcode/export_xvid4.so
-lib/transcode/export_yuv4mpeg.a
-lib/transcode/export_yuv4mpeg.la
-lib/transcode/filter_29to23.la
-lib/transcode/filter_29to23.so
-lib/transcode/filter_32detect.la
-lib/transcode/filter_32detect.so
-lib/transcode/filter_32drop.la
-lib/transcode/filter_32drop.so
-lib/transcode/filter_aclip.la
-lib/transcode/filter_aclip.so
-lib/transcode/filter_astat.la
-lib/transcode/filter_astat.so
-lib/transcode/filter_clone.la
-lib/transcode/filter_clone.so
-lib/transcode/filter_compare.la
-lib/transcode/filter_compare.so
-lib/transcode/filter_control.la
-lib/transcode/filter_control.so
-lib/transcode/filter_cpaudio.la
-lib/transcode/filter_cpaudio.so
-lib/transcode/filter_cshift.la
-lib/transcode/filter_cshift.so
-lib/transcode/filter_cut.la
-lib/transcode/filter_cut.so
-lib/transcode/filter_decimate.la
-lib/transcode/filter_decimate.so
-lib/transcode/filter_denoise3d.la
-lib/transcode/filter_denoise3d.so
-lib/transcode/filter_detectclipping.la
-lib/transcode/filter_detectclipping.so
-lib/transcode/filter_detectsilence.la
-lib/transcode/filter_detectsilence.so
-lib/transcode/filter_dilyuvmmx.la
-lib/transcode/filter_dilyuvmmx.so
-lib/transcode/filter_divxkey.la
-lib/transcode/filter_divxkey.so
-lib/transcode/filter_dnr.la
-lib/transcode/filter_dnr.so
-lib/transcode/filter_doublefps.la
-lib/transcode/filter_doublefps.so
-lib/transcode/filter_extsub.la
-lib/transcode/filter_extsub.so
-lib/transcode/filter_extsub2.la
-lib/transcode/filter_extsub2.so
-lib/transcode/filter_fields.la
-lib/transcode/filter_fields.so
-lib/transcode/filter_fps.la
-lib/transcode/filter_fps.so
-lib/transcode/filter_hqdn3d.la
-lib/transcode/filter_hqdn3d.so
-lib/transcode/filter_invert.la
-lib/transcode/filter_invert.so
-lib/transcode/filter_ivtc.la
-lib/transcode/filter_ivtc.so
-lib/transcode/filter_list.awk
-lib/transcode/filter_logo.la
-lib/transcode/filter_logo.so
-lib/transcode/filter_logoaway.la
-lib/transcode/filter_logoaway.so
-lib/transcode/filter_lowpass.la
-lib/transcode/filter_lowpass.so
-lib/transcode/filter_mask.la
-lib/transcode/filter_mask.so
-lib/transcode/filter_modfps.la
-lib/transcode/filter_modfps.so
-lib/transcode/filter_msharpen.la
-lib/transcode/filter_msharpen.so
-lib/transcode/filter_nored.la
-lib/transcode/filter_nored.so
-lib/transcode/filter_normalize.la
-lib/transcode/filter_normalize.so
-lib/transcode/filter_null.la
-lib/transcode/filter_null.so
-lib/transcode/filter_pp.la
-lib/transcode/filter_pp.so
-lib/transcode/${FILTERPV}
-lib/transcode/filter_pv.la
-lib/transcode/filter_resample.la
-lib/transcode/filter_resample.so
-lib/transcode/filter_skip.la
-lib/transcode/filter_skip.so
-lib/transcode/filter_slowmo.la
-lib/transcode/filter_slowmo.so
-lib/transcode/filter_smartbob.la
-lib/transcode/filter_smartbob.so
-lib/transcode/filter_smartdeinter.la
-lib/transcode/filter_smartdeinter.so
-lib/transcode/filter_smartyuv.la
-lib/transcode/filter_smartyuv.so
-lib/transcode/filter_smooth.la
-lib/transcode/filter_smooth.so
-lib/transcode/filter_subtitler.la
-lib/transcode/filter_subtitler.so
-lib/transcode/filter_tc_audio.la
-lib/transcode/filter_tc_audio.so
-lib/transcode/filter_tc_video.la
-lib/transcode/filter_tc_video.so
-lib/transcode/filter_test.a
-lib/transcode/filter_test.la
-lib/transcode/filter_testframe.la
-lib/transcode/filter_testframe.so
-lib/transcode/filter_unsharp.la
-lib/transcode/filter_unsharp.so
-lib/transcode/filter_videocore.la
-lib/transcode/filter_videocore.so
-lib/transcode/filter_whitebalance.la
-lib/transcode/filter_whitebalance.so
-lib/transcode/filter_xsharpen.la
-lib/transcode/filter_xsharpen.so
-lib/transcode/filter_yuvdenoise.la
-lib/transcode/filter_yuvdenoise.so
-lib/transcode/filter_yuvmedian.la
-lib/transcode/filter_yuvmedian.so
-lib/transcode/filter_yuy2toyv12.la
-lib/transcode/filter_yuy2toyv12.so
-lib/transcode/import_ac3.la
-lib/transcode/import_ac3.so
-lib/transcode/import_avi.la
-lib/transcode/import_avi.so
-lib/transcode/import_divx.la
-lib/transcode/import_divx.so
-lib/transcode/import_dv.la
-lib/transcode/import_dv.so
-lib/transcode/import_dvd.la
-lib/transcode/import_dvd.so
-lib/transcode/import_ffmpeg.la
-lib/transcode/import_ffmpeg.so
-lib/transcode/import_fraps.la
-lib/transcode/import_fraps.so
-lib/transcode/import_im.la
-lib/transcode/import_im.so
-lib/transcode/import_imlist.la
-lib/transcode/import_imlist.so
-lib/transcode/import_lav.la
-lib/transcode/import_lav.so
-lib/transcode/import_lzo.la
-lib/transcode/import_lzo.so
-lib/transcode/import_mp3.la
-lib/transcode/import_mp3.so
-lib/transcode/import_mpeg2.la
-lib/transcode/import_mpeg2.so
-lib/transcode/import_mplayer.la
-lib/transcode/import_mplayer.so
-lib/transcode/import_net.la
-lib/transcode/import_net.so
-lib/transcode/import_null.la
-lib/transcode/import_null.so
-lib/transcode/import_nuv.la
-lib/transcode/import_nuv.so
-lib/transcode/import_nvrec.la
-lib/transcode/import_nvrec.so
-lib/transcode/import_ogg.la
-lib/transcode/import_ogg.so
-lib/transcode/import_raw.la
-lib/transcode/import_raw.so
-lib/transcode/import_rawlist.la
-lib/transcode/import_rawlist.so
-lib/transcode/import_sh.la
-lib/transcode/import_sh.so
-lib/transcode/import_vdrac3.la
-lib/transcode/import_vdrac3.so
-lib/transcode/import_vnc.la
-lib/transcode/import_vnc.so
-lib/transcode/import_vob.la
-lib/transcode/import_vob.so
-lib/transcode/import_xml.la
-lib/transcode/import_xml.so
-lib/transcode/import_xvid.la
-lib/transcode/import_xvid.so
-lib/transcode/import_yuv.la
-lib/transcode/import_yuv.so
-lib/transcode/import_yuv4mpeg.la
-lib/transcode/import_yuv4mpeg.so
-lib/transcode/libxvidcore.so.4
-lib/transcode/parse_csv.awk
-lib/transcode/xvid2.cfg
-lib/transcode/xvid3.cfg
-lib/transcode/xvid4.cfg
-man/man1/avifix.1
-man/man1/aviindex.1
-man/man1/avimerge.1
-man/man1/avisplit.1
-man/man1/avisync.1
-man/man1/tccat.1
-man/man1/tcdecode.1
-man/man1/tcdemux.1
-man/man1/tcextract.1
-man/man1/tcmodinfo.1
-man/man1/tcprobe.1
-man/man1/tcpvmexportd.1
-man/man1/tcscan.1
-man/man1/tcxmlcheck.1
-man/man1/transcode.1
-share/doc/transcode/ChangeLog
-share/doc/transcode/OPTIMIZERS
-share/doc/transcode/README.Inverse.Telecine.txt
-share/doc/transcode/README.cluster
-share/doc/transcode/README.filter.modfps
-share/doc/transcode/README.rip
-share/doc/transcode/README.sync
-share/doc/transcode/README.vcd
-share/doc/transcode/README.xvid-credits
-share/doc/transcode/architecture.txt
-share/doc/transcode/avi_comments.txt
-share/doc/transcode/clone.txt
-share/doc/transcode/export-API.txt
-share/doc/transcode/export_ffmpeg.txt
-share/doc/transcode/export_mpeg.txt
-share/doc/transcode/export_pvm.txt
-share/doc/transcode/filter-API.txt
-share/doc/transcode/filter-socket.txt
-share/doc/transcode/filter_dnr.txt
-share/doc/transcode/filter_logo.txt
-share/doc/transcode/filter_logoaway.txt
-share/doc/transcode/filter_text.txt
-share/doc/transcode/filter_yuvdenoise.txt
-share/doc/transcode/framerate.txt
-share/doc/transcode/html/about.html
-share/doc/transcode/html/anim.html
-share/doc/transcode/html/cluster_guide.txt
-share/doc/transcode/html/core.html
-share/doc/transcode/html/dv.html
-share/doc/transcode/html/dvd.html
-share/doc/transcode/html/export_af6.html
-share/doc/transcode/html/export_divx.html
-share/doc/transcode/html/export_divx4.php
-share/doc/transcode/html/export_divx5.php
-share/doc/transcode/html/export_fame.php
-share/doc/transcode/html/export_iv50.html
-share/doc/transcode/html/export_null.html
-share/doc/transcode/html/export_ogg.php
-share/doc/transcode/html/export_opendivx.php
-share/doc/transcode/html/export_raw.html
-share/doc/transcode/html/export_xvid.php
-share/doc/transcode/html/faq.html
-share/doc/transcode/html/filter.html
-share/doc/transcode/html/import_ac3.html
-share/doc/transcode/html/import_avi.html
-share/doc/transcode/html/import_dv.html
-share/doc/transcode/html/import_dvd.html
-share/doc/transcode/html/import_mp3.html
-share/doc/transcode/html/import_mpeg2.html
-share/doc/transcode/html/import_mpeg3.html
-share/doc/transcode/html/import_null.html
-share/doc/transcode/html/import_nuv.html
-share/doc/transcode/html/import_ogg.php
-share/doc/transcode/html/import_raw.html
-share/doc/transcode/html/import_vob.html
-share/doc/transcode/html/import_yuv4mpeg.html
-share/doc/transcode/html/index.html
-share/doc/transcode/html/intro.html
-share/doc/transcode/html/mes0-00000.png
-share/doc/transcode/html/mes4-00000.png
-share/doc/transcode/html/mes5-00000.png
-share/doc/transcode/html/mes6-00000.png
-share/doc/transcode/html/mes7-00000.png
-share/doc/transcode/html/misc.html
-share/doc/transcode/html/modules.html
-share/doc/transcode/html/mpeg.html
-share/doc/transcode/html/new.png
-share/doc/transcode/html/options.html
-share/doc/transcode/html/other.html
-share/doc/transcode/html/post.html
-share/doc/transcode/html/pre.html
-share/doc/transcode/html/smart.html
-share/doc/transcode/html/sorry.html
-share/doc/transcode/html/sub0-00000.png
-share/doc/transcode/html/sub1-00000.png
-share/doc/transcode/html/sub2-00000.png
-share/doc/transcode/html/sub3-00000.png
-share/doc/transcode/html/subtitles.html
-share/doc/transcode/html/table.php
-share/doc/transcode/html/tc.png
-share/doc/transcode/import-API.txt
-share/doc/transcode/import-xml.txt
-share/doc/transcode/import_nvrec.txt
-share/doc/transcode/import_v4l2.txt
-share/doc/transcode/pvm.cfg
-share/doc/transcode/template.cfg.txt
-@dirrm share/doc/transcode/html
-@dirrm share/doc/transcode
-@dirrm lib/transcode
diff --git a/graphics/transcode/distinfo b/graphics/transcode/distinfo
deleted file mode 100644
index 7376a067141..00000000000
--- a/graphics/transcode/distinfo
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: distinfo,v 1.6 2004/03/28 20:09:07 mycroft Exp $
-
-SHA1 (transcode-0.6.12.tar.gz) = 3d9b223f804253a6a76d9645feb86609b0a2499a
-Size (transcode-0.6.12.tar.gz) = 3454807 bytes
-SHA1 (patch-ad) = dc3777cbfd86eba3d62c0bfa947e9877c6c44fea
-SHA1 (patch-ae) = f49a155b84edbeb3c93705e6ab15e80f48adbdb1
-SHA1 (patch-af) = 88d2209445c4011f400ae2dd79d9e285aecd3f0a
-SHA1 (patch-ag) = 23fbedeb2db586af0afee74785013a64b9562c4e
-SHA1 (patch-ah) = db21f19742abfb6db70b4c77371a8da79cc8c7d0
-SHA1 (patch-ai) = 86f49f23d8af5320be93c8dc475b53b906dff10f
-SHA1 (patch-aj) = f62d0e1e23868b290221cffc367c3f0a5cc5cbc6
-SHA1 (patch-ak) = add9a293ddb73e3f82982d2021a6310f742e45f1
-SHA1 (patch-al) = 797bd770565263452d47e2f4d8942974ef153553
-SHA1 (patch-an) = ee416096f1fc6b8ff74f80f93cc5e40d4ad49223
-SHA1 (patch-ao) = e6f1006e5aa4663259e1e2fd2355dbfc32bda8f5
-SHA1 (patch-ap) = fb393e3400423a5d4225fb31afabfbcaa265a35b
-SHA1 (patch-aq) = 3a8bd7888460880767204239ac783bff3d6814a9
-SHA1 (patch-ar) = df0bf12044741c586b0168ead6aa0fa71a23aea1
-SHA1 (patch-as) = d673ec6009d96f55afcf8382f834edc2cadd2ae3
diff --git a/graphics/transcode/patches/patch-ad b/graphics/transcode/patches/patch-ad
deleted file mode 100644
index 7af690ba392..00000000000
--- a/graphics/transcode/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2003/06/23 07:09:32 mrg Exp $
-
-diff -rcp filter/yuvdenoise/mjpeg_types.h filter/yuvdenoise/mjpeg_types.h
-*** filter/yuvdenoise/mjpeg_types.h	Fri Mar 14 22:12:41 2003
---- filter/yuvdenoise/mjpeg_types.h	Mon Jun  9 17:48:25 2003
-*************** typedef u_int64_t uint64_t;
-*** 58,64 ****
-  /* fixme */
-  #endif /* HAVE_STDINT_H */
-  
-! #if defined(__FreeBSD__)
-  #include <sys/types.h> /* FreeBSD - ssize_t */
-  #endif
-  
---- 58,64 ----
-  /* fixme */
-  #endif /* HAVE_STDINT_H */
-  
-! #if defined(__FreeBSD__)|| defined(__NetBSD__)
-  #include <sys/types.h> /* FreeBSD - ssize_t */
-  #endif
-  
diff --git a/graphics/transcode/patches/patch-ae b/graphics/transcode/patches/patch-ae
deleted file mode 100644
index 7884b98b7bd..00000000000
--- a/graphics/transcode/patches/patch-ae
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2003/06/23 07:09:32 mrg Exp $
-
-diff -rcp import/import_divx.c import/import_divx.c
-*** import/import_divx.c	Mon May 12 16:46:50 2003
---- import/import_divx.c	Mon Jun  9 17:46:50 2003
-*************** static unsigned char *bufalloc(size_t si
-*** 158,164 ****
-  }
-  
-  static int divx_init(char *path) {
-! #ifdef __FreeBSD__
-      const
-  #endif    
-      char *error;
---- 158,164 ----
-  }
-  
-  static int divx_init(char *path) {
-! #if defined(__FreeBSD__) || defined(__NetBSD__)
-      const
-  #endif    
-      char *error;
diff --git a/graphics/transcode/patches/patch-af b/graphics/transcode/patches/patch-af
deleted file mode 100644
index ec876669f70..00000000000
--- a/graphics/transcode/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.2 2004/03/28 20:09:07 mycroft Exp $
-
---- import/import_xvid.c	2004-03-26 19:12:32.000000000 +0000
-+++ import/import_xvid.c	2004-03-26 19:12:42.000000000 +0000
-@@ -67,7 +67,7 @@
- #define XVID_SHARED_LIB_NAME "libxvidcore.so"
- 
- static int xvid2_init(char *path) {
--#if defined(__FreeBSD__) || defined(__APPLE__)
-+#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__NetBSD__)
- 	const
- #endif    
- 		char *error;
diff --git a/graphics/transcode/patches/patch-ag b/graphics/transcode/patches/patch-ag
deleted file mode 100644
index 27d6cd32c89..00000000000
--- a/graphics/transcode/patches/patch-ag
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2003/06/23 07:09:32 mrg Exp $
-
-diff -rcp import/iodump.c import/iodump.c
-*** import/iodump.c	Wed Apr  2 19:03:05 2003
---- import/iodump.c	Mon Jun  9 17:47:23 2003
-***************
-*** 37,43 ****
-  #include "dvd_reader.h"
-  #endif
-  
-! #if defined(__bsdi__) || defined(__FreeBSD__) || defined(__APPLE__)
-  typedef	off_t off64_t;
-  #define	lseek64 lseek
-  #endif
---- 37,43 ----
-  #include "dvd_reader.h"
-  #endif
-  
-! #if defined(__bsdi__) || defined(__FreeBSD__) || defined(__APPLE__) || defined(__NetBSD__)
-  typedef	off_t off64_t;
-  #define	lseek64 lseek
-  #endif
diff --git a/graphics/transcode/patches/patch-ah b/graphics/transcode/patches/patch-ah
deleted file mode 100644
index 9cc6f063bf0..00000000000
--- a/graphics/transcode/patches/patch-ah
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 2003/06/23 07:09:32 mrg Exp $
-
-diff -rcp import/nuv/rtjpeg_aud_plugin.c import/nuv/rtjpeg_aud_plugin.c
-*** import/nuv/rtjpeg_aud_plugin.c	Tue Apr  8 20:50:11 2003
---- import/nuv/rtjpeg_aud_plugin.c	Mon Jun  9 17:47:33 2003
-*************** int rtjpeg_aud_open(char *tplorg)
-*** 108,114 ****
-      regions[0].end   = -1;
-    }
-  
-! #if defined(__FreeBSD__) || defined(__APPLE__) 
-    rtjpeg_aud_file=open(tplorg, O_RDONLY);
-  #else 
-    rtjpeg_aud_file=open(tplorg, O_RDONLY|O_LARGEFILE);
---- 108,114 ----
-      regions[0].end   = -1;
-    }
-  
-! #if defined(__FreeBSD__) || defined(__APPLE__) || defined(__NetBSD__)
-    rtjpeg_aud_file=open(tplorg, O_RDONLY);
-  #else 
-    rtjpeg_aud_file=open(tplorg, O_RDONLY|O_LARGEFILE);
diff --git a/graphics/transcode/patches/patch-ai b/graphics/transcode/patches/patch-ai
deleted file mode 100644
index 984fe91d093..00000000000
--- a/graphics/transcode/patches/patch-ai
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 2003/06/23 07:09:32 mrg Exp $
-
-diff -rcp import/nuv/rtjpeg_vid_plugin.c import/nuv/rtjpeg_vid_plugin.c
-*** import/nuv/rtjpeg_vid_plugin.c	Tue Apr  8 20:50:11 2003
---- import/nuv/rtjpeg_vid_plugin.c	Mon Jun  9 17:47:40 2003
-*************** int rtjpeg_vid_open(char *tplorg)
-*** 108,114 ****
-      regions[0].end   = -1;
-    }
-  
-! #if defined(__FreeBSD__) || defined(__APPLE__) 
-    rtjpeg_vid_file=open(tplorg, O_RDONLY);
-  #else 
-    rtjpeg_vid_file=open(tplorg, O_RDONLY|O_LARGEFILE);
---- 108,114 ----
-      regions[0].end   = -1;
-    }
-  
-! #if defined(__FreeBSD__) || defined(__APPLE__) || defined(__NetBSD__)
-    rtjpeg_vid_file=open(tplorg, O_RDONLY);
-  #else 
-    rtjpeg_vid_file=open(tplorg, O_RDONLY|O_LARGEFILE);
diff --git a/graphics/transcode/patches/patch-aj b/graphics/transcode/patches/patch-aj
deleted file mode 100644
index f15e2566f96..00000000000
--- a/graphics/transcode/patches/patch-aj
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aj,v 1.1.1.1 2003/06/23 07:09:32 mrg Exp $
-
-diff -rcp src/dl_loader.c src/dl_loader.c
-*** src/dl_loader.c	Wed Apr 30 18:14:28 2003
---- src/dl_loader.c	Mon Jun  9 17:45:34 2003
-*************** int tca_import(int opt, void *para1, voi
-*** 128,134 ****
-  
-  void *load_module(char *mod_name, int mode)
-  {
-! #if defined(__FreeBSD__) || defined (__APPLE__)
-    const
-  #endif  
-    char *error;
---- 128,134 ----
-  
-  void *load_module(char *mod_name, int mode)
-  {
-! #if defined(__FreeBSD__) || defined (__APPLE__) || defined(__NetBSD__)
-    const
-  #endif  
-    char *error;
diff --git a/graphics/transcode/patches/patch-ak b/graphics/transcode/patches/patch-ak
deleted file mode 100644
index 100752455ef..00000000000
--- a/graphics/transcode/patches/patch-ak
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ak,v 1.1.1.1 2003/06/23 07:09:32 mrg Exp $
-
-diff -rcp src/filter.c src/filter.c
-*** src/filter.c	Mon May 12 05:03:00 2003
---- src/filter.c	Mon Jun  9 17:45:39 2003
-*************** int filter_unquote_options(char *options
-*** 127,133 ****
-  }
-  
-  int load_plugin(char *path) {
-! #if defined(__FreeBSD__) || defined (__APPLE__)
-    const
-  #endif    
-    char *error;
---- 127,133 ----
-  }
-  
-  int load_plugin(char *path) {
-! #if defined(__FreeBSD__) || defined (__APPLE__) || defined(__NetBSD__)
-    const
-  #endif    
-    char *error;
diff --git a/graphics/transcode/patches/patch-al b/graphics/transcode/patches/patch-al
deleted file mode 100644
index bc946383d18..00000000000
--- a/graphics/transcode/patches/patch-al
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-al,v 1.1.1.1 2003/06/23 07:09:32 mrg Exp $
-
-diff -rcp src/iodir.c src/iodir.c
-*** src/iodir.c	Sun Mar  9 00:42:49 2003
---- src/iodir.c	Mon Jun  9 17:45:31 2003
-***************
-*** 25,31 ****
-  #include <dirent.h>
-  #include "ioaux.h"
-  
-! #if defined(__bsdi__) || defined(__FreeBSD__)
-  typedef	off_t off64_t;
-  #define	lseek64 lseek
-  #endif
---- 25,31 ----
-  #include <dirent.h>
-  #include "ioaux.h"
-  
-! #if defined(__bsdi__) || defined(__FreeBSD__) || defined(__NetBSD__)
-  typedef	off_t off64_t;
-  #define	lseek64 lseek
-  #endif
diff --git a/graphics/transcode/patches/patch-an b/graphics/transcode/patches/patch-an
deleted file mode 100644
index 523f60eb289..00000000000
--- a/graphics/transcode/patches/patch-an
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-an,v 1.1.1.1 2003/06/23 07:09:32 mrg Exp $
-
-diff -rcp tools/tcmodinfo.c tools/tcmodinfo.c
-*** tools/tcmodinfo.c	Mon May 12 19:44:12 2003
---- tools/tcmodinfo.c	Mon Jun  9 17:48:49 2003
-*************** void tc_error(char *string)
-*** 102,108 ****
-  
-  void *load_module(char *mod_name, char *mod_path, int mode)
-  {
-! #if defined(__FreeBSD__) || defined (__APPLE__)
-    const
-  #endif  
-    char *error;
---- 102,108 ----
-  
-  void *load_module(char *mod_name, char *mod_path, int mode)
-  {
-! #if defined(__FreeBSD__) || defined (__APPLE__) || defined(__NetBSD__)
-    const
-  #endif  
-    char *error;
-*************** void *load_module(char *mod_name, char *
-*** 186,192 ****
-  
-  
-  int load_plugin(char *path, int id) {
-! #if defined(__FreeBSD__) || defined(__APPLE__)
-    const
-  #endif    
-    char *error;
---- 186,192 ----
-  
-  
-  int load_plugin(char *path, int id) {
-! #if defined(__FreeBSD__) || defined(__APPLE__) || defined(__NetBSD__)
-    const
-  #endif    
-    char *error;
diff --git a/graphics/transcode/patches/patch-ao b/graphics/transcode/patches/patch-ao
deleted file mode 100644
index 85a59c0ceae..00000000000
--- a/graphics/transcode/patches/patch-ao
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ao,v 1.2 2004/03/28 20:09:07 mycroft Exp $
-
---- avilib/Makefile.am	2004-03-26 19:14:20.000000000 +0000
-+++ avilib/Makefile.am	2004-03-26 19:14:30.000000000 +0000
-@@ -3,12 +3,12 @@
- AUTOMAKE_OPTIONS = 1.3 foreign
- DEFAULT_INCLUDES = -I$(top_srcdir) -I$(srcdir) -I$(top_builddir) -I.
- 
--noinst_LIBRARIES = libavi.a
-+noinst_LTLIBRARIES = libavi.la
- 
- INCLUDES = -I./
- 
- CFLAGS=-funroll-loops -ffast-math -DLINUX -Wall @CFLAGS@
--libavi_a_SOURCES = avilib.c avidump.c avimisc.c
-+libavi_la_SOURCES = avilib.c avidump.c avimisc.c
- 
- EXTRA_DIST = avilib.h README.avilib os.h
- 
diff --git a/graphics/transcode/patches/patch-ap b/graphics/transcode/patches/patch-ap
deleted file mode 100644
index ebc8ab5fd19..00000000000
--- a/graphics/transcode/patches/patch-ap
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ap,v 1.3 2004/03/28 20:09:07 mycroft Exp $
-
---- ffmpeg/libavcodec/Makefile.am	2004-03-26 19:15:46.000000000 +0000
-+++ ffmpeg/libavcodec/Makefile.am	2004-03-26 19:15:58.000000000 +0000
-@@ -34,9 +34,9 @@
- 
- AM_CFLAGS = -O2 -g -Wall -ffast-math $(ALTIVEC) $(X86) $(MMX) -DHAVE_AV_CONFIG_H -D_GNU_SOURCE --include=$(top_srcdir)/ffmpeg/av_config.h
- 
--noinst_LIBRARIES = libtcavcodec.a
-+noinst_LTLIBRARIES = libtcavcodec.la
- 
--libtcavcodec_a_SOURCES = \
-+libtcavcodec_la_SOURCES = \
-       common.c utils.c mem.c allcodecs.c \
-       mpegvideo.c jrevdct.c jfdctfst.c jfdctint.c \
-       mpegaudio.c ac3enc.c mjpeg.c resample.c dsputil.c \
diff --git a/graphics/transcode/patches/patch-aq b/graphics/transcode/patches/patch-aq
deleted file mode 100644
index 0db3a078422..00000000000
--- a/graphics/transcode/patches/patch-aq
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aq,v 1.2 2004/03/28 20:09:07 mycroft Exp $
-
---- libac3/Makefile.am	2004-03-26 19:16:37.000000000 +0000
-+++ libac3/Makefile.am	2004-03-26 19:16:44.000000000 +0000
-@@ -4,9 +4,9 @@
- 
- CFLAGS = -O3 -funroll-loops -ffast-math -DLINUX -fPIC -DPIC @CFLAGS@
- 
--noinst_LIBRARIES = libac3_tc.a
-+noinst_LTLIBRARIES = libac3_tc.la
- 
--libac3_tc_a_SOURCES = bitstream.c decode.c imdct.c coeff.c exponent.c stats.c\
-+libac3_tc_la_SOURCES = bitstream.c decode.c imdct.c coeff.c exponent.c stats.c\
- 	bit_allocate.c  parse.c crc.c debug.c rematrix.c downmix.c dither.c \
- 	sanity_check.c
- 
diff --git a/graphics/transcode/patches/patch-ar b/graphics/transcode/patches/patch-ar
deleted file mode 100644
index 779fe642f75..00000000000
--- a/graphics/transcode/patches/patch-ar
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ar,v 1.2 2004/03/28 20:09:07 mycroft Exp $
-
---- libvo/Makefile.am	2004-03-26 19:17:33.000000000 +0000
-+++ libvo/Makefile.am	2004-03-26 19:17:40.000000000 +0000
-@@ -3,9 +3,9 @@
- DEFAULT_INCLUDES = -I$(top_srcdir) -I$(srcdir) -I$(top_builddir) -I.
- 
- CFLAGS = -Wall -fPIC -DPIC @CFLAGS@ -I../libmpeg2 -I$(srcdir)/../libmpeg2
--noinst_LIBRARIES = libvout.a
-+noinst_LTLIBRARIES = libvout.la
- 
--libvout_a_SOURCES = video_out.c video_out_ppm.c video_out_yuv.c yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c cpu_accel.c rgb2yuv.c
-+libvout_la_SOURCES = video_out.c video_out_ppm.c video_out_yuv.c yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c cpu_accel.c rgb2yuv.c
- 
- noinst_HEADERS = yuv2rgb.h video_out_internal.h video_out.h rgb2yuv.h mmx.h mm_accel.h 
- EXTRA_DIST = COPYING AUTHORS README
diff --git a/graphics/transcode/patches/patch-as b/graphics/transcode/patches/patch-as
deleted file mode 100644
index 2ef4b43fe29..00000000000
--- a/graphics/transcode/patches/patch-as
+++ /dev/null
@@ -1,55 +0,0 @@
-$NetBSD: patch-as,v 1.2 2004/03/28 20:09:07 mycroft Exp $
-
---- src/decoder.c.orig	2003-12-20 11:49:22.000000000 +0000
-+++ src/decoder.c	2004-03-28 09:16:35.000000000 +0000
-@@ -119,16 +119,12 @@
-   }
- 
-   //wait for threads to terminate
--#ifdef BROKEN_PTHREADS // Used to be MacOSX specific; kernel 2.6 as well?
-   pthread_cond_signal(&vframe_list_full_cv);
--#endif
-   cc1=pthread_join(vthread, &status);
-   
-   if(verbose & TC_DEBUG) fprintf(stderr, "(%s) video thread exit (ret_code=%d) (status_code=%d)\n", __FILE__, cc1, (int) status);
-   
--#ifdef BROKEN_PTHREADS // Used to be MacOSX specific; kernel 2.6 as well?
-   pthread_cond_signal(&aframe_list_full_cv);
--#endif
-   cc2=pthread_join(athread, &status);
-   
-   if(verbose & TC_DEBUG) fprintf(stderr, "(%s) audio thread exit (ret_code=%d) (status_code=%d)\n", __FILE__, cc2, (int) status);
-@@ -467,6 +463,7 @@
-     pthread_testcancel();
- 
-     //check buffer fill level
-+    pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
-     pthread_mutex_lock(&vframe_list_lock);
-     
-     while(vframe_fill_level(TC_BUFFER_FULL)) {
-@@ -481,7 +478,9 @@
- 	  pthread_exit( (int *) 11);
- 	}
-     }
-+
-     pthread_mutex_unlock(&vframe_list_lock);
-+    pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
-     
-     // get a frame buffer or wait
-     while((ptr = vframe_register(i))==NULL) {
-@@ -655,6 +654,7 @@
-     pthread_testcancel();
-     
-     //check buffer fill level
-+    pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
-     pthread_mutex_lock(&aframe_list_lock);
-     
-     while(aframe_fill_level(TC_BUFFER_FULL)) {
-@@ -671,6 +671,7 @@
-     }
-     
-     pthread_mutex_unlock(&aframe_list_lock);
-+    pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
-     
-     // get a frame buffer or wait
-     while((ptr = aframe_register(i))==NULL) {
diff --git a/multimedia/Makefile b/multimedia/Makefile
index 2b6e291f124..acbaa004ed9 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2004/05/10 13:43:43 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2004/05/10 13:48:31 wiz Exp $
 #
 
 COMMENT=	Multimedia utilities
@@ -59,6 +59,7 @@ SUBDIR+=	ogmtools
 SUBDIR+=	openquicktime
 SUBDIR+=	realplayer
 SUBDIR+=	realplayer-codecs
+SUBDIR+=	transcode
 SUBDIR+=	trplayer
 SUBDIR+=	vlc
 SUBDIR+=	vls
diff --git a/multimedia/dvdrip/Makefile b/multimedia/dvdrip/Makefile
index 3079addc8f3..e21be723913 100644
--- a/multimedia/dvdrip/Makefile
+++ b/multimedia/dvdrip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/04/12 21:58:05 salo Exp $
+# $NetBSD: Makefile,v 1.6 2004/05/10 13:48:31 wiz Exp $
 #
 
 VERS=		0.50.16
@@ -18,7 +18,7 @@ DEPENDS+=	mplayer>=0.90:../../multimedia/mplayer
 DEPENDS+=	ogmtools-[0-9]*:../../multimedia/ogmtools
 DEPENDS+=	p5-Gdk-Pixbuf-[0-9]*:../../graphics/p5-Gdk-Pixbuf
 DEPENDS+=	subtitleripper-[0-9]*:../../textproc/subtitleripper
-DEPENDS+=	transcode>=0.6.9:../../graphics/transcode
+DEPENDS+=	transcode>=0.6.9:../../multimedia/transcode
 DEPENDS+=	vcdimager>=0.7.12:../../sysutils/vcdimager-devel
 
 .if (${MACHINE_ARCH} == "i386")