Some changes to cinnamon and related ports:

	- stop using the GITHUB macros from bsd.sites.mk and use MASTER_SITES instead [1]
	- fix some incorrect STAGEDIR usages. Also remove some incorrect and useless ${STAGE}
	- resort x11/cinnamon post-patch so that all the paths in generate_desktop_files are staging compliant
	- fix the compilation of cinnamon. The build failed to detect gettext
	- fix nemo to install gir and typelib files in the right place
	- fix c-c-c to honour ${LOCALBASE} when calling autoreconf, ${PREFIX} may be different than ${LOCALBASE}

[1] The source code was tar'ed inside a directory that did not follow the desired name schema (${PORTNAME}-${PORTVERSION}) and also was chaging from time to time, making the port hard to keep up to date and compilable. The code was inside a directory like linuxmint-portname-$random_id where $random_im != port_commit_id.

Reviewed by:	kwm


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

9 files changed, 48 insertions, 111 deletions

diff --git a/sysutils/cinnamon-control-center/Makefile b/sysutils/cinnamon-control-center/Makefile
index 348ac6f83..5f66410d7 100644
--- a/sysutils/cinnamon-control-center/Makefile
+++ b/sysutils/cinnamon-control-center/Makefile
@@ -5,6 +5,7 @@
 PORTNAME=	cinnamon-control-center
 PORTVERSION=	1.8.2
 CATEGORIES=	sysutils gnome
+MASTER_SITES=	http://github.com/linuxmint/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/
 DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gustau.perez@gmail.com
@@ -33,13 +34,7 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-
 		${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \
 		${LOCALBASE}/share/doc/py-lxml/CREDITS.txt:${PORTSDIR}/devel/py-lxml
 
-WRKSRC=		${WRKDIR}/linuxmint-cinnamon-control-center-2249c94
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	linuxmint
-GH_TAGNAME=	1.8.2
-GH_COMMIT=	3b93fd2
-
+FETCH_ARGS=	-Fpr
 USE_XORG=	x11 xfixes sm
 USES=		gettext gmake pathfix pkgconfig
 USE_GNOME=	gnomeprefix intlhack gtk30 gconf2 gnomemenus3 \
@@ -77,6 +72,6 @@ post-patch:
 		${WRKSRC}/panels/common/cc-common-language.c
 
 pre-configure:
-	cd ${WRKSRC} && ${PREFIX}/bin/autoreconf
+	cd ${WRKSRC} && ${LOCALBASE}/bin/autoreconf
 
 .include <bsd.port.mk>
diff --git a/sysutils/cinnamon-control-center/distinfo b/sysutils/cinnamon-control-center/distinfo
index 70b31cb05..20aff8036 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) = c1bb0e1851b3379d62fce6fe7659ca114df8b2637dc8ad3fe237147fe0371562
-SIZE (gnome3/cinnamon-control-center-1.8.2.tar.gz) = 8434741
+SHA256 (gnome3/cinnamon-control-center-1.8.2.tar.gz) = 78effed26a8fdce481cfe467889c9afdb6db78a961aec61b918c83c9781ccf4f
+SIZE (gnome3/cinnamon-control-center-1.8.2.tar.gz) = 8431440
diff --git a/x11-fm/nemo/Makefile b/x11-fm/nemo/Makefile
index f872eaeaf..92eff8e5a 100644
--- a/x11-fm/nemo/Makefile
+++ b/x11-fm/nemo/Makefile
@@ -4,6 +4,7 @@
 PORTNAME=	nemo
 PORTVERSION=	1.8.5
 CATEGORIES=	x11-fm gnome
+MASTER_SITES=	http://github.com/linuxmint/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/
 DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gustau.perez@gmail.com
@@ -19,13 +20,7 @@ LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif \
 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
 
-WRKSRC=		${WRKDIR}/linuxmint-nemo-63f7b44
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	linuxmint
-GH_TAGNAME=	1.8.5
-GH_COMMIT=	40f84d6
-
+FETCH_ARGS=	-Fpr
 INSTALLS_ICONS=	yes
 USES=		desktop-file-utils gettext gmake pathfix \
 		pkgconfig shared-mime-info
@@ -51,6 +46,11 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|g' \
 		${WRKSRC}/src/nemo-properties-window.c
 
+	@${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' \
+		${WRKSRC}/libnemo-extension/Makefile.am
+
 	@${FIND} ${WRKSRC} -name \* | ${XARGS} ${EGREP} -l "#!.*\/usr\/bin\/python" | \
 		${XARGS} ${REINPLACE_CMD} -e "s|#!.*python.*|#!/usr/bin/env python|g"
 
diff --git a/x11-fm/nemo/distinfo b/x11-fm/nemo/distinfo
index a44fcf627..a4f900a71 100644
--- a/x11-fm/nemo/distinfo
+++ b/x11-fm/nemo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/nemo-1.8.5.tar.gz) = ba43794293c66ebc31a9c4145d6e7a8326321a4f0e58b28fe4f3d56a8fe39874
-SIZE (gnome3/nemo-1.8.5.tar.gz) = 3806096
+SHA256 (gnome3/nemo-1.8.5.tar.gz) = 18bbbf311ccdd8f772b004313265b6f9f65c45e8cc9b87cf387cc24c9d4b75be
+SIZE (gnome3/nemo-1.8.5.tar.gz) = 3804791
diff --git a/x11-fm/nemo/pkg-plist b/x11-fm/nemo/pkg-plist
index 79d5dcb97..638447a30 100644
--- a/x11-fm/nemo/pkg-plist
+++ b/x11-fm/nemo/pkg-plist
@@ -45,114 +45,57 @@ 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/as/LC_MESSAGES/nemo.mo
-share/locale/ast/LC_MESSAGES/nemo.mo
-share/locale/az/LC_MESSAGES/nemo.mo
-share/locale/be/LC_MESSAGES/nemo.mo
-share/locale/be@latin/LC_MESSAGES/nemo.mo
-share/locale/bg/LC_MESSAGES/nemo.mo
-share/locale/bn/LC_MESSAGES/nemo.mo
-share/locale/bn_IN/LC_MESSAGES/nemo.mo
-share/locale/bo/LC_MESSAGES/nemo.mo
-share/locale/br/LC_MESSAGES/nemo.mo
 share/locale/bs/LC_MESSAGES/nemo.mo
 share/locale/ca/LC_MESSAGES/nemo.mo
-share/locale/ca@valencia/LC_MESSAGES/nemo.mo
-share/locale/crh/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/dz/LC_MESSAGES/nemo.mo
 share/locale/el/LC_MESSAGES/nemo.mo
-share/locale/en@shaw/LC_MESSAGES/nemo.mo
-share/locale/en_CA/LC_MESSAGES/nemo.mo
+share/locale/en_AU/LC_MESSAGES/nemo.mo
 share/locale/en_GB/LC_MESSAGES/nemo.mo
-share/locale/eo/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/fur/LC_MESSAGES/nemo.mo
-share/locale/fy/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/gu/LC_MESSAGES/nemo.mo
-share/locale/gv/LC_MESSAGES/nemo.mo
-share/locale/ha/LC_MESSAGES/nemo.mo
-share/locale/he/LC_MESSAGES/nemo.mo
-share/locale/hi/LC_MESSAGES/nemo.mo
 share/locale/hr/LC_MESSAGES/nemo.mo
 share/locale/hu/LC_MESSAGES/nemo.mo
-share/locale/hy/LC_MESSAGES/nemo.mo
 share/locale/id/LC_MESSAGES/nemo.mo
-share/locale/ig/LC_MESSAGES/nemo.mo
-share/locale/io/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/ka/LC_MESSAGES/nemo.mo
-share/locale/kk/LC_MESSAGES/nemo.mo
-share/locale/km/LC_MESSAGES/nemo.mo
-share/locale/kn/LC_MESSAGES/nemo.mo
-share/locale/ko/LC_MESSAGES/nemo.mo
-share/locale/ku/LC_MESSAGES/nemo.mo
-share/locale/li/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/mai/LC_MESSAGES/nemo.mo
-share/locale/mg/LC_MESSAGES/nemo.mo
-share/locale/mi/LC_MESSAGES/nemo.mo
-share/locale/mk/LC_MESSAGES/nemo.mo
 share/locale/ml/LC_MESSAGES/nemo.mo
-share/locale/mn/LC_MESSAGES/nemo.mo
-share/locale/mr/LC_MESSAGES/nemo.mo
 share/locale/ms/LC_MESSAGES/nemo.mo
-share/locale/my/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/nso/LC_MESSAGES/nemo.mo
-share/locale/oc/LC_MESSAGES/nemo.mo
-share/locale/or/LC_MESSAGES/nemo.mo
-share/locale/pa/LC_MESSAGES/nemo.mo
 share/locale/pl/LC_MESSAGES/nemo.mo
-share/locale/ps/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/rw/LC_MESSAGES/nemo.mo
-share/locale/si/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@ije/LC_MESSAGES/nemo.mo
 share/locale/sr@latin/LC_MESSAGES/nemo.mo
 share/locale/sv/LC_MESSAGES/nemo.mo
-share/locale/ta/LC_MESSAGES/nemo.mo
-share/locale/te/LC_MESSAGES/nemo.mo
-share/locale/th/LC_MESSAGES/nemo.mo
-share/locale/tk/LC_MESSAGES/nemo.mo
+share/locale/tlh/LC_MESSAGES/nemo.mo
 share/locale/tr/LC_MESSAGES/nemo.mo
-share/locale/ug/LC_MESSAGES/nemo.mo
 share/locale/uk/LC_MESSAGES/nemo.mo
-share/locale/uz/LC_MESSAGES/nemo.mo
-share/locale/uz@cyrillic/LC_MESSAGES/nemo.mo
 share/locale/vi/LC_MESSAGES/nemo.mo
-share/locale/wa/LC_MESSAGES/nemo.mo
-share/locale/xh/LC_MESSAGES/nemo.mo
-share/locale/yi/LC_MESSAGES/nemo.mo
-share/locale/yo/LC_MESSAGES/nemo.mo
 share/locale/zh_CN/LC_MESSAGES/nemo.mo
-share/locale/zh_HK/LC_MESSAGES/nemo.mo
 share/locale/zh_TW/LC_MESSAGES/nemo.mo
-share/locale/zu/LC_MESSAGES/nemo.mo
 share/mime/application/nemo-action.xml
 share/mime/application/x-gnome-saved-search.xml
 share/mime/packages/nemo.xml
@@ -164,6 +107,12 @@ share/mime/packages/nemo.xml
 %%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
 @dirrm %%DATADIR%%/icons/hicolor/48x48/emblems
 @dirrm %%DATADIR%%/icons/hicolor/48x48
 @dirrm %%DATADIR%%/icons/hicolor/24x24/emblems
@@ -174,10 +123,6 @@ share/mime/packages/nemo.xml
 @dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%/actions
 @dirrm %%DATADIR%%
-@dirrmtry share/locale/gv/LC_MESSAGES
-@dirrmtry share/locale/gv
-@dirrmtry share/locale/bo/LC_MESSAGES
-@dirrmtry share/locale/bo
 @dirrmtry share/gtksourceview-3.0/language-specs
 @dirrmtry share/gtksourceview-3.0
 @dirrmtry share/gtksourceview-2.0/language-specs
diff --git a/x11-wm/muffin/Makefile b/x11-wm/muffin/Makefile
index 505d2b289..432faccf5 100644
--- a/x11-wm/muffin/Makefile
+++ b/x11-wm/muffin/Makefile
@@ -4,6 +4,7 @@
 PORTNAME=	muffin
 PORTVERSION=	1.8.2
 CATEGORIES=	x11-wm gnome
+MASTER_SITES=	http://github.com/linuxmint/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/
 DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gustau.perez@gmail.com
@@ -18,13 +19,7 @@ LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \
 		libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3
 RUN_DEPENDS=	zenity>=3.0.0:${PORTSDIR}/x11/zenity3
 
-WRKSRC=		${WRKDIR}/linuxmint-muffin-60cab8b
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	linuxmint
-GH_TAGNAME=	1.8.2
-GH_COMMIT=	aa1ef1d
-
+FETCH_ARGS=	-Fpr
 USE_XORG=	x11 xext xrandr xcomposite xcursor xinerama ice sm
 USE_PYTHON=	2.5+
 USES=		gettext gmake pathfix pkgconfig
diff --git a/x11-wm/muffin/distinfo b/x11-wm/muffin/distinfo
index 0c8eb4b77..2d8d2545f 100644
--- a/x11-wm/muffin/distinfo
+++ b/x11-wm/muffin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/muffin-1.8.2.tar.gz) = 61c22b185d8afa1b87b5e1b2b74b9525a6fe285cbd904491e71285d10706a6fe
-SIZE (gnome3/muffin-1.8.2.tar.gz) = 2686661
+SHA256 (gnome3/muffin-1.8.2.tar.gz) = 903c6ab5e228c8a1b8e05f460ba34c111e8a92ce9382ebd0b014416af4dd7049
+SIZE (gnome3/muffin-1.8.2.tar.gz) = 2685117
diff --git a/x11/cinnamon/Makefile b/x11/cinnamon/Makefile
index 3bad08a49..57a7e5350 100644
--- a/x11/cinnamon/Makefile
+++ b/x11/cinnamon/Makefile
@@ -4,6 +4,7 @@
 PORTNAME=	cinnamon
 PORTVERSION=	1.8.8.1
 CATEGORIES=	x11 gnome
+MASTER_SITES=	http://github.com/linuxmint/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/
 DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gustau.perez@gmail.com
@@ -26,16 +27,12 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-
 		${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \
 		cinnamon-control-center:${PORTSDIR}/sysutils/cinnamon-control-center \
 		nemo:${PORTSDIR}/x11-fm/nemo \
-		${PYTHONPREFIX_INCLUDEDIR}/Imaging.h:${PORTSDIR}/graphics/py-imaging \
+		${PYTHON_SITELIBDIR}/PIL/__init__.py:${PORTSDIR}/graphics/py-imaging \
 		${LOCALBASE}/share/doc/py-lxml/CREDITS.txt:${PORTSDIR}/devel/py-lxml
 
-WRKSRC=		${WRKDIR}/linuxmint-Cinnamon-aa9fb31
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	linuxmint
-GH_TAGNAME=	1.8.8.1
-GH_COMMIT=	6d44281
+WRKSRC=		${WRKDIR}/Cinnamon-1.8.8.1
 
+FETCH_ARGS=	-Fpr
 USE_XORG=	x11 xfixes sm
 USES=		gettext gmake pathfix pkgconfig
 USE_AUTOTOOLS=	libtool autoconf automake
@@ -54,10 +51,19 @@ CPPFLAGS+=	-I${LOCALASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
-	@${MKDIR} ${WRKSRC}/files${STAGE}${PREFIX}
+	@${MKDIR} ${WRKSRC}/files${PREFIX}
 .for d in bin lib share
 	@${MV} ${WRKSRC}/files/usr/${d} ${WRKSRC}/files${PREFIX}
 .endfor
+
+	@${REINPLACE_CMD} -e 's|/usr/share/cinnamon|${STAGEDIR}${PREFIX}/share/|g ;\
+		s|/usr/lib|${STAGEDIR}${PREFIX}/share/|g' \
+			${WRKSRC}/files/generate_desktop_files
+
+	@${REINPLACE_CMD} -e 's|"usr/lib|"${STAGEDIR}${PREFIX}/share/|g ;\
+		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}
@@ -122,18 +128,14 @@ post-patch:
 		/datadir/s|/usr|${PREFIX}|g' \
 			${WRKSRC}/files${PREFIX}/share/cinnamon-menu-editor/cme/config.py
 
-	@${REINPLACE_CMD} -e 's|/usr/share|${STAGEDIR}${PREFIX}/share/|g ;\
-		s|/usr/lib|${PREFIX}/share/|g' \
-			${WRKSRC}/files/generate_desktop_files
-
-	@${REINPLACE_CMD} -e 's|"usr/lib|"${STAGEDIR}${PREFIX}/share/|g ;\
-		s|"usr/share|"${STAGEDIR}${PREFIX}/share/|g' \
-			${WRKSRC}/files/generate_desktop_files
-
 	@${REINPLACE_CMD} -e 's|/usr/bin|${PREFIX}/bin|g' \
 		${WRKSRC}/files${PREFIX}/share/xsessions/cinnamon.desktop \
 		${WRKSRC}/files${PREFIX}/share/xsessions/cinnamon2d.desktop
 
+	@${REINPLACE_CMD} -e 's|AM_GNU_GETTEXT_VERSION(\[0.17\])||g ;\
+		s|AM_GNU_GETTEXT(\[external\])||g' \
+		${WRKSRC}/configure.ac
+
 # 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" | \
 		${XARGS} ${REINPLACE_CMD} -e "s|#!.*python.*|#!/usr/bin/env python|g"
diff --git a/x11/cinnamon/distinfo b/x11/cinnamon/distinfo
index f74253d36..456fe06d5 100644
--- a/x11/cinnamon/distinfo
+++ b/x11/cinnamon/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/cinnamon-1.8.8.1.tar.gz) = 521df0204f0e892eaddd106b8e237565ee30d456141bd3a39b863126637e5095
-SIZE (gnome3/cinnamon-1.8.8.1.tar.gz) = 4348754
+SHA256 (gnome3/cinnamon-1.8.8.1.tar.gz) = 100cf6ca9b2622d74532323278bdefb06ac76b750bbf326cc9dadd14e99909bb
+SIZE (gnome3/cinnamon-1.8.8.1.tar.gz) = 4347516