5 files changed, 20 insertions, 39 deletions

diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile
index f091646571c7..5335333e733a 100644
--- a/sysutils/gnome-settings-daemon/Makefile
+++ b/sysutils/gnome-settings-daemon/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gnome-settings-daemon
-PORTVERSION=	3.16.4
+PORTVERSION=	3.18.2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -33,7 +33,7 @@ PORTSCOUT=	limitw:1,even
 
 USE_XORG=	xxf86misc
 USE_GNOME=	gnomedesktop3 intltool libxslt
-USES=		gettext gmake libtool pathfix pkgconfig tar:xz
+USES=		gettext gmake gnome libtool pathfix pkgconfig tar:xz
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 CONFIGURE_ARGS=	--disable-gudev \
@@ -64,6 +64,7 @@ GLIB_SCHEMAS=	org.gnome.settings-daemon.enums.xml \
 		org.gnome.settings-daemon.plugins.keyboard.gschema.xml \
 		org.gnome.settings-daemon.plugins.media-keys.gschema.xml \
 		org.gnome.settings-daemon.plugins.power.gschema.xml \
+		org.gnome.settings-daemon.plugins.power.gschema.xml.override \
 		org.gnome.settings-daemon.plugins.print-notifications.gschema.xml \
 		org.gnome.settings-daemon.plugins.sharing.gschema.xml \
 		org.gnome.settings-daemon.plugins.xrandr.gschema.xml \
@@ -73,4 +74,8 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/gnome|${PREFIX}/etc/gnome|g' \
 		${WRKSRC}/data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in.in
 
+post-install:
+	${INSTALL_DATA} ${FILESDIR}/org.gnome.settings-daemon.plugins.power.gschema.xml.override \
+		${STAGEDIR}${PREFIX}/share/glib-2.0/schemas/
+
 .include <bsd.port.mk>
diff --git a/sysutils/gnome-settings-daemon/distinfo b/sysutils/gnome-settings-daemon/distinfo
index a612ff66f94f..0c8ea22f7742 100644
--- a/sysutils/gnome-settings-daemon/distinfo
+++ b/sysutils/gnome-settings-daemon/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gnome-settings-daemon-3.16.4.tar.xz) = 15da8a112368c18e8b22b553cea5109c96bb8f7c097bb4f0bb685e10bd93edb5
-SIZE (gnome3/gnome-settings-daemon-3.16.4.tar.xz) = 1605708
+SHA256 (gnome3/gnome-settings-daemon-3.18.2.tar.xz) = 3071c7258f22684f7f64b7f735821e4cb25f59fc4665eb08e8d86b560e72fc6f
+SIZE (gnome3/gnome-settings-daemon-3.18.2.tar.xz) = 1626400
diff --git a/sysutils/gnome-settings-daemon/files/org.gnome.settings-daemon.plugins.power.gschema.xml.override b/sysutils/gnome-settings-daemon/files/org.gnome.settings-daemon.plugins.power.gschema.xml.override
new file mode 100644
index 000000000000..7f28bf9004c8
--- /dev/null
+++ b/sysutils/gnome-settings-daemon/files/org.gnome.settings-daemon.plugins.power.gschema.xml.override
@@ -0,0 +1,7 @@
+[org.gnome.settings-daemon.plugins.power]
+sleep-inactive-ac-type = 'nothing'
+sleep-inactive-battery-type = 'nothing'
+button-suspend = 'nothing'
+button-power = 'nothing'
+button-sleep = 'nothing'
+
diff --git a/sysutils/gnome-settings-daemon/files/patch-data_org.gnome.settings-daemon.plugins.power.gschema.xml.in.in b/sysutils/gnome-settings-daemon/files/patch-data_org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
deleted file mode 100644
index 70f064a773c8..000000000000
--- a/sysutils/gnome-settings-daemon/files/patch-data_org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
+++ /dev/null
@@ -1,35 +0,0 @@
---- data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in.orig	2014-03-04 16:15:04.000000000 +0000
-+++ data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in	2014-03-14 00:09:44.592409466 +0000
-@@ -26,7 +26,7 @@
-       <description>The amount of time in seconds the computer on AC power needs to be inactive before it goes to sleep. A value of 0 means never.</description>
-     </key>
-     <key name="sleep-inactive-ac-type" enum="org.gnome.settings-daemon.GsdPowerActionType">
--      <default>'suspend'</default>
-+      <default>'nothing'</default>
-       <summary>Whether to hibernate, suspend or do nothing when inactive</summary>
-       <description>The type of sleeping that should be performed when the computer is inactive.</description>
-     </key>
-@@ -36,12 +36,12 @@
-       <description>The amount of time in seconds the computer on battery power needs to be inactive before it goes to sleep. A value of 0 means never.</description>
-     </key>
-     <key name="sleep-inactive-battery-type" enum="org.gnome.settings-daemon.GsdPowerActionType">
--      <default>'suspend'</default>
-+      <default>'nothing'</default>
-       <summary>Whether to hibernate, suspend or do nothing when inactive</summary>
-       <description>The type of sleeping that should be performed when the computer is inactive.</description>
-     </key>
-     <key name="button-suspend" enum="org.gnome.settings-daemon.GsdPowerActionType">
--      <default>'suspend'</default>
-+      <default>'nothing'</default>
-       <summary>Suspend button action</summary>
-       <description>The action to take when the system suspend button is pressed.</description>
-     </key>
-@@ -57,7 +57,7 @@
-     </key>
-     <!-- See https://bugzilla.gnome.org/show_bug.cgi?id=652183 for rationale -->
-     <key name="button-power" enum="org.gnome.settings-daemon.GsdPowerActionType">
--      <default>'suspend'</default>
-+      <default>'nothing'</default>
-       <summary>Power button action</summary>
-       <description>The action to take when the system power button is pressed.</description>
-     </key>
diff --git a/sysutils/gnome-settings-daemon/pkg-plist b/sysutils/gnome-settings-daemon/pkg-plist
index 97a1ead5b862..b4a21ba94056 100644
--- a/sysutils/gnome-settings-daemon/pkg-plist
+++ b/sysutils/gnome-settings-daemon/pkg-plist
@@ -28,6 +28,9 @@ lib/gnome-settings-daemon-3.0/libmedia-keys.a
 lib/gnome-settings-daemon-3.0/libmedia-keys.so
 lib/gnome-settings-daemon-3.0/libmouse.a
 lib/gnome-settings-daemon-3.0/libmouse.so
+lib/gnome-settings-daemon-3.0/liborientation.a
+lib/gnome-settings-daemon-3.0/liborientation.so
+lib/gnome-settings-daemon-3.0/orientation.gnome-settings-plugin
 lib/gnome-settings-daemon-3.0/libpower.a
 lib/gnome-settings-daemon-3.0/libpower.so
 %%CUPS%%lib/gnome-settings-daemon-3.0/libprint-notifications.a
@@ -67,6 +70,7 @@ libexec/gsd-test-housekeeping
 libexec/gsd-test-keyboard
 libexec/gsd-test-media-keys
 libexec/gsd-test-mouse
+libexec/gsd-test-orientation
 %%CUPS%%libexec/gsd-test-print-notifications
 %%SMARTCARD%%libexec/gsd-test-smartcard
 libexec/gsd-test-sound