MASTER_SITES -> SITES

100 files changed, 102 insertions, 102 deletions

diff --git a/fonts/dejavu-fonts/Makefile b/fonts/dejavu-fonts/Makefile
index bd9ca6f..d345d1a 100644
--- a/fonts/dejavu-fonts/Makefile
+++ b/fonts/dejavu-fonts/Makefile
@@ -17,7 +17,7 @@ MAINTAINER =	xenocara@openbsd.org
 # https://github.com/dejavu-fonts/dejavu-fonts/blob/master/LICENSE
 PERMIT_PACKAGE =	Yes
 
-SITES =		${SITE_SOURCEFORGE:=dejavu/2.37/}
+SITES =			${SITE_SOURCEFORGE:=dejavu/2.37/}
 
 MODULES = 	xenocara
 
diff --git a/fonts/font-adobe-100dpi/Makefile b/fonts/font-adobe-100dpi/Makefile
index 4abc96f..738aa1e 100644
--- a/fonts/font-adobe-100dpi/Makefile
+++ b/fonts/font-adobe-100dpi/Makefile
@@ -15,7 +15,7 @@ MAINTAINER =	xenocara@openbsd.org
 # MIT
 PERMIT_PACKAGE =	Yes
 
-MASTER_SITES =		${MASTER_SITE_XORG:=font/}
+SITES =			${SITE_XORG:=font/}
 
 MODULES = 		xenocara
 
diff --git a/fonts/font-adobe-75dpi/Makefile b/fonts/font-adobe-75dpi/Makefile
index 6557f25..c664325 100644
--- a/fonts/font-adobe-75dpi/Makefile
+++ b/fonts/font-adobe-75dpi/Makefile
@@ -15,7 +15,7 @@ MAINTAINER =	xenocara@openbsd.org
 # MIT
 PERMIT_PACKAGE =	Yes
 
-MASTER_SITES =		${MASTER_SITE_XORG:=font/}
+SITES =			${SITE_XORG:=font/}
 
 MODULES = 		xenocara
 
diff --git a/fonts/font-adobe-utopia-100dpi/Makefile b/fonts/font-adobe-utopia-100dpi/Makefile
index 5e6853e..8fa7351 100644
--- a/fonts/font-adobe-utopia-100dpi/Makefile
+++ b/fonts/font-adobe-utopia-100dpi/Makefile
@@ -15,7 +15,7 @@ MAINTAINER =	xenocara@openbsd.org
 # MIT
 PERMIT_PACKAGE =	Yes
 
-MASTER_SITES =		${MASTER_SITE_XORG:=font/}
+SITES =			${SITE_XORG:=font/}
 
 MODULES = 		xenocara
 
diff --git a/fonts/font-adobe-utopia-75dpi/Makefile b/fonts/font-adobe-utopia-75dpi/Makefile
index 332ca69..4713c2f 100644
--- a/fonts/font-adobe-utopia-75dpi/Makefile
+++ b/fonts/font-adobe-utopia-75dpi/Makefile
@@ -15,7 +15,7 @@ MAINTAINER =	xenocara@openbsd.org
 # MIT
 PERMIT_PACKAGE =	Yes
 
-MASTER_SITES =		${MASTER_SITE_XORG:=font/}
+SITES =			${SITE_XORG:=font/}
 
 MODULES = 		xenocara
 
diff --git a/fonts/font-adobe-utopia-type1/Makefile b/fonts/font-adobe-utopia-type1/Makefile
index fd3211a..75f41cd 100644
--- a/fonts/font-adobe-utopia-type1/Makefile
+++ b/fonts/font-adobe-utopia-type1/Makefile
@@ -14,7 +14,7 @@ MAINTAINER =	xenocara@openbsd.org
 # MIT
 PERMIT_PACKAGE =	Yes
 
-MASTER_SITES =		${MASTER_SITE_XORG:=font/}
+SITES =			${SITE_XORG:=font/}
 
 MODULES = 		xenocara
 
diff --git a/fonts/font-arabic-misc/Makefile b/fonts/font-arabic-misc/Makefile
index 5efd043..2e03e7c 100644
--- a/fonts/font-arabic-misc/Makefile
+++ b/fonts/font-arabic-misc/Makefile
@@ -14,7 +14,7 @@ MAINTAINER =	xenocara@openbsd.org
 # MIT
 PERMIT_PACKAGE =	Yes
 
-MASTER_SITES =		${MASTER_SITE_XORG:=font/}
+SITES =			${SITE_XORG:=font/}
 
 MODULES = 		xenocara
 
diff --git a/fonts/font-bh-100dpi/Makefile b/fonts/font-bh-100dpi/Makefile
index 48ac16f..a10d403 100644
--- a/fonts/font-bh-100dpi/Makefile
+++ b/fonts/font-bh-100dpi/Makefile
@@ -15,7 +15,7 @@ MAINTAINER =	xenocara@openbsd.org
 # MIT
 PERMIT_PACKAGE =	Yes
 
-MASTER_SITES =		${MASTER_SITE_XORG:=font/}
+SITES =			${SITE_XORG:=font/}
 
 MODULES = 		xenocara
 
diff --git a/fonts/font-bh-75dpi/Makefile b/fonts/font-bh-75dpi/Makefile
index 9c2526a..7bbd40f 100644
--- a/fonts/font-bh-75dpi/Makefile
+++ b/fonts/font-bh-75dpi/Makefile
@@ -15,7 +15,7 @@ MAINTAINER =	xenocara@openbsd.org
 # MIT
 PERMIT_PACKAGE =	Yes
 
-MASTER_SITES =		${MASTER_SITE_XORG:=font/}
+SITES =			${SITE_XORG:=font/}
 
 MODULES = 		xenocara
 
diff --git a/fonts/font-bh-lucidatypewriter-100/Makefile b/fonts/font-bh-lucidatypewriter-100/Makefile
index 1bfc0af..9633fc5 100644
--- a/fonts/font-bh-lucidatypewriter-100/Makefile
+++ b/fonts/font-bh-lucidatypewriter-100/Makefile
@@ -15,7 +15,7 @@ MAINTAINER =	xenocara@openbsd.org
 # MIT
 PERMIT_PACKAGE =	Yes
 
-MASTER_SITES =		${MASTER_SITE_XORG:=font/}
+SITES =			${SITE_XORG:=font/}
 
 MODULES = 		xenocara
 
diff --git a/fonts/font-bh-lucidatypewriter-75/Makefile b/fonts/font-bh-lucidatypewriter-75/Makefile
index f395824..773b7ed 100644
--- a/fonts/font-bh-lucidatypewriter-75/Makefile
+++ b/fonts/font-bh-lucidatypewriter-75/Makefile
@@ -15,7 +15,7 @@ MAINTAINER =	xenocara@openbsd.org
 # MIT
 PERMIT_PACKAGE =	Yes
 
-MASTER_SITES =		${MASTER_SITE_XORG:=font/}
+SITES =			${SITE_XORG:=font/}
 
 MODULES = 		xenocara
 
diff --git a/fonts/font-cursor-misc/Makefile b/fonts/font-cursor-misc/Makefile
index 205166f..3fd4401 100644
--- a/fonts/font-cursor-misc/Makefile
+++ b/fonts/font-cursor-misc/Makefile
@@ -14,7 +14,7 @@ MAINTAINER =	xenocara@openbsd.org
 # MIT
 PERMIT_PACKAGE =	Yes
 
-MASTER_SITES =		${MASTER_SITE_XORG:=font/}
+SITES =			${SITE_XORG:=font/}
 
 MODULES = 		xenocara
 
diff --git a/fonts/font-xfree86-type1/Makefile b/fonts/font-xfree86-type1/Makefile
index 6e8dbdc..7e3a0c9 100644
--- a/fonts/font-xfree86-type1/Makefile
+++ b/fonts/font-xfree86-type1/Makefile
@@ -14,7 +14,7 @@ MAINTAINER =	xenocara@openbsd.org
 # MIT
 PERMIT_PACKAGE =	Yes
 
-MASTER_SITES =		${MASTER_SITE_XORG:=font/}
+SITES =			${SITE_XORG:=font/}
 
 MODULES = 		xenocara
 
diff --git a/fonts/xfonts-alias/Makefile b/fonts/xfonts-alias/Makefile
index 7787502..423d62f 100644
--- a/fonts/xfonts-alias/Makefile
+++ b/fonts/xfonts-alias/Makefile
@@ -15,7 +15,7 @@ MAINTAINER =	xenocara@openbsd.org
 # MIT
 PERMIT_PACKAGE =	Yes
 
-MASTER_SITES =		${MASTER_SITE_XORG:=font/}
+SITES =			${SITE_XORG:=font/}
 
 MODULES = 		xenocara
 
diff --git a/fonts/xfonts-encodings/Makefile b/fonts/xfonts-encodings/Makefile
index 36187d2..19db0dc 100644
--- a/fonts/xfonts-encodings/Makefile
+++ b/fonts/xfonts-encodings/Makefile
@@ -15,7 +15,7 @@ MAINTAINER =	xenocara@openbsd.org
 # MIT
 PERMIT_PACKAGE =	Yes
 
-MASTER_SITES =		${MASTER_SITE_XORG:=font/}
+SITES =			${SITE_XORG:=font/}
 
 MODULES = 		xenocara
 
diff --git a/fonts/xorg-font-util/Makefile b/fonts/xorg-font-util/Makefile
index 06fc1c3..e258045 100644
--- a/fonts/xorg-font-util/Makefile
+++ b/fonts/xorg-font-util/Makefile
@@ -12,7 +12,7 @@ MAINTAINER =	xenocara@openbsd.org
 # MIT
 PERMIT_PACKAGE =	Yes
 
-MASTER_SITES =		${MASTER_SITE_XORG:=font/}
+SITES =			${SITE_XORG:=font/}
 
 MODULES = 		xenocara
 
diff --git a/graphics/libGLU/Makefile b/graphics/libGLU/Makefile
index 39bb872..596f0bc 100644
--- a/graphics/libGLU/Makefile
+++ b/graphics/libGLU/Makefile
@@ -10,7 +10,7 @@ CATEGORIES =	graphics
 
 HOMEPAGE =	https://gitlab.freedesktop.org/mesa/glu
 
-MASTER_SITES =  https://archive.mesa3d.org//glu/
+SITES =		https://archive.mesa3d.org//glu/
 
 MAINTAINER =	xenocara@openbsd.org
 
diff --git a/graphics/mesa-demos/Makefile b/graphics/mesa-demos/Makefile
index b880aee..3231c49 100644
--- a/graphics/mesa-demos/Makefile
+++ b/graphics/mesa-demos/Makefile
@@ -14,9 +14,9 @@ PERMIT_PACKAGE = Yes
 
 WANTLIB = GL GLU OSMesa glut X11 Xext c m pthread
 
-MODULES = devel/meson  xenocara
+MODULES =	devel/meson xenocara
 
-MASTER_SITES =          https://archive.mesa3d.org//demos/${V}/
+SITES =		https://archive.mesa3d.org//demos/${V}/
 
 EXTRACT_SUFX = .tar.gz
 
diff --git a/graphics/mesa/Makefile b/graphics/mesa/Makefile
index 40ada40..58c1463 100644
--- a/graphics/mesa/Makefile
+++ b/graphics/mesa/Makefile
@@ -29,7 +29,7 @@ WANTLIB =		drm drm_radeon m pthread z expat \
 			Xxf86vm c++ c++abi LLVM elf xcb-randr drm_amdgpu \
 			zstd 
 
-MASTER_SITES =		https://mesa.freedesktop.org/archive/
+SITES =			https://mesa.freedesktop.org/archive/
 EXTRACT_SUFX =		.tar.xz
 
 BUILD_DEPENDS =		sysutils/libdrm \
diff --git a/graphics/pixman/Makefile b/graphics/pixman/Makefile
index f0ab0f4..d9cd595 100644
--- a/graphics/pixman/Makefile
+++ b/graphics/pixman/Makefile
@@ -15,7 +15,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		m pthread
 
-MASTER_SITES =		https://cairographics.org/releases/
+SITES =			https://cairographics.org/releases/
 
 MODULES =		xenocara
 
diff --git a/print/freetype2/Makefile b/print/freetype2/Makefile
index 1dfc034..310f7d6 100644
--- a/print/freetype2/Makefile
+++ b/print/freetype2/Makefile
@@ -16,8 +16,8 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		pthread z
 
-MASTER_SITES =		https://download.savannah.gnu.org/releases/freetype/
-MASTER_SITES +=		${MASTER_SITE_SOURCEFORGE:=freetype/}
+SITES =			https://download.savannah.gnu.org/releases/freetype/
+SITES +=		${SITE_SOURCEFORGE:=freetype/}
 
 EXTRACT_SUFX =		.tar.xz
 
diff --git a/sysutils/libdrm/Makefile b/sysutils/libdrm/Makefile
index c96b661..c91c8c8 100644
--- a/sysutils/libdrm/Makefile
+++ b/sysutils/libdrm/Makefile
@@ -21,7 +21,7 @@ MODULES =		devel/meson xenocara
 
 WANTLIB	= 		pciaccess
 
-MASTER_SITES =		https://dri.freedesktop.org/libdrm/
+SITES =			https://dri.freedesktop.org/libdrm/
 
 BUILD_DEPENDS =		graphics/cairo \
 			textproc/py-docutils
diff --git a/sysutils/libpciaccess/Makefile b/sysutils/libpciaccess/Makefile
index 331641b..f5841dd 100644
--- a/sysutils/libpciaccess/Makefile
+++ b/sysutils/libpciaccess/Makefile
@@ -17,7 +17,7 @@ PERMIT_PACKAGE =	Yes
 # "make port-lib-depends-check" can help
 #WANTLIB =		???
 
-MASTER_SITES =		${MASTER_SITE_XORG:=lib/}
+SITES =			${SITE_XORG:=lib/}
 
 MODULES = 		xenocara
 
diff --git a/sysutils/sessreg/Makefile b/sysutils/sessreg/Makefile
index 2ed908d..24234ad 100644
--- a/sysutils/sessreg/Makefile
+++ b/sysutils/sessreg/Makefile
@@ -12,7 +12,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		c
 
-MASTER_SITES =		${MASTER_SITE_XORG:=app/}
+SITES =			${SITE_XORG:=app/}
 
 MODULES = 		xenocara
 
diff --git a/x11/bdftopcf/Makefile b/x11/bdftopcf/Makefile
index 5d9aeab..e393b83 100644
--- a/x11/bdftopcf/Makefile
+++ b/x11/bdftopcf/Makefile
@@ -12,7 +12,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		c
 
-MASTER_SITES =		${MASTER_SITE_XORG:=util/}
+SITES =			${SITE_XORG:=util/}
 
 MODULES =		xenocara
 
diff --git a/x11/cwm/Makefile b/x11/cwm/Makefile
index e284f5e..7551af8 100644
--- a/x11/cwm/Makefile
+++ b/x11/cwm/Makefile
@@ -14,7 +14,7 @@ PERMIT_PACKAGE =	Yes
 WANTLIB =		ICE X11 Xaw7 Xext Xft Xinerama Xmu Xpm Xt \
 			c curses fontconfig freetype util
 
-MASTER_SITES =		https://leahneukirchen.org/releases/
+SITES =			https://leahneukirchen.org/releases/
 
 MODULES =		xenocara
 
diff --git a/x11/editres/Makefile b/x11/editres/Makefile
index b804345..b81516d 100644
--- a/x11/editres/Makefile
+++ b/x11/editres/Makefile
@@ -13,7 +13,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		Xaw7 Xmu Xt X11 c
 
-MASTER_SITES =		${MASTER_SITE_XORG:=app/}
+SITES =			${SITE_XORG:=app/}
 
 MODULES =		xenocara
 
diff --git a/x11/fontconfig/Makefile b/x11/fontconfig/Makefile
index b2e804c..2dcf9d9 100644
--- a/x11/fontconfig/Makefile
+++ b/x11/fontconfig/Makefile
@@ -14,7 +14,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		expat freetype c
 
-MASTER_SITES =		http://fontconfig.org/release/
+SITES =			http://fontconfig.org/release/
 
 EXTRACT_SUFX =		.tar.gz
 
diff --git a/x11/fonttosfnt/Makefile b/x11/fonttosfnt/Makefile
index 535052e..d72e31b 100644
--- a/x11/fonttosfnt/Makefile
+++ b/x11/fonttosfnt/Makefile
@@ -12,7 +12,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		fontenc freetype c m
 
-MASTER_SITES =		${MASTER_SITE_XORG:=app/}
+SITES =			${SITE_XORG:=app/}
 
 MODULES =		xenocara
 
diff --git a/x11/fvwm-obsd/Makefile b/x11/fvwm-obsd/Makefile
index d35e726..1a3a35d 100644
--- a/x11/fvwm-obsd/Makefile
+++ b/x11/fvwm-obsd/Makefile
@@ -13,7 +13,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		ICE SM X11 Xau  Xdmcp Xext Xpm Xt xcb c 
 
-MASTER_SITES =		https://xenocara.org/distfiles/app/
+SITES =			https://xenocara.org/distfiles/app/
 
 MODULES =		xenocara
 
diff --git a/x11/iceauth/Makefile b/x11/iceauth/Makefile
index d38f414..8b6967c 100644
--- a/x11/iceauth/Makefile
+++ b/x11/iceauth/Makefile
@@ -12,7 +12,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		ICE c
 
-MASTER_SITES =		${MASTER_SITE_XORG:=app/}
+SITES =			${SITE_XORG:=app/}
 
 MODULES =		xenocara
 
diff --git a/x11/libICE/Makefile b/x11/libICE/Makefile
index 9550cf6..9485b02 100644
--- a/x11/libICE/Makefile
+++ b/x11/libICE/Makefile
@@ -12,7 +12,7 @@ SHARED_LIBS=    ICE 11.0
 # MIT
 PERMIT_PACKAGE =	Yes
 
-MASTER_SITES =		${MASTER_SITE_XORG:=lib/}
+SITES =			${SITE_XORG:=lib/}
 
 MODULES =		xenocara
 
diff --git a/x11/libSM/Makefile b/x11/libSM/Makefile
index be76c48..91a66e0 100644
--- a/x11/libSM/Makefile
+++ b/x11/libSM/Makefile
@@ -14,7 +14,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		ICE
 
-MASTER_SITES =		${MASTER_SITE_XORG:=lib/}
+SITES =			${SITE_XORG:=lib/}
 
 MODULES =		xenocara
 
diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index af35a77..53a70fb 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -14,7 +14,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		Xau Xdmcp xcb pthread
 
-MASTER_SITES =		${MASTER_SITE_XORG:=lib/}
+SITES =			${SITE_XORG:=lib/}
 
 MODULES =		xenocara
 
diff --git a/x11/libXScrnSaver/Makefile b/x11/libXScrnSaver/Makefile
index 2502b97..7247719 100644
--- a/x11/libXScrnSaver/Makefile
+++ b/x11/libXScrnSaver/Makefile
@@ -14,7 +14,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		X11 Xau Xdmcp Xext xcb
 
-MASTER_SITES =		${MASTER_SITE_XORG:=lib/}
+SITES =			${SITE_XORG:=lib/}
 
 MODULES =		xenocara
 
diff --git a/x11/libXau/Makefile b/x11/libXau/Makefile
index 5359ef0..cd93c12 100644
--- a/x11/libXau/Makefile
+++ b/x11/libXau/Makefile
@@ -14,7 +14,7 @@ PERMIT_PACKAGE =	Yes
 
 #WANTLIB =		???
 
-MASTER_SITES =		${MASTER_SITE_XORG:=lib/}
+SITES =			${SITE_XORG:=lib/}
 
 MODULES =		xenocara
 
diff --git a/x11/libXaw/Makefile b/x11/libXaw/Makefile
index b5682c3..c3cf812 100644
--- a/x11/libXaw/Makefile
+++ b/x11/libXaw/Makefile
@@ -14,7 +14,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		Xt ICE SM X11 Xau Xdmcp Xext Xmu Xpm X11 xcb pthread
 
-MASTER_SITES =		${MASTER_SITE_XORG:=lib/}
+SITES =			${SITE_XORG:=lib/}
 
 MODULES =		xenocara
 
diff --git a/x11/libXcomposite/Makefile b/x11/libXcomposite/Makefile
index 2342ac1..1b244ca 100644
--- a/x11/libXcomposite/Makefile
+++ b/x11/libXcomposite/Makefile
@@ -14,7 +14,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		X11 Xau Xdmcp xcb
 
-MASTER_SITES =		${MASTER_SITE_XORG:=lib/}
+SITES =			${SITE_XORG:=lib/}
 
 MODULES =		xenocara
 
diff --git a/x11/libXcursor/Makefile b/x11/libXcursor/Makefile
index 3f8b8fc..918b032 100644
--- a/x11/libXcursor/Makefile
+++ b/x11/libXcursor/Makefile
@@ -14,7 +14,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		Xrender Xfixes X11 Xau xcb
 
-MASTER_SITES =		${MASTER_SITE_XORG:=lib/}
+SITES =			${SITE_XORG:=lib/}
 
 MODULES =		xenocara
 
diff --git a/x11/libXdamage/Makefile b/x11/libXdamage/Makefile
index 2f14d28..0215dd4 100644
--- a/x11/libXdamage/Makefile
+++ b/x11/libXdamage/Makefile
@@ -14,7 +14,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		X11 Xau Xdmcp Xfixes xcb
 
-MASTER_SITES =		${MASTER_SITE_XORG:=lib/}
+SITES =			${SITE_XORG:=lib/}
 
 MODULES =		xenocara
 
diff --git a/x11/libXdmcp/Makefile b/x11/libXdmcp/Makefile
index 850c68c..3794e06 100644
--- a/x11/libXdmcp/Makefile
+++ b/x11/libXdmcp/Makefile
@@ -12,7 +12,7 @@ SHARED_LIBS=    Xdmcp 11.0
 # MIT
 PERMIT_PACKAGE =	Yes
 
-MASTER_SITES =		${MASTER_SITE_XORG:=lib/}
+SITES =			${SITE_XORG:=lib/}
 
 MODULES =		xenocara
 
diff --git a/x11/libXext/Makefile b/x11/libXext/Makefile
index f5bc030..73172cc 100644
--- a/x11/libXext/Makefile
+++ b/x11/libXext/Makefile
@@ -14,7 +14,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		X11 Xau Xdmcp xcb
 
-MASTER_SITES =		${MASTER_SITE_XORG:=lib/}
+SITES =			${SITE_XORG:=lib/}
 
 MODULES =		xenocara
 
diff --git a/x11/libXfixes/Makefile b/x11/libXfixes/Makefile
index 644bcc9..382f8ba 100644
--- a/x11/libXfixes/Makefile
+++ b/x11/libXfixes/Makefile
@@ -14,7 +14,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		X11 Xau Xdmcp xcb pthread
 
-MASTER_SITES =		${MASTER_SITE_XORG:=lib/}
+SITES =			${SITE_XORG:=lib/}
 
 MODULES =		xenocara
 
diff --git a/x11/libXfont2/Makefile b/x11/libXfont2/Makefile
index 3ffec1f..5163f54 100644
--- a/x11/libXfont2/Makefile
+++ b/x11/libXfont2/Makefile
@@ -14,7 +14,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		fontenc freetype m z
 
-MASTER_SITES =		${MASTER_SITE_XORG:=lib/}
+SITES =			${SITE_XORG:=lib/}
 
 MODULES =		xenocara
 
diff --git a/x11/libXft/Makefile b/x11/libXft/Makefile
index de1aa97..5a61b53 100644
--- a/x11/libXft/Makefile
+++ b/x11/libXft/Makefile
@@ -15,7 +15,7 @@ PERMIT_PACKAGE =	Yes
 WANTLIB =		Xrender X11 Xau Xdmcp expat fontconfig freetype \
 			pthread xcb z
 
-MASTER_SITES =		${MASTER_SITE_XORG:=lib/}
+SITES =			${SITE_XORG:=lib/}
 
 MODULES =		xenocara
 
diff --git a/x11/libXi/Makefile b/x11/libXi/Makefile
index c184e2e..8f021e2 100644
--- a/x11/libXi/Makefile
+++ b/x11/libXi/Makefile
@@ -14,7 +14,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		X11 Xau Xdmcp Xext xcb pthread
 
-MASTER_SITES =		${MASTER_SITE_XORG:=lib/}
+SITES =			${SITE_XORG:=lib/}
 
 MODULES =		xenocara
 
diff --git a/x11/libXinerama/Makefile b/x11/libXinerama/Makefile
index 6f83ca4..2c92bb8 100644
--- a/x11/libXinerama/Makefile
+++ b/x11/libXinerama/Makefile
@@ -14,7 +14,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		X11 Xau Xdmcp Xext xcb
 
-MASTER_SITES =		${MASTER_SITE_XORG:=lib/}
+SITES =			${SITE_XORG:=lib/}
 
 MODULES =		xenocara
 
diff --git a/x11/libXmu/Makefile b/x11/libXmu/Makefile
index fb3dbbb..fd7c096 100644
--- a/x11/libXmu/Makefile
+++ b/x11/libXmu/Makefile
@@ -14,7 +14,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		SM ICE X11 Xau Xdmcp Xext Xt xcb
 
-MASTER_SITES =		${MASTER_SITE_XORG:=lib/}
+SITES =			${SITE_XORG:=lib/}
 
 MODULES =		xenocara
 
diff --git a/x11/libXpm/Makefile b/x11/libXpm/Makefile
index b970434..8b74d54 100644
--- a/x11/libXpm/Makefile
+++ b/x11/libXpm/Makefile
@@ -14,7 +14,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		ICE SM X11 Xau Xdmcp Xext Xt xcb c
 
-MASTER_SITES =		${MASTER_SITE_XORG:=lib/}
+SITES =			${SITE_XORG:=lib/}
 
 MODULES =		xenocara
 
diff --git a/x11/libXpresent/Makefile b/x11/libXpresent/Makefile
index 2abf38a..d9d6996 100644
--- a/x11/libXpresent/Makefile
+++ b/x11/libXpresent/Makefile
@@ -14,7 +14,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		X11 Xau Xdmcp xcb
 
-MASTER_SITES =		${MASTER_SITE_XORG:=lib/}
+SITES =			${SITE_XORG:=lib/}
 
 MODULES =		xenocara
 
diff --git a/x11/libXrandr/Makefile b/x11/libXrandr/Makefile
index 929604a..449f05d 100644
--- a/x11/libXrandr/Makefile
+++ b/x11/libXrandr/Makefile
@@ -14,7 +14,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		X11 Xau Xext Xdmcp Xrender xcb
 
-MASTER_SITES =		${MASTER_SITE_XORG:=lib/}
+SITES =			${SITE_XORG:=lib/}
 
 MODULES =		xenocara
 
diff --git a/x11/libXrender/Makefile b/x11/libXrender/Makefile
index 42163ed..c66eb73 100644
--- a/x11/libXrender/Makefile
+++ b/x11/libXrender/Makefile
@@ -14,7 +14,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		X11 Xau Xdmcp xcb
 
-MASTER_SITES =		${MASTER_SITE_XORG:=lib/}
+SITES =			${SITE_XORG:=lib/}
 
 MODULES =		xenocara
 
diff --git a/x11/libXres/Makefile b/x11/libXres/Makefile
index 7ce6e6d..8c88bd5 100644
--- a/x11/libXres/Makefile
+++ b/x11/libXres/Makefile
@@ -14,7 +14,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		X11 Xau Xdmcp Xext xcb
 
-MASTER_SITES =		${MASTER_SITE_XORG:=lib/}
+SITES =			${SITE_XORG:=lib/}
 
 MODULES =		xenocara
 
diff --git a/x11/libXt/Makefile b/x11/libXt/Makefile
index 318b589..d5aef46 100644
--- a/x11/libXt/Makefile
+++ b/x11/libXt/Makefile
@@ -14,7 +14,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		ICE SM X11 Xau Xdmcp xcb pthread
 
-MASTER_SITES =		${MASTER_SITE_XORG:=lib/}
+SITES =			${SITE_XORG:=lib/}
 
 MODULES =		xenocara
 
diff --git a/x11/libXtst/Makefile b/x11/libXtst/Makefile
index 61f55db..1b04d80 100644
--- a/x11/libXtst/Makefile
+++ b/x11/libXtst/Makefile
@@ -14,7 +14,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		X11 Xau Xdmcp Xext Xi xcb
 
-MASTER_SITES =		${MASTER_SITE_XORG:=lib/}
+SITES =			${SITE_XORG:=lib/}
 
 MODULES =		xenocara
 
diff --git a/x11/libXv/Makefile b/x11/libXv/Makefile
index 41a996a..983d63e 100644
--- a/x11/libXv/Makefile
+++ b/x11/libXv/Makefile
@@ -14,7 +14,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		X11 Xau Xdmcp Xext xcb
 
-MASTER_SITES =		${MASTER_SITE_XORG:=lib/}
+SITES =			${SITE_XORG:=lib/}
 
 MODULES =		xenocara
 
diff --git a/x11/libXvMC/Makefile b/x11/libXvMC/Makefile
index f9728e5..4112c6d 100644
--- a/x11/libXvMC/Makefile
+++ b/x11/libXvMC/Makefile
@@ -14,7 +14,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		Xv X11 Xau Xdmcp Xext xcb pthread
 
-MASTER_SITES =		${MASTER_SITE_XORG:=lib/}
+SITES =			${SITE_XORG:=lib/}
 
 MODULES =		xenocara
 
diff --git a/x11/libXxf86vm/Makefile b/x11/libXxf86vm/Makefile
index 430e252..bd652fc 100644
--- a/x11/libXxf86vm/Makefile
+++ b/x11/libXxf86vm/Makefile
@@ -14,7 +14,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		X11 Xau Xext xcb
 
-MASTER_SITES =		${MASTER_SITE_XORG:=lib/}
+SITES =			${SITE_XORG:=lib/}
 
 MODULES =		xenocara
 
diff --git a/x11/libfontenc/Makefile b/x11/libfontenc/Makefile
index cb94e47..3445947 100644
--- a/x11/libfontenc/Makefile
+++ b/x11/libfontenc/Makefile
@@ -15,7 +15,7 @@ PERMIT_PACKAGE =	Yes
 
 #WANTLIB =		???
 
-MASTER_SITES =		${MASTER_SITE_XORG:=lib/}
+SITES =			${SITE_XORG:=lib/}
 
 MODULES =		xenocara
 
diff --git a/x11/libxcb/Makefile b/x11/libxcb/Makefile
index ee3e6b8..70789e7 100644
--- a/x11/libxcb/Makefile
+++ b/x11/libxcb/Makefile
@@ -41,7 +41,7 @@ MODULES =		xenocara
 
 WANTLIB =		Xau Xdmcp
 
-MASTER_SITES =		https://xcb.freedesktop.org/dist/
+SITES =			https://xcb.freedesktop.org/dist/
 
 BUILD_DEPENDS =		devel/xcb-proto \
 			devel/xorgproto
diff --git a/x11/libxkbfile/Makefile b/x11/libxkbfile/Makefile
index e211224..6544be4 100644
--- a/x11/libxkbfile/Makefile
+++ b/x11/libxkbfile/Makefile
@@ -14,7 +14,7 @@ PERMIT_PACKAGE =	Yes
 
 #WANTLIB =		???
 
-MASTER_SITES =		${MASTER_SITE_XORG:=lib/}
+SITES =			${SITE_XORG:=lib/}
 
 MODULES =		xenocara
 
diff --git a/x11/libxshmfence/Makefile b/x11/libxshmfence/Makefile
index aef0e70..22236c1 100644
--- a/x11/libxshmfence/Makefile
+++ b/x11/libxshmfence/Makefile
@@ -12,7 +12,7 @@ SHARED_LIBS=    xshmfence 0.0
 # MIT
 PERMIT_PACKAGE =	Yes
 
-MASTER_SITES =		${MASTER_SITE_XORG:=lib/}
+SITES =			${SITE_XORG:=lib/}
 
 MODULES =		xenocara
 
diff --git a/x11/mkfontscale/Makefile b/x11/mkfontscale/Makefile
index b6a1511..14aae94 100644
--- a/x11/mkfontscale/Makefile
+++ b/x11/mkfontscale/Makefile
@@ -12,7 +12,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB = fontenc freetype z c
 
-MASTER_SITES =		${MASTER_SITE_XORG:=app/}
+SITES =			${SITE_XORG:=app/}
 
 MODULES =		xenocara
 
diff --git a/x11/setxkbmap/Makefile b/x11/setxkbmap/Makefile
index 64603de..1fa2110 100644
--- a/x11/setxkbmap/Makefile
+++ b/x11/setxkbmap/Makefile
@@ -13,7 +13,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		X11 xkbfile c
 
-MASTER_SITES =		${MASTER_SITE_XORG:=app/}
+SITES =			${SITE_XORG:=app/}
 
 MODULES =		xenocara
 
diff --git a/x11/xauth/Makefile b/x11/xauth/Makefile
index 00b6044..0c89d42 100644
--- a/x11/xauth/Makefile
+++ b/x11/xauth/Makefile
@@ -12,7 +12,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		Xau Xext Xmuu X11 c
 
-MASTER_SITES =		${MASTER_SITE_XORG:=app/}
+SITES =			${SITE_XORG:=app/}
 
 MODULES =		xenocara
 
diff --git a/x11/xbacklight/Makefile b/x11/xbacklight/Makefile
index fb76d0d..dbfe452 100644
--- a/x11/xbacklight/Makefile
+++ b/x11/xbacklight/Makefile
@@ -13,7 +13,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		xcb-randr xcb-util xcb Xdmcp Xau c
 
-MASTER_SITES =		${MASTER_SITE_XORG:=app/}
+SITES =			${SITE_XORG:=app/}
 
 MODULES =		xenocara
 
diff --git a/x11/xbitmaps/Makefile b/x11/xbitmaps/Makefile
index f16411b..b3e183c 100644
--- a/x11/xbitmaps/Makefile
+++ b/x11/xbitmaps/Makefile
@@ -12,7 +12,7 @@ MAINTAINER =		xenocara@openbsd.org
 PERMIT_PACKAGE =	Yes
 PERMIT_DISTFILES =	Yes
 
-MASTER_SITES =		${MASTER_SITE_XORG:=data/}
+SITES =			${SITE_XORG:=data/}
 
 MODULES =		xenocara
 
diff --git a/x11/xcb-util-cursor/Makefile b/x11/xcb-util-cursor/Makefile
index 0a85917..f1ee5c5 100644
--- a/x11/xcb-util-cursor/Makefile
+++ b/x11/xcb-util-cursor/Makefile
@@ -15,7 +15,7 @@ PERMIT_PACKAGE =	Yes
 WANTLIB =		Xau Xdmcp xcb xcb-image xcb-render \
 			xcb-render-util xcb-shm xcb-util
 
-MASTER_SITES =		https://xcb.freedesktop.org/dist/
+SITES =			https://xcb.freedesktop.org/dist/
 
 MODULES =		xenocara
 
diff --git a/x11/xcb-util-image/Makefile b/x11/xcb-util-image/Makefile
index 817dbac..15190d4 100644
--- a/x11/xcb-util-image/Makefile
+++ b/x11/xcb-util-image/Makefile
@@ -16,7 +16,7 @@ MODULES =		xenocara
 
 WANTLIB =		Xau Xdmcp xcb xcb-shm xcb-util
 
-MASTER_SITES =		https://xcb.freedesktop.org/dist/
+SITES =			https://xcb.freedesktop.org/dist/
 
 BUILD_DEPENDS =		devel/xorgproto
 
diff --git a/x11/xcb-util-keysyms/Makefile b/x11/xcb-util-keysyms/Makefile
index 16aeb82..8663adf 100644
--- a/x11/xcb-util-keysyms/Makefile
+++ b/x11/xcb-util-keysyms/Makefile
@@ -14,7 +14,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		Xau Xdmcp xcb
 
-MASTER_SITES =		https://xcb.freedesktop.org/dist/
+SITES =			https://xcb.freedesktop.org/dist/
 
 MODULES =		xenocara
 
diff --git a/x11/xcb-util-renderutil/Makefile b/x11/xcb-util-renderutil/Makefile
index 662f679..faa7fb5 100644
--- a/x11/xcb-util-renderutil/Makefile
+++ b/x11/xcb-util-renderutil/Makefile
@@ -16,7 +16,7 @@ MODULES =		xenocara
 
 WANTLIB =		Xau Xdmcp xcb xcb-render
 
-MASTER_SITES =		https://xcb.freedesktop.org/dist/
+SITES =			https://xcb.freedesktop.org/dist/
 
 BUILD_DEPENDS =		devel/xorgproto
 
diff --git a/x11/xcb-util-wm/Makefile b/x11/xcb-util-wm/Makefile
index def3edb..9445e8a 100644
--- a/x11/xcb-util-wm/Makefile
+++ b/x11/xcb-util-wm/Makefile
@@ -14,7 +14,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		Xau Xdmcp xcb
 
-MASTER_SITES =		https://xcb.freedesktop.org/dist/
+SITES =			https://xcb.freedesktop.org/dist/
 
 MODULES =		xenocara
 
diff --git a/x11/xcb-util/Makefile b/x11/xcb-util/Makefile
index ca8bdce..57674d6 100644
--- a/x11/xcb-util/Makefile
+++ b/x11/xcb-util/Makefile
@@ -17,7 +17,7 @@ MODULES =		xenocara
 
 WANTLIB =		Xau Xdmcp xcb
 
-MASTER_SITES =		https://xcb.freedesktop.org/dist/
+SITES =			https://xcb.freedesktop.org/dist/
 
 LIB_DEPENDS =		x11/libxcb
 
diff --git a/x11/xclock/Makefile b/x11/xclock/Makefile
index efe02db..1ecb351 100644
--- a/x11/xclock/Makefile
+++ b/x11/xclock/Makefile
@@ -13,7 +13,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		Xaw7 Xmu Xt X11 Xrender Xft xkbfile m c
 
-MASTER_SITES =		${MASTER_SITE_XORG:=app/}
+SITES =			${SITE_XORG:=app/}
 
 MODULES =		xenocara
 
diff --git a/x11/xconsole/Makefile b/x11/xconsole/Makefile
index de332cc..a4f1712 100644
--- a/x11/xconsole/Makefile
+++ b/x11/xconsole/Makefile
@@ -12,7 +12,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		X11 Xaw7 Xmu Xt c util
 
-MASTER_SITES =		${MASTER_SITE_XORG:=app/}
+SITES =			${SITE_XORG:=app/}
 
 MODULES =		xenocara
 
diff --git a/x11/xenodm/Makefile b/x11/xenodm/Makefile
index 52302ff..d20d032 100644
--- a/x11/xenodm/Makefile
+++ b/x11/xenodm/Makefile
@@ -16,7 +16,7 @@ WANTLIB +=		Xmu Xpm Xrender Xt
 WANTLIB +=		c fontconfig freetype expat iconv intl pthread util
 WANTLIB += 		xcb z
 
-MASTER_SITES =		https://xenocara.org/app/xenodm/
+SITES =			https://xenocara.org/app/xenodm/
 
 MODULES =		xenocara
 
diff --git a/x11/xf86-input-keyboard/Makefile b/x11/xf86-input-keyboard/Makefile
index 846df02..cd93062 100644
--- a/x11/xf86-input-keyboard/Makefile
+++ b/x11/xf86-input-keyboard/Makefile
@@ -9,7 +9,7 @@ MAINTAINER =	xenocara@openbsd.org
 # MIT
 PERMIT_PACKAGE =	Yes
 
-MASTER_SITES =		${MASTER_SITE_XORG:=driver/}
+SITES =			${SITE_XORG:=driver/}
 
 MODULES =		xenocara
 
diff --git a/x11/xf86-input-mouse/Makefile b/x11/xf86-input-mouse/Makefile
index 6edebd5..eb9783c 100644
--- a/x11/xf86-input-mouse/Makefile
+++ b/x11/xf86-input-mouse/Makefile
@@ -9,7 +9,7 @@ MAINTAINER =	xenocara@openbsd.org
 # MIT
 PERMIT_PACKAGE =	Yes
 
-MASTER_SITES =		${MASTER_SITE_XORG:=driver/}
+SITES =			${SITE_XORG:=driver/}
 
 MODULES =		xenocara
 
diff --git a/x11/xf86-input-usbtablet/Makefile b/x11/xf86-input-usbtablet/Makefile
index 4cee7fb..97a3fee 100644
--- a/x11/xf86-input-usbtablet/Makefile
+++ b/x11/xf86-input-usbtablet/Makefile
@@ -9,7 +9,7 @@ MAINTAINER =	xenocara@openbsd.org
 # MIT
 PERMIT_PACKAGE =	Yes
 
-MASTER_SITES =		${MASTER_SITE_XORG:=driver/}
+SITES =			${SITE_XORG:=driver/}
 
 MODULES =		xenocara
 
diff --git a/x11/xf86-input-ws/Makefile b/x11/xf86-input-ws/Makefile
index 0de5ccb..78d5a20 100644
--- a/x11/xf86-input-ws/Makefile
+++ b/x11/xf86-input-ws/Makefile
@@ -9,7 +9,7 @@ MAINTAINER =	xenocara@openbsd.org
 # MIT
 PERMIT_PACKAGE =	Yes
 
-MASTER_SITES =		${MASTER_SITE_XENOCARA:=driver/}
+SITES =			 https://xenocara.org/driver/xf86-input-ws/
 
 MODULES =		xenocara
 
diff --git a/x11/xf86-video-amdgpu/Makefile b/x11/xf86-video-amdgpu/Makefile
index 05edd4d..e98a671 100644
--- a/x11/xf86-video-amdgpu/Makefile
+++ b/x11/xf86-video-amdgpu/Makefile
@@ -9,7 +9,7 @@ MAINTAINER =	xenocara@openbsd.org
 # MIT
 PERMIT_PACKAGE =	Yes
 
-MASTER_SITES =		${MASTER_SITE_XORG:=driver/}
+SITES =			${SITE_XORG:=driver/}
 
 MODULES =		xenocara
 
diff --git a/x11/xf86-video-ati/Makefile b/x11/xf86-video-ati/Makefile
index 5214d2f..b482e27 100644
--- a/x11/xf86-video-ati/Makefile
+++ b/x11/xf86-video-ati/Makefile
@@ -9,7 +9,7 @@ MAINTAINER =	xenocara@openbsd.org
 # MIT
 PERMIT_PACKAGE =	Yes
 
-MASTER_SITES =		${MASTER_SITE_XORG:=driver/}
+SITES =			${SITE_XORG:=driver/}
 
 MODULES =		xenocara
 
diff --git a/x11/xf86-video-intel/Makefile b/x11/xf86-video-intel/Makefile
index 073d8ea..fbaef13 100644
--- a/x11/xf86-video-intel/Makefile
+++ b/x11/xf86-video-intel/Makefile
@@ -9,7 +9,7 @@ MAINTAINER =	xenocara@openbsd.org
 # MIT
 PERMIT_PACKAGE =	Yes
 
-MASTER_SITES =		${MASTER_SITE_XORG:=driver/}
+SITES =			${SITE_XORG:=driver/}
 
 MODULES =		xenocara
 
diff --git a/x11/xhost/Makefile b/x11/xhost/Makefile
index 3e55b53..187d518 100644
--- a/x11/xhost/Makefile
+++ b/x11/xhost/Makefile
@@ -13,7 +13,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		X11 Xmuu c
 
-MASTER_SITES =		${MASTER_SITE_XORG:=app/}
+SITES =			${SITE_XORG:=app/}
 
 MODULES =		xenocara
 
diff --git a/x11/xinit/Makefile b/x11/xinit/Makefile
index 32df14d..26d85af 100644
--- a/x11/xinit/Makefile
+++ b/x11/xinit/Makefile
@@ -12,7 +12,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		X11 c
 
-MASTER_SITES =		${MASTER_SITE_XORG:=app/}
+SITES =			${SITE_XORG:=app/}
 
 MODULES =		xenocara
 
diff --git a/x11/xinput/Makefile b/x11/xinput/Makefile
index 4b492b1..eff3348 100644
--- a/x11/xinput/Makefile
+++ b/x11/xinput/Makefile
@@ -12,7 +12,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		X11 Xext Xi Xrandr Xinerama c
 
-MASTER_SITES =		${MASTER_SITE_XORG:=app/}
+SITES =			${SITE_XORG:=app/}
 
 MODULES =		xenocara
 
diff --git a/x11/xkbcomp/Makefile b/x11/xkbcomp/Makefile
index 21c54a2..95e6248 100644
--- a/x11/xkbcomp/Makefile
+++ b/x11/xkbcomp/Makefile
@@ -11,7 +11,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		X11 xkbfile c
 
-MASTER_SITES =		${MASTER_SITE_XORG:=app/}
+SITES =			${SITE_XORG:=app/}
 
 MODULES =		xenocara
 
diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile
index ced9f71..9610cd6 100644
--- a/x11/xkeyboard-config/Makefile
+++ b/x11/xkeyboard-config/Makefile
@@ -11,7 +11,7 @@ MAINTAINER =		xenocara@openbsd.org
 # MIT
 PERMIT_PACKAGE =	Yes
 
-MASTER_SITES =		${MASTER_SITE_XORG:=data/xkeyboard-config/}
+SITES =			${SITE_XORG:=data/xkeyboard-config/}
 
 MODULES =		xenocara
 
diff --git a/x11/xlockmore-obsd/Makefile b/x11/xlockmore-obsd/Makefile
index 46e542c..f080b2a 100644
--- a/x11/xlockmore-obsd/Makefile
+++ b/x11/xlockmore-obsd/Makefile
@@ -14,7 +14,7 @@ PERMIT_PACKAGE =	Yes
 WANTLIB =		ICE SM X11 Xau Xdmcp Xext Xmu Xpm freetype xcb 
 WANTLIB +=		${COMPILER_LIBCXX} c m z
 
-MASTER_SITES =		https://xenocara.org/distfiles/app
+SITES =			https://xenocara.org/distfiles/app
 
 MODULES =		xenocara
 
diff --git a/x11/xlogo/Makefile b/x11/xlogo/Makefile
index 07de258..710b6d4 100644
--- a/x11/xlogo/Makefile
+++ b/x11/xlogo/Makefile
@@ -13,7 +13,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		 SM Xaw7 Xmu Xt X11 Xext Xft Xrender xkbfile c
 
-MASTER_SITES =		${MASTER_SITE_XORG:=app/}
+SITES =			${SITE_XORG:=app/}
 
 MODULES =		xenocara
 
diff --git a/x11/xlsfonts/Makefile b/x11/xlsfonts/Makefile
index ccad3ad..62e59fc 100644
--- a/x11/xlsfonts/Makefile
+++ b/x11/xlsfonts/Makefile
@@ -13,7 +13,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		X11 c
 
-MASTER_SITES =		${MASTER_SITE_XORG:=app/}
+SITES =			${SITE_XORG:=app/}
 
 MODULES =		xenocara
 
diff --git a/x11/xmag/Makefile b/x11/xmag/Makefile
index 6033e53..3136cea 100644
--- a/x11/xmag/Makefile
+++ b/x11/xmag/Makefile
@@ -13,7 +13,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		Xaw7 Xmu Xt X11 c m
 
-MASTER_SITES =		${MASTER_SITE_XORG:=app/}
+SITES =			${SITE_XORG:=app/}
 
 MODULES =		xenocara
 
diff --git a/x11/xmodmap/Makefile b/x11/xmodmap/Makefile
index 594a090..54d1ee7 100644
--- a/x11/xmodmap/Makefile
+++ b/x11/xmodmap/Makefile
@@ -13,7 +13,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		X11  c
 
-MASTER_SITES =		${MASTER_SITE_XORG:=app/}
+SITES =			${SITE_XORG:=app/}
 
 MODULES =		xenocara
 
diff --git a/x11/xrandr/Makefile b/x11/xrandr/Makefile
index 194dcab..4ad8a81 100644
--- a/x11/xrandr/Makefile
+++ b/x11/xrandr/Makefile
@@ -13,7 +13,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		X11 Xrandr Xrender c m
 
-MASTER_SITES =		${MASTER_SITE_XORG:=app/}
+SITES =			${SITE_XORG:=app/}
 
 MODULES =		xenocara
 
diff --git a/x11/xrdb/Makefile b/x11/xrdb/Makefile
index e88ab61..5cb9934 100644
--- a/x11/xrdb/Makefile
+++ b/x11/xrdb/Makefile
@@ -12,7 +12,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		X11 Xmuu c
 
-MASTER_SITES =		${MASTER_SITE_XORG:=app/}
+SITES =			${SITE_XORG:=app/}
 
 MODULES =		xenocara
 
diff --git a/x11/xset/Makefile b/x11/xset/Makefile
index 616d204..110b6aa 100644
--- a/x11/xset/Makefile
+++ b/x11/xset/Makefile
@@ -13,7 +13,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		 X11 Xext Xmuu c
 
-MASTER_SITES =		${MASTER_SITE_XORG:=app/}
+SITES =			${SITE_XORG:=app/}
 
 MODULES =		xenocara
 
diff --git a/x11/xsetroot/Makefile b/x11/xsetroot/Makefile
index e1fd014..427f46d 100644
--- a/x11/xsetroot/Makefile
+++ b/x11/xsetroot/Makefile
@@ -12,7 +12,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		X11 Xcursor Xmuu c
 
-MASTER_SITES =		${MASTER_SITE_XORG:=app/}
+SITES =			${SITE_XORG:=app/}
 
 MODULES =		xenocara
 
diff --git a/x11/xterm/Makefile b/x11/xterm/Makefile
index 3fd6c02..a62b3cb 100644
--- a/x11/xterm/Makefile
+++ b/x11/xterm/Makefile
@@ -13,7 +13,7 @@ PERMIT_PACKAGE =	Yes
 WANTLIB =		ICE X11 Xaw7 Xext Xft Xinerama Xmu Xpm Xt \
 			c curses fontconfig freetype util
 
-MASTER_SITES =		https://invisible-island.net/archives/xterm/
+SITES =			https://invisible-island.net/archives/xterm/
 
 EXTRACT_SUFX =		.tgz
 
diff --git a/x11/xtrans/Makefile b/x11/xtrans/Makefile
index 09050e6..76d7c1f 100644
--- a/x11/xtrans/Makefile
+++ b/x11/xtrans/Makefile
@@ -11,7 +11,7 @@ MAINTAINER =	xenocara@openbsd.org
 # MIT
 PERMIT_PACKAGE =	Yes
 
-MASTER_SITES =		${MASTER_SITE_XORG:=lib/}
+SITES =			${SITE_XORG:=lib/}
 
 MODULES =		xenocara
 
diff --git a/x11/xwd/Makefile b/x11/xwd/Makefile
index 8774e48..f2ee2c2 100644
--- a/x11/xwd/Makefile
+++ b/x11/xwd/Makefile
@@ -12,7 +12,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		X11 xkbfile c
 
-MASTER_SITES =		${MASTER_SITE_XORG:=app/}
+SITES =			${SITE_XORG:=app/}
 
 MODULES =		xenocara