Use ${XORG_VER}.

7 files changed, 33 insertions, 33 deletions

diff --git a/fonts/xorg-fonts100dpi/Makefile b/fonts/xorg-fonts100dpi/Makefile
index 27d271528f7..1fd5ee942c2 100644
--- a/fonts/xorg-fonts100dpi/Makefile
+++ b/fonts/xorg-fonts100dpi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/07/30 08:31:23 xtraeme Exp $
+# $NetBSD: Makefile,v 1.5 2004/07/30 23:25:07 xtraeme Exp $
 
 DISTNAME=	X11R6.7.0-src1
 PKGNAME=	xorg-fonts100dpi-${XORG_VER}
@@ -9,11 +9,11 @@ MAINTAINER=	xtraeme@NetBSD.org
 HOMEPAGE=	http://www.x.org/
 COMMENT=	X.org 100dpi bitmap fonts
 
-BUILD_DEPENDS=	xorg-clients>=6.7.0:../../x11/xorg-clients
-DEPENDS+=	xorg-fontsEncodings>=6.7.0:../../fonts/xorg-fontsEncodings
+BUILD_DEPENDS=	xorg-clients>=${XORG_VER}:../../x11/xorg-clients
+DEPENDS+=	xorg-fontsEncodings>=${XORG_VER}:../../fonts/xorg-fontsEncodings
 
-XBUILD_DIRS=		fonts/encodings fonts/bdf/100dpi
-XINSTALL_DIRS=		fonts/bdf/100dpi
+XBUILD_DIRS=	fonts/encodings fonts/bdf/100dpi
+XINSTALL_DIRS=	fonts/bdf/100dpi
 
 FILESDIR=	${.CURDIR}/../../fonts/xorg-fontsEncodings/files
 
diff --git a/fonts/xorg-fonts75dpi/Makefile b/fonts/xorg-fonts75dpi/Makefile
index 93f51af57cf..a06c8f383dc 100644
--- a/fonts/xorg-fonts75dpi/Makefile
+++ b/fonts/xorg-fonts75dpi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/07/30 08:31:23 xtraeme Exp $
+# $NetBSD: Makefile,v 1.5 2004/07/30 23:25:08 xtraeme Exp $
 
 DISTNAME=	X11R6.7.0-src1
 PKGNAME=	xorg-fonts75dpi-${XORG_VER}
@@ -9,11 +9,11 @@ MAINTAINER=	xtraeme@NetBSD.org
 HOMEPAGE=	http://www.x.org/
 COMMENT=	X.org 75dpi bitmap fonts
 
-BUILD_DEPENDS=	xorg-clients>=6.7.0:../../x11/xorg-clients
-DEPENDS+=	xorg-fontsEncodings>=6.7.0:../../fonts/xorg-fontsEncodings
+BUILD_DEPENDS=	xorg-clients>=${XORG_VER}:../../x11/xorg-clients
+DEPENDS+=	xorg-fontsEncodings>=${XORG_VER}:../../fonts/xorg-fontsEncodings
 
-XBUILD_DIRS=		fonts/encodings fonts/bdf/75dpi
-XINSTALL_DIRS=		fonts/bdf/75dpi
+XBUILD_DIRS=	fonts/encodings fonts/bdf/75dpi
+XINSTALL_DIRS=	fonts/bdf/75dpi
 
 FILESDIR=	${.CURDIR}/../../fonts/xorg-fontsEncodings/files
 
diff --git a/fonts/xorg-fontsCyrillic/Makefile b/fonts/xorg-fontsCyrillic/Makefile
index 28bc258bce2..ddd9defad85 100644
--- a/fonts/xorg-fontsCyrillic/Makefile
+++ b/fonts/xorg-fontsCyrillic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/07/30 08:31:23 xtraeme Exp $
+# $NetBSD: Makefile,v 1.5 2004/07/30 23:25:08 xtraeme Exp $
 
 DISTNAME=	X11R6.7.0-src1
 PKGNAME=	xorg-fontsCyrillic-${XORG_VER}
@@ -9,11 +9,11 @@ MAINTAINER=	xtraeme@NetBSD.org
 HOMEPAGE=	http://www.x.org/
 COMMENT=	X.org Cyrillic bitmap fonts
 
-BUILD_DEPENDS=	xorg-clients>=6.7.0:../../x11/xorg-clients
-DEPENDS+=	xorg-fontsEncodings>=6.7.0:../../fonts/xorg-fontsEncodings
+BUILD_DEPENDS=	xorg-clients>=${XORG_VER}:../../x11/xorg-clients
+DEPENDS+=	xorg-fontsEncodings>=${XORG_VER}:../../fonts/xorg-fontsEncodings
 
-XBUILD_DIRS=		fonts/encodings fonts/bdf/cyrillic
-XINSTALL_DIRS=		fonts/bdf/cyrillic
+XBUILD_DIRS=	fonts/encodings fonts/bdf/cyrillic
+XINSTALL_DIRS=	fonts/bdf/cyrillic
 
 FILESDIR=	${.CURDIR}/../../fonts/xorg-fontsEncodings/files
 
diff --git a/fonts/xorg-fontsEncodings/Makefile b/fonts/xorg-fontsEncodings/Makefile
index e24bf085b1e..87a0420e4ad 100644
--- a/fonts/xorg-fontsEncodings/Makefile
+++ b/fonts/xorg-fontsEncodings/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/07/30 08:31:23 xtraeme Exp $
+# $NetBSD: Makefile,v 1.4 2004/07/30 23:25:08 xtraeme Exp $
 
 DISTNAME=	X11R6.7.0-src1
 PKGNAME=	xorg-fontsEncodings-${XORG_VER}
@@ -9,9 +9,9 @@ MAINTAINER=	xtraeme@NetBSD.org
 HOMEPAGE=	http://www.x.org/
 COMMENT=	X.org Encoding fonts
 
-BUILD_DEPENDS=	xorg-clients>=6.7.0:../../x11/xorg-clients
+BUILD_DEPENDS=	xorg-clients>=${XORG_VER}:../../x11/xorg-clients
 
-XBUILD_DIRS=		fonts/encodings
+XBUILD_DIRS=	fonts/encodings
 
 .include "../../meta-pkgs/xorg/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/xorg-fontsMisc/Makefile b/fonts/xorg-fontsMisc/Makefile
index c536c4a27a3..b63e8bff615 100644
--- a/fonts/xorg-fontsMisc/Makefile
+++ b/fonts/xorg-fontsMisc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/07/30 08:31:23 xtraeme Exp $
+# $NetBSD: Makefile,v 1.5 2004/07/30 23:25:08 xtraeme Exp $
 
 DISTNAME=	X11R6.7.0-src1
 PKGNAME=	xorg-fontsMisc-${XORG_VER}
@@ -9,11 +9,11 @@ MAINTAINER=	xtraeme@NetBSD.org
 HOMEPAGE=	http://www.x.org/
 COMMENT=	X.org miscellaneous bitmap fonts
 
-BUILD_DEPENDS=	xorg-clients>=6.7.0:../../x11/xorg-clients
-DEPENDS+=	xorg-fontsEncodings>=6.7.0:../../fonts/xorg-fontsEncodings
+BUILD_DEPENDS=	xorg-clients>=${XORG_VER}:../../x11/xorg-clients
+DEPENDS+=	xorg-fontsEncodings>=${XORG_VER}:../../fonts/xorg-fontsEncodings
 
-XBUILD_DIRS=		fonts/encodings fonts/bdf/misc
-XINSTALL_DIRS=		fonts/bdf/misc
+XBUILD_DIRS=	fonts/encodings fonts/bdf/misc
+XINSTALL_DIRS=	fonts/bdf/misc
 
 FILESDIR=	${.CURDIR}/../../fonts/xorg-fontsEncodings/files
 
diff --git a/fonts/xorg-fontsTruetype/Makefile b/fonts/xorg-fontsTruetype/Makefile
index 87e68b65702..7eb40a628eb 100644
--- a/fonts/xorg-fontsTruetype/Makefile
+++ b/fonts/xorg-fontsTruetype/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/07/30 08:31:23 xtraeme Exp $
+# $NetBSD: Makefile,v 1.5 2004/07/30 23:25:08 xtraeme Exp $
 
 DISTNAME=	X11R6.7.0-src1
 PKGNAME=	xorg-fontsTruetype-${XORG_VER}
@@ -9,14 +9,14 @@ MAINTAINER=	xtraeme@NetBSD.org
 HOMEPAGE=	http://www.x.org/
 COMMENT=	X.org Truetype fonts
 
-BUILD_DEPENDS=	xorg-clients>=6.7.0:../../x11/xorg-clients
+BUILD_DEPENDS=	xorg-clients>=${XORG_VER}:../../x11/xorg-clients
 BUILD_DEPENDS+=	fontconfig-[0-9]*:../../fonts/fontconfig
-DEPENDS+=	xorg-fontsEncodings>=6.7.0:../../fonts/xorg-fontsEncodings
+DEPENDS+=	xorg-fontsEncodings>=${XORG_VER}:../../fonts/xorg-fontsEncodings
 
 CONFLICTS=	vera-ttf-[0-9]*
 
-XBUILD_DIRS=		fonts/encodings fonts/scaled/TTF
-XINSTALL_DIRS=		fonts/scaled/TTF
+XBUILD_DIRS=	fonts/encodings fonts/scaled/TTF
+XINSTALL_DIRS=	fonts/scaled/TTF
 
 FILESDIR=	${.CURDIR}/../../fonts/xorg-fontsEncodings/files
 
diff --git a/fonts/xorg-fontsType1/Makefile b/fonts/xorg-fontsType1/Makefile
index 19cc266f644..5d0e07aac45 100644
--- a/fonts/xorg-fontsType1/Makefile
+++ b/fonts/xorg-fontsType1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/07/30 08:31:23 xtraeme Exp $
+# $NetBSD: Makefile,v 1.5 2004/07/30 23:25:08 xtraeme Exp $
 
 DISTNAME=	X11R6.7.0-src1
 PKGNAME=	xorg-fontsType1-${XORG_VER}
@@ -9,11 +9,11 @@ MAINTAINER=	xtraeme@NetBSD.org
 HOMEPAGE=	http://www.x.org/
 COMMENT=	X.org Type1 fonts
 
-BUILD_DEPENDS=	xorg-clients>=6.7.0:../../x11/xorg-clients
-DEPENDS+=	xorg-fontsEncodings>=6.7.0:../../fonts/xorg-fontsEncodings
+BUILD_DEPENDS=	xorg-clients>=${XORG_VER}:../../x11/xorg-clients
+DEPENDS+=	xorg-fontsEncodings>=${XORG_VER}:../../fonts/xorg-fontsEncodings
 
-XBUILD_DIRS=		fonts/encodings fonts/scaled/Type1
-XINSTALL_DIRS=		fonts/scaled/Type1
+XBUILD_DIRS=	fonts/encodings fonts/scaled/Type1
+XINSTALL_DIRS=	fonts/scaled/Type1
 
 FILESDIR=	${.CURDIR}/../../fonts/xorg-fontsEncodings/files