From d160c1d0489574143689ec4822322ec23fc6fb3f Mon Sep 17 00:00:00 2001 From: jlam Date: Wed, 5 Jul 2006 04:59:47 +0000 Subject: * 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. --- devel/nbitools/Makefile | 9 +++------ devel/nbitools/buildlink3.mk | 29 ----------------------------- devel/nbitools/distinfo | 6 +++--- devel/nbitools/patches/patch-ac | 20 +++++++++++++------- devel/nbitools/patches/patch-ad | 24 +++++++++++++++--------- 5 files changed, 34 insertions(+), 54 deletions(-) delete mode 100644 devel/nbitools/buildlink3.mk diff --git a/devel/nbitools/Makefile b/devel/nbitools/Makefile index 062edc1b7d3..afe79df353a 100644 --- a/devel/nbitools/Makefile +++ b/devel/nbitools/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.11 2006/06/17 16:50:27 rillig Exp $ +# $NetBSD: Makefile,v 1.12 2006/07/05 04:59:47 jlam Exp $ # DISTNAME= nbitools-R6.3 PKGNAME= nbitools-6.3 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_LOCAL} @@ -13,15 +13,12 @@ COMMENT= imake and tools derived from NetBSD-current/xsrc PKG_INSTALLATION_TYPES= overwrite pkgviews - BUILD_TARGET= World MAKE_ENV+= GCCCMD=gcc .include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == "Linux" -USE_TOOLS+= gmake -.endif +USE_TOOLS+= ${IMAKE_TOOLS:Nimake} SUBST_CLASSES+= nbi SUBST_STAGE.nbi= pre-configure diff --git a/devel/nbitools/buildlink3.mk b/devel/nbitools/buildlink3.mk deleted file mode 100644 index 09979bbe32d..00000000000 --- a/devel/nbitools/buildlink3.mk +++ /dev/null @@ -1,29 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/06/17 16:50:27 rillig Exp $ - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -NBITOOLS_BUILDLINK3_MK:= ${NBITOOLS_BUILDLINK3_MK}+ - -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= nbitools -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nnbitools} -BUILDLINK_PACKAGES+= nbitools - -.if !empty(NBITOOLS_BUILDLINK3_MK:M+) -BUILDLINK_API_DEPENDS.nbitools+= nbitools>=6.3 -BUILDLINK_PKGSRCDIR.nbitools?= ../../devel/nbitools -BUILDLINK_DEPMETHOD.nbitools?= build - -BUILDLINK_FILES.nbitools+= lib/itools/X11/config/* - -XMKMF_CMD= ${BUILDLINK_PREFIX.nbitools}/libexec/itools/xmkmf - -. include "../../mk/bsd.prefs.mk" -. if ${OPSYS} == "Linux" -USE_TOOLS+= gmake -. endif - -.endif # NBITOOLS_BUILDLINK3_MK - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/nbitools/distinfo b/devel/nbitools/distinfo index d904b1e9a4f..077d680547d 100644 --- a/devel/nbitools/distinfo +++ b/devel/nbitools/distinfo @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.9 2006/02/25 17:31:57 schwarz Exp $ +$NetBSD: distinfo,v 1.10 2006/07/05 04:59:47 jlam Exp $ SHA1 (nbitools-R6.3.tar.gz) = 0f6751417d7ef412be04611fbe4f56386a04322a RMD160 (nbitools-R6.3.tar.gz) = 047f64b113a0307b045573bfe429b59063ae38ea Size (nbitools-R6.3.tar.gz) = 435764 bytes SHA1 (patch-aa) = df66d326f0a5375f829353084bf9935ac2d8e57c SHA1 (patch-ab) = 4cc71d9e9a3c12106deff9d60118d363ae3ba981 -SHA1 (patch-ac) = 4cb8804bae2d7e815b36640c55789b5ed7b7fb75 -SHA1 (patch-ad) = b0c18505891834182c57819489b7d9890802d550 +SHA1 (patch-ac) = 443c407f7619a8592da4d833f9fba91d78bd0493 +SHA1 (patch-ad) = 4b6792ede85edcf9315a5f10e3a080db73e67a44 SHA1 (patch-ae) = 0a0acf8798055a7b1b292e8d2edf998857641550 SHA1 (patch-af) = 9a7e4bd19863d086a1e57f1cd9484b05189cbda6 SHA1 (patch-ag) = 2563b2e5105d000cc0b57717d4dadfadec34ee4f diff --git a/devel/nbitools/patches/patch-ac b/devel/nbitools/patches/patch-ac index 43c8088ac5f..e2d98f9ce18 100644 --- a/devel/nbitools/patches/patch-ac +++ b/devel/nbitools/patches/patch-ac @@ -1,6 +1,6 @@ -$NetBSD: patch-ac,v 1.2 2004/04/29 18:59:25 minskim Exp $ +$NetBSD: patch-ac,v 1.3 2006/07/05 04:59:47 jlam Exp $ ---- config/util/xmkmf.cpp.orig Thu May 29 22:59:30 1997 +--- 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 @@ -11,24 +11,30 @@ $NetBSD: patch-ac,v 1.2 2004/04/29 18:59:25 minskim Exp $ topdir= curdir=. do_all= -@@ -41,10 +41,10 @@ else +@@ -41,10 +41,16 @@ else args="-I$topdir/config/cf -DTOPDIR=$topdir -DCURDIR=$curdir" fi -echo imake $args -+echo BINDIRSPEC/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 && -+ BINDIRSPEC/imake $args && ++ $imake_cmd $args && echo "make Makefiles" && make Makefiles && echo "make includes" && -@@ -53,6 +53,6 @@ +@@ -53,6 +59,6 @@ yes) make depend ;; *) - imake $args -+ BINDIRSPEC/imake $args ++ $imake_cmd $args ;; esac diff --git a/devel/nbitools/patches/patch-ad b/devel/nbitools/patches/patch-ad index 80aeee61a1d..9a85b3d4667 100644 --- a/devel/nbitools/patches/patch-ad +++ b/devel/nbitools/patches/patch-ad @@ -1,37 +1,43 @@ -$NetBSD: patch-ad,v 1.1.1.1 2002/06/03 09:53:47 sakamoto Exp $ +$NetBSD: patch-ad,v 1.2 2006/07/05 04:59:47 jlam Exp $ ---- config/cf/Imake.tmpl.orig Wed Mar 7 22:08:22 2001 +--- config/cf/Imake.tmpl.orig 2001-03-07 08:08:22.000000000 -0500 +++ config/cf/Imake.tmpl -@@ -961,7 +961,7 @@ +@@ -960,22 +960,22 @@ JPTCLIBDIR = JpTclLibDir + #define LoaderLibPrefix /**/ #endif #ifndef ImakeCmd - #ifdef UseInstalled /* assume BINDIR in path */ +-#ifdef UseInstalled /* assume BINDIR in path */ -#define ImakeCmd imake ++#ifdef UseInstalled /* Force use of itools' binary */ +#define ImakeCmd $(BINDIR)/imake #else #define ImakeCmd $(IMAKESRC)/imake #endif -@@ -969,13 +969,13 @@ + #endif #ifndef DependCmd #if UseGccMakeDepend - #ifdef UseInstalled /* assume BINDIR in path */ +-#ifdef UseInstalled /* assume BINDIR in path */ -#define DependCmd gccmakedep ++#ifdef UseInstalled /* Force use of itools' binary */ +#define DependCmd $(BINDIR)/gccmakedep #else #define DependCmd $(DEPENDSRC)/gccmakedep #endif #else - #ifdef UseInstalled /* assume BINDIR in path */ +-#ifdef UseInstalled /* assume BINDIR in path */ -#define DependCmd makedepend ++#ifdef UseInstalled /* Force use of itools' binary */ +#define DependCmd $(BINDIR)/makedepend #else #define DependCmd $(DEPENDSRC)/makedepend #endif -@@ -1002,7 +1002,7 @@ +@@ -1001,8 +1001,8 @@ JPTCLIBDIR = JpTclLibDir + # endif #endif #ifndef MkdirHierCmd - #ifdef UseInstalled /* assume BINDIR in path */ +-#ifdef UseInstalled /* assume BINDIR in path */ -#define MkdirHierCmd mkdirhier ++#ifdef UseInstalled /* Force use of itools' binary */ +#define MkdirHierCmd $(BINDIR)/mkdirhier #else #define MkdirHierCmd $(SHELL) $(CONFIGSRC)/util/mkdirhier.sh -- cgit v1.2.3