Remove unneeded patch and add other patches I forgot to commit earlier.

5 files changed, 59 insertions, 25 deletions

diff --git a/x11/xfce4-session/distinfo b/x11/xfce4-session/distinfo
index f94d9f2abef..b42fa2d7d70 100644
--- a/x11/xfce4-session/distinfo
+++ b/x11/xfce4-session/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2015/06/29 16:50:01 youri Exp $
+$NetBSD: distinfo,v 1.15 2015/07/02 13:15:58 youri Exp $
 
 SHA1 (xfce4-session-4.12.1.tar.bz2) = ccdeac8bb6b4bb2382a963efdf2e05c09c61fee4
 RMD160 (xfce4-session-4.12.1.tar.bz2) = 14db09177003f4139345b4d670015d90ebf28ef6
@@ -6,7 +6,6 @@ Size (xfce4-session-4.12.1.tar.bz2) = 1289284 bytes
 SHA1 (patch-ac) = 14398273b8169d26f89262310c1ca4d8546a2c0c
 SHA1 (patch-config.h.in) = 88c67de7708c958674de7f222937739dd9f7fc00
 SHA1 (patch-configure) = 22924508b9af1b428dfe41413ff46b5592d17c48
-SHA1 (patch-configure.ac) = f6d86f0e1be3fc7124f0a83c04667f30e07e71b2
 SHA1 (patch-scripts_Makefile.in) = 1d1f2230fc861f222f44b9541d52c157a23c16dc
 SHA1 (patch-settings_xfce4-session.xml) = 6607e682df06674c4e6a3219b911f58f756cfab7
 SHA1 (patch-xfsm-shutdown-helper_main.c) = 93d2322ed90bef8b17427c1cb32e2fe87f614b04
diff --git a/x11/xfce4-session/patches/patch-config.h.in b/x11/xfce4-session/patches/patch-config.h.in
new file mode 100644
index 00000000000..bc5d5645a94
--- /dev/null
+++ b/x11/xfce4-session/patches/patch-config.h.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-config.h.in,v 1.1 2015/07/02 13:15:58 youri Exp $
+
+Add NetBSD backend.
+--- config.h.in.orig	2015-03-16 07:29:52.000000000 +0000
++++ config.h.in
+@@ -12,6 +12,9 @@
+ /* OpenBSD suspend/hibernate backend */
+ #undef BACKEND_TYPE_OPENBSD
+ 
++/* NetBSD suspend/hibernate backend */
++#undef BACKEND_TYPE_NETBSD
++
+ /* Define for debugging support */
+ #undef DEBUG
+ 
diff --git a/x11/xfce4-session/patches/patch-configure b/x11/xfce4-session/patches/patch-configure
new file mode 100644
index 00000000000..b84bbbe6a41
--- /dev/null
+++ b/x11/xfce4-session/patches/patch-configure
@@ -0,0 +1,26 @@
+$NetBSD: patch-configure,v 1.1 2015/07/02 13:15:58 youri Exp $
+
+Add NetBSD backend detection.
+--- configure.orig	2015-06-29 16:19:21.000000000 +0000
++++ configure
+@@ -18208,6 +18208,8 @@ if test x$with_backend = x; then
+     with_backend=freebsd ;; #(
+   *-*dragonfly*) :
+     with_backend=freebsd ;; #(
++  *-*netbsd*) :
++    with_backend=netbsd ;; #(
+   *-openbsd*) :
+     with_backend=openbsd ;; #(
+   *) :
+@@ -18237,6 +18239,11 @@ if test x$with_backend = xopenbsd; then
+ $as_echo "#define BACKEND_TYPE_OPENBSD 1" >>confdefs.h
+ 
+ fi
++if test x$with_backend = xnetbsd; then
++
++$as_echo "#define BACKEND_TYPE_NETBSD 1" >>confdefs.h
++
++fi
+ 
+ XFCE_GLADE_CATALOG_PATH="`pkg-config --variable glade_catalogdir libxfce4ui-1`"
+ XFCE_GLADE_PIXMAP_PATH="`pkg-config --variable glade_pixmapdir libxfce4ui-1`"
diff --git a/x11/xfce4-session/patches/patch-scripts_startxfce4.in b/x11/xfce4-session/patches/patch-scripts_startxfce4.in
deleted file mode 100644
index 45146d587e2..00000000000
--- a/x11/xfce4-session/patches/patch-scripts_startxfce4.in
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-scripts_startxfce4.in,v 1.1 2015/04/21 08:56:45 jperkin Exp $
-
-Portability fix
---- scripts/startxfce4.in.orig	2013-05-05 15:33:55.000000000 +0000
-+++ scripts/startxfce4.in
-@@ -24,7 +24,7 @@ then
-   OPTS=""
-   for OPT in $*
-   do
--    if test "x$OPT" == "x--help"
-+    if test "x$OPT" = "x--help"
-     then
-       # print help and exit
-       echo "Usage:"
-@@ -37,7 +37,7 @@ then
-       echo
- 
-       exit 0
--    elif test "x$OPT" == "x--with-ck-launch"
-+    elif test "x$OPT" = "x--with-ck-launch"
-     then
-       # try to launch xfce4-session with ck-launch-session in xinitrc
-       XFCE4_SESSION_WITH_CK="1"
diff --git a/x11/xfce4-session/patches/patch-xfsm-shutdown-helper_main.c b/x11/xfce4-session/patches/patch-xfsm-shutdown-helper_main.c
new file mode 100644
index 00000000000..b45f42d4b6b
--- /dev/null
+++ b/x11/xfce4-session/patches/patch-xfsm-shutdown-helper_main.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-xfsm-shutdown-helper_main.c,v 1.1 2015/07/02 13:15:58 youri Exp $
+
+Add NetBSD commands.
+--- xfsm-shutdown-helper/main.c.orig	2014-08-28 15:52:27.000000000 +0000
++++ xfsm-shutdown-helper/main.c
+@@ -91,7 +91,10 @@
+ #define UP_BACKEND_SUSPEND_COMMAND	"/usr/sbin/zzz"
+ #define UP_BACKEND_HIBERNATE_COMMAND "/usr/sbin/ZZZ"
+ #endif
+-
++#ifdef BACKEND_TYPE_NETBSD
++#define UP_BACKEND_SUSPEND_COMMAND      "/usr/sbin/zzz"
++#define UP_BACKEND_HIBERNATE_COMMAND    "/usr/sbin/zzz"
++#endif
+ 
+ static gboolean
+ run (const gchar *command)