[pkgsrc/trunk]: pkgsrc/mk/tools Add modular Xorg support for iceauth and xmes...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bbc935c6313a
branches:  trunk
changeset: 524013:bbc935c6313a
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Jan 16 21:45:38 2007 +0000

description:
Add modular Xorg support for iceauth and xmessage as tool, nuke
makepsres at the same time. The latter wasn't used in pkgsrc and
is related to DPS which is dead.

diffstat:

 mk/tools/replace.mk |  27 ++++++++++++++++++++++++---
 1 files changed, 24 insertions(+), 3 deletions(-)

diffs (54 lines):

diff -r 31ec8105a881 -r bbc935c6313a mk/tools/replace.mk
--- a/mk/tools/replace.mk       Tue Jan 16 21:33:25 2007 +0000
+++ b/mk/tools/replace.mk       Tue Jan 16 21:45:38 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.182 2007/01/02 23:14:54 wiz Exp $
+# $NetBSD: replace.mk,v 1.183 2007/01/16 21:45:38 joerg Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -964,6 +964,17 @@
 # For modular Xorg, these are individual packages.
 #
 .if ${X11_TYPE} == "modular"
+.if !defined(TOOLS_IGNORE.iceauth) && !empty(_USE_TOOLS:Miceauth)
+.  if !empty(PKGPATH:Mx11/iceauth)
+MAKEFLAGS+=            TOOLS_IGNORE.iceauth=
+.  else
+TOOLS_DEPENDS.iceauth?=                iceauth-[0-9]*:../../x11/iceauth
+TOOLS_FIND_PREFIX+=            TOOLS_PREFIX.iceauth=iceauth
+TOOLS_PATH.iceauth=            ${TOOLS_PREFIX.iceauth}/bin/iceauth
+TOOLS_CREATE.iceauth=          iceauth
+.   endif
+.endif
+
 .if !defined(TOOLS_IGNORE.mkfontdir) && !empty(_USE_TOOLS:Mmkfontdir)
 .  if !empty(PKGPATH:Mfonts/mkfontdir)
 MAKEFLAGS+=            TOOLS_IGNORE.mkfontdir=
@@ -1019,14 +1030,24 @@
 .  endif
 .endif
 
+.if !defined(TOOLS_IGNORE.xmessage) && !empty(_USE_TOOLS:Mxmessage)
+.  if !empty(PKGPATH:Mx11/xmessage)
+MAKEFLAGS+=            TOOLS_IGNORE.xmessage=
+.  else
+TOOLS_DEPENDS.xmessage?=               xmessage-[0-9]*:../../x11/xmessage
+TOOLS_FIND_PREFIX+=            TOOLS_PREFIX.xmessage=xmessage
+TOOLS_PATH.xmessage=           ${TOOLS_PREFIX.xmessage}/bin/xmessage
+TOOLS_CREATE.xmessage=         xmessage
+.   endif
+.endif
+
 .endif
 
 # Otherwise these tools are all supplied by an X11 clients package if there is no
 # native tool available.
 #
 .if ${X11_TYPE} != "modular"
-_TOOLS.x11-clients=    bdftopcf iceauth mkfontdir mkfontscale \
-                       makepsres xmessage
+_TOOLS.x11-clients=    bdftopcf iceauth mkfontdir mkfontscale xmessage
 
 .for _t_ in ${_TOOLS.x11-clients}
 .  if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_})