From f4b9dcf6aa0588be77b1e11ae23adf29cb9a885c Mon Sep 17 00:00:00 2001
From: dcoppa <dcoppa@openbsd.org>
Date: Wed, 25 May 2011 12:35:33 +0000
Subject: [PATCH] Enable support for gnome-power-manager's inhibit method now
 that we have a port of gnome-power-manager. Add a note into pkg/README.

With help and OK ajacoutot@
---
 x11/gnome-mplayer/Makefile                |  5 ++-
 x11/gnome-mplayer/patches/patch-configure | 50 +----------------------
 x11/gnome-mplayer/pkg/MESSAGE             |  5 ---
 x11/gnome-mplayer/pkg/PLIST               |  3 +-
 x11/gnome-mplayer/pkg/README              | 15 +++++++
 5 files changed, 21 insertions(+), 57 deletions(-)
 delete mode 100644 x11/gnome-mplayer/pkg/MESSAGE
 create mode 100644 x11/gnome-mplayer/pkg/README

diff --git a/x11/gnome-mplayer/Makefile b/x11/gnome-mplayer/Makefile
index cf3a1d9e6da..c0f692fba8c 100644
--- a/x11/gnome-mplayer/Makefile
+++ b/x11/gnome-mplayer/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.36 2011/05/04 05:35:54 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.37 2011/05/25 12:35:33 dcoppa Exp $
 
 COMMENT =		GTK+/GNOME frontend for MPlayer
 DISTNAME =		gnome-mplayer-1.0.3
-REVISION =		0
+REVISION =		1
 CATEGORIES =		x11 multimedia
 
 MAINTAINER =		David Coppa <dcoppa@openbsd.org>
@@ -49,6 +49,7 @@ CONFIGURE_ENV =		CPPFLAGS="-I${LOCALBASE}/include \
 			LDFLAGS="-L${LOCALBASE}/lib \
 				-L${X11BASE}/lib -pthread"
 CONFIGURE_ARGS =	--with-gio \
+			--with-gpm-new-method \
 			--with-libnotify \
 			--with-libgpod \
 			--with-libmusicbrainz3 \
diff --git a/x11/gnome-mplayer/patches/patch-configure b/x11/gnome-mplayer/patches/patch-configure
index f029949f26e..c259f4138d8 100644
--- a/x11/gnome-mplayer/patches/patch-configure
+++ b/x11/gnome-mplayer/patches/patch-configure
@@ -1,4 +1,4 @@
-$OpenBSD: patch-configure,v 1.5 2011/04/28 11:47:48 dcoppa Exp $
+$OpenBSD: patch-configure,v 1.6 2011/05/25 12:35:33 dcoppa Exp $
 
 don't check for libgpod 0.6.x: it's not in our ports tree
 disable gnome-power-manager support
@@ -131,51 +131,3 @@ disable gnome-power-manager support
  
  
  
-@@ -9318,47 +9231,6 @@ $as_echo "#define SM_INHIBIT 0" >>confdefs.h
- $as_echo "#define SS_INHIBIT 0" >>confdefs.h
- 
- 
--
--# Check whether --with-gpm-new-method was given.
--if test "${with_gpm_new_method+set}" = set; then :
--  withval=$with_gpm_new_method; CHECK_GPM=no
--$as_echo "#define SM_INHIBIT 1" >>confdefs.h
--
--fi
--
--
--# Check whether --with-gpm-old-method was given.
--if test "${with_gpm_old_method+set}" = set; then :
--  withval=$with_gpm_old_method; CHECK_GPM=no
--$as_echo "#define SS_INHIBIT 1" >>confdefs.h
--
--fi
--
--
--if test x$CHECK_GPM = "xyes"; then
--	GPM=`which gnome-power-manager`
--    if test "$GPM" != ""; then
--            { $as_echo "$as_me:${as_lineno-$LINENO}: Checking for gnome-power-manager support" >&5
--$as_echo "$as_me: Checking for gnome-power-manager support" >&6;}
--            GPMVER=`$GPM --version | sed -e 's/.* 2.//' | cut -b1-2`
--            if test -n $GPMVER; then
--
--$as_echo "#define SM_INHIBIT 1" >>confdefs.h
--
--            else
--                if test $GPMVER -ge 26; then
--
--$as_echo "#define SM_INHIBIT 1" >>confdefs.h
--
--                fi
--                if test $GPMVER -lt 26; then
--
--$as_echo "#define SS_INHIBIT 1" >>confdefs.h
--
--                fi
--            fi
--    fi
--fi
- 
- if test x$with_gsettings = "xyes"; then
- 
diff --git a/x11/gnome-mplayer/pkg/MESSAGE b/x11/gnome-mplayer/pkg/MESSAGE
deleted file mode 100644
index 62ba7dea578..00000000000
--- a/x11/gnome-mplayer/pkg/MESSAGE
+++ /dev/null
@@ -1,5 +0,0 @@
-To prevent errors, the "unclutter" program (from x11/unclutter) must not
-be running when using gnome-mplayer.
-
-MPlayer software volume control (softvol) is enabled by default because 
-there is no volume control in mplayer's sndio backend.
diff --git a/x11/gnome-mplayer/pkg/PLIST b/x11/gnome-mplayer/pkg/PLIST
index 1ecefa485d3..30508bede05 100644
--- a/x11/gnome-mplayer/pkg/PLIST
+++ b/x11/gnome-mplayer/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.8 2011/04/28 11:47:48 dcoppa Exp $
+@comment $OpenBSD: PLIST,v 1.9 2011/05/25 12:35:33 dcoppa Exp $
 @bin bin/gnome-mplayer
 @man man/man1/gnome-mplayer.1
 share/applications/gnome-mplayer.desktop
@@ -12,6 +12,7 @@ share/doc/gnome-mplayer/README
 share/doc/gnome-mplayer/dbus.txt
 share/doc/gnome-mplayer/keyboard_shortcuts.txt
 share/doc/gnome-mplayer/plugin-interaction.txt
+share/doc/pkg-readmes/${FULLPKGNAME}
 share/glib-2.0/schemas/apps.gecko-mediaplayer.preferences.gschema.xml
 share/glib-2.0/schemas/apps.gnome-mplayer.preferences.enums.xml
 share/glib-2.0/schemas/apps.gnome-mplayer.preferences.gschema.xml
diff --git a/x11/gnome-mplayer/pkg/README b/x11/gnome-mplayer/pkg/README
new file mode 100644
index 00000000000..b00f355b21c
--- /dev/null
+++ b/x11/gnome-mplayer/pkg/README
@@ -0,0 +1,15 @@
+$OpenBSD: README,v 1.1 2011/05/25 12:35:33 dcoppa Exp $
+
+Running gnome-mplayer on OpenBSD
+================================
+
+To prevent errors, the "unclutter" program (from x11/unclutter) must not
+be running when using gnome-mplayer.
+
+MPlayer software volume control (softvol) is enabled by default because
+there is no volume control in mplayer's sndio(7) backend.
+
+To use the gnome-power-manager's inhibit method instead of the
+XScrnSaver one, go into Edit->Preferences->Interface and remove the
+checkmark from "Use X Screen Saver control over Gnome Power Manager"
+(this obviously needs the gnome-power-manager package to be installed).