Another batch of updates. Add xps as an option for evince. Also

bring in adwaita-icon-theme, evince needs it and will replace
the default gnome icon theme.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19966 df743ca5-7f9a-e211-a948-0013205c9059

5 files changed, 43 insertions, 94 deletions

diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile
index c4e22f0ca..fee2b8d74 100644
--- a/sysutils/gnome-settings-daemon/Makefile
+++ b/sysutils/gnome-settings-daemon/Makefile
@@ -3,8 +3,7 @@
 #   $MCom$
 
 PORTNAME=	gnome-settings-daemon
-PORTVERSION=	3.12.2
-PORTREVISION=	1
+PORTVERSION=	3.14.1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -32,13 +31,14 @@ RUN_DEPENDS=	gnome-session>=0:${PORTSDIR}/x11/gnome-session \
 		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
 
 USE_XORG=	xxf86misc
-USE_GNOME=	gnomehier gnomedesktop3 gnomeprefix intlhack
+USE_GNOME=	gnomehier gnomedesktop3 gnomeprefix intlhack libxslt
 USES=		gettext gmake libtool pathfix pkgconfig tar:xz
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 CONFIGURE_ARGS=	--disable-gudev \
 		--disable-systemd \
 		--disable-rfkill \
+		--disable-network-manager \
 		--disable-packagekit
 #		--disable-ibus \
 #--with-pnpids=${LOCALBASE}/share/libgnome-desktop-3.0/pnp.ids
@@ -46,9 +46,14 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
+OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	CUPS SMARTCARD
 OPTIONS_DEFAULT=CUPS SMARTCARD
 SMARTCARD_DESC=	Smartcard support
+CUPS_CONFIGURE_ENABLE=	cups
+CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client
+SMARTCARD_CONFIGURE_ENABLE=	smartcard-support
+SMARTCARD_LIB_DEPENDS=	libnss3.so:${PORTSDIR}/security/nss
 
 GLIB_SCHEMAS=	org.gnome.settings-daemon.enums.xml \
 		org.gnome.settings-daemon.peripherals.gschema.xml \
@@ -60,30 +65,12 @@ GLIB_SCHEMAS=	org.gnome.settings-daemon.enums.xml \
 		org.gnome.settings-daemon.plugins.media-keys.gschema.xml \
 		org.gnome.settings-daemon.plugins.power.gschema.xml \
 		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 \
 		org.gnome.settings-daemon.plugins.xsettings.gschema.xml
 # work around missing cursor with xorg-server 1.12.
 GLIB_SCHEMAS+=	cursor-plugin.gschema.override
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MCUPS}
-LIB_DEPENDS+=	libcups.so:${PORTSDIR}/print/cups-client
-PLIST_SUB+=	CUPS=""
-.else
-PLIST_SUB+=	CUPS="@comment "
-CONFIGURE_ARGS+=--disable-cups
-.endif
-
-.if ${PORT_OPTIONS:MSMARTCARD}
-LIB_DEPENDS+=	libnss3.so:${PORTSDIR}/security/nss
-CONFIGURE_ARGS+=--enable-smartcard-support
-PLIST_SUB+=	SMARTCARD=""
-.else
-CONFIGURE_ARGS+=--disable-smartcard-support
-PLIST_SUB+=	SMARTCARD="@comment "
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/gnome|${PREFIX}/etc/gnome|g' \
 		${WRKSRC}/data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in.in
diff --git a/sysutils/gnome-settings-daemon/distinfo b/sysutils/gnome-settings-daemon/distinfo
index f3f84e601..3834b0ce8 100644
--- a/sysutils/gnome-settings-daemon/distinfo
+++ b/sysutils/gnome-settings-daemon/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gnome-settings-daemon-3.12.2.tar.xz) = e887bd63c733febccb7f2c1453c075016342e223214fa9cfc60d90f1e16e080f
-SIZE (gnome3/gnome-settings-daemon-3.12.2.tar.xz) = 1672512
+SHA256 (gnome3/gnome-settings-daemon-3.14.1.tar.xz) = 1bcca93d9dab5d5a98d0fdfcd1730d334b12158b06d352070537e418f2d98f96
+SIZE (gnome3/gnome-settings-daemon-3.14.1.tar.xz) = 1606848
diff --git a/sysutils/gnome-settings-daemon/files/patch-data_Makefile.in b/sysutils/gnome-settings-daemon/files/patch-data_Makefile.in
index 0172aaa11..62deab5d0 100644
--- a/sysutils/gnome-settings-daemon/files/patch-data_Makefile.in
+++ b/sysutils/gnome-settings-daemon/files/patch-data_Makefile.in
@@ -1,34 +1,50 @@
---- data/Makefile.in.orig	2014-03-15 10:38:22.618467723 +0000
-+++ data/Makefile.in	2014-03-15 10:39:58.357459569 +0000
-@@ -91,10 +91,7 @@
+--- data/Makefile.in.orig	2014-10-16 07:58:46.261475320 +0200
++++ data/Makefile.in	2014-10-16 08:00:53.638467450 +0200
+@@ -91,10 +91,8 @@
  	$(srcdir)/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in \
  	$(srcdir)/org.gnome.settings-daemon.peripherals.gschema.xml.in.in \
  	$(srcdir)/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml.in.in \
 -	$(srcdir)/org.gnome.settings-daemon.plugins.orientation.gschema.xml.in.in \
--	$(srcdir)/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in \
+ 	$(srcdir)/org.gnome.settings-daemon.plugins.sharing.gschema.xml.in.in \
  	$(srcdir)/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in.in \
 -	$(srcdir)/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in \
  	$(srcdir)/org.gnome.settings-daemon.plugins.print-notifications.gschema.xml.in.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-@@ -114,10 +111,7 @@
+@@ -114,10 +112,8 @@
  	org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in \
  	org.gnome.settings-daemon.peripherals.gschema.xml.in \
  	org.gnome.settings-daemon.plugins.housekeeping.gschema.xml.in \
 -	org.gnome.settings-daemon.plugins.orientation.gschema.xml.in \
--	org.gnome.settings-daemon.plugins.updates.gschema.xml.in \
+ 	org.gnome.settings-daemon.plugins.sharing.gschema.xml.in \
  	org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in \
 -	org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in \
  	org.gnome.settings-daemon.plugins.print-notifications.gschema.xml.in
  CONFIG_CLEAN_VPATH_FILES =
  AM_V_P = $(am__v_P_@AM_V@)
-@@ -417,9 +411,6 @@
+@@ -414,9 +410,7 @@
+ 	org.gnome.settings-daemon.plugins.xsettings.gschema.xml		\
  	org.gnome.settings-daemon.plugins.housekeeping.gschema.xml	\
  	org.gnome.settings-daemon.plugins.print-notifications.gschema.xml	\
- 	org.gnome.settings-daemon.plugins.xrandr.gschema.xml		\
--	org.gnome.settings-daemon.plugins.updates.gschema.xml		\
+-	org.gnome.settings-daemon.plugins.xrandr.gschema.xml		\
 -	org.gnome.settings-daemon.plugins.orientation.gschema.xml	\
 -	org.gnome.settings-daemon.peripherals.wacom.gschema.xml
++	org.gnome.settings-daemon.plugins.xrandr.gschema.xml
  
  convertdir = $(datadir)/GConf/gsettings
  convert_DATA = gnome-settings-daemon.convert
+@@ -500,14 +494,10 @@
+ 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ org.gnome.settings-daemon.plugins.housekeeping.gschema.xml.in: $(top_builddir)/config.status $(srcdir)/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml.in.in
+ 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+-org.gnome.settings-daemon.plugins.orientation.gschema.xml.in: $(top_builddir)/config.status $(srcdir)/org.gnome.settings-daemon.plugins.orientation.gschema.xml.in.in
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ org.gnome.settings-daemon.plugins.sharing.gschema.xml.in: $(top_builddir)/config.status $(srcdir)/org.gnome.settings-daemon.plugins.sharing.gschema.xml.in.in
+ 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in: $(top_builddir)/config.status $(srcdir)/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in.in
+ 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+-org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in: $(top_builddir)/config.status $(srcdir)/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ org.gnome.settings-daemon.plugins.print-notifications.gschema.xml.in: $(top_builddir)/config.status $(srcdir)/org.gnome.settings-daemon.plugins.print-notifications.gschema.xml.in.in
+ 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ 
diff --git a/sysutils/gnome-settings-daemon/files/patch-data_org.gnome.settings-daemon.plugins.gschema.xml.in.in b/sysutils/gnome-settings-daemon/files/patch-data_org.gnome.settings-daemon.plugins.gschema.xml.in.in
index cc2af1d1f..15a841b75 100644
--- a/sysutils/gnome-settings-daemon/files/patch-data_org.gnome.settings-daemon.plugins.gschema.xml.in.in
+++ b/sysutils/gnome-settings-daemon/files/patch-data_org.gnome.settings-daemon.plugins.gschema.xml.in.in
@@ -1,6 +1,6 @@
---- data/org.gnome.settings-daemon.plugins.gschema.xml.in.in.orig	2014-03-04 16:15:04.000000000 +0000
-+++ data/org.gnome.settings-daemon.plugins.gschema.xml.in.in	2014-03-14 00:06:02.791034492 +0000
-@@ -15,18 +15,15 @@
+--- data/org.gnome.settings-daemon.plugins.gschema.xml.in.in.orig	2014-09-22 18:02:18.000000000 +0200
++++ data/org.gnome.settings-daemon.plugins.gschema.xml.in.in	2014-10-16 08:02:07.945478208 +0200
+@@ -15,12 +15,10 @@
      <child name="color" schema="org.gnome.settings-daemon.plugins.color"/>
      <child name="cursor" schema="org.gnome.settings-daemon.plugins.cursor"/>
      <child name="datetime" schema="org.gnome.settings-daemon.plugins.datetime"/>
@@ -13,9 +13,3 @@
      <child name="power" schema="org.gnome.settings-daemon.plugins.power"/>
      <child name="print-notifications" schema="org.gnome.settings-daemon.plugins.print-notifications"/>
      <child name="screensaver-proxy" schema="org.gnome.settings-daemon.plugins.screensaver-proxy"/>
-     <child name="smartcard" schema="org.gnome.settings-daemon.plugins.smartcard"/>
-     <child name="sound" schema="org.gnome.settings-daemon.plugins.sound"/>
--    <child name="updates" schema="org.gnome.settings-daemon.plugins.updates"/>
-     <child name="xrandr" schema="org.gnome.settings-daemon.plugins.xrandr"/>
-     <child name="xsettings" schema="org.gnome.settings-daemon.plugins.xsettings"/>
-   </schema>
diff --git a/sysutils/gnome-settings-daemon/pkg-plist b/sysutils/gnome-settings-daemon/pkg-plist
index 2fb9bb1f3..175261bdb 100644
--- a/sysutils/gnome-settings-daemon/pkg-plist
+++ b/sysutils/gnome-settings-daemon/pkg-plist
@@ -37,6 +37,8 @@ lib/gnome-settings-daemon-3.0/libpower.so
 %%CUPS%%lib/gnome-settings-daemon-3.0/libprint-notifications.so
 lib/gnome-settings-daemon-3.0/libscreensaver-proxy.a
 lib/gnome-settings-daemon-3.0/libscreensaver-proxy.so
+lib/gnome-settings-daemon-3.0/libsharing.a
+lib/gnome-settings-daemon-3.0/libsharing.so
 %%SMARTCARD%%lib/gnome-settings-daemon-3.0/libsmartcard.a
 %%SMARTCARD%%lib/gnome-settings-daemon-3.0/libsmartcard.so
 lib/gnome-settings-daemon-3.0/libsound.a
@@ -50,6 +52,7 @@ lib/gnome-settings-daemon-3.0/mouse.gnome-settings-plugin
 lib/gnome-settings-daemon-3.0/power.gnome-settings-plugin
 %%CUPS%%lib/gnome-settings-daemon-3.0/print-notifications.gnome-settings-plugin
 lib/gnome-settings-daemon-3.0/screensaver-proxy.gnome-settings-plugin
+lib/gnome-settings-daemon-3.0/sharing.gnome-settings-plugin
 %%SMARTCARD%%lib/gnome-settings-daemon-3.0/smartcard.gnome-settings-plugin
 lib/gnome-settings-daemon-3.0/sound.gnome-settings-plugin
 lib/gnome-settings-daemon-3.0/xrandr.gnome-settings-plugin
@@ -76,7 +79,6 @@ libexec/gsd-test-xrandr
 libexec/gsd-test-xsettings
 man/man1/gnome-settings-daemon.1.gz
 share/GConf/gsettings/gnome-settings-daemon.convert
-share/dbus-1/services/org.freedesktop.IBus.service
 %%DATADIR%%/datetime/backward
 share/gnome-settings-daemon-3.0/input-device-example.sh
 share/icons/hicolor/16x16/apps/gsd-xrandr.png
@@ -118,6 +120,7 @@ share/locale/fi/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/fr/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/ga/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/gl/LC_MESSAGES/gnome-settings-daemon.mo
+share/locale/gd/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/gu/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/he/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/hi/LC_MESSAGES/gnome-settings-daemon.mo
@@ -178,56 +181,5 @@ share/locale/zh_HK/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/zu/LC_MESSAGES/gnome-settings-daemon.mo
 share/polkit-1/actions/org.gnome.settings-daemon.plugins.power.policy
-@dirrmtry share/locale/zu/LC_MESSAGES
-@dirrmtry share/locale/zu
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/ug/LC_MESSAGES
-@dirrmtry share/locale/ug
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/nso/LC_MESSAGES
-@dirrmtry share/locale/nso
-@dirrmtry share/locale/nds/LC_MESSAGES
-@dirrmtry share/locale/nds
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/mg/LC_MESSAGES
-@dirrmtry share/locale/mg
-@dirrmtry share/locale/mai/LC_MESSAGES
-@dirrmtry share/locale/mai
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/en@shaw/LC_MESSAGES
-@dirrmtry share/locale/en@shaw
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/crh/LC_MESSAGES
-@dirrmtry share/locale/crh
-@dirrmtry share/locale/ca@valencia/LC_MESSAGES
-@dirrmtry share/locale/ca@valencia
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be@latin/LC_MESSAGES
-@dirrmtry share/locale/be@latin
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as
 @comment this is done in libcanberra
 @comment @dirrm lib/gnome-settings-daemon-3.0
-@dirrm %%DATADIR%%/datetime
-@dirrm %%DATADIR%%
-@dirrm lib/gnome-settings-daemon-3.0
-@dirrm include/gnome-settings-daemon-3.0/gnome-settings-daemon
-@dirrm include/gnome-settings-daemon-3.0