From e7410bbb7dcdba2d51e070918cf12c2adbd78f3a Mon Sep 17 00:00:00 2001 From: tron Date: Sun, 9 Jun 2013 19:59:33 +0000 Subject: Pullup ticket #4154 - requested by obache fonts/efont-unicode: build fix fonts/ja-naga10: build fix Revisions pulled up: - fonts/efont-unicode/Makefile 1.14 - fonts/ja-naga10/Makefile 1.12 - mk/tools/replace.mk 1.259-1.260 --- Module Name: pkgsrc Committed By: obache Date: Wed Jun 5 13:26:35 UTC 2013 Modified Files: pkgsrc/mk/tools: replace.mk Log Message: fixes usage of TOOLS_CREATE for X related tools, and those tools will be created in ${TOOLS_DIR}/bin, same as other tools. --- Module Name: pkgsrc Committed By: obache Date: Thu Jun 6 02:17:17 UTC 2013 Modified Files: pkgsrc/mk/tools: replace.mk Log Message: create X related tools also for X11_TYPE=native. might fix PR pkg/47883. --- Module Name: pkgsrc Committed By: obache Date: Sun Jun 9 13:00:47 UTC 2013 Modified Files: pkgsrc/fonts/efont-unicode: Makefile pkgsrc/fonts/ja-naga10: Makefile Log Message: Bump PKGREVISION so that .pcf files will be created correctly with X related tools fixes. PR pkg/47883. --- fonts/efont-unicode/Makefile | 4 +-- fonts/ja-naga10/Makefile | 4 +-- mk/tools/replace.mk | 74 +++++++++++++++++++++++++++----------------- 3 files changed, 50 insertions(+), 32 deletions(-) diff --git a/fonts/efont-unicode/Makefile b/fonts/efont-unicode/Makefile index c286fc5db09..7a1e6c93ff1 100644 --- a/fonts/efont-unicode/Makefile +++ b/fonts/efont-unicode/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.12 2012/10/03 18:28:18 asau Exp $ +# $NetBSD: Makefile,v 1.12.4.1 2013/06/09 19:59:33 tron Exp $ DISTNAME= efont-unicode-bdf-0.4.2 PKGNAME= ${DISTNAME:S/-bdf//} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= fonts x11 MASTER_SITES= http://openlab.ring.gr.jp/efont/dist/unicode-bdf/ EXTRACT_SUFX= .tar.bz2 diff --git a/fonts/ja-naga10/Makefile b/fonts/ja-naga10/Makefile index 0e8f9da52ec..8da76bcdfb9 100644 --- a/fonts/ja-naga10/Makefile +++ b/fonts/ja-naga10/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.11 2012/10/03 18:28:24 asau Exp $ +# $NetBSD: Makefile,v 1.11.4.1 2013/06/09 19:59:33 tron Exp $ DISTNAME= knj10-1.1 PKGNAME= ja-naga10-1.1 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= fonts x11 japanese MASTER_SITES= http://hp.vector.co.jp/authors/VA013391/fonts/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk index e872b3ac00e..4ee0b4ebd41 100644 --- a/mk/tools/replace.mk +++ b/mk/tools/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.255 2013/03/16 23:03:33 dholland Exp $ +# $NetBSD: replace.mk,v 1.255.2.1 2013/06/09 19:59:33 tron Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -1110,117 +1110,135 @@ TOOLS_PATH.${_t_}= ${TOOLS_PREFIX.${_t_}}/bin/${_t_} .if !defined(TOOLS_IGNORE.iceauth) && !empty(_USE_TOOLS:Miceauth) . if !empty(PKGPATH:Mx11/iceauth) MAKEFLAGS+= TOOLS_IGNORE.iceauth= -. elif !empty(X11_TYPE:Mnative) +. elif !empty(_TOOLS_USE_PKGSRC.iceauth:M[yY][eE][sS]) +TOOLS_CREATE+= iceauth +. if !empty(X11_TYPE:Mnative) TOOLS_PATH.iceauth= ${X11BASE}/bin/iceauth -. else +. else TOOLS_DEPENDS.iceauth?= iceauth-[0-9]*:../../x11/iceauth TOOLS_FIND_PREFIX+= TOOLS_PREFIX.iceauth=iceauth TOOLS_PATH.iceauth= ${TOOLS_PREFIX.iceauth}/bin/iceauth -TOOLS_CREATE.iceauth= iceauth +. endif . endif .endif .if !defined(TOOLS_IGNORE.mkfontdir) && !empty(_USE_TOOLS:Mmkfontdir) . if !empty(PKGPATH:Mfonts/mkfontdir) MAKEFLAGS+= TOOLS_IGNORE.mkfontdir= -. elif !empty(X11_TYPE:Mnative) +. elif !empty(_TOOLS_USE_PKGSRC.mkfontdir:M[yY][eE][sS]) +TOOLS_CREATE+= mkfontdir +. if !empty(X11_TYPE:Mnative) TOOLS_PATH.mkfontdir= ${X11BASE}/bin/mkfontdir -. else +. else TOOLS_DEPENDS.mkfontdir?= mkfontdir-[0-9]*:../../fonts/mkfontdir TOOLS_FIND_PREFIX+= TOOLS_PREFIX.mkfontdir=mkfontdir TOOLS_PATH.mkfontdir= ${TOOLS_PREFIX.mkfontdir}/bin/mkfontdir -TOOLS_CREATE.mkfontdir= mkfontdir +. endif . endif .endif .if !defined(TOOLS_IGNORE.mkfontscale) && !empty(_USE_TOOLS:Mmkfontscale) . if !empty(PKGPATH:Mfonts/mkfontscale) MAKEFLAGS+= TOOLS_IGNORE.mkfontscale= -. elif !empty(X11_TYPE:Mnative) +. elif !empty(_TOOLS_USE_PKGSRC.mkfontscale:M[yY][eE][sS]) +TOOLS_CREATE+= mkfontscale +. if !empty(X11_TYPE:Mnative) TOOLS_PATH.mkfontscale= ${X11BASE}/bin/mkfontscale -. else +. else TOOLS_DEPENDS.mkfontscale?= mkfontscale-[0-9]*:../../fonts/mkfontscale TOOLS_FIND_PREFIX+= TOOLS_PREFIX.mkfontscale=mkfontscale TOOLS_PATH.mkfontscale= ${TOOLS_PREFIX.mkfontscale}/bin/mkfontscale -TOOLS_CREATE.mkfontscale= mkfontscale +. endif . endif .endif .if !defined(TOOLS_IGNORE.bdftopcf) && !empty(_USE_TOOLS:Mbdftopcf) . if !empty(PKGPATH:Mfonts/bdftopcf) MAKEFLAGS+= TOOLS_IGNORE.bdftopcf= -. elif !empty(X11_TYPE:Mnative) +. elif !empty(_TOOLS_USE_PKGSRC.bdftopcf:M[yY][eE][sS]) +TOOLS_CREATE+= bdftopcf +. if !empty(X11_TYPE:Mnative) TOOLS_PATH.bdftopcf= ${X11BASE}/bin/bdftopcf -. else +. else TOOLS_DEPENDS.bdftopcf?= bdftopcf-[0-9]*:../../fonts/bdftopcf TOOLS_FIND_PREFIX+= TOOLS_PREFIX.bdftopcf=bdftopcf TOOLS_PATH.bdftopcf= ${TOOLS_PREFIX.bdftopcf}/bin/bdftopcf -TOOLS_CREATE.bdftopcf= bdftopcf +. endif . endif .endif .if !defined(TOOLS_IGNORE.ucs2any) && !empty(_USE_TOOLS:Mucs2any) . if !empty(PKGPATH:Mfonts/font-util) MAKEFLAGS+= TOOLS_IGNORE.ucs2any= -. elif !empty(X11_TYPE:Mnative) +. elif !empty(_TOOLS_USE_PKGSRC.ucs2any:M[yY][eE][sS]) +TOOLS_CREATE+= ucs2any +. if !empty(X11_TYPE:Mnative) TOOLS_PATH.ucs2any= ${X11BASE}/bin/ucs2any -. else +. else TOOLS_DEPENDS.ucs2any?= font-util-[0-9]*:../../fonts/font-util TOOLS_FIND_PREFIX+= TOOLS_PREFIX.ucs2any=ucs2any TOOLS_PATH.ucs2any= ${TOOLS_PREFIX.ucs2any}/bin/ucs2any -TOOLS_CREATE.ucs2any= ucs2any +. endif . endif .endif .if !defined(TOOLS_IGNORE.bdftruncate) && !empty(_USE_TOOLS:Mbdftruncate) . if !empty(PKGPATH:Mfonts/font-util) MAKEFLAGS+= TOOLS_IGNORE.bdftruncate= -. elif !empty(X11_TYPE:Mnative) +. elif !empty(_TOOLS_USE_PKGSRC.bdftruncate:M[yY][eE][sS]) +TOOLS_CREATE+= bdftruncate +. if !empty(X11_TYPE:Mnative) TOOLS_PATH.bdftruncate= ${X11BASE}/bin/bdftruncate -. else +. else TOOLS_DEPENDS.bdftruncate?= font-util-[0-9]*:../../fonts/font-util TOOLS_FIND_PREFIX+= TOOLS_PREFIX.bdftruncate=bdftruncate TOOLS_PATH.bdftruncate= ${TOOLS_PREFIX.bdftruncate}/bin/bdftruncate -TOOLS_CREATE.bdftruncate= bdftruncate +. endif . endif .endif .if !defined(TOOLS_IGNORE.xauth) && !empty(_USE_TOOLS:Mxauth) . if !empty(PKGPATH:Mx11/xauth) MAKEFLAGS+= TOOLS_IGNORE.xauth= -. elif !empty(X11_TYPE:Mnative) +. elif !empty(_TOOLS_USE_PKGSRC.xauth:M[yY][eE][sS]) +TOOLS_CREATE+= xauth +. if !empty(X11_TYPE:Mnative) TOOLS_PATH.xauth= ${X11BASE}/bin/xauth -. else +. else TOOLS_DEPENDS.xauth?= xauth-[0-9]*:../../x11/xauth TOOLS_FIND_PREFIX+= TOOLS_PREFIX.xauth=xauth TOOLS_PATH.xauth= ${TOOLS_PREFIX.xauth}/bin/xauth -TOOLS_CREATE.xauth= xauth +. endif . endif .endif .if !defined(TOOLS_IGNORE.xinit) && !empty(_USE_TOOLS:Mxinit) . if !empty(PKGPATH:Mx11/xinit) MAKEFLAGS+= TOOLS_IGNORE.xinit= -. elif !empty(X11_TYPE:Mnative) +. elif !empty(_TOOLS_USE_PKGSRC.xinit:M[yY][eE][sS]) +TOOLS_CREATE+= xinit +. if !empty(X11_TYPE:Mnative) TOOLS_PATH.xinit= ${X11BASE}/bin/xinit -. else +. else TOOLS_DEPENDS.xinit?= xinit-[0-9]*:../../x11/xinit TOOLS_FIND_PREFIX+= TOOLS_PREFIX.xinit=xinit TOOLS_PATH.xinit= ${TOOLS_PREFIX.xinit}/bin/xinit -TOOLS_CREATE.xinit= xinit +. endif . endif .endif .if !defined(TOOLS_IGNORE.xmessage) && !empty(_USE_TOOLS:Mxmessage) . if !empty(PKGPATH:Mx11/xmessage) MAKEFLAGS+= TOOLS_IGNORE.xmessage= -. elif !empty(X11_TYPE:Mnative) +. elif !empty(_TOOLS_USE_PKGSRC.xmessage:M[yY][eE][sS]) +TOOLS_CREATE+= xmessage +. if !empty(X11_TYPE:Mnative) TOOLS_PATH.xmessage= ${X11BASE}/bin/xmessage -. else +. else TOOLS_DEPENDS.xmessage?= xmessage-[0-9]*:../../x11/xmessage TOOLS_FIND_PREFIX+= TOOLS_PREFIX.xmessage=xmessage TOOLS_PATH.xmessage= ${TOOLS_PREFIX.xmessage}/bin/xmessage -TOOLS_CREATE.xmessage= xmessage +. endif . endif .endif -- cgit v1.2.3