18 files changed, 48 insertions, 60 deletions

diff --git a/cad/kicad-doc/Makefile b/cad/kicad-doc/Makefile
index b4ee77855395..117af0af79f2 100644
--- a/cad/kicad-doc/Makefile
+++ b/cad/kicad-doc/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	kicad
-PORTVERSION=	5.1.7
+PORTVERSION=	5.1.8
 CATEGORIES=	cad
 MASTER_SITES=	https://kicad-downloads.s3.cern.ch/docs/
 PKGNAMESUFFIX=	-doc
diff --git a/cad/kicad-doc/distinfo b/cad/kicad-doc/distinfo
index 6f74aecbe342..3c5b7b0b812e 100644
--- a/cad/kicad-doc/distinfo
+++ b/cad/kicad-doc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1601142842
-SHA256 (kicad-doc-5.1.7.tar.gz) = 552156c0dbf05ac3767b49d294f2f99c4963621e06577042d311ac470490eb21
-SIZE (kicad-doc-5.1.7.tar.gz) = 315888563
+TIMESTAMP = 1603923817
+SHA256 (kicad-doc-5.1.8.tar.gz) = f2d96bae9bb44c089b155ee61bb589d51373647cdfdf28b5f931756e369bdf14
+SIZE (kicad-doc-5.1.8.tar.gz) = 315888898
diff --git a/cad/kicad-doc/pkg-descr b/cad/kicad-doc/pkg-descr
index ae46e7fa7a3b..ec7a94f64b3b 100644
--- a/cad/kicad-doc/pkg-descr
+++ b/cad/kicad-doc/pkg-descr
@@ -1,3 +1,3 @@
 This port installs the KiCad help and documentation files.
 
-WWW: https://github.com/KiCad/kicad-doc
+WWW: https://gitlab.com/kicad/services/kicad-doc
diff --git a/cad/kicad-library-footprints/Makefile b/cad/kicad-library-footprints/Makefile
index 231f23058360..7bddd5a080fe 100644
--- a/cad/kicad-library-footprints/Makefile
+++ b/cad/kicad-library-footprints/Makefile
@@ -2,9 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	kicad
-PORTVERSION=	5.1.7
+PORTVERSION=	5.1.8
 CATEGORIES=	cad
+MASTER_SITES=	https://gitlab.com/kicad/libraries/${PORTNAME}-footprints/-/archive/${DISTVERSION}/
 PKGNAMESUFFIX=	-library-footprints
+DISTNAME=	${PORTNAME}-footprints-${DISTVERSION}
 
 MAINTAINER=	cmt@FreeBSD.org
 COMMENT=	Official KiCad Footprint Libraries
@@ -13,14 +15,9 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	kicad:cad/kicad
 
-CONFLICTS=	kicad-devel-r2*
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	KiCad
-GH_PROJECT=	kicad-footprints
-GH_TAGNAME=	${GIT_FP_HASH}
+USES=		cmake tar:bz2
 
-USES=		cmake
+CONFLICTS=	kicad-devel-r2*
 
 CMAKE_ARGS=	-DLOCALBASE="${LOCALBASE}" \
 		-DCMAKE_BUILD_TYPE="Release" \
diff --git a/cad/kicad-library-footprints/distinfo b/cad/kicad-library-footprints/distinfo
index 1ac1b0a3cb16..2385af848daf 100644
--- a/cad/kicad-library-footprints/distinfo
+++ b/cad/kicad-library-footprints/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1600935982
-SHA256 (KiCad-kicad-footprints-5.1.7_GH0.tar.gz) = 2720e009285fbafa44216417c71d438833398ccb4a23d9c6cce86170983817fa
-SIZE (KiCad-kicad-footprints-5.1.7_GH0.tar.gz) = 6035007
+TIMESTAMP = 1603991230
+SHA256 (kicad-footprints-5.1.8.tar.bz2) = 8937b5ba0f67844ffaca40632bebe9c2f4f17fba446137434aa72363c55d7dd9
+SIZE (kicad-footprints-5.1.8.tar.bz2) = 3387152
diff --git a/cad/kicad-library-footprints/pkg-descr b/cad/kicad-library-footprints/pkg-descr
index 78a814355a2e..1560b486eba8 100644
--- a/cad/kicad-library-footprints/pkg-descr
+++ b/cad/kicad-library-footprints/pkg-descr
@@ -1,3 +1,3 @@
 This port installs the official KiCad Footprint Libraries.
 
-WWW: https://github.com/KiCad/kicad-footprints
+WWW: https://gitlab.com/kicad/libraries/kicad-footprints
diff --git a/cad/kicad-library-packages3d/Makefile b/cad/kicad-library-packages3d/Makefile
index ef47e3aa725d..25d9098f87cd 100644
--- a/cad/kicad-library-packages3d/Makefile
+++ b/cad/kicad-library-packages3d/Makefile
@@ -2,9 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	kicad
-PORTVERSION=	5.1.7
+PORTVERSION=	5.1.8
 CATEGORIES=	cad
+MASTER_SITES=	https://gitlab.com/kicad/libraries/${PORTNAME}-packages3D/-/archive/${DISTVERSION}/
 PKGNAMESUFFIX=	-library-packages3d
+DISTNAME=	${PORTNAME}-packages3D-${DISTVERSION}
 
 MAINTAINER=	cmt@FreeBSD.org
 COMMENT=	Official KiCad 3D model libraries for rendering and MCAD integration
@@ -13,13 +15,9 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	kicad:cad/kicad
 
-CONFLICTS=	kicad-devel-r2*
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	KiCad
-GH_PROJECT=	kicad-packages3D
+USES=		cmake tar:bz2
 
-USES=		cmake
+CONFLICTS=	kicad-devel-r2*
 
 CMAKE_ARGS=	-DLOCALBASE="${LOCALBASE}" \
 		-DCMAKE_BUILD_TYPE="Release" \
diff --git a/cad/kicad-library-packages3d/distinfo b/cad/kicad-library-packages3d/distinfo
index e27f9a445498..859f420f32e0 100644
--- a/cad/kicad-library-packages3d/distinfo
+++ b/cad/kicad-library-packages3d/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1600936219
-SHA256 (KiCad-kicad-packages3D-5.1.7_GH0.tar.gz) = 5420ed6a9cebb15c70210c633d0710f0a89ec43ca2ef111c0439930c8156006c
-SIZE (KiCad-kicad-packages3D-5.1.7_GH0.tar.gz) = 942594575
+TIMESTAMP = 1603993714
+SHA256 (kicad-packages3D-5.1.8.tar.bz2) = 81e64939e922742431284bb19d1ec274d6dc10fd238e5583ead21dc08876c221
+SIZE (kicad-packages3D-5.1.8.tar.bz2) = 727228580
diff --git a/cad/kicad-library-packages3d/pkg-descr b/cad/kicad-library-packages3d/pkg-descr
index 96b7e65fc6f6..d1331d453b3d 100644
--- a/cad/kicad-library-packages3d/pkg-descr
+++ b/cad/kicad-library-packages3d/pkg-descr
@@ -1,4 +1,4 @@
 This port installs the official KiCad 3D model libraries for rendering and MCAD
 integration.
 
-WWW: https://github.com/KiCad/kicad-packages3d
+WWW: https://gitlab.com/kicad/libraries/kicad-packages3D
diff --git a/cad/kicad-library-symbols/Makefile b/cad/kicad-library-symbols/Makefile
index 08b248fcddea..de8287b9e329 100644
--- a/cad/kicad-library-symbols/Makefile
+++ b/cad/kicad-library-symbols/Makefile
@@ -2,9 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	kicad
-PORTVERSION=	5.1.7
+PORTVERSION=	5.1.8
 CATEGORIES=	cad
+MASTER_SITES=	https://gitlab.com/kicad/libraries/${PORTNAME}-symbols/-/archive/${DISTVERSION}/
 PKGNAMESUFFIX=	-library-symbols
+DISTNAME=	${PORTNAME}-symbols-${DISTVERSION}
 
 MAINTAINER=	cmt@FreeBSD.org
 COMMENT=	Official KiCad schematic symbol libraries
@@ -13,13 +15,9 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	kicad:cad/kicad
 
-CONFLICTS=	kicad-devel-r2*
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	KiCad
-GH_PROJECT=	kicad-symbols
+USES=		cmake tar:bz2
 
-USES=		cmake
+CONFLICTS=	kicad-devel-r2*
 
 CMAKE_ARGS=	-DLOCALBASE="${LOCALBASE}" \
 		-DCMAKE_BUILD_TYPE="Release" \
diff --git a/cad/kicad-library-symbols/distinfo b/cad/kicad-library-symbols/distinfo
index 77d59b844b37..9f8c37fbda88 100644
--- a/cad/kicad-library-symbols/distinfo
+++ b/cad/kicad-library-symbols/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1600935956
-SHA256 (KiCad-kicad-symbols-5.1.7_GH0.tar.gz) = ab8fe5a65a7c1a99d9b85f82c56cc7b2dbe77eb37e28945481dcddad7378b425
-SIZE (KiCad-kicad-symbols-5.1.7_GH0.tar.gz) = 3033099
+TIMESTAMP = 1603991904
+SHA256 (kicad-symbols-5.1.8.tar.bz2) = 98cedcca4d7ad6e3be96ec5a41f8f9b3414eae276bac1efdfd3f8871f0f8bc7e
+SIZE (kicad-symbols-5.1.8.tar.bz2) = 1815263
diff --git a/cad/kicad-library-symbols/pkg-descr b/cad/kicad-library-symbols/pkg-descr
index f1a3aa308382..5168ab86fad7 100644
--- a/cad/kicad-library-symbols/pkg-descr
+++ b/cad/kicad-library-symbols/pkg-descr
@@ -1,3 +1,3 @@
 This port installs the official KiCad schematic symbol libraries.
 
-WWW: https://github.com/KiCad/kicad-symbols
+WWW: https://gitlab.com/kicad/libraries/kicad-symbols
diff --git a/cad/kicad-library-templates/Makefile b/cad/kicad-library-templates/Makefile
index 18122abe9f7f..ae4d04a67804 100644
--- a/cad/kicad-library-templates/Makefile
+++ b/cad/kicad-library-templates/Makefile
@@ -2,9 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	kicad
-PORTVERSION=	5.1.7
+PORTVERSION=	5.1.8
 CATEGORIES=	cad
+MASTER_SITES=	https://gitlab.com/kicad/libraries/${PORTNAME}-templates/-/archive/${DISTVERSION}/
 PKGNAMESUFFIX=	-library-tmpl
+DISTNAME=	${PORTNAME}-templates-${DISTVERSION}
 
 MAINTAINER=	cmt@FreeBSD.org
 COMMENT=	Official KiCad project templates
@@ -13,13 +15,9 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	kicad:cad/kicad
 
-CONFLICTS=	kicad-devel-r2*
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	KiCad
-GH_PROJECT=	kicad-templates
+USES=		cmake tar:bz2
 
-USES=		cmake
+CONFLICTS=	kicad-devel-r2*
 
 CMAKE_ARGS=	-DLOCALBASE="${LOCALBASE}" \
 		-DCMAKE_BUILD_TYPE="Release" \
diff --git a/cad/kicad-library-templates/distinfo b/cad/kicad-library-templates/distinfo
index 4d27fa7fd104..e4c2130b603a 100644
--- a/cad/kicad-library-templates/distinfo
+++ b/cad/kicad-library-templates/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1600935922
-SHA256 (KiCad-kicad-templates-5.1.7_GH0.tar.gz) = 0454a08872e39c7f5f038f4447606ec05d7e327684a8361ccb71e7e3d497bbb2
-SIZE (KiCad-kicad-templates-5.1.7_GH0.tar.gz) = 1643946
+TIMESTAMP = 1603992073
+SHA256 (kicad-templates-5.1.8.tar.bz2) = d64ca82854e9780413447a3fa82a528b264d39f57d467fddfc78f919e7ed15c5
+SIZE (kicad-templates-5.1.8.tar.bz2) = 1552947
diff --git a/cad/kicad-library-templates/pkg-descr b/cad/kicad-library-templates/pkg-descr
index 4d35199d03c9..8a3c6730a9ee 100644
--- a/cad/kicad-library-templates/pkg-descr
+++ b/cad/kicad-library-templates/pkg-descr
@@ -1,3 +1,3 @@
 This port installs the KiCad project templates.
 
-WWW: https://github.com/KiCad/kicad-templates
+WWW: https://gitlab.com/kicad/libraries/kicad-templates
diff --git a/cad/kicad/Makefile b/cad/kicad/Makefile
index 46f672021ff3..a4e339f09fbf 100644
--- a/cad/kicad/Makefile
+++ b/cad/kicad/Makefile
@@ -2,9 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	kicad
-PORTVERSION=	5.1.7
+PORTVERSION=	5.1.8
 PORTEPOCH=	2
 CATEGORIES=	cad
+MASTER_SITES=	https://gitlab.com/${PORTNAME}/code/${PORTNAME}/-/archive/${DISTVERSION}/
 
 MAINTAINER=	cmt@FreeBSD.org
 COMMENT=	Schematic and PCB editing software
@@ -22,13 +23,9 @@ LIB_DEPENDS=	libboost_thread.so:devel/boost-libs	\
 
 CONFLICTS=	kicad-devel-r201*
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	KiCad
-GH_PROJECT=	kicad-source-mirror
-
 USES=		cmake:noninja compiler:c++11-lib desktop-file-utils gl \
 		gnome pkgconfig python:3.5+ shared-mime-info shebangfix ssl \
-		tar:xz xorg
+		tar:bz2 xorg
 SHEBANG_FILES=	pcbnew/python/plugins/touch_slider_wizard.py
 
 USE_XORG=	ice x11 xext
diff --git a/cad/kicad/distinfo b/cad/kicad/distinfo
index 6ceee6f36009..a18c706fecef 100644
--- a/cad/kicad/distinfo
+++ b/cad/kicad/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1601064745
-SHA256 (KiCad-kicad-source-mirror-5.1.7_GH0.tar.gz) = 6fb52bbe003ae2a94fefd3d457c94f9410407397b9857b209822988d77fbc964
-SIZE (KiCad-kicad-source-mirror-5.1.7_GH0.tar.gz) = 23792744
+TIMESTAMP = 1603991154
+SHA256 (kicad-5.1.8.tar.bz2) = 81ab6c167c982b2c90506134b0ee7ea5f9d61aec59856887892644dc9bbb9346
+SIZE (kicad-5.1.8.tar.bz2) = 18282857
diff --git a/cad/kicad/pkg-descr b/cad/kicad/pkg-descr
index 58be9025901e..93a03a5a0c2f 100644
--- a/cad/kicad/pkg-descr
+++ b/cad/kicad/pkg-descr
@@ -13,4 +13,4 @@ Kicad is a set of four softwares and a project manager:
     * Cvpcb: footprint selector for components used in the circuit design.
     * Kicad: project manager.
 
-WWW: http://kicad-pcb.org/
+WWW: https://kicad.org/