Update to 0.15:

     Fifteenth alpha version, released on 2004/02/04.

     o   Finally dropped bt_make and bt_wrap, together with all compatibility
         code introduced around them.

     o   M4 is no longer needed.  It was introduced to clean up code, but it
         has proven to only ofuscate it.  As a side effect, bt_swcgen uses
         shell scripts instead of macro files to generate system wide configu-
         ration.

     o   Added some checks to bt_config: bt_check_hdr_time(),
         bt_check_prog_cc_flag() and bt_check_prog_cxx_flag().

     o   Support for the `+=' operator (append text to a variable) was added
         to bt_sh.  This can be used to simplify syntax when writting scripts.

     o   Support for pkgconfig files was added to bt_pkgflags.

     o   Support for pkgconfig command line syntax was added to bt_pkgflags
         (it is not exactly the same, but we now support operators in their
         real form, like `=' or `!=', plus spaces to separate keywords).

     o   Multiple portability problems fixed.

4 files changed, 10 insertions, 34 deletions

diff --git a/devel/buildtool/Makefile b/devel/buildtool/Makefile
index 9dc3f9ca11e..3280cc511e2 100644
--- a/devel/buildtool/Makefile
+++ b/devel/buildtool/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2003/09/15 14:49:44 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2004/02/04 17:12:09 jmmv Exp $
 #
 
-DISTNAME=	buildtool-0.14
+DISTNAME=	buildtool-0.15
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=buildtool/}
 
@@ -12,19 +12,14 @@ COMMENT=	Portable build infrastructure
 USE_BUILDLINK2=	yes
 HAS_CONFIGURE=	yes
 
+TEST_TARGET=		test
+
 PKG_SYSCONFSUBDIR=	buildtool
 
 CONFIGURE_ARGS=		-p ${LOCALBASE}
 CONFIGURE_ARGS+=	-c ${PKG_SYSCONFDIR}
 CONFIGURE_ENV+=		SH="${SH}"
 
-.include "../../mk/bsd.prefs.mk"
-
-.if !empty(MACHINE_PLATFORM:MNetBSD-1.5*)
-DEPENDS+=		m4>=1.4nb1:../../devel/m4
-M4=			"${GNU_PROGRAM_PREFIX}m4"
-.endif
-
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/buildtool-0/pkgflags
 
diff --git a/devel/buildtool/PLIST b/devel/buildtool/PLIST
index 4edd104f0c3..217acf31d08 100644
--- a/devel/buildtool/PLIST
+++ b/devel/buildtool/PLIST
@@ -1,18 +1,15 @@
-@comment $NetBSD: PLIST,v 1.8 2003/09/05 18:50:33 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.9 2004/02/04 17:12:09 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
 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
@@ -30,26 +27,12 @@ share/buildtool-0/bt_logic/program.subr
 share/buildtool-0/bt_logic/qt_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
-share/buildtool-0/mk/bt.dep.mk
-share/buildtool-0/mk/bt.inc.mk
-share/buildtool-0/mk/bt.info.mk
-share/buildtool-0/mk/bt.init.mk
-share/buildtool-0/mk/bt.lib.mk
-share/buildtool-0/mk/bt.man.mk
-share/buildtool-0/mk/bt.prog.mk
-share/buildtool-0/mk/bt.subdir.mk
-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/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
@@ -57,8 +40,6 @@ share/doc/${PKGNAME}/TODO
 @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
diff --git a/devel/buildtool/buildlink2.mk b/devel/buildtool/buildlink2.mk
index 4cca186633d..dcf40782244 100644
--- a/devel/buildtool/buildlink2.mk
+++ b/devel/buildtool/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/09/05 18:50:33 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2004/02/04 17:12:09 jmmv Exp $
 
 .if !defined(BUILDTOOL_BUILDLINK2_MK)
 BUILDTOOL_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		buildtool
-BUILDLINK_DEPENDS.buildtool?=	buildtool>=0.14
+BUILDLINK_DEPENDS.buildtool?=	buildtool>=0.15
 BUILDLINK_PKGSRCDIR.buildtool?=	../../devel/buildtool
 BUILDLINK_DEPMETHOD.buildtool?=	build
 
diff --git a/devel/buildtool/distinfo b/devel/buildtool/distinfo
index 843b8f00245..88660d18a86 100644
--- a/devel/buildtool/distinfo
+++ b/devel/buildtool/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2003/09/05 18:50:33 jmmv Exp $
+$NetBSD: distinfo,v 1.12 2004/02/04 17:12:09 jmmv Exp $
 
-SHA1 (buildtool-0.14.tar.gz) = 81158884241decc9ffdb3270b6c2290898ee0052
-Size (buildtool-0.14.tar.gz) = 386753 bytes
+SHA1 (buildtool-0.15.tar.gz) = 15f4af8a67a15c9e09cc9994bf952ebb7548fc33
+Size (buildtool-0.15.tar.gz) = 190284 bytes