diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile
index 0b05e265978..ab480c3d3e4 100644
--- a/multimedia/libquicktime/Makefile
+++ b/multimedia/libquicktime/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2004/07/09 07:30:17 sturm Exp $
+# $OpenBSD: Makefile,v 1.2 2004/12/04 21:44:34 sturm Exp $
 # $FreeBSD: ports/multimedia/libquicktime/Makefile,v 1.19 2004/03/16 04:23:53 edwin Exp $
 
-NOT_FOR_ARCHS=		${NO_SHARED_ARCHS}
+SHARED_ONLY=		Yes
 
 COMMENT=		library for reading and writing quicktime files
-DISTNAME=		libquicktime-0.9.2
+DISTNAME=		libquicktime-0.9.3
 CATEGORIES=		multimedia
 
 HOMEPAGE=		http://libquicktime.sourceforge.net/
@@ -17,12 +17,17 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
+WANTLIB=		GL GLU ICE SM X11 Xaw Xext Xi Xt Xv c gdk glib \
+			gmodule gtk iconv intl m mp3lame ogg ossaudio \
+			pthread z
+
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=libquicktime/}
 
 LIB_DEPENDS=		vorbis.3,vorbisfile.4,vorbisenc.2::audio/libvorbis \
 			jpeg.9::graphics/jpeg \
 			png.4::graphics/png \
-			dv.4::multimedia/libdv
+			dv.4::multimedia/libdv \
+			avcodec.4::graphics/ffmpeg
 
 USE_GMAKE=		Yes
 VMEM_WARNING=		Yes
diff --git a/multimedia/libquicktime/distinfo b/multimedia/libquicktime/distinfo
index db031c05b01..2748333dad4 100644
--- a/multimedia/libquicktime/distinfo
+++ b/multimedia/libquicktime/distinfo
@@ -1,3 +1,3 @@
-MD5 (libquicktime-0.9.2.tar.gz) = 1b42ca12966526647fa9a1b14fb947a1
-RMD160 (libquicktime-0.9.2.tar.gz) = d0a4e3856f3617ec5473d2e03d39836df738561b
-SHA1 (libquicktime-0.9.2.tar.gz) = 896758aa295b81eaa1f45ddc4ef0b8ed40006be2
+MD5 (libquicktime-0.9.3.tar.gz) = 38d9dbe8a75ea0be13ffa16b858502ae
+RMD160 (libquicktime-0.9.3.tar.gz) = 0c9ab22887ef6980162385968a73b2cf210d1465
+SHA1 (libquicktime-0.9.3.tar.gz) = 42d40e6cf9df3efe2e56fb82edffa8775b3a3782
diff --git a/multimedia/libquicktime/patches/patch-configure b/multimedia/libquicktime/patches/patch-configure
index 3bc1d17e346..2cadb6dfe84 100644
--- a/multimedia/libquicktime/patches/patch-configure
+++ b/multimedia/libquicktime/patches/patch-configure
@@ -1,7 +1,44 @@
-$OpenBSD: patch-configure,v 1.1.1.1 2004/07/09 07:30:17 sturm Exp $
---- configure.orig	Sat Sep  6 19:15:25 2003
-+++ configure	Mon Jul  5 22:10:46 2004
-@@ -8691,11 +8691,11 @@ ASFLAGS=
+$OpenBSD: patch-configure,v 1.2 2004/12/04 21:44:34 sturm Exp $
+--- configure.orig	Mon Jul 19 11:57:49 2004
++++ configure	Mon Aug  9 03:17:56 2004
+@@ -3500,12 +3500,10 @@ nto-qnx)
+   ;;
+ 
+ openbsd*)
+-  lt_cv_file_magic_cmd=/usr/bin/file
+-  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
++    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
+   else
+-    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
++    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+   fi
+   ;;
+ 
+@@ -10040,6 +10038,21 @@ if test -z "$aix_libpath"; then aix_libp
+     # Workaround some broken pre-1.5 toolchains
+     output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+     ;;
++  openbsd2*)
++      # C++ shared libraries are fairly broken
++      ld_shlibs=no
++      ;;
++  openbsd*)
++      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++      hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
++      hardcode_direct_CXX=yes
++      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++        archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++        export_dynamic_flag_spec_CXX='${wl}-E'
++        whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      fi
++      output_verbose_link_cmd='echo'
++      ;;
+   osf3*)
+     case $cc_basename in
+       KCC)
+@@ -19822,11 +19835,11 @@ ASFLAGS=
  
  
  
@@ -15,15 +52,15 @@ $OpenBSD: patch-configure,v 1.1.1.1 2004/07/09 07:30:17 sturm Exp $
  OPTIMIZE_CFLAGS="-O3"
  
  echo "$as_me:$LINENO: checking if $CC supports -funroll-all-loops flags" >&5
-@@ -8938,6 +8938,7 @@ echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
+@@ -20069,6 +20082,7 @@ echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
      else
          :
      fi
 +fi # OPTIMIZE = yes
  
- # large file support
- COMMON_FLAGS="$COMMON_FLAGS -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
-@@ -9181,7 +9182,7 @@ fi
+ # -Wno-unused-variable -Wno-unused-parameter
+ # -std=gnu99
+@@ -20373,7 +20387,7 @@ fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  if test "$ac_cv_search_pthread_create" = no; then
    for ac_lib in gthread pthread c_r; do
@@ -32,7 +69,7 @@ $OpenBSD: patch-configure,v 1.1.1.1 2004/07/09 07:30:17 sturm Exp $
      cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
  /* confdefs.h.  */
-@@ -9217,7 +9218,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -20409,7 +20423,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -41,34 +78,48 @@ $OpenBSD: patch-configure,v 1.1.1.1 2004/07/09 07:30:17 sturm Exp $
  break
  else
    echo "$as_me: failed program was:" >&5
-@@ -12316,7 +12317,7 @@ rm -f conftest.$ac_objext conftest$ac_ex
-   rm -f conf.glibtest
- 
- 
--LIBS="$GLIB_LIBS -ldv"
-+LIBS="$GLIB_LIBS -ldv -pthread"
- CFLAGS=$GLIB_CFLAGS
- 
- if test x$have_glib = xtrue; then
-@@ -12979,7 +12980,7 @@ fi;
-     VORBIS_LIBDIR="-L$prefix/lib"
+@@ -23354,7 +23368,7 @@ fi;
+     VORBIS_LIBS="-L$libdir"
    fi
  
--  VORBIS_LIBS="$VORBIS_LIBDIR -lvorbis -lm"
-+  VORBIS_LIBS="$VORBIS_LIBDIR -lvorbis -logg -lm"
+-  VORBIS_LIBS="$VORBIS_LIBS -lvorbis -lm"
++  VORBIS_LIBS="$VORBIS_LIBS -lvorbis -logg -lm"
    VORBISFILE_LIBS="-lvorbisfile"
    VORBISENC_LIBS="-lvorbisenc"
  
-@@ -13276,7 +13277,7 @@ fi
- have_libavcodec=false
+@@ -23547,7 +23561,7 @@ if test "${ac_cv_lib_mp3lame_lame_decode
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lmp3lame  -lm -lvorbis $LIBS"
++LIBS="-lmp3lame  -lm -lvorbis -logg $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h.  */
+@@ -24448,6 +24462,7 @@ fi
+   else
+      PKG_CONFIG_MIN_VERSION=0.9.0
+      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
++       if test X$with_ffmpeg_acl = Xyes ; then
+         echo "$as_me:$LINENO: checking for avcodec_acl = $AVCODEC_REQUIRED" >&5
+ echo $ECHO_N "checking for avcodec_acl = $AVCODEC_REQUIRED... $ECHO_C" >&6
  
- OLD_LIBS=$LIBS
--LIBS="-lavcodec -lm"
-+LIBS="-lavcodec -logg -lm"
+@@ -24476,8 +24491,13 @@ echo "${ECHO_T}$AVCODEC_LIBS" >&6
  
- echo "$as_me:$LINENO: checking for libavcodec" >&5
- echo $ECHO_N "checking for libavcodec... $ECHO_C" >&6
-@@ -13516,7 +13517,7 @@ fi
+         fi
+ 
++      else
++        echo "$as_me:$LINENO: result: yes" >&5
++        echo "${ECHO_T}yes" >&6
++        succeeded=yes
++        AVCODEC_LIBS="-lavcodec -logg"
++      fi # ffmpeg_acl
+ 
+-
+      else
+         echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+         echo "*** See http://www.freedesktop.org/software/pkgconfig"
+@@ -24682,7 +24702,7 @@ fi
  
  # Set CPU specific compiler options
  
diff --git a/multimedia/libquicktime/patches/patch-include_lqt_fseek_h b/multimedia/libquicktime/patches/patch-include_lqt_fseek_h
deleted file mode 100644
index c8c4c657a93..00000000000
--- a/multimedia/libquicktime/patches/patch-include_lqt_fseek_h
+++ /dev/null
@@ -1,15 +0,0 @@
-$OpenBSD: patch-include_lqt_fseek_h,v 1.1.1.1 2004/07/09 07:30:17 sturm Exp $
---- include/lqt_fseek.h.orig	2003-01-22 10:03:58.000000000 -0800
-+++ include/lqt_fseek.h	2004-05-10 16:05:59.000000000 -0700
-@@ -16,6 +16,11 @@ off_t lqt_ftello64(FILE *);
- #define ftello64(a) lqt_ftello64(a)
- #endif
- 
-+#ifdef __OpenBSD__
-+#define FTELL ftello
-+#define FSEEK fseeko
-+#else
- #define FTELL ftello64
- #define FSEEK fseeko64
-+#endif
- 
diff --git a/multimedia/libquicktime/patches/patch-ltmain_sh b/multimedia/libquicktime/patches/patch-ltmain_sh
index f6ebd717299..3b970fefd44 100644
--- a/multimedia/libquicktime/patches/patch-ltmain_sh
+++ b/multimedia/libquicktime/patches/patch-ltmain_sh
@@ -1,18 +1,76 @@
-$OpenBSD: patch-ltmain_sh,v 1.1.1.1 2004/07/09 07:30:17 sturm Exp $
---- ltmain.sh.orig	2004-05-10 17:48:34.000000000 -0700
-+++ ltmain.sh	2004-05-10 17:52:19.000000000 -0700
-@@ -1775,10 +1775,10 @@ compiler."
- 	    continue
+$OpenBSD: patch-ltmain_sh,v 1.2 2004/12/04 21:44:34 sturm Exp $
+--- ltmain.sh.orig	Mon Jul 19 11:57:44 2004
++++ ltmain.sh	Mon Aug  9 03:09:03 2004
+@@ -1354,6 +1354,17 @@ EOF
+ 
+       -o) prev=output ;;
+ 
++      -pthread)
++	case $host in
++	*-*-openbsd* | *-*-freebsd*)
++	  # These systems use the -pthread flag for pthreads.
++	  deplibs="$deplibs $arg"
++	  continue
++	  ;;
++	esac
++	continue
++	;;
++
+       -release)
+ 	prev=release
+ 	continue
+@@ -1898,6 +1909,22 @@ EOF
+ 	  esac # linkmode
+ 	  continue
+ 	  ;; # -L
++        -pthread)
++	  case $host in
++	  *-*-openbsd* | *-*-freebsd*)
++	    # These systems use the -pthread flag for pthreads.
++	    if test "$linkmode,$pass" = "prog,link"; then
++	      compile_deplibs="$deplib $compile_deplibs"
++	      finalize_deplibs="$deplib $finalize_deplibs"
++	    else
++	      deplibs="$deplib $deplibs"
++	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
++	    fi
++	    continue
++	    ;;
++	  esac
++          continue
++	  ;;
+ 	-R*)
+ 	  if test "$pass" = link; then
+ 	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
+@@ -1918,7 +1945,21 @@ EOF
  	  fi
- 
--	  if test "$installed" = no; then
--	    notinst_deplibs="$notinst_deplibs $lib"
--	    need_relink=yes
--	  fi
-+	  #if test "$installed" = no; then
-+	  #  notinst_deplibs="$notinst_deplibs $lib"
-+	  #  need_relink=yes
-+	  #fi
- 
- 	  if test -n "$old_archive_from_expsyms_cmds"; then
- 	    # figure out the soname
+ 	  case $linkmode in
+ 	  lib)
+-	    if test "$deplibs_check_method" != pass_all; then
++	    valid_a_lib=no
++	    case $deplibs_check_method in
++	      match_pattern*)
++	        match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
++		if eval $echo \"$deplib\" 2>/dev/null \
++		    | ${SED} 10q \
++		    | ${EGREP} "$match_pattern_regex" > /dev/null; then
++		  valid_a_lib=yes
++		fi
++		;;
++	      pass_all)
++		valid_a_lib=yes
++		;;
++            esac
++	    if test "$valid_a_lib" != yes; then
+ 	      $echo
+ 	      $echo "*** Warning: Trying to link with static lib archive $deplib."
+ 	      $echo "*** I have the capability to make that library automatically link in when"
+@@ -2403,7 +2444,7 @@ EOF
+ 	    add_dir=
+ 	    add=
+ 	    # Finalize command for both is simple: just hardcode it.
+-	    if test "$hardcode_direct" = yes; then
++	    if test "$hardcode_direct" = yes && test -f $libdir/$linklib; then
+ 	      add="$libdir/$linklib"
+ 	    elif test "$hardcode_minus_L" = yes; then
+ 	      add_dir="-L$libdir"
diff --git a/multimedia/libquicktime/patches/patch-plugins_Makefile_in b/multimedia/libquicktime/patches/patch-plugins_Makefile_in
deleted file mode 100644
index 3baabb510bb..00000000000
--- a/multimedia/libquicktime/patches/patch-plugins_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-plugins_Makefile_in,v 1.1.1.1 2004/07/09 07:30:17 sturm Exp $
---- plugins/Makefile.in.orig	2004-05-10 17:17:45.000000000 -0700
-+++ plugins/Makefile.in	2004-05-10 17:18:26.000000000 -0700
-@@ -152,7 +152,7 @@ svq
- @HAVE_VORBIS_TRUE@vorbis_subdirs = vorbis
- @HAVE_VORBIS_FALSE@vorbis_subdirs = 
- 
--@HAVE_LIBAVCODEC_TRUE@libavcodec_subdirs = ffmpeg
-+@HAVE_LIBAVCODEC_TRUE@libavcodec_subdirs =
- @HAVE_LIBAVCODEC_FALSE@libavcodec = 
- 
- SUBDIRS = $(base_subdirs) $(jpeg_subdirs) $(dv_subdirs) \
diff --git a/multimedia/libquicktime/patches/patch-plugins_audiocodec_ulaw_c b/multimedia/libquicktime/patches/patch-plugins_audiocodec_ulaw_c
new file mode 100644
index 00000000000..7d0153c6db0
--- /dev/null
+++ b/multimedia/libquicktime/patches/patch-plugins_audiocodec_ulaw_c
@@ -0,0 +1,13 @@
+$OpenBSD: patch-plugins_audiocodec_ulaw_c,v 1.1 2004/12/04 21:44:34 sturm Exp $
+--- plugins/audiocodec/ulaw.c.orig	Mon Aug  9 03:20:47 2004
++++ plugins/audiocodec/ulaw.c	Mon Aug  9 03:21:06 2004
+@@ -1,7 +1,9 @@
+ #include "funcprotos.h"
+ #include "quicktime.h"
+ #include "ulaw.h"
++#ifdef HAVE_STDINT_H
+ #include <stdint.h>
++#endif
+ 
+ typedef struct
+ {
diff --git a/multimedia/libquicktime/patches/patch-plugins_rtjpeg_Makefile_in b/multimedia/libquicktime/patches/patch-plugins_rtjpeg_Makefile_in
deleted file mode 100644
index 4460a5fce22..00000000000
--- a/multimedia/libquicktime/patches/patch-plugins_rtjpeg_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-plugins_rtjpeg_Makefile_in,v 1.1 2004/07/12 03:48:05 pvalchev Exp $
---- plugins/rtjpeg/Makefile.in.orig	Sat Sep  6 11:15:42 2003
-+++ plugins/rtjpeg/Makefile.in	Sun Jul 11 21:44:51 2004
-@@ -397,7 +397,7 @@ uninstall-am: uninstall-info-am uninstal
- 
- 
- RTjpeg.lo:	RTjpeg.c RTjpeg.h
--	gcc @RTJPEG_CFLAGS@ -c RTjpeg.c -o RTjpeg.lo
-+	$(CC) @RTJPEG_CFLAGS@ -fPIC -DPIC -c RTjpeg.c -o RTjpeg.lo
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/multimedia/libquicktime/patches/patch-plugins_RTjpeg_h b/multimedia/libquicktime/patches/patch-plugins_rtjpeg_RTjpeg_h
similarity index 53%
rename from multimedia/libquicktime/patches/patch-plugins_RTjpeg_h
rename to multimedia/libquicktime/patches/patch-plugins_rtjpeg_RTjpeg_h
index 48f1dcceb49..a727f1e597c 100644
--- a/multimedia/libquicktime/patches/patch-plugins_RTjpeg_h
+++ b/multimedia/libquicktime/patches/patch-plugins_rtjpeg_RTjpeg_h
@@ -1,6 +1,6 @@
-$OpenBSD: patch-plugins_RTjpeg_h,v 1.1.1.1 2004/07/09 07:30:17 sturm Exp $
---- plugins/rtjpeg/RTjpeg.h.orig	Mon Jun  3 22:04:22 2002
-+++ plugins/rtjpeg/RTjpeg.h	Mon Jul  5 21:55:46 2004
+$OpenBSD: patch-plugins_rtjpeg_RTjpeg_h,v 1.1 2004/12/04 21:44:34 sturm Exp $
+--- plugins/rtjpeg/RTjpeg.h.orig	Mon Jun  3 13:04:22 2002
++++ plugins/rtjpeg/RTjpeg.h	Mon Aug  9 02:49:14 2004
 @@ -31,8 +31,12 @@ Foundation, Inc., 59 Temple Place, Suite
  		South Africa
  */
diff --git a/multimedia/libquicktime/patches/patch-plugins_videocodec_v308_c b/multimedia/libquicktime/patches/patch-plugins_videocodec_v308_c
new file mode 100644
index 00000000000..061a6a99470
--- /dev/null
+++ b/multimedia/libquicktime/patches/patch-plugins_videocodec_v308_c
@@ -0,0 +1,13 @@
+$OpenBSD: patch-plugins_videocodec_v308_c,v 1.1 2004/12/04 21:44:34 sturm Exp $
+--- plugins/videocodec/v308.c.orig	Mon Aug  9 03:21:32 2004
++++ plugins/videocodec/v308.c	Mon Aug  9 03:21:53 2004
+@@ -4,7 +4,9 @@
+ #include <workarounds.h>
+ #include "v308.h"
+ 
++#ifdef HAVE_STDINT_H
+ #include <stdint.h>
++#endif
+ #include <stdlib.h>
+ 
+ 
diff --git a/multimedia/libquicktime/patches/patch-plugins_videocodec_v408_c b/multimedia/libquicktime/patches/patch-plugins_videocodec_v408_c
new file mode 100644
index 00000000000..bed4372b43e
--- /dev/null
+++ b/multimedia/libquicktime/patches/patch-plugins_videocodec_v408_c
@@ -0,0 +1,13 @@
+$OpenBSD: patch-plugins_videocodec_v408_c,v 1.1 2004/12/04 21:44:34 sturm Exp $
+--- plugins/videocodec/v408.c.orig	Mon Aug  9 03:22:15 2004
++++ plugins/videocodec/v408.c	Mon Aug  9 03:22:37 2004
+@@ -4,7 +4,9 @@
+ #include <workarounds.h>
+ #include "v408.h"
+ 
++#ifdef HAVE_STDINT_H
+ #include <stdint.h>
++#endif
+ #include <stdlib.h>
+ 
+ typedef struct
diff --git a/multimedia/libquicktime/patches/patch-plugins_videocodec_v410_c b/multimedia/libquicktime/patches/patch-plugins_videocodec_v410_c
new file mode 100644
index 00000000000..d50498b5baf
--- /dev/null
+++ b/multimedia/libquicktime/patches/patch-plugins_videocodec_v410_c
@@ -0,0 +1,13 @@
+$OpenBSD: patch-plugins_videocodec_v410_c,v 1.1 2004/12/04 21:44:34 sturm Exp $
+--- plugins/videocodec/v410.c.orig	Mon Aug  9 03:22:55 2004
++++ plugins/videocodec/v410.c	Mon Aug  9 03:23:14 2004
+@@ -4,7 +4,9 @@
+ #include <workarounds.h>
+ #include "v410.h"
+ 
++#ifdef HAVE_STDINT_H
+ #include <stdint.h>
++#endif
+ #include <stdlib.h>
+ 
+ typedef struct
diff --git a/multimedia/libquicktime/patches/patch-src_Makefile_in b/multimedia/libquicktime/patches/patch-src_Makefile_in
new file mode 100644
index 00000000000..802bca19358
--- /dev/null
+++ b/multimedia/libquicktime/patches/patch-src_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_Makefile_in,v 1.1 2004/12/04 21:44:34 sturm Exp $
+--- src/Makefile.in.orig	Fri Nov 26 00:46:51 2004
++++ src/Makefile.in	Fri Nov 26 00:56:34 2004
+@@ -211,7 +211,7 @@ lib_LTLIBRARIES = libquicktime.la
+ # Library dependencies are emtpy no
+ # Maybe we need zlib to read compressed quicktime headers
+ #
+-libquicktime_la_LDFLAGS = -export-dynamic
++libquicktime_la_LDFLAGS = -export-dynamic -version-info 1:0:0
+ @HAVE_FSEEKO_FALSE@FSEEKO_SRC = lqt_fseeko.c
+ 
+ 
diff --git a/multimedia/libquicktime/patches/patch-utils_Makefile_in b/multimedia/libquicktime/patches/patch-utils_Makefile_in
index f3038ce5dc5..5ad91c91e13 100644
--- a/multimedia/libquicktime/patches/patch-utils_Makefile_in
+++ b/multimedia/libquicktime/patches/patch-utils_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-utils_Makefile_in,v 1.1.1.1 2004/07/09 07:30:17 sturm Exp $
---- utils/Makefile.in.orig	2004-05-10 16:42:32.000000000 -0700
-+++ utils/Makefile.in	2004-05-10 16:43:30.000000000 -0700
-@@ -169,7 +169,7 @@ qtyuv4toyuv_LDADD = @UTIL_LIBADD@
+$OpenBSD: patch-utils_Makefile_in,v 1.2 2004/12/04 21:44:34 sturm Exp $
+--- utils/Makefile.in.orig	Mon Jul 19 11:57:53 2004
++++ utils/Makefile.in	Mon Aug  9 02:49:14 2004
+@@ -253,7 +253,7 @@ qtyuv4toyuv_LDADD = @UTIL_LIBADD@
  
  lqtplay_SOURCES = lqtplay.c
  lqtplay_LDADD = @UTIL_LIBADD@ @X_LIBS@ -lXaw -lXt @X_PRE_LIBS@ -lXext \
diff --git a/multimedia/libquicktime/patches/patch-utils_lqtplay_c b/multimedia/libquicktime/patches/patch-utils_lqtplay_c
index 15d6609d28b..d62ae731006 100644
--- a/multimedia/libquicktime/patches/patch-utils_lqtplay_c
+++ b/multimedia/libquicktime/patches/patch-utils_lqtplay_c
@@ -1,19 +1,19 @@
-$OpenBSD: patch-utils_lqtplay_c,v 1.1.1.1 2004/07/09 07:30:17 sturm Exp $
---- utils/lqtplay.c.orig	2002-06-25 04:41:49.000000000 -0700
-+++ utils/lqtplay.c	2004-06-04 20:18:10.000000000 -0700
-@@ -17,7 +17,11 @@
+$OpenBSD: patch-utils_lqtplay_c,v 1.2 2004/12/04 21:44:34 sturm Exp $
+--- utils/lqtplay.c.orig	Tue Jan 20 20:32:30 2004
++++ utils/lqtplay.c	Mon Aug  9 02:56:37 2004
+@@ -19,8 +19,10 @@
  #include <sys/ipc.h>
  #include <sys/shm.h>
  #include <sys/ioctl.h>
-+#if defined(__OpenBSD__)
-+#include <soundcard.h>
-+#else
+-#ifdef	HAVE_SOUNDCARD_H
++#ifdef	HAVE_SYS_SOUNDCARD_H
  #include <sys/soundcard.h>
-+#endif
++#else
++#include <soundcard.h>
+ #endif
  
  #include <X11/Xlib.h>
- #include <X11/Intrinsic.h>
-@@ -644,7 +648,7 @@ static void qt_init(FILE *fp, char *file
+@@ -656,7 +658,7 @@ static void qt_init(FILE *fp, char *file
  	qt_hasaudio = 1;
  	if (quicktime_track_channels(qt,0) > 1)
  	    qt_stereo = 1;
diff --git a/multimedia/libquicktime/patches/patch-utils_qtinfo_c b/multimedia/libquicktime/patches/patch-utils_qtinfo_c
new file mode 100644
index 00000000000..d90476a1551
--- /dev/null
+++ b/multimedia/libquicktime/patches/patch-utils_qtinfo_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-utils_qtinfo_c,v 1.1 2004/12/04 21:44:34 sturm Exp $
+--- utils/qtinfo.c.orig	Mon Aug  9 03:31:15 2004
++++ utils/qtinfo.c	Mon Aug  9 03:33:25 2004
+@@ -1,6 +1,7 @@
+ /* 	Qtinfo by Elliot Lee <sopwith@redhat.com> */
+ 
+-#include <quicktime/quicktime.h>
++/* #include <quicktime/quicktime.h> */
++#include <quicktime/lqt.h>
+ 
+ static void file_info(char *filename);
+ 
diff --git a/multimedia/libquicktime/patches/patch-utils_testqt_c b/multimedia/libquicktime/patches/patch-utils_testqt_c
new file mode 100644
index 00000000000..4621621974c
--- /dev/null
+++ b/multimedia/libquicktime/patches/patch-utils_testqt_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-utils_testqt_c,v 1.1 2004/12/04 21:44:34 sturm Exp $
+--- utils/testqt.c.orig	Mon Aug  9 03:37:58 2004
++++ utils/testqt.c	Mon Aug  9 03:38:59 2004
+@@ -134,7 +134,7 @@ int main(int argc, char** argv)
+ 							sizeof( int16_t ),
+ 							pxAudioOutputs[i] );
+ 				}
+-				printf( "a %d(%d) < %d ", iFrameNum*iSamplesPerFrame, iSamplesPerFrame, quicktime_audio_length( pxQuicktimeInput, 0 ) );
++				printf( "a %d(%d) < %ld ", iFrameNum*iSamplesPerFrame, iSamplesPerFrame, quicktime_audio_length( pxQuicktimeInput, 0 ) );
+ 			}
+ 
+ 			printf( "At frame #%d\n", iFrameNum );
diff --git a/multimedia/libquicktime/patches/patch-utils_yuv4toyuv_c b/multimedia/libquicktime/patches/patch-utils_yuv4toyuv_c
new file mode 100644
index 00000000000..72ef2c87530
--- /dev/null
+++ b/multimedia/libquicktime/patches/patch-utils_yuv4toyuv_c
@@ -0,0 +1,9 @@
+$OpenBSD: patch-utils_yuv4toyuv_c,v 1.1 2004/12/04 21:44:34 sturm Exp $
+--- utils/yuv4toyuv.c.orig	Fri Aug 29 08:48:22 2003
++++ utils/yuv4toyuv.c	Mon Aug  9 03:47:49 2004
+@@ -1,4 +1,5 @@
+ #include <quicktime/quicktime.h>
++#include "funcprotos.h"
+ 
+ int usage(void)
+ {
diff --git a/multimedia/libquicktime/pkg/PFRAG.shared b/multimedia/libquicktime/pkg/PFRAG.shared
index 0cf79a5ce20..e69de29bb2d 100644
--- a/multimedia/libquicktime/pkg/PFRAG.shared
+++ b/multimedia/libquicktime/pkg/PFRAG.shared
@@ -1,3 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.2 2004/09/15 18:04:35 espie Exp $
-@lib lib/libquicktime.so.0.0
-@lib lib/libquicktime_mjpeg.so.0.0
diff --git a/multimedia/libquicktime/pkg/PLIST b/multimedia/libquicktime/pkg/PLIST
index 31090e47bd5..c3263032cbb 100644
--- a/multimedia/libquicktime/pkg/PLIST
+++ b/multimedia/libquicktime/pkg/PLIST
@@ -1,18 +1,16 @@
-@comment $OpenBSD: PLIST,v 1.2 2004/09/15 18:04:35 espie Exp $
+@comment $OpenBSD: PLIST,v 1.3 2004/12/04 21:44:35 sturm Exp $
 bin/libquicktime_config
 bin/lqt-config
+bin/lqt_transcode
 bin/lqtplay
 bin/qtdechunk
 bin/qtdump
 bin/qtinfo
 bin/qtrechunk
-bin/qtrecover
 bin/qtstreamize
 bin/qtyuv4toyuv
 include/quicktime/
 include/quicktime/colormodels.h
-include/quicktime/jpeg.h
-include/quicktime/libmjpeg.h
 include/quicktime/lqt.h
 include/quicktime/lqt1394_config.h
 include/quicktime/lqt_codecapi.h
@@ -21,44 +19,27 @@ include/quicktime/lqt_version.h
 include/quicktime/qtprivate.h
 include/quicktime/quicktime.h
 lib/libquicktime/
-lib/libquicktime.a
 lib/libquicktime.la
-lib/libquicktime/lqt_audiocodec.a
+@lib lib/libquicktime.so.1.0
 @comment lib/libquicktime/lqt_audiocodec.la
 lib/libquicktime/lqt_audiocodec.so
-lib/libquicktime/lqt_dv.a
 @comment lib/libquicktime/lqt_dv.la
 lib/libquicktime/lqt_dv.so
-lib/libquicktime/lqt_ferguson.a
-@comment lib/libquicktime/lqt_ferguson.la
-lib/libquicktime/lqt_ferguson.so
-lib/libquicktime/lqt_mjpeg.a
+@comment lib/libquicktime/lqt_ffmpeg.la
+lib/libquicktime/lqt_ffmpeg.so
+@comment lib/libquicktime/lqt_lame.la
+lib/libquicktime/lqt_lame.so
 @comment lib/libquicktime/lqt_mjpeg.la
 lib/libquicktime/lqt_mjpeg.so
-lib/libquicktime/lqt_opendivx.a
 @comment lib/libquicktime/lqt_opendivx.la
 lib/libquicktime/lqt_opendivx.so
-lib/libquicktime/lqt_png.a
 @comment lib/libquicktime/lqt_png.la
 lib/libquicktime/lqt_png.so
-lib/libquicktime/lqt_rtjpeg.a
 @comment lib/libquicktime/lqt_rtjpeg.la
 lib/libquicktime/lqt_rtjpeg.so
-lib/libquicktime/lqt_svq.a
-@comment lib/libquicktime/lqt_svq.la
-lib/libquicktime/lqt_svq.so
-lib/libquicktime/lqt_videocodec.a
 @comment lib/libquicktime/lqt_videocodec.la
 lib/libquicktime/lqt_videocodec.so
-lib/libquicktime/lqt_vorbis.a
 @comment lib/libquicktime/lqt_vorbis.la
 lib/libquicktime/lqt_vorbis.so
-lib/libquicktime/lqt_xanim.a
-@comment lib/libquicktime/lqt_xanim.la
-lib/libquicktime/lqt_xanim.so
-lib/libquicktime_mjpeg.a
-@comment lib/libquicktime_mjpeg.la
 @man man/man1/lqtplay.1
-share/aclocal/
 share/aclocal/lqt.m4
-%%SHARED%%