Update to 0.99.6

Mark MAKE_JOBS_SAFE
Take maintainership

Feature safe:	yes

20 files changed, 20 insertions, 265 deletions

diff --git a/multimedia/xine/Makefile b/multimedia/xine/Makefile
index 84dbbfba302f..624dd5de9b4c 100644
--- a/multimedia/xine/Makefile
+++ b/multimedia/xine/Makefile
@@ -6,18 +6,20 @@
 #
 
 PORTNAME=	xine
-PORTVERSION=	0.99.5
-PORTREVISION=	9
+PORTVERSION=	0.99.6
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-ui/${PORTVERSION}
 DISTNAME=	${PORTNAME}-ui-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	makc@FreeBSD.org
 COMMENT=	An X11 multimedia player
 
+BUILD_DEPENDS=	update-mime-database:${PORTSDIR}/misc/shared-mime-info
 LIB_DEPENDS=	xine.1:${PORTSDIR}/multimedia/libxine \
 		png.6:${PORTSDIR}/graphics/png
+RUN_DEPENDS=	update-mime-database:${PORTSDIR}/misc/shared-mime-info
 
+USE_XZ=		yes
 USE_XORG=	x11 xt xv xinerama xxf86vm
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
@@ -27,9 +29,14 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		THREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		THREAD_LIBS="${PTHREAD_LIBS}"
+MAKE_JOBS_SAFE=	yes
 
 MANLANG=	"" de es fr pl
-MAN1=		aaxine.1 xine-bugreport.1 xine-check.1 xine-remote.1 xine.1
+MAN1_EN=	aaxine.1 xine-bugreport.1 xine-check.1 xine-remote.1 xine.1
+MAN1_DE=	${MAN1_EN}
+MAN1_ES=	${MAN1_EN}
+MAN1_FR=	xine.1
+MAN1_PL=	aaxine.1 xine-remote.1 xine.1
 
 OPTIONS=	CACA "Enable libcaca output" off \
 		AALIB "Enable aalib output" off \
@@ -84,7 +91,7 @@ LIBXINE_VER=	1.26
 .if !exists(${LOCALBASE}/lib/xine/plugins/${LIBXINE_VER}/xineplug_vo_out_caca.so)
 IGNORE=libxine should be compiled with caca support
 .endif
-LIB_DEPENDS+=   caca.0:${PORTSDIR}/graphics/libcaca
+LIB_DEPENDS+=	caca.0:${PORTSDIR}/graphics/libcaca
 PLIST_SUB+=	WITH_CACA=""
 .else
 PLIST_SUB+=	WITH_CACA="@comment "
@@ -107,18 +114,6 @@ post-patch:
 		${WRKSRC}/configure
 
 post-install:
-.for l in es fr
-	@${CP} ${PREFIX}/man/man1/aaxine.1 ${PREFIX}/man/${l}/man1/aaxine.1
-.endfor
-.for l in es fr pl
-	@${CP} ${PREFIX}/man/man1/xine-bugreport.1 ${PREFIX}/man/${l}/man1/xine-bugreport.1
-.endfor
-.for l in es fr pl
-	@${CP} ${PREFIX}/man/man1/xine-check.1 ${PREFIX}/man/${l}/man1/xine-check.1
-.endfor
-.for l in es fr
-	@${CP} ${PREFIX}/man/man1/xine-remote.1 ${PREFIX}/man/${l}/man1/xine-remote.1
-.endfor
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/xine/distinfo b/multimedia/xine/distinfo
index a3d58d25ab60..378e76312a0f 100644
--- a/multimedia/xine/distinfo
+++ b/multimedia/xine/distinfo
@@ -1,3 +1,3 @@
-MD5 (xine-ui-0.99.5.tar.gz) = e643cd1fcad4d98a5ae4eb877ce5087b
-SHA256 (xine-ui-0.99.5.tar.gz) = 1368aa9cfd70433d14efde5bf0e70911f80f9463a026192c1f133a339be25e1e
-SIZE (xine-ui-0.99.5.tar.gz) = 2606481
+MD5 (xine-ui-0.99.6.tar.xz) = d468b4e7fe39ff19888261e1da9be914
+SHA256 (xine-ui-0.99.6.tar.xz) = 4eb1e3eb6c2ebba70f2e215a15d8b99bb3e2b0449c94105dc16e963a99a59ef3
+SIZE (xine-ui-0.99.6.tar.xz) = 1797144
diff --git a/multimedia/xine/files/patch-src-xitk-Imlib-light-load.c b/multimedia/xine/files/patch-src-xitk-Imlib-light-load.c
deleted file mode 100644
index 45638542e1ce..000000000000
--- a/multimedia/xine/files/patch-src-xitk-Imlib-light-load.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/xitk/Imlib-light/load.c.orig	2003-07-15 00:44:10.000000000 +0200
-+++ src/xitk/Imlib-light/load.c	2010-03-29 10:16:04.000000000 +0200
-@@ -193,7 +193,7 @@
-     return 0;
-   fread(buf, 1, 8, f);
-   rewind(f);
--  return (int)png_check_sig(buf, 8);
-+  return (int)(png_sig_cmp(buf, 0, 8) == 0);
- }
- 
- ImlibImage * Imlib_load_image(ImlibData * id, char *file) {
diff --git a/multimedia/xine/files/patch-src:xitk:event_sender.c b/multimedia/xine/files/patch-src:xitk:event_sender.c
deleted file mode 100644
index 2c8d0d1485f1..000000000000
--- a/multimedia/xine/files/patch-src:xitk:event_sender.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/xitk/event_sender.c.orig	Thu Dec 16 06:10:44 2004
-+++ src/xitk/event_sender.c	Thu Dec 30 04:26:51 2004
-@@ -43,7 +43,7 @@
- 
- extern gGui_t          *gGui;
- 
--static char            *eventerfontname = "-*-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*";
-+static char            *eventerfontname = "-*-*-bold-r-normal-*-12-*-*-*-*-*-*-*";
- 
- typedef struct {
-   xitk_window_t        *xwin;
diff --git a/multimedia/xine/files/patch-src:xitk:file_browser.c b/multimedia/xine/files/patch-src:xitk:file_browser.c
deleted file mode 100644
index 96455d025a2f..000000000000
--- a/multimedia/xine/files/patch-src:xitk:file_browser.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/xitk/file_browser.c.orig	Sun Dec 12 23:19:08 2004
-+++ src/xitk/file_browser.c	Thu Dec 30 04:27:49 2004
-@@ -71,8 +71,8 @@
- 
- extern gGui_t          *gGui;
- 
--static char            *fontname           = "-*-helvetica-medium-r-*-*-10-*-*-*-*-*-*-*";
--static char            *btnfontname        = "-*-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*";
-+static char            *fontname           = "-*-*-medium-r-normal-*-10-*-*-*-*-*-*-*";
-+static char            *btnfontname        = "-*-*-bold-r-normal-*-12-*-*-*-*-*-*-*";
- 
- typedef struct {
-   char                      *name;
diff --git a/multimedia/xine/files/patch-src:xitk:help.c b/multimedia/xine/files/patch-src:xitk:help.c
deleted file mode 100644
index 4cd3ad841b08..000000000000
--- a/multimedia/xine/files/patch-src:xitk:help.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/xitk/help.c.orig	Thu Dec 16 06:10:44 2004
-+++ src/xitk/help.c	Thu Dec 30 04:28:30 2004
-@@ -44,8 +44,8 @@
- 
- extern gGui_t                   *gGui;
- 
--static char                     *br_fontname = "-misc-fixed-medium-r-normal-*-10-*-*-*-*-*-*-*";
--static char                     *tabsfontname = "-*-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*";
-+static char                     *br_fontname = "-*-*-medium-r-normal-*-10-*-*-*-*-*-*-*";
-+static char                     *tabsfontname = "-*-*-bold-r-normal-*-12-*-*-*-*-*-*-*";
- 
- #define WINDOW_WIDTH             580
- #define WINDOW_HEIGHT            480
diff --git a/multimedia/xine/files/patch-src:xitk:kbindings.c b/multimedia/xine/files/patch-src:xitk:kbindings.c
deleted file mode 100644
index 39c5993c2b69..000000000000
--- a/multimedia/xine/files/patch-src:xitk:kbindings.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/xitk/kbindings.c.orig	Tue Apr 10 07:39:35 2007
-+++ src/xitk/kbindings.c	Sun Jul 15 19:19:16 2007
-@@ -81,8 +81,8 @@
- } _kbedit_t;
- 
- static _kbedit_t    *kbedit = NULL;
--static char         *fontname = "-*-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*";
--static char         *br_fontname = "-misc-fixed-medium-r-normal-*-10-*-*-*-*-*-*-*";
-+static char         *fontname = "-*-*-bold-r-*-*-12-*-*-*-*-*-*-*";
-+static char         *br_fontname = "-*-*-medium-r-normal-*-10-*-*-*-*-*-*-*";
- 
- #define WINDOW_WIDTH        530
- #define WINDOW_HEIGHT       456
diff --git a/multimedia/xine/files/patch-src:xitk:mediamark.c b/multimedia/xine/files/patch-src:xitk:mediamark.c
deleted file mode 100644
index 2e9f6cb4030e..000000000000
--- a/multimedia/xine/files/patch-src:xitk:mediamark.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/xitk/mediamark.c.orig	Thu Dec 16 16:14:26 2004
-+++ src/xitk/mediamark.c	Thu Dec 30 04:30:47 2004
-@@ -44,8 +44,8 @@
- #define WINDOW_WIDTH            505
- #define WINDOW_HEIGHT           250
- 
--static char                    *btnfontname  = "-*-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*";
--static char                    *fontname     = "-*-helvetica-medium-r-*-*-10-*-*-*-*-*-*-*";
-+static char                    *btnfontname  = "-*-*-bold-r-normal-*-12-*-*-*-*-*-*-*";
-+static char                    *fontname     = "-*-*-medium-r-normal-*-10-*-*-*-*-*-*-*";
- 
- typedef struct {
-   apply_callback_t              callback;
diff --git a/multimedia/xine/files/patch-src:xitk:post.c b/multimedia/xine/files/patch-src:xitk:post.c
deleted file mode 100644
index b94cf35d2106..000000000000
--- a/multimedia/xine/files/patch-src:xitk:post.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/xitk/post.c.orig	Thu Dec 16 06:10:46 2004
-+++ src/xitk/post.c	Thu Dec 30 04:31:21 2004
-@@ -67,10 +67,11 @@
-         xitk_enable_and_show_widget(widget);                                                    \
-     } while(0)
-  
--static char                  *br_fontname      = "-misc-fixed-medium-r-normal-*-10-*-*-*-*-*-*-*";
--static char                  *btnfontname      = "-*-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*";
--static char                  *fontname         = "-*-helvetica-medium-r-*-*-10-*-*-*-*-*-*-*";
--static char                  *boldfontname     = "-*-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*";
-+
-+static char                  *br_fontname      = "-*-*-medium-r-normal-*-10-*-*-*-*-*-*-*";
-+static char                  *btnfontname      = "-*-*-bold-r-normal-*-12-*-*-*-*-*-*-*";
-+static char                  *fontname         = "-*-*-medium-r-normal-*-10-*-*-*-*-*-*-*";
-+static char                  *boldfontname     = "-*-*-bold-r-normal-*-12-*-*-*-*-*-*-*";
- 
- typedef struct {
-   xine_post_t                 *post;
diff --git a/multimedia/xine/files/patch-src:xitk:setup.c b/multimedia/xine/files/patch-src:xitk:setup.c
deleted file mode 100644
index 10cc981b6255..000000000000
--- a/multimedia/xine/files/patch-src:xitk:setup.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/xitk/setup.c.orig	Thu Dec 16 06:10:46 2004
-+++ src/xitk/setup.c	Thu Dec 30 04:46:48 2004
-@@ -34,9 +34,9 @@
- 
- extern gGui_t                   *gGui;
- 
--static char                     *fontname     = "-*-helvetica-medium-r-*-*-10-*-*-*-*-*-*-*";
--static char                     *boldfontname = "-*-helvetica-bold-r-*-*-10-*-*-*-*-*-*-*";
--static char                     *tabsfontname = "-*-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*";
-+static char                     *fontname     = "-*-*-medium-r-normal-*-10-*-*-*-*-*-*-*";
-+static char                     *boldfontname = "-*-*-bold-r-normal-*-10-*-*-*-*-*-*-*";
-+static char                     *tabsfontname = "-*-*-bold-r-normal-*-12-*-*-*-*-*-*-*";
- 
- #define WINDOW_WIDTH             500
- #define WINDOW_HEIGHT            500
diff --git a/multimedia/xine/files/patch-src:xitk:skins.c b/multimedia/xine/files/patch-src:xitk:skins.c
deleted file mode 100644
index b99b093f786a..000000000000
--- a/multimedia/xine/files/patch-src:xitk:skins.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/xitk/skins.c.orig	Fri Mar 30 08:51:34 2007
-+++ src/xitk/skins.c	Sun Jul 15 19:22:31 2007
-@@ -1050,8 +1050,8 @@
-   layer_above_video(xitk_window_get_window(xwin));
-   
-   if((slxs = skins_get_slx_entries(url)) != NULL) {
--    char                      *br_fontname = "-misc-fixed-medium-r-normal-*-10-*-*-*-*-*-*-*";
--    char                      *btnfontname = "-*-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*";
-+    char                      *br_fontname = "-*-*-medium-r-normal-*-10-*-*-*-*-*-*-*";
-+    char                      *btnfontname = "-*-*-bold-r-*-*-12-*-*-*-*-*-*-*";
-     int                        i;
-     xitk_browser_widget_t      br;
-     xitk_labelbutton_widget_t  lb;
diff --git a/multimedia/xine/files/patch-src:xitk:tvset.c b/multimedia/xine/files/patch-src:xitk:tvset.c
deleted file mode 100644
index 9bcbd1096ea3..000000000000
--- a/multimedia/xine/files/patch-src:xitk:tvset.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/xitk/tvset.c.orig	Fri Mar 30 08:51:34 2007
-+++ src/xitk/tvset.c	Sun Jul 15 19:26:24 2007
-@@ -45,9 +45,9 @@
- 
- extern gGui_t          *gGui;
- 
--static char            *tvsetfontname     = "-*-helvetica-medium-r-*-*-10-*-*-*-*-*-*-*";
--static char            *lfontname         = "-*-helvetica-bold-r-*-*-10-*-*-*-*-*-*-*";
--static char            *btnfontname       = "-*-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*";
-+static char            *tvsetfontname     = "-*-*-medium-r-*-*-10-*-*-*-*-*-*-*";
-+static char            *lfontname         = "-*-*-bold-r-*-*-10-*-*-*-*-*-*-*";
-+static char            *btnfontname       = "-*-*-bold-r-*-*-12-*-*-*-*-*-*-*";
- 
- typedef struct {
-   xitk_window_t        *xwin;
diff --git a/multimedia/xine/files/patch-src:xitk:viewlog.c b/multimedia/xine/files/patch-src:xitk:viewlog.c
deleted file mode 100644
index e0a3520bcfe1..000000000000
--- a/multimedia/xine/files/patch-src:xitk:viewlog.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/xitk/viewlog.c.orig	Thu Dec 16 06:10:46 2004
-+++ src/xitk/viewlog.c	Thu Dec 30 04:37:44 2004
-@@ -41,8 +41,8 @@
- 
- extern gGui_t              *gGui;
- 
--static char                *br_fontname = "-misc-fixed-medium-r-normal-*-10-*-*-*-*-*-*-*";
--static char                *tabsfontname = "-*-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*";
-+static char                *br_fontname = "-*-*-medium-r-normal-*-10-*-*-*-*-*-*-*";
-+static char                *tabsfontname = "-*-*-bold-r-normal-*-12-*-*-*-*-*-*-*";
- 
- #define WINDOW_WIDTH        580
- #define WINDOW_HEIGHT       480
diff --git a/multimedia/xine/files/patch-src:xitk:xine-toolkit:font.h b/multimedia/xine/files/patch-src:xitk:xine-toolkit:font.h
deleted file mode 100644
index 1f90e307b4ba..000000000000
--- a/multimedia/xine/files/patch-src:xitk:xine-toolkit:font.h
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/xitk/xine-toolkit/font.h.orig	Wed Apr 14 04:55:49 2004
-+++ src/xitk/xine-toolkit/font.h	Thu Dec 30 04:38:33 2004
-@@ -25,12 +25,12 @@
- 
- #include "_xitk.h"
- 
--#define DEFAULT_FONT_10      "-*-helvetica-medium-r-*-*-10-*-*-*-*-*-*-*"
--#define DEFAULT_FONT_12      "-*-helvetica-medium-r-*-*-12-*-*-*-*-*-*-*"
--#define DEFAULT_FONT_14      "-*-helvetica-medium-r-*-*-14-*-*-*-*-*-*-*"
--#define DEFAULT_BOLD_FONT_10 "-*-helvetica-bold-r-*-*-10-*-*-*-*-*-*-*"
--#define DEFAULT_BOLD_FONT_12 "-*-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*"
--#define DEFAULT_BOLD_FONT_14 "-*-helvetica-bold-r-*-*-14-*-*-*-*-*-*-*"
-+#define DEFAULT_FONT_10      "-*-*-medium-r-*-*-10-*-*-*-*-*-*-*"
-+#define DEFAULT_FONT_12      "-*-*-medium-r-*-*-12-*-*-*-*-*-*-*"
-+#define DEFAULT_FONT_14      "-*-*-medium-r-*-*-14-*-*-*-*-*-*-*"
-+#define DEFAULT_BOLD_FONT_10 "-*-*-bold-r-*-*-10-*-*-*-*-*-*-*"
-+#define DEFAULT_BOLD_FONT_12 "-*-*-bold-r-*-*-12-*-*-*-*-*-*-*"
-+#define DEFAULT_BOLD_FONT_14 "-*-*-bold-r-*-*-14-*-*-*-*-*-*-*"
- #define FONT_HEIGHT_MODEL    "azertyuiopqsdfghjklmwxcvbnAZERTYUIOPQSDFGHJKLMWXCVBN&é(-è_çà)=¹~#{[|`\\^@]}%"
- 
- /*
diff --git a/multimedia/xine/files/patch-src_aaui_Makefile.in b/multimedia/xine/files/patch-src_aaui_Makefile.in
deleted file mode 100644
index a862f1114031..000000000000
--- a/multimedia/xine/files/patch-src_aaui_Makefile.in
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/aaui/Makefile.in.orig	Sun Jul 15 18:51:53 2007
-+++ src/aaui/Makefile.in	Sun Jul 15 18:54:51 2007
-@@ -266,13 +266,13 @@
- aaxine_SOURCES = $(GETOPT_C) main.c
- aaxine_CFLAGS = $(AALIB_CFLAGS) -DAA $(AM_CFLAGS)
- aaxine_LDADD = @XINE_LIBS@ $(AALIB_LIBS) $(DYNAMIC_LD_LIBS) -lm \
--	       $(top_builddir)/src/common/libcommon.a
-+	       $(top_builddir)/src/common/libcommon.a $(THREAD_LIBS)
- 
- aaxine_DEPENDENCIES = $(top_builddir)/src/common/libcommon.a
- cacaxine_SOURCES = $(GETOPT_C) main.c
- cacaxine_CFLAGS = $(CACA_CFLAGS) -DCACA $(AM_CFLAGS)
- cacaxine_LDADD = @XINE_LIBS@ $(CACA_LIBS) $(DYNAMIC_LD_LIBS) -lm \
--	       $(top_builddir)/src/common/libcommon.a
-+	       $(top_builddir)/src/common/libcommon.a $(THREAD_LIBS)
- 
- cacaxine_DEPENDENCIES = $(top_builddir)/src/common/libcommon.a
- all: all-am
diff --git a/multimedia/xine/files/patch-src_aaui_main.c b/multimedia/xine/files/patch-src_aaui_main.c
deleted file mode 100644
index cdb936953331..000000000000
--- a/multimedia/xine/files/patch-src_aaui_main.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/aaui/main.c.orig	2008-03-23 22:52:31.000000000 +0900
-+++ src/aaui/main.c	2008-03-23 22:53:32.000000000 +0900
-@@ -593,7 +593,7 @@
-   while ( !caca_get_event(aaxine.display, CACA_EVENT_KEY_PRESS, &ev, 50000) && aaxine.running ) ;
- 
-   if (!aaxine.running) return 0;
--  return ev.data.key.ch;
-+  return caca_get_event_key_ch(&ev);
- #endif
- }
- 
diff --git a/multimedia/xine/files/patch-src_fb_Makefile.in b/multimedia/xine/files/patch-src_fb_Makefile.in
deleted file mode 100644
index 205d106d3073..000000000000
--- a/multimedia/xine/files/patch-src_fb_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/fb/Makefile.in.orig	Sun Jul 15 18:56:10 2007
-+++ src/fb/Makefile.in	Sun Jul 15 18:56:42 2007
-@@ -264,7 +264,7 @@
- target_alias = @target_alias@
- AM_CFLAGS = @XINE_CFLAGS@ $(X_CFLAGS) -DFONTDIR=\"$(XINE_SKINDIR)/../fonts/\"
- fbxine_DEPENDENCIES = $(top_builddir)/src/common/libcommon.a
--fbxine_LDADD = @XINE_LIBS@ $(LIRC_LIBS) $(DYNAMIC_LD_LIBS) -lm $(top_builddir)/src/common/libcommon.a
-+fbxine_LDADD = @XINE_LIBS@ $(LIRC_LIBS) $(DYNAMIC_LD_LIBS) -lm $(top_builddir)/src/common/libcommon.a $(THREAD_LIBS)
- fbxine_SOURCES = main.c lirc.c actions.c keys.c options.c callback.c stdctl.c post.c osd.c config_wrapper.c
- noinst_HEADERS = main.h lirc.h actions.h keys.h options.h callback.h stdctl.h post.h osd.h config_wrapper.h
- all: all-am
diff --git a/multimedia/xine/files/patch-src_xitk_Makefile.in b/multimedia/xine/files/patch-src_xitk_Makefile.in
deleted file mode 100644
index f9b702e34ea3..000000000000
--- a/multimedia/xine/files/patch-src_xitk_Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/xitk/Makefile.in.orig	Tue May  1 07:51:15 2007
-+++ src/xitk/Makefile.in	Sun Jul 15 18:48:07 2007
-@@ -351,7 +351,7 @@
-              $(top_builddir)/src/common/libcommonx.a \
- 	     $(X_PRE_LIBS) $(LIRC_LIBS) $(DYNAMIC_LD_LIBS) $(XFT_LIBS) \
- 	     $(X_LIBS) $(XTEST_LIBS) $(CURL_LIBS) $(NVTVSIMPLE_LIBS) \
--	     -lX11 -lm $(DBG_LIBS) $(XV_LIB) $(LIBPNG_LIBS) $(INTLLIBS)
-+	     -lX11 -lm $(DBG_LIBS) $(XV_LIB) $(LIBPNG_LIBS) $(INTLLIBS) $(THREAD_LIBS)
- 
- xine_remote_CFLAGS = $(AM_CFLAGS) -DNETWORK_CLIENT
- xine_remote_SOURCES = network.c
-@@ -465,7 +465,7 @@
- 	$(LINK) $(xine_LDFLAGS) $(xine_OBJECTS) $(xine_LDADD) $(LIBS)
- xine-remote$(EXEEXT): $(xine_remote_OBJECTS) $(xine_remote_DEPENDENCIES) 
- 	@rm -f xine-remote$(EXEEXT)
--	$(LINK) $(xine_remote_LDFLAGS) $(xine_remote_OBJECTS) $(xine_remote_LDADD) $(LIBS)
-+	$(LINK) $(xine_remote_LDFLAGS) $(xine_remote_OBJECTS) $(xine_remote_LDADD) $(LIBS) $(INTLLIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
diff --git a/multimedia/xine/files/patch-src_xitk_stream_infos.c b/multimedia/xine/files/patch-src_xitk_stream_infos.c
deleted file mode 100644
index ff9405663fc5..000000000000
--- a/multimedia/xine/files/patch-src_xitk_stream_infos.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/xitk/stream_infos.c.orig	Sun Jul 15 19:28:59 2007
-+++ src/xitk/stream_infos.c	Sun Jul 15 19:29:13 2007
-@@ -45,9 +45,9 @@
- 
- extern gGui_t          *gGui;
- 
--static char            *sinfosfontname     = "-*-helvetica-medium-r-*-*-10-*-*-*-*-*-*-*";
--static char            *lfontname          = "-*-helvetica-bold-r-*-*-10-*-*-*-*-*-*-*";
--static char            *btnfontname        = "-*-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*";
-+static char            *sinfosfontname     = "-*-*-medium-r-*-*-10-*-*-*-*-*-*-*";
-+static char            *lfontname          = "-*-*-bold-r-*-*-10-*-*-*-*-*-*-*";
-+static char            *btnfontname        = "-*-*-bold-r-*-*-12-*-*-*-*-*-*-*";
- 
- typedef struct {
-   xitk_window_t        *xwin;
diff --git a/multimedia/xine/pkg-plist b/multimedia/xine/pkg-plist
index 3176ac22a8f1..e1ec3a7dffe0 100644
--- a/multimedia/xine/pkg-plist
+++ b/multimedia/xine/pkg-plist
@@ -60,6 +60,8 @@ share/icons/hicolor/48x48/apps/xine.png
 %%NLS%%share/locale/sk/LC_MESSAGES/xitk.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/xine-ui.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/xitk.mo
+share/mime/packages/xine-ui.xml
+share/mime/text/x-xine.xml
 share/pixmaps/xine.xpm
 %%DATADIR%%/desktop/xine.desktop
 %%DATADIR%%/oxine/mainmenu
@@ -145,7 +147,7 @@ share/pixmaps/xine.xpm
 @dirrmtry share/icons/hicolor/16x16
 @dirrmtry share/icons/hicolor
 @dirrmtry share/icons
-@dirrm share/doc/xitk
+@dirrmtry share/doc/xitk
 @dirrm %%DOCSDIR%%
 @dirrmtry man/pl/man1
 @dirrmtry man/pl
@@ -155,3 +157,5 @@ share/pixmaps/xine.xpm
 @dirrmtry man/es
 @dirrmtry man/de/man1
 @dirrmtry man/de
+@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true