Remove references to xine_trick_mode(), which was not actually used

here and got removed from xine-lib. While here, add desktopdb.mk and
set BUILDLINK_DEPMETHOD.libXt correctly. PKGREVISION -> 10.

4 files changed, 49 insertions, 5 deletions

diff --git a/multimedia/xfmedia/Makefile b/multimedia/xfmedia/Makefile
index 3d9da2c91e9..c2a08a8e50e 100644
--- a/multimedia/xfmedia/Makefile
+++ b/multimedia/xfmedia/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2012/03/03 00:13:42 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2012/07/01 02:02:52 dholland Exp $
 #
 
 DISTNAME=		xfmedia-0.9.2
-#PKGREVISION=		1
-PKGREVISION=		9
+PKGREVISION=		10
 CATEGORIES=		multimedia
 MASTER_SITES=		http://spuriousinterrupt.org/projects/xfmedia/files/
 EXTRACT_SUFX=		.tar.bz2
@@ -28,7 +27,7 @@ post-install:
 	${INSTALL} ${WRKSRC}/src/keybindings.rc \
 	    ${DESTDIR}${PREFIX}/share/xfmedia/keybindings.rc
 
-BUILDLINK_DEPMETHOD.libXt?=	build
+BUILDLINK_DEPMETHOD.libXt=	build
 
 .include "../../audio/taglib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
@@ -40,4 +39,5 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/libxfce4gui/buildlink3.mk"
 .include "../../x11/xfce4-exo/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/xfmedia/distinfo b/multimedia/xfmedia/distinfo
index 794f96515dc..c1fce39fdde 100644
--- a/multimedia/xfmedia/distinfo
+++ b/multimedia/xfmedia/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.4 2007/04/13 12:56:34 martti Exp $
+$NetBSD: distinfo,v 1.5 2012/07/01 02:02:52 dholland Exp $
 
 SHA1 (xfmedia-0.9.2.tar.bz2) = cb8d39f2a4ee6a6164f722162fa45004770a7605
 RMD160 (xfmedia-0.9.2.tar.bz2) = e1d16fe50609475f916594f2b6a885cfed6251e0
 Size (xfmedia-0.9.2.tar.bz2) = 893228 bytes
 SHA1 (patch-aa) = cdc013c15413d3add02333d8b7f3f829e8335626
 SHA1 (patch-ab) = e41bda068165083c61b2e06f2b185e6f0f93ec9e
+SHA1 (patch-src_xfmedia_xine_c) = 26869588478ed6178ddfa07d079b2c5fe6c14a33
+SHA1 (patch-src_xfmedia_xine_h) = d08ddf9ea2320ba36843deefefbab97807805d90
diff --git a/multimedia/xfmedia/patches/patch-src_xfmedia_xine_c b/multimedia/xfmedia/patches/patch-src_xfmedia_xine_c
new file mode 100644
index 00000000000..b5658194074
--- /dev/null
+++ b/multimedia/xfmedia/patches/patch-src_xfmedia_xine_c
@@ -0,0 +1,25 @@
+$NetBSD: patch-src_xfmedia_xine_c,v 1.1 2012/07/01 02:02:52 dholland Exp $
+
+Remove references to xine_trick_mode(), which was removed from xine_lib.
+(This code is not used in xfmedia.)
+
+--- src/xfmedia-xine.c~	2006-11-27 07:21:23.000000000 +0000
++++ src/xfmedia-xine.c
+@@ -1450,17 +1450,6 @@ xfmedia_xine_play(XfmediaXine *xfx, gint
+ }
+ 
+ gboolean
+-xfmedia_xine_trick_mode(XfmediaXine * xfx, gint mode, gint value)
+-{
+-
+-    g_return_val_if_fail(xfx != NULL, 0);
+-    g_return_val_if_fail(XFMEDIA_IS_XINE(xfx), 0);
+-    g_return_val_if_fail(xfx->priv->stream != NULL, 0);
+-
+-    return xine_trick_mode(xfx->priv->stream, mode, value);
+-}
+-
+-gboolean
+ xfmedia_xine_get_pos_length(XfmediaXine *xfx, gint *pos_stream,
+     gint *pos_time, gint *length_time)
+ {
diff --git a/multimedia/xfmedia/patches/patch-src_xfmedia_xine_h b/multimedia/xfmedia/patches/patch-src_xfmedia_xine_h
new file mode 100644
index 00000000000..f7c6c74bbf2
--- /dev/null
+++ b/multimedia/xfmedia/patches/patch-src_xfmedia_xine_h
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_xfmedia_xine_h,v 1.1 2012/07/01 02:02:52 dholland Exp $
+
+Remove references to xine_trick_mode(), which was removed from xine_lib.
+(This code is not used in xfmedia.)
+
+--- src/xfmedia-xine.h~	2006-11-27 07:21:23.000000000 +0000
++++ src/xfmedia-xine.h
+@@ -87,9 +87,6 @@ gboolean     xfmedia_xine_open          
+ gboolean     xfmedia_xine_play                       (XfmediaXine *xfx,
+                                                   gint pos,
+                                                   gint start_time);
+-gboolean     xfmedia_xine_trick_mode                 (XfmediaXine *xfx,
+-                                                  gint mode,
+-                                                  gint value);
+ gint         xfmedia_xine_get_stream_info            (XfmediaXine *xfx,
+                                                   gint info);
+ G_CONST_RETURN gchar *xfmedia_xine_get_meta_info     (XfmediaXine *xfx,