Update to 4.12.1:

4.12.0
======
Stable release of xfce4-session for Xfce 4.12.

* Miscellaneous bug fixes:
- Remove AC_CHECK_HEADER_STDBOOL, it was only
  added in autoconf 2.69 and we dont use
  stdbool.h anyway
- Add symlinks to the old icons (Bug #11513)
- Rename action icon names (Bug #11513)
- Gracefully handle the sessions dir being
  readonly (Bug #11307)
- Add ConsoleKit2 support
- Create scripts/xinitrc from scripts/xinitrc.in
  created by configure

* Translation updates:
  Asturian (ast), Bulgarian (bg), Spanish (Castilian) (es),
  Finnish (fi), French (fr), Hebrew (he), Romanian (ro),
  Slovak (sk), Slovenian (sl).

4.11.1
======
- Add DesktopNames to .desktop file
- Export XDG_CURRENT_DESKTOP (Bug #11239)
- Expand usage of xfsm_verbose for debugging
- Don't log errors when trying to close non-existent FDs
- Add error checking for fcntl
- Properly print the dbus error message
- Check the return value of select
- atoi (argv[2]) is unsafe
- Check the return value of gtk_tree_selection_get_selected
- gtk_cell_renderer_text_new is never used
- Minor Autotools Updates
- Add fallback DragonflyBSD support for suspend/hibernate
- Use pkexec for xfsm-shutdown (Bug 9952)
- Handle gpg and ssh agents separately
  Patch by Mikhail Efremov
- Non-POSIX compliant test used in startxfce4 (Bug 10828)
  Patch by seejay
- Update copyright year (Bug 10768)
- polkit_unix_process_new is deprecated (Bug 10793)
  Patch by Baurzhan Muftakhidinov
- Add logind runtime detection to support suspend/hibernate (Bug 9952)
  Patch by Guido Berhoerster
- Translation Updates: Asturian (ast), Bulgarian (bg),
  German (de), Spanish (Castilian) (es), Finnish (fi),
  French (fr), Norwegian Bokmål (nb), Dutch (Flemish) (nl),
  Polish (pl), Swedish (sv), Phan Vĩnh Thịnh (vi).

4.11.0
======
- Remove gnome-keyring remains.
- Remove xfce environment functions and use glib.
- Add shutdown/reboot functionality for systemd (bug #8729).
- Fix duplicated accelerators.
- Use the async spawn function of glib.
- Store the watch function id to avoid possible double free (bug #9709).
- Translation updates: Amharic, Arabic, Asturian, Azerbaijani,
  Belarusian, Bulgarian, Bengali, Bengali (India), Catalan (Valencian),
  Czech, Danish, German, Dzongkha, Greek, English (Australia), English
  (United Kingdom), Spanish (Castilian), Basque, Persian, Finnish,
  French, Galician, Gujarati, Hindi, Croatian, Hungarian, Indonesian,
  Icelandic, Italian, Japanese, Georgian, Kazakh, Korean, Lithuanian,
  Latvian, Macedonian, Marathi, Malay, Norwegian Bokmal, Dutch
  (Flemish), Norwegian Nynorsk, Occitan (post 1500), Polish,
  Portuguese, Portuguese (Brazilian), Romanian, Russian, Slovak,
  Albanian, Serbian, Swedish, Tamil, Thai, Turkish, Uyghur, Ukrainian,
  Urdu, Urdu (Pakistan), Chinese (China), Chinese (Hong Kong), Chinese
  (Taiwan).

6 files changed, 35 insertions, 42 deletions

diff --git a/x11/xfce4-session/Makefile b/x11/xfce4-session/Makefile
index f3a50398e83..250b6737f7e 100644
--- a/x11/xfce4-session/Makefile
+++ b/x11/xfce4-session/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.50 2015/04/25 14:25:25 tnn Exp $
+# $NetBSD: Makefile,v 1.51 2015/06/29 16:50:01 youri Exp $
 
-PKGREVISION= 1
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-DISTNAME=		xfce4-session-4.10.1
+DISTNAME=		xfce4-session-4.12.1
 CATEGORIES=		x11
-MASTER_SITES+=		http://archive.xfce.org/src/xfce/xfce4-session/4.10/
+MASTER_SITES+=		http://archive.xfce.org/src/xfce/xfce4-session/4.12/
 
 HOMEPAGE=	http://docs.xfce.org/xfce/xfce4-session/start
 COMMENT=		Xfce session manager
@@ -23,18 +22,9 @@ EGDIR=			${XFCE4_EGBASE}
 PKG_SYSCONFSUBDIR=	xdg
 
 MAKE_DIRS+=	${PKG_SYSCONFDIR} ${PKG_SYSCONFDIR}/autostart
-MAKE_DIRS+=	${PREFIX}/include/xfce4 ${PREFIX}/lib/xfce4
 MAKE_DIRS+=	${EGDIR} ${EGDIR}/autostart ${EGDIR}/xfconf
 MAKE_DIRS+=	${EGDIR}/xfconf/xfce-perchannel-xml
-MAKE_DIRS+=	${EGDIR}/share/themes/Default
-MAKE_DIRS+=	${PREFIX}/share/xfce4 ${PREFIX}/share/xfce4/doc
-MAKE_DIRS+=	${PREFIX}/share/xfce4/doc/C ${PREFIX}/share/xfce4/doc/C/images
-MAKE_DIRS+=	${PREFIX}/share/xfce4/doc/fr ${PREFIX}/share/xfce4/doc/fr/images
-
-#CONF_FILES=	${EGDIR}/applications/xfce-session-settings.desktop \
-		${PKG_SYSCONFDIR}/applications/xfce-session-settings.desktop
-#CONF_FILES+=	${EGDIR}/applications/xfce4-session-logout.desktop \
-		${PKG_SYSCONFDIR}/applications/xfce4-session-logout.desktop
+
 CONF_FILES=	${EGDIR}/autostart/xscreensaver.desktop \
 		${PKG_SYSCONFDIR}/autostart/xscreensaver.desktop
 CONF_FILES=	${EGDIR}/xfconf/xfce-perchannel-xml/xfce4-session.xml \
diff --git a/x11/xfce4-session/PLIST b/x11/xfce4-session/PLIST
index 2dc7577bdc8..9e7c565b7da 100644
--- a/x11/xfce4-session/PLIST
+++ b/x11/xfce4-session/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2015/04/21 08:56:45 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.17 2015/06/29 16:50:01 youri Exp $
 bin/startxfce4
 bin/xfce4-session
 bin/xfce4-session-logout
@@ -23,6 +23,11 @@ share/examples/xfce4/autostart/xscreensaver.desktop
 share/examples/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
 share/examples/xfce4/xinitrc
 share/icons/hicolor/128x128/apps/xfce4-session.png
+share/icons/hicolor/48x48/apps/system-hibernate.png
+share/icons/hicolor/48x48/apps/system-log-out.png
+share/icons/hicolor/48x48/apps/system-reboot.png
+share/icons/hicolor/48x48/apps/system-shutdown.png
+share/icons/hicolor/48x48/apps/system-suspend.png
 share/icons/hicolor/48x48/apps/xfce4-session.png
 share/icons/hicolor/48x48/apps/xfce4-splash.png
 share/icons/hicolor/48x48/apps/xfsm-hibernate.png
@@ -30,52 +35,45 @@ share/icons/hicolor/48x48/apps/xfsm-logout.png
 share/icons/hicolor/48x48/apps/xfsm-reboot.png
 share/icons/hicolor/48x48/apps/xfsm-shutdown.png
 share/icons/hicolor/48x48/apps/xfsm-suspend.png
+share/icons/hicolor/scalable/apps/system-shutdown.svg
 share/icons/hicolor/scalable/apps/xfce4-session.svg
 share/icons/hicolor/scalable/apps/xfsm-shutdown.svg
 share/locale/am/LC_MESSAGES/xfce4-session.mo
 share/locale/ar/LC_MESSAGES/xfce4-session.mo
 share/locale/ast/LC_MESSAGES/xfce4-session.mo
-share/locale/az/LC_MESSAGES/xfce4-session.mo
 share/locale/be/LC_MESSAGES/xfce4-session.mo
 share/locale/bg/LC_MESSAGES/xfce4-session.mo
 share/locale/bn/LC_MESSAGES/xfce4-session.mo
-share/locale/bn_IN/LC_MESSAGES/xfce4-session.mo
 share/locale/ca/LC_MESSAGES/xfce4-session.mo
 share/locale/cs/LC_MESSAGES/xfce4-session.mo
 share/locale/da/LC_MESSAGES/xfce4-session.mo
 share/locale/de/LC_MESSAGES/xfce4-session.mo
-share/locale/dz/LC_MESSAGES/xfce4-session.mo
 share/locale/el/LC_MESSAGES/xfce4-session.mo
+share/locale/en_AU/LC_MESSAGES/xfce4-session.mo
 share/locale/en_GB/LC_MESSAGES/xfce4-session.mo
 share/locale/eo/LC_MESSAGES/xfce4-session.mo
 share/locale/es/LC_MESSAGES/xfce4-session.mo
-share/locale/es_MX/LC_MESSAGES/xfce4-session.mo
 share/locale/et/LC_MESSAGES/xfce4-session.mo
 share/locale/eu/LC_MESSAGES/xfce4-session.mo
-share/locale/fa/LC_MESSAGES/xfce4-session.mo
 share/locale/fi/LC_MESSAGES/xfce4-session.mo
 share/locale/fr/LC_MESSAGES/xfce4-session.mo
 share/locale/gl/LC_MESSAGES/xfce4-session.mo
-share/locale/gu/LC_MESSAGES/xfce4-session.mo
 share/locale/he/LC_MESSAGES/xfce4-session.mo
-share/locale/hi/LC_MESSAGES/xfce4-session.mo
 share/locale/hr/LC_MESSAGES/xfce4-session.mo
 share/locale/hu/LC_MESSAGES/xfce4-session.mo
 share/locale/id/LC_MESSAGES/xfce4-session.mo
 share/locale/is/LC_MESSAGES/xfce4-session.mo
 share/locale/it/LC_MESSAGES/xfce4-session.mo
 share/locale/ja/LC_MESSAGES/xfce4-session.mo
-share/locale/ka/LC_MESSAGES/xfce4-session.mo
 share/locale/kk/LC_MESSAGES/xfce4-session.mo
 share/locale/ko/LC_MESSAGES/xfce4-session.mo
 share/locale/lt/LC_MESSAGES/xfce4-session.mo
 share/locale/lv/LC_MESSAGES/xfce4-session.mo
-share/locale/mk/LC_MESSAGES/xfce4-session.mo
-share/locale/mr/LC_MESSAGES/xfce4-session.mo
 share/locale/ms/LC_MESSAGES/xfce4-session.mo
 share/locale/nb/LC_MESSAGES/xfce4-session.mo
 share/locale/nl/LC_MESSAGES/xfce4-session.mo
 share/locale/nn/LC_MESSAGES/xfce4-session.mo
+share/locale/oc/LC_MESSAGES/xfce4-session.mo
 share/locale/pa/LC_MESSAGES/xfce4-session.mo
 share/locale/pl/LC_MESSAGES/xfce4-session.mo
 share/locale/pt/LC_MESSAGES/xfce4-session.mo
@@ -84,11 +82,12 @@ share/locale/ro/LC_MESSAGES/xfce4-session.mo
 share/locale/ru/LC_MESSAGES/xfce4-session.mo
 share/locale/si/LC_MESSAGES/xfce4-session.mo
 share/locale/sk/LC_MESSAGES/xfce4-session.mo
+share/locale/sl/LC_MESSAGES/xfce4-session.mo
 share/locale/sq/LC_MESSAGES/xfce4-session.mo
 share/locale/sr/LC_MESSAGES/xfce4-session.mo
 share/locale/sv/LC_MESSAGES/xfce4-session.mo
-share/locale/ta/LC_MESSAGES/xfce4-session.mo
 share/locale/te/LC_MESSAGES/xfce4-session.mo
+share/locale/th/LC_MESSAGES/xfce4-session.mo
 share/locale/tr/LC_MESSAGES/xfce4-session.mo
 share/locale/ug/LC_MESSAGES/xfce4-session.mo
 share/locale/uk/LC_MESSAGES/xfce4-session.mo
@@ -96,6 +95,7 @@ share/locale/ur/LC_MESSAGES/xfce4-session.mo
 share/locale/ur_PK/LC_MESSAGES/xfce4-session.mo
 share/locale/vi/LC_MESSAGES/xfce4-session.mo
 share/locale/zh_CN/LC_MESSAGES/xfce4-session.mo
+share/locale/zh_HK/LC_MESSAGES/xfce4-session.mo
 share/locale/zh_TW/LC_MESSAGES/xfce4-session.mo
 share/themes/Default/balou/logo.png
 share/themes/Default/balou/themerc
diff --git a/x11/xfce4-session/distinfo b/x11/xfce4-session/distinfo
index 78ad1ad40dc..f94d9f2abef 100644
--- a/x11/xfce4-session/distinfo
+++ b/x11/xfce4-session/distinfo
@@ -1,9 +1,12 @@
-$NetBSD: distinfo,v 1.13 2015/04/21 08:56:45 jperkin Exp $
+$NetBSD: distinfo,v 1.14 2015/06/29 16:50:01 youri Exp $
 
-SHA1 (xfce4-session-4.10.1.tar.bz2) = b33d2ced61a9cbacff4f5709959e02d4d1c3836f
-RMD160 (xfce4-session-4.10.1.tar.bz2) = c8c72d954ebb22085e4c4d7d14ab7b9dbfdab6b4
-Size (xfce4-session-4.10.1.tar.bz2) = 1273015 bytes
-SHA1 (patch-ac) = 0fc28a4a34455470cd893c3240f184058a31d89e
-SHA1 (patch-scripts_Makefile.in) = da968583217fe713de60e8466df8ec602a54453d
-SHA1 (patch-scripts_startxfce4.in) = b85727681bf67975d45980656c4312d70d067d9b
-SHA1 (patch-settings_xfce4-session.xml) = dcba5873ec78cd822b4bbc19af3677ab10b1cab3
+SHA1 (xfce4-session-4.12.1.tar.bz2) = ccdeac8bb6b4bb2382a963efdf2e05c09c61fee4
+RMD160 (xfce4-session-4.12.1.tar.bz2) = 14db09177003f4139345b4d670015d90ebf28ef6
+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-ac b/x11/xfce4-session/patches/patch-ac
index a0a20a16e9a..85c8f64b337 100644
--- a/x11/xfce4-session/patches/patch-ac
+++ b/x11/xfce4-session/patches/patch-ac
@@ -1,9 +1,9 @@
-$NetBSD: patch-ac,v 1.2 2015/04/21 08:56:45 jperkin Exp $
+$NetBSD: patch-ac,v 1.3 2015/06/29 16:50:01 youri Exp $
 
 Adjust config path.
---- settings/Makefile.in.orig	2013-05-05 15:33:59.000000000 +0000
+--- settings/Makefile.in.orig	2015-03-16 07:29:45.000000000 +0000
 +++ settings/Makefile.in
-@@ -418,7 +418,7 @@ xfce4_session_settings_LDADD = \
+@@ -452,7 +452,7 @@ xfce4_session_settings_LDADD = \
  xfce4_session_settings_DEPENDENCIES = \
  	$(top_builddir)/libxfsm/libxfsm-4.6.la
  
diff --git a/x11/xfce4-session/patches/patch-scripts_Makefile.in b/x11/xfce4-session/patches/patch-scripts_Makefile.in
index f92d1f6ccb9..83122403455 100644
--- a/x11/xfce4-session/patches/patch-scripts_Makefile.in
+++ b/x11/xfce4-session/patches/patch-scripts_Makefile.in
@@ -1,9 +1,9 @@
-$NetBSD: patch-scripts_Makefile.in,v 1.1 2015/04/21 08:56:45 jperkin Exp $
+$NetBSD: patch-scripts_Makefile.in,v 1.2 2015/06/29 16:50:01 youri Exp $
 
 Adjust config path.
---- scripts/Makefile.in.orig	2013-05-05 15:33:59.000000000 +0000
+--- scripts/Makefile.in.orig	2015-03-16 07:29:45.000000000 +0000
 +++ scripts/Makefile.in
-@@ -329,12 +329,12 @@ edit = $(SED) \
+@@ -363,12 +363,12 @@ edit = $(SED) \
  	-e "s,@_docdir_\@,$$(dirname $(docdir)),g" \
  	-e "s,@_sysconfdir_\@,$(sysconfdir),g"
  
diff --git a/x11/xfce4-session/patches/patch-settings_xfce4-session.xml b/x11/xfce4-session/patches/patch-settings_xfce4-session.xml
index 1ae4317dee1..a59980541cf 100644
--- a/x11/xfce4-session/patches/patch-settings_xfce4-session.xml
+++ b/x11/xfce4-session/patches/patch-settings_xfce4-session.xml
@@ -1,7 +1,7 @@
-$NetBSD: patch-settings_xfce4-session.xml,v 1.1 2015/04/21 08:56:45 jperkin Exp $
+$NetBSD: patch-settings_xfce4-session.xml,v 1.2 2015/06/29 16:50:01 youri Exp $
 
 Look for the right thunar binary.
---- settings/xfce4-session.xml.orig	2013-05-05 15:33:55.000000000 +0000
+--- settings/xfce4-session.xml.orig	2014-08-28 15:50:18.000000000 +0000
 +++ settings/xfce4-session.xml
 @@ -21,7 +21,7 @@
        </property>