Cleanup, thanks leot@ for the heads up!

8 files changed, 17 insertions, 30 deletions

diff --git a/x11/xfce4-session/Makefile b/x11/xfce4-session/Makefile
index c3b3fdf53bd..716788aa728 100644
--- a/x11/xfce4-session/Makefile
+++ b/x11/xfce4-session/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2017/06/18 22:37:33 youri Exp $
+# $NetBSD: Makefile,v 1.60 2017/06/22 09:40:24 youri Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -49,5 +49,4 @@ CONF_FILES+=	${EGDIR}/xinitrc \
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/libxfce4ui/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "options.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-session/distinfo b/x11/xfce4-session/distinfo
index 85001321cd9..c89c11c3de1 100644
--- a/x11/xfce4-session/distinfo
+++ b/x11/xfce4-session/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.20 2017/06/18 22:37:33 youri Exp $
+$NetBSD: distinfo,v 1.21 2017/06/22 09:40:24 youri Exp $
 
 SHA1 (xfce4-session-4.13.0.tar.bz2) = 23d93a524870c0402c83ab23650a63bcaeaeb234
 RMD160 (xfce4-session-4.13.0.tar.bz2) = ab9fda8e31891ce9e244e9d7d15fc865d5a6f6c1
 SHA512 (xfce4-session-4.13.0.tar.bz2) = 61f9a547b03eb109a1a0fc83feaac743ea2119360f2f7208e589feb3e8f1db016ffe85cf1c8e20633ec399f263dcbccd35c431bde6f6f1482658688096da5cb0
 Size (xfce4-session-4.13.0.tar.bz2) = 1314715 bytes
-SHA1 (patch-ac) = 14398273b8169d26f89262310c1ca4d8546a2c0c
-SHA1 (patch-config.h.in) = 88c67de7708c958674de7f222937739dd9f7fc00
-SHA1 (patch-configure) = 10b5a5dd2047685012c1a898204cc695c9a70d35
-SHA1 (patch-scripts_Makefile.in) = 1d1f2230fc861f222f44b9541d52c157a23c16dc
-SHA1 (patch-settings_xfce4-session.xml) = 6607e682df06674c4e6a3219b911f58f756cfab7
+SHA1 (patch-ac) = 6d6ecae678ef34b0435ea40fa75ce51aeea1509d
+SHA1 (patch-config.h.in) = 30e2ae1ea70a99a83f11523e940081b661add69b
+SHA1 (patch-configure) = 55a15e79821b89cc37f6ebedac6ad1804cdee38a
+SHA1 (patch-scripts_Makefile.in) = 042c3d9c632a57f9acfc8dab43aa6bca8ec69097
+SHA1 (patch-settings_xfce4-session.xml) = 86a50db54aede973d7495869e3e713a39a73446d
 SHA1 (patch-xfsm-shutdown-helper_main.c) = 6f885efe31597360bb9534007daffa46df41c831
diff --git a/x11/xfce4-session/patches/patch-ac b/x11/xfce4-session/patches/patch-ac
index 85c8f64b337..6f5654cb892 100644
--- a/x11/xfce4-session/patches/patch-ac
+++ b/x11/xfce4-session/patches/patch-ac
@@ -1,6 +1,7 @@
-$NetBSD: patch-ac,v 1.3 2015/06/29 16:50:01 youri Exp $
+$NetBSD: patch-ac,v 1.4 2017/06/22 09:40:24 youri Exp $
 
 Adjust config path.
+
 --- settings/Makefile.in.orig	2015-03-16 07:29:45.000000000 +0000
 +++ settings/Makefile.in
 @@ -452,7 +452,7 @@ xfce4_session_settings_LDADD = \
diff --git a/x11/xfce4-session/patches/patch-config.h.in b/x11/xfce4-session/patches/patch-config.h.in
index bc5d5645a94..e3870054a5f 100644
--- a/x11/xfce4-session/patches/patch-config.h.in
+++ b/x11/xfce4-session/patches/patch-config.h.in
@@ -1,6 +1,7 @@
-$NetBSD: patch-config.h.in,v 1.1 2015/07/02 13:15:58 youri Exp $
+$NetBSD: patch-config.h.in,v 1.2 2017/06/22 09:40:24 youri Exp $
 
 Add NetBSD backend.
+
 --- config.h.in.orig	2015-03-16 07:29:52.000000000 +0000
 +++ config.h.in
 @@ -12,6 +12,9 @@
diff --git a/x11/xfce4-session/patches/patch-configure b/x11/xfce4-session/patches/patch-configure
index 809653ad9bb..ae17f54a240 100644
--- a/x11/xfce4-session/patches/patch-configure
+++ b/x11/xfce4-session/patches/patch-configure
@@ -1,6 +1,7 @@
-$NetBSD: patch-configure,v 1.2 2015/07/07 14:04:22 youri Exp $
+$NetBSD: patch-configure,v 1.3 2017/06/22 09:40:24 youri Exp $
 
 Add NetBSD backend detection.
+
 --- configure.orig	2015-03-16 07:29:45.000000000 +0000
 +++ configure
 @@ -18208,6 +18208,8 @@ if test x$with_backend = x; then
diff --git a/x11/xfce4-session/patches/patch-scripts_Makefile.in b/x11/xfce4-session/patches/patch-scripts_Makefile.in
index 83122403455..97b5a601b81 100644
--- a/x11/xfce4-session/patches/patch-scripts_Makefile.in
+++ b/x11/xfce4-session/patches/patch-scripts_Makefile.in
@@ -1,6 +1,7 @@
-$NetBSD: patch-scripts_Makefile.in,v 1.2 2015/06/29 16:50:01 youri Exp $
+$NetBSD: patch-scripts_Makefile.in,v 1.3 2017/06/22 09:40:24 youri Exp $
 
 Adjust config path.
+
 --- scripts/Makefile.in.orig	2015-03-16 07:29:45.000000000 +0000
 +++ scripts/Makefile.in
 @@ -363,12 +363,12 @@ edit = $(SED) \
diff --git a/x11/xfce4-session/patches/patch-settings_xfce4-session.xml b/x11/xfce4-session/patches/patch-settings_xfce4-session.xml
index a59980541cf..d76d3c5934d 100644
--- a/x11/xfce4-session/patches/patch-settings_xfce4-session.xml
+++ b/x11/xfce4-session/patches/patch-settings_xfce4-session.xml
@@ -1,6 +1,7 @@
-$NetBSD: patch-settings_xfce4-session.xml,v 1.2 2015/06/29 16:50:01 youri Exp $
+$NetBSD: patch-settings_xfce4-session.xml,v 1.3 2017/06/22 09:40:24 youri Exp $
 
 Look for the right thunar binary.
+
 --- settings/xfce4-session.xml.orig	2014-08-28 15:50:18.000000000 +0000
 +++ settings/xfce4-session.xml
 @@ -21,7 +21,7 @@
diff --git a/x11/xfce4-session/patches/patch-xfce4-session_xfsm-global.h b/x11/xfce4-session/patches/patch-xfce4-session_xfsm-global.h
deleted file mode 100644
index eb7b2b4ebcf..00000000000
--- a/x11/xfce4-session/patches/patch-xfce4-session_xfsm-global.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-xfce4-session_xfsm-global.h,v 1.1 2015/07/07 14:04:22 youri Exp $
-
-Make verbose logging optional.
---- xfce4-session/xfsm-global.h.orig	2014-09-28 14:51:01.000000000 +0000
-+++ xfce4-session/xfsm-global.h
-@@ -49,7 +49,10 @@ extern XfsmSplashScreen *splash_screen;
- #if defined(G_HAVE_ISO_VARARGS)
- 
- #define xfsm_verbose(...)\
--    xfsm_verbose_real (__func__, __FILE__, __LINE__, __VA_ARGS__)
-+G_STMT_START{	\
-+	if (G_UNLIKELY (verbose))	\
-+    		xfsm_verbose_real (__func__, __FILE__, __LINE__, __VA_ARGS__);\
-+}G_STMT_END
- 
- #else
-