head 1.4; access; symbols pkgsrc-2014Q3:1.3.0.70 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.68 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.66 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.64 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.62 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.60 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.58 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.56 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.54 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.52 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.50 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.48 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.46 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.44 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.42 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.40 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.38 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.36 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.34 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.32 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.30 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.28 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.26 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.24 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.22 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.20 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.18 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.16 pkgsrc-2008Q1:1.3.0.14 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.12 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.10 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.8 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.6 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.4 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.2 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.2.0.18 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.16 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.14 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.12 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.10 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.8 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.6 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.4 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.2 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.1.1.1.0.2 pkgsrc-2004Q1-base:1.1 pkgsrc-2003Q4:1.1.1.1.0.4 pkgsrc-2003Q4-base:1.1 netbsd-1-6-1:1.1.1.1.0.8 netbsd-1-6-1-base:1.1 netbsd-1-6:1.1.1.1.0.10 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.1.1.0.12 pkgviews-base:1.1 buildlink2-base:1.1.1.1 buildlink2:1.1.1.1.0.6 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.4 date 2014.10.01.19.07.08; author joerg; state dead; branches; next 1.3; commitid 9W0AgDRSu2HwZwSx; 1.3 date 2006.07.05.04.59.47; author jlam; state Exp; branches; next 1.2; 1.2 date 2004.04.29.18.59.25; author minskim; state Exp; branches; next 1.1; 1.1 date 2002.06.03.09.53.47; author sakamoto; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2002.06.03.09.53.47; author sakamoto; state Exp; branches 1.1.1.1.6.1; next ; 1.1.1.1.6.1 date 2002.06.03.09.53.47; author jlam; state dead; branches; next 1.1.1.1.6.2; 1.1.1.1.6.2 date 2002.06.23.18.44.38; author jlam; state Exp; branches; next ; desc @@ 1.4 log @Retire devel/nbitools, an ancient fork of NetBSD's imake version from xsrc. @ text @$NetBSD: patch-ac,v 1.3 2006/07/05 04:59:47 jlam Exp $ --- config/util/xmkmf.cpp.orig 1997-08-22 04:21:46.000000000 -0400 +++ config/util/xmkmf.cpp @@@@ -7,7 +7,7 @@@@ XCOMM $XConsortium: xmkmf.cpp /main/22 1 usage="usage: $0 [-a] [top_of_sources_pathname [current_directory]]" -configdirspec=CONFIGDIRSPEC +configdirspec="-I"CONFIGDIRSPEC topdir= curdir=. do_all= @@@@ -41,10 +41,16 @@@@ else args="-I$topdir/config/cf -DTOPDIR=$topdir -DCURDIR=$curdir" fi -echo imake $args +case "$IMAKE_CMD" in +"") imake_cmd="BINDIRSPEC/imake" ;; +*) imake_cmd="$IMAKE_CMD" ;; +esac +IMAKE_CMD="$imake_cmd"; export IMAKE_CMD + +echo $imake_cmd $args case "$do_all" in yes) - imake $args && + $imake_cmd $args && echo "make Makefiles" && make Makefiles && echo "make includes" && @@@@ -53,6 +59,6 @@@@ yes) make depend ;; *) - imake $args + $imake_cmd $args ;; esac @ 1.3 log @* Modify comments in installed config files to match what's happening. * Modify xmkmf so that we can override the imake command invoked via an environment variable IMAKE_CMD. * Drop the nbitools/buildlink3.mk file as it's no longer used by either canna or sj3 for package builds. Bump the PKGREVISION to 4. @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Change an argument passed to cpp so that it will not confuse buildlink3. The problem was reported by Yasushi Oshima on tech-pkg-ja@@jp.NetBSD.org. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.1 2002/06/03 09:53:47 sakamoto Exp $ d3 1 a3 1 --- config/util/xmkmf.cpp.orig Thu May 29 22:59:30 1997 d14 1 a14 1 @@@@ -41,10 +41,10 @@@@ else d19 7 a25 1 +echo BINDIRSPEC/imake $args d29 1 a29 1 + BINDIRSPEC/imake $args && d33 1 a33 1 @@@@ -53,6 +53,6 @@@@ d38 1 a38 1 + BINDIRSPEC/imake $args @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ d5 10 a14 1 @@@@ -41,10 +41,10 @@@@ @ 1.1.1.1 log @Import nbitools-6.3 The itools-R6.3 distribution contains imake, X11 configuration files, makedepend, xmkmf, mkdirhier, imboot, msub, and imdent. http://www.kitebird.com/imake-book/ nbitools-R6.3 is rearchived with NetBSD-current/xsrc. Approved by agc, for inputmethod/{canna-*,sj3-*} @ text @@ 1.1.1.1.6.1 log @file patch-ac was added on branch buildlink2 on 2002-06-23 18:44:38 +0000 @ text @d1 25 @ 1.1.1.1.6.2 log @Merge from pkgsrc-current to buildlink2 branch. @ text @a0 25 $NetBSD: patch-ac,v 1.1.1.1.6.1 2002/06/23 18:44:38 jlam Exp $ --- config/util/xmkmf.cpp.orig Thu May 29 22:59:30 1997 +++ config/util/xmkmf.cpp @@@@ -41,10 +41,10 @@@@ args="-I$topdir/config/cf -DTOPDIR=$topdir -DCURDIR=$curdir" fi -echo imake $args +echo BINDIRSPEC/imake $args case "$do_all" in yes) - imake $args && + BINDIRSPEC/imake $args && echo "make Makefiles" && make Makefiles && echo "make includes" && @@@@ -53,6 +53,6 @@@@ make depend ;; *) - imake $args + BINDIRSPEC/imake $args ;; esac @