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

1 files changed, 54 insertions, 63 deletions

diff --git a/x11/cinnamon/Makefile b/x11/cinnamon/Makefile
index 05854aa27..3dffdac27 100644
--- a/x11/cinnamon/Makefile
+++ b/x11/cinnamon/Makefile
@@ -1,8 +1,9 @@
 # Created by: Gustau Perez i Querol <gustau.perez@gmail.com>
 # $FreeBSD$
+#    $MCom$
 
 PORTNAME=	cinnamon
-PORTVERSION=	1.8.8.1
+PORTVERSION=	2.0.14
 CATEGORIES=	x11 gnome
 MASTER_SITES=	http://github.com/linuxmint/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/
 DIST_SUBDIR=	gnome3
@@ -22,21 +23,24 @@ LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \
 		libcroco-0.6.so:${PORTSDIR}/textproc/libcroco \
 		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
 		libclutter-glx-1.0.so:${PORTSDIR}/graphics/clutter \
-		libgjs.so:${PORTSDIR}/lang/gjs \
+		libcjs.so:${PORTSDIR}/lang/cjs \
 		libaccountsservice.so:${PORTSDIR}/sysutils/accountsservice
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus \
 		${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \
 		gnome-themes-standard>=3.0.0:${PORTSDIR}/x11-themes/gnome-themes-standard \
 		cinnamon-control-center:${PORTSDIR}/sysutils/cinnamon-control-center \
+		cinnamon-translations>=0:${PORTSDIR}/misc/cinnamon-translations \
+		cinnamon-screensaver:${PORTSDIR}/x11/cinnamon-screensaver \
 		nemo:${PORTSDIR}/x11-fm/nemo \
 		${PYTHON_SITELIBDIR}/PIL/__init__.py:${PORTSDIR}/graphics/py-imaging \
 		py*-lxml>=0:${PORTSDIR}/devel/py-lxml
 
-WRKSRC=		${WRKDIR}/Cinnamon-1.8.8.1
+WRKSRC=		${WRKDIR}/Cinnamon-${PORTVERSION}
 
-FETCH_ARGS=	-Fpr
 USE_XORG=	x11 xfixes sm
-USES=		gettext gmake pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig shebangfix
+# this happens before moving the file to ${PREFIX} (which then will be copied to ${STAGEDIR}${PREFIX}
+SHEBANG_FILES=	files/usr/bin/cinnamon2d
 USE_AUTOTOOLS=	libtool autoconf automake
 USE_GNOME=	evolutiondataserver3 gconf2 gnomedesktop3 gnomemenus3 \
 		gnomeprefix gtk30 intlhack introspection:build
@@ -52,6 +56,14 @@ CONFIGURE_ARGS+=--enable-compile-warnings=no \
 CPPFLAGS+=	-I${LOCALASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+OPTIONS_DEFINE=	NLS
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
+RUN_DEPENDS+=	cinnamon-translations>=0:${PORTSDIR}/misc/cinnamon-translations
+.endif
+
 post-patch:
 	@${MKDIR} ${WRKSRC}/files${PREFIX}
 .for d in bin lib share
@@ -66,77 +78,54 @@ post-patch:
 		s|"usr/share|"${STAGEDIR}${PREFIX}/share/|g' \
 			${WRKSRC}/files/generate_desktop_files
 
-	@${MV} ${WRKSRC}/files/${PREFIX}/share/cinnamon/locale \
-		${WRKSRC}/files/${PREFIX}/share/locale
 	@${MV} ${WRKSRC}/files/etc ${WRKSRC}/files${PREFIX}
-	@${MV} ${WRKSRC}/files/${PREFIX}/lib/* ${WRKSRC}/files${PREFIX}/share/
-	@${RMDIR} ${WRKSRC}/files/${PREFIX}/lib
-
-	@${REINPLACE_CMD} -e 's|/usr/lib|${PREFIX}/lib/|g' \
-		${WRKSRC}/files${PREFIX}/share/cinnamon-settings/bin/capi.py
+	@${RM} ${WRKSRC}/files/${PREFIX}/lib/cinnamon-settings/modules/cs_user.py
+	# Remove a broken link (is applications-merge used anywhere?)
+	@${RM} ${WRKSRC}/files/${PREFIX}/etc/xdg/menus/cinnamon-applications-merged
 
-	@${FIND} ${WRKSRC} -name \* | ${XARGS} ${EGREP} -l "/usr/share/cinnamon/locale" | \
-		${XARGS} ${REINPLACE_CMD} -e "s|/usr/share/cinnamon/locale|${PREFIX}/share/locale|g"
+	@${REINPLACE_CMD} -e 's|AM_GNU_GETTEXT_VERSION(\[0.17\])||g ;\
+		s|AM_GNU_GETTEXT(\[external\])||g' \
+		${WRKSRC}/configure.ac
 
-	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share/|g ;\
-		s|/usr/lib|${PREFIX}/share/|g' \
-			${WRKSRC}/data/theme/cinnamon.css \
-			${WRKSRC}/js/ui/main.js \
-			${WRKSRC}/js/ui/panel.js \
-			${WRKSRC}/js/ui/expo.js \
-			${WRKSRC}/makepot \
-			${WRKSRC}/src/st/st-background-effect.c \
-			${WRKSRC}/files${PREFIX}/bin/cinnamon-launcher \
-			${WRKSRC}/files${PREFIX}/share/cinnamon/applets/brightness@cinnamon.org/applet.js \
-			${WRKSRC}/files${PREFIX}/share/cinnamon/applets/panel-launchers@cinnamon.org/cinnamon-add-panel-launcher.py \
-			${WRKSRC}/files${PREFIX}/share/cinnamon/applets/sound@cinnamon.org/applet.js \
-			${WRKSRC}/files${PREFIX}/share/cinnamon/desklets/launcher@cinnamon.org/editorDialog.py \
-			${WRKSRC}/files${PREFIX}/share/cinnamon/desklets/launcher@cinnamon.org/desklet.js \
-			${WRKSRC}/files${PREFIX}/share/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.py \
-			${WRKSRC}/files${PREFIX}/share/cinnamon-menu-editor/cme/config.py \
-			${WRKSRC}/files${PREFIX}/share/cinnamon-settings/cinnamon-settings.py \
-			${WRKSRC}/files${PREFIX}/share/cinnamon-settings/modules/cs_backgrounds.py \
-			${WRKSRC}/files${PREFIX}/share/cinnamon-settings/modules/cs_keyboard.py \
-			${WRKSRC}/files${PREFIX}/share/cinnamon-settings/modules/cs_extensions.py \
-			${WRKSRC}/files${PREFIX}/share/cinnamon-settings/modules/cs_calendar.py \
-			${WRKSRC}/files${PREFIX}/share/cinnamon-settings/modules/cs_desklets.py \
-			${WRKSRC}/files${PREFIX}/share/cinnamon-settings/modules/cs_themes.py \
-			${WRKSRC}/files${PREFIX}/share/cinnamon-settings/modules/cs_applets.py \
-			${WRKSRC}/files${PREFIX}/share/cinnamon-settings/data/spices/applet-detail.html \
-			${WRKSRC}/files${PREFIX}/share/cinnamon-settings/bin/capi.py \
-			${WRKSRC}/files${PREFIX}/share/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.py \
-			${WRKSRC}/files${PREFIX}/share/cinnamon-menu-editor/cme/config.py \
-			${WRKSRC}/files${PREFIX}/share/cinnamon-menu-editor/cme/MainWindow.py \
-			${WRKSRC}/files${PREFIX}/bin/cinnamon-menu-editor \
-			${WRKSRC}/files${PREFIX}/bin/cinnamon-settings \
-			${WRKSRC}/files${PREFIX}/bin/cinnamon-looking-glass \
-			${WRKSRC}/files${PREFIX}/bin/cinnamon-screensaver-lock-dialog
+	@${REINPLACE_CMD} -e 's|find|find ${WRKSRC}/files|g' \
+		${WRKSRC}/files/Makefile.in
 
+	# is this really needed?
 	@${REINPLACE_CMD} -e 's|const NetworkManager = imports.gi.NetworkManager;||g ;\
 		s|const NMClient = imports.gi.NMClient;||g' \
 			${WRKSRC}/files${PREFIX}/share/cinnamon/applets/network\@cinnamon.org/applet.js
 
-	@${REINPLACE_CMD} -e 's|const GnomeBluetoothApplet = imports.gi.GnomeBluetoothApplet;||g ;\
-		s|const GnomeBluetooth = imports.gi.GnomeBluetooth;||g' \
-			${WRKSRC}/files${PREFIX}/share/cinnamon/applets/bluetooth\@cinnamon.org/applet.js
-
-	@${REINPLACE_CMD} -e 's|/usr/lib/gnome-session|${PREFIX}/libexec|g' \
-		${WRKSRC}/files${PREFIX}/share/gnome-session/sessions/cinnamon.session
-
-	@${REINPLACE_CMD} -e 's|find|find ${WRKSRC}/files|g' \
-		${WRKSRC}/files/Makefile.in
+	@${REINPLACE_CMD} -e 's|nm-applet;||g' \
+		${WRKSRC}/files${PREFIX}/share/cinnamon-session/sessions/cinnamon.session \
+		${WRKSRC}/files${PREFIX}/share/cinnamon-session/sessions/cinnamon2d.session
 
 	@${REINPLACE_CMD} -e '/prefix/s|/usr|${PREFIX}|g ; \
 		/datadir/s|/usr|${PREFIX}|g' \
-			${WRKSRC}/files${PREFIX}/share/cinnamon-menu-editor/cme/config.py
+			${WRKSRC}/files${PREFIX}/lib/cinnamon-menu-editor/cme/config.py
 
-	@${REINPLACE_CMD} -e 's|/usr/bin|${PREFIX}/bin|g' \
-		${WRKSRC}/files${PREFIX}/share/xsessions/cinnamon.desktop \
-		${WRKSRC}/files${PREFIX}/share/xsessions/cinnamon2d.desktop
+	@${FIND} ${WRKSRC} -name \* | ${XARGS} ${EGREP} -l "/usr/share/cinnamon/locale" | \
+		${XARGS} ${REINPLACE_CMD} -e "s|/usr/share/cinnamon/locale|${PREFIX}/share/locale|g"
 
-	@${REINPLACE_CMD} -e 's|AM_GNU_GETTEXT_VERSION(\[0.17\])||g ;\
-		s|AM_GNU_GETTEXT(\[external\])||g' \
-		${WRKSRC}/configure.ac
+	@${FIND} ${WRKSRC} -name \* | ${XARGS} ${EGREP} -l "/usr/share" | \
+		${XARGS} ${REINPLACE_CMD} -e "s|/usr/share|${PREFIX}/share|g"
+
+	@${FIND} ${WRKSRC} -name \* | ${XARGS} ${EGREP} -l "/usr/lib" | \
+		${XARGS} ${REINPLACE_CMD} -e "s|/usr/lib|${PREFIX}/lib|g"
+
+# The cs_user.py is not patched until we have the python-pam module
+	@${REINPLACE_CMD} -e 's|"/usr/bin|"${PREFIX}/bin|g' \
+		${WRKSRC}/files${PREFIX}/share/cinnamon/applets/menu@cinnamon.org/applet.js \
+		${WRKSRC}/files${PREFIX}/share/cinnamon/applets/user@cinnamon.org/applet.js \
+		${WRKSRC}/files${PREFIX}/lib/cinnamon-settings/bin/Spices.py \
+#		${WRKSRC}/files${PREFIX}/lib/cinnamon-settings/modules/cs_user.py \
+		${WRKSRC}/files${PREFIX}/lib/cinnamon-settings/modules/cs_screensaver.py \
+		${WRKSRC}/files${PREFIX}/bin/cinnamon-settings \
+		${WRKSRC}/files${PREFIX}/bin/cinnamon-launcher
+
+	@${REINPLACE_CMD} -e 's|=/usr/bin/|=${PREFIX}/bin|g' \
+		${WRKSRC}/files${PREFIX}/share/xsessions/cinnamon2d.desktop \
+		${WRKSRC}/files${PREFIX}/share/xsessions/cinnamon.desktop \
+		${WRKSRC}/files${PREFIX}/share/applications/cinnamon2d.desktop
 
 # Some python files use #! /usr/bin/python (note the space between the bang and the python interpreter
 	@${FIND} ${WRKSRC} -name \* | ${XARGS} ${EGREP} -l "#!.*\/usr\/bin\/python" | \
@@ -151,4 +140,6 @@ pre-configure:
 post-install:
 	@${PYTHON_CMD} ${WRKSRC}/files/generate_desktop_files
 
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/cinnamon/libcinnamon.so
+
 .include <bsd.port.mk>