Thu Jun 6 02:17:17 2013 UTC ()
create X related tools also for X11_TYPE=native.

might fix PR pkg/47883.


(obache)
diff -r1.259 -r1.260 pkgsrc/mk/tools/replace.mk
cvs diff -r1.259 -r1.260 pkgsrc/mk/tools/replace.mk (expand / switch to unified diff)

--- pkgsrc/mk/tools/replace.mk 2013/06/05 13:26:35 1.259
+++ pkgsrc/mk/tools/replace.mk 2013/06/06 02:17:17 1.260
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: replace.mk,v 1.259 2013/06/05 13:26:35 obache Exp $ 1# $NetBSD: replace.mk,v 1.260 2013/06/06 02:17:17 obache 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
@@ -1090,137 +1090,155 @@ TOOLS_CREATE+= ${_t_} @@ -1090,137 +1090,155 @@ TOOLS_CREATE+= ${_t_}
1090TOOLS_FIND_PREFIX+= TOOLS_PREFIX.${_t_}=${TOOLS_DEPENDS.ghostscript:C/:.*//} 1090TOOLS_FIND_PREFIX+= TOOLS_PREFIX.${_t_}=${TOOLS_DEPENDS.ghostscript:C/:.*//}
1091TOOLS_PATH.${_t_}= ${TOOLS_PREFIX.${_t_}}/bin/${_t_} 1091TOOLS_PATH.${_t_}= ${TOOLS_PREFIX.${_t_}}/bin/${_t_}
1092. endif 1092. endif
1093. endif 1093. endif
1094.endfor 1094.endfor
1095 1095
1096###################################################################### 1096######################################################################
1097 1097
1098# For modular Xorg, these are individual packages. 1098# For modular Xorg, these are individual packages.
1099# 1099#
1100.if !defined(TOOLS_IGNORE.iceauth) && !empty(_USE_TOOLS:Miceauth) 1100.if !defined(TOOLS_IGNORE.iceauth) && !empty(_USE_TOOLS:Miceauth)
1101. if !empty(PKGPATH:Mx11/iceauth) 1101. if !empty(PKGPATH:Mx11/iceauth)
1102MAKEFLAGS+= TOOLS_IGNORE.iceauth= 1102MAKEFLAGS+= TOOLS_IGNORE.iceauth=
1103. elif !empty(X11_TYPE:Mnative) 1103. elif !empty(_TOOLS_USE_PKGSRC.iceauth:M[yY][eE][sS])
 1104TOOLS_CREATE+= iceauth
 1105. if !empty(X11_TYPE:Mnative)
1104TOOLS_PATH.iceauth= ${X11BASE}/bin/iceauth 1106TOOLS_PATH.iceauth= ${X11BASE}/bin/iceauth
1105. else 1107. else
1106TOOLS_DEPENDS.iceauth?= iceauth-[0-9]*:../../x11/iceauth 1108TOOLS_DEPENDS.iceauth?= iceauth-[0-9]*:../../x11/iceauth
1107TOOLS_FIND_PREFIX+= TOOLS_PREFIX.iceauth=iceauth 1109TOOLS_FIND_PREFIX+= TOOLS_PREFIX.iceauth=iceauth
1108TOOLS_PATH.iceauth= ${TOOLS_PREFIX.iceauth}/bin/iceauth 1110TOOLS_PATH.iceauth= ${TOOLS_PREFIX.iceauth}/bin/iceauth
1109TOOLS_CREATE+= iceauth 1111. endif
1110. endif 1112. endif
1111.endif 1113.endif
1112 1114
1113.if !defined(TOOLS_IGNORE.mkfontdir) && !empty(_USE_TOOLS:Mmkfontdir) 1115.if !defined(TOOLS_IGNORE.mkfontdir) && !empty(_USE_TOOLS:Mmkfontdir)
1114. if !empty(PKGPATH:Mfonts/mkfontdir) 1116. if !empty(PKGPATH:Mfonts/mkfontdir)
1115MAKEFLAGS+= TOOLS_IGNORE.mkfontdir= 1117MAKEFLAGS+= TOOLS_IGNORE.mkfontdir=
1116. elif !empty(X11_TYPE:Mnative) 1118. elif !empty(_TOOLS_USE_PKGSRC.mkfontdir:M[yY][eE][sS])
 1119TOOLS_CREATE+= mkfontdir
 1120. if !empty(X11_TYPE:Mnative)
1117TOOLS_PATH.mkfontdir= ${X11BASE}/bin/mkfontdir 1121TOOLS_PATH.mkfontdir= ${X11BASE}/bin/mkfontdir
1118. else 1122. else
1119TOOLS_DEPENDS.mkfontdir?= mkfontdir-[0-9]*:../../fonts/mkfontdir 1123TOOLS_DEPENDS.mkfontdir?= mkfontdir-[0-9]*:../../fonts/mkfontdir
1120TOOLS_FIND_PREFIX+= TOOLS_PREFIX.mkfontdir=mkfontdir 1124TOOLS_FIND_PREFIX+= TOOLS_PREFIX.mkfontdir=mkfontdir
1121TOOLS_PATH.mkfontdir= ${TOOLS_PREFIX.mkfontdir}/bin/mkfontdir 1125TOOLS_PATH.mkfontdir= ${TOOLS_PREFIX.mkfontdir}/bin/mkfontdir
1122TOOLS_CREATE+= mkfontdir 1126. endif
1123. endif 1127. endif
1124.endif 1128.endif
1125 1129
1126.if !defined(TOOLS_IGNORE.mkfontscale) && !empty(_USE_TOOLS:Mmkfontscale) 1130.if !defined(TOOLS_IGNORE.mkfontscale) && !empty(_USE_TOOLS:Mmkfontscale)
1127. if !empty(PKGPATH:Mfonts/mkfontscale) 1131. if !empty(PKGPATH:Mfonts/mkfontscale)
1128MAKEFLAGS+= TOOLS_IGNORE.mkfontscale= 1132MAKEFLAGS+= TOOLS_IGNORE.mkfontscale=
1129. elif !empty(X11_TYPE:Mnative) 1133. elif !empty(_TOOLS_USE_PKGSRC.mkfontscale:M[yY][eE][sS])
 1134TOOLS_CREATE+= mkfontscale
 1135. if !empty(X11_TYPE:Mnative)
1130TOOLS_PATH.mkfontscale= ${X11BASE}/bin/mkfontscale 1136TOOLS_PATH.mkfontscale= ${X11BASE}/bin/mkfontscale
1131. else 1137. else
1132TOOLS_DEPENDS.mkfontscale?= mkfontscale-[0-9]*:../../fonts/mkfontscale 1138TOOLS_DEPENDS.mkfontscale?= mkfontscale-[0-9]*:../../fonts/mkfontscale
1133TOOLS_FIND_PREFIX+= TOOLS_PREFIX.mkfontscale=mkfontscale 1139TOOLS_FIND_PREFIX+= TOOLS_PREFIX.mkfontscale=mkfontscale
1134TOOLS_PATH.mkfontscale= ${TOOLS_PREFIX.mkfontscale}/bin/mkfontscale 1140TOOLS_PATH.mkfontscale= ${TOOLS_PREFIX.mkfontscale}/bin/mkfontscale
1135TOOLS_CREATE+= mkfontscale 1141. endif
1136. endif 1142. endif
1137.endif 1143.endif
1138 1144
1139.if !defined(TOOLS_IGNORE.bdftopcf) && !empty(_USE_TOOLS:Mbdftopcf) 1145.if !defined(TOOLS_IGNORE.bdftopcf) && !empty(_USE_TOOLS:Mbdftopcf)
1140. if !empty(PKGPATH:Mfonts/bdftopcf) 1146. if !empty(PKGPATH:Mfonts/bdftopcf)
1141MAKEFLAGS+= TOOLS_IGNORE.bdftopcf= 1147MAKEFLAGS+= TOOLS_IGNORE.bdftopcf=
1142. elif !empty(X11_TYPE:Mnative) 1148. elif !empty(_TOOLS_USE_PKGSRC.bdftopcf:M[yY][eE][sS])
 1149TOOLS_CREATE+= bdftopcf
 1150. if !empty(X11_TYPE:Mnative)
1143TOOLS_PATH.bdftopcf= ${X11BASE}/bin/bdftopcf 1151TOOLS_PATH.bdftopcf= ${X11BASE}/bin/bdftopcf
1144. else 1152. else
1145TOOLS_DEPENDS.bdftopcf?= bdftopcf-[0-9]*:../../fonts/bdftopcf 1153TOOLS_DEPENDS.bdftopcf?= bdftopcf-[0-9]*:../../fonts/bdftopcf
1146TOOLS_FIND_PREFIX+= TOOLS_PREFIX.bdftopcf=bdftopcf 1154TOOLS_FIND_PREFIX+= TOOLS_PREFIX.bdftopcf=bdftopcf
1147TOOLS_PATH.bdftopcf= ${TOOLS_PREFIX.bdftopcf}/bin/bdftopcf 1155TOOLS_PATH.bdftopcf= ${TOOLS_PREFIX.bdftopcf}/bin/bdftopcf
1148TOOLS_CREATE+= bdftopcf 1156. endif
1149. endif 1157. endif
1150.endif 1158.endif
1151 1159
1152.if !defined(TOOLS_IGNORE.ucs2any) && !empty(_USE_TOOLS:Mucs2any) 1160.if !defined(TOOLS_IGNORE.ucs2any) && !empty(_USE_TOOLS:Mucs2any)
1153. if !empty(PKGPATH:Mfonts/font-util) 1161. if !empty(PKGPATH:Mfonts/font-util)
1154MAKEFLAGS+= TOOLS_IGNORE.ucs2any= 1162MAKEFLAGS+= TOOLS_IGNORE.ucs2any=
1155. elif !empty(X11_TYPE:Mnative) 1163. elif !empty(_TOOLS_USE_PKGSRC.ucs2any:M[yY][eE][sS])
 1164TOOLS_CREATE+= ucs2any
 1165. if !empty(X11_TYPE:Mnative)
1156TOOLS_PATH.ucs2any= ${X11BASE}/bin/ucs2any 1166TOOLS_PATH.ucs2any= ${X11BASE}/bin/ucs2any
1157. else 1167. else
1158TOOLS_DEPENDS.ucs2any?= font-util-[0-9]*:../../fonts/font-util 1168TOOLS_DEPENDS.ucs2any?= font-util-[0-9]*:../../fonts/font-util
1159TOOLS_FIND_PREFIX+= TOOLS_PREFIX.ucs2any=ucs2any 1169TOOLS_FIND_PREFIX+= TOOLS_PREFIX.ucs2any=ucs2any
1160TOOLS_PATH.ucs2any= ${TOOLS_PREFIX.ucs2any}/bin/ucs2any 1170TOOLS_PATH.ucs2any= ${TOOLS_PREFIX.ucs2any}/bin/ucs2any
1161TOOLS_CREATE+= ucs2any 1171. endif
1162. endif 1172. endif
1163.endif 1173.endif
1164 1174
1165.if !defined(TOOLS_IGNORE.bdftruncate) && !empty(_USE_TOOLS:Mbdftruncate) 1175.if !defined(TOOLS_IGNORE.bdftruncate) && !empty(_USE_TOOLS:Mbdftruncate)
1166. if !empty(PKGPATH:Mfonts/font-util) 1176. if !empty(PKGPATH:Mfonts/font-util)
1167MAKEFLAGS+= TOOLS_IGNORE.bdftruncate= 1177MAKEFLAGS+= TOOLS_IGNORE.bdftruncate=
1168. elif !empty(X11_TYPE:Mnative) 1178. elif !empty(_TOOLS_USE_PKGSRC.bdftruncate:M[yY][eE][sS])
 1179TOOLS_CREATE+= bdftruncate
 1180. if !empty(X11_TYPE:Mnative)
1169TOOLS_PATH.bdftruncate= ${X11BASE}/bin/bdftruncate 1181TOOLS_PATH.bdftruncate= ${X11BASE}/bin/bdftruncate
1170. else 1182. else
1171TOOLS_DEPENDS.bdftruncate?= font-util-[0-9]*:../../fonts/font-util 1183TOOLS_DEPENDS.bdftruncate?= font-util-[0-9]*:../../fonts/font-util
1172TOOLS_FIND_PREFIX+= TOOLS_PREFIX.bdftruncate=bdftruncate 1184TOOLS_FIND_PREFIX+= TOOLS_PREFIX.bdftruncate=bdftruncate
1173TOOLS_PATH.bdftruncate= ${TOOLS_PREFIX.bdftruncate}/bin/bdftruncate 1185TOOLS_PATH.bdftruncate= ${TOOLS_PREFIX.bdftruncate}/bin/bdftruncate
1174TOOLS_CREATE+= bdftruncate 1186. endif
1175. endif 1187. endif
1176.endif 1188.endif
1177 1189
1178.if !defined(TOOLS_IGNORE.xauth) && !empty(_USE_TOOLS:Mxauth) 1190.if !defined(TOOLS_IGNORE.xauth) && !empty(_USE_TOOLS:Mxauth)
1179. if !empty(PKGPATH:Mx11/xauth) 1191. if !empty(PKGPATH:Mx11/xauth)
1180MAKEFLAGS+= TOOLS_IGNORE.xauth= 1192MAKEFLAGS+= TOOLS_IGNORE.xauth=
1181. elif !empty(X11_TYPE:Mnative) 1193. elif !empty(_TOOLS_USE_PKGSRC.xauth:M[yY][eE][sS])
 1194TOOLS_CREATE+= xauth
 1195. if !empty(X11_TYPE:Mnative)
1182TOOLS_PATH.xauth= ${X11BASE}/bin/xauth 1196TOOLS_PATH.xauth= ${X11BASE}/bin/xauth
1183. else 1197. else
1184TOOLS_DEPENDS.xauth?= xauth-[0-9]*:../../x11/xauth 1198TOOLS_DEPENDS.xauth?= xauth-[0-9]*:../../x11/xauth
1185TOOLS_FIND_PREFIX+= TOOLS_PREFIX.xauth=xauth 1199TOOLS_FIND_PREFIX+= TOOLS_PREFIX.xauth=xauth
1186TOOLS_PATH.xauth= ${TOOLS_PREFIX.xauth}/bin/xauth 1200TOOLS_PATH.xauth= ${TOOLS_PREFIX.xauth}/bin/xauth
1187TOOLS_CREATE+= xauth 1201. endif
1188. endif 1202. endif
1189.endif 1203.endif
1190 1204
1191.if !defined(TOOLS_IGNORE.xinit) && !empty(_USE_TOOLS:Mxinit) 1205.if !defined(TOOLS_IGNORE.xinit) && !empty(_USE_TOOLS:Mxinit)
1192. if !empty(PKGPATH:Mx11/xinit) 1206. if !empty(PKGPATH:Mx11/xinit)
1193MAKEFLAGS+= TOOLS_IGNORE.xinit= 1207MAKEFLAGS+= TOOLS_IGNORE.xinit=
1194. elif !empty(X11_TYPE:Mnative) 1208. elif !empty(_TOOLS_USE_PKGSRC.xinit:M[yY][eE][sS])
 1209TOOLS_CREATE+= xinit
 1210. if !empty(X11_TYPE:Mnative)
1195TOOLS_PATH.xinit= ${X11BASE}/bin/xinit 1211TOOLS_PATH.xinit= ${X11BASE}/bin/xinit
1196. else 1212. else
1197TOOLS_DEPENDS.xinit?= xinit-[0-9]*:../../x11/xinit 1213TOOLS_DEPENDS.xinit?= xinit-[0-9]*:../../x11/xinit
1198TOOLS_FIND_PREFIX+= TOOLS_PREFIX.xinit=xinit 1214TOOLS_FIND_PREFIX+= TOOLS_PREFIX.xinit=xinit
1199TOOLS_PATH.xinit= ${TOOLS_PREFIX.xinit}/bin/xinit 1215TOOLS_PATH.xinit= ${TOOLS_PREFIX.xinit}/bin/xinit
1200TOOLS_CREATE+= xinit 1216. endif
1201. endif 1217. endif
1202.endif 1218.endif
1203 1219
1204.if !defined(TOOLS_IGNORE.xmessage) && !empty(_USE_TOOLS:Mxmessage) 1220.if !defined(TOOLS_IGNORE.xmessage) && !empty(_USE_TOOLS:Mxmessage)
1205. if !empty(PKGPATH:Mx11/xmessage) 1221. if !empty(PKGPATH:Mx11/xmessage)
1206MAKEFLAGS+= TOOLS_IGNORE.xmessage= 1222MAKEFLAGS+= TOOLS_IGNORE.xmessage=
1207. elif !empty(X11_TYPE:Mnative) 1223. elif !empty(_TOOLS_USE_PKGSRC.xmessage:M[yY][eE][sS])
 1224TOOLS_CREATE+= xmessage
 1225. if !empty(X11_TYPE:Mnative)
1208TOOLS_PATH.xmessage= ${X11BASE}/bin/xmessage 1226TOOLS_PATH.xmessage= ${X11BASE}/bin/xmessage
1209. else 1227. else
1210TOOLS_DEPENDS.xmessage?= xmessage-[0-9]*:../../x11/xmessage 1228TOOLS_DEPENDS.xmessage?= xmessage-[0-9]*:../../x11/xmessage
1211TOOLS_FIND_PREFIX+= TOOLS_PREFIX.xmessage=xmessage 1229TOOLS_FIND_PREFIX+= TOOLS_PREFIX.xmessage=xmessage
1212TOOLS_PATH.xmessage= ${TOOLS_PREFIX.xmessage}/bin/xmessage 1230TOOLS_PATH.xmessage= ${TOOLS_PREFIX.xmessage}/bin/xmessage
1213TOOLS_CREATE+= xmessage 1231. endif
1214. endif 1232. endif
1215.endif 1233.endif
1216 1234
1217###################################################################### 1235######################################################################
1218 1236
1219# These tools are all supplied by an X11 imake package if there is no 1237# These tools are all supplied by an X11 imake package if there is no
1220# native tool available. 1238# native tool available.
1221# 1239#
1222_TOOLS.x11-imake= imake mkdirhier xmkmf 1240_TOOLS.x11-imake= imake mkdirhier xmkmf
1223 1241
1224.for _t_ in ${_TOOLS.x11-imake} 1242.for _t_ in ${_TOOLS.x11-imake}
1225. if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_}) 1243. if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_})
1226. if !empty(PKGPATH:Mdevel/nbitools) || \ 1244. if !empty(PKGPATH:Mdevel/nbitools) || \