- Add two patches to fix some issues on NetBSD, from anonymous via joerg@.

- Do not remove share/xine, as it's used by xine-lib too.
- There's no need to set BUILDLINK_API_DEPENDS for curl anymore, its
  buildlink3.mk file takes care of the required version.

Bump PKGREVISION.

5 files changed, 144 insertions, 6 deletions

diff --git a/multimedia/xine-ui/Makefile b/multimedia/xine-ui/Makefile
index c99d7811ddb..efff9cc32d5 100644
--- a/multimedia/xine-ui/Makefile
+++ b/multimedia/xine-ui/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2007/07/15 19:41:28 xtraeme Exp $
+# $NetBSD: Makefile,v 1.36 2007/07/16 10:12:46 xtraeme Exp $
 #
 
 DISTNAME=		xine-ui-0.99.5
+PKGREVISION=		1
 CATEGORIES=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xine/}
 
@@ -9,8 +10,6 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://xinehq.de/
 COMMENT=		Skinned xlib-based xine GUI
 
-BUILDLINK_API_DEPENDS.curl+=	curl>7.10.2
-
 USE_PKGLOCALEDIR=	YES
 USE_TOOLS+=		msgfmt pkg-config
 USE_DIRS+=		xdg-1.1
diff --git a/multimedia/xine-ui/PLIST b/multimedia/xine-ui/PLIST
index 8716a4835c2..cec63e658d6 100644
--- a/multimedia/xine-ui/PLIST
+++ b/multimedia/xine-ui/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2007/07/15 19:41:28 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.8 2007/07/16 10:12:46 xtraeme Exp $
 bin/fbxine
 bin/xine
 bin/xine-bugreport
@@ -137,7 +137,6 @@ 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
diff --git a/multimedia/xine-ui/distinfo b/multimedia/xine-ui/distinfo
index 506a1f15aff..1923f3d4fba 100644
--- a/multimedia/xine-ui/distinfo
+++ b/multimedia/xine-ui/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2007/07/15 19:41:28 xtraeme Exp $
+$NetBSD: distinfo,v 1.16 2007/07/16 10:12:46 xtraeme Exp $
 
 SHA1 (xine-ui-0.99.5.tar.gz) = 4f452516319f31cda01d08ea2779f195933af0bb
 RMD160 (xine-ui-0.99.5.tar.gz) = 64cb69549d88d904d986ea7dd7b36a51d5b91756
@@ -7,3 +7,5 @@ SHA1 (patch-aa) = 9a4bc545b2574477aaba82604e9e794617ee4cdc
 SHA1 (patch-ae) = 1d5887168efd340f047dfdb9e135ce12c18e2d5f
 SHA1 (patch-ag) = dddbea5257a5b21e3a7ba21207661f4a47a9fa7e
 SHA1 (patch-at) = 433c648bbeea1a73189ab4e42c3c9ce4c4610290
+SHA1 (patch-zy) = 47bc376d68594604c65d017e61574218e4c5b71a
+SHA1 (patch-zz) = f3b33d65805a9e58daaf812a3b9eb572c86ee7b9
diff --git a/multimedia/xine-ui/patches/patch-zy b/multimedia/xine-ui/patches/patch-zy
new file mode 100644
index 00000000000..bc1b934a512
--- /dev/null
+++ b/multimedia/xine-ui/patches/patch-zy
@@ -0,0 +1,116 @@
+$NetBSD: patch-zy,v 1.1 2007/07/16 10:12:46 xtraeme Exp $
+
+--- src/xitk/actions.c.orig	2007-04-07 00:52:54.000000000 +0000
++++ src/xitk/actions.c	2007-06-07 00:15:04.000000000 +0000
+@@ -638,58 +638,77 @@
+ 
+   if(video_window_is_visible())
+     video_window_set_visibility(0);
++
++  config_update_num("gui.amp_level", gGui->mixer.amp_level);
++  config_save();
+   
++  /* we are going to dispose this stream, so make sure slider_loop 
++   * won't use it anymore (otherwise -> segfault on exit).
++   */
++  gGui->running = 0;
++
++  if(gGui->visual_anim.event_queue) {
++    xine_event_dispose_queue(gGui->visual_anim.event_queue);
++    gGui->visual_anim.event_queue = 0;
++  }
++  if(gGui->visual_anim.stream) {
++    xine_dispose(gGui->visual_anim.stream);
++    gGui->visual_anim.stream = 0;
++  }
++
+   tvout_deinit(gGui->tvout);
+-  video_window_exit();
+ 
+-#ifdef HAVE_XF86VIDMODE
+-  /* just in case a different modeline than the original one is running,
+-   * toggle back to window mode which automatically causes a switch back to
+-   * the original modeline
+-   */
+-  if(gGui->XF86VidMode_fullscreen)
+-    video_window_set_fullscreen_mode(WINDOWED_MODE);
+-  //     gui_set_fullscreen_mode(NULL,NULL);
+-#endif
+-   
++  if(gGui->event_queue) {
++    xine_event_dispose_queue(gGui->event_queue);
++    gGui->event_queue = 0;
++  }
++
+   osd_deinit();
+ 
+-  config_update_num("gui.amp_level", gGui->mixer.amp_level);
+-  config_save();
+-  
++  if(gGui->ao_none) {
++    xine_close_audio_driver(gGui->xine, gGui->ao_none);
++    gGui->ao_none = 0;
++  }
++  if(gGui->vo_none) {
++    xine_close_video_driver(gGui->xine, gGui->vo_none);
++    gGui->vo_none = 0;
++  }
++
+   /* Restore old audio volume */
+   if(gGui->ao_port && (gGui->mixer.method == SOUND_CARD_MIXER))
+     xine_set_param(gGui->stream, XINE_PARAM_AUDIO_VOLUME, gGui->mixer.original_level);
+-  
+-  xine_close(gGui->stream);
+-  xine_close(gGui->visual_anim.stream);
+ 
+-  xine_event_dispose_queue(gGui->event_queue);
+-  xine_event_dispose_queue(gGui->visual_anim.event_queue);
+-
+-  /* we are going to dispose this stream, so make sure slider_loop 
+-   * won't use it anymore (otherwise -> segfault on exit).
+-   */
+-  gGui->running = 0;
++  if(gGui->stream) {
++    xine_dispose(gGui->stream);
++    gGui->stream = 0;
++  }
+ 
+   if(gGui->visual_anim.post_output_element.post)
+     xine_post_dispose(gGui->xine, gGui->visual_anim.post_output_element.post);
+ 
+-  xine_dispose(gGui->stream);
+-  /* xine_dispose(gGui->visual_anim.stream); */
+-
+-  if(gGui->vo_port)
++  if(gGui->vo_port) {
+     xine_close_video_driver(gGui->xine, gGui->vo_port);
+-  if(gGui->vo_none)
+-    xine_close_video_driver(gGui->xine, gGui->vo_none);
+-
+-  if(gGui->ao_port)
++    gGui->vo_port = 0;
++  }
++  if(gGui->ao_port) {
+     xine_close_audio_driver(gGui->xine, gGui->ao_port);
+-  if(gGui->ao_none)
+-    xine_close_audio_driver(gGui->xine, gGui->ao_none);
++    gGui->ao_port = 0;
++  }
+ 
+   xine_exit(gGui->xine); 
++  
++  video_window_exit();
+ 
++#ifdef HAVE_XF86VIDMODE
++  /* just in case a different modeline than the original one is running,
++   * toggle back to window mode which automatically causes a switch back to
++   * the original modeline
++   */
++  if(gGui->XF86VidMode_fullscreen)
++    video_window_set_fullscreen_mode(WINDOWED_MODE);
++  //     gui_set_fullscreen_mode(NULL,NULL);
++#endif
++   
+ #ifdef HAVE_LIRC
+   if(gGui->lirc_enable)
+     lirc_stop();
diff --git a/multimedia/xine-ui/patches/patch-zz b/multimedia/xine-ui/patches/patch-zz
new file mode 100644
index 00000000000..82512c83b21
--- /dev/null
+++ b/multimedia/xine-ui/patches/patch-zz
@@ -0,0 +1,22 @@
+$NetBSD: patch-zz,v 1.1 2007/07/16 10:12:46 xtraeme Exp $
+
+--- src/xitk/panel.c.orig	2006-06-29 14:08:13.000000000 +0000
++++ src/xitk/panel.c	2007-06-07 02:13:51.000000000 +0000
+@@ -152,6 +152,8 @@
+ 
+     xitk_unregister_event_handler(&panel->widget_key);
+ 
++    pthread_join(panel->slider_thread, NULL);
++
+     XLockDisplay(gGui->display);
+     XUnmapWindow(gGui->display, gGui->panel_window);
+     XUnlockDisplay(gGui->display);
+@@ -368,8 +370,6 @@
+   int pos, secs;
+   int i = 0;
+   
+-  pthread_detach(pthread_self());
+-
+   while(gGui->on_quit == 0) {
+ 
+     if(gGui->stream) {