Update cinnamon to 2.0. Among the changes:

        - Many packages were split. New components appeared
        - In cinnamon-settings, the applet to configure the users has been removed. It needs
          python-pam, which is not in the tree yet
        - The translations are optional and can be enabled in x11/cinnamon
        - To configure cinnamon, use cinnamon-settings. The cinnamon-control-center seems to be
          lagging behind
        - The cinnamon2d, the fallback version of cinnamon, seems to be buggy and needs some love. It can be
          chosen with gdm in the session list
        - Only a subset of the nemo-extensions were enabled. More to come in the future
        - The JavaScripts bindings are now provided by lang/cjs (which seems to be a fork from lang/gjs)

The development of cinnamon is moving fast, so if you find problems please contact gnome@freebsd.org

Reviewed by: kwm


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

4 files changed, 16 insertions, 186 deletions

diff --git a/sysutils/cinnamon-control-center/Makefile b/sysutils/cinnamon-control-center/Makefile
index cd547d38a..eed9b9bad 100644
--- a/sysutils/cinnamon-control-center/Makefile
+++ b/sysutils/cinnamon-control-center/Makefile
@@ -3,7 +3,7 @@
 #   $MCom$
 
 PORTNAME=	cinnamon-control-center
-PORTVERSION=	1.8.2
+PORTVERSION=	2.0.9
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://github.com/linuxmint/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/
 DIST_SUBDIR=	gnome3
@@ -12,7 +12,7 @@ MAINTAINER=	gustau.perez@gmail.com
 COMMENT=	gnome-control-center replacement for Cinnamon
 
 BUILD_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \
-		gnome-settings-daemon>=3.4.0:${PORTSDIR}/sysutils/gnome-settings-daemon \
+		cinnamon-settings-daemon>=0:${PORTSDIR}/sysutils/cinnamon-settings-daemon \
 		gnome-autogen.sh:${PORTSDIR}/devel/gnome-common
 LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \
 		libupower-glib.so:${PORTSDIR}/sysutils/upower \
@@ -32,18 +32,17 @@ LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \
 		libclutter-gst-2.0.so:${PORTSDIR}/multimedia/clutter-gst \
 		libgjs.so:${PORTSDIR}/lang/gjs
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus \
-		gnome-settings-daemon>=3.4.0:${PORTSDIR}/sysutils/gnome-settings-daemon \
+		cinnamon-settings-daemon>=0:${PORTSDIR}/sysutils/cinnamon-settings-daemon \
 		${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \
 		py*-lxml>=0:${PORTSDIR}/devel/py-lxml
 
-FETCH_ARGS=	-Fpr
 USE_XORG=	x11 xfixes sm
 USES=		gettext gmake pathfix pkgconfig
-USE_GNOME=	gnomeprefix intlhack gtk30 gconf2 gnomemenus3 \
-		gnomedesktop3 evolutiondataserver3
+USE_GNOME=	evolutiondataserver3 gconf2 gnomemenus3 gnomeprefix \
+		gtk30 intlhack libgnomekbd
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:env automake:env aclocal:env autoheader:env
+USE_AUTOTOOLS=	libtool autoconf automake
 USE_PYTHON=	yes
 INSTALLS_ICONS=	yes
 
@@ -69,11 +68,14 @@ PLIST_SUB+=	CUPS="@comment "
 post-patch:
 	@${REINPLACE_CMD} -e 's|find|find ${WRKSRC}/files|g' \
 		${WRKSRC}/files/Makefile.in
-
 	@${REINPLACE_CMD} -e 's|/usr/share/|${PREFIX}/share/|g' \
 		${WRKSRC}/panels/common/cc-common-language.c
 
 pre-configure:
-	cd ${WRKSRC} && ${LOCALBASE}/bin/autoreconf
+	cd ${WRKSRC} && NOCONFIGURE=yes ${SH} ./autogen.sh
+
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/cinnamon-control-center-1/panels/lib*.so
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libcinnamon-control-center.so.1
 
 .include <bsd.port.mk>
diff --git a/sysutils/cinnamon-control-center/distinfo b/sysutils/cinnamon-control-center/distinfo
index 20aff8036..761ac8d11 100644
--- a/sysutils/cinnamon-control-center/distinfo
+++ b/sysutils/cinnamon-control-center/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/cinnamon-control-center-1.8.2.tar.gz) = 78effed26a8fdce481cfe467889c9afdb6db78a961aec61b918c83c9781ccf4f
-SIZE (gnome3/cinnamon-control-center-1.8.2.tar.gz) = 8431440
+SHA256 (gnome3/cinnamon-control-center-2.0.9.tar.gz) = 63bb179a50d5f873ed1c19de97966592eedbc055ce2829e4298223a75fc33b4e
+SIZE (gnome3/cinnamon-control-center-2.0.9.tar.gz) = 4798104
diff --git a/sysutils/cinnamon-control-center/files/patch-panels_user-accounts_um-utils.c b/sysutils/cinnamon-control-center/files/patch-unused-panels_user-accounts_um-utils.c
index 565411a89..58c72f617 100644
--- a/sysutils/cinnamon-control-center/files/patch-panels_user-accounts_um-utils.c
+++ b/sysutils/cinnamon-control-center/files/patch-unused-panels_user-accounts_um-utils.c
@@ -1,11 +1,10 @@
---- panels/user-accounts/um-utils.c.orig	2013-05-22 16:25:19.000000000 +0000
-+++ panels/user-accounts/um-utils.c	2013-10-09 16:50:07.978760476 +0000
+--- unused-panels/user-accounts/um-utils.c.orig	2013-11-24 13:33:13.594698498 +0000
++++ unused-panels/user-accounts/um-utils.c	2013-11-24 13:33:34.715696820 +0000
 @@ -25,7 +25,15 @@
  #include <stdlib.h>
  #include <sys/types.h>
  #include <pwd.h>
 -#include <utmp.h>
-+
 +#include <sys/param.h>
 +#if __FreeBSD_version < 900000
 + #include <utmp.h>
@@ -14,6 +13,7 @@
 +/* from the old utmp.h */
 +#define UT_NAMESIZE 16
 +#endif
++
  
  #include <glib.h>
  #include <glib/gi18n-lib.h>
diff --git a/sysutils/cinnamon-control-center/pkg-plist b/sysutils/cinnamon-control-center/pkg-plist
index 057bb3791..534b28e33 100644
--- a/sysutils/cinnamon-control-center/pkg-plist
+++ b/sysutils/cinnamon-control-center/pkg-plist
@@ -26,9 +26,6 @@ lib/cinnamon-control-center-1/panels/libsoundnua.so
 lib/cinnamon-control-center-1/panels/libuniversal-access.a
 lib/cinnamon-control-center-1/panels/libuniversal-access.la
 lib/cinnamon-control-center-1/panels/libuniversal-access.so
-lib/cinnamon-control-center-1/panels/libuser-accounts.a
-lib/cinnamon-control-center-1/panels/libuser-accounts.la
-lib/cinnamon-control-center-1/panels/libuser-accounts.so
 lib/libcinnamon-control-center.la
 lib/libcinnamon-control-center.so
 lib/libcinnamon-control-center.so.1
@@ -42,7 +39,6 @@ share/applications/cinnamon-screen-panel.desktop
 share/applications/cinnamon-sound-nua-panel.desktop
 share/applications/cinnamon-sound-panel.desktop
 share/applications/cinnamon-universal-access-panel.desktop
-share/applications/cinnamon-user-accounts-panel.desktop
 %%DATADIR%%/icons/hicolor/16x16/devices/cin-audio-headset.svg
 %%DATADIR%%/icons/hicolor/16x16/status/cin-audio-input-microphone-high.png
 %%DATADIR%%/icons/hicolor/16x16/status/cin-audio-input-microphone-low.png
@@ -80,33 +76,6 @@ share/applications/cinnamon-user-accounts-panel.desktop
 %%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right.svg
 %%DATADIR%%/icons/hicolor/48x48/devices/audio-subwoofer-testing.svg
 %%DATADIR%%/icons/hicolor/48x48/devices/audio-subwoofer.svg
-%%DATADIR%%/pixmaps/about-me-lock-open.png
-%%DATADIR%%/pixmaps/about-me-lock.png
-%%DATADIR%%/pixmaps/left-index-finger.png
-%%DATADIR%%/pixmaps/left-index-finger.svg
-%%DATADIR%%/pixmaps/left-little-finger.png
-%%DATADIR%%/pixmaps/left-little-finger.svg
-%%DATADIR%%/pixmaps/left-middle-finger.png
-%%DATADIR%%/pixmaps/left-middle-finger.svg
-%%DATADIR%%/pixmaps/left-ring-finger.png
-%%DATADIR%%/pixmaps/left-ring-finger.svg
-%%DATADIR%%/pixmaps/left-thumb.png
-%%DATADIR%%/pixmaps/left-thumb.svg
-%%DATADIR%%/pixmaps/print_error.png
-%%DATADIR%%/pixmaps/print_error.svg
-%%DATADIR%%/pixmaps/print_ok.png
-%%DATADIR%%/pixmaps/print_ok.svg
-%%DATADIR%%/pixmaps/right-index-finger.png
-%%DATADIR%%/pixmaps/right-index-finger.svg
-%%DATADIR%%/pixmaps/right-little-finger.png
-%%DATADIR%%/pixmaps/right-little-finger.svg
-%%DATADIR%%/pixmaps/right-middle-finger.png
-%%DATADIR%%/pixmaps/right-middle-finger.svg
-%%DATADIR%%/pixmaps/right-ring-finger.png
-%%DATADIR%%/pixmaps/right-ring-finger.svg
-%%DATADIR%%/pixmaps/right-thumb.png
-%%DATADIR%%/pixmaps/right-thumb.svg
-share/cinnamon-control-center/sounds/cinnamon-sounds-default.xml
 share/cinnamon-control-center/ui/cinnamon-region-panel-layout-chooser.ui
 share/cinnamon-control-center/ui/cinnamon-region-panel-options-dialog.ui
 share/cinnamon-control-center/ui/cinnamon-region-panel.ui
@@ -117,11 +86,6 @@ share/cinnamon-control-center/ui/power.ui
 share/cinnamon-control-center/ui/screen.ui
 share/cinnamon-control-center/ui/shell.ui
 share/cinnamon-control-center/ui/uap.ui
-share/cinnamon-control-center/ui/user-accounts/account-dialog.ui
-share/cinnamon-control-center/ui/user-accounts/account-fingerprint.ui
-share/cinnamon-control-center/ui/user-accounts/password-dialog.ui
-share/cinnamon-control-center/ui/user-accounts/photo-dialog.ui
-share/cinnamon-control-center/ui/user-accounts/user-accounts-dialog.ui
 share/cinnamon-control-center/ui/zoom-options.ui
 share/desktop-directories/cinnamoncc.directory
 share/icons/hicolor/16x16/apps/cin-multimedia-volume-control.png
@@ -157,144 +121,8 @@ share/icons/hicolor/scalable/status/cin-audio-input-microphone-high-symbolic.svg
 share/icons/hicolor/scalable/status/cin-audio-input-microphone-low-symbolic.svg
 share/icons/hicolor/scalable/status/cin-audio-input-microphone-medium-symbolic.svg
 share/icons/hicolor/scalable/status/cin-audio-input-microphone-muted-symbolic.svg
-share/locale/af/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/am/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/ar/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/as/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/ast/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/az/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/be/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/be@latin/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/bg/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/bn/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/bn_IN/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/br/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/bs/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/ca/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/ca@valencia/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/crh/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/cs/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/cy/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/da/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/de/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/dz/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/el/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/en/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/en@shaw/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/en_CA/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/en_GB/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/eo/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/es/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/et/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/eu/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/fa/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/fi/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/fr/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/ga/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/gl/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/gu/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/he/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/hi/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/hr/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/hu/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/hy/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/id/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/is/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/it/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/ja/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/ka/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/kk/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/km/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/kn/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/ko/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/ku/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/ky/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/lt/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/lv/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/mai/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/mg/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/mk/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/ml/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/mn/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/mr/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/ms/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/my/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/nb/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/nds/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/ne/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/nl/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/nn/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/nso/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/oc/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/or/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/pa/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/pl/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/pt/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/pt_BR/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/ro/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/ru/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/rw/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/si/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/sk/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/sl/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/sq/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/sr/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/sr@latin/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/sv/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/ta/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/te/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/th/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/tr/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/ug/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/uk/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/uz/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/uz@cyrillic/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/vi/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/wa/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/xh/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/zh_CN/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/zh_HK/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/zh_TW/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/locale/zu/LC_MESSAGES/cinnamon-control-center-1.0.mo
-share/pixmaps/cinnamon/faces/astronaut.jpg
-share/pixmaps/cinnamon/faces/baseball.png
-share/pixmaps/cinnamon/faces/butterfly.png
-share/pixmaps/cinnamon/faces/cat-eye.jpg
-share/pixmaps/cinnamon/faces/chess.jpg
-share/pixmaps/cinnamon/faces/coffee.jpg
-share/pixmaps/cinnamon/faces/dice.jpg
-share/pixmaps/cinnamon/faces/energy-arc.jpg
-share/pixmaps/cinnamon/faces/fish.jpg
-share/pixmaps/cinnamon/faces/flake.jpg
-share/pixmaps/cinnamon/faces/flower.jpg
-share/pixmaps/cinnamon/faces/grapes.jpg
-share/pixmaps/cinnamon/faces/guitar.jpg
-share/pixmaps/cinnamon/faces/launch.jpg
-share/pixmaps/cinnamon/faces/leaf.jpg
-share/pixmaps/cinnamon/faces/lightning.jpg
-share/pixmaps/cinnamon/faces/penguin.jpg
-share/pixmaps/cinnamon/faces/puppy.jpg
-share/pixmaps/cinnamon/faces/sky.jpg
-share/pixmaps/cinnamon/faces/soccerball.png
-share/pixmaps/cinnamon/faces/sunflower.jpg
-share/pixmaps/cinnamon/faces/sunset.jpg
-share/pixmaps/cinnamon/faces/tennis-ball.png
-share/pixmaps/cinnamon/faces/yellow-rose.jpg
-share/polkit-1/actions/org.cinnamon.controlcenter.user-accounts.policy
 share/polkit-1/rules.d/cinnamon-control-center.rules
-share/sounds/cinnamon/default/alerts/bark.ogg
-share/sounds/cinnamon/default/alerts/drip.ogg
-share/sounds/cinnamon/default/alerts/glass.ogg
-share/sounds/cinnamon/default/alerts/sonar.ogg
-@dirrm share/sounds/cinnamon/default/alerts
-@dirrm share/sounds/cinnamon/default
-@dirrm share/sounds/cinnamon
-@dirrm share/pixmaps/cinnamon/faces
-@dirrm share/pixmaps/cinnamon
-@dirrm share/cinnamon-control-center/ui/user-accounts
 @dirrm share/cinnamon-control-center/ui
-@dirrm share/cinnamon-control-center/sounds
-@dirrm share/cinnamon-control-center/pixmaps
 @dirrm share/cinnamon-control-center/icons/hicolor/48x48/devices
 @dirrm share/cinnamon-control-center/icons/hicolor/48x48
 @dirrm share/cinnamon-control-center/icons/hicolor/32x32/status