diff options
| author | joerg <joerg@pkgsrc.org> | 2012-03-19 12:34:12 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2012-03-19 12:34:12 +0000 |
| commit | 2b1c8cecc647ec925183e8328f75056033c29d9f (patch) | |
| tree | a3955afe4cc63c2b002bc7b453f7fdc618bce538 /mk/tools | |
| parent | 91ce155c2c816847ac6ff504520a555611e2224f (diff) | |
| download | pkgsrc-2b1c8cecc647ec925183e8328f75056033c29d9f.tar.gz | |
Drop imake-check logic from X11 components' builtin.mk.
Always use xorg-cf-files and imake from pkgsrc, replacing xpkgwedge.
Always install man pages, not cat pages when using imake.
Unify the various imake PLIST variables in preparation for dropping.
Adjust xbattbar for the new expectations.
Diffstat (limited to 'mk/tools')
| -rw-r--r-- | mk/tools/replace.mk | 23 | ||||
| -rw-r--r-- | mk/tools/tools.IRIX.mk | 5 |
2 files changed, 3 insertions, 25 deletions
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk index ad000a7c4b3..cf3a1212cd0 100644 --- a/mk/tools/replace.mk +++ b/mk/tools/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.245 2012/02/23 13:09:55 hans Exp $ +# $NetBSD: replace.mk,v 1.246 2012/03/19 12:34:19 joerg Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -1203,18 +1203,10 @@ TOOLS_CREATE+= ${_t_} TOOLS_DEPENDS.${_t_}?= nbitools>=6.3nb4:../../devel/nbitools TOOLS_FIND_PREFIX+= TOOLS_PREFIX.${_t_}=nbitools TOOLS_PATH.${_t_}= ${TOOLS_PREFIX.${_t_}}/libexec/itools/${_t_} -. elif defined(X11_TYPE) && !empty(X11_TYPE:Mmodular) +. else TOOLS_DEPENDS.${_t_}?= imake-[0-9]*:../../devel/imake TOOLS_FIND_PREFIX+= TOOLS_PREFIX.${_t_}=imake TOOLS_PATH.${_t_}= ${TOOLS_PREFIX.${_t_}}/bin/${_t_} -. else # !empty(X11_TYPE:Mnative) -. if exists(${X11BASE}/bin/${_t_}) -TOOLS_PATH.${_t_}= ${X11BASE}/bin/${_t_} -. else # X11_TYPE native, but tool does not exist, so fall back -TOOLS_DEPENDS.${_t_}?= imake-[0-9]*:../../devel/imake -TOOLS_FIND_PREFIX+= TOOLS_PREFIX.${_t_}=imake -TOOLS_PATH.${_t_}= ${TOOLS_PREFIX.${_t_}}/bin/${_t_} -. endif . endif . endif . endif @@ -1239,17 +1231,6 @@ TOOLS_PATH.makedepend= ${X11BASE}/bin/makedepend . endif . endif .endif -# -# If we're using xpkgwedge, then we need to invoke the special xmkmf -# script that will find imake config files in both ${PREFIX} and in -# ${X11BASE}. -# -.if !defined(TOOLS_IGNORE.xmkmf) && !empty(_USE_TOOLS:Mxmkmf) -. if !empty(USE_XPKGWEDGE:M[yY][eE][sS]) && empty(_USE_TOOLS:Mitools) -TOOLS_FIND_PREFIX+= TOOLS_PREFIX.xpkgwedge=xpkgwedge -TOOLS_PATH.xmkmf= ${TOOLS_PREFIX.xpkgwedge}/bin/pkgxmkmf -. endif -.endif ###################################################################### diff --git a/mk/tools/tools.IRIX.mk b/mk/tools/tools.IRIX.mk index b988a6d1c17..f7b73caa259 100644 --- a/mk/tools/tools.IRIX.mk +++ b/mk/tools/tools.IRIX.mk @@ -1,4 +1,4 @@ -# $NetBSD: tools.IRIX.mk,v 1.19 2007/01/08 08:55:52 rillig Exp $ +# $NetBSD: tools.IRIX.mk,v 1.20 2012/03/19 12:34:19 joerg Exp $ # # System-supplied tools for the IRIX operating system. @@ -37,9 +37,6 @@ TOOLS_PLATFORM.gzip?= /usr/sbin/gzip -nf ${GZIP} TOOLS_PLATFORM.head?= /usr/bsd/head TOOLS_PLATFORM.hostname?= /usr/bsd/hostname TOOLS_PLATFORM.id?= /usr/bin/id -.if defined(X11_TYPE) && !empty(X11_TYPE:Mnative) && exists(/usr/bin/X11/imake) -TOOLS_PLATFORM.imake?= /usr/bin/X11/imake -.endif TOOLS_PLATFORM.ln?= /sbin/ln TOOLS_PLATFORM.ls?= /sbin/ls TOOLS_PLATFORM.m4?= /sbin/m4 |