Use ${XF_VER} instead of using 4.4.0.

14 files changed, 38 insertions, 38 deletions

diff --git a/fonts/XFree86-fonts100dpi/Makefile b/fonts/XFree86-fonts100dpi/Makefile
index 2c68a686015..a2a5e936543 100644
--- a/fonts/XFree86-fonts100dpi/Makefile
+++ b/fonts/XFree86-fonts100dpi/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2004/07/29 06:36:32 xtraeme Exp $
+# $NetBSD: Makefile,v 1.7 2004/07/29 09:06:19 xtraeme Exp $
 
-DISTNAME=	XFree86-4.4.0-src-4
+DISTNAME=	XFree86-${XF_VER}-src-4
 PKGNAME=	XFree86-fonts100dpi-${XF_VER}
 CATEGORIES=	fonts x11
 MASTER_SITES=	${MASTER_SITE_XFREE}
diff --git a/fonts/XFree86-fonts75dpi/Makefile b/fonts/XFree86-fonts75dpi/Makefile
index a5a39d894f5..6e6482457b2 100644
--- a/fonts/XFree86-fonts75dpi/Makefile
+++ b/fonts/XFree86-fonts75dpi/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2004/07/29 06:36:33 xtraeme Exp $
+# $NetBSD: Makefile,v 1.7 2004/07/29 09:06:19 xtraeme Exp $
 
-DISTNAME=	XFree86-4.4.0-src-4
+DISTNAME=	XFree86-${XF_VER}-src-4
 PKGNAME=	XFree86-fonts75dpi-${XF_VER}
 CATEGORIES=	fonts x11
 MASTER_SITES=	${MASTER_SITE_XFREE}
diff --git a/fonts/XFree86-fontsCyrillic/Makefile b/fonts/XFree86-fontsCyrillic/Makefile
index ea944ad3030..74926dfeaeb 100644
--- a/fonts/XFree86-fontsCyrillic/Makefile
+++ b/fonts/XFree86-fontsCyrillic/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2004/07/29 06:36:33 xtraeme Exp $
+# $NetBSD: Makefile,v 1.7 2004/07/29 09:06:19 xtraeme Exp $
 
-DISTNAME=	XFree86-4.4.0-src-4	
+DISTNAME=	XFree86-${XF_VER}-src-4	
 PKGNAME=	XFree86-fontsCyrillic-${XF_VER}
 CATEGORIES=	fonts x11
 MASTER_SITES=	${MASTER_SITE_XFREE}
diff --git a/fonts/XFree86-fontsEncodings/Makefile b/fonts/XFree86-fontsEncodings/Makefile
index 75bf75b4d8d..b2f9c6b85e3 100644
--- a/fonts/XFree86-fontsEncodings/Makefile
+++ b/fonts/XFree86-fontsEncodings/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2004/07/29 06:36:33 xtraeme Exp $
+# $NetBSD: Makefile,v 1.8 2004/07/29 09:06:19 xtraeme Exp $
 
-DISTNAME=	XFree86-4.4.0-src-4
+DISTNAME=	XFree86-${XF_VER}-src-4
 PKGNAME=	XFree86-fontsEncodings-${XF_VER}
 CATEGORIES=	fonts x11
 MASTER_SITES=	${MASTER_SITE_XFREE}
@@ -10,7 +10,7 @@ MAINTAINER=	xfree86@blef.org
 HOMEPAGE=	http://www.xfree86.org/
 COMMENT=	XFree86 Encoding fonts
 
-DEPENDS=	XFree86-clients>=4.4.0:../../x11/XFree86-clients
+DEPENDS=	XFree86-clients>=${XF_VER}:../../x11/XFree86-clients
 
 NO_XFREE86_TARGETS=	# defined
 CHECK_X11_TYPE=		# defined
diff --git a/fonts/XFree86-fontsEncodings/Makefile.common b/fonts/XFree86-fontsEncodings/Makefile.common
index c87e855dc1d..6482a106a9e 100644
--- a/fonts/XFree86-fontsEncodings/Makefile.common
+++ b/fonts/XFree86-fontsEncodings/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2004/03/29 00:30:16 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.3 2004/07/29 09:06:19 xtraeme Exp $
 #
 # Makefile fragment used by XFree86-fonts* packages.
 
@@ -6,7 +6,7 @@ NO_BUILDLINK=	# defined
 USE_LANGUAGES=	# empty
 CHECK_X11_TYPE=	# defined
 
-DEPENDS+=	XFree86-fontsEncodings>=4.4.0:../../fonts/XFree86-fontsEncodings
+DEPENDS+=	XFree86-fontsEncodings>=${XF_VER}:../../fonts/XFree86-fontsEncodings
 FILESDIR=	${.CURDIR}/../../fonts/XFree86-fontsEncodings/files
 
 ENCODINGS=	encodings encodings/large
diff --git a/fonts/XFree86-fontsMisc/Makefile b/fonts/XFree86-fontsMisc/Makefile
index 5317c3f8d75..ecb7016fc4e 100644
--- a/fonts/XFree86-fontsMisc/Makefile
+++ b/fonts/XFree86-fontsMisc/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2004/07/29 06:36:33 xtraeme Exp $
+# $NetBSD: Makefile,v 1.7 2004/07/29 09:06:20 xtraeme Exp $
 
 DISTNAME=	${DISTFILES}
 PKGNAME=	XFree86-fontsMisc-${XF_VER}
 CATEGORIES=	fonts x11
 MASTER_SITES=	${MASTER_SITE_XFREE}
-DISTFILES=	XFree86-4.4.0-src-1.tgz XFree86-4.4.0-src-4.tgz
+DISTFILES=	XFree86-${XF_VER}-src-1.tgz XFree86-${XF_VER}-src-4.tgz
 
 MAINTAINER=	xfree86@blef.org
 HOMEPAGE=	http://www.xfree86.org/
@@ -13,7 +13,7 @@ COMMENT=	XFree86 default bitmap fonts
 NO_XFREE86_TARGETS=	# defined
 FONTS_MISC=		# defined
 WRKSRC=			${WRKDIR}/xc/fonts/bdf/misc
-EXTRACT_ONLY=		XFree86-4.4.0-src-4.tgz
+EXTRACT_ONLY=		XFree86-${XF_VER}-src-4.tgz
 
 .include "../../fonts/XFree86-fontsEncodings/Makefile.common"
 .include "../../meta-pkgs/XFree86/Makefile.common"
diff --git a/fonts/XFree86-fontsScalable/Makefile b/fonts/XFree86-fontsScalable/Makefile
index f926de2683c..94bef88cc01 100644
--- a/fonts/XFree86-fontsScalable/Makefile
+++ b/fonts/XFree86-fontsScalable/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.7 2004/07/29 06:36:33 xtraeme Exp $
+# $NetBSD: Makefile,v 1.8 2004/07/29 09:06:20 xtraeme Exp $
 
 DISTNAME=	${DISTFILES}
 PKGNAME=	XFree86-fontsScalable-${XF_VER}
 CATEGORIES=	fonts x11
 MASTER_SITES=	${MASTER_SITE_XFREE}
-DISTFILES=	XFree86-4.4.0-src-4.tgz XFree86-4.4.0-src-5.tgz
+DISTFILES=	XFree86-${XF_VER}-src-4.tgz XFree86-${XF_VER}-src-5.tgz
 
 MAINTAINER=	xfree86@blef.org
 HOMEPAGE=	http://www.xfree86.org/
 COMMENT=	XFree86 scalable fonts
 
-DEPENDS+=	XFree86-fontsEncodings>=4.4.0:../XFree86-fontsEncodings
+DEPENDS+=	XFree86-fontsEncodings>=${XF_VER}:../XFree86-fontsEncodings
 
 NO_BUILD=		yes
 NO_BUILDLINK=		# defined
diff --git a/fonts/XFree86-fontserver/Makefile b/fonts/XFree86-fontserver/Makefile
index 3b731f6f2ff..68c526dfbe1 100644
--- a/fonts/XFree86-fontserver/Makefile
+++ b/fonts/XFree86-fontserver/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.8 2004/07/29 06:36:33 xtraeme Exp $
+# $NetBSD: Makefile,v 1.9 2004/07/29 09:06:20 xtraeme Exp $
 
 DISTNAME=	${DISTFILES}
 PKGNAME=	XFree86-fontserver-${XF_VER}
 CATEGORIES=	fonts x11
 MASTER_SITES=	${MASTER_SITE_XFREE}
-DISTFILES=	XFree86-4.4.0-src-1.tgz XFree86-4.4.0-src-2.tgz \
-		XFree86-4.4.0-src-3.tgz XFree86-4.4.0-src-4.tgz
+DISTFILES=	XFree86-${XF_VER}-src-1.tgz XFree86-${XF_VER}-src-2.tgz \
+		XFree86-${XF_VER}-src-3.tgz XFree86-${XF_VER}-src-4.tgz
 
 MAINTAINER=	xfree86@blef.org
 HOMEPAGE=	http://www.xfree86.org/
diff --git a/misc/XFree86-docs/Makefile b/misc/XFree86-docs/Makefile
index 0c3f82fb9a8..2f4b90d7036 100644
--- a/misc/XFree86-docs/Makefile
+++ b/misc/XFree86-docs/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.6 2004/07/29 06:36:32 xtraeme Exp $
+# $NetBSD: Makefile,v 1.7 2004/07/29 09:06:19 xtraeme Exp $
 
 DISTNAME=		${DISTFILES}
 PKGNAME=		XFree86-docs-${XF_VER}
 CATEGORIES=		misc x11
 MASTER_SITES=		${MASTER_SITE_XFREE}
-DISTFILES+=		XFree86-4.4.0-src-1.tgz XFree86-4.4.0-src-6.tgz
+DISTFILES+=		XFree86-${XF_VER}-src-1.tgz XFree86-${XF_VER}-src-6.tgz
 
 MAINTAINER=		xfree86@blef.org
 HOMEPAGE=		http://www.xfree86.org/
 COMMENT=		XFree86 Documentation
 
-DEPENDS=		imake>=4.4.0:../../x11/imake
+DEPENDS=		imake>=${XF_VER}:../../x11/imake
 
 USE_LANGUAGES=		# empty
 NO_BUILDLINK=		# defined
diff --git a/misc/XFree86-man/Makefile b/misc/XFree86-man/Makefile
index 0922a630ba4..7c5bb2b1eba 100644
--- a/misc/XFree86-man/Makefile
+++ b/misc/XFree86-man/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2004/03/28 22:06:15 xtraeme Exp $
+# $NetBSD: Makefile,v 1.6 2004/07/29 09:06:19 xtraeme Exp $
 
-DISTNAME=	XFree86-4.4.0-src-1
+DISTNAME=	XFree86-${XF_VER}-src-1
 PKGNAME=	XFree86-man-${XF_VER}
 CATEGORIES=	misc x11
 MASTER_SITES=	${MASTER_SITE_XFREE}
@@ -10,7 +10,7 @@ MAINTAINER=	xfree86@blef.org
 HOMEPAGE=	http://www.xfree86.org/
 COMMENT=	XFree86 Manuals
 
-DEPENDS=	imake>=4.4.0:../../x11/imake
+DEPENDS=	imake>=${XF_VER}:../../x11/imake
 
 USE_LANGUAGES=		# empty
 NO_BUILDLINK=		# defined
diff --git a/x11/XFree86-clients/Makefile b/x11/XFree86-clients/Makefile
index 58fee0135ec..deab850722b 100644
--- a/x11/XFree86-clients/Makefile
+++ b/x11/XFree86-clients/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.11 2004/07/29 06:36:33 xtraeme Exp $
+# $NetBSD: Makefile,v 1.12 2004/07/29 09:06:20 xtraeme Exp $
 
 DISTNAME=		${DISTFILES}
 PKGNAME=		XFree86-clients-${XF_VER}
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_XFREE}
-DISTFILES=		XFree86-4.4.0-src-1.tgz XFree86-4.4.0-src-2.tgz \
-			XFree86-4.4.0-src-3.tgz XFree86-4.4.0-src-4.tgz
+DISTFILES=		XFree86-${XF_VER}-src-1.tgz XFree86-${XF_VER}-src-2.tgz \
+			XFree86-${XF_VER}-src-3.tgz XFree86-${XF_VER}-src-4.tgz
 
 MAINTAINER=		xfree86@blef.org
 HOMEPAGE=		http://www.xfree86.org/
diff --git a/x11/XFree86-libs/Makefile b/x11/XFree86-libs/Makefile
index 60b74475e26..1c3cb0a4cd1 100644
--- a/x11/XFree86-libs/Makefile
+++ b/x11/XFree86-libs/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.14 2004/07/29 06:36:33 xtraeme Exp $
+# $NetBSD: Makefile,v 1.15 2004/07/29 09:06:20 xtraeme Exp $
 
 DISTNAME=		${DISTFILES}
 PKGNAME=		XFree86-libs-${XF_VER}
 PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_XFREE}
-DISTFILES=		XFree86-4.4.0-src-1.tgz XFree86-4.4.0-src-2.tgz \
-			XFree86-4.4.0-src-3.tgz XFree86-4.4.0-src-4.tgz
+DISTFILES=		XFree86-${XF_VER}-src-1.tgz XFree86-${XF_VER}-src-2.tgz \
+			XFree86-${XF_VER}-src-3.tgz XFree86-${XF_VER}-src-4.tgz
 
 MAINTAINER=		xfree86@blef.org
 HOMEPAGE=		http://www.xfree86.org/
@@ -16,7 +16,7 @@ CONFLICTS+=		xextensions-[0-9]*
 CONFLICTS+=		libX11-[0-9]*
 CONFLICTS+=		libXau-[0-9]*
 
-BUILD_DEPENDS=		imake>=4.4.0:../../x11/imake
+BUILD_DEPENDS=		imake>=${XF_VER}:../../x11/imake
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/x11/XFree86-server/Makefile b/x11/XFree86-server/Makefile
index e4d6459afa6..501c879a895 100644
--- a/x11/XFree86-server/Makefile
+++ b/x11/XFree86-server/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.10 2004/07/29 06:36:33 xtraeme Exp $
+# $NetBSD: Makefile,v 1.11 2004/07/29 09:06:20 xtraeme Exp $
 
 DISTNAME=		${DISTFILES}
 PKGNAME=		XFree86-server-${XF_VER}
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_XFREE}
-DISTFILES=		XFree86-4.4.0-src-1.tgz XFree86-4.4.0-src-2.tgz \
-			XFree86-4.4.0-src-3.tgz
+DISTFILES=		XFree86-${XF_VER}-src-1.tgz XFree86-${XF_VER}-src-2.tgz \
+			XFree86-${XF_VER}-src-3.tgz
 
 MAINTAINER=		xfree86@blef.org
 HOMEPAGE=		http://www.xfree86.org/
diff --git a/x11/imake/Makefile b/x11/imake/Makefile
index 08085ee8c53..fa06fb5826d 100644
--- a/x11/imake/Makefile
+++ b/x11/imake/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.13 2004/07/29 06:36:33 xtraeme Exp $
+# $NetBSD: Makefile,v 1.14 2004/07/29 09:06:20 xtraeme Exp $
 
 DISTNAME=	${DISTFILES}
 PKGNAME=	imake-${XF_VER}
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XFREE}
-DISTFILES=	XFree86-4.4.0-src-1.tgz XFree86-4.4.0-src-3.tgz
+DISTFILES=	XFree86-${XF_VER}-src-1.tgz XFree86-${XF_VER}-src-3.tgz
 
 MAINTAINER=	xfree86@blef.org
 HOMEPAGE=	http://www.xfree86.org/