Update to 0.99.5:

After long time, a new xine-ui version is now available. There are fixes
for security issues with playlists (upgrade recommended!), fixes for crashes,
memleaks and bugs. Functional enhancements and features are added,
appearance of non-skinned windows is harmonized (with more space for
text), translations are updated.

23 files changed, 45 insertions, 601 deletions

diff --git a/multimedia/xine-ui/Makefile b/multimedia/xine-ui/Makefile
index dc9b482a561..c99d7811ddb 100644
--- a/multimedia/xine-ui/Makefile
+++ b/multimedia/xine-ui/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2007/02/17 22:48:16 salo Exp $
+# $NetBSD: Makefile,v 1.35 2007/07/15 19:41:28 xtraeme Exp $
 #
 
-DISTNAME=		xine-ui-0.99.4
-PKGREVISION=		8
+DISTNAME=		xine-ui-0.99.5
 CATEGORIES=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xine/}
 
@@ -13,7 +12,7 @@ COMMENT=		Skinned xlib-based xine GUI
 BUILDLINK_API_DEPENDS.curl+=	curl>7.10.2
 
 USE_PKGLOCALEDIR=	YES
-USE_TOOLS+=		msgfmt
+USE_TOOLS+=		msgfmt pkg-config
 USE_DIRS+=		xdg-1.1
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
@@ -21,6 +20,8 @@ USE_GNU_READLINE=	yes
 
 BUILDLINK_DEPMETHOD.libXt?=	build
 
+PTHREAD_AUTO_VARS=	yes
+
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
diff --git a/multimedia/xine-ui/PLIST b/multimedia/xine-ui/PLIST
index 949ffd2f5c9..8716a4835c2 100644
--- a/multimedia/xine-ui/PLIST
+++ b/multimedia/xine-ui/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2007/02/11 17:19:49 drochner Exp $
+@comment $NetBSD: PLIST,v 1.7 2007/07/15 19:41:28 xtraeme Exp $
 bin/fbxine
 bin/xine
 bin/xine-bugreport
@@ -32,10 +32,15 @@ share/doc/xine-ui/README_it
 share/doc/xine-ui/README_pl
 share/doc/xine-ui/README_uk
 share/doc/xitk/README
+share/icons/hicolor/16x16/apps/xine.png
+share/icons/hicolor/22x22/apps/xine.png
+share/icons/hicolor/32x32/apps/xine.png
+share/icons/hicolor/48x48/apps/xine.png
 share/locale/cs/LC_MESSAGES/xine-ui.mo
 share/locale/cs/LC_MESSAGES/xitk.mo
 share/locale/de/LC_MESSAGES/xine-ui.mo
 share/locale/de/LC_MESSAGES/xitk.mo
+share/locale/eo/LC_MESSAGES/xine-ui.mo
 share/locale/es/LC_MESSAGES/xine-ui.mo
 share/locale/es/LC_MESSAGES/xitk.mo
 share/locale/eu/LC_MESSAGES/xine-ui.mo
@@ -46,6 +51,8 @@ share/locale/it/LC_MESSAGES/xine-ui.mo
 share/locale/it/LC_MESSAGES/xitk.mo
 share/locale/ja/LC_MESSAGES/xine-ui.mo
 share/locale/ja/LC_MESSAGES/xitk.mo
+share/locale/nb/LC_MESSAGES/xine-ui.mo
+share/locale/nb/LC_MESSAGES/xitk.mo
 share/locale/pl/LC_MESSAGES/xine-ui.mo
 share/locale/pl/LC_MESSAGES/xitk.mo
 share/locale/pt_BR/LC_MESSAGES/xine-ui.mo
@@ -57,10 +64,6 @@ share/locale/sk/LC_MESSAGES/xitk.mo
 share/locale/uk/LC_MESSAGES/xine-ui.mo
 share/locale/uk/LC_MESSAGES/xitk.mo
 share/pixmaps/xine.xpm
-share/pixmaps/xine_16x16.png
-share/pixmaps/xine_22x22.png
-share/pixmaps/xine_32x32.png
-share/pixmaps/xine_48x48.png
 share/xine/desktop/xine.desktop
 share/xine/oxine/mainmenu
 share/xine/oxine/mediamarks
@@ -134,6 +137,17 @@ share/xine/visuals/default.avi
 @dirrm share/xine/skins
 @dirrm share/xine/oxine
 @dirrm share/xine/desktop
+@dirrm share/xine
 @comment in xdg-dirs: @dirrm share/pixmaps
+@dirrm share/icons/hicolor/48x48/apps
+@dirrm share/icons/hicolor/48x48
+@dirrm share/icons/hicolor/32x32/apps
+@dirrm share/icons/hicolor/32x32
+@dirrm share/icons/hicolor/22x22/apps
+@dirrm share/icons/hicolor/22x22
+@dirrm share/icons/hicolor/16x16/apps
+@dirrm share/icons/hicolor/16x16
+@dirrm share/icons/hicolor
+@comment in xdg-dirs: @dirrm share/icons
 @dirrm share/doc/xitk
 @dirrm share/doc/xine-ui
diff --git a/multimedia/xine-ui/distinfo b/multimedia/xine-ui/distinfo
index c53329701ea..506a1f15aff 100644
--- a/multimedia/xine-ui/distinfo
+++ b/multimedia/xine-ui/distinfo
@@ -1,27 +1,9 @@
-$NetBSD: distinfo,v 1.14 2007/02/17 22:48:16 salo Exp $
+$NetBSD: distinfo,v 1.15 2007/07/15 19:41:28 xtraeme Exp $
 
-SHA1 (xine-ui-0.99.4.tar.gz) = b982e5697f183559c216f9243b9410d61b9c58aa
-RMD160 (xine-ui-0.99.4.tar.gz) = eeead5c6e566ade5505c8fcb924272c74eb4f49a
-Size (xine-ui-0.99.4.tar.gz) = 2544984 bytes
-SHA1 (patch-aa) = 4221e235da0b2047d218a9123f82a40cce92e15b
+SHA1 (xine-ui-0.99.5.tar.gz) = 4f452516319f31cda01d08ea2779f195933af0bb
+RMD160 (xine-ui-0.99.5.tar.gz) = 64cb69549d88d904d986ea7dd7b36a51d5b91756
+Size (xine-ui-0.99.5.tar.gz) = 2606481 bytes
+SHA1 (patch-aa) = 9a4bc545b2574477aaba82604e9e794617ee4cdc
 SHA1 (patch-ae) = 1d5887168efd340f047dfdb9e135ce12c18e2d5f
 SHA1 (patch-ag) = dddbea5257a5b21e3a7ba21207661f4a47a9fa7e
-SHA1 (patch-ah) = 9d61282de803459e4b9c49814796dcc97658849d
-SHA1 (patch-ai) = 68bd0bdb39ecacd993335707a8843fd696067633
-SHA1 (patch-al) = d00f3ad348450e209d55ba69c1c053fce7d359b3
-SHA1 (patch-am) = 57567b2c1f86ef575ff4abcbfaa5f06e3178a056
-SHA1 (patch-ao) = 09e83615b88dffbdfeb0b0bad07dcdc60024ba67
-SHA1 (patch-ap) = f4f360e5fc8008882f07c649b7ea29ef163c6731
-SHA1 (patch-aq) = 393f889a397c60a9cb1940f197e92efd12cb13bb
-SHA1 (patch-ar) = 50c45ce7c272385100bc562b8d1d668c3d860df7
-SHA1 (patch-as) = 96f680bcab84c7a832f0ea4ae2b6a5b687f79244
-SHA1 (patch-at) = 4d11203d056c45474e24b4e840e031720d840d55
-SHA1 (patch-au) = 1ab308585b3c806931fc0dd60dd82794a46cc4a9
-SHA1 (patch-av) = 0d36d3f7603752e5bfe98215ced4a878d4ec2058
-SHA1 (patch-aw) = 2cbb4e5a17faa79fb8d6607e52a9fa9d965ac884
-SHA1 (patch-ax) = 5388a8cb6fa73bbc001e7b1ad2ed4d25dc2425a8
-SHA1 (patch-ay) = f7252e705e017957238c3be37fbe52aea698785b
-SHA1 (patch-az) = 696c9a25ac25ba7940d976399519caadc4932c4b
-SHA1 (patch-ba) = 02493f55c8c1330a1eae6c109b51a4f5cdbe12d1
-SHA1 (patch-bb) = ebbfcc327d3918b152205a7907fc7c4252b7e1c2
-SHA1 (patch-bc) = 584d14552fd0acaaf32e64a4fa8c2886b4b16b84
+SHA1 (patch-at) = 433c648bbeea1a73189ab4e42c3c9ce4c4610290
diff --git a/multimedia/xine-ui/patches/patch-aa b/multimedia/xine-ui/patches/patch-aa
index 7be485f7ea9..8d0d22acd34 100644
--- a/multimedia/xine-ui/patches/patch-aa
+++ b/multimedia/xine-ui/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.5 2006/04/09 07:26:52 xtraeme Exp $
+$NetBSD: patch-aa,v 1.6 2007/07/15 19:41:28 xtraeme Exp $
 
---- doc/man/Makefile.in.orig	2006-04-08 21:22:54.000000000 +0200
-+++ doc/man/Makefile.in	2006-04-08 21:23:16.000000000 +0200
-@@ -280,7 +280,7 @@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
+--- doc/man/Makefile.in.orig	2007-07-15 21:13:56.000000000 +0200
++++ doc/man/Makefile.in	2007-07-15 21:14:08.000000000 +0200
+@@ -246,7 +246,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
 -SUBDIRS = fr es en pl de
 +SUBDIRS = en
  all: all-recursive
diff --git a/multimedia/xine-ui/patches/patch-ah b/multimedia/xine-ui/patches/patch-ah
deleted file mode 100644
index bec971a4e15..00000000000
--- a/multimedia/xine-ui/patches/patch-ah
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2004/03/28 21:11:35 mycroft Exp $
-
---- src/common/utils.c.orig	2003-12-18 00:30:11.000000000 +0000
-+++ src/common/utils.c	2004-03-28 20:55:10.000000000 +0000
-@@ -34,7 +34,6 @@
- #include <sys/stat.h>
- #include <sys/wait.h>
- #include <sys/utsname.h>
--#include <alloca.h>
- 
- #ifdef HAVE_X11
- #include <X11/Xlib.h>
-@@ -47,6 +46,10 @@
- #include <X11/Xutil.h>
- #endif /* !HAVE_X11 */
- 
-+#ifdef HAVE_ALLOCA_H
-+#include <alloca.h>
-+#endif
-+
- #include <xine/xineutils.h>
- 
- #include "utils.h"
diff --git a/multimedia/xine-ui/patches/patch-ai b/multimedia/xine-ui/patches/patch-ai
deleted file mode 100644
index 5ecf6aa276f..00000000000
--- a/multimedia/xine-ui/patches/patch-ai
+++ /dev/null
@@ -1,149 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2007/02/17 22:48:16 salo Exp $
-
---- src/xitk/xine-remote.c.orig	2005-07-16 21:05:32.000000000 +0200
-+++ src/xitk/xine-remote.c	2007-02-17 22:24:26.000000000 +0100
-@@ -30,6 +30,7 @@
- #endif
- /* required for strncasecmp() */
- #define _BSD_SOURCE 1
-+#define _NETBSD_SOURCE
- /* required to enable POSIX variant of getpwuid_r on solaris */
- #define _POSIX_PTHREAD_SEMANTICS 1
- 
-@@ -58,7 +59,7 @@
- #include <sys/ioctl.h>
- #include <sys/types.h>
- #include <sys/stat.h>
--#include <sys/signal.h>
-+#include <signal.h>
- #include <sys/time.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
-@@ -66,8 +67,8 @@
- #include <netdb.h>
- #include <pthread.h>
- 
--#include <readline.h>
--#include <history.h>
-+#include <readline/readline.h>
-+#include <readline/history.h>
- 
- #include "common.h"
- 
-@@ -638,7 +639,7 @@ static int write_to_console(session_t *s
-   va_end(args);
-   
-   pthread_mutex_lock(&session->console_mutex);
--  err = write_to_console_unlocked(session, buf);
-+  err = write_to_console_unlocked(session, "%s", buf);
-   pthread_mutex_unlock(&session->console_mutex);
- 
-   return err;
-@@ -998,7 +999,7 @@ static void *select_thread(void *data) {
- 		  write_to_console_unlocked_nocr(session, "\b \b");
- 		  pos--;
- 		}
--		write_to_console_unlocked(session, obuffer);
-+		write_to_console_unlocked(session, "%s", obuffer);
- 
- 		rl_crlf();
- 		rl_forced_update_display();
-@@ -1082,7 +1083,7 @@ static void client_handle_command(sessio
- 	  
- 	  *pp = '\0';
- 	  
--	  if((sock_write(session->socket, buf)) == -1) {
-+	  if((sock_write(session->socket, "%s", buf)) == -1) {
- 	    session->running = 0;
- 	  }
- 	}
-@@ -1094,7 +1095,7 @@ static void client_handle_command(sessio
-   
-   /* Perhaps a ';' separated commands, so send anyway to server */
-   if(found == 0) {
--    sock_write(session->socket, (char *)command);
-+    sock_write(session->socket, "%s", (char *)command);
-   }
-   
-   if((!strncasecmp(cmd, "exit", strlen(cmd))) || (!strncasecmp(cmd, "halt", strlen(cmd)))) {
-@@ -1714,7 +1715,7 @@ static void do_commands(commands_t *cmd,
-     i++;
-   }
-   sprintf(buf, "%s.\n", buf);
--  sock_write(client_info->socket, buf);
-+  sock_write(client_info->socket, "%s", buf);
- }
- 
- static void do_help(commands_t *cmd, client_info_t *client_info) {
-@@ -1760,7 +1761,7 @@ static void do_help(commands_t *cmd, cli
-     }
-     
-     sprintf(buf, "%s\n", buf);
--    sock_write(client_info->socket, buf);
-+    sock_write(client_info->socket, "%s", buf);
-   }
-   else {
-     int i;
-@@ -2096,7 +2097,7 @@ static void do_get(commands_t *cmd, clie
- 	  sprintf(buf, "%s%s", buf, "*UNKNOWN*");
- 	
- 	sprintf(buf, "%s%c", buf, '\n');
--	sock_write(client_info->socket, buf);
-+	sock_write(client_info->socket, "%s", buf);
-       }
-       else if(is_arg_contain(client_info, 1, "speed")) {
- 	char buf[64];
-@@ -2116,7 +2117,7 @@ static void do_get(commands_t *cmd, clie
- 	  sprintf(buf, "%s%s", buf, "*UNKNOWN*");
- 	
- 	sprintf(buf, "%s%c", buf, '\n');
--	sock_write(client_info->socket, buf);
-+	sock_write(client_info->socket, "%s", buf);
-       }
-       else if(is_arg_contain(client_info, 1, "position")) {
- 	char buf[64];
-@@ -2128,7 +2129,7 @@ static void do_get(commands_t *cmd, clie
- 			    &pos_time,
- 			    &length_time);
- 	snprintf(buf, sizeof(buf), "%s: %d\n", "Current position", pos_time);
--	sock_write(client_info->socket, buf);
-+	sock_write(client_info->socket, "%s", buf);
-       }
-       else if(is_arg_contain(client_info, 1, "length")) {
- 	char buf[64];
-@@ -2140,7 +2141,7 @@ static void do_get(commands_t *cmd, clie
- 			    &pos_time,
- 			    &length_time);
- 	snprintf(buf, sizeof(buf), "%s: %d\n", "Current length", length_time);
--	sock_write(client_info->socket, buf);
-+	sock_write(client_info->socket, "%s", buf);
-       }
-       else if(is_arg_contain(client_info, 1, "loop")) {
- 	char buf[64];
-@@ -2169,7 +2170,7 @@ static void do_get(commands_t *cmd, clie
- 	}
- 
- 	sprintf(buf, "%s.\n", buf);
--	sock_write(client_info->socket, buf);
-+	sock_write(client_info->socket, "%s", buf);
-       }
-     }
-     else if(nargs >= 2) {
-@@ -2552,7 +2553,7 @@ static void do_halt(commands_t *cmd, cli
- static void network_messenger(void *data, char *message) {
-   int socket = (int) data;
-   
--  sock_write(socket, message);
-+  sock_write(socket, "%s", message);
- }
- 
- static void do_snap(commands_t *cmd, client_info_t *client_info) {
-@@ -2577,7 +2578,7 @@ static void say_hello(client_info_t *cli
-   else {
-     snprintf(buf, sizeof(buf), "%s %s %s\n", PACKAGE, VERSION, "remote server. Nice to meet you.");
-   }
--  sock_write(client_info->socket, buf);
-+  sock_write(client_info->socket, "%s", buf);
-   
- }
- 
diff --git a/multimedia/xine-ui/patches/patch-al b/multimedia/xine-ui/patches/patch-al
deleted file mode 100644
index d248854afd9..00000000000
--- a/multimedia/xine-ui/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.1 2005/09/20 12:15:34 dmcmahill Exp $
-
---- src/xitk/Makefile.am.orig	2004-04-21 18:35:05.000000000 -0400
-+++ src/xitk/Makefile.am
-@@ -66,7 +66,7 @@ xine_LDADD = @XINE_LIBS@ $(top_builddir)
- xine_remote_SOURCES = xine-remote.c
- xine_remote_DEPENDENCIES = $(top_builddir)/src/common/libcommon.la \
- 			   xine-remote.c
--xine_remote_LDADD = $(INTLLIBS) $(NET_LIBS) $(THREAD_LIBS) $(READLINE_LIBS) $(NCURSES_LIB) \
-+xine_remote_LDADD = @XINE_LIBS@ $(INTLLIBS) $(NET_LIBS) $(THREAD_LIBS) $(READLINE_LIBS) $(NCURSES_LIB) \
- 	$(top_builddir)/src/common/libcommon.la $(DBG_LIBS)
- 
- session_ctrl_LDADD = @XINE_LIBS@ $(top_builddir)/src/common/libcommon.la $(DBG_LIBS)
diff --git a/multimedia/xine-ui/patches/patch-am b/multimedia/xine-ui/patches/patch-am
deleted file mode 100644
index 2a4c178dae1..00000000000
--- a/multimedia/xine-ui/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.2 2006/04/09 07:26:52 xtraeme Exp $
-
---- src/xitk/Makefile.in.orig	2006-04-08 21:02:11.000000000 +0200
-+++ src/xitk/Makefile.in	2006-04-08 21:02:20.000000000 +0200
-@@ -397,7 +397,7 @@
- xine_remote_DEPENDENCIES = $(top_builddir)/src/common/libcommon.la \
- 			   xine-remote.c
- 
--xine_remote_LDADD = $(INTLLIBS) $(NET_LIBS) $(THREAD_LIBS) $(READLINE_LIBS) $(NCURSES_LIB) \
-+xine_remote_LDADD = @XINE_LIBS@ $(INTLLIBS) $(NET_LIBS) $(THREAD_LIBS) $(READLINE_LIBS) $(NCURSES_LIB) \
- 	$(top_builddir)/src/common/libcommon.la $(DBG_LIBS)
- 
- session_ctrl_LDADD = @XINE_LIBS@ $(top_builddir)/src/common/libcommon.la $(DBG_LIBS)
diff --git a/multimedia/xine-ui/patches/patch-ao b/multimedia/xine-ui/patches/patch-ao
deleted file mode 100644
index 93ad9163680..00000000000
--- a/multimedia/xine-ui/patches/patch-ao
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2005/10/10 22:52:44 joerg Exp $
-
---- configure.orig	2005-07-10 21:44:30.000000000 +0000
-+++ configure
-@@ -22988,7 +22988,7 @@ CFLAGS="$SAVE_CFLAGS"
- 
- 
- case "$host" in
--  *-*-freebsd*|*-*-openbsd*)
-+  *-*-freebsd*|*-*-openbsd* | *-*-dragonfly*)
-     THREAD_LIBS="-L/usr/local/lib -pthread"
-     THREAD_CFLAGS="-I/usr/local/include -D_THREAD_SAFE"
-     CFLAGS="-L/usr/local/lib $THREAD_CFLAGS $CFLAGS"
-@@ -28623,7 +28623,7 @@ if test "$host_or_hostalias" = ""; then
- fi
- 
- case "$host_or_hostalias" in
--  i386-*-freebsd*)
-+  i386-*-freebsd* | i386-*-dragonfly*)
-     CFLAGS="-pipe -fomit-frame-pointer $f_af $f_al $f_aj $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -finline-functions -D_REENTRANT $CFLAGS"
-     DEBUG_CFLAGS="$X_CFLAGS -D_REENTRANT -DDEBUG $DEBUG_CFLAGS"
- 
diff --git a/multimedia/xine-ui/patches/patch-ap b/multimedia/xine-ui/patches/patch-ap
deleted file mode 100644
index 44a2ebdafd4..00000000000
--- a/multimedia/xine-ui/patches/patch-ap
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-ap,v 1.2 2006/04/09 08:21:22 xtraeme Exp $
-
---- src/xitk/oxine/mediamarks.c.orig	Tue Sep 20 23:58:50 2005
-+++ src/xitk/oxine/mediamarks.c	Wed Sep 21 00:13:23 2005
-@@ -439,34 +439,19 @@
- 
- static void parse_m3u(const char *mrl, list_t *items) {
-   FILE *file;
--  char **line;
--  int *n;
--  int a;
-+  char line[1024];
- 
-   file = fopen(mrl, "r");
--  if(!file) return ;
-+  if(!file) return;
- 
--  n = ho_new(size_t);
--  line = ho_new(char *);
--
--  *line = NULL;
--  *n = 0;
--  a = getline(line, n, file);
--  if(a<=0) return;
--
--  while((a = getline(line, n, file))>0) {
--    char *str;
-+  while(fgets(line, sizeof(line) - 1, file) != NULL) {
-     playitem_t *item;
- 
--    if(*line[0] == '#') continue;
--    str = strndup(*line, a-1);
-+    if(line[0] == '#') continue;
-     /* printf("%s\n", str); */
--    item = playitem_new (TYPE_REG, basename(str), str, list_new());
--    ho_free(str);
-+    item = playitem_new (TYPE_REG, basename(line), line, list_new());
-     playitem_append(item, items);
-   }
--  ho_free(line);
--  ho_free(n);
-   fclose(file);
- }
diff --git a/multimedia/xine-ui/patches/patch-aq b/multimedia/xine-ui/patches/patch-aq
deleted file mode 100644
index 46a576d8ce1..00000000000
--- a/multimedia/xine-ui/patches/patch-aq
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-aq,v 1.2 2007/02/17 22:48:16 salo Exp $
-
---- src/xitk/main.c.orig	2007-02-17 22:10:56.000000000 +0100
-+++ src/xitk/main.c	2007-02-17 22:10:38.000000000 +0100
-@@ -456,7 +456,7 @@ static void print_formatted(char *title,
-   int          len;
-   char        *blanks = "     ";
- 
--  printf(title);
-+  printf("%s", title);
-   
-   sprintf(buffer, "%s", blanks);
-   plugin = *plugins++;
-@@ -469,7 +469,7 @@ static void print_formatted(char *title,
-       sprintf(buffer, "%s%s%s", buffer, (strlen(buffer) == strlen(blanks)) ? "" : ", ", plugin);
-     }
-     else {
--      printf(buffer);
-+      printf("%s", buffer);
-       printf(",\n");
-       snprintf(buffer, sizeof(buffer), "%s%s", blanks, plugin);
-     }
-@@ -478,7 +478,7 @@ static void print_formatted(char *title,
-   }
-   
-   if(strlen(buffer))
--    printf(buffer);
-+    printf("%s", buffer);
-   
-   printf(".\n\n");
- }
-@@ -1249,7 +1249,7 @@ static void event_listener(void *user_da
-       snprintf(buffer, sizeof(buffer), "%s [%d%%]\n", pevent->description, pevent->percent);
-       gGui->mrl_overrided = 3;
-       panel_set_title(buffer);
--      osd_display_info(buffer);
-+      osd_display_info("%s", buffer);
-     }
-     break;
- 
diff --git a/multimedia/xine-ui/patches/patch-ar b/multimedia/xine-ui/patches/patch-ar
deleted file mode 100644
index 26c0cd4199e..00000000000
--- a/multimedia/xine-ui/patches/patch-ar
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ar,v 1.2 2007/01/09 14:52:41 drochner Exp $
-
---- src/xitk/xine-toolkit/xitk.c.orig	2005-05-21 00:02:05.000000000 +0200
-+++ src/xitk/xine-toolkit/xitk.c
-@@ -147,7 +147,7 @@ typedef struct {
-   
-   struct timeval              keypress;
- 
--  KeyCode                     ignore_keys[3];
-+  KeyCode                     ignore_keys[2];
- 
-   pthread_t                  *tips_thread;
-   unsigned long               tips_timeout;
-@@ -1805,9 +1805,8 @@ void xitk_init(Display *display, XColor 
-   xitk_x_error           = 0;
-   gXitk->x_error_handler = NULL;
-   gXitk->modalw          = None;
--  gXitk->ignore_keys[0]  = XKeysymToKeycode(display, XK_Scroll_Lock);
--  gXitk->ignore_keys[1]  = XKeysymToKeycode(display, XK_Num_Lock);
--  gXitk->ignore_keys[2]  = XKeysymToKeycode(display, XK_Caps_Lock);
-+  gXitk->ignore_keys[0]  = XKeysymToKeycode(display, XK_Shift_L);
-+  gXitk->ignore_keys[1]  = XKeysymToKeycode(display, XK_Control_L);
-   gXitk->tips_timeout    = TIPS_TIMEOUT;
-   XGetInputFocus(display, &(gXitk->parent.window), &(gXitk->parent.focus));
- 
-@@ -1877,7 +1876,7 @@ void xitk_init(Display *display, XColor 
-   sprintf(buffer, "%s%s", buffer, " ]-");
- 
-   if(verbosity)
--    printf(buffer);
-+    printf("%s", buffer);
- 
-   gXitk->wm_type = xitk_check_wm(display);
-   
diff --git a/multimedia/xine-ui/patches/patch-as b/multimedia/xine-ui/patches/patch-as
deleted file mode 100644
index adee45b0309..00000000000
--- a/multimedia/xine-ui/patches/patch-as
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-as,v 1.1 2007/01/09 14:52:41 drochner Exp $
-
---- src/xitk/videowin.c.orig	2007-01-08 18:39:40.000000000 +0100
-+++ src/xitk/videowin.c
-@@ -1449,8 +1449,8 @@ void video_window_init (window_attribute
-   gVw->desktopHeight      = DisplayHeight(gGui->video_display, gGui->video_screen);
- 
- #ifdef HAVE_XTESTEXTENSION
--  gVw->fake_keys[0] = XKeysymToKeycode(gGui->video_display, XK_Scroll_Lock);
--  gVw->fake_keys[1] = XKeysymToKeycode(gGui->video_display, XK_Num_Lock);
-+  gVw->fake_keys[0] = XKeysymToKeycode(gGui->video_display, XK_Shift_L);
-+  gVw->fake_keys[1] = XKeysymToKeycode(gGui->video_display, XK_Control_L);
-   gVw->fake_key_cur = 0;
- #endif
-   
-@@ -2151,8 +2151,6 @@ void video_window_reset_ssaver(void) {
-       XLockDisplay(gGui->video_display);
-       XTestFakeKeyEvent(gGui->video_display, gVw->fake_keys[gVw->fake_key_cur], True, CurrentTime);
-       XTestFakeKeyEvent(gGui->video_display, gVw->fake_keys[gVw->fake_key_cur], False, CurrentTime);
--      XTestFakeKeyEvent(gGui->video_display, gVw->fake_keys[gVw->fake_key_cur], True, CurrentTime);
--      XTestFakeKeyEvent(gGui->video_display, gVw->fake_keys[gVw->fake_key_cur], False, CurrentTime);
-       XSync(gGui->video_display, False);
-       XUnlockDisplay(gGui->video_display);
-     }
diff --git a/multimedia/xine-ui/patches/patch-at b/multimedia/xine-ui/patches/patch-at
index 0e91c8af3fb..31568757f32 100644
--- a/multimedia/xine-ui/patches/patch-at
+++ b/multimedia/xine-ui/patches/patch-at
@@ -1,13 +1,13 @@
-$NetBSD: patch-at,v 1.1 2007/02/11 17:19:49 drochner Exp $
+$NetBSD: patch-at,v 1.2 2007/07/15 19:41:30 xtraeme Exp $
 
---- doc/man/en/Makefile.in.orig	2007-02-11 18:07:38.000000000 +0100
-+++ doc/man/en/Makefile.in
-@@ -277,7 +277,7 @@ target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
+--- doc/man/en/Makefile.in.orig	2007-07-15 21:13:06.000000000 +0200
++++ doc/man/en/Makefile.in	2007-07-15 21:13:17.000000000 +0200
+@@ -243,7 +243,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
 -manfiles = xine.1 aaxine.1 xine-check.1 xine-remote.1
 +manfiles = xine.1 xine-check.1 xine-remote.1
  man_MANS = $(manfiles) xine-bugreport.1
  EXTRA_DIST = $(manfiles) xine.1.in aaxine.1.in
- all: all-am
+ DISTCLEANFILES = xine-bugreport.1
diff --git a/multimedia/xine-ui/patches/patch-au b/multimedia/xine-ui/patches/patch-au
deleted file mode 100644
index f3c2d921551..00000000000
--- a/multimedia/xine-ui/patches/patch-au
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-au,v 1.1 2007/02/17 22:48:16 salo Exp $
-
---- src/fb/osd.c.orig	2003-12-01 18:23:27.000000000 +0100
-+++ src/fb/osd.c	2007-02-17 21:56:02.000000000 +0100
-@@ -589,7 +589,7 @@ void osd_display_spu_lang(void) {
-   }
-   
-   sprintf(buffer, "Subtitles: %s", lang);
--  osd_display_info(buffer);
-+  osd_display_info("%s", buffer);
- }
- 
- void osd_display_audio_lang(void) {
-@@ -618,5 +618,5 @@ void osd_display_audio_lang(void) {
-   }
- 
-   sprintf(buffer, "Audio Channel: %s", lang);
--  osd_display_info(buffer);
-+  osd_display_info("%s", buffer);
- }
diff --git a/multimedia/xine-ui/patches/patch-av b/multimedia/xine-ui/patches/patch-av
deleted file mode 100644
index c45f9d37309..00000000000
--- a/multimedia/xine-ui/patches/patch-av
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-av,v 1.1 2007/02/17 22:48:16 salo Exp $
-
---- src/xitk/actions.c.orig	2005-07-24 04:40:36.000000000 +0200
-+++ src/xitk/actions.c	2007-02-17 21:56:02.000000000 +0100
-@@ -398,7 +398,7 @@ int gui_xine_play(xine_stream_t *stream,
-     
- 
-     if(v_unhandled && a_unhandled) {
--      xine_error(buffer);
-+      xine_error("%s", buffer);
-       return 0;
-     }
- 
-@@ -416,7 +416,7 @@ int gui_xine_play(xine_stream_t *stream,
-       xw = xitk_window_dialog_yesno_with_width(gGui->imlib_data, _("Start Playback ?"), 
- 					       start_anyway_yesno, start_anyway_yesno, 
- 					       NULL, 400, ALIGN_CENTER,
--					       buffer);
-+					       "%s", buffer);
-       XLockDisplay(gGui->display);
-       if(!gGui->use_root_window && gGui->video_display == gGui->display)
- 	XSetTransientForHint(gGui->display, xitk_window_get_window(xw), gGui->video_window);
diff --git a/multimedia/xine-ui/patches/patch-aw b/multimedia/xine-ui/patches/patch-aw
deleted file mode 100644
index 1c8935db45c..00000000000
--- a/multimedia/xine-ui/patches/patch-aw
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-aw,v 1.1 2007/02/17 22:48:16 salo Exp $
-
---- src/xitk/errors.c.orig	2005-02-07 19:16:28.000000000 +0100
-+++ src/xitk/errors.c	2007-02-17 21:56:02.000000000 +0100
-@@ -68,7 +68,7 @@ static void errors_create_window(char *t
- 						 _("Done"), _("More..."),
- 						 NULL, _errors_display_log, 
- 						 NULL, 400, ALIGN_CENTER,
--						 message);
-+						 "%s", message);
- 
-   xitk_window_set_parent_window(xw, gGui->video_window);
- 
-@@ -125,7 +125,7 @@ void xine_error(char *message, ...) {
-     } else {
-       xitk_window_t *xw;
- 
--      xw = xitk_window_dialog_error(gGui->imlib_data, buf2);
-+      xw = xitk_window_dialog_error(gGui->imlib_data, "%s", buf2);
- 
-       if(!gGui->use_root_window && gGui->video_display == gGui->display) {
-         XLockDisplay(gGui->display);
-@@ -228,7 +228,7 @@ void xine_info(char *message, ...) {
-     } else {
-       xitk_window_t *xw;
- 
--      xw = xitk_window_dialog_info(gGui->imlib_data, buf2);
-+      xw = xitk_window_dialog_info(gGui->imlib_data, "%s", buf2);
- 
-       if(!gGui->use_root_window && gGui->video_display == gGui->display) {
-         XLockDisplay(gGui->display);
-@@ -354,7 +354,7 @@ void too_slow_window(void) {
-                                                  _("Disable this warning."),
-                                                  checked, _dont_show_too_slow_again,
- 						 NULL, 500, ALIGN_CENTER,
--						 message);
-+						 "%s", message);
-   if(!gGui->use_root_window && gGui->video_display == gGui->display) {
-     XLockDisplay(gGui->display);
-     XSetTransientForHint(gGui->display, xitk_window_get_window(xw), gGui->video_window);
diff --git a/multimedia/xine-ui/patches/patch-ax b/multimedia/xine-ui/patches/patch-ax
deleted file mode 100644
index 6a776a364c8..00000000000
--- a/multimedia/xine-ui/patches/patch-ax
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ax,v 1.1 2007/02/17 22:48:17 salo Exp $
-
---- src/xitk/file_browser.c.orig	2005-05-29 12:43:40.000000000 +0200
-+++ src/xitk/file_browser.c	2007-02-17 21:56:02.000000000 +0100
-@@ -1012,7 +1012,7 @@ static void fb_delete_file(xitk_widget_t
-     xitk_window_dialog_yesno(gGui->imlib_data, _("Confirm deletion ?"),
- 			     fb_delete_file_cb, 
- 			     fb_delete_file_cb, 
--			     (void *)fb, ALIGN_DEFAULT, buf);
-+			     (void *)fb, ALIGN_DEFAULT, "%s", buf);
-   }
- }
- 
diff --git a/multimedia/xine-ui/patches/patch-ay b/multimedia/xine-ui/patches/patch-ay
deleted file mode 100644
index 3d2a8e1cbd3..00000000000
--- a/multimedia/xine-ui/patches/patch-ay
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ay,v 1.1 2007/02/17 22:48:17 salo Exp $
-
---- src/xitk/kbindings.c.orig	2005-07-16 21:05:31.000000000 +0200
-+++ src/xitk/kbindings.c	2007-02-17 21:56:02.000000000 +0100
-@@ -622,7 +622,7 @@ static void _kbindings_check_redundancy(
- 						     _("Reset"), _("Editor"), _("Cancel"),
- 						     _kbinding_reset_cb, _kbinding_editor_cb, NULL,
- 						     (void *) kbt, 450, ALIGN_CENTER,
--						     kmsg);
-+						     "%s", kmsg);
-     free(kmsg);
-     XLockDisplay(gGui->display);
-     if(!gGui->use_root_window && gGui->video_display == gGui->display)
diff --git a/multimedia/xine-ui/patches/patch-az b/multimedia/xine-ui/patches/patch-az
deleted file mode 100644
index 7d7b1068d7c..00000000000
--- a/multimedia/xine-ui/patches/patch-az
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-az,v 1.1 2007/02/17 22:48:17 salo Exp $
-
---- src/xitk/osd.c.orig	2005-07-16 21:05:32.000000000 +0200
-+++ src/xitk/osd.c	2007-02-17 21:56:02.000000000 +0100
-@@ -698,7 +698,7 @@ void osd_display_spu_lang(void) {
-   }
-   
-   snprintf(buffer, sizeof(buffer), "%s%s", _("Subtitles: "), get_language_from_iso639_1(lang));
--  osd_display_info(buffer);
-+  osd_display_info("%s", buffer);
- }
- 
- void osd_display_audio_lang(void) {
-@@ -727,7 +727,7 @@ void osd_display_audio_lang(void) {
-   }
- 
-   snprintf(buffer, sizeof(buffer), "%s%s", _("Audio Channel: "), get_language_from_iso639_1(lang));
--  osd_display_info(buffer);
-+  osd_display_info("%s", buffer);
- }
- 
- int osd_is_visible(void) {
diff --git a/multimedia/xine-ui/patches/patch-ba b/multimedia/xine-ui/patches/patch-ba
deleted file mode 100644
index e5b7b8839f3..00000000000
--- a/multimedia/xine-ui/patches/patch-ba
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2007/02/17 22:48:18 salo Exp $
-
---- src/xitk/panel.c.orig	2005-07-24 04:40:37.000000000 +0200
-+++ src/xitk/panel.c	2007-02-17 21:56:02.000000000 +0100
-@@ -845,10 +845,10 @@ void panel_toggle_audio_mute(xitk_widget
-  *  to snapshot current frame.
-  */
- static void panel_snapshot_error(void *data, char *message) {
--  xine_error(message);
-+  xine_error("%s", message);
- }
- static void panel_snapshot_info(void *data, char *message) {
--  xine_info(message);
-+  xine_info("%s", message);
- }
- void panel_snapshot(xitk_widget_t *w, void *data) {
-   create_snapshot(gGui->mmk.mrl, panel_snapshot_error, panel_snapshot_info, NULL);
diff --git a/multimedia/xine-ui/patches/patch-bb b/multimedia/xine-ui/patches/patch-bb
deleted file mode 100644
index bf9db02dbb6..00000000000
--- a/multimedia/xine-ui/patches/patch-bb
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-bb,v 1.1 2007/02/17 22:48:18 salo Exp $
-
---- src/xitk/xine-toolkit/window.c.orig	2004-12-31 01:52:15.000000000 +0100
-+++ src/xitk/xine-toolkit/window.c	2007-02-17 21:56:02.000000000 +0100
-@@ -1088,7 +1088,7 @@ xitk_window_t *xitk_window_dialog_ok_wit
-     char buf2[(strlen(buf) * 2) + 1];
-     xitk_subst_special_chars(buf, buf2);
-     xw = xitk_window_dialog_one_button_with_width(im, title, _("OK"), cb, userdata, window_width,
--						  align, buf2);
-+						  align, "%s", buf2);
-   }
-   XITK_FREE(buf);
-   return xw;
-@@ -1337,7 +1337,7 @@ xitk_window_t *xitk_window_dialog_yesno_
-     
-     xitk_subst_special_chars(buf, buf2);
-     xw = xitk_window_dialog_two_buttons_with_width(im, title, _("Yes"), _("No"), 
--						   ycb, ncb, userdata, window_width, align, buf2);
-+						   ycb, ncb, userdata, window_width, align, "%s", buf2);
-   }
- 
-   XITK_FREE(buf);
-@@ -1559,7 +1559,7 @@ xitk_window_t *xitk_window_dialog_yesnoc
-     
-     xitk_subst_special_chars(buf, buf2);
-     xw = xitk_window_dialog_three_buttons_with_width(im, title, _("Yes"), _("No"), _("Cancel"),
--						     ycb, ncb, ccb, userdata, window_width, align, buf2);
-+						     ycb, ncb, ccb, userdata, window_width, align, "%s", buf2);
-   }
-   XITK_FREE(buf);
-   return xw;
diff --git a/multimedia/xine-ui/patches/patch-bc b/multimedia/xine-ui/patches/patch-bc
deleted file mode 100644
index 15117f18db3..00000000000
--- a/multimedia/xine-ui/patches/patch-bc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-bc,v 1.1 2007/02/17 22:48:18 salo Exp $
-
---- src/xitk/xine-toolkit/xitk.h.orig	2004-12-16 22:35:30.000000000 +0100
-+++ src/xitk/xine-toolkit/xitk.h	2007-02-17 21:56:02.000000000 +0100
-@@ -2310,7 +2310,8 @@ xitk_window_t *xitk_window_dialog_checkb
-                                                          char *checkbox_label, int checkbox_state,
-                                                          xitk_state_callback_t cb3,
- 							 void *userdata, 
--							 int window_width, int align, char *message, ...);
-+							 int window_width, int align, char *message, ...)
-+  __attribute__((__format__(__printf__, 13, 14)));
- 
- #ifdef __GNUC__
- #define xitk_window_dialog_two_buttons_with_width(im, title, bl1, bl2, cb1, cb2, userdata, window_width, align, message, args...) \