Update meta-pkgs/xorg to 6.9.0.

The full list of changes:
http://ftp.x.org/pub/X11R7.0/doc/html/RELNOTES2.html

Thanks to joerg@ and reed@ for testing on DragonFlyBSD.

Tested on NetBSD/i386 3.0/-current and DragonFlyBSD-1.4/i386.

2 files changed, 19 insertions, 21 deletions

diff --git a/meta-pkgs/xorg/Makefile b/meta-pkgs/xorg/Makefile
index 066c81ff3a0..c394c0d4729 100644
--- a/meta-pkgs/xorg/Makefile
+++ b/meta-pkgs/xorg/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:37 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2006/01/18 23:53:06 xtraeme Exp $
 
 DISTNAME=	# empty
 PKGNAME=	xorg-${XORG_VER}
-PKGREVISION=	1
 CATEGORIES=	meta-pkgs x11
 MASTER_SITES=	${MASTER_SITE_XORG}
 DISTFILES=	# empty
@@ -11,7 +10,7 @@ MAINTAINER=	xtraeme@NetBSD.org
 HOMEPAGE=	http://www.x.org/
 COMMENT=	X.org meta-package
 
-DEPENDS+=	xorg-imake>=${XORG_VER}:../../x11/xorg-imake
+DEPENDS=	xorg-imake>=${XORG_VER}:../../x11/xorg-imake
 DEPENDS+=	xorg-libs>=${XORG_VER}:../../x11/xorg-libs
 DEPENDS+=	xorg-server>=${XORG_VER}:../../x11/xorg-server
 DEPENDS+=	xorg-clients>=${XORG_VER}:../../x11/xorg-clients
@@ -22,7 +21,7 @@ DEPENDS+=	xorg-fontsMisc>=${XORG_VER}:../../fonts/xorg-fontsMisc
 DEPENDS+=	xorg-fontsCyrillic>=${XORG_VER}:../../fonts/xorg-fontsCyrillic
 DEPENDS+=	xorg-fontsTruetype>=${XORG_VER}:../../fonts/xorg-fontsTruetype
 DEPENDS+=	xorg-fontsType1>=${XORG_VER}:../../fonts/xorg-fontsType1
-DEPENDS+=	xorg-docs>=${XORG_VER}nb1:../../misc/xorg-docs
+DEPENDS+=	xorg-docs>=${XORG_VER}:../../misc/xorg-docs
 
 NO_BUILD=		yes
 NO_CHECKSUM=		yes
diff --git a/meta-pkgs/xorg/Makefile.common b/meta-pkgs/xorg/Makefile.common
index 545cc70b49f..59eb8719eb5 100644
--- a/meta-pkgs/xorg/Makefile.common
+++ b/meta-pkgs/xorg/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.37 2005/12/08 09:18:24 rillig Exp $
+# $NetBSD: Makefile.common,v 1.38 2006/01/18 23:53:06 xtraeme Exp $
 #
 # XBUILD_DIRS is the group of directories under ${WRKSRC} that will
 #   be built in.
@@ -130,16 +130,16 @@ PLIST_SUBST+=	LIBXTHRSTUB=${LIBXTHRSTUB}
 PLIST_SUBST+=	XF86RUSH=${XF86RUSH}
 PLIST_SUBST+=	IMAKE_MANTOOLS=${IMAKE_MANTOOLS}
 PLIST_SUBST+=	LIBDRI=${LIBDRI}
-PLIST_SUBST+=	MAN_DIR=${MAN_DIR:Q}
-PLIST_SUBST+=	LIBMAN_DIR=${LIBMAN_DIR:Q}
-PLIST_SUBST+=	MAN_SUFFIX=${MAN_SUFFIX:Q}
-PLIST_SUBST+=	LIBMAN_SUFFIX=${LIBMAN_SUFFIX:Q}
-PLIST_SUBST+=	KERNMAN_DIR=${KERNMAN_DIR:Q}
-PLIST_SUBST+=	KERNMAN_SUFFIX=${KERNMAN_SUFFIX:Q}
-PLIST_SUBST+=	FILEMAN_DIR=${FILEMAN_DIR:Q}
-PLIST_SUBST+=	FILEMAN_SUFFIX=${FILEMAN_SUFFIX:Q}
-PLIST_SUBST+=	MISCMAN_DIR=${MISCMAN_DIR:Q}
-PLIST_SUBST+=	MISCMAN_SUFFIX=${MISCMAN_SUFFIX:Q}
+PLIST_SUBST+=	MAN_DIR=${MAN_DIR}
+PLIST_SUBST+=	LIBMAN_DIR=${LIBMAN_DIR}
+PLIST_SUBST+=	MAN_SUFFIX=${MAN_SUFFIX}
+PLIST_SUBST+=	LIBMAN_SUFFIX=${LIBMAN_SUFFIX}
+PLIST_SUBST+=	KERNMAN_DIR=${KERNMAN_DIR}
+PLIST_SUBST+=	KERNMAN_SUFFIX=${KERNMAN_SUFFIX}
+PLIST_SUBST+=	FILEMAN_DIR=${FILEMAN_DIR}
+PLIST_SUBST+=	FILEMAN_SUFFIX=${FILEMAN_SUFFIX}
+PLIST_SUBST+=	MISCMAN_DIR=${MISCMAN_DIR}
+PLIST_SUBST+=	MISCMAN_SUFFIX=${MISCMAN_SUFFIX}
 
 CHECK_X11_TYPE?=	yes
 
@@ -156,7 +156,7 @@ X11ROOT?=		${LOCALBASE}/${X11ROOT_PREFIX}
 PREPEND_PATH+=		${X11ROOT}/bin # Make sure we have this in PATH :)
 EGDIR?=			${LOCALBASE}/share/examples/xorg
 
-PLIST_SUBST+=		X11ROOT_PREFIX=${X11ROOT_PREFIX:Q}
+PLIST_SUBST+=		X11ROOT_PREFIX=${X11ROOT_PREFIX}
 MESSAGE_SUBST+=		X11ROOT=${X11ROOT}
 
 .if ${OPSYS} != "Darwin"
@@ -182,9 +182,7 @@ ONLY_FOR_PLATFORM=	Darwin-*-* FreeBSD-*-* Linux-*-* NetBSD-*-*	\
 			OpenBSD-*-* SunOS-*-* DragonFly-*-*
 
 MASTER_SITE_XORG+=	\
-	http://ftp.skynet.be/pub/ftp.x.org/pub/X11R${XORG_VER}/src/	\
-	http://www.mirrormonster.com/ftp.x.org/pub/X11R${XORG_VER}/src/	\
-	http://xorg.freedesktop.org/X11R${XORG_VER}/src/		\
+	http://xorg.freedesktop.org/releases/X11R${XORG_VER}/src/	\
 	ftp://ftp.opengroup.org/pub/x.org/pub/X11R${XORG_VER}/src/	\
 	ftp://x.mirrors.skynet.be/pub/ftp.x.org/pub/X11R${XORG_VER}/src/ \
 	http://x.mirrors.skynet.be/pub/ftp.x.org/pub/X11R${XORG_VER}/src/ \
@@ -196,7 +194,7 @@ MASTER_SITE_XORG+=	\
 
 # When updating the version be sure to regenerate checksums
 # for each xorg package with distinfo files.
-XORG_VER=	6.8.2
+XORG_VER=	6.9.0
 
 IMAKE=		${X11ROOT}/bin/imake
 
@@ -264,11 +262,11 @@ post-extract:
 	@${LN} -sf ${X11ROOT}/bin/pswrap ${WRKSRC}/config/pswrap
 	@${LN} -sf ${X11ROOT}/lib/X11/config/version.def ${WRKSRC}/config/cf
 	@${LN} -sf ${X11ROOT}/lib/X11/config/date.def ${WRKSRC}/config/cf
-	@${CP} ${PKGSRCDIR}/x11/xorg-libs/files/DragonFly.cf ${WRKSRC}/config/cf
 
 .  for F in ${SYSTEMS}
 	@${MV} ${WRKSRC}/config/cf/${F}.cf ${WRKSRC}/config/cf/${F}.cf.in
 .  endfor
+.  undef F
 .  endif
 
 .  if !target(pre-configure)
@@ -284,6 +282,7 @@ pre-configure:
 		${WRKSRC}/config/cf/${F}.cf.in > \
 		${WRKSRC}/config/cf/${F}.cf
 .  endfor
+.  undef F
 .  endif
 
 .  if !target(do-configure)