pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/tools Check ${X11BASE}/bin/bdftopcf exists before b...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d43a34461f0f
branches:  trunk
changeset: 631486:d43a34461f0f
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Fri Mar 07 15:07:44 2014 +0000

description:
Check ${X11BASE}/bin/bdftopcf exists before blindly using it, not all
distributions include it.

diffstat:

 mk/tools/replace.mk |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r b1a0d0d75883 -r d43a34461f0f mk/tools/replace.mk
--- a/mk/tools/replace.mk       Fri Mar 07 15:03:15 2014 +0000
+++ b/mk/tools/replace.mk       Fri Mar 07 15:07:44 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.267 2014/02/14 07:43:46 obache Exp $
+# $NetBSD: replace.mk,v 1.268 2014/03/07 15:07:44 jperkin Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -1192,7 +1192,7 @@
 MAKEFLAGS+=            TOOLS_IGNORE.bdftopcf=
 .  elif !empty(_TOOLS_USE_PKGSRC.bdftopcf:M[yY][eE][sS])
 TOOLS_CREATE+=                 bdftopcf
-.    if !empty(X11_TYPE:Mnative)
+.    if !empty(X11_TYPE:Mnative) && exists(${X11BASE}/bin/bdftopcf)
 TOOLS_PATH.bdftopcf=   ${X11BASE}/bin/bdftopcf
 .    else
 TOOLS_DEPENDS.bdftopcf?=       bdftopcf-[0-9]*:../../fonts/bdftopcf



Home | Main Index | Thread Index | Old Index