Update to 0.13:

     o   All Buildtool control files (the ones in the buildtool.d subdirecto-
         ry) were unified into a single file, Generic.bt, which is placed in
         the top level directory for simplicity.  Everything is now controlled
         from shell functions defined in that file.  Buildtool will assist you
         in this conversion when needed.

     o   The bt_sh module was added, a very fast and small shell interpreter.

     o   The bt_logic module was extended (really, rewritten from scratch) to
         provide a shell based program to track dependancies and build tar-
         gets.  It still acts as a wrapper for compilation and linking com-
         mands.  As a side effect, the old code was readded as the bt_wrap
         module, needed to keep bt_make working until both can be safely re-
         moved.

     o   bt_config will now check for several programs to generate dependancy
         files.  Aside from the standard cpp(1), it also searches for fastdep,
         which will give better results on slow computers.

     o   Some bug fixes.

4 files changed, 34 insertions, 20 deletions

diff --git a/devel/buildtool/Makefile b/devel/buildtool/Makefile
index c2473bf75aa..77a5c7ffe2c 100644
--- a/devel/buildtool/Makefile
+++ b/devel/buildtool/Makefile
@@ -1,17 +1,13 @@
-# $NetBSD: Makefile,v 1.11 2003/07/25 11:52:53 jmmv Exp $
+# $NetBSD: Makefile,v 1.12 2003/08/31 19:29:06 jmmv Exp $
 #
 
-DISTNAME=	buildtool-0.12
-PKGREVISION=	1
+DISTNAME=	buildtool-0.13
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=buildtool/}
 
-PATCHFILES=	${DISTNAME}-ldflags.diff
-PATCH_SITES=	${HOMEPAGE}
-
 MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://buildtool.sourceforge.net/
-COMMENT=	Portable BSD-like build infrastructure
+COMMENT=	Portable build infrastructure
 
 USE_BUILDLINK2=	yes
 HAS_CONFIGURE=	yes
diff --git a/devel/buildtool/PLIST b/devel/buildtool/PLIST
index 557927306f5..57fe0a8eea6 100644
--- a/devel/buildtool/PLIST
+++ b/devel/buildtool/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.6 2003/07/24 10:12:30 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.7 2003/08/31 19:29:06 jmmv Exp $
 bin/buildtool
 bin/buildtool-0
+libexec/buildtool-0/bt-012-to-013
 libexec/buildtool-0/bt_config
 libexec/buildtool-0/bt_dist
 libexec/buildtool-0/bt_doc
@@ -8,13 +9,26 @@ libexec/buildtool-0/bt_lint
 libexec/buildtool-0/bt_logic
 libexec/buildtool-0/bt_make
 libexec/buildtool-0/bt_pkgflags
+libexec/buildtool-0/bt_sh
 libexec/buildtool-0/bt_swcgen
 libexec/buildtool-0/bt_wizard
+libexec/buildtool-0/bt_wrap
+libexec/buildtool-0/depconv
+libexec/buildtool-0/oodate
 man/man1/buildtool.1
 share/buildtool-0/bt_config/base.subr
 share/buildtool-0/bt_config/pkgconfig.subr
 share/buildtool-0/bt_config/pthread.subr
 share/buildtool-0/bt_config/x11.subr
+share/buildtool-0/bt_logic/archive.subr
+share/buildtool-0/bt_logic/convert.subr
+share/buildtool-0/bt_logic/depend.subr
+share/buildtool-0/bt_logic/library.subr
+share/buildtool-0/bt_logic/null.subr
+share/buildtool-0/bt_logic/output.subr
+share/buildtool-0/bt_logic/program.subr
+share/buildtool-0/bt_logic/shlib.subr
+share/buildtool-0/bt_logic/texinfo.subr
 share/buildtool-0/bt_swcgen/out_conf.m4
 share/buildtool-0/bt_swcgen/out_script.m4
 share/buildtool-0/mk/bt.clean.mk
@@ -30,17 +44,23 @@ share/buildtool-0/mk/qt.moc.mk
 share/buildtool-0/mk/sys.mk
 share/buildtool-0/templates/README.bt
 share/buildtool-0/templates/bt_config.conf.in
-share/buildtool-0/templates/config
-share/buildtool-0/templates/defs
-share/buildtool-0/templates/docs
 share/buildtool-0/templates/mk_bin
 share/buildtool-0/templates/mk_top
 share/buildtool-0/templates/pkgflags
+share/doc/${PKGNAME}/CHANGES
+share/doc/${PKGNAME}/COPYING
+share/doc/${PKGNAME}/DIFFS.bt_sh
+share/doc/${PKGNAME}/NOTES.bt_logic
+share/doc/${PKGNAME}/PEOPLE
+share/doc/${PKGNAME}/README
+share/doc/${PKGNAME}/TODO
+@dirrm share/doc/${PKGNAME}
 @dirrm share/buildtool-0/templates
 @exec ${MKDIR} %D/share/buildtool-0/pkgflags
 @dirrm share/buildtool-0/pkgflags
 @dirrm share/buildtool-0/mk
 @dirrm share/buildtool-0/bt_swcgen
+@dirrm share/buildtool-0/bt_logic
 @dirrm share/buildtool-0/bt_config
 @dirrm share/buildtool-0
 @dirrm libexec/buildtool-0
diff --git a/devel/buildtool/buildlink2.mk b/devel/buildtool/buildlink2.mk
index 79284f6e447..9d8a8006007 100644
--- a/devel/buildtool/buildlink2.mk
+++ b/devel/buildtool/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/07/25 11:52:53 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/08/31 19:29:07 jmmv Exp $
 
 .if !defined(BUILDTOOL_BUILDLINK2_MK)
 BUILDTOOL_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		buildtool
-BUILDLINK_DEPENDS.buildtool?=	buildtool>=0.12nb1
+BUILDLINK_DEPENDS.buildtool?=	buildtool>=0.13
 BUILDLINK_PKGSRCDIR.buildtool?=	../../devel/buildtool
 BUILDLINK_DEPMETHOD.buildtool?=	build
 
@@ -31,12 +31,12 @@ CONFIGURE_ARGS+=	--prefix=${PREFIX}
 
 .if !target(do-build)
 do-build:
-	${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${BUILDTOOL} make all
+	${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${BUILDTOOL} build
 .endif
 
 .if !target(do-install)
 do-install:
-	${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${BUILDTOOL} make install
+	${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${BUILDTOOL} install
 .endif
 
 .endif	# BUILDTOOL_BUILDLINK2_MK
diff --git a/devel/buildtool/distinfo b/devel/buildtool/distinfo
index a984c8a9149..c511e8712b7 100644
--- a/devel/buildtool/distinfo
+++ b/devel/buildtool/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.9 2003/07/25 11:52:53 jmmv Exp $
+$NetBSD: distinfo,v 1.10 2003/08/31 19:29:07 jmmv Exp $
 
-SHA1 (buildtool-0.12.tar.gz) = 4df19c4c401d78fb598a660ce13a39c835eda763
-Size (buildtool-0.12.tar.gz) = 260673 bytes
-SHA1 (buildtool-0.12-ldflags.diff) = 301ec1f23099e0abbff319e3894a656d768924ee
-Size (buildtool-0.12-ldflags.diff) = 1965 bytes
+SHA1 (buildtool-0.13.tar.gz) = b542b5e554451134e94610efbca18d9d985e25d4
+Size (buildtool-0.13.tar.gz) = 382724 bytes