MASTER_SITES -> SITESxenocara

78 files changed, 78 insertions, 78 deletions

diff --git a/x11/bdftopcf/Makefile b/x11/bdftopcf/Makefile
index 5d9aeab..fbb3dab 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..a60c8d2 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..223a1da 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..afe7fbb 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..1a53d76 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..50022f8 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..e2cd3d1 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..df50565 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..7f886e1 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..12b9604 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..7b77e6d 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..fbda912 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..7fd9611 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..e9ebd7b 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..7bbb456 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..02d7081 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..54aabb1 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..e3782c2 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..1bca93e 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..4d3f00f 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..e3028e6 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..7154827 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..7acbec1 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..7a9a9d0 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..c8860b4 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..da71239 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..8edd214 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..9902310 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..108a105 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..dbb0ed4 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..b8459ae 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..451ea3e 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..33540b7 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..5fc74e2 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..8ea0d21 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..dcbbad3 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..a76efc7 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..bfc7545 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..3ef2fa2 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..3d767c7 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..3561207 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..1e79fb7 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..80c3e0d 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..c2eff18 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-errors/Makefile b/x11/xcb-util-errors/Makefile
index 06b1e15..3b2830d 100644
--- a/x11/xcb-util-errors/Makefile
+++ b/x11/xcb-util-errors/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/
 
 SEPARATE_BUILD =	Yes
 USE_GMAKE =		Yes
diff --git a/x11/xcb-util-image/Makefile b/x11/xcb-util-image/Makefile
index 817dbac..3de31c6 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..2f3f0d0 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..51a6a2f 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..9e2730c 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..e5ae523 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..52f1504 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..e4aaf04 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..bd3db24 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..c9a9408 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..a95b792 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..1f1da00 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..1424a6b 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 =		${SITE_XENOCARA:=driver/}
 
 MODULES =		xenocara
 
diff --git a/x11/xf86-video-amdgpu/Makefile b/x11/xf86-video-amdgpu/Makefile
index 05edd4d..6cce003 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..d22bbde 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..105976b 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..91b4b81 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..08d89d5 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..b079004 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..133d898 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..bb476b3 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..88f6ed1 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..6895e5e 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..2b2f24d 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..0618552 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..070aade 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/xorg-server/Makefile b/x11/xorg-server/Makefile
index 540ccda..2aafe1b 100644
--- a/x11/xorg-server/Makefile
+++ b/x11/xorg-server/Makefile
@@ -20,7 +20,7 @@ WANTLIB += xcb-shape xcb-shm xcb-sync xcb-util xcb-xf86dri xcb-xkb xcb-xv
 WANTLIB += Xext Xfixes Xxf86vm fontenc freetype xcvt xshmfence
 WANTLIB += epoxy
 
-MASTER_SITES =		${MASTER_SITE_XORG:=xserver/}
+SITES =		${SITE_XORG:=xserver/}
 
 MODULES =		xenocara
 
diff --git a/x11/xrandr/Makefile b/x11/xrandr/Makefile
index 194dcab..f80ab2b 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..e5eb932 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..f2e6855 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..526f435 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..e0d0380 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..945f2ee 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..67b9003 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