Index: devel/libgetopt/files/getopt_long.c
===================================================================
--- devel/libgetopt/files/getopt_long.c	(revision 226)
+++ devel/libgetopt/files/getopt_long.c	(revision 227)
@@ -50,6 +50,8 @@
 int	optopt = '?';		/* character checked for validity */
 int	optreset;		/* reset getopt */
 char    *optarg;		/* argument associated with option */
+#elif defined(__QNXNTO__)
+int	optreset;		/* reset getopt */
 #endif
 
 #ifdef __weak_alias
Index: multimedia/x264-devel/distinfo
===================================================================
--- multimedia/x264-devel/distinfo	(revision 226)
+++ multimedia/x264-devel/distinfo	(revision 227)
@@ -3,9 +3,10 @@
 SHA1 (x264-snapshot-20090326-2245.tar.bz2) = 4d28a02db4586986162368c18e607ca3b10b3453
 RMD160 (x264-snapshot-20090326-2245.tar.bz2) = fc6581a33970f012c660489eb2ae48f8ac9c151d
 Size (x264-snapshot-20090326-2245.tar.bz2) = 2466701 bytes
-SHA1 (patch-aa) = b2222f1f9fa66ba46d1512dfca76d9ac4c14eea4
+SHA1 (patch-aa) = 28317771e20aac16d1f4d1a0c0e5eb520d2a0a83
 SHA1 (patch-ab) = ba276318f8e12626bdddbc978c00609d42921965
 SHA1 (patch-ac) = 0659b7f6ad1195c59c6298bc270b15990b1a8204
+SHA1 (patch-ad) = f8ca77d91fd7f705874da90c96440e2ffef667b8
 SHA1 (patch-ak) = d8362f3beadcc5cc19684a12b3794d542f502f14
 SHA1 (patch-am) = 07418547d05fd6c6e1703725a4cc5f1ddc36dca1
 SHA1 (patch-an) = 69e2a8f6167fd2410c69e4df3e3a071c8c0c835f
Index: multimedia/x264-devel/patches/patch-ad
===================================================================
--- multimedia/x264-devel/patches/patch-ad	(revision 0)
+++ multimedia/x264-devel/patches/patch-ad	(revision 227)
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- x264.h.orig	2009-03-26 17:45:08.000000000 -0400
++++ x264.h
+@@ -24,8 +24,8 @@
+ #ifndef X264_X264_H
+ #define X264_X264_H
+ 
+-#if !defined(_STDINT_H) && !defined(_STDINT_H_) && \
+-    !defined(_INTTYPES_H) && !defined(_INTTYPES_H_)
++#if !defined(_STDINT_H) && !defined(_STDINT_H_) && !defined(_STDINT_H_INCLUDED) &&\
++        !defined(_INTTYPES_H) && !defined(_INTTYPES_H_) && !defined(_INTTYPES_H_INCLUDED)
+ # ifdef _MSC_VER
+ #  pragma message("You must include stdint.h or inttypes.h before x264.h")
+ # else
Index: multimedia/x264-devel/patches/patch-aa
===================================================================
--- multimedia/x264-devel/patches/patch-aa	(revision 226)
+++ multimedia/x264-devel/patches/patch-aa	(revision 227)
@@ -1,6 +1,6 @@
 $NetBSD: patch-aa,v 1.7 2009/05/25 20:56:38 drochner Exp $
 
---- configure.orig	2009-03-26 22:45:08.000000000 +0100
+--- configure.orig	2009-03-26 17:45:08.000000000 -0400
 +++ configure
 @@ -117,7 +117,7 @@ for opt do
              LDFLAGS="$LDFLAGS ${opt#--extra-ldflags=}"
@@ -31,7 +31,19 @@
    kfreebsd*-gnu)
      SYS="FREEBSD"
      CFLAGS="$CFLAGS -DHAVE_MALLOC_H"
-@@ -244,7 +248,7 @@ case $host_cpu in
+@@ -225,6 +229,11 @@ case $host_os in
+     LDFLAGS="$LDFLAGS -lm"
+     HAVE_GETOPT_LONG=0
+     ;;
++  nto-qnx6*)
++    SYS="QNX6"
++    CFLAGS="$CFLAGS -DHAVE_MALLOC_H"
++    LDFLAGS="$LDFLAGS -lm -lgetopt"
++    ;;
+   *)
+     echo "Unknown system $host, edit the configure"
+     exit 1
+@@ -244,7 +253,7 @@ case $host_cpu in
        ASFLAGS="$ASFLAGS -f elf"
      fi
      ;;
@@ -40,7 +52,7 @@
      ARCH="X86_64"
      AS="yasm"
      if [ "$SYS" = MACOSX ];then
-@@ -258,11 +262,11 @@ case $host_cpu in
+@@ -258,11 +267,11 @@ case $host_cpu in
      fi
      ;;
    powerpc|powerpc64)
@@ -54,7 +66,7 @@
        ALTIVECFLAGS="$ALTIVECFLAGS -maltivec -mabi=altivec -DHAVE_ALTIVEC_H"
      fi
      ;;
-@@ -322,7 +326,7 @@ grep -q BIGE conftest.o && CFLAGS="$CFLA
+@@ -322,7 +331,7 @@ grep -q BIGE conftest.o && CFLAGS="$CFLA
  
  # autodetect options that weren't forced nor disabled
  
@@ -63,7 +75,7 @@
  if test "$pthread" = "auto" ; then
      pthread="no"
      case $SYS in
-@@ -355,7 +359,7 @@ if test "$pthread" = "auto" ; then
+@@ -355,7 +364,7 @@ if test "$pthread" = "auto" ; then
      esac
  fi
  if test "$pthread" = "yes" ; then
@@ -72,7 +84,7 @@
      LDFLAGS="$LDFLAGS $libpthread"
  fi
  
-@@ -392,7 +396,8 @@ if [ "$avis_input" = "yes" ] ; then
+@@ -392,7 +401,8 @@ if [ "$avis_input" = "yes" ] ; then
  fi
  
  if [ "$pic" = "yes" ] ; then
Index: multimedia/x264-devel/Makefile
===================================================================
--- multimedia/x264-devel/Makefile	(revision 226)
+++ multimedia/x264-devel/Makefile	(revision 227)
@@ -61,4 +61,8 @@
 	${CP} ${FILESDIR}/strip_fopt.sh ${WRKSRC}/ && \
 	${CHMOD} +x ${WRKSRC}/strip_fopt.sh
 
+.if ${OPSYS} == "QNX"
+.include "../../devel/libgetopt/buildlink3.mk"
+.endif
+
 .include "../../mk/bsd.pkg.mk"