summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Mk/bsd.sites.mk33
-rw-r--r--accessibility/orca/Makefile2
-rw-r--r--accessibility/py-atspi/Makefile2
-rw-r--r--archivers/file-roller/Makefile2
-rw-r--r--audio/gnome-music/Makefile2
-rw-r--r--audio/libaudiofile/Makefile2
-rw-r--r--deskutils/baobab/Makefile2
-rw-r--r--deskutils/bijiben/Makefile2
-rw-r--r--deskutils/gnome-calendar/Makefile2
-rw-r--r--deskutils/gnome-characters/Makefile2
-rw-r--r--deskutils/gnome-clocks/Makefile2
-rw-r--r--deskutils/gnome-contacts/Makefile2
-rw-r--r--deskutils/gnome-dictionary/Makefile2
-rw-r--r--deskutils/gnome-font-viewer/Makefile2
-rw-r--r--deskutils/gnome-initial-setup/Makefile2
-rw-r--r--deskutils/gnome-maps/Makefile2
-rw-r--r--deskutils/gnome-photos/Makefile2
-rw-r--r--deskutils/gnome-screenshot/Makefile2
-rw-r--r--deskutils/gnome-sound-recorder/Makefile2
-rw-r--r--deskutils/gnome-todo/Makefile2
-rw-r--r--deskutils/gnome-tweaks/Makefile2
-rw-r--r--deskutils/gnome-weather/Makefile2
-rw-r--r--deskutils/gnote/Makefile2
-rw-r--r--devel/d-spy/Makefile2
-rw-r--r--devel/devhelp/Makefile2
-rw-r--r--devel/gconf2/Makefile2
-rw-r--r--devel/gnome-builder/Makefile2
-rw-r--r--devel/gsettings-desktop-schemas/Makefile2
-rw-r--r--devel/gtranslator/Makefile2
-rw-r--r--devel/libglade2/Makefile2
-rw-r--r--devel/libunicode/Makefile2
-rw-r--r--devel/py-pygobject/Makefile2
-rw-r--r--devel/tinysparql/Makefile2
-rw-r--r--editors/gedit-plugins/Makefile2
-rw-r--r--editors/gedit/Makefile2
-rw-r--r--editors/ghex/Makefile2
-rw-r--r--editors/gnome-text-editor/Makefile2
-rw-r--r--games/gnome-chess/Makefile2
-rw-r--r--games/gnome-mines/Makefile2
-rw-r--r--games/gnome-robots/Makefile2
-rw-r--r--games/gnome-sudoku/Makefile2
-rw-r--r--games/lightsoff/Makefile2
-rw-r--r--games/quadrapassel/Makefile2
-rw-r--r--games/swell-foop/Makefile2
-rw-r--r--games/tali/Makefile2
-rw-r--r--graphics/eog-plugins/Makefile2
-rw-r--r--graphics/eog/Makefile2
-rw-r--r--graphics/evince/Makefile2
-rw-r--r--graphics/libepoxy/Makefile2
-rw-r--r--graphics/simple-scan/Makefile4
-rw-r--r--irc/polari/Makefile2
-rw-r--r--mail/geary/Makefile2
-rw-r--r--math/gnome-calculator/Makefile2
-rw-r--r--misc/gnome-devel-docs/Makefile2
-rw-r--r--misc/gnome-user-docs/Makefile2
-rw-r--r--multimedia/cheese/Makefile2
-rw-r--r--multimedia/pitivi/Makefile2
-rw-r--r--multimedia/totem/Makefile2
-rw-r--r--net/gnome-connections/Makefile2
-rw-r--r--net/gnome-nettool/Makefile2
-rw-r--r--net/libcloudproviders/Makefile2
-rw-r--r--security/gnome-keyring/Makefile2
-rw-r--r--security/seahorse/Makefile2
-rw-r--r--sysutils/gnome-control-center/Makefile2
-rw-r--r--sysutils/gnome-settings-daemon/Makefile2
-rw-r--r--sysutils/gnome-system-monitor/Makefile2
-rw-r--r--sysutils/localsearch/Makefile2
-rw-r--r--textproc/libxml2/Makefile2
-rw-r--r--textproc/libxslt/Makefile2
-rw-r--r--textproc/py-gi-docgen/Makefile2
-rw-r--r--textproc/yelp-tools/Makefile2
-rw-r--r--www/epiphany/Makefile2
-rw-r--r--x11-fm/nautilus/Makefile2
-rw-r--r--x11-fm/sushi/Makefile4
-rw-r--r--x11-fonts/bitstream-vera/Makefile2
-rw-r--r--x11-themes/gnome-backgrounds/Makefile2
-rw-r--r--x11-themes/gtk-engines2/Makefile2
-rw-r--r--x11-toolkits/gnome-pty-helper/Makefile2
-rw-r--r--x11-toolkits/gtk20/Makefile2
-rw-r--r--x11-toolkits/gtk30/Makefile2
-rw-r--r--x11-toolkits/gtksourceview2/Makefile2
-rw-r--r--x11-toolkits/libwnck3/Makefile2
-rw-r--r--x11-toolkits/unique/Makefile2
-rw-r--r--x11-wm/mutter/Makefile2
-rw-r--r--x11/gdm/Makefile2
-rw-r--r--x11/gnome-console/Makefile2
-rw-r--r--x11/gnome-desktop/Makefile2
-rw-r--r--x11/gnome-session/Makefile2
-rw-r--r--x11/gnome-shell-extensions/Makefile2
-rw-r--r--x11/gnome-shell/Makefile2
-rw-r--r--x11/xdg-desktop-portal-gnome/Makefile2
-rw-r--r--x11/yelp/Makefile2
92 files changed, 115 insertions, 104 deletions
diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk
index 713298eb2948..5988f78845a4 100644
--- a/Mk/bsd.sites.mk
+++ b/Mk/bsd.sites.mk
@@ -580,17 +580,28 @@ WWW?= https://gitlab.com/${GL_ACCOUNT}/${GL_PROJECT}/
.endif # !defined(IGNORE_MASTER_SITE_GITLAB)
.if !defined(IGNORE_MASTER_SITE_GNOME)
+_version_major= ${DISTVERSION:C|^([0-9]+).*|\1|}
+_version_minor= ${DISTVERSION:C|^([0-9]+)\.([0-9]+).*|\2|}
+
+. if ${_version_major} >= 10
+_gnome_ver= ${_version_major}
+. else
+_gnome_ver= ${_version_major}.${_version_minor}
+. endif
+
+. if !empty(MASTER_SITES:M*/archive/*)
+_GNOME_PATH= %SUBDIR%
+. else
+_GNOME_PATH= %SUBDIR%/${_gnome_ver}
+. endif
+
MASTER_SITE_GNOME+= \
- https://download.gnome.org/%SUBDIR%/ \
- https://gitlab.gnome.org/GNOME/${PORTNAME}/-/archive/${PORTVERSION}/ \
- http://ftp.belnet.be/mirror/ftp.gnome.org/gnomeftp/%SUBDIR%/ \
- ftp://ftp.belnet.be/mirror/ftp.gnome.org/gnomeftp/%SUBDIR%/ \
- https://ftp.acc.umu.se/pub/GNOME/%SUBDIR%/ \
- ftp://ftp.cse.buffalo.edu/pub/Gnome/%SUBDIR%/ \
- https://fr2.rpmfind.net/linux/gnome.org/%SUBDIR%/ \
- ftp://ftp.kddlabs.co.jp/pub/GNOME/%SUBDIR%/ \
- ftp://ftp.mirrorservice.org/sites/ftp.gnome.org/pub/GNOME/%SUBDIR%/ \
- ftp://ftp.nara.wide.ad.jp/pub/X11/GNOME/%SUBDIR%/
+ https://download.gnome.org/${_GNOME_PATH}/ \
+ http://ftp.belnet.be/mirror/ftp.gnome.org/gnomeftp/${_GNOME_PATH}/ \
+ https://ftp.acc.umu.se/pub/GNOME/${_GNOME_PATH}/ \
+ https://fr2.rpmfind.net/linux/gnome.org/${_GNOME_PATH}/ \
+ https://gitlab.gnome.org/GNOME/${PORTNAME}/-/archive/${PORTVERSION}/
+
.endif
.if !defined(IGNORE_MASTER_SITE_GIMP)
@@ -1087,7 +1098,7 @@ MASTER_SITES_SUBDIRS= APACHE_COMMONS_BINARIES:${PORTNAME:S,commons-,,} \
GIMP:${PORTNAME}/${PORTVERSION:R}/ \
GITHUB:${GH_ACCOUNT}/${GH_PROJECT}/tar.gz/${GH_TAGNAME}?dummy=/ \
GITHUB_CLOUD:${GH_ACCOUNT}/${GH_PROJECT}/ \
- GNOME:sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} \
+ GNOME:sources/${DISTNAME:S/-${DISTVERSIONFULL}$//} \
GNU:${PORTNAME} \
GNUPG:${PORTNAME} \
GNU_ALPHA:${PORTNAME} \
diff --git a/accessibility/orca/Makefile b/accessibility/orca/Makefile
index 195ce4f53f5d..c16fb36192ba 100644
--- a/accessibility/orca/Makefile
+++ b/accessibility/orca/Makefile
@@ -2,7 +2,7 @@ PORTNAME= orca
PORTVERSION= 43.1
PORTREVISION= 5
CATEGORIES= accessibility gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/accessibility/py-atspi/Makefile b/accessibility/py-atspi/Makefile
index d6d7bfc10dd1..0061b767179e 100644
--- a/accessibility/py-atspi/Makefile
+++ b/accessibility/py-atspi/Makefile
@@ -1,7 +1,7 @@
PORTNAME= atspi
DISTVERSION= 2.46.1
CATEGORIES= accessibility x11-toolkits python
-MASTER_SITES= GNOME/sources/pyatspi/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES= GNOME
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pyatspi-${DISTVERSION}
DIST_SUBDIR= gnome
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 0f7148db301f..015b27c34c88 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -2,7 +2,7 @@ PORTNAME= file-roller
PORTVERSION= 44.5
PORTEPOCH= 1
CATEGORIES= archivers gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/audio/gnome-music/Makefile b/audio/gnome-music/Makefile
index 7d3853e047ab..475b8d20f1ba 100644
--- a/audio/gnome-music/Makefile
+++ b/audio/gnome-music/Makefile
@@ -1,7 +1,7 @@
PORTNAME= gnome-music
PORTVERSION= 47.1
CATEGORIES= audio gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/audio/libaudiofile/Makefile b/audio/libaudiofile/Makefile
index a2b3e6df12da..1abd056575dc 100644
--- a/audio/libaudiofile/Makefile
+++ b/audio/libaudiofile/Makefile
@@ -2,7 +2,7 @@ PORTNAME= libaudiofile
PORTVERSION= 0.3.6
PORTREVISION= 6
CATEGORIES= audio
-MASTER_SITES= GNOME/sources/${PORTNAME:S/lib//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES= GNOME
DISTNAME= audiofile-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
diff --git a/deskutils/baobab/Makefile b/deskutils/baobab/Makefile
index 5d8676a9cb30..9d98a435245a 100644
--- a/deskutils/baobab/Makefile
+++ b/deskutils/baobab/Makefile
@@ -2,7 +2,7 @@ PORTNAME= baobab
PORTVERSION= 43.0
PORTREVISION= 2
CATEGORIES= deskutils gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/deskutils/bijiben/Makefile b/deskutils/bijiben/Makefile
index 6671976b3253..f89103e3b97d 100644
--- a/deskutils/bijiben/Makefile
+++ b/deskutils/bijiben/Makefile
@@ -2,7 +2,7 @@ PORTNAME= bijiben
PORTVERSION= 40.1
PORTREVISION= 7
CATEGORIES= deskutils gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
PATCH_SITES= https://gitlab.gnome.org/GNOME/${PORTNAME}/-/commit/
diff --git a/deskutils/gnome-calendar/Makefile b/deskutils/gnome-calendar/Makefile
index 073818c56631..10f401b31f3b 100644
--- a/deskutils/gnome-calendar/Makefile
+++ b/deskutils/gnome-calendar/Makefile
@@ -1,7 +1,7 @@
PORTNAME= gnome-calendar
PORTVERSION= 47.0
CATEGORIES= deskutils gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/deskutils/gnome-characters/Makefile b/deskutils/gnome-characters/Makefile
index eff43c34d81b..0afb6c72b247 100644
--- a/deskutils/gnome-characters/Makefile
+++ b/deskutils/gnome-characters/Makefile
@@ -2,7 +2,7 @@ PORTNAME= gnome-characters
PORTVERSION= 47.0
PORTREVISION= 1
CATEGORIES= deskutils gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/deskutils/gnome-clocks/Makefile b/deskutils/gnome-clocks/Makefile
index 88d934d8ba12..70f4ab42a36a 100644
--- a/deskutils/gnome-clocks/Makefile
+++ b/deskutils/gnome-clocks/Makefile
@@ -2,7 +2,7 @@ PORTNAME= gnome-clocks
PORTVERSION= 47.0
PORTEPOCH= 1
CATEGORIES= deskutils gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/deskutils/gnome-contacts/Makefile b/deskutils/gnome-contacts/Makefile
index a422070800bb..d9d6df3fca95 100644
--- a/deskutils/gnome-contacts/Makefile
+++ b/deskutils/gnome-contacts/Makefile
@@ -2,7 +2,7 @@ PORTNAME= gnome-contacts
PORTVERSION= 47.1.1
PORTREVISION= 1
CATEGORIES= deskutils gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
MAINTAINER= gnome@FreeBSD.org
COMMENT= Contacts manager for gnome
diff --git a/deskutils/gnome-dictionary/Makefile b/deskutils/gnome-dictionary/Makefile
index bc45288367f7..4e1e93138f09 100644
--- a/deskutils/gnome-dictionary/Makefile
+++ b/deskutils/gnome-dictionary/Makefile
@@ -2,7 +2,7 @@ PORTNAME= gnome-dictionary
PORTVERSION= 40.0
PORTREVISION= 5
CATEGORIES= deskutils gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
PATCH_SITES= https://gitlab.gnome.org/GNOME/${PORTNAME}/-/commit/
diff --git a/deskutils/gnome-font-viewer/Makefile b/deskutils/gnome-font-viewer/Makefile
index ee34dd9f0dd3..0404f8f49aea 100644
--- a/deskutils/gnome-font-viewer/Makefile
+++ b/deskutils/gnome-font-viewer/Makefile
@@ -1,7 +1,7 @@
PORTNAME= gnome-font-viewer
PORTVERSION= 47.0
CATEGORIES= deskutils gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/deskutils/gnome-initial-setup/Makefile b/deskutils/gnome-initial-setup/Makefile
index 3fe4e3c74339..cd60b9b9e115 100644
--- a/deskutils/gnome-initial-setup/Makefile
+++ b/deskutils/gnome-initial-setup/Makefile
@@ -2,7 +2,7 @@ PORTNAME= gnome-initial-setup
PORTVERSION= 43.2
PORTREVISION= 5
CATEGORIES= deskutils gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/deskutils/gnome-maps/Makefile b/deskutils/gnome-maps/Makefile
index 6c86d233a6ad..4996285847e3 100644
--- a/deskutils/gnome-maps/Makefile
+++ b/deskutils/gnome-maps/Makefile
@@ -1,7 +1,7 @@
PORTNAME= gnome-maps
DISTVERSION= 47.4
CATEGORIES= deskutils gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/deskutils/gnome-photos/Makefile b/deskutils/gnome-photos/Makefile
index 7639776fd50e..d9731ed77dd0 100644
--- a/deskutils/gnome-photos/Makefile
+++ b/deskutils/gnome-photos/Makefile
@@ -2,7 +2,7 @@ PORTNAME= gnome-photos
DISTVERSION= 44.0
PORTREVISION= 1
CATEGORIES= deskutils gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/deskutils/gnome-screenshot/Makefile b/deskutils/gnome-screenshot/Makefile
index 5e3e0557dd63..0ec3f24d5f4c 100644
--- a/deskutils/gnome-screenshot/Makefile
+++ b/deskutils/gnome-screenshot/Makefile
@@ -2,7 +2,7 @@ PORTNAME= gnome-screenshot
PORTVERSION= 41.0
PORTREVISION= 3
CATEGORIES= deskutils gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
PATCH_SITES= https://gitlab.gnome.org/GNOME/${PORTNAME}/-/commit/
diff --git a/deskutils/gnome-sound-recorder/Makefile b/deskutils/gnome-sound-recorder/Makefile
index 12e2f0da7307..7ad00e925319 100644
--- a/deskutils/gnome-sound-recorder/Makefile
+++ b/deskutils/gnome-sound-recorder/Makefile
@@ -2,7 +2,7 @@ PORTNAME= gnome-sound-recorder
DISTVERSION= 42.0
PORTREVISION= 2
CATEGORIES= deskutils gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/deskutils/gnome-todo/Makefile b/deskutils/gnome-todo/Makefile
index dcb222ac0625..9d814ca6ca6b 100644
--- a/deskutils/gnome-todo/Makefile
+++ b/deskutils/gnome-todo/Makefile
@@ -2,7 +2,7 @@ PORTNAME= gnome-todo
PORTVERSION= 41.0
PORTREVISION= 4
CATEGORIES= deskutils gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/deskutils/gnome-tweaks/Makefile b/deskutils/gnome-tweaks/Makefile
index 8a62ced68c81..5f0ace6b6375 100644
--- a/deskutils/gnome-tweaks/Makefile
+++ b/deskutils/gnome-tweaks/Makefile
@@ -2,7 +2,7 @@ PORTNAME= gnome-tweaks
PORTVERSION= 40.10
PORTREVISION= 4
CATEGORIES= deskutils gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
MAINTAINER= gnome@FreeBSD.org
COMMENT= Allows to tweak some hidden settings in GNOME3
diff --git a/deskutils/gnome-weather/Makefile b/deskutils/gnome-weather/Makefile
index a79869fabc03..bd4dfe15300d 100644
--- a/deskutils/gnome-weather/Makefile
+++ b/deskutils/gnome-weather/Makefile
@@ -2,7 +2,7 @@ PORTNAME= gnome-weather
PORTVERSION= 42.0
PORTREVISION= 1
CATEGORIES= deskutils gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/deskutils/gnote/Makefile b/deskutils/gnote/Makefile
index 1e1946f585b6..19671c864a75 100644
--- a/deskutils/gnote/Makefile
+++ b/deskutils/gnote/Makefile
@@ -2,7 +2,7 @@ PORTNAME= gnote
PORTVERSION= 42.1
PORTREVISION= 2
CATEGORIES= deskutils gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
MAINTAINER= gnome@FreeBSD.org
COMMENT= C++ version of Tomboy, note taking application
diff --git a/devel/d-spy/Makefile b/devel/d-spy/Makefile
index 7063a481de85..409c023ea15e 100644
--- a/devel/d-spy/Makefile
+++ b/devel/d-spy/Makefile
@@ -1,7 +1,7 @@
PORTNAME= d-spy
PORTVERSION= 47.0
CATEGORIES= devel
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES= GNOME
MAINTAINER= gnome@FreeBSD.org
COMMENT= D-Bus explorer
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index f1e00e742090..01c263cad7b2 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -2,7 +2,7 @@ PORTNAME= devhelp
PORTVERSION= 41.2
PORTREVISION= 4
CATEGORIES= devel gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
PATCH_SITES= https://gitlab.gnome.org/GNOME/${PORTNAME}/-/commit/
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index d4c361816ec6..331d91800a31 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -2,7 +2,7 @@ PORTNAME= gconf2
PORTVERSION= 3.2.6
PORTREVISION= 10
CATEGORIES= devel gnome
-MASTER_SITES= GNOME/sources/GConf/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES= GNOME
DISTNAME= GConf-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/devel/gnome-builder/Makefile b/devel/gnome-builder/Makefile
index 7faf00c606d5..df0b0c8fa847 100644
--- a/devel/gnome-builder/Makefile
+++ b/devel/gnome-builder/Makefile
@@ -2,7 +2,7 @@ PORTNAME= gnome-builder
PORTVERSION= 42.1
PORTREVISION= 10
CATEGORIES= devel gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/devel/gsettings-desktop-schemas/Makefile b/devel/gsettings-desktop-schemas/Makefile
index c74bca831a4f..64d4362adb75 100644
--- a/devel/gsettings-desktop-schemas/Makefile
+++ b/devel/gsettings-desktop-schemas/Makefile
@@ -2,7 +2,7 @@ PORTNAME= gsettings-desktop-schemas
DISTVERSION= 47.1
PORTREVISION= 1
CATEGORIES= devel gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${DISTVERSION:R:R}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= desktop@FreeBSD.org
diff --git a/devel/gtranslator/Makefile b/devel/gtranslator/Makefile
index 2dc96c853c8a..07a125ca53d0 100644
--- a/devel/gtranslator/Makefile
+++ b/devel/gtranslator/Makefile
@@ -2,7 +2,7 @@ PORTNAME= gtranslator
PORTVERSION= 40.0
PORTREVISION= 5
CATEGORIES= devel gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
PATCH_SITES= https://gitlab.gnome.org/GNOME/${PORTNAME}/-/commit/
PATCHFILES+= 7ac572cc8c8c.patch:-p1 # https://gitlab.gnome.org/GNOME/gtranslator/-/merge_requests/90
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index 93686b081032..5a815f5d1afe 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -2,7 +2,7 @@ PORTNAME= libglade2
PORTVERSION= 2.6.4
PORTREVISION?= 13
CATEGORIES= devel gnome
-MASTER_SITES= GNOME/sources/${PORTNAME:S/2$//}/${PORTVERSION:C/..$//}
+MASTER_SITES= GNOME
DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/devel/libunicode/Makefile b/devel/libunicode/Makefile
index 1f238fed7cf8..e3d6f029f880 100644
--- a/devel/libunicode/Makefile
+++ b/devel/libunicode/Makefile
@@ -2,7 +2,7 @@ PORTNAME= libunicode
PORTVERSION= 0.4
PORTREVISION= 12
CATEGORIES= devel gnome
-MASTER_SITES= GNOME/sources/libunicode/0.4
+MASTER_SITES= GNOME
DISTNAME= ${PORTNAME}-${PORTVERSION}.gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/devel/py-pygobject/Makefile b/devel/py-pygobject/Makefile
index 86cc88f33cec..4a20d90d1e40 100644
--- a/devel/py-pygobject/Makefile
+++ b/devel/py-pygobject/Makefile
@@ -2,7 +2,7 @@ PORTNAME= pygobject
DISTVERSION= 3.50.0
PORTREVISION?= 0
CATEGORIES= devel python
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES= GNOME
PKGNAMEPREFIX?= ${PYTHON_PKGNAMEPREFIX}
DIST_SUBDIR= gnome
diff --git a/devel/tinysparql/Makefile b/devel/tinysparql/Makefile
index 2f9a144574dd..4561e2c427a2 100644
--- a/devel/tinysparql/Makefile
+++ b/devel/tinysparql/Makefile
@@ -2,7 +2,7 @@ PORTNAME= tinysparql
PORTVERSION= 3.8.2
PORTREVISION= 2
CATEGORIES= devel
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile
index 472a4b1c9efc..423b02be8478 100644
--- a/editors/gedit-plugins/Makefile
+++ b/editors/gedit-plugins/Makefile
@@ -2,7 +2,7 @@ PORTNAME= gedit-plugins
PORTVERSION= 43.1
PORTREVISION= 6
CATEGORIES= editors gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index d8292658de15..667bcd514bf4 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -2,7 +2,7 @@ PORTNAME= gedit
PORTVERSION= 44.2
PORTREVISION= 4
CATEGORIES= editors gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/editors/ghex/Makefile b/editors/ghex/Makefile
index f220e5c5dac5..0ce4f3d59805 100644
--- a/editors/ghex/Makefile
+++ b/editors/ghex/Makefile
@@ -1,7 +1,7 @@
PORTNAME= ghex
PORTVERSION= 46.2
CATEGORIES= editors gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/editors/gnome-text-editor/Makefile b/editors/gnome-text-editor/Makefile
index 88cb5efe2a77..ee06ee8c86e9 100644
--- a/editors/gnome-text-editor/Makefile
+++ b/editors/gnome-text-editor/Makefile
@@ -2,7 +2,7 @@ PORTNAME= gnome-text-editor
PORTVERSION= 42.2
PORTREVISION= 6
CATEGORIES= editors gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/games/gnome-chess/Makefile b/games/gnome-chess/Makefile
index 41be2955a969..2d2d0a9fa0b6 100644
--- a/games/gnome-chess/Makefile
+++ b/games/gnome-chess/Makefile
@@ -2,7 +2,7 @@ PORTNAME= gnome-chess
PORTVERSION= 43.0
PORTREVISION= 2
CATEGORIES= games gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/games/gnome-mines/Makefile b/games/gnome-mines/Makefile
index 8d7658ef6b80..ae810c3c7db9 100644
--- a/games/gnome-mines/Makefile
+++ b/games/gnome-mines/Makefile
@@ -2,7 +2,7 @@ PORTNAME= gnome-mines
PORTVERSION= 40.1
PORTREVISION= 3
CATEGORIES= games gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/games/gnome-robots/Makefile b/games/gnome-robots/Makefile
index 5b46925d1811..afbd3b2d2a22 100644
--- a/games/gnome-robots/Makefile
+++ b/games/gnome-robots/Makefile
@@ -2,7 +2,7 @@ PORTNAME= gnome-robots
PORTVERSION= 40.0
PORTREVISION= 3
CATEGORIES= games gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/games/gnome-sudoku/Makefile b/games/gnome-sudoku/Makefile
index 9ccd3e6ff18c..a78a654ded94 100644
--- a/games/gnome-sudoku/Makefile
+++ b/games/gnome-sudoku/Makefile
@@ -2,7 +2,7 @@ PORTNAME= gnome-sudoku
PORTVERSION= 42.0
PORTREVISION= 3
CATEGORIES= games gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/games/lightsoff/Makefile b/games/lightsoff/Makefile
index 6118e1460f6a..cd7f83859084 100644
--- a/games/lightsoff/Makefile
+++ b/games/lightsoff/Makefile
@@ -2,7 +2,7 @@ PORTNAME= lightsoff
PORTVERSION= 40.0.1
PORTREVISION= 3
CATEGORIES= games gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/games/quadrapassel/Makefile b/games/quadrapassel/Makefile
index 6e6d27347cc7..60b8e5fc44c7 100644
--- a/games/quadrapassel/Makefile
+++ b/games/quadrapassel/Makefile
@@ -2,7 +2,7 @@ PORTNAME= quadrapassel
PORTVERSION= 40.2
PORTREVISION= 3
CATEGORIES= games gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/games/swell-foop/Makefile b/games/swell-foop/Makefile
index ae77f67aec37..4e40ad5eeb22 100644
--- a/games/swell-foop/Makefile
+++ b/games/swell-foop/Makefile
@@ -2,7 +2,7 @@ PORTNAME= swell-foop
PORTVERSION= 41.1
PORTREVISION= 2
CATEGORIES= games gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/games/tali/Makefile b/games/tali/Makefile
index 03b25823c36f..462e886d1e8c 100644
--- a/games/tali/Makefile
+++ b/games/tali/Makefile
@@ -2,7 +2,7 @@ PORTNAME= tali
PORTVERSION= 40.8
PORTREVISION= 3
CATEGORIES= games gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/graphics/eog-plugins/Makefile b/graphics/eog-plugins/Makefile
index 522c70cb266c..ba783e2fc7e5 100644
--- a/graphics/eog-plugins/Makefile
+++ b/graphics/eog-plugins/Makefile
@@ -2,7 +2,7 @@ PORTNAME= eog-plugins
DISTVERSION= 44.1
PORTREVISION= 1
CATEGORIES= graphics gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index 5729c7a23026..ba40f7aade61 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -1,7 +1,7 @@
PORTNAME= eog
DISTVERSION= 47.0
CATEGORIES= graphics gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile
index c98e32ff524a..b55f26b383d6 100644
--- a/graphics/evince/Makefile
+++ b/graphics/evince/Makefile
@@ -2,7 +2,7 @@ PORTNAME= evince
DISTVERSION= 46.3.1
PORTREVISION= 3
CATEGORIES= graphics print gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/graphics/libepoxy/Makefile b/graphics/libepoxy/Makefile
index 9640aa5740ba..eebacfaeb104 100644
--- a/graphics/libepoxy/Makefile
+++ b/graphics/libepoxy/Makefile
@@ -1,7 +1,7 @@
PORTNAME= libepoxy
DISTVERSION= 1.5.10
CATEGORIES= graphics
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES= GNOME
MAINTAINER= x11@FreeBSD.org
COMMENT= Library to handle OpenGL function pointer management
diff --git a/graphics/simple-scan/Makefile b/graphics/simple-scan/Makefile
index 07a9baeb7fc8..26183c1530d7 100644
--- a/graphics/simple-scan/Makefile
+++ b/graphics/simple-scan/Makefile
@@ -1,12 +1,12 @@
PORTNAME= simple-scan
PORTVERSION= 46.0
CATEGORIES= graphics gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Simple scanning utility
-WWW= https://gitlab.gnome.org/GNOME/simple-scan
+WWW= https://gitlab.gnome.org/GNOME
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
diff --git a/irc/polari/Makefile b/irc/polari/Makefile
index 6b86d8bd7081..02d5c522b698 100644
--- a/irc/polari/Makefile
+++ b/irc/polari/Makefile
@@ -2,7 +2,7 @@ PORTNAME= polari
PORTVERSION= 42.1
PORTREVISION= 3
CATEGORIES= irc gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/mail/geary/Makefile b/mail/geary/Makefile
index f38ceea54d5b..b2fa14a18b38 100644
--- a/mail/geary/Makefile
+++ b/mail/geary/Makefile
@@ -2,7 +2,7 @@ PORTNAME= geary
PORTVERSION= 40.0
PORTREVISION= 13
CATEGORIES= mail gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
PATCH_SITES= https://gitlab.gnome.org/GNOME/geary/-/commit/
diff --git a/math/gnome-calculator/Makefile b/math/gnome-calculator/Makefile
index e478fc945f70..369390a0bf4f 100644
--- a/math/gnome-calculator/Makefile
+++ b/math/gnome-calculator/Makefile
@@ -1,7 +1,7 @@
PORTNAME= gnome-calculator
PORTVERSION= 47.1
CATEGORIES= math gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/misc/gnome-devel-docs/Makefile b/misc/gnome-devel-docs/Makefile
index 1161f31822c3..14bb15d3f66a 100644
--- a/misc/gnome-devel-docs/Makefile
+++ b/misc/gnome-devel-docs/Makefile
@@ -1,7 +1,7 @@
PORTNAME= gnome-devel-docs
PORTVERSION= 40.3
CATEGORIES= misc gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/misc/gnome-user-docs/Makefile b/misc/gnome-user-docs/Makefile
index 6b710a07cc49..e13ab0ed1461 100644
--- a/misc/gnome-user-docs/Makefile
+++ b/misc/gnome-user-docs/Makefile
@@ -1,7 +1,7 @@
PORTNAME= gnome-user-docs
PORTVERSION= 42.0
CATEGORIES= misc gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/multimedia/cheese/Makefile b/multimedia/cheese/Makefile
index 8a09024e94fa..9cf945f8fd59 100644
--- a/multimedia/cheese/Makefile
+++ b/multimedia/cheese/Makefile
@@ -1,7 +1,7 @@
PORTNAME= cheese
PORTVERSION= 44.1
CATEGORIES= multimedia gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/multimedia/pitivi/Makefile b/multimedia/pitivi/Makefile
index 070cbd9bf999..e736c0268665 100644
--- a/multimedia/pitivi/Makefile
+++ b/multimedia/pitivi/Makefile
@@ -2,7 +2,7 @@ PORTNAME= pitivi
PORTVERSION= 2022.06
PORTREVISION= 4
CATEGORIES= multimedia
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES= GNOME
MAINTAINER= kwm@FreeBSD.org
COMMENT= Gstreamer based non-linear audio/video editor
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index d02a4593def4..db5ee37bdec0 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -2,7 +2,7 @@ PORTNAME= totem
PORTVERSION= 43.1
PORTREVISION= 1
CATEGORIES= multimedia gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/net/gnome-connections/Makefile b/net/gnome-connections/Makefile
index db189ce82ff1..bceb2b06d78c 100644
--- a/net/gnome-connections/Makefile
+++ b/net/gnome-connections/Makefile
@@ -2,7 +2,7 @@ PORTNAME= gnome-connections
PORTVERSION= 42.1.2
PORTREVISION= 3
CATEGORIES= net gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile
index 203ee2bfc8f6..92284b53a099 100644
--- a/net/gnome-nettool/Makefile
+++ b/net/gnome-nettool/Makefile
@@ -3,7 +3,7 @@ PORTVERSION= 42.0
PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= net gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org
diff --git a/net/libcloudproviders/Makefile b/net/libcloudproviders/Makefile
index e3f1b269712c..2e81762aaca3 100644
--- a/net/libcloudproviders/Makefile
+++ b/net/libcloudproviders/Makefile
@@ -1,7 +1,7 @@
PORTNAME= libcloudproviders
PORTVERSION= 0.3.6
CATEGORIES= net
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+.[0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index 0840389a8cc5..df8da5a36031 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -2,7 +2,7 @@ PORTNAME= gnome-keyring
PORTVERSION= 42.1
PORTREVISION= 6
CATEGORIES= security gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index f67800a5cd4c..86fdecd11037 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -2,7 +2,7 @@ PORTNAME= seahorse
PORTVERSION= 41.0
PORTREVISION= 3
CATEGORIES= security gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 5e5fb1cc44c1..295ef1d3c421 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -2,7 +2,7 @@ PORTNAME= gnome-control-center
PORTVERSION= 43.2
PORTREVISION= 6
CATEGORIES= sysutils gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile
index 19efe2c86607..c1b705cab9cc 100644
--- a/sysutils/gnome-settings-daemon/Makefile
+++ b/sysutils/gnome-settings-daemon/Makefile
@@ -2,7 +2,7 @@ PORTNAME= gnome-settings-daemon
PORTVERSION= 42.2
PORTREVISION= 9
CATEGORIES= sysutils gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
PATCH_SITES= https://gitlab.gnome.org/GNOME/${PORTNAME}/-/commit/
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 58202c80760e..e0b9524f128b 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -2,7 +2,7 @@ PORTNAME= gnome-system-monitor
PORTVERSION= 42.0
PORTREVISION= 1
CATEGORIES= sysutils gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/sysutils/localsearch/Makefile b/sysutils/localsearch/Makefile
index 71167c2c98d3..f6bbcd8fc890 100644
--- a/sysutils/localsearch/Makefile
+++ b/sysutils/localsearch/Makefile
@@ -2,7 +2,7 @@ PORTNAME= localsearch
PORTVERSION= 3.8.2
PORTREVISION= 2
CATEGORIES= sysutils
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+.[0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 2537d749d3ff..251af286f36d 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -2,7 +2,7 @@ PORTNAME= libxml2
DISTVERSION= 2.11.9
PORTREVISION?= 0
CATEGORIES?= textproc gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${DISTVERSION:R}/
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= desktop@FreeBSD.org
diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile
index ff4d2c528dd3..801171772c21 100644
--- a/textproc/libxslt/Makefile
+++ b/textproc/libxslt/Makefile
@@ -1,7 +1,7 @@
PORTNAME= libxslt
DISTVERSION= 1.1.43
CATEGORIES= textproc gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${DISTVERSION:R}/
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= desktop@FreeBSD.org
diff --git a/textproc/py-gi-docgen/Makefile b/textproc/py-gi-docgen/Makefile
index ddf511070113..2fef1a14cab2 100644
--- a/textproc/py-gi-docgen/Makefile
+++ b/textproc/py-gi-docgen/Makefile
@@ -2,7 +2,7 @@ PORTNAME= gi-docgen
PORTVERSION= 2024.1
PORTREVISION= 1
CATEGORIES= textproc python
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= desktop@FreeBSD.org
diff --git a/textproc/yelp-tools/Makefile b/textproc/yelp-tools/Makefile
index d57cb831dadc..05e2522a80a1 100644
--- a/textproc/yelp-tools/Makefile
+++ b/textproc/yelp-tools/Makefile
@@ -2,7 +2,7 @@ PORTNAME= yelp-tools
PORTVERSION= 42.0
PORTREVISION= 1
CATEGORIES= textproc gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 94c481a017ea..03fd643c7550 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -1,7 +1,7 @@
PORTNAME= epiphany
PORTVERSION= 47.3.1
CATEGORIES= www gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index c68c93fff5d5..5cbebb1ce477 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -1,7 +1,7 @@
PORTNAME= nautilus
PORTVERSION= 47.2
CATEGORIES= x11-fm gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-fm/sushi/Makefile b/x11-fm/sushi/Makefile
index 89bfc3882cb4..4c5dcbdada70 100644
--- a/x11-fm/sushi/Makefile
+++ b/x11-fm/sushi/Makefile
@@ -2,12 +2,12 @@ PORTNAME= sushi
PORTVERSION= 42.0
PORTREVISION= 5
CATEGORIES= x11-fm gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Tool similar to Gloobus Preview that provides quick file previews
-WWW= https://gitlab.gnome.org/GNOME/sushi
+WWW= https://gitlab.gnome.org/GNOME
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
diff --git a/x11-fonts/bitstream-vera/Makefile b/x11-fonts/bitstream-vera/Makefile
index 539861d48e62..e5ba53d798a8 100644
--- a/x11-fonts/bitstream-vera/Makefile
+++ b/x11-fonts/bitstream-vera/Makefile
@@ -2,7 +2,7 @@ PORTNAME= bitstream-vera
PORTVERSION= 1.10
PORTREVISION= 8
CATEGORIES= x11-fonts
-MASTER_SITES= GNOME/sources/ttf-${PORTNAME}/${PORTVERSION}
+MASTER_SITES= GNOME
DISTNAME= ttf-${PORTNAME}-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11-themes/gnome-backgrounds/Makefile b/x11-themes/gnome-backgrounds/Makefile
index 90bcf684ff83..f17cab63892d 100644
--- a/x11-themes/gnome-backgrounds/Makefile
+++ b/x11-themes/gnome-backgrounds/Makefile
@@ -2,7 +2,7 @@ PORTNAME= gnome-backgrounds
PORTVERSION= 43
PORTREVISION= 1
CATEGORIES= x11-themes graphics gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile
index f33ebab30d25..fafa49d11506 100644
--- a/x11-themes/gtk-engines2/Makefile
+++ b/x11-themes/gtk-engines2/Makefile
@@ -2,7 +2,7 @@ PORTNAME= gtk-engines2
PORTVERSION= 2.20.2
PORTREVISION= 4
CATEGORIES= x11-themes
-MASTER_SITES= GNOME/sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES= GNOME
DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/gnome-pty-helper/Makefile b/x11-toolkits/gnome-pty-helper/Makefile
index 4f5d2ec34d93..c9e7348f71a0 100644
--- a/x11-toolkits/gnome-pty-helper/Makefile
+++ b/x11-toolkits/gnome-pty-helper/Makefile
@@ -1,7 +1,7 @@
PORTNAME= gnome-pty-helper
PORTVERSION= 0.40.2
CATEGORIES= x11-toolkits gnome
-MASTER_SITES= GNOME/sources/vte/${PORTVERSION:R}
+MASTER_SITES= GNOME
DISTNAME= vte-${PORTVERSION}
DIST_SUBDIR= gnome
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 2755ce62de03..33d6299d54d8 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -2,7 +2,7 @@ PORTNAME= gtk
PORTVERSION= 2.24.33 # sync with graphics/gtk-update-icon-cache
PORTREVISION= 1
CATEGORIES= x11-toolkits
-MASTER_SITES= GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES= GNOME
PKGNAMESUFFIX= 2
DISTNAME= gtk+-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index ccdf46907b3c..699df6c9cb80 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -1,7 +1,7 @@
PORTNAME= gtk
DISTVERSION= 3.24.49 # sync with x11-themes: adwaita-icon-theme, gnome-themes-standard and mate-themes
CATEGORIES= x11-toolkits
-MASTER_SITES= GNOME/sources/gtk/${DISTVERSION:R}
+MASTER_SITES= GNOME
PKGNAMESUFFIX= 3
DIST_SUBDIR= gnome
diff --git a/x11-toolkits/gtksourceview2/Makefile b/x11-toolkits/gtksourceview2/Makefile
index c125b63cb0b2..534f24ab2f4b 100644
--- a/x11-toolkits/gtksourceview2/Makefile
+++ b/x11-toolkits/gtksourceview2/Makefile
@@ -2,7 +2,7 @@ PORTNAME= gtksourceview2
DISTVERSION= 2.10.5
PORTREVISION= 9
CATEGORIES= x11-toolkits gnome
-MASTER_SITES= GNOME/sources/${PORTNAME:S/2$//}/${DISTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES= GNOME
DISTNAME= ${PORTNAME:S/2$//}-${DISTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/libwnck3/Makefile b/x11-toolkits/libwnck3/Makefile
index 6048deb06a9e..c45774006435 100644
--- a/x11-toolkits/libwnck3/Makefile
+++ b/x11-toolkits/libwnck3/Makefile
@@ -1,7 +1,7 @@
PORTNAME= libwnck
PORTVERSION= 43.2
CATEGORIES= x11-toolkits gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
PKGNAMESUFFIX= 3
DIST_SUBDIR= gnome
diff --git a/x11-toolkits/unique/Makefile b/x11-toolkits/unique/Makefile
index 7eeee83a9710..a6597e396269 100644
--- a/x11-toolkits/unique/Makefile
+++ b/x11-toolkits/unique/Makefile
@@ -2,7 +2,7 @@ PORTNAME= unique
PORTVERSION= 1.1.6
PORTREVISION= 8
CATEGORIES= x11-toolkits
-MASTER_SITES= GNOME/sources/lib${PORTNAME}/${PORTVERSION:R}/
+MASTER_SITES= GNOME
DISTNAME= lib${PORTNAME}-${PORTVERSION}
MAINTAINER= kwm@FreeBSD.org
diff --git a/x11-wm/mutter/Makefile b/x11-wm/mutter/Makefile
index c78ee2fa52bb..607056c0c68e 100644
--- a/x11-wm/mutter/Makefile
+++ b/x11-wm/mutter/Makefile
@@ -2,7 +2,7 @@ PORTNAME= mutter
PORTVERSION= 42.4
PORTREVISION= 4
CATEGORIES= x11-wm
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 233557d90839..24bd485364b5 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -2,7 +2,7 @@ PORTNAME= gdm
PORTVERSION= 42.0
PORTREVISION= 7
CATEGORIES= x11 gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11/gnome-console/Makefile b/x11/gnome-console/Makefile
index dfff420931be..e34e115f5047 100644
--- a/x11/gnome-console/Makefile
+++ b/x11/gnome-console/Makefile
@@ -2,7 +2,7 @@ PORTNAME= gnome-console
PORTVERSION= 43.0
PORTREVISION= 5
CATEGORIES= x11 gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 0c83c9c95688..7e19cd7098a9 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -1,7 +1,7 @@
PORTNAME= gnome-desktop
PORTVERSION= 44.1
CATEGORIES= x11 gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 3133b49b92d3..ffa5ef43eeff 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -2,7 +2,7 @@ PORTNAME= gnome-session
PORTVERSION= 42.0
PORTREVISION= 4
CATEGORIES= x11 gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11/gnome-shell-extensions/Makefile b/x11/gnome-shell-extensions/Makefile
index 6441f33eb90c..6c863eb15070 100644
--- a/x11/gnome-shell-extensions/Makefile
+++ b/x11/gnome-shell-extensions/Makefile
@@ -2,7 +2,7 @@ PORTNAME= gnome-shell-extensions
PORTVERSION= 42.3
PORTREVISION= 3
CATEGORIES= x11 gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11/gnome-shell/Makefile b/x11/gnome-shell/Makefile
index f1cd77cb715a..63bc1e9418be 100644
--- a/x11/gnome-shell/Makefile
+++ b/x11/gnome-shell/Makefile
@@ -2,7 +2,7 @@ PORTNAME= gnome-shell
PORTVERSION= 42.4
PORTREVISION= 14
CATEGORIES= x11 gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11/xdg-desktop-portal-gnome/Makefile b/x11/xdg-desktop-portal-gnome/Makefile
index 333af90e3f5f..a0f472f990c8 100644
--- a/x11/xdg-desktop-portal-gnome/Makefile
+++ b/x11/xdg-desktop-portal-gnome/Makefile
@@ -1,7 +1,7 @@
PORTNAME= xdg-desktop-portal-gnome
DISTVERSION= 43.1
CATEGORIES= x11 gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= tagattie@FreeBSD.org
diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index 4f7173672b54..29e83ff5415d 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -2,7 +2,7 @@ PORTNAME= yelp
DISTVERSION= 42.1
PORTREVISION= 4
CATEGORIES= x11 gnome
-MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org