[pkgsrc/trunk]: pkgsrc x11/imake was changed to x11/XFree86-imake. Also packa...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a65ec619ec31
branches:  trunk
changeset: 500586:a65ec619ec31
user:      reed <reed%pkgsrc.org@localhost>
date:      Mon Oct 10 17:22:05 2005 +0000

description:
x11/imake was changed to x11/XFree86-imake. Also package name
changed to XFree86-imake.

diffstat:

 meta-pkgs/XFree86/Makefile |   4 ++--
 misc/XFree86-docs/Makefile |   4 ++--
 misc/XFree86-man/Makefile  |   4 ++--
 mk/tools/replace.mk        |  10 +++++-----
 x11/XFree86-libs/Makefile  |   4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

diffs (111 lines):

diff -r 9fabdf7a0f35 -r a65ec619ec31 meta-pkgs/XFree86/Makefile
--- a/meta-pkgs/XFree86/Makefile        Mon Oct 10 17:19:51 2005 +0000
+++ b/meta-pkgs/XFree86/Makefile        Mon Oct 10 17:22:05 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/09/28 19:13:50 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2005/10/10 17:22:05 reed Exp $
 
 DISTNAME=      # empty
 PKGNAME=       XFree86-${XF_VER}
@@ -10,7 +10,7 @@
 HOMEPAGE=      http://www.xfree86.org/
 COMMENT=       XFree86 meta-package
 
-DEPENDS=       imake>=4.4.0:../../x11/imake
+DEPENDS=       XFree86-imake>=4.4.0:../../x11/XFree86-imake
 DEPENDS+=      XFree86-libs>=4.4.0:../../x11/XFree86-libs
 DEPENDS+=      XFree86-clients>=4.4.0:../../x11/XFree86-clients
 DEPENDS+=      XFree86-server>=4.4.0:../../x11/XFree86-server
diff -r 9fabdf7a0f35 -r a65ec619ec31 misc/XFree86-docs/Makefile
--- a/misc/XFree86-docs/Makefile        Mon Oct 10 17:19:51 2005 +0000
+++ b/misc/XFree86-docs/Makefile        Mon Oct 10 17:22:05 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/09/28 20:52:24 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2005/10/10 17:22:05 reed Exp $
 
 DISTNAME=              ${DISTFILES}
 PKGNAME=               XFree86-docs-${XF_VER}
@@ -10,7 +10,7 @@
 HOMEPAGE=              http://www.xfree86.org/
 COMMENT=               XFree86 Documentation
 
-DEPENDS=               imake>=${XF_VER}:../../x11/imake
+DEPENDS=               XFree86-imake>=${XF_VER}:../../x11/XFree86-imake
 
 USE_LANGUAGES=         # empty
 NO_XFREE86_TARGETS=    yes
diff -r 9fabdf7a0f35 -r a65ec619ec31 misc/XFree86-man/Makefile
--- a/misc/XFree86-man/Makefile Mon Oct 10 17:19:51 2005 +0000
+++ b/misc/XFree86-man/Makefile Mon Oct 10 17:22:05 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/09/28 20:52:24 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2005/10/10 17:22:05 reed Exp $
 
 DISTNAME=      XFree86-${XF_VER}-src-1
 PKGNAME=       XFree86-man-${XF_VER}
@@ -10,7 +10,7 @@
 HOMEPAGE=      http://www.xfree86.org/
 COMMENT=       XFree86 Manuals
 
-DEPENDS=       imake>=${XF_VER}:../../x11/imake
+DEPENDS=       XFree86-imake>=${XF_VER}:../../x11/XFree86-imake
 
 USE_LANGUAGES=         # empty
 NO_XFREE86_TARGETS=    yes
diff -r 9fabdf7a0f35 -r a65ec619ec31 mk/tools/replace.mk
--- a/mk/tools/replace.mk       Mon Oct 10 17:19:51 2005 +0000
+++ b/mk/tools/replace.mk       Mon Oct 10 17:22:05 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.126 2005/09/20 03:50:18 jlam Exp $
+# $NetBSD: replace.mk,v 1.127 2005/10/10 17:22:06 reed Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -679,12 +679,12 @@
 .endif
 
 .if !defined(TOOLS_IGNORE.imake) && !empty(_USE_TOOLS:Mimake)
-.  if !empty(PKGPATH:Mx11/imake) || !empty(PKGPATH:Mx11/xorg-imake)
+.  if !empty(PKGPATH:Mx11/XFree86-imake) || !empty(PKGPATH:Mx11/xorg-imake)
 MAKEFLAGS+=                    TOOLS_IGNORE.imake=
 .  elif !empty(_TOOLS_USE_PKGSRC.imake:M[yY][eE][sS])
 TOOLS_CREATE+=                 imake
 .    if defined(X11_TYPE) && !empty(X11_TYPE:MXFree86)
-TOOLS_DEPENDS.imake?=          imake>=4.4.0:../../x11/imake
+TOOLS_DEPENDS.imake?=          XFree86-imake>=4.4.0:../../x11/XFree86-imake
 TOOLS_FIND_PREFIX+=            TOOLS_PREFIX.imake=imake
 TOOLS_PATH.imake=              ${TOOLS_PREFIX.imake}/${X11ROOT_PREFIX}/bin/imake
 .    elif defined(X11_TYPE) && !empty(X11_TYPE:Mxorg)
@@ -1149,12 +1149,12 @@
 .endif
 
 .if !defined(TOOLS_IGNORE.xmkmf) && !empty(_USE_TOOLS:Mxmkmf)
-.  if !empty(PKGPATH:Mx11/imake) || !empty(PKGPATH:Mx11/xorg-imake)
+.  if !empty(PKGPATH:Mx11/XFree86-imake) || !empty(PKGPATH:Mx11/xorg-imake)
 MAKEFLAGS+=                    TOOLS_IGNORE.xmkmf=
 .  elif !empty(_TOOLS_USE_PKGSRC.xmkmf:M[yY][eE][sS])
 TOOLS_CREATE+=                 xmkmf
 .    if defined(X11_TYPE) && !empty(X11_TYPE:MXFree86)
-TOOLS_DEPENDS.xmkmf?=          imake>=4.4.0:../../x11/imake
+TOOLS_DEPENDS.xmkmf?=          XFree86-imake>=4.4.0:../../x11/XFree86-imake
 TOOLS_FIND_PREFIX+=            TOOLS_PREFIX.xmkmf=imake
 TOOLS_PATH.xmkmf=              ${TOOLS_PREFIX.xmkmf}/${X11ROOT_PREFIX}/bin/xmkmf
 .    elif defined(X11_TYPE) && !empty(X11_TYPE:Mxorg)
diff -r 9fabdf7a0f35 -r a65ec619ec31 x11/XFree86-libs/Makefile
--- a/x11/XFree86-libs/Makefile Mon Oct 10 17:19:51 2005 +0000
+++ b/x11/XFree86-libs/Makefile Mon Oct 10 17:22:05 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/09/18 19:51:55 xtraeme Exp $
+# $NetBSD: Makefile,v 1.21 2005/10/10 17:22:05 reed Exp $
 
 DISTNAME=              ${DISTFILES}
 PKGNAME=               XFree86-libs-${XF_VER}
@@ -16,7 +16,7 @@
 CONFLICTS+=            libX11-[0-9]*
 CONFLICTS+=            libXau-[0-9]*
 
-BUILD_DEPENDS=         imake>=${XF_VER}:../../x11/imake
+BUILD_DEPENDS=         XFree86-imake>=${XF_VER}:../../x11/XFree86-imake
 
 .include "../../mk/bsd.prefs.mk"