Update to 0.12:

     Released on 2003/07/24, its state was alpha.

     o   The bt_wizard module was added, which creates the basic structure
         needed for a project based on a serie of interactive questions.

     o   Added cache support for many checks in bt_config.  This makes the
         program run a lot faster if checks are duplicated, and more impor-
         tant, lets the administrator define check results beforehand in the
         system wide bt_config.conf configuration file.

     o   The bt_swcgen module was added, which aids the system administrator
         in the creation of system-wide configuration files for bt_config
         (that is, files that store check results to avoid rechecking the same
         thing over and over again).

     o   The buildtool.d/config_init file was deprecated.  The entire configu-
         ration script is now read from a single file, buildtool.d/config, as
         the old framework was confusing and error prone.  Compatibility will
         be kept for some time.

     o   The TeXinfo documentation was removed.  The manual is now distributed
         in its own `buildtool-doc' package, written using Docbook/XML.

     o   The buildtool.spec file was added, needed to create RPM packages.  It
         actually supports building binary packages for RedHat Linux and SuSE
         Linux.

     o   Improved user experience: better usage messages and support for long
         options added.

     o   A developer mode was added to all configure scripts (disabled by de-
         fault).  It enables extra functionality during the build process,
         ideal for developers but which may annoy end users.

     o   Removed license description files.  bt_dist will suggest a COPYING
         file instead, as this is the most common practice suggested by li-
         censes.

     o   New standard checks in the bt_config module, specially
         bt_check_prog_m4() and bt_check_attribute().

     o   Code cleanup and simplification (using M4 in some places).

5 files changed, 75 insertions, 18 deletions

diff --git a/devel/buildtool/MESSAGE b/devel/buildtool/MESSAGE
new file mode 100644
index 00000000000..58b4398ee1e
--- /dev/null
+++ b/devel/buildtool/MESSAGE
@@ -0,0 +1,15 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2003/07/24 10:12:30 jmmv Exp $
+
+As part of the post installation stage, you should now create a system-wide
+configuration file for the bt_config module, containing cached results for
+several common checks run by many configure scripts.
+
+For an automated setup, issue the following commands (as ${ROOT_USER}):
+
+	mkdir -p ${PKG_SYSCONFDIR}
+	cp ${PREFIX}/share/buildtool-0/templates/bt_config.conf.in \
+	    ${PKG_SYSCONFDIR}/bt_config.conf.in
+	${PREFIX}/bin/buildtool swcgen
+
+===========================================================================
diff --git a/devel/buildtool/Makefile b/devel/buildtool/Makefile
index 194e0d30f24..aab55ea8d47 100644
--- a/devel/buildtool/Makefile
+++ b/devel/buildtool/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2003/07/17 21:29:46 grant Exp $
+# $NetBSD: Makefile,v 1.10 2003/07/24 10:12:30 jmmv Exp $
 #
 
-DISTNAME=	buildtool-0.11
+DISTNAME=	buildtool-0.12
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=buildtool/}
 
@@ -12,15 +12,14 @@ COMMENT=	Portable BSD-like build infrastructure
 USE_BUILDLINK2=	yes
 HAS_CONFIGURE=	yes
 
-TEXINFO_REQD=		4.0
-USE_MAKEINFO=		yes
-USE_NEW_TEXINFO=	yes
-INFO_FILES=		buildtool.info
-
 PKG_SYSCONFSUBDIR=	buildtool
 
 CONFIGURE_ARGS=		-p ${LOCALBASE}
 CONFIGURE_ARGS+=	-c ${PKG_SYSCONFDIR}
+CONFIGURE_ENV+=		M4="${M4}"
 CONFIGURE_ENV+=		SH="${SH}"
 
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/buildtool-0/pkgflags
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/buildtool/PLIST b/devel/buildtool/PLIST
index e69dc51ef90..557927306f5 100644
--- a/devel/buildtool/PLIST
+++ b/devel/buildtool/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.5 2003/06/20 10:22:56 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.6 2003/07/24 10:12:30 jmmv Exp $
 bin/buildtool
 bin/buildtool-0
-info/buildtool.info
 libexec/buildtool-0/bt_config
 libexec/buildtool-0/bt_dist
 libexec/buildtool-0/bt_doc
@@ -9,15 +8,15 @@ libexec/buildtool-0/bt_lint
 libexec/buildtool-0/bt_logic
 libexec/buildtool-0/bt_make
 libexec/buildtool-0/bt_pkgflags
+libexec/buildtool-0/bt_swcgen
+libexec/buildtool-0/bt_wizard
 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/licenses/apache
-share/buildtool-0/licenses/artistic
-share/buildtool-0/licenses/bsd
-share/buildtool-0/licenses/gplv2
+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
@@ -30,15 +29,18 @@ 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/config
-share/buildtool-0/templates/config_init
 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
 @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/licenses
+@dirrm share/buildtool-0/bt_swcgen
 @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
new file mode 100644
index 00000000000..a944a5e1b2a
--- /dev/null
+++ b/devel/buildtool/buildlink2.mk
@@ -0,0 +1,41 @@
+# $NetBSD: buildlink2.mk,v 1.1 2003/07/24 10:12:30 jmmv Exp $
+
+.if !defined(BUILDTOOL_BUILDLINK2_MK)
+BUILDTOOL_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		buildtool
+BUILDLINK_DEPENDS.buildtool?=	buildtool>=0.12
+BUILDLINK_PKGSRCDIR.buildtool?=	../../devel/buildtool
+BUILDLINK_DEPMETHOD.buildtool?=	build
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.buildtool=buildtool
+BUILDLINK_PREFIX.buildtool_DEFAULT=	${LOCALBASE}
+
+BUILDTOOL=		${BUILDLINK_PREFIX.buildtool}/bin/buildtool
+
+BUILD_TARGET=		all
+INSTALL_TARGET=		install
+
+HAS_CONFIGURE=		yes
+CONFIGURE_SCRIPT=	${BUILDTOOL} config
+CONFIGURE_ENV+=		BT_FLAGS_CC="${CFLAGS}"
+CONFIGURE_ENV+=		BT_FLAGS_CPP="${CPPFLAGS}"
+CONFIGURE_ENV+=		BT_FLAGS_CXX="${CXXFLAGS}"
+CONFIGURE_ENV+=		BT_PROG_AWK="${AWK}"
+CONFIGURE_ENV+=		BT_PROG_CC="${CC}"
+CONFIGURE_ENV+=		BT_PROG_CXX="${CXX}"
+CONFIGURE_ENV+=		BT_PROG_LD="${LD}"
+CONFIGURE_ENV+=		BT_PROG_M4="${M4}"
+CONFIGURE_ARGS+=	--prefix=${PREFIX}
+
+.if !target(do-build)
+do-build:
+	${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${BUILDTOOL} make all
+.endif
+
+.if !target(do-install)
+do-install:
+	${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${BUILDTOOL} make install
+.endif
+
+.endif	# BUILDTOOL_BUILDLINK2_MK
diff --git a/devel/buildtool/distinfo b/devel/buildtool/distinfo
index 05c3fd1491c..8bb3cc8ae41 100644
--- a/devel/buildtool/distinfo
+++ b/devel/buildtool/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2003/04/12 10:14:26 jmmv Exp $
+$NetBSD: distinfo,v 1.8 2003/07/24 10:12:30 jmmv Exp $
 
-SHA1 (buildtool-0.11.tar.gz) = a4d1d2eef29d2e66af4bbdbea6128165d5bbfa13
-Size (buildtool-0.11.tar.gz) = 277177 bytes
+SHA1 (buildtool-0.12.tar.gz) = 4df19c4c401d78fb598a660ce13a39c835eda763
+Size (buildtool-0.12.tar.gz) = 260673 bytes