diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile
index 319c536cac1..afdd1677161 100644
--- a/multimedia/x264/Makefile
+++ b/multimedia/x264/Makefile
@@ -1,18 +1,20 @@
-# $OpenBSD: Makefile,v 1.8 2008/08/28 15:23:31 brad Exp $
+# $OpenBSD: Makefile,v 1.9 2009/04/14 19:50:47 kili Exp $
 
 COMMENT=	free H264/AVC encoder
 
-V=		20080713
+V=		20090204
 DISTNAME=	x264-snapshot-${V}-2245
-PKGNAME=	x264-${V}p2
+PKGNAME=	x264-${V}
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.videolan.org/pub/videolan/x264/snapshots/
 EXTRACT_SUFX=	.tar.bz2
 
-SHARED_LIBS=	x264	2.0
+SHARED_LIBS=	x264	3.0
 
 HOMEPAGE=	http://www.videolan.org/developers/x264.html
 
+MAINTAINER=	Brad Smith <brad@comstyle.com>
+
 # GPLv2+
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
@@ -23,8 +25,8 @@ WANTLIB=	c m pthread
 USE_GMAKE=	Yes
 CONFIGURE_STYLE= simple
 CONFIGURE_ENV=	API=${LIBx264_VERSION}
-CONFIGURE_ARGS+=--prefix=${PREFIX} \
-		--disable-mp4-output
+CONFIGURE_ARGS+=--disable-mp4-output \
+		--prefix=${PREFIX}
 
 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
 BUILD_DEPENDS+=	::devel/yasm
diff --git a/multimedia/x264/distinfo b/multimedia/x264/distinfo
index 2f28c5ce8a9..03edf5c0d44 100644
--- a/multimedia/x264/distinfo
+++ b/multimedia/x264/distinfo
@@ -1,5 +1,5 @@
-MD5 (x264-snapshot-20080713-2245.tar.bz2) = YDfmg1Xk42i48O4GPgL2Og==
-RMD160 (x264-snapshot-20080713-2245.tar.bz2) = FGbrc8CPlm+Ssa3ElYenDwW1CWs=
-SHA1 (x264-snapshot-20080713-2245.tar.bz2) = LBhxRwnYWEDJAmiataGx4Nj0gjE=
-SHA256 (x264-snapshot-20080713-2245.tar.bz2) = BuXSoRBunb3gljW++dTgpSsUiECpsrmgxipzimXyVOM=
-SIZE (x264-snapshot-20080713-2245.tar.bz2) = 2161879
+MD5 (x264-snapshot-20090204-2245.tar.bz2) = MBqmWc2OCb7fXd1oKGUfeg==
+RMD160 (x264-snapshot-20090204-2245.tar.bz2) = U+dOLIo/FMafvvBDb6BqZs6AycM=
+SHA1 (x264-snapshot-20090204-2245.tar.bz2) = DGzbusrnJdrk36+vSwoPFJ+wD6k=
+SHA256 (x264-snapshot-20090204-2245.tar.bz2) = uOQfiUM+7iocylGfslF8U8DyzfQNAhpSaKsKhb51mzY=
+SIZE (x264-snapshot-20090204-2245.tar.bz2) = 2419267
diff --git a/multimedia/x264/patches/patch-Makefile b/multimedia/x264/patches/patch-Makefile
index 2b770a8aee2..e04078589e1 100644
--- a/multimedia/x264/patches/patch-Makefile
+++ b/multimedia/x264/patches/patch-Makefile
@@ -1,7 +1,7 @@
-$OpenBSD: patch-Makefile,v 1.3 2008/07/22 20:24:04 brad Exp $
---- Makefile.orig	Fri Jul  4 16:45:05 2008
-+++ Makefile	Wed Jul  9 00:15:36 2008
-@@ -52,6 +52,9 @@ ALTIVECSRC += common/ppc/mc.c common/ppc/pixel.c commo
+$OpenBSD: patch-Makefile,v 1.4 2009/04/14 19:50:47 kili Exp $
+--- Makefile.orig	Wed Feb  4 16:45:09 2009
++++ Makefile	Thu Mar  5 10:44:49 2009
+@@ -53,6 +53,9 @@ ALTIVECSRC += common/ppc/mc.c common/ppc/pixel.c commo
                common/ppc/predict.c
  SRCS += $(ALTIVECSRC)
  $(ALTIVECSRC:%.c=%.o): CFLAGS += $(ALTIVECFLAGS)
@@ -11,7 +11,7 @@ $OpenBSD: patch-Makefile,v 1.3 2008/07/22 20:24:04 brad Exp $
  endif
  
  # VIS optims
-@@ -65,6 +68,7 @@ SRCS += extras/getopt.c
+@@ -66,6 +69,7 @@ SRCS += extras/getopt.c
  endif
  
  OBJS = $(SRCS:%.c=%.o)
@@ -19,7 +19,7 @@ $OpenBSD: patch-Makefile,v 1.3 2008/07/22 20:24:04 brad Exp $
  OBJCLI = $(SRCCLI:%.c=%.o)
  DEP  = depend
  
-@@ -76,8 +80,8 @@ libx264.a: .depend $(OBJS) $(OBJASM)
+@@ -77,8 +81,8 @@ libx264.a: .depend $(OBJS) $(OBJASM)
  	ar rc libx264.a $(OBJS) $(OBJASM)
  	ranlib libx264.a
  
@@ -30,7 +30,7 @@ $OpenBSD: patch-Makefile,v 1.3 2008/07/22 20:24:04 brad Exp $
  
  x264$(EXE): $(OBJCLI) libx264.a 
  	$(CC) -o $@ $+ $(LDFLAGS)
-@@ -93,6 +97,9 @@ checkasm: tools/checkasm.o libx264.a
+@@ -91,9 +95,12 @@ checkasm: tools/checkasm.o libx264.a
  # delete local/anonymous symbols, so they don't show up in oprofile
  	-@ strip -x $@
  
@@ -39,12 +39,16 @@ $OpenBSD: patch-Makefile,v 1.3 2008/07/22 20:24:04 brad Exp $
 +
  .depend: config.mak
  	rm -f .depend
- # Hacky - because gcc 2.9x doesn't have -MT
-@@ -160,7 +167,6 @@ install: x264$(EXE) $(SONAME)
+-	$(foreach SRC, $(SRCS) $(SRCCLI), $(CC) $(CFLAGS) $(ALTIVECFLAGS) $(SRC) -MT $(SRC:%.c=%.o) -MM -g0 1>> .depend;)
++	$(foreach SRC, $(SRCS) $(SRCCLI), ( $(ECHON) "`dirname $(SRC)`/" && $(CC) $(CFLAGS) $(ALTIVECFLAGS) $(SRC) -MM -g0 ) 1>> .depend;)
+ 
+ config.mak:
+ 	./configure
+@@ -154,7 +161,6 @@ install: x264$(EXE) $(SONAME)
  ifeq ($(SYS),MINGW)
  	$(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(bindir))
  else
--	$(if $(SONAME), ln -sf $(SONAME) $(DESTDIR)$(libdir)/libx264.so)
+-	$(if $(SONAME), ln -sf $(SONAME) $(DESTDIR)$(libdir)/libx264.$(SOSUFFIX))
  	$(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(libdir))
  endif
  	$(if $(IMPLIBNAME), install -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir))
diff --git a/multimedia/x264/patches/patch-common_cpu_c b/multimedia/x264/patches/patch-common_cpu_c
index c6ebc8e349e..8dd4a8f2140 100644
--- a/multimedia/x264/patches/patch-common_cpu_c
+++ b/multimedia/x264/patches/patch-common_cpu_c
@@ -1,67 +1,16 @@
-$OpenBSD: patch-common_cpu_c,v 1.3 2008/08/28 15:23:31 brad Exp $
---- common/cpu.c.orig	Sun Jul 13 16:45:06 2008
-+++ common/cpu.c	Thu Aug 14 20:58:30 2008
-@@ -32,6 +32,10 @@
- #include <sys/types.h>
- #include <sys/sysctl.h>
- #endif
-+#ifdef SYS_OPENBSD
-+#include <sys/param.h>
-+#include <sys/sysctl.h>
-+#endif
- 
- #include "common.h"
- #include "cpu.h"
-@@ -182,17 +186,28 @@ uint32_t x264_cpu_detect( void )
- 
- #elif defined( ARCH_PPC )
- 
--#ifdef SYS_MACOSX
-+#if defined(SYS_MACOSX) || defined(SYS_OPENBSD)
- #include <sys/sysctl.h>
-+#ifdef SYS_OPENBSD
-+#include <machine/cpu.h>
-+#endif
- uint32_t x264_cpu_detect( void )
- {
-     /* Thank you VLC */
-     uint32_t cpu = 0;
--    int      selectors[2] = { CTL_HW, HW_VECTORUNIT };
--    int      has_altivec = 0;
-+    int      selectors[2];
-+    int      has_altivec = 0, error;
+$OpenBSD: patch-common_cpu_c,v 1.4 2009/04/14 19:50:47 kili Exp $
+--- common/cpu.c.orig	Wed Feb  4 16:45:09 2009
++++ common/cpu.c	Sun Apr  5 16:55:33 2009
+@@ -214,10 +214,12 @@ uint32_t x264_cpu_detect( void )
      size_t   length = sizeof( has_altivec );
--    int      error = sysctl( selectors, 2, &has_altivec, &length, NULL, 0 );
+     int      error = sysctl( selectors, 2, &has_altivec, &length, NULL, 0 );
  
-+#ifdef SYS_OPENBSD
-+    selectors[0] = CTL_MACHDEP;
-+    selectors[1] = CPU_ALTIVEC;
-+#else
-+    selectors[0] = CTL_HW;
-+    selectors[1] = HW_VECTORUNIT;
-+#endif
-+
-+    error = sysctl( selectors, 2, &has_altivec, &length, NULL, 0 );
++#if 0
      if( error == 0 && has_altivec != 0 )
      {
          cpu |= X264_CPU_ALTIVEC;
-@@ -286,6 +301,19 @@ int x264_cpu_num_processors( void )
-     int numberOfCPUs;
-     size_t length = sizeof( numberOfCPUs );
-     if( sysctlbyname("hw.ncpu", &numberOfCPUs, &length, NULL, 0) )
-+    {
-+        numberOfCPUs = 1;
-+    }
-+    return numberOfCPUs;
-+
-+#elif defined(SYS_OPENBSD)
-+    int mib[2], numberOfCPUs;
-+    size_t length = sizeof( numberOfCPUs );
-+
-+    mib[0] = CTL_HW;
-+    mib[1] = HW_NCPU;
-+
-+    if( sysctl(mib, 2, &numberOfCPUs, &length, NULL, 0) )
-     {
-         numberOfCPUs = 1;
      }
++#endif
+ 
+     return cpu;
+ }
diff --git a/multimedia/x264/patches/patch-common_osdep_h b/multimedia/x264/patches/patch-common_osdep_h
deleted file mode 100644
index f5f1245ff68..00000000000
--- a/multimedia/x264/patches/patch-common_osdep_h
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-common_osdep_h,v 1.1 2008/08/20 01:44:44 jakemsr Exp $
---- common/osdep.h.orig	Tue Aug 19 17:24:38 2008
-+++ common/osdep.h	Tue Aug 19 17:26:10 2008
-@@ -51,9 +51,6 @@
- #define X264_VERSION "" // no configure script for msvc
- #endif
- 
--#ifdef SYS_OPENBSD
--#define isfinite finite
--#endif
- #if defined(_MSC_VER) || defined(SYS_SunOS) || defined(SYS_MACOSX)
- #define sqrtf sqrt
- #endif
diff --git a/multimedia/x264/patches/patch-common_ppc_dct_c b/multimedia/x264/patches/patch-common_ppc_dct_c
deleted file mode 100644
index 1dfe0eaf10e..00000000000
--- a/multimedia/x264/patches/patch-common_ppc_dct_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-common_ppc_dct_c,v 1.2 2008/07/22 20:24:04 brad Exp $
---- common/ppc/dct.c.orig	Fri Jul  4 16:45:05 2008
-+++ common/ppc/dct.c	Tue Jul  8 23:59:12 2008
-@@ -21,7 +21,7 @@
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
-  *****************************************************************************/
- 
--#ifdef SYS_LINUX
-+#if defined SYS_LINUX || defined SYS_OPENBSD
- #include <altivec.h>
- #endif
- 
diff --git a/multimedia/x264/patches/patch-common_ppc_deblock_c b/multimedia/x264/patches/patch-common_ppc_deblock_c
deleted file mode 100644
index 8ab52f3d2d8..00000000000
--- a/multimedia/x264/patches/patch-common_ppc_deblock_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-common_ppc_deblock_c,v 1.1 2008/08/20 01:44:44 jakemsr Exp $
---- common/ppc/deblock.c.orig	Tue Aug 19 16:00:18 2008
-+++ common/ppc/deblock.c	Tue Aug 19 16:00:45 2008
-@@ -18,7 +18,7 @@
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
- *****************************************************************************/
- 
--#if defined SYS_LINUX
-+#if defined SYS_LINUX || defined SYS_OPENBSD
- #include <altivec.h>
- #endif
- 
diff --git a/multimedia/x264/patches/patch-common_ppc_mc_c b/multimedia/x264/patches/patch-common_ppc_mc_c
index 363c19fa1e9..d67440300c0 100644
--- a/multimedia/x264/patches/patch-common_ppc_mc_c
+++ b/multimedia/x264/patches/patch-common_ppc_mc_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-common_ppc_mc_c,v 1.1.1.1 2007/04/08 17:31:01 ajacoutot Exp $
---- common/ppc/mc.c.orig	Mon Mar 19 22:45:02 2007
-+++ common/ppc/mc.c	Tue Mar 20 18:20:12 2007
-@@ -24,10 +24,10 @@
+$OpenBSD: patch-common_ppc_mc_c,v 1.2 2009/04/14 19:50:47 kili Exp $
+--- common/ppc/mc.c.orig	Tue Jan  6 16:45:09 2009
++++ common/ppc/mc.c	Tue Jan  6 13:10:49 2009
+@@ -24,7 +24,7 @@
  #include <stdlib.h>
  #include <stdio.h>
  #include <string.h>
@@ -9,8 +9,4 @@ $OpenBSD: patch-common_ppc_mc_c,v 1.1.1.1 2007/04/08 17:31:01 ajacoutot Exp $
 +#include <inttypes.h>
  #include <stdarg.h>
  
--#ifdef SYS_LINUX
-+#if defined SYS_LINUX || defined SYS_OPENBSD
- #include <altivec.h>
- #endif
- 
+ #include "x264.h"
diff --git a/multimedia/x264/patches/patch-common_ppc_pixel_c b/multimedia/x264/patches/patch-common_ppc_pixel_c
deleted file mode 100644
index b365159f0ae..00000000000
--- a/multimedia/x264/patches/patch-common_ppc_pixel_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-common_ppc_pixel_c,v 1.2 2008/07/22 20:24:04 brad Exp $
---- common/ppc/pixel.c.orig	Fri Jul  4 16:45:05 2008
-+++ common/ppc/pixel.c	Tue Jul  8 23:59:12 2008
-@@ -21,7 +21,7 @@
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
-  *****************************************************************************/
- 
--#ifdef SYS_LINUX
-+#if defined SYS_LINUX || defined SYS_OPENBSD
- #include <altivec.h>
- #endif
- 
diff --git a/multimedia/x264/patches/patch-common_ppc_predict_c b/multimedia/x264/patches/patch-common_ppc_predict_c
deleted file mode 100644
index e700fe285b9..00000000000
--- a/multimedia/x264/patches/patch-common_ppc_predict_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-common_ppc_predict_c,v 1.1 2008/08/20 01:44:44 jakemsr Exp $
---- common/ppc/predict.c.orig	Tue Aug 19 16:02:22 2008
-+++ common/ppc/predict.c	Tue Aug 19 17:13:49 2008
-@@ -18,7 +18,7 @@
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
-  *****************************************************************************/
- 
--#ifdef SYS_LINUX
-+#if defined SYS_LINUX || defined SYS_OPENBSD
- #include <altivec.h>
- #endif
- 
diff --git a/multimedia/x264/patches/patch-common_ppc_quant_c b/multimedia/x264/patches/patch-common_ppc_quant_c
deleted file mode 100644
index 017e100f174..00000000000
--- a/multimedia/x264/patches/patch-common_ppc_quant_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-common_ppc_quant_c,v 1.2 2008/07/22 20:24:04 brad Exp $
---- common/ppc/quant.c.orig	Fri Jul  4 16:45:05 2008
-+++ common/ppc/quant.c	Tue Jul  8 23:59:12 2008
-@@ -18,7 +18,7 @@
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
- *****************************************************************************/
- 
--#if defined SYS_LINUX
-+#if defined SYS_LINUX || defined SYS_OPENBSD
- #include <altivec.h>
- #endif
- 
diff --git a/multimedia/x264/patches/patch-common_x86_mc-a_asm b/multimedia/x264/patches/patch-common_x86_mc-a_asm
deleted file mode 100644
index f36500e985e..00000000000
--- a/multimedia/x264/patches/patch-common_x86_mc-a_asm
+++ /dev/null
@@ -1,18 +0,0 @@
-$OpenBSD: patch-common_x86_mc-a_asm,v 1.1 2008/07/22 20:24:04 brad Exp $
---- common/x86/mc-a.asm.orig	Tue Jul 22 09:15:30 2008
-+++ common/x86/mc-a.asm	Tue Jul 22 09:17:05 2008
-@@ -373,12 +373,12 @@ AVG_CACHELINE_CHECK  8, 32, mmxext
- AVG_CACHELINE_CHECK 12, 32, mmxext
- AVG_CACHELINE_CHECK 16, 32, mmxext
- AVG_CACHELINE_CHECK 20, 32, mmxext
--AVG_CACHELINE_CHECK 16, 64, mmxext
--AVG_CACHELINE_CHECK 20, 64, mmxext
- %endif
- 
- AVG_CACHELINE_CHECK  8, 64, mmxext
- AVG_CACHELINE_CHECK 12, 64, mmxext
-+AVG_CACHELINE_CHECK 16, 64, mmxext
-+AVG_CACHELINE_CHECK 20, 64, mmxext
- AVG_CACHELINE_CHECK 16, 64, sse2
- AVG_CACHELINE_CHECK 20, 64, sse2
- 
diff --git a/multimedia/x264/patches/patch-configure b/multimedia/x264/patches/patch-configure
index d6beb63c752..4ba975f34cd 100644
--- a/multimedia/x264/patches/patch-configure
+++ b/multimedia/x264/patches/patch-configure
@@ -1,43 +1,46 @@
-$OpenBSD: patch-configure,v 1.4 2008/07/22 20:24:04 brad Exp $
---- configure.orig	Fri Jul  4 16:45:05 2008
-+++ configure	Sat Jul 12 02:16:14 2008
-@@ -254,7 +254,7 @@ case $host_cpu in
-     fi
-     as_check || AS="nasm"
-     ;;
--  x86_64)
-+  x86_64 | amd64)
-     ARCH="X86_64"
-     AS="yasm"
-     if [ "$SYS" = MACOSX ];then
-@@ -353,6 +353,9 @@ if test "$pthread" = "auto" ; then
-                 CFLAGS="$CFLAGS -DPTW32_STATIC_LIB"
-             fi
-             ;;
-+        OPENBSD)
-+            cc_check pthread.h -pthread && pthread="yes" && libpthread="-pthread"
-+            ;;
-         *)
-             cc_check pthread.h -lpthread && pthread="yes" && libpthread="-lpthread"
-             ;;
-@@ -389,21 +392,21 @@ if [ "$avis_input" = "yes" ] ; then
+$OpenBSD: patch-configure,v 1.5 2009/04/14 19:50:47 kili Exp $
+--- configure.orig	Wed Feb  4 16:45:09 2009
++++ configure	Thu Mar  5 10:44:49 2009
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ 
+ if test x"$1" = x"-h" -o x"$1" = x"--help" ; then
+ 
+@@ -70,6 +70,18 @@ ASFLAGS=""
+ 
+ EXE=""
+ 
++# check whether 'echo -n' works as expected, otherwise try printf
++if [ "x`echo -n houba`" = xhouba ]
++then
++  ECHON="echo -n"
++elif [ "x`printf houba`" = xhouba ]
++then
++  ECHON="printf"
++else
++  echo "Neither 'echo -n' nor 'printf' are working with your shell!"
++  exit 1
++fi
++
+ # parse options
+ 
+ for opt do
+@@ -371,21 +383,15 @@ if [ "$avis_input" = "yes" ] ; then
  fi
  
  if [ "$pic" = "yes" ] ; then
 -    CFLAGS="$CFLAGS -fPIC"
-+    CFLAGS="$CFLAGS"
-     ASFLAGS="$ASFLAGS -D__PIC__"
+     ASFLAGS="$ASFLAGS -DPIC"
      # resolve textrels in the x86 asm
      cc_check stdio.h -Wl,-Bsymbolic && LDFLAGS="$LDFLAGS -Wl,-Bsymbolic"
  fi
  
- if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then
+-if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then
 -    CFLAGS="$CFLAGS -s -fomit-frame-pointer"
 -    LDFLAGS="$LDFLAGS -s"
-+    CFLAGS="$CFLAGS"
-+    LDFLAGS="$LDFLAGS"
- fi
- 
+-fi
+-
  if [ "$debug" = "yes" ]; then
      CFLAGS="-O1 -g $CFLAGS"
  else
@@ -46,23 +49,32 @@ $OpenBSD: patch-configure,v 1.4 2008/07/22 20:24:04 brad Exp $
  fi
  
  if cc_check "stdio.h" "" "fseeko(stdin,0,0);" ; then
-@@ -449,7 +452,6 @@ echo '' >> config.mak
- cp config.mak gtk/config.mak
+@@ -418,10 +424,16 @@ EXE=$EXE
+ VIS=$vis
+ HAVE_GETOPT_LONG=$HAVE_GETOPT_LONG
+ DEVNULL=$DEVNULL
++ECHON=$ECHON
+ EOF
  
++$ECHON 'CONFIGURE_ARGS=' >> config.mak
++for A in "$@" ; do
++    $ECHON " '$A'" >> config.mak
++done
++echo '' >> config.mak
++
  if [ "$shared" = "yes" ]; then
 -    API=$(grep '#define X264_BUILD' < x264.h | cut -f 3 -d ' ')
      if [ "$SYS" = "MINGW" ]; then
          echo "SONAME=libx264-$API.dll" >> config.mak
          echo 'IMPLIBNAME=libx264.dll.a' >> config.mak
-@@ -459,7 +461,6 @@ if [ "$shared" = "yes" ]; then
-         echo 'SOFLAGS=-dynamiclib -Wl,-single_module -Wl,-read_only_relocs,suppress' >> config.mak        
+@@ -437,14 +449,13 @@ if [ "$shared" = "yes" ]; then
      else
+         echo "SOSUFFIX=so" >> config.mak
          echo "SONAME=libx264.so.$API" >> config.mak
 -        echo 'SOFLAGS=-Wl,-soname,$(SONAME)' >> config.mak
      fi
      echo 'default: $(SONAME)' >> config.mak
-     if [ "$gtk" = "yes" ]; then
-@@ -474,7 +475,7 @@ fi
+ fi
  
  ./version.sh
  
diff --git a/multimedia/x264/patches/patch-version_sh b/multimedia/x264/patches/patch-version_sh
new file mode 100644
index 00000000000..b0583d4ddf2
--- /dev/null
+++ b/multimedia/x264/patches/patch-version_sh
@@ -0,0 +1,26 @@
+$OpenBSD: patch-version_sh,v 1.1 2009/04/14 19:50:47 kili Exp $
+--- version.sh.orig	Thu Jan 29 16:45:08 2009
++++ version.sh	Thu Feb 12 01:24:30 2009
+@@ -1,19 +1,6 @@
+-#!/bin/bash
+-git rev-list HEAD | sort > config.git-hash
+-LOCALVER=`wc -l config.git-hash | awk '{print $1}'`
+-if [ $LOCALVER \> 1 ] ; then
+-    VER=`git rev-list origin/master | sort | join config.git-hash - | wc -l | awk '{print $1}'`
+-    if [ $VER != $LOCALVER ] ; then
+-        VER="$VER+$(($LOCALVER-$VER))"
+-    elif git status | grep -q "modified:" ; then
+-        VER="${VER}M"
+-    fi
+-    VER="$VER $(git rev-list HEAD -n 1 | head -c 7)"
+-    echo "#define X264_VERSION \" r$VER\"" >> config.h
+-else
+-    echo "#define X264_VERSION \"\"" >> config.h
+-    VER="x"
+-fi
++#!/bin/sh
++echo "#define X264_VERSION \"\"" >> config.h
++VER="x"
+ rm -f config.git-hash
+ API=`grep '#define X264_BUILD' < x264.h | sed -e 's/.* \([1-9][0-9]*\).*/\1/'`
+ echo "#define X264_POINTVER \"0.$API.$VER\"" >> config.h