35 files changed, 35 insertions, 36 deletions

diff --git a/openembedded/packages/compositeext/compositeext_cvs.bb b/openembedded/packages/compositeext/compositeext_cvs.bb
index 75317fabcd..94160746e6 100644
--- a/openembedded/packages/compositeext/compositeext_cvs.bb
+++ b/openembedded/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/openembedded/packages/damageext/damageext_cvs.bb b/openembedded/packages/damageext/damageext_cvs.bb
index 1489e5355b..86a6032b29 100644
--- a/openembedded/packages/damageext/damageext_cvs.bb
+++ b/openembedded/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/openembedded/packages/fixesext/fixesext_cvs.bb b/openembedded/packages/fixesext/fixesext_cvs.bb
index c279256fa2..30b9460138 100644
--- a/openembedded/packages/fixesext/fixesext_cvs.bb
+++ b/openembedded/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/openembedded/packages/glib-2.0/glib-2.0_2.10.1.bb b/openembedded/packages/glib-2.0/glib-2.0_2.10.1.bb
index 81ae84df0c..1c887e0206 100644
--- a/openembedded/packages/glib-2.0/glib-2.0_2.10.1.bb
+++ b/openembedded/packages/glib-2.0/glib-2.0_2.10.1.bb
@@ -6,7 +6,6 @@ UNIX-like platforms, Windows, OS/2 and BeOS."
 LICENSE = "LGPL"
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS += "glib-2.0-native gtk-doc"
 DEPENDS += "virtual/libiconv virtual/libintl"
 PACKAGES =+ "glib-2.0-utils "
diff --git a/openembedded/packages/randrext/randrext_cvs.bb b/openembedded/packages/randrext/randrext_cvs.bb
index 15b3768436..a16139b539 100644
--- a/openembedded/packages/randrext/randrext_cvs.bb
+++ b/openembedded/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/openembedded/packages/recordext/recordext_cvs.bb b/openembedded/packages/recordext/recordext_cvs.bb
index 1c6bd0b931..494b53acdd 100644
--- a/openembedded/packages/recordext/recordext_cvs.bb
+++ b/openembedded/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/openembedded/packages/renderext/renderext_cvs.bb b/openembedded/packages/renderext/renderext_cvs.bb
index 85a790a6e7..af84c6f8ee 100644
--- a/openembedded/packages/renderext/renderext_cvs.bb
+++ b/openembedded/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/openembedded/packages/resourceext/resourceext_cvs.bb b/openembedded/packages/resourceext/resourceext_cvs.bb
index b2cbfd7592..92ac8d75b0 100644
--- a/openembedded/packages/resourceext/resourceext_cvs.bb
+++ b/openembedded/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/openembedded/packages/xauth/xauth_cvs.bb b/openembedded/packages/xauth/xauth_cvs.bb
index 358da9bd35..1243fce1d8 100644
--- a/openembedded/packages/xauth/xauth_cvs.bb
+++ b/openembedded/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/openembedded/packages/xcalibrate/xcalibrate_cvs.bb b/openembedded/packages/xcalibrate/xcalibrate_cvs.bb
index 31a60a3202..e254348e4f 100644
--- a/openembedded/packages/xcalibrate/xcalibrate_cvs.bb
+++ b/openembedded/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/openembedded/packages/xcalibrateext/xcalibrateext_cvs.bb b/openembedded/packages/xcalibrateext/xcalibrateext_cvs.bb
index 133d19ee36..4e47c1677e 100644
--- a/openembedded/packages/xcalibrateext/xcalibrateext_cvs.bb
+++ b/openembedded/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/openembedded/packages/xdpyinfo/xdpyinfo_cvs.bb b/openembedded/packages/xdpyinfo/xdpyinfo_cvs.bb
index 6b0a4242f5..bd1047c63e 100644
--- a/openembedded/packages/xdpyinfo/xdpyinfo_cvs.bb
+++ b/openembedded/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/openembedded/packages/xhost/xhost_20040413.bb b/openembedded/packages/xhost/xhost_20040413.bb
index d25560493c..b3ca3c939c 100644
--- a/openembedded/packages/xhost/xhost_20040413.bb
+++ b/openembedded/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/openembedded/packages/xlibs/libxfixes_cvs.bb b/openembedded/packages/xlibs/libxfixes_cvs.bb
index 6a9ae6194f..f02f9518cf 100644
--- a/openembedded/packages/xlibs/libxfixes_cvs.bb
+++ b/openembedded/packages/xlibs/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/openembedded/packages/xlibs/libxft_cvs.bb b/openembedded/packages/xlibs/libxft_cvs.bb
index 6d5c11f36b..01c53b47d5 100644
--- a/openembedded/packages/xlibs/libxft_cvs.bb
+++ b/openembedded/packages/xlibs/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/openembedded/packages/xlibs/libxrender_cvs.bb b/openembedded/packages/xlibs/libxrender_cvs.bb
index c4d26b5c2d..76c4af5bbc 100644
--- a/openembedded/packages/xlibs/libxrender_cvs.bb
+++ b/openembedded/packages/xlibs/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/openembedded/packages/xlibs/xau_cvs.bb b/openembedded/packages/xlibs/xau_cvs.bb
index 46958baf19..a0e2bd312f 100644
--- a/openembedded/packages/xlibs/xau_cvs.bb
+++ b/openembedded/packages/xlibs/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/openembedded/packages/xlibs/xcomposite_cvs.bb b/openembedded/packages/xlibs/xcomposite_cvs.bb
index 8469e9c366..c2ec718cd6 100644
--- a/openembedded/packages/xlibs/xcomposite_cvs.bb
+++ b/openembedded/packages/xlibs/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/openembedded/packages/xlibs/xdamage_cvs.bb b/openembedded/packages/xlibs/xdamage_cvs.bb
index c10852783e..d7d9e33f8d 100644
--- a/openembedded/packages/xlibs/xdamage_cvs.bb
+++ b/openembedded/packages/xlibs/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/openembedded/packages/xlibs/xext_cvs.bb b/openembedded/packages/xlibs/xext_cvs.bb
index 84ecd349bc..4ea5061264 100644
--- a/openembedded/packages/xlibs/xext_cvs.bb
+++ b/openembedded/packages/xlibs/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/openembedded/packages/xlibs/xfont_cvs.bb b/openembedded/packages/xlibs/xfont_cvs.bb
index 1873d74dfc..49896ecd83 100644
--- a/openembedded/packages/xlibs/xfont_cvs.bb
+++ b/openembedded/packages/xlibs/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/openembedded/packages/xlibs/xmu_cvs.bb b/openembedded/packages/xlibs/xmu_cvs.bb
index 3f62a89643..9420280adc 100644
--- a/openembedded/packages/xlibs/xmu_cvs.bb
+++ b/openembedded/packages/xlibs/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/openembedded/packages/xlibs/xpm_cvs.bb b/openembedded/packages/xlibs/xpm_cvs.bb
index e23928023a..78e44b3f9b 100644
--- a/openembedded/packages/xlibs/xpm_cvs.bb
+++ b/openembedded/packages/xlibs/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/openembedded/packages/xlibs/xtrans_cvs.bb b/openembedded/packages/xlibs/xtrans_cvs.bb
index 86d5346680..9714f4017b 100644
--- a/openembedded/packages/xlibs/xtrans_cvs.bb
+++ b/openembedded/packages/xlibs/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/openembedded/packages/xmodmap/xmodmap_cvs.bb b/openembedded/packages/xmodmap/xmodmap_cvs.bb
index 6c00f069c9..9582639559 100644
--- a/openembedded/packages/xmodmap/xmodmap_cvs.bb
+++ b/openembedded/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/openembedded/packages/xproto/xproto_6.6.2+cvs20050226.bb b/openembedded/packages/xproto/xproto_6.6.2+cvs20050226.bb
index a5a92fee40..594a351155 100644
--- a/openembedded/packages/xproto/xproto_6.6.2+cvs20050226.bb
+++ b/openembedded/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/openembedded/packages/xproto/xproto_cvs.bb b/openembedded/packages/xproto/xproto_cvs.bb
index b5ecf2d7ef..1d9c96c87d 100644
--- a/openembedded/packages/xproto/xproto_cvs.bb
+++ b/openembedded/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/openembedded/packages/xrandr/xrandr_cvs.bb b/openembedded/packages/xrandr/xrandr_cvs.bb
index ea6c71c6ab..1e6609384b 100644
--- a/openembedded/packages/xrandr/xrandr_cvs.bb
+++ b/openembedded/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/openembedded/packages/xserver/xserver-kdrive_20050207.bb b/openembedded/packages/xserver/xserver-kdrive_20050207.bb
index 6ebbd2ce40..9567863aaf 100644
--- a/openembedded/packages/xserver/xserver-kdrive_20050207.bb
+++ b/openembedded/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/openembedded/packages/xserver/xserver-kdrive_20050624.bb b/openembedded/packages/xserver/xserver-kdrive_20050624.bb
index 7c8949a896..fcabbd4d28 100644
--- a/openembedded/packages/xserver/xserver-kdrive_20050624.bb
+++ b/openembedded/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/openembedded/packages/xserver/xserver-kdrive_cvs.bb b/openembedded/packages/xserver/xserver-kdrive_cvs.bb
index 241f17565a..dd93ed5418 100644
--- a/openembedded/packages/xserver/xserver-kdrive_cvs.bb
+++ b/openembedded/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://fbdev-not-fix.patch;patch=1"
 
diff --git a/openembedded/packages/xserver/xserver-xorg_6.8.99.10.bb b/openembedded/packages/xserver/xserver-xorg_6.8.99.10.bb
index 0358b0688f..c5b05cd2fc 100644
--- a/openembedded/packages/xserver/xserver-xorg_6.8.99.10.bb
+++ b/openembedded/packages/xserver/xserver-xorg_6.8.99.10.bb
@@ -6,7 +6,7 @@ PR = "r2"
 
 DEPENDS = "fontconfig freetype libxi xmu flex-native zlib"
 
-SRC_URI = "cvs://anoncvs@cvs.freedesktop.org/cvs/xorg;module=xc;method=pserver;tag=XORG-6_8_99_10 \
+SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;method=pserver;tag=XORG-6_8_99_10 \
         file://imake-staging.patch;patch=1 \
         file://imake-installed.patch;patch=1 \
         file://fontfile.patch;patch=1 file://freetype.patch;patch=1 \
diff --git a/openembedded/packages/xserver/xserver-xorg_6.8.99.11.bb b/openembedded/packages/xserver/xserver-xorg_6.8.99.11.bb
index 84ff41e218..2a0519fd76 100644
--- a/openembedded/packages/xserver/xserver-xorg_6.8.99.11.bb
+++ b/openembedded/packages/xserver/xserver-xorg_6.8.99.11.bb
@@ -6,7 +6,7 @@ PR = "r0"
 
 DEPENDS = "fontconfig freetype libxi xmu flex-native zlib"
 
-SRC_URI = "cvs://anoncvs@cvs.freedesktop.org/cvs/xorg;module=xc;method=pserver;tag=XORG-6_8_99_11 \
+SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;method=pserver;tag=XORG-6_8_99_11 \
         file://imake-staging.patch;patch=1 \
         file://imake-installed.patch;patch=1 \
         file://fontfile.patch;patch=1 file://freetype.patch;patch=1 \
diff --git a/openembedded/packages/xserver/xserver-xorg_cvs.bb b/openembedded/packages/xserver/xserver-xorg_cvs.bb
index 9c52864bef..9c64fb8377 100644
--- a/openembedded/packages/xserver/xserver-xorg_cvs.bb
+++ b/openembedded/packages/xserver/xserver-xorg_cvs.bb
@@ -7,7 +7,7 @@ PV = "6.8.1+cvs${SRCDATE}"
 
 DEPENDS = "fontconfig freetype libxi xmu flex-2.5.4-native"
 
-SRC_URI = "cvs://anoncvs@cvs.freedesktop.org/cvs/xorg;module=xc;method=pserver \
+SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;method=pserver \
         file://imake-staging.patch;patch=1 \
         file://dri.patch;patch=1"
 
diff --git a/openembedded/packages/xtst/xtst_cvs.bb b/openembedded/packages/xtst/xtst_cvs.bb
index fab1ee2069..1662d3983a 100644
--- a/openembedded/packages/xtst/xtst_cvs.bb
+++ b/openembedded/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