summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/imake/Makefile6
-rw-r--r--devel/makedepend/Makefile4
-rw-r--r--devel/xorg-util-macros/Makefile6
-rw-r--r--fonts/bdftopcf/Makefile4
-rw-r--r--fonts/encodings/Makefile4
-rw-r--r--fonts/font-adobe-100dpi/Makefile4
-rw-r--r--fonts/font-adobe-75dpi/Makefile4
-rw-r--r--fonts/font-adobe-utopia-100dpi/Makefile4
-rw-r--r--fonts/font-adobe-utopia-75dpi/Makefile4
-rw-r--r--fonts/font-adobe-utopia-type1/Makefile4
-rw-r--r--fonts/font-alias/Makefile6
-rw-r--r--fonts/font-bh-100dpi/Makefile4
-rw-r--r--fonts/font-bh-75dpi/Makefile4
-rw-r--r--fonts/font-bh-lucidatypewriter-100dpi/Makefile4
-rw-r--r--fonts/font-bh-lucidatypewriter-75dpi/Makefile4
-rw-r--r--fonts/font-bh-ttf/Makefile4
-rw-r--r--fonts/font-bh-type1/Makefile4
-rw-r--r--fonts/font-bitstream-100dpi/Makefile4
-rw-r--r--fonts/font-bitstream-75dpi/Makefile4
-rw-r--r--fonts/font-bitstream-type1/Makefile4
-rw-r--r--fonts/font-cursor-misc/Makefile6
-rw-r--r--fonts/font-daewoo-misc/Makefile4
-rw-r--r--fonts/font-dec-misc/Makefile4
-rw-r--r--fonts/font-ibm-type1/Makefile4
-rw-r--r--fonts/font-isas-misc/Makefile4
-rw-r--r--fonts/font-jis-misc/Makefile4
-rw-r--r--fonts/font-misc-misc/Makefile4
-rw-r--r--fonts/font-mutt-misc/Makefile4
-rw-r--r--fonts/font-sony-misc/Makefile4
-rw-r--r--fonts/font-util/Makefile4
-rw-r--r--fonts/libfontenc/Makefile4
-rw-r--r--fonts/mkfontdir/Makefile4
-rw-r--r--fonts/mkfontscale/Makefile4
-rw-r--r--mail/xbiff/Makefile4
-rw-r--r--meta-pkgs/modular-xorg-apps/Makefile4
-rw-r--r--meta-pkgs/modular-xorg-drivers/Makefile4
-rw-r--r--meta-pkgs/modular-xorg-fonts/Makefile4
-rw-r--r--meta-pkgs/modular-xorg-libs/Makefile4
-rw-r--r--wm/compiz/Makefile4
-rw-r--r--wm/twm/Makefile4
-rw-r--r--x11/appres/Makefile4
-rw-r--r--x11/beforelight/Makefile4
-rw-r--r--x11/bigreqsproto/Makefile4
-rw-r--r--x11/bitmap/Makefile4
-rw-r--r--x11/compositeproto/Makefile4
-rw-r--r--x11/damageproto/Makefile4
-rw-r--r--x11/editres/Makefile4
-rw-r--r--x11/evieext/Makefile4
-rw-r--r--x11/fixesproto/Makefile4
-rw-r--r--x11/fontcacheproto/Makefile4
-rw-r--r--x11/fontsproto/Makefile4
-rw-r--r--x11/glproto/Makefile4
-rw-r--r--x11/iceauth/Makefile4
-rw-r--r--x11/ico/Makefile4
-rw-r--r--x11/inputproto/Makefile4
-rw-r--r--x11/kbproto/Makefile4
-rw-r--r--x11/lbxproxy/Makefile4
-rw-r--r--x11/libFS/Makefile4
-rw-r--r--x11/libICE/Makefile4
-rw-r--r--x11/libSM/Makefile4
-rw-r--r--x11/libX11/Makefile4
-rw-r--r--x11/libXScrnSaver/Makefile4
-rw-r--r--x11/libXTrap/Makefile4
-rw-r--r--x11/libXau/Makefile4
-rw-r--r--x11/libXaw/Makefile4
-rw-r--r--x11/libXcomposite/Makefile4
-rw-r--r--x11/libXcursor/Makefile4
-rw-r--r--x11/libXdamage/Makefile4
-rw-r--r--x11/libXdmcp/Makefile4
-rw-r--r--x11/libXevie/Makefile4
-rw-r--r--x11/libXext/Makefile4
-rw-r--r--x11/libXfixes/Makefile4
-rw-r--r--x11/libXfont/Makefile4
-rw-r--r--x11/libXft/Makefile4
-rw-r--r--x11/libXi/Makefile4
-rw-r--r--x11/libXinerama/Makefile4
-rw-r--r--x11/libXmu/Makefile4
-rw-r--r--x11/libXp/Makefile6
-rw-r--r--x11/libXpm/Makefile4
-rw-r--r--x11/libXprintUtil/Makefile6
-rw-r--r--x11/libXrandr/Makefile4
-rw-r--r--x11/libXrender/Makefile4
-rw-r--r--x11/libXres/Makefile4
-rw-r--r--x11/libXt/Makefile4
-rw-r--r--x11/libXtst/Makefile4
-rw-r--r--x11/libXv/Makefile4
-rw-r--r--x11/libXvMC/Makefile4
-rw-r--r--x11/libXxf86dga/Makefile6
-rw-r--r--x11/libXxf86misc/Makefile6
-rw-r--r--x11/libXxf86vm/Makefile6
-rw-r--r--x11/liblbxutil/Makefile4
-rw-r--r--x11/libxkbfile/Makefile4
-rw-r--r--x11/libxkbui/Makefile4
-rw-r--r--x11/listres/Makefile4
-rw-r--r--x11/luit/Makefile4
-rw-r--r--x11/modular-xorg-server/Makefile5
-rw-r--r--x11/pixman/Makefile4
-rw-r--r--x11/printproto/Makefile6
-rw-r--r--x11/randrproto/Makefile4
-rw-r--r--x11/recordproto/Makefile4
-rw-r--r--x11/renderproto/Makefile4
-rw-r--r--x11/resourceproto/Makefile4
-rw-r--r--x11/rgb/Makefile4
-rw-r--r--x11/scrnsaverproto/Makefile4
-rw-r--r--x11/sessreg/Makefile4
-rw-r--r--x11/setxkbmap/Makefile4
-rw-r--r--x11/trapproto/Makefile4
-rw-r--r--x11/videoproto/Makefile4
-rw-r--r--x11/x11perf/Makefile4
-rw-r--r--x11/xauth/Makefile4
-rw-r--r--x11/xbacklight/Makefile4
-rw-r--r--x11/xbitmaps/Makefile4
-rw-r--r--x11/xcalc/Makefile4
-rw-r--r--x11/xclock/Makefile4
-rw-r--r--x11/xcmiscproto/Makefile4
-rw-r--r--x11/xcompmgr/Makefile4
-rw-r--r--x11/xconsole/Makefile4
-rw-r--r--x11/xdm/Makefile4
-rw-r--r--x11/xdpyinfo/Makefile4
-rw-r--r--x11/xev/Makefile6
-rw-r--r--x11/xextproto/Makefile4
-rw-r--r--x11/xeyes/Makefile6
-rw-r--r--x11/xf86-input-keyboard/Makefile5
-rw-r--r--x11/xf86-input-mouse/Makefile5
-rw-r--r--x11/xf86-input-vmmouse/Makefile5
-rw-r--r--x11/xf86-input-void/Makefile5
-rw-r--r--x11/xf86-video-apm/Makefile5
-rw-r--r--x11/xf86-video-ark/Makefile5
-rw-r--r--x11/xf86-video-ast/Makefile5
-rw-r--r--x11/xf86-video-ati/Makefile5
-rw-r--r--x11/xf86-video-chips/Makefile5
-rw-r--r--x11/xf86-video-cirrus/Makefile5
-rw-r--r--x11/xf86-video-cyrix/Makefile5
-rw-r--r--x11/xf86-video-glint/Makefile5
-rw-r--r--x11/xf86-video-i128/Makefile5
-rw-r--r--x11/xf86-video-i740/Makefile5
-rw-r--r--x11/xf86-video-i810/Makefile5
-rw-r--r--x11/xf86-video-imstt/Makefile5
-rw-r--r--x11/xf86-video-intel/Makefile4
-rw-r--r--x11/xf86-video-mga/Makefile5
-rw-r--r--x11/xf86-video-neomagic/Makefile5
-rw-r--r--x11/xf86-video-nsc/Makefile5
-rw-r--r--x11/xf86-video-nv/Makefile5
-rw-r--r--x11/xf86-video-radeonhd/Makefile4
-rw-r--r--x11/xf86-video-rendition/Makefile5
-rw-r--r--x11/xf86-video-s3/Makefile5
-rw-r--r--x11/xf86-video-s3virge/Makefile5
-rw-r--r--x11/xf86-video-savage/Makefile5
-rw-r--r--x11/xf86-video-siliconmotion/Makefile5
-rw-r--r--x11/xf86-video-sis/Makefile5
-rw-r--r--x11/xf86-video-tdfx/Makefile5
-rw-r--r--x11/xf86-video-tga/Makefile5
-rw-r--r--x11/xf86-video-trident/Makefile5
-rw-r--r--x11/xf86-video-tseng/Makefile5
-rw-r--r--x11/xf86-video-vesa/Makefile5
-rw-r--r--x11/xf86-video-vga/Makefile5
-rw-r--r--x11/xf86-video-via/Makefile5
-rw-r--r--x11/xf86-video-vmware/Makefile5
-rw-r--r--x11/xf86-video-wsfb/Makefile5
-rw-r--r--x11/xf86bigfontproto/Makefile4
-rw-r--r--x11/xf86dgaproto/Makefile4
-rw-r--r--x11/xf86driproto/Makefile4
-rw-r--r--x11/xf86miscproto/Makefile4
-rw-r--r--x11/xf86vidmodeproto/Makefile4
-rw-r--r--x11/xfd/Makefile6
-rw-r--r--x11/xfontsel/Makefile4
-rw-r--r--x11/xgamma/Makefile4
-rw-r--r--x11/xhost/Makefile4
-rw-r--r--x11/xineramaproto/Makefile4
-rw-r--r--x11/xinit/Makefile4
-rw-r--r--x11/xinput/Makefile6
-rw-r--r--x11/xkbcomp/Makefile4
-rw-r--r--x11/xkbdata/Makefile4
-rw-r--r--x11/xkill/Makefile4
-rw-r--r--x11/xload/Makefile6
-rw-r--r--x11/xlogo/Makefile4
-rw-r--r--x11/xlsclients/Makefile4
-rw-r--r--x11/xmag/Makefile4
-rw-r--r--x11/xman/Makefile4
-rw-r--r--x11/xmessage/Makefile4
-rw-r--r--x11/xmodmap/Makefile4
-rw-r--r--x11/xmore/Makefile4
-rw-r--r--x11/xorg-cf-files/Makefile6
-rw-r--r--x11/xplsprinters/Makefile4
-rw-r--r--x11/xprehashprinterlist/Makefile4
-rw-r--r--x11/xprop/Makefile4
-rw-r--r--x11/xproto/Makefile4
-rw-r--r--x11/xproxymanagementprotocol/Makefile4
-rw-r--r--x11/xrandr/Makefile4
-rw-r--r--x11/xrdb/Makefile4
-rw-r--r--x11/xrefresh/Makefile4
-rw-r--r--x11/xset/Makefile4
-rw-r--r--x11/xsetmode/Makefile4
-rw-r--r--x11/xsetpointer/Makefile4
-rw-r--r--x11/xsetroot/Makefile4
-rw-r--r--x11/xsm/Makefile4
-rw-r--r--x11/xtrans/Makefile4
-rw-r--r--x11/xvinfo/Makefile4
-rw-r--r--x11/xwd/Makefile4
-rw-r--r--x11/xwininfo/Makefile4
-rw-r--r--x11/xwud/Makefile4
201 files changed, 454 insertions, 418 deletions
diff --git a/devel/imake/Makefile b/devel/imake/Makefile
index 1d0317b70fc..550e7789509 100644
--- a/devel/imake/Makefile
+++ b/devel/imake/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.5 2007/07/17 21:05:11 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2008/05/24 21:45:20 tnn Exp $
#
DISTNAME= imake-1.0.2
PKGREVISION= 2
CATEGORIES= x11 devel
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/util/
+MASTER_SITES= ${MASTER_SITE_XORG:=util/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
-HOMEPAGE= http://xorg.freedesktop.org/releases/individual/util/
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Imake and other utilities from modular X.org
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/devel/makedepend/Makefile b/devel/makedepend/Makefile
index d2bcf9fe8e3..1e6a0acaa29 100644
--- a/devel/makedepend/Makefile
+++ b/devel/makedepend/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2007/03/21 22:59:19 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:20 tnn Exp $
#
DISTNAME= makedepend-1.0.1
CATEGORIES= devel
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/util/
+MASTER_SITES= ${MASTER_SITE_XORG:=util/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/devel/xorg-util-macros/Makefile b/devel/xorg-util-macros/Makefile
index 027379e830f..825cba3db50 100644
--- a/devel/xorg-util-macros/Makefile
+++ b/devel/xorg-util-macros/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.2 2007/08/06 15:27:06 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:20 tnn Exp $
#
DISTNAME= util-macros-1.1.5
PKGNAME= xorg-${DISTNAME}
PKGREVISION= 1
CATEGORIES= devel x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/util/
+MASTER_SITES= ${MASTER_SITE_XORG:=util/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
-HOMEPAGE= http://xorg.freedesktop.org/releases/individual/util/
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Xorg autotool macros
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/fonts/bdftopcf/Makefile b/fonts/bdftopcf/Makefile
index 7ab9669079e..801cf0a9afb 100644
--- a/fonts/bdftopcf/Makefile
+++ b/fonts/bdftopcf/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2007/07/12 13:21:38 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/24 21:45:20 tnn Exp $
#
DISTNAME= bdftopcf-1.0.1
CATEGORIES= fonts
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/fonts/encodings/Makefile b/fonts/encodings/Makefile
index 41f38b7fd5b..0ddb458fb52 100644
--- a/fonts/encodings/Makefile
+++ b/fonts/encodings/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2007/03/18 20:22:12 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:20 tnn Exp $
#
DISTNAME= encodings-1.0.2
CATEGORIES= fonts x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/font/
+MASTER_SITES= ${MASTER_SITE_XORG:=font/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/fonts/font-adobe-100dpi/Makefile b/fonts/font-adobe-100dpi/Makefile
index 43f29bb4928..4609092f9aa 100644
--- a/fonts/font-adobe-100dpi/Makefile
+++ b/fonts/font-adobe-100dpi/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2008/01/22 17:09:52 tnn Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/24 21:45:20 tnn Exp $
#
DISTNAME= font-adobe-100dpi-1.0.0
CATEGORIES= fonts
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/font/
+MASTER_SITES= ${MASTER_SITE_XORG:=font/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/fonts/font-adobe-75dpi/Makefile b/fonts/font-adobe-75dpi/Makefile
index ce493af9c6f..4dc8075f992 100644
--- a/fonts/font-adobe-75dpi/Makefile
+++ b/fonts/font-adobe-75dpi/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2008/01/22 17:09:52 tnn Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/24 21:45:20 tnn Exp $
#
DISTNAME= font-adobe-75dpi-1.0.0
CATEGORIES= fonts
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/font/
+MASTER_SITES= ${MASTER_SITE_XORG:=font/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/fonts/font-adobe-utopia-100dpi/Makefile b/fonts/font-adobe-utopia-100dpi/Makefile
index 4d0a910b5ad..0e25ccac303 100644
--- a/fonts/font-adobe-utopia-100dpi/Makefile
+++ b/fonts/font-adobe-utopia-100dpi/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2008/01/22 17:09:52 tnn Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/24 21:45:20 tnn Exp $
#
DISTNAME= font-adobe-utopia-100dpi-1.0.1
CATEGORIES= fonts
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/font/
+MASTER_SITES= ${MASTER_SITE_XORG:=font/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/fonts/font-adobe-utopia-75dpi/Makefile b/fonts/font-adobe-utopia-75dpi/Makefile
index b46dbd3ebfb..736e2bed6a2 100644
--- a/fonts/font-adobe-utopia-75dpi/Makefile
+++ b/fonts/font-adobe-utopia-75dpi/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2008/01/22 17:09:52 tnn Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/24 21:45:20 tnn Exp $
#
DISTNAME= font-adobe-utopia-75dpi-1.0.1
CATEGORIES= fonts
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/font/
+MASTER_SITES= ${MASTER_SITE_XORG:=font/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/fonts/font-adobe-utopia-type1/Makefile b/fonts/font-adobe-utopia-type1/Makefile
index 2afbefcd6a7..16296347d48 100644
--- a/fonts/font-adobe-utopia-type1/Makefile
+++ b/fonts/font-adobe-utopia-type1/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2007/02/19 07:57:25 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2008/05/24 21:45:20 tnn Exp $
#
DISTNAME= font-adobe-utopia-type1-1.0.1
CATEGORIES= fonts
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/font/
+MASTER_SITES= ${MASTER_SITE_XORG:=font/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/fonts/font-alias/Makefile b/fonts/font-alias/Makefile
index 3fbbaa9d5c2..894b7b8b517 100644
--- a/fonts/font-alias/Makefile
+++ b/fonts/font-alias/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/01/24 12:56:09 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/24 21:45:20 tnn Exp $
#
DISTNAME= font-alias-1.0.1
CATEGORIES= fonts x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/font/
+MASTER_SITES= ${MASTER_SITE_XORG:=font/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
-HOMEPAGE= http://xorg.freedesktop.org/releases/individual/font/
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Standard aliases for X11 PCF fonts
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/fonts/font-bh-100dpi/Makefile b/fonts/font-bh-100dpi/Makefile
index bc3384165be..69b7c47c642 100644
--- a/fonts/font-bh-100dpi/Makefile
+++ b/fonts/font-bh-100dpi/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2008/01/22 17:09:52 tnn Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:21 tnn Exp $
#
DISTNAME= font-bh-100dpi-1.0.0
CATEGORIES= fonts
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/font/
+MASTER_SITES= ${MASTER_SITE_XORG:=font/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/fonts/font-bh-75dpi/Makefile b/fonts/font-bh-75dpi/Makefile
index c6bf2fc4362..8fe506ea604 100644
--- a/fonts/font-bh-75dpi/Makefile
+++ b/fonts/font-bh-75dpi/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2008/01/22 17:09:53 tnn Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:21 tnn Exp $
#
DISTNAME= font-bh-75dpi-1.0.0
CATEGORIES= fonts
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/font/
+MASTER_SITES= ${MASTER_SITE_XORG:=font/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/fonts/font-bh-lucidatypewriter-100dpi/Makefile b/fonts/font-bh-lucidatypewriter-100dpi/Makefile
index 02b2eb1db7e..d595f93683d 100644
--- a/fonts/font-bh-lucidatypewriter-100dpi/Makefile
+++ b/fonts/font-bh-lucidatypewriter-100dpi/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2008/01/22 17:09:53 tnn Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:21 tnn Exp $
#
DISTNAME= font-bh-lucidatypewriter-100dpi-1.0.0
CATEGORIES= fonts
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/font/
+MASTER_SITES= ${MASTER_SITE_XORG:=font/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/fonts/font-bh-lucidatypewriter-75dpi/Makefile b/fonts/font-bh-lucidatypewriter-75dpi/Makefile
index 6eb21276dfe..175013ad114 100644
--- a/fonts/font-bh-lucidatypewriter-75dpi/Makefile
+++ b/fonts/font-bh-lucidatypewriter-75dpi/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2008/01/22 17:09:53 tnn Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:21 tnn Exp $
#
DISTNAME= font-bh-lucidatypewriter-75dpi-1.0.0
CATEGORIES= fonts
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/font/
+MASTER_SITES= ${MASTER_SITE_XORG:=font/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/fonts/font-bh-ttf/Makefile b/fonts/font-bh-ttf/Makefile
index 3bae8a0beca..cceea38935a 100644
--- a/fonts/font-bh-ttf/Makefile
+++ b/fonts/font-bh-ttf/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2007/02/19 07:57:25 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2008/05/24 21:45:21 tnn Exp $
#
DISTNAME= font-bh-ttf-1.0.0
CATEGORIES= fonts
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/font/
+MASTER_SITES= ${MASTER_SITE_XORG:=font/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/fonts/font-bh-type1/Makefile b/fonts/font-bh-type1/Makefile
index c81142825c6..d040c6a0beb 100644
--- a/fonts/font-bh-type1/Makefile
+++ b/fonts/font-bh-type1/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2007/02/19 07:57:25 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2008/05/24 21:45:21 tnn Exp $
#
DISTNAME= font-bh-type1-1.0.0
CATEGORIES= fonts
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/font/
+MASTER_SITES= ${MASTER_SITE_XORG:=font/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/fonts/font-bitstream-100dpi/Makefile b/fonts/font-bitstream-100dpi/Makefile
index 74b3c0e16e8..a716ea6e48a 100644
--- a/fonts/font-bitstream-100dpi/Makefile
+++ b/fonts/font-bitstream-100dpi/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2008/01/22 17:09:53 tnn Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:21 tnn Exp $
#
DISTNAME= font-bitstream-100dpi-1.0.0
CATEGORIES= fonts
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/font/
+MASTER_SITES= ${MASTER_SITE_XORG:=font/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/fonts/font-bitstream-75dpi/Makefile b/fonts/font-bitstream-75dpi/Makefile
index 466367d694b..4e777611800 100644
--- a/fonts/font-bitstream-75dpi/Makefile
+++ b/fonts/font-bitstream-75dpi/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2008/01/22 17:09:53 tnn Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:21 tnn Exp $
#
DISTNAME= font-bitstream-75dpi-1.0.0
CATEGORIES= fonts
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/font/
+MASTER_SITES= ${MASTER_SITE_XORG:=font/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/fonts/font-bitstream-type1/Makefile b/fonts/font-bitstream-type1/Makefile
index dc8c7cf13c8..b89cbe15e7d 100644
--- a/fonts/font-bitstream-type1/Makefile
+++ b/fonts/font-bitstream-type1/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2007/02/19 07:57:25 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/24 21:45:21 tnn Exp $
#
DISTNAME= font-bitstream-type1-1.0.0
CATEGORIES= fonts
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/font/
+MASTER_SITES= ${MASTER_SITE_XORG:=font/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/fonts/font-cursor-misc/Makefile b/fonts/font-cursor-misc/Makefile
index 9c2681b63f3..364e5a07734 100644
--- a/fonts/font-cursor-misc/Makefile
+++ b/fonts/font-cursor-misc/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.2 2008/01/22 17:09:53 tnn Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:21 tnn Exp $
#
DISTNAME= font-cursor-misc-1.0.0
CATEGORIES= fonts x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/font/
+MASTER_SITES= ${MASTER_SITE_XORG:=font/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
-HOMEPAGE= http://xorg.freedesktop.org/releases/individual/font/
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Standard X11 cursors in PCF format
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/fonts/font-daewoo-misc/Makefile b/fonts/font-daewoo-misc/Makefile
index 0cd387e34d1..3f120db947d 100644
--- a/fonts/font-daewoo-misc/Makefile
+++ b/fonts/font-daewoo-misc/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2008/01/22 17:09:53 tnn Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:21 tnn Exp $
#
DISTNAME= font-daewoo-misc-1.0.0
CATEGORIES= fonts
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/font/
+MASTER_SITES= ${MASTER_SITE_XORG:=font/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/fonts/font-dec-misc/Makefile b/fonts/font-dec-misc/Makefile
index 046c6ae3360..2deda6d1c0d 100644
--- a/fonts/font-dec-misc/Makefile
+++ b/fonts/font-dec-misc/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2008/01/22 17:09:53 tnn Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:21 tnn Exp $
#
DISTNAME= font-dec-misc-1.0.0
CATEGORIES= fonts
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/font/
+MASTER_SITES= ${MASTER_SITE_XORG:=font/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/fonts/font-ibm-type1/Makefile b/fonts/font-ibm-type1/Makefile
index d8231a871f9..023233cf048 100644
--- a/fonts/font-ibm-type1/Makefile
+++ b/fonts/font-ibm-type1/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2007/02/19 07:57:26 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/24 21:45:21 tnn Exp $
#
DISTNAME= font-ibm-type1-1.0.0
CATEGORIES= fonts
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/font/
+MASTER_SITES= ${MASTER_SITE_XORG:=font/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/fonts/font-isas-misc/Makefile b/fonts/font-isas-misc/Makefile
index f7be2cd72a0..0be112ed5b7 100644
--- a/fonts/font-isas-misc/Makefile
+++ b/fonts/font-isas-misc/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2008/01/22 17:09:54 tnn Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:21 tnn Exp $
#
DISTNAME= font-isas-misc-1.0.0
CATEGORIES= fonts
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/font/
+MASTER_SITES= ${MASTER_SITE_XORG:=font/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/fonts/font-jis-misc/Makefile b/fonts/font-jis-misc/Makefile
index 811ac972742..69fdf6fe1d4 100644
--- a/fonts/font-jis-misc/Makefile
+++ b/fonts/font-jis-misc/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2008/01/22 17:09:54 tnn Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:21 tnn Exp $
#
DISTNAME= font-jis-misc-1.0.0
CATEGORIES= fonts
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/font/
+MASTER_SITES= ${MASTER_SITE_XORG:=font/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/fonts/font-misc-misc/Makefile b/fonts/font-misc-misc/Makefile
index dec5bac94f5..7dd1b9b39ba 100644
--- a/fonts/font-misc-misc/Makefile
+++ b/fonts/font-misc-misc/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2008/01/22 17:09:54 tnn Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:20 tnn Exp $
#
DISTNAME= font-misc-misc-1.0.0
CATEGORIES= fonts
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/font/
+MASTER_SITES= ${MASTER_SITE_XORG:=font/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/fonts/font-mutt-misc/Makefile b/fonts/font-mutt-misc/Makefile
index 4f15a2af54b..3786b509b49 100644
--- a/fonts/font-mutt-misc/Makefile
+++ b/fonts/font-mutt-misc/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2008/01/22 17:09:54 tnn Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:21 tnn Exp $
#
DISTNAME= font-mutt-misc-1.0.0
CATEGORIES= fonts
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/font/
+MASTER_SITES= ${MASTER_SITE_XORG:=font/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/fonts/font-sony-misc/Makefile b/fonts/font-sony-misc/Makefile
index 7edb9b5312e..ec4d9e2a3ed 100644
--- a/fonts/font-sony-misc/Makefile
+++ b/fonts/font-sony-misc/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2008/01/22 17:09:54 tnn Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:21 tnn Exp $
#
DISTNAME= font-sony-misc-1.0.0
CATEGORIES= fonts
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/font/
+MASTER_SITES= ${MASTER_SITE_XORG:=font/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/fonts/font-util/Makefile b/fonts/font-util/Makefile
index 1ad97df916e..ffd1eadcfe1 100644
--- a/fonts/font-util/Makefile
+++ b/fonts/font-util/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2008/02/20 22:33:18 tnn Exp $
+# $NetBSD: Makefile,v 1.6 2008/05/24 21:45:21 tnn Exp $
#
DISTNAME= font-util-1.0.1
PKGREVISION= 1
CATEGORIES= fonts
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/font/
+MASTER_SITES= ${MASTER_SITE_XORG:=font/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/fonts/libfontenc/Makefile b/fonts/libfontenc/Makefile
index e67cd7d8138..0b5202f3f54 100644
--- a/fonts/libfontenc/Makefile
+++ b/fonts/libfontenc/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2007/01/23 14:44:09 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/24 21:45:21 tnn Exp $
#
DISTNAME= libfontenc-1.0.4
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/lib/
+MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/fonts/mkfontdir/Makefile b/fonts/mkfontdir/Makefile
index b8d961f35fa..fd8791c3d88 100644
--- a/fonts/mkfontdir/Makefile
+++ b/fonts/mkfontdir/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2008/04/17 21:13:11 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2008/05/24 21:45:21 tnn Exp $
#
DISTNAME= mkfontdir-1.0.4
CATEGORIES= fonts x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/fonts/mkfontscale/Makefile b/fonts/mkfontscale/Makefile
index 902c191521b..247cd3f6cb6 100644
--- a/fonts/mkfontscale/Makefile
+++ b/fonts/mkfontscale/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2008/05/19 03:00:19 bjs Exp $
+# $NetBSD: Makefile,v 1.24 2008/05/24 21:45:21 tnn Exp $
#
DISTNAME= mkfontscale-1.0.5
CATEGORIES= fonts x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/mail/xbiff/Makefile b/mail/xbiff/Makefile
index 9d897c344f1..4f5d44bdf23 100644
--- a/mail/xbiff/Makefile
+++ b/mail/xbiff/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2007/06/19 09:39:10 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:21 tnn Exp $
#
DISTNAME= xbiff-1.0.1
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/meta-pkgs/modular-xorg-apps/Makefile b/meta-pkgs/modular-xorg-apps/Makefile
index 5141a9241d7..ca8ed27a6f4 100644
--- a/meta-pkgs/modular-xorg-apps/Makefile
+++ b/meta-pkgs/modular-xorg-apps/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2008/03/04 20:16:34 tnn Exp $
+# $NetBSD: Makefile,v 1.11 2008/05/24 21:45:21 tnn Exp $
DISTNAME= # empty
PKGNAME= modular-xorg-apps-1.5
CATEGORIES= meta-pkgs x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
DISTFILES= # empty
MAINTAINER= joerg@NetBSD.org
diff --git a/meta-pkgs/modular-xorg-drivers/Makefile b/meta-pkgs/modular-xorg-drivers/Makefile
index 249966c4652..64ce6a80f24 100644
--- a/meta-pkgs/modular-xorg-drivers/Makefile
+++ b/meta-pkgs/modular-xorg-drivers/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2008/05/18 03:10:07 tnn Exp $
+# $NetBSD: Makefile,v 1.11 2008/05/24 21:45:21 tnn Exp $
DISTNAME= # empty
PKGNAME= modular-xorg-drivers-1.2
CATEGORIES= meta-pkgs drivers x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/drivers
+MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
DISTFILES= # empty
MAINTAINER= joerg@NetBSD.org
diff --git a/meta-pkgs/modular-xorg-fonts/Makefile b/meta-pkgs/modular-xorg-fonts/Makefile
index d0ff619e189..776feef4cc0 100644
--- a/meta-pkgs/modular-xorg-fonts/Makefile
+++ b/meta-pkgs/modular-xorg-fonts/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2007/12/19 12:27:29 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/24 21:45:22 tnn Exp $
DISTNAME= # empty
PKGNAME= modular-xorg-fonts-1.0
CATEGORIES= meta-pkgs fonts x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/fonts/
+MASTER_SITES= ${MASTER_SITE_XORG:=font/}
DISTFILES= # empty
MAINTAINER= joerg@NetBSD.org
diff --git a/meta-pkgs/modular-xorg-libs/Makefile b/meta-pkgs/modular-xorg-libs/Makefile
index 13ada883b65..133f8a3e04e 100644
--- a/meta-pkgs/modular-xorg-libs/Makefile
+++ b/meta-pkgs/modular-xorg-libs/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2007/12/19 12:27:29 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/24 21:45:22 tnn Exp $
DISTNAME= # empty
PKGNAME= modular-xorg-libs-1.0
CATEGORIES= meta-pkgs x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/lib/
+MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
DISTFILES= # empty
MAINTAINER= joerg@NetBSD.org
diff --git a/wm/compiz/Makefile b/wm/compiz/Makefile
index a22ea4eefdd..392bf4834b5 100644
--- a/wm/compiz/Makefile
+++ b/wm/compiz/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.18 2008/05/12 01:57:37 jmcneill Exp $
+# $NetBSD: Makefile,v 1.19 2008/05/24 21:45:14 tnn Exp $
#
DISTNAME= compiz-0.6.2
PKGREVISION= 1
CATEGORIES= wm x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://compiz.org/
diff --git a/wm/twm/Makefile b/wm/twm/Makefile
index 2ff579f35bc..2a4b383bae1 100644
--- a/wm/twm/Makefile
+++ b/wm/twm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2008/04/24 03:50:58 bjs Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:14 tnn Exp $
DISTNAME= twm-1.0.4
CATEGORIES= x11 wm
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
diff --git a/x11/appres/Makefile b/x11/appres/Makefile
index 49e124ddfb0..6310b0b72eb 100644
--- a/x11/appres/Makefile
+++ b/x11/appres/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/03/07 15:03:08 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/24 21:45:14 tnn Exp $
#
DISTNAME= appres-1.0.1
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/beforelight/Makefile b/x11/beforelight/Makefile
index 1b648718f12..36c4690d60f 100644
--- a/x11/beforelight/Makefile
+++ b/x11/beforelight/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2007/09/21 18:00:02 bjs Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/24 21:45:14 tnn Exp $
#
DISTNAME= beforelight-1.0.3
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/bigreqsproto/Makefile b/x11/bigreqsproto/Makefile
index 7223447db74..0e376322df6 100644
--- a/x11/bigreqsproto/Makefile
+++ b/x11/bigreqsproto/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/11/03 17:38:16 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/24 21:45:14 tnn Exp $
#
DISTNAME= bigreqsproto-1.0.2
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/proto/
+MASTER_SITES= ${MASTER_SITE_XORG:=proto/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/bitmap/Makefile b/x11/bitmap/Makefile
index 499d0ed3532..e219bf49bd5 100644
--- a/x11/bitmap/Makefile
+++ b/x11/bitmap/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/03/07 15:04:24 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/24 21:45:14 tnn Exp $
#
DISTNAME= bitmap-1.0.3
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/compositeproto/Makefile b/x11/compositeproto/Makefile
index df6e43b7f23..4efb8750ae4 100644
--- a/x11/compositeproto/Makefile
+++ b/x11/compositeproto/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2007/07/25 15:53:10 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2008/05/24 21:45:14 tnn Exp $
#
DISTNAME= compositeproto-0.4
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/proto/
+MASTER_SITES= ${MASTER_SITE_XORG:=proto/}
MAINTAINER= joerg@NetBSD.org
HOMEPAGE= http://xorg.freedesktop.org/
diff --git a/x11/damageproto/Makefile b/x11/damageproto/Makefile
index 1c421648be7..a1f6fdeb14b 100644
--- a/x11/damageproto/Makefile
+++ b/x11/damageproto/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2007/01/18 17:30:44 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:14 tnn Exp $
#
DISTNAME= damageproto-1.1.0
CATEGORIES= x11 devel
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/proto/
+MASTER_SITES= ${MASTER_SITE_XORG:=proto/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/editres/Makefile b/x11/editres/Makefile
index d15341ae06c..65c8a31c1f8 100644
--- a/x11/editres/Makefile
+++ b/x11/editres/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/04/10 13:46:29 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/24 21:45:18 tnn Exp $
#
DISTNAME= editres-1.0.3
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/evieext/Makefile b/x11/evieext/Makefile
index 3b93861587d..cb1ceab750f 100644
--- a/x11/evieext/Makefile
+++ b/x11/evieext/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/11/03 21:47:55 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/24 21:45:14 tnn Exp $
#
DISTNAME= evieext-1.0.2
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/proto/
+MASTER_SITES= ${MASTER_SITE_XORG:=proto/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/fixesproto/Makefile b/x11/fixesproto/Makefile
index 5002e6f6830..7e888df2643 100644
--- a/x11/fixesproto/Makefile
+++ b/x11/fixesproto/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2006/11/03 17:09:27 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2008/05/24 21:45:14 tnn Exp $
#
DISTNAME= fixesproto-4.0
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/proto/
+MASTER_SITES= ${MASTER_SITE_XORG:=proto/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/fontcacheproto/Makefile b/x11/fontcacheproto/Makefile
index 8e2f91e7cab..9376b045190 100644
--- a/x11/fontcacheproto/Makefile
+++ b/x11/fontcacheproto/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/11/03 19:54:04 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/24 21:45:14 tnn Exp $
#
DISTNAME= fontcacheproto-0.1.2
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/proto/
+MASTER_SITES= ${MASTER_SITE_XORG:=proto/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/fontsproto/Makefile b/x11/fontsproto/Makefile
index e1c85c672b2..a30c260baa6 100644
--- a/x11/fontsproto/Makefile
+++ b/x11/fontsproto/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/11/03 17:14:03 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/24 21:45:14 tnn Exp $
#
DISTNAME= fontsproto-2.0.2
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/proto/
+MASTER_SITES= ${MASTER_SITE_XORG:=proto/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/glproto/Makefile b/x11/glproto/Makefile
index 7c9ecb52201..4529ab30dda 100644
--- a/x11/glproto/Makefile
+++ b/x11/glproto/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2008/01/15 23:51:56 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:14 tnn Exp $
#
DISTNAME= glproto-1.4.9
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/proto/
+MASTER_SITES= ${MASTER_SITE_XORG:=proto/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/iceauth/Makefile b/x11/iceauth/Makefile
index ef907141fa8..cc7895093b4 100644
--- a/x11/iceauth/Makefile
+++ b/x11/iceauth/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2007/08/05 21:15:45 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/24 21:45:14 tnn Exp $
#
DISTNAME= iceauth-1.0.2
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/ico/Makefile b/x11/ico/Makefile
index 3380045c6a2..d751e5fa21a 100644
--- a/x11/ico/Makefile
+++ b/x11/ico/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2007/08/05 21:21:03 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/24 21:45:19 tnn Exp $
#
DISTNAME= ico-1.0.2
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/inputproto/Makefile b/x11/inputproto/Makefile
index 169ca249342..9fb988e9cfd 100644
--- a/x11/inputproto/Makefile
+++ b/x11/inputproto/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2008/03/07 20:18:07 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2008/05/24 21:45:14 tnn Exp $
#
DISTNAME= inputproto-1.4.3
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/proto/
+MASTER_SITES= ${MASTER_SITE_XORG:=proto/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/kbproto/Makefile b/x11/kbproto/Makefile
index 58b436a5e61..613995a328e 100644
--- a/x11/kbproto/Makefile
+++ b/x11/kbproto/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/11/03 18:08:58 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/24 21:45:15 tnn Exp $
#
DISTNAME= kbproto-1.0.3
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/proto/
+MASTER_SITES= ${MASTER_SITE_XORG:=proto/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/lbxproxy/Makefile b/x11/lbxproxy/Makefile
index 4bb061b56d5..2d591390f89 100644
--- a/x11/lbxproxy/Makefile
+++ b/x11/lbxproxy/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/04/10 13:46:38 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/24 21:45:19 tnn Exp $
#
DISTNAME= lbxproxy-1.0.1
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/libFS/Makefile b/x11/libFS/Makefile
index a27727f239b..dac7ba343e1 100644
--- a/x11/libFS/Makefile
+++ b/x11/libFS/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2007/07/02 12:32:19 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/24 21:45:15 tnn Exp $
#
DISTNAME= libFS-1.0.0
CATEGORIES= x11 devel
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/lib/
+MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/libICE/Makefile b/x11/libICE/Makefile
index 08dfe2d8900..5213662452e 100644
--- a/x11/libICE/Makefile
+++ b/x11/libICE/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2008/01/15 22:59:16 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2008/05/24 21:45:15 tnn Exp $
#
DISTNAME= libICE-1.0.4
CATEGORIES= x11 devel
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/lib/
+MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/libSM/Makefile b/x11/libSM/Makefile
index 57f786bdde7..6bdc806afc7 100644
--- a/x11/libSM/Makefile
+++ b/x11/libSM/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2007/10/15 12:48:57 abs Exp $
+# $NetBSD: Makefile,v 1.5 2008/05/24 21:45:15 tnn Exp $
#
DISTNAME= libSM-1.0.3
PKGREVISION= 1
CATEGORIES= x11 devel
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/lib/
+MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index 7c92777d4d1..05b8fad8396 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.13 2008/05/24 20:15:46 tnn Exp $
+# $NetBSD: Makefile,v 1.14 2008/05/24 21:45:15 tnn Exp $
#
DISTNAME= libX11-1.1.4
PKGREVISION= 1
CATEGORIES= x11 devel
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/lib/
+MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/libXScrnSaver/Makefile b/x11/libXScrnSaver/Makefile
index e6f4c563708..5652e2033a0 100644
--- a/x11/libXScrnSaver/Makefile
+++ b/x11/libXScrnSaver/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2008/04/17 21:21:58 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/24 21:45:15 tnn Exp $
#
DISTNAME= libXScrnSaver-1.1.3
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/lib/
+MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/libXTrap/Makefile b/x11/libXTrap/Makefile
index cdfabf26910..a35a4c6fdbf 100644
--- a/x11/libXTrap/Makefile
+++ b/x11/libXTrap/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2006/12/17 22:39:02 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/24 21:45:15 tnn Exp $
#
DISTNAME= libXTrap-1.0.0
CATEGORIES= x11 devel
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/lib/
+MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/libXau/Makefile b/x11/libXau/Makefile
index 616ca5869ff..219bcd32746 100644
--- a/x11/libXau/Makefile
+++ b/x11/libXau/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2008/05/24 20:15:46 tnn Exp $
+# $NetBSD: Makefile,v 1.5 2008/05/24 21:45:15 tnn Exp $
#
DISTNAME= libXau-1.0.3
CATEGORIES= x11 devel
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/lib/
+MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/libXaw/Makefile b/x11/libXaw/Makefile
index 17db10512cd..00a4705695a 100644
--- a/x11/libXaw/Makefile
+++ b/x11/libXaw/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2008/01/29 03:57:36 bjs Exp $
+# $NetBSD: Makefile,v 1.5 2008/05/24 21:45:15 tnn Exp $
#
DISTNAME= libXaw-1.0.4
PKGREVISION= 1
CATEGORIES= graphics x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/lib/
+MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/libXcomposite/Makefile b/x11/libXcomposite/Makefile
index d6bb7044fdb..f58113cae78 100644
--- a/x11/libXcomposite/Makefile
+++ b/x11/libXcomposite/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2007/07/25 15:56:09 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/24 21:45:15 tnn Exp $
#
DISTNAME= libXcomposite-0.4.0
CATEGORIES= x11 devel
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/lib/
+MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/libXcursor/Makefile b/x11/libXcursor/Makefile
index c27bc52a3c8..179860cefdc 100644
--- a/x11/libXcursor/Makefile
+++ b/x11/libXcursor/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2008/01/15 23:20:12 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:15 tnn Exp $
#
DISTNAME= libXcursor-1.1.9
CATEGORIES= x11 devel
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/lib/
+MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/libXdamage/Makefile b/x11/libXdamage/Makefile
index e94b170c5f0..d3bfd3a6aeb 100644
--- a/x11/libXdamage/Makefile
+++ b/x11/libXdamage/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2008/01/29 03:50:25 bjs Exp $
+# $NetBSD: Makefile,v 1.5 2008/05/24 21:45:15 tnn Exp $
#
DISTNAME= libXdamage-1.1.1
PKGREVISION= 1
CATEGORIES= x11 devel
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/lib/
+MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/libXdmcp/Makefile b/x11/libXdmcp/Makefile
index e2b062f2a02..c14feb39442 100644
--- a/x11/libXdmcp/Makefile
+++ b/x11/libXdmcp/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2007/01/22 15:18:50 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:15 tnn Exp $
#
DISTNAME= libXdmcp-1.0.2
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/lib/
+MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/libXevie/Makefile b/x11/libXevie/Makefile
index d32950fb046..2237cdf0b16 100644
--- a/x11/libXevie/Makefile
+++ b/x11/libXevie/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2007/08/06 13:59:34 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:15 tnn Exp $
#
DISTNAME= libXevie-1.0.2
CATEGORIES= x11 devel
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/lib/
+MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/libXext/Makefile b/x11/libXext/Makefile
index c0aab80b851..bf4de62d75f 100644
--- a/x11/libXext/Makefile
+++ b/x11/libXext/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2008/05/16 13:48:41 tnn Exp $
+# $NetBSD: Makefile,v 1.7 2008/05/24 21:45:15 tnn Exp $
#
DISTNAME= libXext-1.0.4
CATEGORIES= x11 devel
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/lib/
+MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/libXfixes/Makefile b/x11/libXfixes/Makefile
index 376673259e9..8d6bb374f54 100644
--- a/x11/libXfixes/Makefile
+++ b/x11/libXfixes/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2007/01/24 13:11:56 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:15 tnn Exp $
#
DISTNAME= libXfixes-4.0.3
CATEGORIES= x11 devel
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/lib/
+MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/libXfont/Makefile b/x11/libXfont/Makefile
index 926f2315a13..7636048515e 100644
--- a/x11/libXfont/Makefile
+++ b/x11/libXfont/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2008/03/07 20:16:19 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2008/05/24 21:45:15 tnn Exp $
#
DISTNAME= libXfont-1.3.2
CATEGORIES= x11 devel fonts
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/lib/
+MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/libXft/Makefile b/x11/libXft/Makefile
index 503e07c9f60..811051e2dd0 100644
--- a/x11/libXft/Makefile
+++ b/x11/libXft/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2008/01/29 04:18:44 bjs Exp $
+# $NetBSD: Makefile,v 1.6 2008/05/24 21:45:15 tnn Exp $
DISTNAME= libXft-2.1.12
PKGREVISION= 1
CATEGORIES= fonts x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/lib/
+MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/libXi/Makefile b/x11/libXi/Makefile
index 39ae3592303..c73781c6bd8 100644
--- a/x11/libXi/Makefile
+++ b/x11/libXi/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2008/01/29 03:45:36 bjs Exp $
+# $NetBSD: Makefile,v 1.8 2008/05/24 21:45:15 tnn Exp $
#
DISTNAME= libXi-1.1.3
PKGREVISION= 1
CATEGORIES= x11 devel
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/lib/
+MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/libXinerama/Makefile b/x11/libXinerama/Makefile
index b4c89242020..7293fca50ff 100644
--- a/x11/libXinerama/Makefile
+++ b/x11/libXinerama/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2008/04/17 06:02:28 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2008/05/24 21:45:15 tnn Exp $
DISTNAME= libXinerama-1.0.3
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/lib/
+MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/libXmu/Makefile b/x11/libXmu/Makefile
index 2fbf7359d5a..8abad9c2d4a 100644
--- a/x11/libXmu/Makefile
+++ b/x11/libXmu/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2008/01/15 23:56:46 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/24 21:45:15 tnn Exp $
#
DISTNAME= libXmu-1.0.4
CATEGORIES= x11 devel
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/lib/
+MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/libXp/Makefile b/x11/libXp/Makefile
index 6fe58682ccf..8b9449ca0ca 100644
--- a/x11/libXp/Makefile
+++ b/x11/libXp/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.2 2007/07/27 20:05:24 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:15 tnn Exp $
#
DISTNAME= libXp-1.0.0
CATEGORIES= x11 print
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/lib/
+MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
-HOMEPAGE= http://xorg.freedesktop.org/releases/individual/lib/
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= X Print Service Extension Library
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/libXpm/Makefile b/x11/libXpm/Makefile
index 2d962e07397..3e1f93bfc26 100644
--- a/x11/libXpm/Makefile
+++ b/x11/libXpm/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2008/02/24 02:26:33 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2008/05/24 21:45:15 tnn Exp $
#
DISTNAME= libXpm-3.5.7
PKGREVISION= 1
CATEGORIES= graphics x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/lib/
+MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/libXprintUtil/Makefile b/x11/libXprintUtil/Makefile
index 85649c45b4d..f548770ea3b 100644
--- a/x11/libXprintUtil/Makefile
+++ b/x11/libXprintUtil/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/04/12 15:05:24 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/24 21:45:19 tnn Exp $
#
DISTNAME= libXprintUtil-1.0.1
CATEGORIES= x11 print
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/lib/
+MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
-HOMEPAGE= http://xorg.freedesktop.org/releases/individual/lib/
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= X Print Utility Library
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/libXrandr/Makefile b/x11/libXrandr/Makefile
index 75f87735aed..b043558a684 100644
--- a/x11/libXrandr/Makefile
+++ b/x11/libXrandr/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2007/09/21 19:24:35 bjs Exp $
+# $NetBSD: Makefile,v 1.7 2008/05/24 21:45:15 tnn Exp $
#
DISTNAME= libXrandr-1.2.2
CATEGORIES= x11 devel
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/lib/
+MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/libXrender/Makefile b/x11/libXrender/Makefile
index ce31ea18202..84216c4fc85 100644
--- a/x11/libXrender/Makefile
+++ b/x11/libXrender/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2008/01/15 23:06:13 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/24 21:45:15 tnn Exp $
#
DISTNAME= libXrender-0.9.4
CATEGORIES= x11 devel
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/lib/
+MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/libXres/Makefile b/x11/libXres/Makefile
index d854b883a20..7d1bf7ed9e1 100644
--- a/x11/libXres/Makefile
+++ b/x11/libXres/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2007/08/06 14:05:21 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/24 21:45:15 tnn Exp $
#
DISTNAME= libXres-1.0.3
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/lib/
+MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/libXt/Makefile b/x11/libXt/Makefile
index 0d0f2318a85..0b61523226b 100644
--- a/x11/libXt/Makefile
+++ b/x11/libXt/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2008/05/24 20:15:46 tnn Exp $
+# $NetBSD: Makefile,v 1.10 2008/05/24 21:45:15 tnn Exp $
#
DISTNAME= libXt-1.0.5
PKGREVISION= 1
CATEGORIES= x11 devel
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/lib/
+MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/libXtst/Makefile b/x11/libXtst/Makefile
index f3498b67cc3..ebdea83a69f 100644
--- a/x11/libXtst/Makefile
+++ b/x11/libXtst/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2008/01/15 23:24:33 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/24 21:45:15 tnn Exp $
#
DISTNAME= libXtst-1.0.3
CATEGORIES= x11 devel
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/lib/
+MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/libXv/Makefile b/x11/libXv/Makefile
index 422df6aecb4..927e1e5993f 100644
--- a/x11/libXv/Makefile
+++ b/x11/libXv/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2008/04/17 06:00:46 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2008/05/24 21:45:15 tnn Exp $
#
DISTNAME= libXv-1.0.4
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/lib/
+MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/libXvMC/Makefile b/x11/libXvMC/Makefile
index 70355a5c4df..2843a5179b4 100644
--- a/x11/libXvMC/Makefile
+++ b/x11/libXvMC/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2007/08/06 14:08:47 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:15 tnn Exp $
#
DISTNAME= libXvMC-1.0.4
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/lib/
+MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/libXxf86dga/Makefile b/x11/libXxf86dga/Makefile
index bcef5225dfc..80d8b466805 100644
--- a/x11/libXxf86dga/Makefile
+++ b/x11/libXxf86dga/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.5 2008/01/15 23:59:22 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2008/05/24 21:45:16 tnn Exp $
#
DISTNAME= libXxf86dga-1.0.2
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/lib/
+MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
-HOMEPAGE= http://xorg.freedesktop.org/releases/individual/lib/
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Library for the XFree86-DGA X extension
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/libXxf86misc/Makefile b/x11/libXxf86misc/Makefile
index ff29f6166f7..520ef4b4443 100644
--- a/x11/libXxf86misc/Makefile
+++ b/x11/libXxf86misc/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.2 2007/07/27 23:49:59 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:16 tnn Exp $
#
DISTNAME= libXxf86misc-1.0.1
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/lib/
+MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
-HOMEPAGE= http://xorg.freedesktop.org/releases/individual/lib/
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Library for the XFree86-Misc X extension
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/libXxf86vm/Makefile b/x11/libXxf86vm/Makefile
index 8bd048b1391..f18be64e532 100644
--- a/x11/libXxf86vm/Makefile
+++ b/x11/libXxf86vm/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2008/04/08 03:41:00 bjs Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/24 21:45:16 tnn Exp $
#
DISTNAME= libXxf86vm-1.0.1
PKGREVISION= 1
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/lib/
+MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
-HOMEPAGE= http://xorg.freedesktop.org/releases/individual/lib/
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Library for the XFree86-VidMode X extension
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/liblbxutil/Makefile b/x11/liblbxutil/Makefile
index cfa610ab290..d7586e9ce2b 100644
--- a/x11/liblbxutil/Makefile
+++ b/x11/liblbxutil/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2007/08/06 11:49:50 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:16 tnn Exp $
#
DISTNAME= liblbxutil-1.0.1
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/lib/
+MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/libxkbfile/Makefile b/x11/libxkbfile/Makefile
index 0d10c478559..1c4c21a6ef2 100644
--- a/x11/libxkbfile/Makefile
+++ b/x11/libxkbfile/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2008/04/17 21:14:56 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:16 tnn Exp $
#
DISTNAME= libxkbfile-1.0.5
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/lib/
+MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/libxkbui/Makefile b/x11/libxkbui/Makefile
index 3ddfd473868..faa3f0e0a96 100644
--- a/x11/libxkbui/Makefile
+++ b/x11/libxkbui/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2007/11/23 14:34:33 bjs Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:16 tnn Exp $
#
DISTNAME= libxkbui-1.0.2
PKGREVISION= 1
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/lib/
+MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/listres/Makefile b/x11/listres/Makefile
index 7fb9b3aa52f..0e14afe9994 100644
--- a/x11/listres/Makefile
+++ b/x11/listres/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2007/06/19 09:39:11 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:19 tnn Exp $
#
DISTNAME= listres-1.0.1
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/luit/Makefile b/x11/luit/Makefile
index 9d38768523a..2a555279694 100644
--- a/x11/luit/Makefile
+++ b/x11/luit/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2008/02/06 08:03:10 bjs Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/24 21:45:19 tnn Exp $
#
DISTNAME= luit-1.0.3
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/modular-xorg-server/Makefile b/x11/modular-xorg-server/Makefile
index 68e4f8b2d20..fca5e0c60b3 100644
--- a/x11/modular-xorg-server/Makefile
+++ b/x11/modular-xorg-server/Makefile
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.28 2008/04/21 22:18:52 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2008/05/24 21:45:16 tnn Exp $
DISTNAME= xorg-server-1.3.0.0
PKGNAME= modular-${DISTNAME}
PKGREVISION= 8
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/xserver/
+MASTER_SITES= ${MASTER_SITE_XORG:=xserver/}
EXTRACT_SUFX= .tar.bz2
SPECIAL_PERMS+= bin/Xorg ${SETUID_ROOT_PERMS}
PKG_DESTDIR_SUPPORT= user-destdir
MAINTAINER= joerg@NetBSD.org
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Xorg X11 Server from modular X.org X11
USE_LIBTOOL= YES
diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile
index 6ec0a1f2f27..d51aa20f389 100644
--- a/x11/pixman/Makefile
+++ b/x11/pixman/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.10 2008/04/27 11:58:09 tnn Exp $
+# $NetBSD: Makefile,v 1.11 2008/05/24 21:45:20 tnn Exp $
#
DISTNAME= pixman-0.10.0
PKGNAME= ${DISTNAME:C/pl[0-9]*//}
PKGREVISION= 2
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/lib/
+MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= bjs@NetBSD.org
diff --git a/x11/printproto/Makefile b/x11/printproto/Makefile
index 4cb3a17a124..c995f06052f 100644
--- a/x11/printproto/Makefile
+++ b/x11/printproto/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.2 2008/04/16 14:27:45 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:16 tnn Exp $
#
DISTNAME= printproto-1.0.4
CATEGORIES= x11 print
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/proto/
+MASTER_SITES= ${MASTER_SITE_XORG:=proto/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
-HOMEPAGE= http://xorg.freedesktop.org/releases/individual/proto/
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Print extension headers from X.org
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/randrproto/Makefile b/x11/randrproto/Makefile
index 4db86859f96..688f9e271b0 100644
--- a/x11/randrproto/Makefile
+++ b/x11/randrproto/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2007/02/26 14:52:58 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2008/05/24 21:45:20 tnn Exp $
#
DISTNAME= randrproto-1.2.1
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/proto/
+MASTER_SITES= ${MASTER_SITE_XORG:=proto/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/recordproto/Makefile b/x11/recordproto/Makefile
index 13eb79dc844..e957f3f276f 100644
--- a/x11/recordproto/Makefile
+++ b/x11/recordproto/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2006/11/03 20:13:38 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:16 tnn Exp $
#
DISTNAME= recordproto-1.13.2
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/proto/
+MASTER_SITES= ${MASTER_SITE_XORG:=proto/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/renderproto/Makefile b/x11/renderproto/Makefile
index 42d4bd7fa61..598eadbc954 100644
--- a/x11/renderproto/Makefile
+++ b/x11/renderproto/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2008/01/17 14:06:06 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2008/05/24 21:45:20 tnn Exp $
#
DISTNAME= renderproto-0.9.3
PKGREVISION= 1
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/proto/
+MASTER_SITES= ${MASTER_SITE_XORG:=proto/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/resourceproto/Makefile b/x11/resourceproto/Makefile
index 91c269246d5..e299ffd8b9d 100644
--- a/x11/resourceproto/Makefile
+++ b/x11/resourceproto/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/11/03 22:03:23 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/24 21:45:16 tnn Exp $
#
DISTNAME= resourceproto-1.0.2
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/proto/
+MASTER_SITES= ${MASTER_SITE_XORG:=proto/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/rgb/Makefile b/x11/rgb/Makefile
index d2db7ef6de7..ab06af2b3c6 100644
--- a/x11/rgb/Makefile
+++ b/x11/rgb/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2008/01/15 19:31:18 reed Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:19 tnn Exp $
#
DISTNAME= rgb-1.0.1
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/scrnsaverproto/Makefile b/x11/scrnsaverproto/Makefile
index 1385ac6b530..161d3033f4f 100644
--- a/x11/scrnsaverproto/Makefile
+++ b/x11/scrnsaverproto/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2006/11/03 20:14:42 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:16 tnn Exp $
#
DISTNAME= scrnsaverproto-1.1.0
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/proto/
+MASTER_SITES= ${MASTER_SITE_XORG:=proto/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/sessreg/Makefile b/x11/sessreg/Makefile
index b2bb581f351..040d4903761 100644
--- a/x11/sessreg/Makefile
+++ b/x11/sessreg/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/11/23 12:23:39 bjs Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:20 tnn Exp $
DISTNAME= sessreg-1.0.3
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/setxkbmap/Makefile b/x11/setxkbmap/Makefile
index 429d7a7121c..edd93ebbceb 100644
--- a/x11/setxkbmap/Makefile
+++ b/x11/setxkbmap/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2007/08/05 21:23:50 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2008/05/24 21:45:16 tnn Exp $
#
DISTNAME= setxkbmap-1.0.4
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/trapproto/Makefile b/x11/trapproto/Makefile
index 5c3b129d363..9627d717625 100644
--- a/x11/trapproto/Makefile
+++ b/x11/trapproto/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/11/03 20:02:34 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/24 21:45:16 tnn Exp $
#
DISTNAME= trapproto-3.4.3
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/proto/
+MASTER_SITES= ${MASTER_SITE_XORG:=proto/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/videoproto/Makefile b/x11/videoproto/Makefile
index b3a66965aa8..50e1692a90e 100644
--- a/x11/videoproto/Makefile
+++ b/x11/videoproto/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/11/03 20:18:23 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/24 21:45:16 tnn Exp $
#
DISTNAME= videoproto-2.2.2
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/proto/
+MASTER_SITES= ${MASTER_SITE_XORG:=proto/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/x11perf/Makefile b/x11/x11perf/Makefile
index 051b06af3eb..b3143481056 100644
--- a/x11/x11perf/Makefile
+++ b/x11/x11perf/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2007/06/19 09:39:11 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:19 tnn Exp $
#
DISTNAME= x11perf-1.4.1
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/xauth/Makefile b/x11/xauth/Makefile
index 4b837861dab..fc66813b71e 100644
--- a/x11/xauth/Makefile
+++ b/x11/xauth/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2008/04/16 14:26:26 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:16 tnn Exp $
#
DISTNAME= xauth-1.0.3
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/xbacklight/Makefile b/x11/xbacklight/Makefile
index e81043143a3..a2493684696 100644
--- a/x11/xbacklight/Makefile
+++ b/x11/xbacklight/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/03/04 19:43:26 tnn Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/24 21:45:18 tnn Exp $
#
DISTNAME= xbacklight-1.1
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/xbitmaps/Makefile b/x11/xbitmaps/Makefile
index 782e4d40b93..dd2345c0a42 100644
--- a/x11/xbitmaps/Makefile
+++ b/x11/xbitmaps/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/11/03 19:41:40 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/24 21:45:16 tnn Exp $
#
DISTNAME= xbitmaps-1.0.1
CATEGORIES= x11 devel
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/data/
+MASTER_SITES= ${MASTER_SITE_XORG:=data/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/xcalc/Makefile b/x11/xcalc/Makefile
index 74ac93644ab..5f51b11e95d 100644
--- a/x11/xcalc/Makefile
+++ b/x11/xcalc/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2007/11/23 12:09:53 bjs Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/24 21:45:19 tnn Exp $
#
DISTNAME= xcalc-1.0.2
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/xclock/Makefile b/x11/xclock/Makefile
index 122db559784..0cee5cb0018 100644
--- a/x11/xclock/Makefile
+++ b/x11/xclock/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2007/08/15 22:17:59 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2008/05/24 21:45:16 tnn Exp $
#
DISTNAME= xclock-1.0.3
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/xcmiscproto/Makefile b/x11/xcmiscproto/Makefile
index fc4dc2f16e6..21ed419372d 100644
--- a/x11/xcmiscproto/Makefile
+++ b/x11/xcmiscproto/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/11/03 17:50:36 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/24 21:45:16 tnn Exp $
#
DISTNAME= xcmiscproto-1.1.2
CATEGORIES= x11 devel
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/proto/
+MASTER_SITES= ${MASTER_SITE_XORG:=proto/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/xcompmgr/Makefile b/x11/xcompmgr/Makefile
index a159e19d141..10bbd86309b 100644
--- a/x11/xcompmgr/Makefile
+++ b/x11/xcompmgr/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2008/04/22 19:40:28 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2008/05/24 21:45:16 tnn Exp $
#
DISTNAME= xcompmgr-1.1.4
CATEGORIES= x11
-MASTER_SITES = http://xorg.freedesktop.org/archive/individual/app/
+MASTER_SITES = ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/xconsole/Makefile b/x11/xconsole/Makefile
index 8c9ae40f4d9..4f6809120a8 100644
--- a/x11/xconsole/Makefile
+++ b/x11/xconsole/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2007/11/23 12:04:03 bjs Exp $
+# $NetBSD: Makefile,v 1.5 2008/05/24 21:45:16 tnn Exp $
#
DISTNAME= xconsole-1.0.3
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/xdm/Makefile b/x11/xdm/Makefile
index 720f386d246..5bcbeb97a61 100644
--- a/x11/xdm/Makefile
+++ b/x11/xdm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2008/01/18 02:54:15 bjs Exp $
+# $NetBSD: Makefile,v 1.7 2008/05/24 21:45:20 tnn Exp $
DISTNAME= xdm-1.1.6
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= blair.sadewitz@gmail.com
diff --git a/x11/xdpyinfo/Makefile b/x11/xdpyinfo/Makefile
index e1f05ed86ac..b354b16dc56 100644
--- a/x11/xdpyinfo/Makefile
+++ b/x11/xdpyinfo/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2008/05/22 21:14:52 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2008/05/24 21:45:16 tnn Exp $
#
DISTNAME= xdpyinfo-1.0.3
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/xev/Makefile b/x11/xev/Makefile
index f0e7a85f7aa..ec18dff7a6b 100644
--- a/x11/xev/Makefile
+++ b/x11/xev/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.4 2008/04/16 21:52:26 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2008/05/24 21:45:16 tnn Exp $
#
DISTNAME= xev-1.0.3
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
-HOMEPAGE= http://xorg.freedesktop.org/releases/individual/app/
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Display X events
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/xextproto/Makefile b/x11/xextproto/Makefile
index a5e8315e0d7..194a3309c2c 100644
--- a/x11/xextproto/Makefile
+++ b/x11/xextproto/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2006/11/03 17:05:32 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/24 21:45:16 tnn Exp $
#
DISTNAME= xextproto-7.0.2
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/proto/
+MASTER_SITES= ${MASTER_SITE_XORG:=proto/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/xeyes/Makefile b/x11/xeyes/Makefile
index 4e8de7ce0c3..9070db52ac2 100644
--- a/x11/xeyes/Makefile
+++ b/x11/xeyes/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.2 2007/06/19 09:39:12 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:19 tnn Exp $
#
DISTNAME= xeyes-1.0.1
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
-HOMEPAGE= http://xorg.freedesktop.org/releases/individual/app/
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Follow the mouse demo
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/xf86-input-keyboard/Makefile b/x11/xf86-input-keyboard/Makefile
index fe181d3113c..0ac5576df41 100644
--- a/x11/xf86-input-keyboard/Makefile
+++ b/x11/xf86-input-keyboard/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.3 2008/01/15 23:46:13 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/24 21:45:20 tnn Exp $
DISTNAME= xf86-input-keyboard-1.2.2
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/driver/
+MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Modular Xorg keyboard driver
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/xf86-input-mouse/Makefile b/x11/xf86-input-mouse/Makefile
index 1aa19e0b1bf..0c604469d8f 100644
--- a/x11/xf86-input-mouse/Makefile
+++ b/x11/xf86-input-mouse/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.5 2008/01/15 23:49:48 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2008/05/24 21:45:16 tnn Exp $
DISTNAME= xf86-input-mouse-1.2.3
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/driver/
+MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Modular Xorg mouse driver
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/xf86-input-vmmouse/Makefile b/x11/xf86-input-vmmouse/Makefile
index 22a233966c3..018e7dd068d 100644
--- a/x11/xf86-input-vmmouse/Makefile
+++ b/x11/xf86-input-vmmouse/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/05/17 22:03:58 tnn Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/24 21:45:20 tnn Exp $
DISTNAME= xf86-input-vmmouse-12.5.0
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/driver/
+MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Modular Xorg VMware virtual mouse driver
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/xf86-input-void/Makefile b/x11/xf86-input-void/Makefile
index a7eaf16cd75..6f3aca72de3 100644
--- a/x11/xf86-input-void/Makefile
+++ b/x11/xf86-input-void/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.2 2008/04/07 17:59:57 tnn Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:17 tnn Exp $
DISTNAME= xf86-input-void-1.1.1
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/driver/
+MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Modular Xorg dummy input driver
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/xf86-video-apm/Makefile b/x11/xf86-video-apm/Makefile
index ad18b9334d8..608ad396ea7 100644
--- a/x11/xf86-video-apm/Makefile
+++ b/x11/xf86-video-apm/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/03/22 15:42:29 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/24 21:45:17 tnn Exp $
#
DISTNAME= xf86-video-apm-1.1.1
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/driver/
+MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Modular Xorg Alliance ProtMotion video driver
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/xf86-video-ark/Makefile b/x11/xf86-video-ark/Makefile
index 9a08cd9a06e..3710123e991 100644
--- a/x11/xf86-video-ark/Makefile
+++ b/x11/xf86-video-ark/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/03/20 15:37:45 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/24 21:45:17 tnn Exp $
#
DISTNAME= xf86-video-ark-0.6.0
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/driver/
+MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Modular Xorg ARK Logic video driver
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/xf86-video-ast/Makefile b/x11/xf86-video-ast/Makefile
index 09e709c60e4..c95687a1f77 100644
--- a/x11/xf86-video-ast/Makefile
+++ b/x11/xf86-video-ast/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/03/20 15:44:13 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/24 21:45:17 tnn Exp $
#
DISTNAME= xf86-video-ast-0.81.0
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/driver/
+MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Modular Xorg AST2000 video driver
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/xf86-video-ati/Makefile b/x11/xf86-video-ati/Makefile
index bc8998aaf24..1110dd3d4d7 100644
--- a/x11/xf86-video-ati/Makefile
+++ b/x11/xf86-video-ati/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.5 2007/08/15 18:16:35 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2008/05/24 21:45:17 tnn Exp $
DISTNAME= xf86-video-ati-6.6.3
PKGREVISION= 1
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/driver/
+MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Modular Xorg ATI video driver
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/xf86-video-chips/Makefile b/x11/xf86-video-chips/Makefile
index 4546394fb63..8025e02eb26 100644
--- a/x11/xf86-video-chips/Makefile
+++ b/x11/xf86-video-chips/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/03/20 16:03:59 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/24 21:45:17 tnn Exp $
#
DISTNAME= xf86-video-chips-1.1.1
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/driver/
+MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Modular Xorg Chips and Technologies video driver
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/xf86-video-cirrus/Makefile b/x11/xf86-video-cirrus/Makefile
index ab428de8ac7..ef275c626a1 100644
--- a/x11/xf86-video-cirrus/Makefile
+++ b/x11/xf86-video-cirrus/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/03/20 16:11:14 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/24 21:45:17 tnn Exp $
#
DISTNAME= xf86-video-cirrus-1.1.0
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/driver/
+MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Modular Xorg Cirrus Logic video driver
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/xf86-video-cyrix/Makefile b/x11/xf86-video-cyrix/Makefile
index 944190daa96..86722bad843 100644
--- a/x11/xf86-video-cyrix/Makefile
+++ b/x11/xf86-video-cyrix/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/03/20 16:36:59 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/24 21:45:17 tnn Exp $
#
DISTNAME= xf86-video-cyrix-1.1.0
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/driver/
+MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Modular Xorg Cyrix MediaGX video driver
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/xf86-video-glint/Makefile b/x11/xf86-video-glint/Makefile
index 2c9e78cae5b..eceebd5b4f7 100644
--- a/x11/xf86-video-glint/Makefile
+++ b/x11/xf86-video-glint/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.2 2007/08/15 20:05:01 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:17 tnn Exp $
#
DISTNAME= xf86-video-glint-1.1.1
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/driver/
+MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Modular Xorg GLINT/Permedia video driver
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/xf86-video-i128/Makefile b/x11/xf86-video-i128/Makefile
index e3094c6b294..b00a19801c2 100644
--- a/x11/xf86-video-i128/Makefile
+++ b/x11/xf86-video-i128/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/03/22 15:43:29 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/24 21:45:17 tnn Exp $
#
DISTNAME= xf86-video-i128-1.2.1
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/driver/
+MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Modular Xorg Number 9 I128 video driver
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/xf86-video-i740/Makefile b/x11/xf86-video-i740/Makefile
index 1791b9ed984..7bb0743dc18 100644
--- a/x11/xf86-video-i740/Makefile
+++ b/x11/xf86-video-i740/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/03/22 15:43:34 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/24 21:45:17 tnn Exp $
#
DISTNAME= xf86-video-i740-1.1.0
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/driver/
+MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Modular Xorg Intel i740 video driver
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/xf86-video-i810/Makefile b/x11/xf86-video-i810/Makefile
index bf0265c02d4..8f01dbaf1a4 100644
--- a/x11/xf86-video-i810/Makefile
+++ b/x11/xf86-video-i810/Makefile
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.4 2007/08/15 19:44:55 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2008/05/24 21:45:17 tnn Exp $
DISTNAME= xf86-video-i810-1.7.4
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/driver/
+MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
CONFLICTS+= xf86-video-intel-[0-9]*
MAINTAINER= joerg@NetBSD.org
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Modular Xorg Intel video driver
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/xf86-video-imstt/Makefile b/x11/xf86-video-imstt/Makefile
index 42b013b04fe..aab1a7ed261 100644
--- a/x11/xf86-video-imstt/Makefile
+++ b/x11/xf86-video-imstt/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.2 2007/10/24 21:01:01 xtraeme Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:17 tnn Exp $
#
DISTNAME= xf86-video-imstt-1.1.0
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/driver/
+MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Modular Xorg IMS Twin Turbo 128 video driver
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/xf86-video-intel/Makefile b/x11/xf86-video-intel/Makefile
index 69501906c27..e1399331693 100644
--- a/x11/xf86-video-intel/Makefile
+++ b/x11/xf86-video-intel/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2008/04/23 19:00:46 tnn Exp $
+# $NetBSD: Makefile,v 1.9 2008/05/24 21:45:20 tnn Exp $
DISTNAME= xf86-video-intel-2.3.0
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/driver/
+MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
CONFLICTS+= xf86-video-i810-[0-9]*
diff --git a/x11/xf86-video-mga/Makefile b/x11/xf86-video-mga/Makefile
index a7851b8ef91..55d8aefca1e 100644
--- a/x11/xf86-video-mga/Makefile
+++ b/x11/xf86-video-mga/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.3 2008/01/30 13:17:09 tnn Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/24 21:45:17 tnn Exp $
#
DISTNAME= xf86-video-mga-1.4.8
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/driver/
+MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Modular Xorg Matrox video driver
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/xf86-video-neomagic/Makefile b/x11/xf86-video-neomagic/Makefile
index 256c937c1f2..3dae0d4119f 100644
--- a/x11/xf86-video-neomagic/Makefile
+++ b/x11/xf86-video-neomagic/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/03/22 15:43:47 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/24 21:45:17 tnn Exp $
#
DISTNAME= xf86-video-neomagic-1.1.1
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/driver/
+MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Modular Xorg Neomagic video driver
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/xf86-video-nsc/Makefile b/x11/xf86-video-nsc/Makefile
index e04b4a934ef..2b5145b2ed4 100644
--- a/x11/xf86-video-nsc/Makefile
+++ b/x11/xf86-video-nsc/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/03/22 15:43:52 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/24 21:45:17 tnn Exp $
#
DISTNAME= xf86-video-nsc-2.8.2
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/driver/
+MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Modular Xorg NSC Geode video driver
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/xf86-video-nv/Makefile b/x11/xf86-video-nv/Makefile
index 5360a3e6d32..17fd45a6ba1 100644
--- a/x11/xf86-video-nv/Makefile
+++ b/x11/xf86-video-nv/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.8 2008/03/07 20:05:57 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2008/05/24 21:45:17 tnn Exp $
DISTNAME= xf86-video-nv-2.1.8
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/driver/
+MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Modular Xorg NVIDIA video driver
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/xf86-video-radeonhd/Makefile b/x11/xf86-video-radeonhd/Makefile
index fdfae299600..59118d1da57 100644
--- a/x11/xf86-video-radeonhd/Makefile
+++ b/x11/xf86-video-radeonhd/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2008/04/15 08:33:54 xtraeme Exp $
+# $NetBSD: Makefile,v 1.7 2008/05/24 21:45:19 tnn Exp $
#
DISTNAME= xf86-video-radeonhd-1.2.1
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/driver/
+MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/xf86-video-rendition/Makefile b/x11/xf86-video-rendition/Makefile
index 633c4e6a3ae..c86256aeeff 100644
--- a/x11/xf86-video-rendition/Makefile
+++ b/x11/xf86-video-rendition/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/03/22 15:43:57 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/24 21:45:17 tnn Exp $
#
DISTNAME= xf86-video-rendition-4.1.3
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/driver/
+MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Modular Xorg Rendition video driver
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/xf86-video-s3/Makefile b/x11/xf86-video-s3/Makefile
index 204f4bfc847..c83b241d2a1 100644
--- a/x11/xf86-video-s3/Makefile
+++ b/x11/xf86-video-s3/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/03/22 15:44:04 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/24 21:45:17 tnn Exp $
#
DISTNAME= xf86-video-s3-0.5.0
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/driver/
+MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Modular Xorg S3 video driver
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/xf86-video-s3virge/Makefile b/x11/xf86-video-s3virge/Makefile
index 8fb0efdff32..a559c9f2aba 100644
--- a/x11/xf86-video-s3virge/Makefile
+++ b/x11/xf86-video-s3virge/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/03/22 15:44:08 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/24 21:45:17 tnn Exp $
#
DISTNAME= xf86-video-s3virge-1.9.1
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/driver/
+MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Modular Xorg S3 ViRGE video driver
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/xf86-video-savage/Makefile b/x11/xf86-video-savage/Makefile
index 45e85186655..5966726a033 100644
--- a/x11/xf86-video-savage/Makefile
+++ b/x11/xf86-video-savage/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.3 2008/01/17 23:34:57 tnn Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/24 21:45:17 tnn Exp $
#
DISTNAME= xf86-video-savage-2.1.3
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/driver/
+MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Modular Xorg S3 Savage video driver
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/xf86-video-siliconmotion/Makefile b/x11/xf86-video-siliconmotion/Makefile
index 9164b7600ed..e26180c33cf 100644
--- a/x11/xf86-video-siliconmotion/Makefile
+++ b/x11/xf86-video-siliconmotion/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/03/22 15:44:16 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/24 21:45:17 tnn Exp $
#
DISTNAME= xf86-video-siliconmotion-1.5.1
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/driver/
+MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Modular Xorg Silicon Motion video driver
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/xf86-video-sis/Makefile b/x11/xf86-video-sis/Makefile
index ab433ddd53c..e37f2a8af86 100644
--- a/x11/xf86-video-sis/Makefile
+++ b/x11/xf86-video-sis/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.2 2007/08/15 18:03:32 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:16 tnn Exp $
#
DISTNAME= xf86-video-sis-0.9.3
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/driver/
+MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Modular Xorg SiS and XGI video driver
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/xf86-video-tdfx/Makefile b/x11/xf86-video-tdfx/Makefile
index 4a967a9ef24..c617d2b3155 100644
--- a/x11/xf86-video-tdfx/Makefile
+++ b/x11/xf86-video-tdfx/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.2 2007/08/15 17:55:41 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:19 tnn Exp $
#
DISTNAME= xf86-video-tdfx-1.3.0
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/driver/
+MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Modular Xorg 3Dfx video driver
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/xf86-video-tga/Makefile b/x11/xf86-video-tga/Makefile
index 6f64c3e1671..dcc811952d0 100644
--- a/x11/xf86-video-tga/Makefile
+++ b/x11/xf86-video-tga/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/03/21 00:23:02 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/24 21:45:17 tnn Exp $
#
DISTNAME= xf86-video-tga-1.1.0
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/driver/
+MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Modular Xorg TGA video driver
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/xf86-video-trident/Makefile b/x11/xf86-video-trident/Makefile
index 91d0c4f4146..e3a012b8e8c 100644
--- a/x11/xf86-video-trident/Makefile
+++ b/x11/xf86-video-trident/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/03/21 00:21:55 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/24 21:45:17 tnn Exp $
#
DISTNAME= xf86-video-trident-1.2.3
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/driver/
+MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Modular Xorg Trident video driver
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/xf86-video-tseng/Makefile b/x11/xf86-video-tseng/Makefile
index 9cacfa8b628..73a51e20ddd 100644
--- a/x11/xf86-video-tseng/Makefile
+++ b/x11/xf86-video-tseng/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/03/21 00:21:18 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/24 21:45:17 tnn Exp $
#
DISTNAME= xf86-video-tseng-1.1.1
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/driver/
+MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Modular Xorg Tseng Labs video driver
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/xf86-video-vesa/Makefile b/x11/xf86-video-vesa/Makefile
index 550694821ca..030975e53fc 100644
--- a/x11/xf86-video-vesa/Makefile
+++ b/x11/xf86-video-vesa/Makefile
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2007/08/02 14:15:18 sborrill Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/24 21:45:18 tnn Exp $
#
DISTNAME= xf86-video-vesa-1.3.0
PKGREVISION= 1
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/driver/
+MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Modular Xorg VESA video driver
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/xf86-video-vga/Makefile b/x11/xf86-video-vga/Makefile
index 54d464aa413..540a89fbe31 100644
--- a/x11/xf86-video-vga/Makefile
+++ b/x11/xf86-video-vga/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/03/21 00:20:45 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/24 21:45:18 tnn Exp $
#
DISTNAME= xf86-video-vga-4.1.0
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/driver/
+MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Modular Xorg generic VGA video driver
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/xf86-video-via/Makefile b/x11/xf86-video-via/Makefile
index 62346df30c5..3265a1a1ad9 100644
--- a/x11/xf86-video-via/Makefile
+++ b/x11/xf86-video-via/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.6 2008/04/12 22:43:15 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2008/05/24 21:45:18 tnn Exp $
#
DISTNAME= xf86-video-via-0.2.2
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/driver/
+MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Modular Xorg VIA unichrome video driver
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/xf86-video-vmware/Makefile b/x11/xf86-video-vmware/Makefile
index 5607a379499..235c4ffa23a 100644
--- a/x11/xf86-video-vmware/Makefile
+++ b/x11/xf86-video-vmware/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.2 2008/05/17 21:52:47 tnn Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:16 tnn Exp $
#
DISTNAME= xf86-video-vmware-10.16.1
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/driver/
+MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Modular Xorg VMware virtual video driver
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/xf86-video-wsfb/Makefile b/x11/xf86-video-wsfb/Makefile
index 8d8878e31e4..9c2c814b4d6 100644
--- a/x11/xf86-video-wsfb/Makefile
+++ b/x11/xf86-video-wsfb/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.3 2007/03/20 15:10:01 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/24 21:45:18 tnn Exp $
DISTNAME= xf86-video-wsfb-0.2.1
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/driver/
+MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= reed@NetBSD.org
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Modular Xorg wsdisplay framebuffer video driver
ONLY_FOR_PLATFORM= NetBSD-*-* OpenBSD-*-*
diff --git a/x11/xf86bigfontproto/Makefile b/x11/xf86bigfontproto/Makefile
index d5b201e644e..2b4bb1b8645 100644
--- a/x11/xf86bigfontproto/Makefile
+++ b/x11/xf86bigfontproto/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/11/03 17:53:21 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/24 21:45:18 tnn Exp $
#
DISTNAME= xf86bigfontproto-1.1.2
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/proto/
+MASTER_SITES= ${MASTER_SITE_XORG:=proto/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/xf86dgaproto/Makefile b/x11/xf86dgaproto/Makefile
index 4faf0e86595..9b448515718 100644
--- a/x11/xf86dgaproto/Makefile
+++ b/x11/xf86dgaproto/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2008/01/15 23:27:32 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:18 tnn Exp $
#
DISTNAME= xf86dgaproto-2.0.3
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/proto/
+MASTER_SITES= ${MASTER_SITE_XORG:=proto/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/xf86driproto/Makefile b/x11/xf86driproto/Makefile
index 9ea777b4870..4de6b5cc028 100644
--- a/x11/xf86driproto/Makefile
+++ b/x11/xf86driproto/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2008/04/16 14:33:04 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:18 tnn Exp $
#
DISTNAME= xf86driproto-2.0.4
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/proto/
+MASTER_SITES= ${MASTER_SITE_XORG:=proto/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/xf86miscproto/Makefile b/x11/xf86miscproto/Makefile
index c25a23b6b28..1004f78f375 100644
--- a/x11/xf86miscproto/Makefile
+++ b/x11/xf86miscproto/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/11/14 14:53:41 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/24 21:45:18 tnn Exp $
#
DISTNAME= xf86miscproto-0.9.2
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/proto/
+MASTER_SITES= ${MASTER_SITE_XORG:=proto/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/xf86vidmodeproto/Makefile b/x11/xf86vidmodeproto/Makefile
index e380e21c51c..5fe22e41c44 100644
--- a/x11/xf86vidmodeproto/Makefile
+++ b/x11/xf86vidmodeproto/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/11/14 15:01:55 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/24 21:45:18 tnn Exp $
#
DISTNAME= xf86vidmodeproto-2.2.2
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/proto/
+MASTER_SITES= ${MASTER_SITE_XORG:=proto/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/xfd/Makefile b/x11/xfd/Makefile
index ffcd4c136f5..8e5779bef86 100644
--- a/x11/xfd/Makefile
+++ b/x11/xfd/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/05/19 22:15:55 taca Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/24 21:45:20 tnn Exp $
#
DISTNAME= xfd-1.0.1
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://xorg.freedesktop.org/releases/individual/app/
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Display all the characters in an X font
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/xfontsel/Makefile b/x11/xfontsel/Makefile
index 13a02478fe6..e8ff85384aa 100644
--- a/x11/xfontsel/Makefile
+++ b/x11/xfontsel/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/04/12 18:03:25 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/24 21:45:19 tnn Exp $
#
DISTNAME= xfontsel-1.0.2
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/xgamma/Makefile b/x11/xgamma/Makefile
index 53085c79430..badc27661dd 100644
--- a/x11/xgamma/Makefile
+++ b/x11/xgamma/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2007/08/15 21:38:04 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/24 21:45:19 tnn Exp $
#
DISTNAME= xgamma-1.0.2
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/xhost/Makefile b/x11/xhost/Makefile
index f40615a2337..a3edcbc707a 100644
--- a/x11/xhost/Makefile
+++ b/x11/xhost/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2007/10/15 14:39:46 abs Exp $
+# $NetBSD: Makefile,v 1.7 2008/05/24 21:45:18 tnn Exp $
#
DISTNAME= xhost-1.0.2
PKGREVISION= 1
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/xineramaproto/Makefile b/x11/xineramaproto/Makefile
index 3b4e9d94740..c43703648a9 100644
--- a/x11/xineramaproto/Makefile
+++ b/x11/xineramaproto/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/11/03 20:07:33 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/24 21:45:18 tnn Exp $
#
DISTNAME= xineramaproto-1.1.2
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/proto/
+MASTER_SITES= ${MASTER_SITE_XORG:=proto/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/xinit/Makefile b/x11/xinit/Makefile
index 00130e7381e..f6bbf91b3c3 100644
--- a/x11/xinit/Makefile
+++ b/x11/xinit/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2008/05/22 21:24:17 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2008/05/24 21:45:18 tnn Exp $
#
DISTNAME= xinit-1.0.9
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/xinput/Makefile b/x11/xinput/Makefile
index e5cbd67c235..b3d5b2758d8 100644
--- a/x11/xinput/Makefile
+++ b/x11/xinput/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/03/03 03:04:56 bjs Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/24 21:45:17 tnn Exp $
#
DISTNAME= xinput-1.3.0
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
MAINTAINER= bjs@NetBSD.org
-HOMEPAGE= http://xorg.freedesktop.org/releases/individual/app/
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Xinput diagnostic utility for modular X.org
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/xkbcomp/Makefile b/x11/xkbcomp/Makefile
index aeec36648cb..eccf66cfd98 100644
--- a/x11/xkbcomp/Makefile
+++ b/x11/xkbcomp/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2008/05/09 04:01:55 bjs Exp $
+# $NetBSD: Makefile,v 1.6 2008/05/24 21:45:18 tnn Exp $
#
DISTNAME= xkbcomp-1.0.5
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/xkbdata/Makefile b/x11/xkbdata/Makefile
index caaa0ce1a60..65136f5bb79 100644
--- a/x11/xkbdata/Makefile
+++ b/x11/xkbdata/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2006/12/05 03:09:38 reed Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:18 tnn Exp $
#
DISTNAME= xkbdata-1.0.1
PKGREVISION= 1
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/data/
+MASTER_SITES= ${MASTER_SITE_XORG:=data/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/xkill/Makefile b/x11/xkill/Makefile
index 3fa3ee10218..5dca5660947 100644
--- a/x11/xkill/Makefile
+++ b/x11/xkill/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2007/06/19 09:39:12 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:19 tnn Exp $
#
DISTNAME= xkill-1.0.1
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/xload/Makefile b/x11/xload/Makefile
index 437fa1c21d5..3c1379182cc 100644
--- a/x11/xload/Makefile
+++ b/x11/xload/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.5 2007/11/23 11:56:02 bjs Exp $
+# $NetBSD: Makefile,v 1.6 2008/05/24 21:45:18 tnn Exp $
#
DISTNAME= xload-1.0.2
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
-HOMEPAGE= http://xorg.freedesktop.org/releases/individual/app/
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= System load average display for X
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/xlogo/Makefile b/x11/xlogo/Makefile
index 409e2a599fd..0cea7c5045e 100644
--- a/x11/xlogo/Makefile
+++ b/x11/xlogo/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2008/03/24 11:51:58 xtraeme Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/24 21:45:19 tnn Exp $
#
DISTNAME= xlogo-1.0.1
PKGREVISION= 1
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/xlsclients/Makefile b/x11/xlsclients/Makefile
index 5384af6f99a..e3416d7ba7d 100644
--- a/x11/xlsclients/Makefile
+++ b/x11/xlsclients/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2008/02/17 21:15:33 tnn Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:16 tnn Exp $
#
DISTNAME= xlsclients-1.0.1
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/xmag/Makefile b/x11/xmag/Makefile
index f19d4101af5..0875eadc14a 100644
--- a/x11/xmag/Makefile
+++ b/x11/xmag/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2007/09/21 19:40:22 bjs Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/24 21:45:19 tnn Exp $
#
DISTNAME= xmag-1.0.2
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/xman/Makefile b/x11/xman/Makefile
index e8a8751800d..fcd6b26d264 100644
--- a/x11/xman/Makefile
+++ b/x11/xman/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2008/03/24 12:00:29 xtraeme Exp $
+# $NetBSD: Makefile,v 1.6 2008/05/24 21:45:19 tnn Exp $
#
DISTNAME= xman-1.0.3
PKGREVISION= 1
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/xmessage/Makefile b/x11/xmessage/Makefile
index 8948d03979a..f0ecd12b4af 100644
--- a/x11/xmessage/Makefile
+++ b/x11/xmessage/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2007/08/15 21:57:08 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/24 21:45:18 tnn Exp $
#
DISTNAME= xmessage-1.0.2
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/xmodmap/Makefile b/x11/xmodmap/Makefile
index 506c42c6b98..e7d963203d7 100644
--- a/x11/xmodmap/Makefile
+++ b/x11/xmodmap/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2007/08/15 22:03:03 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:18 tnn Exp $
#
DISTNAME= xmodmap-1.0.3
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/xmore/Makefile b/x11/xmore/Makefile
index af0c028936c..29ebb0aedd3 100644
--- a/x11/xmore/Makefile
+++ b/x11/xmore/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2007/06/19 09:39:14 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/24 21:45:19 tnn Exp $
#
DISTNAME= xmore-1.0.1
PKGREVISION= 1
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/xorg-cf-files/Makefile b/x11/xorg-cf-files/Makefile
index 1296ca98faa..3382d09ed95 100644
--- a/x11/xorg-cf-files/Makefile
+++ b/x11/xorg-cf-files/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.7 2008/01/25 18:55:02 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2008/05/24 21:45:18 tnn Exp $
#
DISTNAME= xorg-cf-files-1.0.2
PKGREVISION= 5
CATEGORIES= x11 devel
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/util/
+MASTER_SITES= ${MASTER_SITE_XORG:=util/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
-HOMEPAGE= http://xorg.freedesktop.org/releases/individual/util/
+HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Xorg imake rules
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/xplsprinters/Makefile b/x11/xplsprinters/Makefile
index 86f7b5b91b2..953a2330a07 100644
--- a/x11/xplsprinters/Makefile
+++ b/x11/xplsprinters/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2007/06/19 09:39:14 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:19 tnn Exp $
#
DISTNAME= xplsprinters-1.0.1
CATEGORIES= x11 print
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/xprehashprinterlist/Makefile b/x11/xprehashprinterlist/Makefile
index 8e34471e556..7f106da7a0c 100644
--- a/x11/xprehashprinterlist/Makefile
+++ b/x11/xprehashprinterlist/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2007/06/19 09:39:14 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:19 tnn Exp $
#
DISTNAME= xprehashprinterlist-1.0.1
CATEGORIES= x11 print
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/xprop/Makefile b/x11/xprop/Makefile
index 58c67eceb78..05b5536949b 100644
--- a/x11/xprop/Makefile
+++ b/x11/xprop/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2007/08/15 22:09:02 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2008/05/24 21:45:18 tnn Exp $
#
DISTNAME= xprop-1.0.3
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/xproto/Makefile b/x11/xproto/Makefile
index f52655e2d6d..b4ef8fa6681 100644
--- a/x11/xproto/Makefile
+++ b/x11/xproto/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2008/03/07 20:03:18 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2008/05/24 21:45:18 tnn Exp $
#
DISTNAME= xproto-7.0.12
CATEGORIES= x11 devel
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/proto/
+MASTER_SITES= ${MASTER_SITE_XORG:=proto/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/xproxymanagementprotocol/Makefile b/x11/xproxymanagementprotocol/Makefile
index 5f1c521adcf..b8267b37f56 100644
--- a/x11/xproxymanagementprotocol/Makefile
+++ b/x11/xproxymanagementprotocol/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/04/10 13:47:08 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2008/05/24 21:45:19 tnn Exp $
#
DISTNAME= xproxymanagementprotocol-1.0.2
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/proto/
+MASTER_SITES= ${MASTER_SITE_XORG:=proto/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/xrandr/Makefile b/x11/xrandr/Makefile
index 4fe2680d816..5a5ec086ec9 100644
--- a/x11/xrandr/Makefile
+++ b/x11/xrandr/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2008/05/17 20:33:50 tnn Exp $
+# $NetBSD: Makefile,v 1.7 2008/05/24 21:45:18 tnn Exp $
#
DISTNAME= xrandr-1.2.3
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/xrdb/Makefile b/x11/xrdb/Makefile
index e5ce59e0a1f..9ea07554afd 100644
--- a/x11/xrdb/Makefile
+++ b/x11/xrdb/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2007/08/16 00:44:41 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/24 21:45:18 tnn Exp $
#
DISTNAME= xrdb-1.0.4
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/xrefresh/Makefile b/x11/xrefresh/Makefile
index 888cd89efd3..85dcf64d242 100644
--- a/x11/xrefresh/Makefile
+++ b/x11/xrefresh/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2007/06/19 09:39:14 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:19 tnn Exp $
#
DISTNAME= xrefresh-1.0.2
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/xset/Makefile b/x11/xset/Makefile
index dbd63efb654..c6dd25e88a7 100644
--- a/x11/xset/Makefile
+++ b/x11/xset/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2008/04/16 21:49:37 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2008/05/24 21:45:18 tnn Exp $
#
DISTNAME= xset-1.0.4
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/xsetmode/Makefile b/x11/xsetmode/Makefile
index b52ad3b54fa..cf903e1326f 100644
--- a/x11/xsetmode/Makefile
+++ b/x11/xsetmode/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2007/06/19 09:39:15 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:19 tnn Exp $
#
DISTNAME= xsetmode-1.0.0
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/xsetpointer/Makefile b/x11/xsetpointer/Makefile
index 3fb835ff667..549e46e2149 100644
--- a/x11/xsetpointer/Makefile
+++ b/x11/xsetpointer/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2007/06/19 09:39:15 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:19 tnn Exp $
#
DISTNAME= xsetpointer-1.0.1
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/xsetroot/Makefile b/x11/xsetroot/Makefile
index f2ea2416785..ee1f44d74ae 100644
--- a/x11/xsetroot/Makefile
+++ b/x11/xsetroot/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2007/08/15 22:12:53 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/24 21:45:18 tnn Exp $
#
DISTNAME= xsetroot-1.0.2
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/xsm/Makefile b/x11/xsm/Makefile
index b9149bbd22c..fab25b530dc 100644
--- a/x11/xsm/Makefile
+++ b/x11/xsm/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2008/05/17 20:52:13 tnn Exp $
+# $NetBSD: Makefile,v 1.5 2008/05/24 21:45:19 tnn Exp $
#
DISTNAME= xsm-1.0.1
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/xtrans/Makefile b/x11/xtrans/Makefile
index 9e90c3fd325..64f22938b2c 100644
--- a/x11/xtrans/Makefile
+++ b/x11/xtrans/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2008/05/09 22:53:21 dsainty Exp $
+# $NetBSD: Makefile,v 1.10 2008/05/24 21:45:18 tnn Exp $
#
DISTNAME= xtrans-1.2
PKGREVISION= 1
CATEGORIES= x11 net
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/lib/
+MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/xvinfo/Makefile b/x11/xvinfo/Makefile
index df26bdf2053..5829d3063b3 100644
--- a/x11/xvinfo/Makefile
+++ b/x11/xvinfo/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2007/11/23 12:01:19 bjs Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/24 21:45:20 tnn Exp $
#
DISTNAME= xvinfo-1.0.2
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/xwd/Makefile b/x11/xwd/Makefile
index 65da85262f3..29d8a277150 100644
--- a/x11/xwd/Makefile
+++ b/x11/xwd/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2007/07/28 00:52:34 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/24 21:45:18 tnn Exp $
#
DISTNAME= xwd-1.0.1
CATEGORIES= x11 graphics
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= reed@reedmedia.net
diff --git a/x11/xwininfo/Makefile b/x11/xwininfo/Makefile
index 984712002d9..8ed77bd9586 100644
--- a/x11/xwininfo/Makefile
+++ b/x11/xwininfo/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2007/09/21 19:50:31 bjs Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/24 21:45:20 tnn Exp $
#
DISTNAME= xwininfo-1.0.3
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg@NetBSD.org
diff --git a/x11/xwud/Makefile b/x11/xwud/Makefile
index 05c02a19c6e..1ffaa88a380 100644
--- a/x11/xwud/Makefile
+++ b/x11/xwud/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2007/07/28 00:55:33 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/24 21:45:16 tnn Exp $
#
DISTNAME= xwud-1.0.1
CATEGORIES= x11 graphics
-MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= reed@reedmedia.net