Upgrade cheese, gnome-contacts and gnome-control-center to 3.14.1

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

10 files changed, 56 insertions, 116 deletions

diff --git a/deskutils/gnome-contacts/Makefile b/deskutils/gnome-contacts/Makefile
index 4c95e7171..92d4fa1bd 100644
--- a/deskutils/gnome-contacts/Makefile
+++ b/deskutils/gnome-contacts/Makefile
@@ -3,8 +3,7 @@
 #   $MCom$
 
 PORTNAME=	gnome-contacts
-PORTVERSION=	3.12.0
-PORTREVISION=	1
+PORTVERSION=	3.14.1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	GNOME
 
diff --git a/deskutils/gnome-contacts/distinfo b/deskutils/gnome-contacts/distinfo
index 551041f46..0a39a351b 100644
--- a/deskutils/gnome-contacts/distinfo
+++ b/deskutils/gnome-contacts/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome-contacts-3.12.0.tar.xz) = fb3f25d409032b24fb67241e67d4da10cf6f77a48c088709455cea5f6f33e87d
-SIZE (gnome-contacts-3.12.0.tar.xz) = 740008
+SHA256 (gnome-contacts-3.14.1.tar.xz) = 09a76c3ccc50e9375af22d01dc99af6486b71bf644b70213ca97c075a87ae77a
+SIZE (gnome-contacts-3.14.1.tar.xz) = 749420
diff --git a/deskutils/gnome-contacts/pkg-plist b/deskutils/gnome-contacts/pkg-plist
index f05691008..e6315b3e8 100644
--- a/deskutils/gnome-contacts/pkg-plist
+++ b/deskutils/gnome-contacts/pkg-plist
@@ -1,9 +1,10 @@
 bin/gnome-contacts
 libexec/gnome-contacts-search-provider
-share/appdata/gnome-contacts.appdata.xml
-share/applications/gnome-contacts.desktop
+share/appdata/org.gnome.Contacts.appdata.xml
+share/applications/org.gnome.Contacts.desktop
 share/dbus-1/services/org.gnome.Contacts.SearchProvider.service
-share/gnome-shell/search-providers/gnome-contacts-search-provider.ini
+share/dbus-1/services/org.gnome.Contacts.service
+share/gnome-shell/search-providers/org.gnome.Contacts.search-provider.ini
 share/locale/af/LC_MESSAGES/gnome-contacts.mo
 share/locale/ar/LC_MESSAGES/gnome-contacts.mo
 share/locale/as/LC_MESSAGES/gnome-contacts.mo
@@ -46,6 +47,7 @@ share/locale/mk/LC_MESSAGES/gnome-contacts.mo
 share/locale/ml/LC_MESSAGES/gnome-contacts.mo
 share/locale/mr/LC_MESSAGES/gnome-contacts.mo
 share/locale/nb/LC_MESSAGES/gnome-contacts.mo
+share/locale/ne/LC_MESSAGES/gnome-contacts.mo
 share/locale/nl/LC_MESSAGES/gnome-contacts.mo
 share/locale/or/LC_MESSAGES/gnome-contacts.mo
 share/locale/pa/LC_MESSAGES/gnome-contacts.mo
@@ -70,21 +72,3 @@ share/locale/vi/LC_MESSAGES/gnome-contacts.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-contacts.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-contacts.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-contacts.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@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/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/ca@valencia/LC_MESSAGES
-@dirrmtry share/locale/ca@valencia
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as
-@dirrmtry share/gnome-shell/search-providers
-@dirrmtry share/gnome-shell
diff --git a/multimedia/cheese/Makefile b/multimedia/cheese/Makefile
index 5c6b1b3ac..a1711f608 100644
--- a/multimedia/cheese/Makefile
+++ b/multimedia/cheese/Makefile
@@ -3,8 +3,7 @@
 #   $MCom$
 
 PORTNAME=	cheese
-PORTVERSION=	3.12.2
-PORTREVISION=	1
+PORTVERSION=	3.14.1
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
diff --git a/multimedia/cheese/distinfo b/multimedia/cheese/distinfo
index 283ed856c..67d2de7da 100644
--- a/multimedia/cheese/distinfo
+++ b/multimedia/cheese/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/cheese-3.12.2.tar.xz) = a7b45369e75e222e3bd5e9a4408a0e6c230be0c49d359a387d36a42e17e3bc64
-SIZE (gnome3/cheese-3.12.2.tar.xz) = 1777924
+SHA256 (gnome3/cheese-3.14.1.tar.xz) = cb8d27c24daf9ceaff4ab209471d09f53e2a81946ed710133533080d2a91c20a
+SIZE (gnome3/cheese-3.14.1.tar.xz) = 1804208
diff --git a/multimedia/cheese/files/patch-cheese-config.h.in b/multimedia/cheese/files/patch-config.h.in
index c9532cd4d..2ca7d2663 100644
--- a/multimedia/cheese/files/patch-cheese-config.h.in
+++ b/multimedia/cheese/files/patch-config.h.in
@@ -1,5 +1,5 @@
---- cheese-config.h.in	2012-05-17 20:48:10.000000000 +0200
-+++ cheese-config.h.in	2012-06-13 10:31:28.000000000 +0200
+--- config.h.in.orig	2014-10-20 08:03:47.398635920 +0200
++++ config.h.in	2014-10-20 08:03:55.769637288 +0200
 @@ -6,6 +6,9 @@
  /* Define to 1 if you have the <dlfcn.h> header file. */
  #undef HAVE_DLFCN_H
diff --git a/multimedia/cheese/pkg-plist b/multimedia/cheese/pkg-plist
index 7f4a07c2c..8de5d4a10 100644
--- a/multimedia/cheese/pkg-plist
+++ b/multimedia/cheese/pkg-plist
@@ -11,15 +11,18 @@ include/cheese/cheese-widget.h
 include/cheese/cheese.h
 lib/libcheese-gtk.so
 lib/libcheese-gtk.so.23
-lib/libcheese-gtk.so.23.1.9
+lib/libcheese-gtk.so.23.1.14
 lib/libcheese.so
 lib/libcheese.so.7
-lib/libcheese.so.7.0.25
+lib/libcheese.so.7.0.30
 lib/girepository-1.0/Cheese-3.0.typelib
 libdata/pkgconfig/cheese-gtk.pc
 libdata/pkgconfig/cheese.pc
-share/appdata/cheese.appdata.xml
-share/applications/cheese.desktop
+libexec/gnome-camera-service
+share/appdata/org.gnome.Cheese.appdata.xml
+share/applications/org.gnome.Cheese.desktop
+share/dbus-1/services/org.gnome.Camera.service
+share/dbus-1/services/org.gnome.Cheese.service
 %%DOCSDIR%%/AUTHORS
 %%DOCSDIR%%/COPYING
 %%DOCSDIR%%/ChangeLog
@@ -208,6 +211,31 @@ share/help/es/cheese/figures/cheese.png
 share/help/es/cheese/figures/effects.png
 share/help/es/cheese/figures/image-properties.png
 share/help/es/cheese/figures/settings.png
+share/help/fi/cheese/burst-mode.page
+share/help/fi/cheese/effects-apply.page
+share/help/fi/cheese/figures/cheese-delete.png
+share/help/fi/cheese/figures/cheese-effects.png
+share/help/fi/cheese/figures/cheese-introduction.png
+share/help/fi/cheese/figures/cheese-record.png
+share/help/fi/cheese/figures/cheese-save.png
+share/help/fi/cheese/figures/cheese-take.png
+share/help/fi/cheese/figures/cheese.png
+share/help/fi/cheese/figures/effects.png
+share/help/fi/cheese/figures/image-properties.png
+share/help/fi/cheese/figures/settings.png
+share/help/fi/cheese/index.page
+share/help/fi/cheese/introduction.page
+share/help/fi/cheese/legal.xml
+share/help/fi/cheese/photo-delete.page
+share/help/fi/cheese/photo-save.page
+share/help/fi/cheese/photo-take.page
+share/help/fi/cheese/photo-view.page
+share/help/fi/cheese/pref-countdown.page
+share/help/fi/cheese/pref-flash.page
+share/help/fi/cheese/pref-fullscreen.page
+share/help/fi/cheese/pref-image-properties.page
+share/help/fi/cheese/pref-resolution.page
+share/help/fi/cheese/video-record.page
 share/help/fr/cheese/burst-mode.page
 share/help/fr/cheese/effects-apply.page
 share/help/fr/cheese/index.page
@@ -497,36 +525,3 @@ share/locale/zh_CN/LC_MESSAGES/cheese.mo
 share/locale/zh_HK/LC_MESSAGES/cheese.mo
 share/locale/zh_TW/LC_MESSAGES/cheese.mo
 share/locale/zu/LC_MESSAGES/cheese.mo
-@dirrm share/help/zh_CN/cheese/figures
-@dirrm share/help/zh_CN/cheese
-@dirrm share/help/sl/cheese/figures
-@dirrm share/help/sl/cheese
-@dirrm share/help/ru/cheese/figures
-@dirrm share/help/ru/cheese
-@dirrm share/help/ru
-@dirrm share/help/pt_BR/cheese/figures
-@dirrm share/help/pt_BR/cheese
-@dirrm share/help/id/cheese/figures
-@dirrm share/help/id/cheese
-@dirrm share/help/id
-@dirrm share/help/hu/cheese/figures
-@dirrm share/help/hu/cheese
-@dirrm share/help/gl/cheese/figures
-@dirrm share/help/gl/cheese
-@dirrm share/help/fr/cheese/figures
-@dirrm share/help/fr/cheese
-@dirrm share/help/es/cheese/figures
-@dirrm share/help/es/cheese
-@dirrm share/help/el/cheese/figures
-@dirrm share/help/el/cheese
-@dirrm share/help/de/cheese/figures
-@dirrm share/help/de/cheese
-@dirrm share/help/cs/cheese/figures
-@dirrm share/help/cs/cheese
-@dirrm share/help/ca/cheese/figures
-@dirrm share/help/ca/cheese
-@dirrm share/help/C/cheese/figures
-@dirrm share/help/C/cheese
-@dirrm share/appdata
-@dirrm include/cheese
-@dirrm %%DOCSDIR%%
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 1f98f4a8d..acf8677d1 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -1,9 +1,9 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports-experimental/trunk/sysutils/gnome-control-center/Makefile 19547 2014-04-16 13:29:05Z gusi $
+#   $MCom$
 
 PORTNAME=	gnome-control-center
-PORTVERSION=	3.12.1
+PORTVERSION=	3.14.1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -14,7 +14,7 @@ COMMENT=	Control center for GNOME 3 project
 BUILD_DEPENDS=	gnome-settings-daemon>=3.4.0:${PORTSDIR}/sysutils/gnome-settings-daemon \
 		gsettings-desktop-schemas>=3.2.2:${PORTSDIR}/devel/gsettings-desktop-schemas \
 		docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl \
-		${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
+		iso-codes>=0:${PORTSDIR}/misc/iso-codes
 LIB_DEPENDS=	libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 \
 		libxklavier.so:${PORTSDIR}/x11/libxklavier \
 		libupower-glib.so:${PORTSDIR}/sysutils/upower \
@@ -32,7 +32,7 @@ LIB_DEPENDS=	libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 \
 RUN_DEPENDS=	gnome-eject:${PORTSDIR}/sysutils/gnome-mount \
 		gnome-settings-daemon>=3.4.0:${PORTSDIR}/sysutils/gnome-settings-daemon \
 		gsettings-desktop-schemas>=3.2.2:${PORTSDIR}/devel/gsettings-desktop-schemas \
-		${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
+		iso-codes>=0:${PORTSDIR}/misc/iso-codes \
 		glxinfo:${PORTSDIR}/graphics/mesa-demos \
 		apg:${PORTSDIR}/security/apg \
 		gcm-calibrate:${PORTSDIR}/graphics/gnome-color-manager
@@ -49,6 +49,7 @@ CONFIGURE_ARGS=	--with-libsocialweb=yes --disable-systemd
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	CUPS
 OPTIONS_DEFAULT=CUPS
 CUPS_DESC=	Cups (printing) support
@@ -58,25 +59,13 @@ OPTIONS_DEFINE_i386=	CHEESE
 OPTIONS_DEFAULT_i386=	CHEESE
 OPTIONS_DEFINE_amd64=	CHEESE
 OPTIONS_DEFAULT_amd64=	CHEESE
+CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client
+CUPS_CONFIGURE_ENABLE=	cups	
+CHEESE_LIB_DEPENDS=	libcheese.so:${PORTSDIR}/multimedia/cheese
+CHEESE_CONFIGUE_WITH=	cheese	
 
 .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:MCHEESE}
-CONFIGURE_ARGS+=--with-cheese
-BUILD_DEPENDS+=	cheese>=3.0.1:${PORTSDIR}/multimedia/cheese
-LIB_DEPENDS+=	libcheese.so:${PORTSDIR}/multimedia/cheese
-.else
-CONFIGURE_ARGS+=--without-cheese
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|datetime wacom|datetime|g' \
 		${WRKSRC}/panels/Makefile.in
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index 7f4f64137..32428531f 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gnome-control-center-3.12.1.tar.xz) = 5297d448eff0ec58f6c0ad9fbd1b94bed0a850496df0ee65571c0622b49c1582
-SIZE (gnome3/gnome-control-center-3.12.1.tar.xz) = 6866544
+SHA256 (gnome3/gnome-control-center-3.14.1.tar.xz) = be1fa93e5a06d776d3dc6099aab7e4e301603cae3f56c00c09d10d3ebeed8249
+SIZE (gnome3/gnome-control-center-3.14.1.tar.xz) = 6930424
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index 90f9d3153..7492e4e2b 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -320,29 +320,3 @@ share/sounds/gnome/default/alerts/bark.ogg
 share/sounds/gnome/default/alerts/drip.ogg
 share/sounds/gnome/default/alerts/glass.ogg
 share/sounds/gnome/default/alerts/sonar.ogg
-@dirrmtry share/sounds/gnome/default/alerts
-@dirrmtry share/sounds/gnome/default
-@dirrmtry share/sounds/gnome
-@dirrmtry share/pixmaps/faces
-@dirrmtry share/locale/ilo/LC_MESSAGES
-@dirrmtry share/locale/ilo
-@dirrmtry share/gnome-shell/search-providers
-@dirrmtry share/gnome-shell
-@dirrmtry %%DATADIR%%/sounds
-@dirrmtry %%DATADIR%%/pixmaps
-@dirrmtry %%DATADIR%%/icons/hicolor/48x48/devices
-@dirrmtry %%DATADIR%%/icons/hicolor/48x48
-@dirrmtry %%DATADIR%%/icons/hicolor/32x32/status
-@dirrmtry %%DATADIR%%/icons/hicolor/32x32/devices
-@dirrmtry %%DATADIR%%/icons/hicolor/32x32
-@dirrmtry %%DATADIR%%/icons/hicolor/24x24/status
-@dirrmtry %%DATADIR%%/icons/hicolor/24x24/devices
-@dirrmtry %%DATADIR%%/icons/hicolor/24x24
-@dirrmtry %%DATADIR%%/icons/hicolor/22x22/status
-@dirrmtry %%DATADIR%%/icons/hicolor/22x22
-@dirrmtry %%DATADIR%%/icons/hicolor/16x16/status
-@dirrmtry %%DATADIR%%/icons/hicolor/16x16/devices
-@dirrmtry %%DATADIR%%/icons/hicolor/16x16
-@dirrmtry %%DATADIR%%/icons/hicolor
-@dirrmtry %%DATADIR%%/icons
-@dirrmtry %%DATADIR%%/datetime