diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile
index f4c91a48551..7285b01d6f1 100644
--- a/multimedia/xine-lib/Makefile
+++ b/multimedia/xine-lib/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.35 2008/06/18 01:26:40 brad Exp $
+# $OpenBSD: Makefile,v 1.36 2008/07/02 01:02:42 brad Exp $
 
 COMMENT-main=		multimedia decoding library
 COMMENT-esd=		esound audio output module for xine-lib
 COMMENT-arts=		artsd audio output module for xine-lib
 COMMENT-jack=		jackd audio output module for xine-lib
 
-V=			1.1.13
+V=			1.1.14
 DISTNAME=		xine-lib-${V}
 PKGNAME-main=		${DISTNAME}
 PKGNAME-esd=		xine-lib-esd-${V}
@@ -14,7 +14,7 @@ PKGNAME-jack=		xine-lib-jack-${V}
 
 EXTRACT_SUFX=		.tar.bz2
 CATEGORIES=		multimedia
-SHARED_LIBS=		xine	21.0
+SHARED_LIBS=		xine	22.0
 
 HOMEPAGE=		http://xinehq.de/
 
@@ -77,7 +77,7 @@ USE_LIBTOOL=		Yes
 USE_GMAKE=		Yes
 LIBTOOL_FLAGS+=		--tag=disable-static
 
-XINEAPI_REV=		1.22
+XINEAPI_REV=		1.23
 SUBST_VARS+=		XINEAPI_REV
 
 .if ${MACHINE_ARCH} == "i386"
diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo
index 57eab26f3db..2bd937ac671 100644
--- a/multimedia/xine-lib/distinfo
+++ b/multimedia/xine-lib/distinfo
@@ -1,5 +1,5 @@
-MD5 (xine-lib-1.1.13.tar.bz2) = uUUSCY3eKNwjD1okA30uGA==
-RMD160 (xine-lib-1.1.13.tar.bz2) = ov/LQ4kOxSURXmL3lt7G6DXOtNU=
-SHA1 (xine-lib-1.1.13.tar.bz2) = 0fTPBREGelVNviQ0aDEevrO73OQ=
-SHA256 (xine-lib-1.1.13.tar.bz2) = rYxboHFcAjZ2qL/5NVhllJpjqFBeNW5vIfv/CZlomRo=
-SIZE (xine-lib-1.1.13.tar.bz2) = 7444294
+MD5 (xine-lib-1.1.14.tar.bz2) = Wy7cJk3a1Ixl4MA+AJqmkw==
+RMD160 (xine-lib-1.1.14.tar.bz2) = UYtOkNVZcRVNeK9x9ph/CTDtk3w=
+SHA1 (xine-lib-1.1.14.tar.bz2) = jf4HGGXr2wz+L1zih0hbte18aXg=
+SHA256 (xine-lib-1.1.14.tar.bz2) = QKiQZeuPGJ03iLQq0tXzXqC5IwNyp2+WyaTEDnFgi/w=
+SIZE (xine-lib-1.1.14.tar.bz2) = 7455590
diff --git a/multimedia/xine-lib/patches/patch-configure b/multimedia/xine-lib/patches/patch-configure
index dd772539fa0..2dfbf3d7b74 100644
--- a/multimedia/xine-lib/patches/patch-configure
+++ b/multimedia/xine-lib/patches/patch-configure
@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure,v 1.16 2008/06/18 01:26:41 brad Exp $
---- configure.orig	Sat Jun 14 19:16:03 2008
-+++ configure	Mon Jun 16 02:30:50 2008
-@@ -24350,6 +24350,9 @@ _ACEOF
+$OpenBSD: patch-configure,v 1.17 2008/07/02 01:02:42 brad Exp $
+--- configure.orig	Sun Jun 29 13:13:20 2008
++++ configure	Sun Jun 29 20:54:10 2008
+@@ -24651,6 +24651,9 @@ _ACEOF
  fi
  done
  
@@ -11,7 +11,7 @@ $OpenBSD: patch-configure,v 1.16 2008/06/18 01:26:41 brad Exp $
  
  
  { echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-@@ -30687,13 +30690,13 @@ t q
+@@ -30988,13 +30991,13 @@ t q
  b
  :q
  q"
@@ -27,7 +27,7 @@ $OpenBSD: patch-configure,v 1.16 2008/06/18 01:26:41 brad Exp $
  
  cat >>confdefs.h <<_ACEOF
  #define LIBXV_SO "${x_lib_location:-libXv.so}"
-@@ -37541,7 +37544,7 @@ fi
+@@ -37830,7 +37833,7 @@ fi
      LIBFLAC_LIBS="-L$prefix/$XINE_LIBNAME"
    fi
  
@@ -36,7 +36,7 @@ $OpenBSD: patch-configure,v 1.16 2008/06/18 01:26:41 brad Exp $
  
    if test "x$libFLAC_includes" != "x" ; then
      LIBFLAC_CFLAGS="-I$libFLAC_includes"
-@@ -37790,7 +37793,7 @@ elif test "x$external_a52dec" = "xyes"; then
+@@ -38079,7 +38082,7 @@ elif test "x$external_a52dec" = "xyes"; then
    have_a52="yes"
  
  
@@ -45,7 +45,7 @@ $OpenBSD: patch-configure,v 1.16 2008/06/18 01:26:41 brad Exp $
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-@@ -37929,7 +37932,7 @@ if test $ac_cv_lib_a52_a52_init = yes; then
+@@ -38218,7 +38221,7 @@ if test $ac_cv_lib_a52_a52_init = yes; then
  #define HAVE_LIBA52 1
  _ACEOF
  
@@ -54,7 +54,7 @@ $OpenBSD: patch-configure,v 1.16 2008/06/18 01:26:41 brad Exp $
  
  else
    have_a52="no"
-@@ -38495,7 +38498,7 @@ if test "${ac_cv_lib_mng_mng_initialize+set}" = set; t
+@@ -38784,7 +38787,7 @@ if test "${ac_cv_lib_mng_mng_initialize+set}" = set; t
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -63,7 +63,7 @@ $OpenBSD: patch-configure,v 1.16 2008/06/18 01:26:41 brad Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -38678,7 +38681,7 @@ echo "${ECHO_T}$ac_cv_header_libmng_h" >&6; }
+@@ -38967,7 +38970,7 @@ echo "${ECHO_T}$ac_cv_header_libmng_h" >&6; }
  fi
  if test $ac_cv_header_libmng_h = yes; then
     have_libmng=yes
@@ -72,7 +72,7 @@ $OpenBSD: patch-configure,v 1.16 2008/06/18 01:26:41 brad Exp $
  else
    { echo "$as_me:$LINENO: result: *** All libmng dependent parts will be disabled ***" >&5
  echo "${ECHO_T}*** All libmng dependent parts will be disabled ***" >&6; }
-@@ -49976,7 +49979,7 @@ cat >>confdefs.h <<_ACEOF
+@@ -50265,7 +50268,7 @@ cat >>confdefs.h <<_ACEOF
  _ACEOF
  
          CFLAGS="$CFLAGS -faltivec -maltivec"
@@ -81,7 +81,7 @@ $OpenBSD: patch-configure,v 1.16 2008/06/18 01:26:41 brad Exp $
      fi
      ;;
    ppc-*-linux* | powerpc-*)
-@@ -50484,7 +50487,7 @@ XINE_SCRIPTPATH="\${xinedatadir}/scripts"
+@@ -50773,7 +50776,7 @@ XINE_SCRIPTPATH="\${xinedatadir}/scripts"
  
  XINE_BUILD_CC="`$CC -v 2>&1 | tail -1 2>/dev/null`"
  XINE_BUILD_OS="`uname -s -r -m`"
@@ -90,7 +90,7 @@ $OpenBSD: patch-configure,v 1.16 2008/06/18 01:26:41 brad Exp $
  
  
  
-@@ -51365,7 +51368,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_i
+@@ -51654,7 +51657,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_i
      { echo "$as_me:$LINENO: result: $ac_cv_try_ldflags_ok" >&5
  echo "${ECHO_T}$ac_cv_try_ldflags_ok" >&6; }
      if test x"$ac_cv_try_ldflags_ok" = x"yes"; then
diff --git a/multimedia/xine-lib/patches/patch-src_audio_out_Makefile_in b/multimedia/xine-lib/patches/patch-src_audio_out_Makefile_in
index 4f4fb6db405..86b9216f819 100644
--- a/multimedia/xine-lib/patches/patch-src_audio_out_Makefile_in
+++ b/multimedia/xine-lib/patches/patch-src_audio_out_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_audio_out_Makefile_in,v 1.9 2008/06/18 01:26:41 brad Exp $
---- src/audio_out/Makefile.in.orig	Sat Jun 14 19:15:47 2008
-+++ src/audio_out/Makefile.in	Mon Jun 16 02:30:50 2008
-@@ -626,7 +626,7 @@ xineplug_ao_out_sun_la_LDFLAGS = -avoid-version -modul
+$OpenBSD: patch-src_audio_out_Makefile_in,v 1.10 2008/07/02 01:02:42 brad Exp $
+--- src/audio_out/Makefile.in.orig	Sun Jun 29 13:13:02 2008
++++ src/audio_out/Makefile.in	Sun Jun 29 20:54:11 2008
+@@ -632,7 +632,7 @@ xineplug_ao_out_sun_la_LDFLAGS = -avoid-version -modul
  #xineplug_ao_out_irixal_la_CFLAGS = $(VISIBILITY_FLAG) $(IRIXAL_CFLAGS)
  #xineplug_ao_out_irixal_la_LDFLAGS = -avoid-version -module
  xineplug_ao_out_arts_la_SOURCES = audio_arts_out.c
diff --git a/multimedia/xine-lib/patches/patch-src_demuxers_demux_asf_c b/multimedia/xine-lib/patches/patch-src_demuxers_demux_asf_c
index 5fcd0087a9b..39f09cb5769 100644
--- a/multimedia/xine-lib/patches/patch-src_demuxers_demux_asf_c
+++ b/multimedia/xine-lib/patches/patch-src_demuxers_demux_asf_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_demuxers_demux_asf_c,v 1.3 2008/01/30 03:52:32 jakemsr Exp $
---- src/demuxers/demux_asf.c.orig	Wed Jan 23 12:52:33 2008
-+++ src/demuxers/demux_asf.c	Tue Jan 29 11:48:36 2008
-@@ -440,7 +440,7 @@ static int asf_read_header (demux_asf_t *this) {
+$OpenBSD: patch-src_demuxers_demux_asf_c,v 1.4 2008/07/02 01:02:42 brad Exp $
+--- src/demuxers/demux_asf.c.orig	Thu Jun 26 20:46:09 2008
++++ src/demuxers/demux_asf.c	Sun Jun 29 20:54:11 2008
+@@ -448,7 +448,7 @@ static int asf_read_header (demux_asf_t *this) {
  	xine_log(this->stream->xine, XINE_LOG_MSG,
  		 _("demux_asf: warning: The stream id=%d is encrypted.\n"), asf_stream->stream_number);
  	_x_message(this->stream, XINE_MSG_ENCRYPTED_SOURCE,
diff --git a/multimedia/xine-lib/patches/patch-src_input_Makefile_in b/multimedia/xine-lib/patches/patch-src_input_Makefile_in
index 1820e0b625b..60eb6ae5f1a 100644
--- a/multimedia/xine-lib/patches/patch-src_input_Makefile_in
+++ b/multimedia/xine-lib/patches/patch-src_input_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_input_Makefile_in,v 1.11 2008/06/18 01:26:41 brad Exp $
---- src/input/Makefile.in.orig	Sat Jun 14 19:15:49 2008
-+++ src/input/Makefile.in	Mon Jun 16 02:30:50 2008
-@@ -589,7 +589,7 @@ EXTRA_DIST = input_dvd.c input_vcd.c input_gnome_vfs.c
+$OpenBSD: patch-src_input_Makefile_in,v 1.12 2008/07/02 01:02:42 brad Exp $
+--- src/input/Makefile.in.orig	Sun Jun 29 13:13:04 2008
++++ src/input/Makefile.in	Sun Jun 29 20:54:12 2008
+@@ -595,7 +595,7 @@ EXTRA_DIST = input_dvd.c input_vcd.c input_gnome_vfs.c
  # ---------
  # All of xine input plugins should be named like the scheme "xineplug_inp_"
  #
diff --git a/multimedia/xine-lib/patches/patch-src_input_input_dvb_c b/multimedia/xine-lib/patches/patch-src_input_input_dvb_c
index 0dc5999a437..5efd7fc3c27 100644
--- a/multimedia/xine-lib/patches/patch-src_input_input_dvb_c
+++ b/multimedia/xine-lib/patches/patch-src_input_input_dvb_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_input_input_dvb_c,v 1.6 2008/06/18 01:26:41 brad Exp $
---- src/input/input_dvb.c.orig	Sat Jun 14 19:15:10 2008
-+++ src/input/input_dvb.c	Mon Jun 16 02:30:50 2008
-@@ -892,7 +892,7 @@ static channel_t *load_channels(xine_t *xine, xine_str
+$OpenBSD: patch-src_input_input_dvb_c,v 1.7 2008/07/02 01:02:42 brad Exp $
+--- src/input/input_dvb.c.orig	Wed Jun 25 09:04:09 2008
++++ src/input/input_dvb.c	Sun Jun 29 20:54:12 2008
+@@ -903,7 +903,7 @@ static channel_t *load_channels(xine_t *xine, xine_str
    if (!f) {
      xprintf(xine, XINE_VERBOSITY_LOG, _("input_dvb: failed to open dvb channel file '%s': %s\n"), filename, strerror (errno));
      if (!f && stream)
@@ -10,7 +10,7 @@ $OpenBSD: patch-src_input_input_dvb_c,v 1.6 2008/06/18 01:26:41 brad Exp $
      return NULL;
    }
    if (fstat(fileno(f), &st) || !S_ISREG (st.st_mode)) {
-@@ -2568,7 +2568,7 @@ static off_t dvb_plugin_read (input_plugin_t *this_gen
+@@ -2584,7 +2584,7 @@ static off_t dvb_plugin_read (input_plugin_t *this_gen
  
    /* no data for several seconds - tell the user a possible reason */
    if(this->read_failcount==5){
diff --git a/multimedia/xine-lib/patches/patch-src_input_input_http_c b/multimedia/xine-lib/patches/patch-src_input_input_http_c
index e10a378105a..658eb8ce76f 100644
--- a/multimedia/xine-lib/patches/patch-src_input_input_http_c
+++ b/multimedia/xine-lib/patches/patch-src_input_input_http_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_input_input_http_c,v 1.4 2008/06/18 01:26:41 brad Exp $
---- src/input/input_http.c.orig	Sat Jun 14 19:15:00 2008
-+++ src/input/input_http.c	Mon Jun 16 02:30:50 2008
-@@ -407,7 +407,7 @@ static off_t http_plugin_read_int (http_input_plugin_t
+$OpenBSD: patch-src_input_input_http_c,v 1.5 2008/07/02 01:02:42 brad Exp $
+--- src/input/input_http.c.orig	Wed Jun 25 09:04:09 2008
++++ src/input/input_http.c	Sun Jun 29 20:54:12 2008
+@@ -409,7 +409,7 @@ static off_t http_plugin_read_int (http_input_plugin_t
    
  error:
    if (!_x_action_pending(this->stream)) 
@@ -10,7 +10,7 @@ $OpenBSD: patch-src_input_input_http_c,v 1.4 2008/06/18 01:26:41 brad Exp $
    xine_log (this->stream->xine, XINE_LOG_MSG, _("input_http: read error %d\n"), errno);
    return read_bytes;
  }
-@@ -663,7 +663,7 @@ static int http_plugin_open (input_plugin_t *this_gen 
+@@ -671,7 +671,7 @@ static int http_plugin_open (input_plugin_t *this_gen 
        if (http_plugin_basicauth (this_class->proxyuser,
  			         this_class->proxypassword,
  				 this->proxyauth, BUFSIZE)) {
@@ -19,7 +19,7 @@ $OpenBSD: patch-src_input_input_http_c,v 1.4 2008/06/18 01:26:41 brad Exp $
  	return 0;
        }
      }
-@@ -672,7 +672,7 @@ static int http_plugin_open (input_plugin_t *this_gen 
+@@ -680,7 +680,7 @@ static int http_plugin_open (input_plugin_t *this_gen 
    
    if (!_x_parse_url(this->mrl, &this->proto, &this->host, &this->port,
                      &this->user, &this->password, &this->uri)) {
@@ -28,7 +28,7 @@ $OpenBSD: patch-src_input_input_http_c,v 1.4 2008/06/18 01:26:41 brad Exp $
      return 0;
    }
    use_proxy = use_proxy && _x_use_proxy(this_class, this->host);
-@@ -682,7 +682,7 @@ static int http_plugin_open (input_plugin_t *this_gen 
+@@ -690,7 +690,7 @@ static int http_plugin_open (input_plugin_t *this_gen 
    
    if (this->user && strlen(this->user)) {
      if (http_plugin_basicauth (this->user, this->password, this->auth, BUFSIZE)) {
@@ -37,7 +37,7 @@ $OpenBSD: patch-src_input_input_http_c,v 1.4 2008/06/18 01:26:41 brad Exp $
        return -1;
      }
    }
-@@ -736,7 +736,7 @@ static int http_plugin_open (input_plugin_t *this_gen 
+@@ -744,7 +744,7 @@ static int http_plugin_open (input_plugin_t *this_gen 
      } while ((res == XIO_TIMEOUT) && (progress <= 100000));
  
      if (res != XIO_READY) {
@@ -46,7 +46,7 @@ $OpenBSD: patch-src_input_input_http_c,v 1.4 2008/06/18 01:26:41 brad Exp $
        return -3;
      }
    }
-@@ -776,7 +776,7 @@ static int http_plugin_open (input_plugin_t *this_gen 
+@@ -784,7 +784,7 @@ static int http_plugin_open (input_plugin_t *this_gen 
  		     "\015\012",
  		     VERSION);
    if (_x_io_tcp_write (this->stream, this->fh, this->buf, buflen) != buflen) {
@@ -55,7 +55,7 @@ $OpenBSD: patch-src_input_input_http_c,v 1.4 2008/06/18 01:26:41 brad Exp $
      xprintf(this_class->xine, XINE_VERBOSITY_DEBUG, "input_http: couldn't send request\n");
      return -4;
    }
-@@ -820,7 +820,7 @@ static int http_plugin_open (input_plugin_t *this_gen 
+@@ -828,7 +828,7 @@ static int http_plugin_open (input_plugin_t *this_gen 
  	    (sscanf(this->buf, "ICY %d %50[^\015\012]", /* icecast 1 ? */
  		    &httpcode, httpstatus) != 2)
  	   ) {
@@ -64,7 +64,7 @@ $OpenBSD: patch-src_input_input_http_c,v 1.4 2008/06/18 01:26:41 brad Exp $
  	    xine_log (this->stream->xine, XINE_LOG_MSG, 
  		      _("input_http: invalid http answer\n"));
  	    return -6;
-@@ -831,20 +831,20 @@ static int http_plugin_open (input_plugin_t *this_gen 
+@@ -839,20 +839,20 @@ static int http_plugin_open (input_plugin_t *this_gen 
  		    _("input_http: 3xx redirection: >%d %s<\n"),
  		    httpcode, httpstatus);
  	} else if (httpcode == 404) {
@@ -88,7 +88,7 @@ $OpenBSD: patch-src_input_input_http_c,v 1.4 2008/06/18 01:26:41 brad Exp $
        	  xine_log (this->stream->xine, XINE_LOG_MSG,
  		    _("input_http: http status not 2xx: >%d %s<\n"),
  		    httpcode, httpstatus);
-@@ -940,7 +940,7 @@ static int http_plugin_open (input_plugin_t *this_gen 
+@@ -949,7 +949,7 @@ static int http_plugin_open (input_plugin_t *this_gen 
      } else
        len ++;
      if ( len >= BUFSIZE ) {
diff --git a/multimedia/xine-lib/patches/patch-src_libfaad_Makefile_in b/multimedia/xine-lib/patches/patch-src_libfaad_Makefile_in
index 3823e45ace9..e3535d2e6d1 100644
--- a/multimedia/xine-lib/patches/patch-src_libfaad_Makefile_in
+++ b/multimedia/xine-lib/patches/patch-src_libfaad_Makefile_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_libfaad_Makefile_in,v 1.8 2008/06/18 01:26:41 brad Exp $
---- src/libfaad/Makefile.in.orig	Sat Jun 14 19:15:51 2008
-+++ src/libfaad/Makefile.in	Mon Jun 16 02:30:50 2008
+$OpenBSD: patch-src_libfaad_Makefile_in,v 1.9 2008/07/02 01:02:42 brad Exp $
+--- src/libfaad/Makefile.in.orig	Sun Jun 29 13:13:07 2008
++++ src/libfaad/Makefile.in	Sun Jun 29 20:54:13 2008
 @@ -68,43 +68,7 @@ LTLIBRARIES = $(xineplug_LTLIBRARIES)
  am__DEPENDENCIES_1 =
  xineplug_decode_faad_la_DEPENDENCIES = $(XINE_LIB) \
@@ -46,7 +46,7 @@ $OpenBSD: patch-src_libfaad_Makefile_in,v 1.8 2008/06/18 01:26:41 brad Exp $
  	xineplug_decode_faad_la-xine_faad_decoder.lo
  xineplug_decode_faad_la_OBJECTS =  \
  	$(am_xineplug_decode_faad_la_OBJECTS)
-@@ -455,97 +419,11 @@ SUBDIRS = codebook
+@@ -461,97 +425,11 @@ SUBDIRS = codebook
  xineplug_LTLIBRARIES = $(faad_module)
  xineplug_decode_faad_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) -fno-strict-aliasing
  xineplug_decode_faad_la_SOURCES = \
diff --git a/multimedia/xine-lib/patches/patch-src_libw32dll_wine_Makefile_in b/multimedia/xine-lib/patches/patch-src_libw32dll_wine_Makefile_in
index 0a861cb1fbb..ecd61c97d72 100644
--- a/multimedia/xine-lib/patches/patch-src_libw32dll_wine_Makefile_in
+++ b/multimedia/xine-lib/patches/patch-src_libw32dll_wine_Makefile_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_libw32dll_wine_Makefile_in,v 1.10 2008/06/18 01:26:41 brad Exp $
---- src/libw32dll/wine/Makefile.in.orig	Sat Jun 14 19:15:56 2008
-+++ src/libw32dll/wine/Makefile.in	Mon Jun 16 02:30:50 2008
+$OpenBSD: patch-src_libw32dll_wine_Makefile_in,v 1.11 2008/07/02 01:02:42 brad Exp $
+--- src/libw32dll/wine/Makefile.in.orig	Sun Jun 29 13:13:11 2008
++++ src/libw32dll/wine/Makefile.in	Sun Jun 29 20:54:14 2008
 @@ -61,7 +61,7 @@ LTLIBRARIES = $(noinst_LTLIBRARIES)
  libwine_la_LIBADD =
  am_libwine_la_OBJECTS = afl.lo driver.lo elfdll.lo ext.lo \
@@ -10,7 +10,7 @@ $OpenBSD: patch-src_libw32dll_wine_Makefile_in,v 1.10 2008/06/18 01:26:41 brad E
  libwine_la_OBJECTS = $(am_libwine_la_OBJECTS)
  @HAVE_W32DLL_TRUE@am_libwine_la_rpath =
  DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-@@ -423,6 +423,7 @@ libwine_la_SOURCES = \
+@@ -429,6 +429,7 @@ libwine_la_SOURCES = \
  	registry.c \
  	vfl.c \
  	win32.c \
@@ -18,7 +18,7 @@ $OpenBSD: patch-src_libw32dll_wine_Makefile_in,v 1.10 2008/06/18 01:26:41 brad E
  	stubs.s \
  	wrapper.S 
  
-@@ -528,6 +529,7 @@ distclean-compile:
+@@ -534,6 +535,7 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vfl.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/win32.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wrapper.Plo@am__quote@
diff --git a/multimedia/xine-lib/patches/patch-src_post_deinterlace_Makefile_in b/multimedia/xine-lib/patches/patch-src_post_deinterlace_Makefile_in
index d05e3a479c4..be46ed0b3eb 100644
--- a/multimedia/xine-lib/patches/patch-src_post_deinterlace_Makefile_in
+++ b/multimedia/xine-lib/patches/patch-src_post_deinterlace_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_post_deinterlace_Makefile_in,v 1.3 2008/06/18 01:26:41 brad Exp $
---- src/post/deinterlace/Makefile.in.orig	Sat Jun 14 19:15:57 2008
-+++ src/post/deinterlace/Makefile.in	Mon Jun 16 02:30:50 2008
-@@ -419,7 +419,7 @@ xinepostdir = $(XINE_PLUGINDIR)/post
+$OpenBSD: patch-src_post_deinterlace_Makefile_in,v 1.4 2008/07/02 01:02:42 brad Exp $
+--- src/post/deinterlace/Makefile.in.orig	Sun Jun 29 13:13:13 2008
++++ src/post/deinterlace/Makefile.in	Sun Jun 29 20:54:14 2008
+@@ -425,7 +425,7 @@ xinepostdir = $(XINE_PLUGINDIR)/post
  vidixdir = $(XINE_PLUGINDIR)/vidix
  SUBDIRS = plugins
  EXTRA_DIST = 
diff --git a/multimedia/xine-lib/patches/patch-src_post_deinterlace_plugins_Makefile_in b/multimedia/xine-lib/patches/patch-src_post_deinterlace_plugins_Makefile_in
index dbede3840e5..f15553828cf 100644
--- a/multimedia/xine-lib/patches/patch-src_post_deinterlace_plugins_Makefile_in
+++ b/multimedia/xine-lib/patches/patch-src_post_deinterlace_plugins_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_post_deinterlace_plugins_Makefile_in,v 1.3 2008/06/18 01:26:41 brad Exp $
---- src/post/deinterlace/plugins/Makefile.in.orig	Sat Jun 14 19:15:57 2008
-+++ src/post/deinterlace/plugins/Makefile.in	Mon Jun 16 02:30:50 2008
-@@ -851,7 +851,7 @@ maintainer-clean-generic:
+$OpenBSD: patch-src_post_deinterlace_plugins_Makefile_in,v 1.4 2008/07/02 01:02:42 brad Exp $
+--- src/post/deinterlace/plugins/Makefile.in.orig	Sun Jun 29 13:13:13 2008
++++ src/post/deinterlace/plugins/Makefile.in	Sun Jun 29 20:54:14 2008
+@@ -857,7 +857,7 @@ maintainer-clean-generic:
  	-rm -f Makefile.in
  
  # Avoid "can't find register" failures with -O0, -O2, -O3 (gcc 4.0)
diff --git a/multimedia/xine-lib/patches/patch-src_xine-engine_Makefile_in b/multimedia/xine-lib/patches/patch-src_xine-engine_Makefile_in
index d63b40c0b14..ffad39477b1 100644
--- a/multimedia/xine-lib/patches/patch-src_xine-engine_Makefile_in
+++ b/multimedia/xine-lib/patches/patch-src_xine-engine_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_xine-engine_Makefile_in,v 1.6 2008/06/18 01:26:41 brad Exp $
---- src/xine-engine/Makefile.in.orig	Sat Jun 14 19:16:00 2008
-+++ src/xine-engine/Makefile.in	Mon Jun 16 02:30:50 2008
-@@ -428,7 +428,7 @@ libxine_la_DEPENDENCIES = $(XINEUTILS_LIB) \
+$OpenBSD: patch-src_xine-engine_Makefile_in,v 1.7 2008/07/02 01:02:42 brad Exp $
+--- src/xine-engine/Makefile.in.orig	Sun Jun 29 13:13:17 2008
++++ src/xine-engine/Makefile.in	Sun Jun 29 20:54:14 2008
+@@ -434,7 +434,7 @@ libxine_la_DEPENDENCIES = $(XINEUTILS_LIB) \
  
  libxine_la_LIBADD = $(PTHREAD_LIBS) $(DYNAMIC_LD_LIBS) $(LTLIBINTL) $(ZLIB_LIBS) \
  		    -lm $(XINEUTILS_LIB) $(LTLIBICONV) $(FT2_LIBS) $(FONTCONFIG_LIBS) \
diff --git a/multimedia/xine-lib/patches/patch-src_xine-engine_xine_c b/multimedia/xine-lib/patches/patch-src_xine-engine_xine_c
index 7f75def130a..e81ecbeeeb6 100644
--- a/multimedia/xine-lib/patches/patch-src_xine-engine_xine_c
+++ b/multimedia/xine-lib/patches/patch-src_xine-engine_xine_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_xine-engine_xine_c,v 1.6 2008/06/18 01:26:41 brad Exp $
---- src/xine-engine/xine.c.orig	Sat Jun 14 19:15:00 2008
-+++ src/xine-engine/xine.c	Mon Jun 16 02:30:51 2008
-@@ -1648,7 +1648,7 @@ static void config_save_cb (void *this_gen, xine_cfg_e
+$OpenBSD: patch-src_xine-engine_xine_c,v 1.7 2008/07/02 01:02:42 brad Exp $
+--- src/xine-engine/xine.c.orig	Wed Jun 25 09:04:09 2008
++++ src/xine-engine/xine.c	Sun Jun 29 20:54:15 2008
+@@ -1669,7 +1669,7 @@ static void config_save_cb (void *this_gen, xine_cfg_e
      pthread_mutex_lock(&this->streams_lock);
      if ( (ite = xine_list_front(this->streams)) ) {
        stream = xine_list_get_value(this->streams, ite);