12 files changed, 25 insertions, 19 deletions

diff --git a/x11/cinnamon-desktop/Makefile b/x11/cinnamon-desktop/Makefile
index 7812342c9927..96b4b11025f2 100644
--- a/x11/cinnamon-desktop/Makefile
+++ b/x11/cinnamon-desktop/Makefile
@@ -4,7 +4,6 @@
 PORTNAME=	cinnamon-desktop
 PORTVERSION=	2.4.2
 CATEGORIES=	x11 gnome
-MASTER_SITES=	http://github.com/linuxmint/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/
 DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -19,6 +18,8 @@ RUN_DEPENDS=	xkeyboard-config>=0:${PORTSDIR}/x11/xkeyboard-config \
 USE_XORG=	x11 xrandr xext
 USES=		autoreconf:build gettext gmake libtool pathfix pkgconfig \
 		shebangfix tar:xz
+USE_GITHUB=	yes
+GH_ACCOUNT=	linuxmint
 USE_GNOME=	gnomeprefix gtk30 intlhack introspection:build
 SHEBANG_FILES=	files/usr/bin/cinnamon-desktop-migrate-mediakeys
 USE_LDCONFIG=	yes
diff --git a/x11/cinnamon-desktop/distinfo b/x11/cinnamon-desktop/distinfo
index 00d3c77fff23..5b7dfc96c8ad 100644
--- a/x11/cinnamon-desktop/distinfo
+++ b/x11/cinnamon-desktop/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/cinnamon-desktop-2.4.2.tar.xz) = 62e2ff4fad405f8d4e7259dbeb2daf65c6f8b9995f2bb1e595a7cc0c2a7f9e0a
-SIZE (gnome3/cinnamon-desktop-2.4.2.tar.xz) = 524074
+SHA256 (gnome3/linuxmint-cinnamon-desktop-2.4.2_GH0.tar.xz) = 62e2ff4fad405f8d4e7259dbeb2daf65c6f8b9995f2bb1e595a7cc0c2a7f9e0a
+SIZE (gnome3/linuxmint-cinnamon-desktop-2.4.2_GH0.tar.xz) = 524074
diff --git a/x11/cinnamon-menus/Makefile b/x11/cinnamon-menus/Makefile
index 96e42736f6dc..262c7bb3a339 100644
--- a/x11/cinnamon-menus/Makefile
+++ b/x11/cinnamon-menus/Makefile
@@ -4,7 +4,6 @@
 PORTNAME=	cinnamon-menus
 PORTVERSION=	2.4.1
 CATEGORIES=	x11 gnome
-MASTER_SITES=	http://github.com/linuxmint/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/
 DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -20,6 +19,8 @@ USES=		autoreconf:build gettext gmake libtool pathfix pkgconfig \
 		python:2 tar:xz
 USE_GNOME=	gnomemenus3 gnomeprefix gtk30 intlhack \
 		introspection:build
+USE_GITHUB=	yes
+GH_ACCOUNT=	linuxmint
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 PATHFIX_MAKEFILEIN=	Makefile.am
diff --git a/x11/cinnamon-menus/distinfo b/x11/cinnamon-menus/distinfo
index 02b6c7643a01..86dd25e29b11 100644
--- a/x11/cinnamon-menus/distinfo
+++ b/x11/cinnamon-menus/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/cinnamon-menus-2.4.1.tar.xz) = 7ab04bb668c80c3a1acccaa07f1b5d22023f397841735f4c4243c10cda717e5c
-SIZE (gnome3/cinnamon-menus-2.4.1.tar.xz) = 518008
+SHA256 (gnome3/linuxmint-cinnamon-menus-2.4.1_GH0.tar.xz) = 7ab04bb668c80c3a1acccaa07f1b5d22023f397841735f4c4243c10cda717e5c
+SIZE (gnome3/linuxmint-cinnamon-menus-2.4.1_GH0.tar.xz) = 518008
diff --git a/x11/cinnamon-screensaver/Makefile b/x11/cinnamon-screensaver/Makefile
index a83dbcbfb64d..1cfa5d1a4600 100644
--- a/x11/cinnamon-screensaver/Makefile
+++ b/x11/cinnamon-screensaver/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	cinnamon-screensaver
 PORTVERSION=	2.4.1
-MASTER_SITES=	http://github.com/linuxmint/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/
 CATEGORIES=	x11 gnome
 DIST_SUBDIR=	gnome3
 
@@ -20,6 +19,8 @@ RUN_DEPENDS=	pam_helper:${PORTSDIR}/security/pam_helper \
 		gnome-keyring>=0:${PORTSDIR}/security/gnome-keyring
 
 USES=		autoreconf:build gettext gmake libtool pathfix pkgconfig tar:xz
+USE_GITHUB=	yes
+GH_ACCOUNT=	linuxmint
 USE_XORG=	x11 xext xxf86vm xxf86misc xscrnsaver
 USE_GNOME=	gnomedesktop3 gnomeprefix intlhack intlhack libgnomekbd libxml2
 GNU_CONFIGURE=	yes
diff --git a/x11/cinnamon-screensaver/distinfo b/x11/cinnamon-screensaver/distinfo
index f24802aa0711..163d9f2b776a 100644
--- a/x11/cinnamon-screensaver/distinfo
+++ b/x11/cinnamon-screensaver/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/cinnamon-screensaver-2.4.1.tar.xz) = e73c5d483cd4faeb8d7a4fec9bb1ab73df5cef5d05a3ab268f7a29947d2a483e
-SIZE (gnome3/cinnamon-screensaver-2.4.1.tar.xz) = 142276
+SHA256 (gnome3/linuxmint-cinnamon-screensaver-2.4.1_GH0.tar.xz) = e73c5d483cd4faeb8d7a4fec9bb1ab73df5cef5d05a3ab268f7a29947d2a483e
+SIZE (gnome3/linuxmint-cinnamon-screensaver-2.4.1_GH0.tar.xz) = 142276
diff --git a/x11/cinnamon-session/Makefile b/x11/cinnamon-session/Makefile
index e5183a893394..00ab25d31852 100644
--- a/x11/cinnamon-session/Makefile
+++ b/x11/cinnamon-session/Makefile
@@ -4,7 +4,6 @@
 PORTNAME=	cinnamon-session
 PORTVERSION=	2.4.3
 CATEGORIES=	x11 gnome
-MASTER_SITES=	http://github.com/linuxmint/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/
 DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -20,6 +19,8 @@ RUN_DEPENDS=	console-kit-daemon:${PORTSDIR}/sysutils/consolekit \
 
 USES=		autoreconf:build execinfo gettext gmake libtool \
 		pathfix pkgconfig tar:xz
+USE_GITHUB=	yes
+GH_ACCOUNT=	linuxmint
 USE_GNOME=	gnomeprefix gtk30 intlhack
 USE_XORG=	ice sm xau xext xtst xrender xtrans xcomposite
 USE_GL=		gl
diff --git a/x11/cinnamon-session/distinfo b/x11/cinnamon-session/distinfo
index 5f2d02d2a19a..3226205b0943 100644
--- a/x11/cinnamon-session/distinfo
+++ b/x11/cinnamon-session/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/cinnamon-session-2.4.3.tar.xz) = 07afa992ae1c513b3a1e83a2fd29f83305f697dd45ba04121521ba8a7c005733
-SIZE (gnome3/cinnamon-session-2.4.3.tar.xz) = 903363
+SHA256 (gnome3/linuxmint-cinnamon-session-2.4.3_GH0.tar.xz) = 07afa992ae1c513b3a1e83a2fd29f83305f697dd45ba04121521ba8a7c005733
+SIZE (gnome3/linuxmint-cinnamon-session-2.4.3_GH0.tar.xz) = 903363
diff --git a/x11/cinnamon/Makefile b/x11/cinnamon/Makefile
index f8e8763aa6b5..9e00517c0202 100644
--- a/x11/cinnamon/Makefile
+++ b/x11/cinnamon/Makefile
@@ -5,7 +5,6 @@ PORTNAME=	cinnamon
 PORTVERSION=	2.4.6
 PORTREVISION=	1
 CATEGORIES=	x11 gnome
-MASTER_SITES=	http://github.com/linuxmint/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/
 DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -42,6 +41,8 @@ USES=		autoreconf:build compiler:c11 gettext gmake libtool \
 		pathfix pkgconfig python shebangfix
 USE_GNOME=	evolutiondataserver3 gconf2 gnomedesktop3 \
 		gnomeprefix gtk30 intlhack introspection:build
+USE_GITHUB=	yes
+GH_ACCOUNT=	linuxmint
 # this happens before moving the file to ${PREFIX} (which then will be copied to ${STAGEDIR}${PREFIX})
 SHEBANG_FILES=	files/usr/bin/cinnamon2d
 USE_XORG=	x11 xfixes sm
diff --git a/x11/cinnamon/distinfo b/x11/cinnamon/distinfo
index de0ec885d0b3..6067d3f914f4 100644
--- a/x11/cinnamon/distinfo
+++ b/x11/cinnamon/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/cinnamon-2.4.6.tar.gz) = f0f8b0c56e8c6ee53daa06bea28c04967960eefed601db2f0ae745ca2abe78e1
-SIZE (gnome3/cinnamon-2.4.6.tar.gz) = 2813177
+SHA256 (gnome3/linuxmint-cinnamon-2.4.6_GH0.tar.gz) = f0f8b0c56e8c6ee53daa06bea28c04967960eefed601db2f0ae745ca2abe78e1
+SIZE (gnome3/linuxmint-cinnamon-2.4.6_GH0.tar.gz) = 2813177
diff --git a/x11/tilda/Makefile b/x11/tilda/Makefile
index 168d4818d515..3ca98b0e2d86 100644
--- a/x11/tilda/Makefile
+++ b/x11/tilda/Makefile
@@ -2,8 +2,8 @@
 
 PORTNAME=	tilda
 PORTVERSION=	1.2.2
+DISTVERSIONPREFIX=	${PORTNAME}-
 CATEGORIES=	x11
-MASTER_SITES=	https://github.com/lanoxx/${PORTNAME}/archive/
 
 MAINTAINER=	rodrigo@FreeBSD.org
 COMMENT=	Drop down x11 terminal with transparency support
@@ -13,12 +13,13 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libconfuse.so:${PORTSDIR}/devel/libconfuse \
 		libvte2_90.so:${PORTSDIR}/x11-toolkits/vte290
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTNAME}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-rpath
 USE_GNOME=	gtk30
 USES=		gmake gettext pkgconfig autoreconf pathfix libtool
 INSTALL_TARGET=	install-strip
+USE_GITHUB=	yes
+GH_ACCOUNT=	lanoxx
 
 DOCS=		AUTHORS ChangeLog HACKING.md README.md TODO.md
 
diff --git a/x11/tilda/distinfo b/x11/tilda/distinfo
index 28da69f672e7..254038850100 100644
--- a/x11/tilda/distinfo
+++ b/x11/tilda/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tilda-1.2.2.tar.gz) = 855ab15423e3de8106975fab2185af4380caeb1bb4c2d0bc60b7674d29f0f4d7
-SIZE (tilda-1.2.2.tar.gz) = 289677
+SHA256 (lanoxx-tilda-tilda-1.2.2_GH0.tar.gz) = 855ab15423e3de8106975fab2185af4380caeb1bb4c2d0bc60b7674d29f0f4d7
+SIZE (lanoxx-tilda-tilda-1.2.2_GH0.tar.gz) = 289677