Index: head/Mk/Uses/lxqt.mk
===================================================================
--- head/Mk/Uses/lxqt.mk	(revision 431550)
+++ head/Mk/Uses/lxqt.mk	(revision 431551)
@@ -1,102 +1,103 @@
 # $FreeBSD$
 #
 # This file contains some variable definitions that are supposed to make your
 # life easier, when dealing with ports related to the LXQt Desktop Environment.
 #
 # Feature:	lxqt
 # Usage:	USES=lxqt
 # Valid ARGS:	does not require args
 #
 # Available LXQt components are:
 #
 # buildtools	- Helpers CMake modules
 # libfmqt	- Libfm Qt bindings
 # lxqt		- LXQt core library
 # qtxdg		- Qt implementation of freedesktop.org xdg specs
 #
 # MAINTAINER: olivierd@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_LXQT_MK)
 _INCLUDE_USES_LXQT_MK=	yes
 
 .if !empty(lxqt_ARGS)
 IGNORE=	Incorrect 'USES+=lxqt:${lxqt_ARGS} takes no arguments
 .endif
 
 MASTER_SITE_LXQT+= \
+	https://github.com/lxde/%SUBDIR%/releases/download/${PORTVERSION}/ \
 	http://downloads.lxqt.org/%SUBDIR%/${PORTVERSION}/
 MASTER_SITE_LXQT_SUBDIR=	lxqt
 
 .if !defined(USE_GITHUB)
 MASTER_SITES?=	${MASTER_SITE_LXQT}
 MASTER_SITE_SUBDIR?=	${MASTER_SITE_LXQT_SUBDIR}
 
 DIST_SUBDIR=	lxqt
 .endif
 
 PLIST_SUB+=	LXQT_INCLUDEDIR="include/lxqt" \
 	LXQT_SHAREDIR="share/lxqt" \
 	LXQT_TRANSLATIONS="share/lxqt/translations" \
 	VERSION="${PORTVERSION}"
 
 CMAKE_ARGS+=	-DCMAKE_INSTALL_MANDIR=${MANDIRS} \
 	-DPULL_TRANSLATIONS:BOOL=OFF
 
 # Available LXQt components are:
 _USE_LXQT_ALL=	buildtools libfmqt lxqt qtxdg
 
 _DATAROOTDIR=	${LOCALBASE}/share
 
 buildtools_BUILD_DEPENDS=	${_DATAROOTDIR}/cmake/lxqt-build-tools/lxqt-build-tools-config.cmake:devel/lxqt-build-tools
 
 libfmqt_LIB_DEPENDS=	libfm-qt.so:x11/libfm-qt
 
 lxqt_LIB_DEPENDS=	liblxqt.so:devel/liblxqt
 lxqt_USE_LXQT_REQ=	qtxdg
 
 qtxdg_LIB_DEPENDS=	libQt5Xdg.so:devel/libqtxdg
 
 .if defined(USE_LXQT)
 
 # First, expand all USE_LXQT_REQ recursively.
 .for comp in ${_USE_LXQT_ALL}
 . for subcomp in ${${comp}_USE_LXQT_REQ}
 ${comp}_USE_LXQT_REQ+=	${${comp}_USE_LXQR_REQ}
 . endfor
 .endfor
 
 # Then, use already expanded USE_LXQT_REQ to expand USE_LXQT.
 .for comp in ${USE_LXQT}
 . if empty(_USE_LXQT_ALL:M${comp})
 IGNORE=	cannot install: Unknown component ${comp}
 . else
 _USE_LXQT+=	${${comp}_USE_LXQT_REQ} ${comp}
 . endif
 .endfor
 
 # Remove duplicate components
 USE_LXQT=	${_USE_LXQT:O:u}
 
 .for comp in ${USE_LXQT}
 . if defined(${comp}_BUILD_DEPENDS)
 BUILD_DEPENDS+=	${${comp}_BUILD_DEPENDS}
 . endif
 
 . if defined(${comp}_LIB_DEPENDS)
 LIB_DEPENDS+=	${${comp}_LIB_DEPENDS}
 . endif
 
 . if defined(${comp}_RUN_DEPENDS)
 RUN_DEPENDS+=	${${comp}_RUN_DEPENDS}
 . endif
 .endfor
 
 .endif # end of defined(USE_LXQT)
 
 .endif # end of !defined(_INCLUDE_USES_LXQT_MK)
 
 .if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_LXQT_POST_MK)
 
 _INCLUDE_USES_LXQT_POST_MK=	yes
 
 .endif
Index: head/graphics/lximage-qt/Makefile
===================================================================
--- head/graphics/lximage-qt/Makefile	(revision 431550)
+++ head/graphics/lximage-qt/Makefile	(revision 431551)
@@ -1,28 +1,27 @@
 # Created by: Olivier Duchateau
 # $FreeBSD$
 
 PORTNAME=	lximage-qt
 PORTVERSION=	0.5.1
 CATEGORIES=	graphics
-#MASTER_SITES=	LXQT/${PORTNAME}
-MASTER_SITES=	https://github.com/lxde/${PORTNAME}/releases/download/${PORTVERSION}/
+MASTER_SITES=	LXQT/${PORTNAME}
 
 MAINTAINER=	olivierd@FreeBSD.org
 COMMENT=	Image viewer and screenshot tool
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libexif.so:graphics/libexif \
 	libmenu-cache.so:x11/menu-cache \
 	libfm.so:x11/libfm
 
 USES=	cmake:outsource compiler:c++11-lib desktop-file-utils gettext-runtime \
 	localbase:ldflags lxqt pkgconfig tar:xz
 USE_GNOME=	glib20
 USE_QT5=	buildtools_build qmake_build core dbus gui linguisttools \
 	printsupport svg widgets x11extras
 USE_LXQT=	buildtools libfmqt
 USE_XORG=	ice sm x11 xcb xext xfixes
 INSTALLS_ICONS=	yes
 
 .include <bsd.port.mk>
Index: head/x11/libfm-qt/Makefile
===================================================================
--- head/x11/libfm-qt/Makefile	(revision 431550)
+++ head/x11/libfm-qt/Makefile	(revision 431551)
@@ -1,26 +1,25 @@
 # Created by: Olivier Duchateau
 # $FreeBSD$
 
 PORTNAME=	libfm-qt
 PORTVERSION=	0.11.2
 CATEGORIES=	x11
-#MASTER_SITES=	LXQT/${PORTNAME}
-MASTER_SITES=	https://github.com/lxde/${PORTNAME}/releases/download/${PORTVERSION}/
+MASTER_SITES=	LXQT/${PORTNAME}
 
 MAINTAINER=	olivierd@FreeBSD.org
 COMMENT=	Qt port of libfm
 
 LICENSE=	LGPL21+
 
 LIB_DEPENDS=	libfm.so:x11/libfm \
 	libmenu-cache.so:x11/menu-cache
 
 USES=	cmake:outsource compiler:c++11-lib gettext-runtime lxqt pkgconfig \
 	tar:xz
 USE_QT5=	buildtools_build qmake_build core gui linguisttools widgets \
 	x11extras
 USE_GNOME=	glib20
 USE_XORG=	xcb
 USE_LXQT=	buildtools
 
 .include <bsd.port.mk>
Index: head/x11-fm/pcmanfm-qt/Makefile
===================================================================
--- head/x11-fm/pcmanfm-qt/Makefile	(revision 431550)
+++ head/x11-fm/pcmanfm-qt/Makefile	(revision 431551)
@@ -1,26 +1,25 @@
 # Created by: Olivier Duchateau
 # $FreeBSD$
 
 PORTNAME=	pcmanfm-qt
 PORTVERSION=	0.11.3
 CATEGORIES=	x11-fm
-#MASTER_SITES=	LXQT/${PORTNAME}
-MASTER_SITES=	https://github.com/lxde/${PORTNAME}/releases/download/${PORTVERSION}/
+MASTER_SITES=	LXQT/${PORTNAME}
 
 MAINTAINER=	olivierd@FreeBSD.org
 COMMENT=	LXQt file manager
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libmenu-cache.so:x11/menu-cache \
 	libfm.so:x11/libfm
 
 USES=	cmake:outsource compiler:c++11-lib desktop-file-utils \
 	gettext-runtime localbase:ldflags lxqt pkgconfig tar:xz
 USE_QT5=	buildtools_build qmake_build core dbus gui linguisttools \
 	widgets x11extras
 USE_LXQT=	buildtools libfmqt
 USE_GNOME=	glib20
 USE_XORG=	xcb
 
 .include <bsd.port.mk>