[pkgsrc/trunk]: pkgsrc Teach the tools framework about bdftopcf and remove

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/199bf780503e
branches:  trunk
changeset: 495178:199bf780503e
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Jun 03 21:11:06 2005 +0000

description:
Teach the tools framework about bdftopcf and remove
x11-clients.buildlink3.mk.  Packages that need bdftopcf should say:

        USE_TOOLS+=     bdftopcf

diffstat:

 mail/metamail/Makefile       |   4 ++--
 mk/tools/replace.mk          |  21 ++++++++++++++++++++-
 mk/x11-clients.buildlink3.mk |  42 ------------------------------------------
 3 files changed, 22 insertions(+), 45 deletions(-)

diffs (104 lines):

diff -r 959437e26f6a -r 199bf780503e mail/metamail/Makefile
--- a/mail/metamail/Makefile    Fri Jun 03 20:22:59 2005 +0000
+++ b/mail/metamail/Makefile    Fri Jun 03 21:11:06 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/05/09 13:02:14 xtraeme Exp $
+# $NetBSD: Makefile,v 1.36 2005/06/03 21:11:07 jlam Exp $
 
 DISTNAME=      mm2.7
 PKGNAME=       metamail-2.7
@@ -24,6 +24,7 @@
 
 EGDIR=         ${PREFIX}/share/examples/metamail
 CONF_FILES=    ${EGDIR}/mailcap ${PKG_SYSCONFDIR}/mailcap
+USE_TOOLS+=    bdftopcf
 
 INSTALLATION_DIRS=     bin man/man1 man/man4
 
@@ -43,5 +44,4 @@
 pre-install:
        ${INSTALL_DATA_DIR} ${EGDIR}
 
-.include "../../mk/x11-clients.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 959437e26f6a -r 199bf780503e mk/tools/replace.mk
--- a/mk/tools/replace.mk       Fri Jun 03 20:22:59 2005 +0000
+++ b/mk/tools/replace.mk       Fri Jun 03 21:11:06 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.97 2005/06/02 21:03:32 jlam Exp $
+# $NetBSD: replace.mk,v 1.98 2005/06/03 21:11:07 jlam Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -196,6 +196,25 @@
 .  endif
 .endif
 
+.if !defined(TOOLS_IGNORE.bdftopcf) && !empty(_USE_TOOLS:Mbdftopcf)
+.  if !empty(PKGPATH:Mx11/XFree86-clients) || !empty(PKGPATH:Mx11/xorg-clients)
+MAKEFLAGS+=                    TOOLS_IGNORE.bdftopcf=
+.  elif !empty(_TOOLS_USE_PKGSRC.bdftopcf:M[yY][eE][sS])
+TOOLS_CREATE+=                 bdftopcf
+.    if defined(X11_TYPE) && !empty(X11_TYPE:MXFree86)
+TOOLS_DEPENDS.bdftopcf?=       XFree86-clients>=4.4.0:../../x11/XFree86-clients
+TOOLS_FIND_PREFIX+=            TOOLS_PREFIX.bdftopcf=imake
+TOOLS_REAL_CMD.bdftopcf=       ${TOOLS_PREFIX.bdftopcf}/${X11ROOT_PREFIX}/bin/bdftopcf
+.    elif defined(X11_TYPE) && !empty(X11_TYPE:Mxorg)
+TOOLS_DEPENDS.bdftopcf?=       xorg-clients>=6.8:../../x11/xorg-clients
+TOOLS_FIND_PREFIX+=            TOOLS_PREFIX.bdftopcf=xorg-clients
+TOOLS_REAL_CMD.bdftopcf=       ${TOOLS_PREFIX.bdftopcf}/${X11ROOT_PREFIX}/bin/bdftopcf
+.    else # !empty(X11_TYPE:Mnative)
+TOOLS_REAL_CMD.bdftopcf=       ${X11BASE}/bin/bdftopcf
+.    endif
+.  endif
+.endif
+
 .if !defined(TOOLS_IGNORE.bison) && !empty(_USE_TOOLS:Mbison)
 .  if !empty(PKGPATH:Mdevel/bison)
 MAKEFLAGS+=                    TOOLS_IGNORE.bison=
diff -r 959437e26f6a -r 199bf780503e mk/x11-clients.buildlink3.mk
--- a/mk/x11-clients.buildlink3.mk      Fri Jun 03 20:22:59 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-# $NetBSD: x11-clients.buildlink3.mk,v 1.1 2005/05/09 13:01:29 xtraeme Exp $
-#
-# This Makefile fragment is meant to be used for packages requiring
-# X11 applications like bdftopcf and so on, this Makefile is useless
-# if you are using the X11 distribution that comes with your system,
-# but it's useful if you use xorg or XFree86 from pkgsrc.
-
-.if !defined(X11CLIENTS_BUILDLINK3_MK)
-X11CLIENTS_BUILDLINK3_MK=       defined
-
-.include "../../mk/bsd.prefs.mk"
-
-X11CLIENTS_DEPMETHOD?=         build
-
-# Require at least these versions for now.
-
-XORG_DISTVER?=                  6.8.0
-XFREE86_DISTVER?=               4.4.0
-
-.if defined(X11_TYPE) && empty(X11_TYPE:Mnative)
-.  if !empty(X11CLIENTS_DEPMETHOD:Mbuild)
-.    if !empty(X11_TYPE:Mxorg)
-BUILD_DEPENDS+=                 \
-        xorg-clients>=${XORG_DISTVER}:../../x11/xorg-clients
-.    elif !empty(X11_TYPE:MXFree86)
-BUILD_DEPENDS+=                 \
-        XFree86-clients>=${XFREE86_DISTVER}:../../x11/XFree86-clients
-.    endif
-.  endif
-
-.  if !empty(X11CLIENTS_DEPMETHOD:Mfull)
-.    if !empty(X11_TYPE:Mxorg)
-DEPENDS+=                       \
-        xorg-clients>=${XORG_DISTVER}:../../x11/xorg-clients
-.    elif !empty(X11_TYPE:MXFree86)
-DEPENDS+=                       \
-        XFree86-clients>=${XFREE86_DISTVER}:../../x11/XFree86-clients
-.    endif
-.  endif
-.endif # X11_TYPE=native
-
-.endif # X11CLIENTS_BUILDLINK3_MK