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, 53 insertions, 67 deletions

diff --git a/x11-fm/nemo/Makefile b/x11-fm/nemo/Makefile
index 819d385a4..52d42fd19 100644
--- a/x11-fm/nemo/Makefile
+++ b/x11-fm/nemo/Makefile
@@ -1,8 +1,9 @@
 # Created by: Gustau Perez i Querol <gustau.perez@gmail.com>
 # $FreeBSD$
+#    $MCom$
 
 PORTNAME=	nemo
-PORTVERSION=	1.8.5
+PORTVERSION=	2.0.8
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	http://github.com/linuxmint/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/
 DIST_SUBDIR=	gnome3
@@ -15,12 +16,12 @@ BUILD_DEPENDS=	${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome
 		gnome-autogen.sh:${PORTSDIR}/devel/gnome-common \
 		${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas
 LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif \
+		libcinnamon-desktop.so:${PORTSDIR}/x11/cinnamon-desktop \
 		libnotify.so:${PORTSDIR}/devel/libnotify \
 		libexempi.so:${PORTSDIR}/textproc/exempi
 RUN_DEPENDS=	${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme \
 		${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas
 
-FETCH_ARGS=	-Fpr
 INSTALLS_ICONS=	yes
 USES=		desktop-file-utils gettext gmake pathfix \
 		pkgconfig shared-mime-info
@@ -31,7 +32,6 @@ USE_AUTOTOOLS=	libtool autoconf automake
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CONFIGURE_ARGS=	--enable-static --disable-packagekit --disable-tracker
-MAKE_ENV=	G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias"
 
 GLIB_SCHEMAS=	org.nemo.gschema.xml
 
@@ -49,6 +49,9 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|g' \
 		${WRKSRC}/src/nemo-properties-window.c
 
+	@${REINPLACE_CMD} -e 's|"-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED"|""|g' \
+		${WRKSRC}/configure.in
+
 	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|g ;\
 		s|@INTROSPECTION_TYPELIBDIR@|$$(libdir)/girepository-1.0|g ;\
 		s|@INTROSPECTION_GIRDIR@|$$(datadir)/gir-1.0|g' \
diff --git a/x11-fm/nemo/distinfo b/x11-fm/nemo/distinfo
index a4f900a71..8ff3ca826 100644
--- a/x11-fm/nemo/distinfo
+++ b/x11-fm/nemo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/nemo-1.8.5.tar.gz) = 18bbbf311ccdd8f772b004313265b6f9f65c45e8cc9b87cf387cc24c9d4b75be
-SIZE (gnome3/nemo-1.8.5.tar.gz) = 3804791
+SHA256 (gnome3/nemo-2.0.8.tar.gz) = e061bd231493737e64c05448bbab29dcd34a0bcc37f0d6240b5f08109e92dbf0
+SIZE (gnome3/nemo-2.0.8.tar.gz) = 1341780
diff --git a/x11-fm/nemo/files/patch-libnemo-private_nemo-action.c b/x11-fm/nemo/files/patch-libnemo-private_nemo-action.c
new file mode 100644
index 000000000..a1f883e03
--- /dev/null
+++ b/x11-fm/nemo/files/patch-libnemo-private_nemo-action.c
@@ -0,0 +1,27 @@
+--- libnemo-private/nemo-action.c.orig	2013-11-25 10:51:16.047414327 +0000
++++ libnemo-private/nemo-action.c	2013-11-25 10:53:12.539547401 +0000
+@@ -1083,7 +1083,7 @@
+     const gchar *orig_label = nemo_action_get_orig_label (action);
+ 
+     if (orig_label == NULL)
+-        return;
++        return NULL;
+ 
+     action->escape_underscores = TRUE;
+ 
+@@ -1106,7 +1106,7 @@
+     const gchar *orig_tt = nemo_action_get_orig_tt (action);
+ 
+     if (orig_tt == NULL)
+-        return;
++        return NULL;
+ 
+     action->escape_underscores = FALSE;
+ 
+@@ -1350,4 +1350,4 @@
+ out:
+ 
+     return selection_type_show && extension_type_show && condition_type_show;
+-}
+\ No newline at end of file
++}
diff --git a/x11-fm/nemo/pkg-plist b/x11-fm/nemo/pkg-plist
index 5d3f30a8f..b5147af0a 100644
--- a/x11-fm/nemo/pkg-plist
+++ b/x11-fm/nemo/pkg-plist
@@ -1,7 +1,6 @@
 bin/nemo
 bin/nemo-autorun-software
 bin/nemo-connect-server
-etc/xdg/autostart/nemo-autostart.desktop
 include/nemo/libnemo-extension/nemo-column-provider.h
 include/nemo/libnemo-extension/nemo-column.h
 include/nemo/libnemo-extension/nemo-extension-types.h
@@ -22,8 +21,8 @@ libdata/pkgconfig/libnemo-extension.pc
 libexec/nemo-convert-metadata
 man/man1/nemo-connect-server.1.gz
 man/man1/nemo.1.gz
-share/GConf/gsettings/nemo.convert
 share/applications/nemo-autorun-software.desktop
+share/applications/nemo-autostart.desktop
 share/applications/nemo.desktop
 share/dbus-1/services/org.Nemo.service
 share/dbus-1/services/org.freedesktop.NemoFileManager1.service
@@ -36,82 +35,39 @@ share/icons/hicolor/22x22/apps/nemo.png
 share/icons/hicolor/24x24/apps/nemo.png
 share/icons/hicolor/32x32/apps/nemo.png
 share/icons/hicolor/scalable/actions/location-symbolic.svg
+share/icons/hicolor/scalable/status/progress-0-symbolic.svg
+share/icons/hicolor/scalable/status/progress-10-symbolic.svg
+share/icons/hicolor/scalable/status/progress-100-symbolic.svg
+share/icons/hicolor/scalable/status/progress-20-symbolic.svg
+share/icons/hicolor/scalable/status/progress-30-symbolic.svg
+share/icons/hicolor/scalable/status/progress-40-symbolic.svg
+share/icons/hicolor/scalable/status/progress-50-symbolic.svg
+share/icons/hicolor/scalable/status/progress-60-symbolic.svg
+share/icons/hicolor/scalable/status/progress-70-symbolic.svg
+share/icons/hicolor/scalable/status/progress-80-symbolic.svg
+share/icons/hicolor/scalable/status/progress-90-symbolic.svg
 share/icons/hicolor/scalable/actions/sidebar-hide-symbolic.svg
 share/icons/hicolor/scalable/actions/sidebar-places-symbolic.svg
 share/icons/hicolor/scalable/actions/sidebar-show-symbolic.svg
 share/icons/hicolor/scalable/actions/sidebar-tree-symbolic.svg
 share/icons/hicolor/scalable/actions/view-compact-symbolic.svg
 share/icons/hicolor/scalable/apps/nemo.svg
-share/locale/af/LC_MESSAGES/nemo.mo
-share/locale/am/LC_MESSAGES/nemo.mo
-share/locale/ar/LC_MESSAGES/nemo.mo
-share/locale/bs/LC_MESSAGES/nemo.mo
-share/locale/ca/LC_MESSAGES/nemo.mo
-share/locale/cs/LC_MESSAGES/nemo.mo
-share/locale/cy/LC_MESSAGES/nemo.mo
-share/locale/da/LC_MESSAGES/nemo.mo
-share/locale/de/LC_MESSAGES/nemo.mo
-share/locale/el/LC_MESSAGES/nemo.mo
-share/locale/en_AU/LC_MESSAGES/nemo.mo
-share/locale/en_GB/LC_MESSAGES/nemo.mo
-share/locale/es/LC_MESSAGES/nemo.mo
-share/locale/et/LC_MESSAGES/nemo.mo
-share/locale/eu/LC_MESSAGES/nemo.mo
-share/locale/fa/LC_MESSAGES/nemo.mo
-share/locale/fi/LC_MESSAGES/nemo.mo
-share/locale/fr/LC_MESSAGES/nemo.mo
-share/locale/fr_CA/LC_MESSAGES/nemo.mo
-share/locale/ga/LC_MESSAGES/nemo.mo
-share/locale/gl/LC_MESSAGES/nemo.mo
-share/locale/hr/LC_MESSAGES/nemo.mo
-share/locale/hu/LC_MESSAGES/nemo.mo
-share/locale/id/LC_MESSAGES/nemo.mo
-share/locale/is/LC_MESSAGES/nemo.mo
-share/locale/it/LC_MESSAGES/nemo.mo
-share/locale/ja/LC_MESSAGES/nemo.mo
-share/locale/jv/LC_MESSAGES/nemo.mo
-share/locale/lt/LC_MESSAGES/nemo.mo
-share/locale/lv/LC_MESSAGES/nemo.mo
-share/locale/ml/LC_MESSAGES/nemo.mo
-share/locale/ms/LC_MESSAGES/nemo.mo
-share/locale/nb/LC_MESSAGES/nemo.mo
-share/locale/nds/LC_MESSAGES/nemo.mo
-share/locale/ne/LC_MESSAGES/nemo.mo
-share/locale/nl/LC_MESSAGES/nemo.mo
-share/locale/nn/LC_MESSAGES/nemo.mo
-share/locale/pl/LC_MESSAGES/nemo.mo
-share/locale/pt/LC_MESSAGES/nemo.mo
-share/locale/pt_BR/LC_MESSAGES/nemo.mo
-share/locale/ro/LC_MESSAGES/nemo.mo
-share/locale/ru/LC_MESSAGES/nemo.mo
-share/locale/sk/LC_MESSAGES/nemo.mo
-share/locale/sl/LC_MESSAGES/nemo.mo
-share/locale/sq/LC_MESSAGES/nemo.mo
-share/locale/sr/LC_MESSAGES/nemo.mo
-share/locale/sr@latin/LC_MESSAGES/nemo.mo
-share/locale/sv/LC_MESSAGES/nemo.mo
-share/locale/tlh/LC_MESSAGES/nemo.mo
-share/locale/tr/LC_MESSAGES/nemo.mo
-share/locale/uk/LC_MESSAGES/nemo.mo
-share/locale/vi/LC_MESSAGES/nemo.mo
-share/locale/zh_CN/LC_MESSAGES/nemo.mo
-share/locale/zh_TW/LC_MESSAGES/nemo.mo
 share/mime/application/nemo-action.xml
 share/mime/application/x-nemo-saved-search.xml
 share/mime/packages/nemo.xml
+%%DATADIR%%/actions/add-desklets.nemo_action
+%%DATADIR%%/actions/change-background.nemo_action
+%%DATADIR%%/actions/mount-archive.nemo_action
 %%DATADIR%%/actions/myaction.py
+%%DATADIR%%/actions/new-launcher.nemo_action
 %%DATADIR%%/actions/sample.nemo_action
+%%DATADIR%%/actions/set-as-background.nemo_action
 %%DATADIR%%/icons/hicolor/16x16/emblems/emblem-note.png
 %%DATADIR%%/icons/hicolor/24x24/emblems/emblem-note.png
 %%DATADIR%%/icons/hicolor/48x48/emblems/emblem-note.png
 %%DATADIR%%/nemo-extras.placeholder
 %%DATADIR%%/nemo-suggested.placeholder
-@dirrmtry share/locale/tlh/LC_MESSAGES
-@dirrmtry share/locale/tlh
-@dirrmtry share/locale/jv/LC_MESSAGES
-@dirrmtry share/locale/jv
-@dirrmtry share/locale/fr_CA/LC_MESSAGES
-@dirrmtry share/locale/fr_CA
+share/polkit-1/actions/org.nemo.root.policy
 @dirrm %%DATADIR%%/icons/hicolor/48x48/emblems
 @dirrm %%DATADIR%%/icons/hicolor/48x48
 @dirrm %%DATADIR%%/icons/hicolor/24x24/emblems