Wed Oct 1 19:04:56 2014 UTC ()
x11/xorg-imake has been dead for a long time.


(joerg)
diff -r1.270 -r1.271 pkgsrc/mk/tools/replace.mk
cvs diff -r1.270 -r1.271 pkgsrc/mk/tools/replace.mk (expand / switch to unified diff)

--- pkgsrc/mk/tools/replace.mk 2014/04/28 13:15:29 1.270
+++ pkgsrc/mk/tools/replace.mk 2014/10/01 19:04:56 1.271
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: replace.mk,v 1.270 2014/04/28 13:15:29 obache Exp $ 1# $NetBSD: replace.mk,v 1.271 2014/10/01 19:04:56 joerg Exp $
2# 2#
3# Copyright (c) 2005 The NetBSD Foundation, Inc. 3# Copyright (c) 2005 The NetBSD Foundation, Inc.
4# All rights reserved. 4# All rights reserved.
5# 5#
6# This code is derived from software contributed to The NetBSD Foundation 6# This code is derived from software contributed to The NetBSD Foundation
7# by Johnny C. Lam. 7# by Johnny C. Lam.
8# 8#
9# Redistribution and use in source and binary forms, with or without 9# Redistribution and use in source and binary forms, with or without
10# modification, are permitted provided that the following conditions 10# modification, are permitted provided that the following conditions
11# are met: 11# are met:
12# 1. Redistributions of source code must retain the above copyright 12# 1. Redistributions of source code must retain the above copyright
13# notice, this list of conditions and the following disclaimer. 13# notice, this list of conditions and the following disclaimer.
14# 2. Redistributions in binary form must reproduce the above copyright 14# 2. Redistributions in binary form must reproduce the above copyright
@@ -1321,47 +1321,45 @@ TOOLS_PATH.xmessage= ${TOOLS_PREFIX.xme @@ -1321,47 +1321,45 @@ TOOLS_PATH.xmessage= ${TOOLS_PREFIX.xme
1321. endif 1321. endif
1322. endif 1322. endif
1323.endif 1323.endif
1324 1324
1325###################################################################### 1325######################################################################
1326 1326
1327# These tools are all supplied by an X11 imake package if there is no 1327# These tools are all supplied by an X11 imake package if there is no
1328# native tool available. 1328# native tool available.
1329# 1329#
1330_TOOLS.x11-imake= imake mkdirhier xmkmf 1330_TOOLS.x11-imake= imake mkdirhier xmkmf
1331 1331
1332.for _t_ in ${_TOOLS.x11-imake} 1332.for _t_ in ${_TOOLS.x11-imake}
1333. if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_}) 1333. if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_})
1334. if !empty(PKGPATH:Mdevel/nbitools) || \ 1334. if !empty(PKGPATH:Mdevel/nbitools)
1335 !empty(PKGPATH:Mx11/xorg-imake) 
1336MAKEFLAGS+= TOOLS_IGNORE.${_t_}= 1335MAKEFLAGS+= TOOLS_IGNORE.${_t_}=
1337. elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS]) 1336. elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS])
1338TOOLS_CREATE+= ${_t_} 1337TOOLS_CREATE+= ${_t_}
1339. if !empty(_USE_TOOLS:Mitools) 1338. if !empty(_USE_TOOLS:Mitools)
1340TOOLS_DEPENDS.${_t_}?= nbitools>=6.3nb4:../../devel/nbitools 1339TOOLS_DEPENDS.${_t_}?= nbitools>=6.3nb4:../../devel/nbitools
1341TOOLS_FIND_PREFIX+= TOOLS_PREFIX.${_t_}=nbitools 1340TOOLS_FIND_PREFIX+= TOOLS_PREFIX.${_t_}=nbitools
1342TOOLS_PATH.${_t_}= ${TOOLS_PREFIX.${_t_}}/libexec/itools/${_t_} 1341TOOLS_PATH.${_t_}= ${TOOLS_PREFIX.${_t_}}/libexec/itools/${_t_}
1343. else 1342. else
1344TOOLS_DEPENDS.${_t_}?= imake-[0-9]*:../../devel/imake 1343TOOLS_DEPENDS.${_t_}?= imake-[0-9]*:../../devel/imake
1345TOOLS_FIND_PREFIX+= TOOLS_PREFIX.${_t_}=imake 1344TOOLS_FIND_PREFIX+= TOOLS_PREFIX.${_t_}=imake
1346TOOLS_PATH.${_t_}= ${TOOLS_PREFIX.${_t_}}/bin/${_t_} 1345TOOLS_PATH.${_t_}= ${TOOLS_PREFIX.${_t_}}/bin/${_t_}
1347. endif 1346. endif
1348. endif 1347. endif
1349. endif 1348. endif
1350.endfor 1349.endfor
1351 1350
1352.if !defined(TOOLS_IGNORE.makedepend) && !empty(_USE_TOOLS:Mmakedepend) 1351.if !defined(TOOLS_IGNORE.makedepend) && !empty(_USE_TOOLS:Mmakedepend)
1353. if !empty(PKGPATH:Mdevel/nbitools) || \ 1352. if !empty(PKGPATH:Mdevel/nbitools)
1354 !empty(PKGPATH:Mx11/xorg-imake) 
1355MAKEFLAGS+= TOOLS_IGNORE.makedepend= 1353MAKEFLAGS+= TOOLS_IGNORE.makedepend=
1356. elif !empty(_TOOLS_USE_PKGSRC.makedepend:M[yY][eE][sS]) 1354. elif !empty(_TOOLS_USE_PKGSRC.makedepend:M[yY][eE][sS])
1357TOOLS_CREATE+= makedepend 1355TOOLS_CREATE+= makedepend
1358. if !empty(_USE_TOOLS:Mitools) 1356. if !empty(_USE_TOOLS:Mitools)
1359TOOLS_DEPENDS.makedepend?= nbitools>=6.3nb4:../../devel/nbitools 1357TOOLS_DEPENDS.makedepend?= nbitools>=6.3nb4:../../devel/nbitools
1360TOOLS_FIND_PREFIX+= TOOLS_PREFIX.makedepend=nbitools 1358TOOLS_FIND_PREFIX+= TOOLS_PREFIX.makedepend=nbitools
1361TOOLS_PATH.makedepend= ${TOOLS_PREFIX.makedepend}/libexec/itools/makedepend 1359TOOLS_PATH.makedepend= ${TOOLS_PREFIX.makedepend}/libexec/itools/makedepend
1362. elif defined(X11_TYPE) && !empty(X11_TYPE:Mmodular) 1360. elif defined(X11_TYPE) && !empty(X11_TYPE:Mmodular)
1363TOOLS_DEPENDS.makedepend?= makedepend-[0-9]*:../../devel/makedepend 1361TOOLS_DEPENDS.makedepend?= makedepend-[0-9]*:../../devel/makedepend
1364TOOLS_FIND_PREFIX+= TOOLS_PREFIX.makedepend=makedepend 1362TOOLS_FIND_PREFIX+= TOOLS_PREFIX.makedepend=makedepend
1365TOOLS_PATH.makedepend= ${TOOLS_PREFIX.makedepend}/bin/makedepend 1363TOOLS_PATH.makedepend= ${TOOLS_PREFIX.makedepend}/bin/makedepend
1366. else # !empty(X11_TYPE:Mnative) 1364. else # !empty(X11_TYPE:Mnative)
1367TOOLS_PATH.makedepend= ${X11BASE}/bin/makedepend 1365TOOLS_PATH.makedepend= ${X11BASE}/bin/makedepend