various packages and bitbake.conf: introduce FREEDESKTOP_CVS and make use of it.

61 files changed, 62 insertions, 61 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index c28e3a7e22..98c2002689 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -304,6 +304,7 @@ XORG_MIRROR = "http://xorg.freedesktop.org/releases"
 GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources"
 FREEBSD_MIRROR = "ftp://ftp.freebsd.org/pub/FreeBSD/"
 HANDHELDS_CVS = "cvs://anoncvs:anoncvs@anoncvs.handhelds.org/cvs"
+FREEDESKTOP_CVS = "cvs://anoncvs:anoncvs@anoncvs.freedesktop.org/cvs"
 GENTOO_MIRROR = "http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles"
 
 # You can use the mirror of your country to get faster downloads by putting
diff --git a/packages/compositeext/compositeext_cvs.bb b/packages/compositeext/compositeext_cvs.bb
index 75317fabcd..94160746e6 100644
--- a/packages/compositeext/compositeext_cvs.bb
+++ b/packages/compositeext/compositeext_cvs.bb
@@ -6,7 +6,7 @@ DEPENDS = "xextensions fixesext"
 DESCRIPTION = "X Composite extension headers and specification"
 DEFAULT_PREFERENCE = "1"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=CompositeExt"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=CompositeExt"
 S = "${WORKDIR}/CompositeExt"
 
 inherit autotools pkgconfig
diff --git a/packages/damageext/damageext_cvs.bb b/packages/damageext/damageext_cvs.bb
index 1489e5355b..86a6032b29 100644
--- a/packages/damageext/damageext_cvs.bb
+++ b/packages/damageext/damageext_cvs.bb
@@ -6,7 +6,7 @@ DEPENDS = "xextensions fixesext"
 DESCRIPTION = "X Damage extension headers and specification"
 PR = "r1"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=DamageExt"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=DamageExt"
 S = "${WORKDIR}/DamageExt"
 
 inherit autotools pkgconfig
diff --git a/packages/fdclock/fdclock_cvs.bb b/packages/fdclock/fdclock_cvs.bb
index 2c37fb67b0..8684a8fe73 100644
--- a/packages/fdclock/fdclock_cvs.bb
+++ b/packages/fdclock/fdclock_cvs.bb
@@ -6,7 +6,7 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DEPENDS = "cairo"
 DESCRIPTION = "The freedesktop.org clock"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xapps;module=fdclock"
+SRC_URI = "${FREEDESKTOP_CVS}/xapps;module=fdclock"
 S = "${WORKDIR}/fdclock"
 
 inherit autotools 
diff --git a/packages/fixesext/fixesext_cvs.bb b/packages/fixesext/fixesext_cvs.bb
index c279256fa2..30b9460138 100644
--- a/packages/fixesext/fixesext_cvs.bb
+++ b/packages/fixesext/fixesext_cvs.bb
@@ -6,7 +6,7 @@ DEPENDS = "xextensions"
 DESCRIPTION = "X Fixes extension headers and specification."
 DEFAULT_PREFERENCE = "1"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=FixesExt"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=FixesExt"
 S = "${WORKDIR}/FixesExt"
 
 inherit autotools pkgconfig
diff --git a/packages/fs/fs_cvs.bb b/packages/fs/fs_cvs.bb
index 282a96cbcd..6bab1d8c3b 100644
--- a/packages/fs/fs_cvs.bb
+++ b/packages/fs/fs_cvs.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "xfont xtrans"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=FS"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=FS"
 S = "${WORKDIR}/FS"
 
 inherit autotools pkgconfig 
diff --git a/packages/ice/ice_cvs.bb b/packages/ice/ice_cvs.bb
index f3ead54e92..fa49ee76b9 100644
--- a/packages/ice/ice_cvs.bb
+++ b/packages/ice/ice_cvs.bb
@@ -7,7 +7,7 @@ DEPENDS = "x11"
 DESCRIPTION = "X11 ICE library"
 PR = "r1"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=ICE"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=ICE"
 S = "${WORKDIR}/ICE"
 
 inherit autotools pkgconfig 
diff --git a/packages/libsm/libsm_cvs.bb b/packages/libsm/libsm_cvs.bb
index ff5fcd8c0e..0c121f72d0 100644
--- a/packages/libsm/libsm_cvs.bb
+++ b/packages/libsm/libsm_cvs.bb
@@ -8,7 +8,7 @@ PR = "r1"
 
 DEFAULT_PREFERENCE="-1"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=SM"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=SM"
 S = "${WORKDIR}/SM"
 
 inherit autotools pkgconfig 
diff --git a/packages/libxcursor/libxcursor_cvs.bb b/packages/libxcursor/libxcursor_cvs.bb
index a719652530..5fe2334b85 100644
--- a/packages/libxcursor/libxcursor_cvs.bb
+++ b/packages/libxcursor/libxcursor_cvs.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "X Cursor library"
 DEPENDS = "libxfixes"
 PR = "r2"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xcursor"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xcursor"
 S = "${WORKDIR}/Xcursor"
 FILES_${PN} += "${libdir}/libXcursor.so"
 
diff --git a/packages/libxfixes/libxfixes_cvs.bb b/packages/libxfixes/libxfixes_cvs.bb
index 6a9ae6194f..f02f9518cf 100644
--- a/packages/libxfixes/libxfixes_cvs.bb
+++ b/packages/libxfixes/libxfixes_cvs.bb
@@ -4,7 +4,7 @@ SECTION = "x11/libs"
 DEPENDS = "x11 fixesext"
 DESCRIPTION = "X Fixes extension library."
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xfixes"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xfixes"
 S = "${WORKDIR}/Xfixes"
 
 inherit autotools pkgconfig 
diff --git a/packages/libxft/libxft_cvs.bb b/packages/libxft/libxft_cvs.bb
index 6d5c11f36b..01c53b47d5 100644
--- a/packages/libxft/libxft_cvs.bb
+++ b/packages/libxft/libxft_cvs.bb
@@ -5,7 +5,7 @@ DEPENDS = "x11 xproto libxrender freetype fontconfig"
 DESCRIPTION = "X FreeType library. Client-side fonts with FreeType."
 PROVIDES = "xft"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xft"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xft"
 S = "${WORKDIR}/Xft"
 
 FILES_${PN} = ${libdir}/lib*.so.*
diff --git a/packages/libxi/libxi_cvs.bb b/packages/libxi/libxi_cvs.bb
index 3935d4a636..5b221d9b36 100644
--- a/packages/libxi/libxi_cvs.bb
+++ b/packages/libxi/libxi_cvs.bb
@@ -5,7 +5,7 @@ DEPENDS = "xproto x11 xextensions"
 DESCRIPTION = "X Input extension library."
 PR = "r1"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xi \
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xi \
 	   file://autofoo.patch;patch=1"
 S = "${WORKDIR}/Xi"
 
diff --git a/packages/libxkbfile/libxkbfile_cvs.bb b/packages/libxkbfile/libxkbfile_cvs.bb
index 9dcbfe78b3..381e76383e 100644
--- a/packages/libxkbfile/libxkbfile_cvs.bb
+++ b/packages/libxkbfile/libxkbfile_cvs.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
 DEPENDS = "x11"
 DESCRIPTION = "X11 keyboard library"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=xkbfile"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=xkbfile"
 S = "${WORKDIR}/xkbfile"
 
 inherit autotools pkgconfig 
diff --git a/packages/libxp/libxp_cvs.bb b/packages/libxp/libxp_cvs.bb
index fa3abb1455..a09e9cb79c 100644
--- a/packages/libxp/libxp_cvs.bb
+++ b/packages/libxp/libxp_cvs.bb
@@ -6,7 +6,7 @@ SECTION = "libs"
 DEPENDS = "x11 xext"
 DESCRIPTION = "X print extension library."
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xp"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xp"
 S = "${WORKDIR}/Xp"
 
 inherit autotools pkgconfig 
diff --git a/packages/libxrandr/libxrandr_cvs.bb b/packages/libxrandr/libxrandr_cvs.bb
index 7617b752ef..5ff10a3118 100644
--- a/packages/libxrandr/libxrandr_cvs.bb
+++ b/packages/libxrandr/libxrandr_cvs.bb
@@ -5,7 +5,7 @@ DEPENDS = "randrext x11 libxrender xext"
 DESCRIPTION = "X Resize and Rotate extension library."
 PR = "r1"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xrandr"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xrandr"
 S = "${WORKDIR}/Xrandr"
 
 inherit autotools pkgconfig 
diff --git a/packages/libxrender/libxrender_cvs.bb b/packages/libxrender/libxrender_cvs.bb
index c4d26b5c2d..76c4af5bbc 100644
--- a/packages/libxrender/libxrender_cvs.bb
+++ b/packages/libxrender/libxrender_cvs.bb
@@ -5,7 +5,7 @@ DEPENDS = "renderext x11"
 DESCRIPTION = "X Render extension library."
 LICENSE = "BSD"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xrender"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xrender"
 S = "${WORKDIR}/Xrender"
 
 inherit autotools pkgconfig 
diff --git a/packages/libxss/libxss_cvs.bb b/packages/libxss/libxss_cvs.bb
index ea85e16da5..ff766757fb 100644
--- a/packages/libxss/libxss_cvs.bb
+++ b/packages/libxss/libxss_cvs.bb
@@ -7,7 +7,7 @@ SECTION = "libs"
 DEPENDS = "x11 xext"
 DESCRIPTION = "X screen saver extension library."
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xss"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xss"
 S = "${WORKDIR}/Xss"
 
 inherit autotools pkgconfig 
diff --git a/packages/libxxf86dga/libxxf86dga_cvs.bb b/packages/libxxf86dga/libxxf86dga_cvs.bb
index a03081b8ad..6111b343a2 100644
--- a/packages/libxxf86dga/libxxf86dga_cvs.bb
+++ b/packages/libxxf86dga/libxxf86dga_cvs.bb
@@ -5,7 +5,7 @@ SECTION = "x11/libs"
 DEPENDS = "x11 xext xxf86dgaext"
 DESCRIPTION = "Xxf86dga extension library."
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xxf86dga"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xxf86dga"
 S = "${WORKDIR}/Xxf86dga"
 
 inherit autotools pkgconfig 
diff --git a/packages/libxxf86vm/libxxf86vm_cvs.bb b/packages/libxxf86vm/libxxf86vm_cvs.bb
index f81a18d8db..d0c342e3f3 100644
--- a/packages/libxxf86vm/libxxf86vm_cvs.bb
+++ b/packages/libxxf86vm/libxxf86vm_cvs.bb
@@ -5,7 +5,7 @@ SECTION = "x11/libs"
 DEPENDS = "x11 xext xxf86vmext"
 DESCRIPTION = "Xxf86vm extension library."
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xxf86vm"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xxf86vm"
 S = "${WORKDIR}/Xxf86vm"
 
 inherit autotools pkgconfig 
diff --git a/packages/panoramixext/panoramixext_cvs.bb b/packages/panoramixext/panoramixext_cvs.bb
index 5a7a67e32b..cd35d0d34c 100644
--- a/packages/panoramixext/panoramixext_cvs.bb
+++ b/packages/panoramixext/panoramixext_cvs.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DESCRIPTION = "PanoramiX extension headers"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=PanoramiXExt"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=PanoramiXExt"
 S = "${WORKDIR}/PanoramiXExt"
 
 inherit autotools pkgconfig 
diff --git a/packages/randrext/randrext_cvs.bb b/packages/randrext/randrext_cvs.bb
index 15b3768436..a16139b539 100644
--- a/packages/randrext/randrext_cvs.bb
+++ b/packages/randrext/randrext_cvs.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DESCRIPTION = "X Resize and Rotate extension headers"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Randr"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Randr"
 S = "${WORKDIR}/Randr"
 
 inherit autotools pkgconfig
diff --git a/packages/recordext/recordext_cvs.bb b/packages/recordext/recordext_cvs.bb
index 1c6bd0b931..494b53acdd 100644
--- a/packages/recordext/recordext_cvs.bb
+++ b/packages/recordext/recordext_cvs.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DESCRIPTION = "XRecord extension protocol bits"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=RecordExt"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=RecordExt"
 S = "${WORKDIR}/RecordExt"
 
 inherit autotools pkgconfig
diff --git a/packages/renderext/renderext_cvs.bb b/packages/renderext/renderext_cvs.bb
index 85a790a6e7..af84c6f8ee 100644
--- a/packages/renderext/renderext_cvs.bb
+++ b/packages/renderext/renderext_cvs.bb
@@ -5,7 +5,7 @@ MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DESCRIPTION = "X Render extension headers"
 DEFAULT_PREFERENCE = "1"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Render"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Render"
 S = "${WORKDIR}/Render"
 
 inherit autotools pkgconfig
diff --git a/packages/resourceext/resourceext_cvs.bb b/packages/resourceext/resourceext_cvs.bb
index b2cbfd7592..92ac8d75b0 100644
--- a/packages/resourceext/resourceext_cvs.bb
+++ b/packages/resourceext/resourceext_cvs.bb
@@ -5,7 +5,7 @@ MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DEPENDS = "xextensions"
 DESCRIPTION = "X Resource usage extension headers"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=ResourceExt"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=ResourceExt"
 S = "${WORKDIR}/ResourceExt"
 
 inherit autotools pkgconfig
diff --git a/packages/x11/x11_cvs.bb b/packages/x11/x11_cvs.bb
index 6f666f5a15..5cc568de58 100644
--- a/packages/x11/x11_cvs.bb
+++ b/packages/x11/x11_cvs.bb
@@ -10,7 +10,7 @@ FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
 FILES_${PN}-locale += "${datadir}/X11/locale"
 PROVIDES = "x11"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=X11 \
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=X11 \
 	   file://errordb-keysymdb-path-fix.patch;patch=1"
 S = "${WORKDIR}/X11"
 
diff --git a/packages/xau/xau_cvs.bb b/packages/xau/xau_cvs.bb
index 46958baf19..a0e2bd312f 100644
--- a/packages/xau/xau_cvs.bb
+++ b/packages/xau/xau_cvs.bb
@@ -7,7 +7,7 @@ MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DEPENDS = "xproto"
 DESCRIPTION = "Authorization Protocol for X."
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xau"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xau"
 S = "${WORKDIR}/Xau"
 
 inherit autotools pkgconfig 
diff --git a/packages/xauth/xauth_cvs.bb b/packages/xauth/xauth_cvs.bb
index 358da9bd35..1243fce1d8 100644
--- a/packages/xauth/xauth_cvs.bb
+++ b/packages/xauth/xauth_cvs.bb
@@ -6,7 +6,7 @@ MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "x11/base"
 PR = "r2"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xorg;module=xc/programs/xauth \
+SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xauth \
            file://autofoo.patch;patch=1"
 S = "${WORKDIR}/xauth"
 
diff --git a/packages/xaw/xaw_cvs.bb b/packages/xaw/xaw_cvs.bb
index ade2156cef..71d4f915ee 100644
--- a/packages/xaw/xaw_cvs.bb
+++ b/packages/xaw/xaw_cvs.bb
@@ -6,7 +6,7 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DEPENDS = "xproto x11 xt xmu xpm"
 DESCRIPTION = "X Athena Widgets library"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xaw"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xaw"
 S = "${WORKDIR}/Xaw"
 
 inherit autotools pkgconfig 
diff --git a/packages/xcalibrate/xcalibrate_cvs.bb b/packages/xcalibrate/xcalibrate_cvs.bb
index 31a60a3202..e254348e4f 100644
--- a/packages/xcalibrate/xcalibrate_cvs.bb
+++ b/packages/xcalibrate/xcalibrate_cvs.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
 DEPENDS = "x11 xcalibrateext xext"
 DESCRIPTION = "XCalibrate client-side library"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=XCalibrate"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XCalibrate"
 S = "${WORKDIR}/XCalibrate"
 
 inherit autotools pkgconfig 
diff --git a/packages/xcalibrateext/xcalibrateext_cvs.bb b/packages/xcalibrateext/xcalibrateext_cvs.bb
index 133d19ee36..4e47c1677e 100644
--- a/packages/xcalibrateext/xcalibrateext_cvs.bb
+++ b/packages/xcalibrateext/xcalibrateext_cvs.bb
@@ -3,7 +3,7 @@ SECTION = "x11/libs"
 LICENSE = "BSD-X"
 DESCRIPTION = "XCalibrate extension headers"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=XCalibrateExt"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XCalibrateExt"
 S = "${WORKDIR}/XCalibrateExt"
 
 inherit autotools pkgconfig
diff --git a/packages/xcompmgr/xcompmgr_cvs.bb b/packages/xcompmgr/xcompmgr_cvs.bb
index 3be8b3ed1b..51fbf403d4 100644
--- a/packages/xcompmgr/xcompmgr_cvs.bb
+++ b/packages/xcompmgr/xcompmgr_cvs.bb
@@ -6,7 +6,7 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DEPENDS = "x11 xdamage xcomposite libxrender"
 DESCRIPTION = "X Compositing Manager"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xapps;module=xcompmgr"
+SRC_URI = "${FREEDESKTOP_CVS}/xapps;module=xcompmgr"
 S = "${WORKDIR}/xcompmgr"
 
 inherit autotools 
diff --git a/packages/xcomposite/xcomposite_cvs.bb b/packages/xcomposite/xcomposite_cvs.bb
index 8469e9c366..c2ec718cd6 100644
--- a/packages/xcomposite/xcomposite_cvs.bb
+++ b/packages/xcomposite/xcomposite_cvs.bb
@@ -4,7 +4,7 @@ SECTION = "x11/libs"
 DEPENDS = "x11 compositeext xextensions libxfixes"
 DESCRIPTION = "X Composite extension library."
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xcomposite"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xcomposite"
 S = "${WORKDIR}/Xcomposite"
 
 inherit autotools pkgconfig 
diff --git a/packages/xdamage/xdamage_cvs.bb b/packages/xdamage/xdamage_cvs.bb
index c10852783e..d7d9e33f8d 100644
--- a/packages/xdamage/xdamage_cvs.bb
+++ b/packages/xdamage/xdamage_cvs.bb
@@ -4,7 +4,7 @@ SECTION = "x11/libs"
 DEPENDS = "x11 damageext libxfixes xproto"
 DESCRIPTION = "X Damage extension library."
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xdamage \
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xdamage \
 	   file://m4.patch;patch=1"
 S = "${WORKDIR}/Xdamage"
 
diff --git a/packages/xdmcp/libxdmcp_cvs.bb b/packages/xdmcp/libxdmcp_cvs.bb
index b4f0fdf368..20b957b522 100644
--- a/packages/xdmcp/libxdmcp_cvs.bb
+++ b/packages/xdmcp/libxdmcp_cvs.bb
@@ -8,7 +8,7 @@ DEPENDS = "xproto"
 PROVIDES = "xdmcp"
 DESCRIPTION = "X Display Manager Control Protocol library."
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xdmcp"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xdmcp"
 S = "${WORKDIR}/Xdmcp"
 
 inherit autotools pkgconfig 
diff --git a/packages/xdpyinfo/xdpyinfo_cvs.bb b/packages/xdpyinfo/xdpyinfo_cvs.bb
index 6b0a4242f5..bd1047c63e 100644
--- a/packages/xdpyinfo/xdpyinfo_cvs.bb
+++ b/packages/xdpyinfo/xdpyinfo_cvs.bb
@@ -6,7 +6,7 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 SECTION = "x11/base"
 PR = "r1"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xapps;module=xdpyinfo"
+SRC_URI = "${FREEDESKTOP_CVS}/xapps;module=xdpyinfo"
 S = "${WORKDIR}/xdpyinfo"
 
 inherit autotools pkgconfig 
diff --git a/packages/xev/xev_cvs.bb b/packages/xev/xev_cvs.bb
index 035e63c855..50c190c173 100644
--- a/packages/xev/xev_cvs.bb
+++ b/packages/xev/xev_cvs.bb
@@ -7,7 +7,7 @@ SECTION = "x11/base"
 DEPENDS = "x11 xau"
 PR = "r1"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xapps;module=xev \
+SRC_URI = "${FREEDESKTOP_CVS}/xapps;module=xev \
 	   file://diet-x11.patch;patch=1"
 S = "${WORKDIR}/xev"
 
diff --git a/packages/xext/xext_cvs.bb b/packages/xext/xext_cvs.bb
index 84ecd349bc..4ea5061264 100644
--- a/packages/xext/xext_cvs.bb
+++ b/packages/xext/xext_cvs.bb
@@ -6,7 +6,7 @@ SECTION = "x11/libs"
 PRIORITY = "optional"
 DEPENDS = "xproto x11 xextensions"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xext"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xext"
 S = "${WORKDIR}/Xext"
 
 inherit autotools pkgconfig 
diff --git a/packages/xextensions/xextensions_20050610.bb b/packages/xextensions/xextensions_20050610.bb
index 735ba64a07..00cea3bc85 100644
--- a/packages/xextensions/xextensions_20050610.bb
+++ b/packages/xextensions/xextensions_20050610.bb
@@ -6,7 +6,7 @@ SECTION = "x11/libs"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DESCRIPTION = "various extension headers."
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=XExtensions;date=${FIXEDSRCDATE}"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XExtensions;date=${FIXEDSRCDATE}"
 S = "${WORKDIR}/XExtensions"
 
 inherit autotools pkgconfig
diff --git a/packages/xextensions/xextensions_cvs.bb b/packages/xextensions/xextensions_cvs.bb
index 05dc2976ee..18b95f5b00 100644
--- a/packages/xextensions/xextensions_cvs.bb
+++ b/packages/xextensions/xextensions_cvs.bb
@@ -4,7 +4,7 @@ SECTION = "x11/libs"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DESCRIPTION = "various extension headers."
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=XExtensions"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XExtensions"
 S = "${WORKDIR}/XExtensions"
 
 inherit autotools pkgconfig
diff --git a/packages/xfont/xfont_cvs.bb b/packages/xfont/xfont_cvs.bb
index 1873d74dfc..49896ecd83 100644
--- a/packages/xfont/xfont_cvs.bb
+++ b/packages/xfont/xfont_cvs.bb
@@ -6,7 +6,7 @@ MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DEPENDS = "xproto xtrans zlib"
 DESCRIPTION = "X font library (used by the X server)."
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xfont \
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xfont \
 	file://scalable.patch;patch=1"
 S = "${WORKDIR}/Xfont"
 
diff --git a/packages/xhost/xhost_20040413.bb b/packages/xhost/xhost_20040413.bb
index d25560493c..b3ca3c939c 100644
--- a/packages/xhost/xhost_20040413.bb
+++ b/packages/xhost/xhost_20040413.bb
@@ -7,7 +7,7 @@ MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "x11/base"
 PR = "r2"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xorg;module=xc/programs/xhost;date=${FIXEDSRCDATE} \
+SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xhost;date=${FIXEDSRCDATE} \
            file://autofoo.patch;patch=1"
 S = "${WORKDIR}/xhost"
 
diff --git a/packages/xinerama/xinerama_1.0.2+cvs20050505.bb b/packages/xinerama/xinerama_1.0.2+cvs20050505.bb
index 749fcc62d8..48a6416b36 100644
--- a/packages/xinerama/xinerama_1.0.2+cvs20050505.bb
+++ b/packages/xinerama/xinerama_1.0.2+cvs20050505.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DEPENDS = "panoramixext xproto x11 xext"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xinerama;date=20050505"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xinerama;date=20050505"
 S = "${WORKDIR}/Xinerama"
 
 inherit autotools pkgconfig 
diff --git a/packages/xinerama/xinerama_cvs.bb b/packages/xinerama/xinerama_cvs.bb
index 3d3c854685..a22e151917 100644
--- a/packages/xinerama/xinerama_cvs.bb
+++ b/packages/xinerama/xinerama_cvs.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
 DEPENDS = "panoramixext xproto x11 xext"
 PV = "0.0+cvs${SRCDATE}"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xinerama"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xinerama"
 S = "${WORKDIR}/Xinerama"
 
 inherit autotools pkgconfig 
diff --git a/packages/xmodmap/xmodmap_cvs.bb b/packages/xmodmap/xmodmap_cvs.bb
index 6c00f069c9..9582639559 100644
--- a/packages/xmodmap/xmodmap_cvs.bb
+++ b/packages/xmodmap/xmodmap_cvs.bb
@@ -7,7 +7,7 @@ PR = "r1"
 
 DEPENDS = "x11"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xorg;module=xc/programs/xmodmap \
+SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xmodmap \
            file://autofoo.patch;patch=1"
 S = "${WORKDIR}/xmodmap"
 
diff --git a/packages/xmu/xmu_cvs.bb b/packages/xmu/xmu_cvs.bb
index 3f62a89643..9420280adc 100644
--- a/packages/xmu/xmu_cvs.bb
+++ b/packages/xmu/xmu_cvs.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
 DEPENDS = "xt xext"
 PR = "r2"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xmu"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xmu"
 S = "${WORKDIR}/Xmu"
 
 PACKAGES =+ "xmuu xmuu-dev"
diff --git a/packages/xpm/xpm_cvs.bb b/packages/xpm/xpm_cvs.bb
index e23928023a..78e44b3f9b 100644
--- a/packages/xpm/xpm_cvs.bb
+++ b/packages/xpm/xpm_cvs.bb
@@ -7,7 +7,7 @@ DEPENDS = "xproto x11"
 DESCRIPTION = "X Pixmap library."
 PR = "r1"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xpm"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xpm"
 S = "${WORKDIR}/Xpm"
 
 inherit autotools pkgconfig 
diff --git a/packages/xprop/xprop_cvs.bb b/packages/xprop/xprop_cvs.bb
index 895a36fa82..f847952af5 100644
--- a/packages/xprop/xprop_cvs.bb
+++ b/packages/xprop/xprop_cvs.bb
@@ -6,7 +6,7 @@ MAINTER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "x11/base"
 PR = "r2"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xorg;module=xc/programs/xprop;tag=XORG-MAIN \
+SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xprop;tag=XORG-MAIN \
            file://autofoo.patch;patch=1"
 S = "${WORKDIR}/xprop"
 
diff --git a/packages/xproto/xproto_6.6.2+cvs20050226.bb b/packages/xproto/xproto_6.6.2+cvs20050226.bb
index a5a92fee40..594a351155 100644
--- a/packages/xproto/xproto_6.6.2+cvs20050226.bb
+++ b/packages/xproto/xproto_6.6.2+cvs20050226.bb
@@ -3,7 +3,7 @@ SECTION = "x11/libs"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DESCRIPTION = "X protocol and ancillary headers."
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xproto;date=20050226"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xproto;date=20050226"
 S = "${WORKDIR}/Xproto"
 
 inherit autotools pkgconfig
diff --git a/packages/xproto/xproto_cvs.bb b/packages/xproto/xproto_cvs.bb
index b5ecf2d7ef..1d9c96c87d 100644
--- a/packages/xproto/xproto_cvs.bb
+++ b/packages/xproto/xproto_cvs.bb
@@ -4,7 +4,7 @@ SECTION = "x11/libs"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DESCRIPTION = "X protocol and ancillary headers."
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xproto"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xproto"
 S = "${WORKDIR}/Xproto"
 
 inherit autotools pkgconfig
diff --git a/packages/xrandr/xrandr_cvs.bb b/packages/xrandr/xrandr_cvs.bb
index ea6c71c6ab..1e6609384b 100644
--- a/packages/xrandr/xrandr_cvs.bb
+++ b/packages/xrandr/xrandr_cvs.bb
@@ -4,7 +4,7 @@ DEPENDS = "libxrandr x11 xext"
 DESCRIPTION = "X Resize and Rotate extension command."
 SECTION = "x11/base"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xapps;module=xrandr"
+SRC_URI = "${FREEDESKTOP_CVS}/xapps;module=xrandr"
 S = "${WORKDIR}/xrandr"
 
 inherit autotools pkgconfig 
diff --git a/packages/xrdb/xrdb_cvs.bb b/packages/xrdb/xrdb_cvs.bb
index daa896874f..ca0e93d947 100644
--- a/packages/xrdb/xrdb_cvs.bb
+++ b/packages/xrdb/xrdb_cvs.bb
@@ -6,7 +6,7 @@ SECTION = "x11/base"
 LICENSE = "xrdb"
 PR = "r2"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xorg;module=xc/programs/xrdb \
+SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xrdb \
            file://autofoo.patch;patch=1"
 S = "${WORKDIR}/xrdb"
 
diff --git a/packages/xres/xres_cvs.bb b/packages/xres/xres_cvs.bb
index d7f8c68dfe..7fe8f4aa60 100644
--- a/packages/xres/xres_cvs.bb
+++ b/packages/xres/xres_cvs.bb
@@ -4,7 +4,7 @@ MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DEPENDS = "x11 xextensions xext resourceext"
 DESCRIPTION = "X Resource usage library."
 LICENSE = "X-MIT"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=XRes"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XRes"
 S = "${WORKDIR}/XRes"
 
 inherit autotools pkgconfig 
diff --git a/packages/xserver/xserver-kdrive_20050207.bb b/packages/xserver/xserver-kdrive_20050207.bb
index 788b8580c4..58289c8ea5 100644
--- a/packages/xserver/xserver-kdrive_20050207.bb
+++ b/packages/xserver/xserver-kdrive_20050207.bb
@@ -33,12 +33,12 @@ FILES_xserver-kdrive-i810 = "${bindir}/Xi810"
 FILES_xserver-kdrive-epson = "${bindir}/Xepson"
 FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver;date=${FIXEDSRCDATE} \
+SRC_URI = "${FREEDESKTOP_CVS}/xserver;module=xserver;date=${FIXEDSRCDATE} \
 	file://kmode.patch;patch=1 \
 	file://disable-apm.patch;patch=1 \
 	file://fbdev-not-fix.patch;patch=1 "
 
-SRC_URI_h3600 = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver;date=${FIXEDSRCDATE} \
+SRC_URI_h3600 = "${FREEDESKTOP_CVS}/xserver;module=xserver;date=${FIXEDSRCDATE} \
         file://kmode.patch;patch=1 \
         file://faster-rotated.patch;patch=1 \
         file://fbdev-not-fix.patch;patch=1 "
diff --git a/packages/xserver/xserver-kdrive_20050624.bb b/packages/xserver/xserver-kdrive_20050624.bb
index 7c8949a896..fcabbd4d28 100644
--- a/packages/xserver/xserver-kdrive_20050624.bb
+++ b/packages/xserver/xserver-kdrive_20050624.bb
@@ -32,7 +32,7 @@ FILES_xserver-kdrive-i810 = "${bindir}/Xi810"
 FILES_xserver-kdrive-epson = "${bindir}/Xepson"
 FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver;date=${FIXEDSRCDATE} \
+SRC_URI = "${FREEDESKTOP_CVS}/xserver;module=xserver;date=${FIXEDSRCDATE} \
 	file://kmode.patch;patch=1 \
 	file://no-serial-probing.patch;patch=1 \
 	file://fbdev-not-fix.patch;patch=1"
diff --git a/packages/xserver/xserver-kdrive_cvs.bb b/packages/xserver/xserver-kdrive_cvs.bb
index 05395132ab..dc05735897 100644
--- a/packages/xserver/xserver-kdrive_cvs.bb
+++ b/packages/xserver/xserver-kdrive_cvs.bb
@@ -32,7 +32,7 @@ FILES_xserver-kdrive-i810 = "${bindir}/Xi810"
 FILES_xserver-kdrive-epson = "${bindir}/Xepson"
 FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver \
+SRC_URI = "${FREEDESKTOP_CVS}/xserver;module=xserver \
 	file://kmode.patch;patch=1 \
 	file://no-serial-probing.patch;patch=1 \
 	file://kdrive-evdev.patch;patch=1  \
diff --git a/packages/xset/xset_20040817.bb b/packages/xset/xset_20040817.bb
index 201b963515..f07d2e0918 100644
--- a/packages/xset/xset_20040817.bb
+++ b/packages/xset/xset_20040817.bb
@@ -11,7 +11,7 @@ CFLAGS += "-D_GNU_SOURCE"
 
 SECTION = "x11/base"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xorg;module=xc/programs/xset;date=${FIXEDSRCDATE} \
+SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xset;date=${FIXEDSRCDATE} \
            file://autofoo.patch;patch=1"
 S = "${WORKDIR}/xset"
 
diff --git a/packages/xt/xt_cvs.bb b/packages/xt/xt_cvs.bb
index fa240e4cad..3434a63565 100644
--- a/packages/xt/xt_cvs.bb
+++ b/packages/xt/xt_cvs.bb
@@ -6,7 +6,7 @@ DEPENDS = "x11 libsm"
 DESCRIPTION = "X Toolkit Intrinsics"
 LICENSE =  "X-MIT"
 PR = "r1"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xt"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xt"
 S = "${WORKDIR}/Xt"
 
 inherit autotools pkgconfig 
diff --git a/packages/xtrans/xtrans_cvs.bb b/packages/xtrans/xtrans_cvs.bb
index 86d5346680..9714f4017b 100644
--- a/packages/xtrans/xtrans_cvs.bb
+++ b/packages/xtrans/xtrans_cvs.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "network API translation layer to \
 insulate X applications and libraries from OS \
 network vageries."
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=xtrans"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=xtrans"
 S = "${WORKDIR}/xtrans"
 
 inherit autotools  pkgconfig
diff --git a/packages/xtst/xtst_cvs.bb b/packages/xtst/xtst_cvs.bb
index fab1ee2069..1662d3983a 100644
--- a/packages/xtst/xtst_cvs.bb
+++ b/packages/xtst/xtst_cvs.bb
@@ -6,7 +6,7 @@ DEPENDS = "x11 recordext xext"
 DESCRIPTION = "X Test Extension: client side library"
 PR = "r3"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xtst"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xtst"
 S = "${WORKDIR}/Xtst"
 
 inherit autotools pkgconfig 
diff --git a/packages/xxf86dgaext/xxf86dgaext_cvs.bb b/packages/xxf86dgaext/xxf86dgaext_cvs.bb
index 9b46c91c1a..30788049c7 100644
--- a/packages/xxf86dgaext/xxf86dgaext_cvs.bb
+++ b/packages/xxf86dgaext/xxf86dgaext_cvs.bb
@@ -3,7 +3,7 @@ LICENSE = "Xorg"
 SECTION = "x11/libs"
 DESCRIPTION = "Xxf86dga extension headers"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=XF86DGAExt"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XF86DGAExt"
 S = "${WORKDIR}/XF86DGAExt"
 
 inherit autotools pkgconfig
diff --git a/packages/xxf86vmext/xxf86vmext_cvs.bb b/packages/xxf86vmext/xxf86vmext_cvs.bb
index 181d763e32..06145e2905 100644
--- a/packages/xxf86vmext/xxf86vmext_cvs.bb
+++ b/packages/xxf86vmext/xxf86vmext_cvs.bb
@@ -3,7 +3,7 @@ LICENSE = "MIT"
 SECTION = "x11/libs"
 DESCRIPTION = "Xxf86vm extension headers"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=XF86VMExt"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XF86VMExt"
 S = "${WORKDIR}/XF86VMExt"
 
 inherit autotools pkgconfig