diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk --- a/Mk/bsd.sites.mk +++ b/Mk/bsd.sites.mk @@ -580,17 +580,28 @@ .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 @@ 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 --- a/accessibility/orca/Makefile +++ b/accessibility/orca/Makefile @@ -2,7 +2,7 @@ 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 --- 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 --- a/archivers/file-roller/Makefile +++ b/archivers/file-roller/Makefile @@ -2,7 +2,7 @@ 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 --- 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 --- a/audio/libaudiofile/Makefile +++ b/audio/libaudiofile/Makefile @@ -2,7 +2,7 @@ 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 --- a/deskutils/baobab/Makefile +++ b/deskutils/baobab/Makefile @@ -2,7 +2,7 @@ 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 --- a/deskutils/bijiben/Makefile +++ b/deskutils/bijiben/Makefile @@ -2,7 +2,7 @@ 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 --- 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 --- a/deskutils/gnome-characters/Makefile +++ b/deskutils/gnome-characters/Makefile @@ -2,7 +2,7 @@ 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 --- a/deskutils/gnome-clocks/Makefile +++ b/deskutils/gnome-clocks/Makefile @@ -2,7 +2,7 @@ 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 --- a/deskutils/gnome-contacts/Makefile +++ b/deskutils/gnome-contacts/Makefile @@ -2,7 +2,7 @@ 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 --- a/deskutils/gnome-dictionary/Makefile +++ b/deskutils/gnome-dictionary/Makefile @@ -2,7 +2,7 @@ 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 --- 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 --- a/deskutils/gnome-initial-setup/Makefile +++ b/deskutils/gnome-initial-setup/Makefile @@ -2,7 +2,7 @@ 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 --- 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 --- a/deskutils/gnome-photos/Makefile +++ b/deskutils/gnome-photos/Makefile @@ -2,7 +2,7 @@ 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 --- a/deskutils/gnome-screenshot/Makefile +++ b/deskutils/gnome-screenshot/Makefile @@ -2,7 +2,7 @@ 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 --- a/deskutils/gnome-sound-recorder/Makefile +++ b/deskutils/gnome-sound-recorder/Makefile @@ -2,7 +2,7 @@ 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 --- a/deskutils/gnome-todo/Makefile +++ b/deskutils/gnome-todo/Makefile @@ -2,7 +2,7 @@ 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 --- a/deskutils/gnome-tweaks/Makefile +++ b/deskutils/gnome-tweaks/Makefile @@ -2,7 +2,7 @@ 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 --- a/deskutils/gnome-weather/Makefile +++ b/deskutils/gnome-weather/Makefile @@ -2,7 +2,7 @@ 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 --- a/deskutils/gnote/Makefile +++ b/deskutils/gnote/Makefile @@ -2,7 +2,7 @@ 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 --- 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 --- a/devel/devhelp/Makefile +++ b/devel/devhelp/Makefile @@ -2,7 +2,7 @@ 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 --- a/devel/gconf2/Makefile +++ b/devel/gconf2/Makefile @@ -2,7 +2,7 @@ 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 --- a/devel/gnome-builder/Makefile +++ b/devel/gnome-builder/Makefile @@ -2,7 +2,7 @@ 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 --- a/devel/gsettings-desktop-schemas/Makefile +++ b/devel/gsettings-desktop-schemas/Makefile @@ -2,7 +2,7 @@ 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 --- a/devel/gtranslator/Makefile +++ b/devel/gtranslator/Makefile @@ -2,7 +2,7 @@ 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 --- a/devel/libglade2/Makefile +++ b/devel/libglade2/Makefile @@ -2,7 +2,7 @@ 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 --- a/devel/libunicode/Makefile +++ b/devel/libunicode/Makefile @@ -2,7 +2,7 @@ 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 --- a/devel/py-pygobject/Makefile +++ b/devel/py-pygobject/Makefile @@ -2,7 +2,7 @@ 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 --- a/devel/tinysparql/Makefile +++ b/devel/tinysparql/Makefile @@ -2,7 +2,7 @@ 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 --- a/editors/gedit-plugins/Makefile +++ b/editors/gedit-plugins/Makefile @@ -2,7 +2,7 @@ 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 --- a/editors/gedit/Makefile +++ b/editors/gedit/Makefile @@ -2,7 +2,7 @@ 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 --- 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 --- a/editors/gnome-text-editor/Makefile +++ b/editors/gnome-text-editor/Makefile @@ -2,7 +2,7 @@ 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 --- a/games/gnome-chess/Makefile +++ b/games/gnome-chess/Makefile @@ -2,7 +2,7 @@ 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 --- a/games/gnome-mines/Makefile +++ b/games/gnome-mines/Makefile @@ -2,7 +2,7 @@ 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 --- a/games/gnome-robots/Makefile +++ b/games/gnome-robots/Makefile @@ -2,7 +2,7 @@ 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 --- a/games/gnome-sudoku/Makefile +++ b/games/gnome-sudoku/Makefile @@ -2,7 +2,7 @@ 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 --- a/games/lightsoff/Makefile +++ b/games/lightsoff/Makefile @@ -2,7 +2,7 @@ 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 --- a/games/quadrapassel/Makefile +++ b/games/quadrapassel/Makefile @@ -2,7 +2,7 @@ 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 --- a/games/swell-foop/Makefile +++ b/games/swell-foop/Makefile @@ -2,7 +2,7 @@ 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 --- a/games/tali/Makefile +++ b/games/tali/Makefile @@ -2,7 +2,7 @@ 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 --- a/graphics/eog-plugins/Makefile +++ b/graphics/eog-plugins/Makefile @@ -2,7 +2,7 @@ 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 --- 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 --- a/graphics/evince/Makefile +++ b/graphics/evince/Makefile @@ -2,7 +2,7 @@ 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 --- 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 --- 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 --- a/irc/polari/Makefile +++ b/irc/polari/Makefile @@ -2,7 +2,7 @@ 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 --- a/mail/geary/Makefile +++ b/mail/geary/Makefile @@ -2,7 +2,7 @@ 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 --- 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 --- 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 --- 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 --- 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 --- a/multimedia/pitivi/Makefile +++ b/multimedia/pitivi/Makefile @@ -2,7 +2,7 @@ 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 --- a/multimedia/totem/Makefile +++ b/multimedia/totem/Makefile @@ -2,7 +2,7 @@ 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 --- a/net/gnome-connections/Makefile +++ b/net/gnome-connections/Makefile @@ -2,7 +2,7 @@ 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 --- a/net/gnome-nettool/Makefile +++ b/net/gnome-nettool/Makefile @@ -3,7 +3,7 @@ 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 --- 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 --- a/security/gnome-keyring/Makefile +++ b/security/gnome-keyring/Makefile @@ -2,7 +2,7 @@ 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 --- a/security/seahorse/Makefile +++ b/security/seahorse/Makefile @@ -2,7 +2,7 @@ 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 --- a/sysutils/gnome-control-center/Makefile +++ b/sysutils/gnome-control-center/Makefile @@ -2,7 +2,7 @@ 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 --- a/sysutils/gnome-settings-daemon/Makefile +++ b/sysutils/gnome-settings-daemon/Makefile @@ -2,7 +2,7 @@ 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 --- a/sysutils/gnome-system-monitor/Makefile +++ b/sysutils/gnome-system-monitor/Makefile @@ -2,7 +2,7 @@ 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 --- a/sysutils/localsearch/Makefile +++ b/sysutils/localsearch/Makefile @@ -2,7 +2,7 @@ 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 --- a/textproc/libxml2/Makefile +++ b/textproc/libxml2/Makefile @@ -2,7 +2,7 @@ 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 --- 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 --- a/textproc/py-gi-docgen/Makefile +++ b/textproc/py-gi-docgen/Makefile @@ -2,7 +2,7 @@ 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 --- a/textproc/yelp-tools/Makefile +++ b/textproc/yelp-tools/Makefile @@ -2,7 +2,7 @@ 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 --- 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 --- 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 --- a/x11-fm/sushi/Makefile +++ b/x11-fm/sushi/Makefile @@ -2,12 +2,12 @@ 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 --- a/x11-fonts/bitstream-vera/Makefile +++ b/x11-fonts/bitstream-vera/Makefile @@ -2,7 +2,7 @@ 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 --- a/x11-themes/gnome-backgrounds/Makefile +++ b/x11-themes/gnome-backgrounds/Makefile @@ -2,7 +2,7 @@ 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 --- a/x11-themes/gtk-engines2/Makefile +++ b/x11-themes/gtk-engines2/Makefile @@ -2,7 +2,7 @@ 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 --- 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 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -2,7 +2,7 @@ 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 --- 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 --- a/x11-toolkits/gtksourceview2/Makefile +++ b/x11-toolkits/gtksourceview2/Makefile @@ -2,7 +2,7 @@ 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 --- 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 --- a/x11-toolkits/unique/Makefile +++ b/x11-toolkits/unique/Makefile @@ -2,7 +2,7 @@ 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 --- a/x11-wm/mutter/Makefile +++ b/x11-wm/mutter/Makefile @@ -2,7 +2,7 @@ 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 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -2,7 +2,7 @@ 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 --- a/x11/gnome-console/Makefile +++ b/x11/gnome-console/Makefile @@ -2,7 +2,7 @@ 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 --- 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 --- a/x11/gnome-session/Makefile +++ b/x11/gnome-session/Makefile @@ -2,7 +2,7 @@ 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 --- a/x11/gnome-shell-extensions/Makefile +++ b/x11/gnome-shell-extensions/Makefile @@ -2,7 +2,7 @@ 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 --- a/x11/gnome-shell/Makefile +++ b/x11/gnome-shell/Makefile @@ -2,7 +2,7 @@ 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 --- 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 --- a/x11/yelp/Makefile +++ b/x11/yelp/Makefile @@ -2,7 +2,7 @@ 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