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

2 files changed, 20 insertions, 18 deletions

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