[pkgsrc/trunk]: pkgsrc Use ${XF_VER} instead of using 4.4.0.

[xtraeme <xtraeme%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1bdbf9fdacca
branches:  trunk
changeset: 478760:1bdbf9fdacca
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Thu Jul 29 09:06:19 2004 +0000

description:
Use ${XF_VER} instead of using 4.4.0.

diffstat:

 fonts/XFree86-fonts100dpi/Makefile           |  4 ++--
 fonts/XFree86-fonts75dpi/Makefile            |  4 ++--
 fonts/XFree86-fontsCyrillic/Makefile         |  4 ++--
 fonts/XFree86-fontsEncodings/Makefile        |  6 +++---
 fonts/XFree86-fontsEncodings/Makefile.common |  4 ++--
 fonts/XFree86-fontsMisc/Makefile             |  6 +++---
 fonts/XFree86-fontsScalable/Makefile         |  6 +++---
 fonts/XFree86-fontserver/Makefile            |  6 +++---
 misc/XFree86-docs/Makefile                   |  6 +++---
 misc/XFree86-man/Makefile                    |  6 +++---
 x11/XFree86-clients/Makefile                 |  6 +++---
 x11/XFree86-libs/Makefile                    |  8 ++++----
 x11/XFree86-server/Makefile                  |  6 +++---
 x11/imake/Makefile                           |  4 ++--
 14 files changed, 38 insertions(+), 38 deletions(-)

diffs (265 lines):

diff -r 383aa20b8634 -r 1bdbf9fdacca fonts/XFree86-fonts100dpi/Makefile
--- a/fonts/XFree86-fonts100dpi/Makefile        Thu Jul 29 08:59:15 2004 +0000
+++ b/fonts/XFree86-fonts100dpi/Makefile        Thu Jul 29 09:06:19 2004 +0000
@@ -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 -r 383aa20b8634 -r 1bdbf9fdacca fonts/XFree86-fonts75dpi/Makefile
--- a/fonts/XFree86-fonts75dpi/Makefile Thu Jul 29 08:59:15 2004 +0000
+++ b/fonts/XFree86-fonts75dpi/Makefile Thu Jul 29 09:06:19 2004 +0000
@@ -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 -r 383aa20b8634 -r 1bdbf9fdacca fonts/XFree86-fontsCyrillic/Makefile
--- a/fonts/XFree86-fontsCyrillic/Makefile      Thu Jul 29 08:59:15 2004 +0000
+++ b/fonts/XFree86-fontsCyrillic/Makefile      Thu Jul 29 09:06:19 2004 +0000
@@ -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 -r 383aa20b8634 -r 1bdbf9fdacca fonts/XFree86-fontsEncodings/Makefile
--- a/fonts/XFree86-fontsEncodings/Makefile     Thu Jul 29 08:59:15 2004 +0000
+++ b/fonts/XFree86-fontsEncodings/Makefile     Thu Jul 29 09:06:19 2004 +0000
@@ -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 @@
 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 -r 383aa20b8634 -r 1bdbf9fdacca fonts/XFree86-fontsEncodings/Makefile.common
--- a/fonts/XFree86-fontsEncodings/Makefile.common      Thu Jul 29 08:59:15 2004 +0000
+++ b/fonts/XFree86-fontsEncodings/Makefile.common      Thu Jul 29 09:06:19 2004 +0000
@@ -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 @@
 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 -r 383aa20b8634 -r 1bdbf9fdacca fonts/XFree86-fontsMisc/Makefile
--- a/fonts/XFree86-fontsMisc/Makefile  Thu Jul 29 08:59:15 2004 +0000
+++ b/fonts/XFree86-fontsMisc/Makefile  Thu Jul 29 09:06:19 2004 +0000
@@ -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@localhost
 HOMEPAGE=      http://www.xfree86.org/
@@ -13,7 +13,7 @@
 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 -r 383aa20b8634 -r 1bdbf9fdacca fonts/XFree86-fontsScalable/Makefile
--- a/fonts/XFree86-fontsScalable/Makefile      Thu Jul 29 08:59:15 2004 +0000
+++ b/fonts/XFree86-fontsScalable/Makefile      Thu Jul 29 09:06:19 2004 +0000
@@ -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@localhost
 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 -r 383aa20b8634 -r 1bdbf9fdacca fonts/XFree86-fontserver/Makefile
--- a/fonts/XFree86-fontserver/Makefile Thu Jul 29 08:59:15 2004 +0000
+++ b/fonts/XFree86-fontserver/Makefile Thu Jul 29 09:06:19 2004 +0000
@@ -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@localhost
 HOMEPAGE=      http://www.xfree86.org/
diff -r 383aa20b8634 -r 1bdbf9fdacca misc/XFree86-docs/Makefile
--- a/misc/XFree86-docs/Makefile        Thu Jul 29 08:59:15 2004 +0000
+++ b/misc/XFree86-docs/Makefile        Thu Jul 29 09:06:19 2004 +0000
@@ -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@localhost
 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 -r 383aa20b8634 -r 1bdbf9fdacca misc/XFree86-man/Makefile
--- a/misc/XFree86-man/Makefile Thu Jul 29 08:59:15 2004 +0000
+++ b/misc/XFree86-man/Makefile Thu Jul 29 09:06:19 2004 +0000
@@ -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 @@
 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 -r 383aa20b8634 -r 1bdbf9fdacca x11/XFree86-clients/Makefile
--- a/x11/XFree86-clients/Makefile      Thu Jul 29 08:59:15 2004 +0000
+++ b/x11/XFree86-clients/Makefile      Thu Jul 29 09:06:19 2004 +0000
@@ -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@localhost
 HOMEPAGE=              http://www.xfree86.org/
diff -r 383aa20b8634 -r 1bdbf9fdacca x11/XFree86-libs/Makefile
--- a/x11/XFree86-libs/Makefile Thu Jul 29 08:59:15 2004 +0000
+++ b/x11/XFree86-libs/Makefile Thu Jul 29 09:06:19 2004 +0000
@@ -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@localhost
 HOMEPAGE=              http://www.xfree86.org/
@@ -16,7 +16,7 @@
 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 -r 383aa20b8634 -r 1bdbf9fdacca x11/XFree86-server/Makefile
--- a/x11/XFree86-server/Makefile       Thu Jul 29 08:59:15 2004 +0000
+++ b/x11/XFree86-server/Makefile       Thu Jul 29 09:06:19 2004 +0000
@@ -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@localhost
 HOMEPAGE=              http://www.xfree86.org/
diff -r 383aa20b8634 -r 1bdbf9fdacca x11/imake/Makefile
--- a/x11/imake/Makefile        Thu Jul 29 08:59:15 2004 +0000
+++ b/x11/imake/Makefile        Thu Jul 29 09:06:19 2004 +0000
@@ -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@localhost
 HOMEPAGE=      http://www.xfree86.org/