Make this package install the Boost.Build (v2) framework instead of the

bjam utility.  The latter is now provided in the boost-jam package, as the
Boost.Build packaging guidelines describe.

3 files changed, 532 insertions, 38 deletions

diff --git a/devel/boost-build/Makefile b/devel/boost-build/Makefile
index f4af7adfa8d..692c5ecd737 100644
--- a/devel/boost-build/Makefile
+++ b/devel/boost-build/Makefile
@@ -1,22 +1,40 @@
-# $NetBSD: Makefile,v 1.3 2006/01/20 20:40:19 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2007/06/02 17:50:28 jmmv Exp $
 #
 
 BOOST_PACKAGE=		build
 BOOST_COMMENT=		(Boost.Build framework)
 BOOST_CONFIG=		no
 
+PKGREVISION=		1
+
 .include "../../meta-pkgs/boost/Makefile.common"
 
+SUBST_CLASSES+=		confdir
+SUBST_MESSAGE.confdir=	Fixing path to site-config.jam.
+SUBST_STAGE.confdir=	pre-build
+SUBST_FILES.confdir=	tools/build/v2/build-system.jam
+SUBST_SED.confdir=	-e 's,/etc,${PKG_SYSCONFDIR},g'
+
+EGDIR=			${PREFIX}/share/examples/boost-build
+CONF_FILES=		${EGDIR}/site-config.jam \
+			${PKG_SYSCONFDIR}/site-config.jam
+
 .include "toolset.mk"
 
-INSTALLATION_DIRS=	bin
+post-extract:
+	${FIND} ${WRKSRC}/tools/build/v2 -type d -exec ${CHMOD} 755 {} \;
+	${FIND} ${WRKSRC}/tools/build/v2 -type f -exec ${CHMOD} 644 {} \;
 
 do-build:
-	@cd ${WRKSRC}/tools/build/jam_src && \
-	    ${SETENV} ${MAKE_ENV} ${SH} ./build.sh ${BOOST_TOOLSET}
+	{ ${ECHO} '# System wide configuration file for Boost.Build.' ; \
+	  ${ECHO} ; \
+	  ${ECHO} 'using ${BOOST_TOOLSET} ;' ; } >${WRKDIR}/site-config.jam
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/tools/build/jam_src/bin.*/bjam \
-	    ${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${PREFIX}/share/boost-build
+	cd ${WRKSRC}/tools/build/v2 && ${PAX} -rw -pp -pm . \
+	    ${PREFIX}/share/boost-build
+	${INSTALL_DATA_DIR} ${EGDIR}
+	${INSTALL_DATA} ${WRKDIR}/site-config.jam ${EGDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/boost-build/PLIST b/devel/boost-build/PLIST
index 83b2ea0545b..46bdf80e8f1 100644
--- a/devel/boost-build/PLIST
+++ b/devel/boost-build/PLIST
@@ -1,2 +1,508 @@
-@comment $NetBSD: PLIST,v 1.1 2005/02/26 22:48:35 jmmv Exp $
-bin/bjam
+@comment $NetBSD: PLIST,v 1.2 2007/06/02 17:50:28 jmmv Exp $
+etc/site-config.jam
+share/boost-build/boost-build.jam
+share/boost-build/boost.css
+share/boost-build/bootstrap.jam
+share/boost-build/build-system.jam
+share/boost-build/build/alias.jam
+share/boost-build/build/build-request.jam
+share/boost-build/build/feature.jam
+share/boost-build/build/generators.jam
+share/boost-build/build/modifiers.jam
+share/boost-build/build/project.jam
+share/boost-build/build/property-set.jam
+share/boost-build/build/property.jam
+share/boost-build/build/readme.txt
+share/boost-build/build/scanner.jam
+share/boost-build/build/targets.jam
+share/boost-build/build/toolset.jam
+share/boost-build/build/type.jam
+share/boost-build/build/version.jam
+share/boost-build/build/virtual-target.jam
+share/boost-build/changes.txt
+share/boost-build/debian/boost-build.docs
+share/boost-build/debian/boost-build.examples
+share/boost-build/debian/changelog
+share/boost-build/debian/conffiles
+share/boost-build/debian/control
+share/boost-build/debian/copyright
+share/boost-build/debian/excludes
+share/boost-build/debian/rules
+share/boost-build/doc/Jamfile.v2
+share/boost-build/doc/development_plan.html
+share/boost-build/doc/src/advanced.xml
+share/boost-build/doc/src/architecture.xml
+share/boost-build/doc/src/catalog.xml
+share/boost-build/doc/src/extending.xml
+share/boost-build/doc/src/faq.xml
+share/boost-build/doc/src/howto.xml
+share/boost-build/doc/src/install.xml
+share/boost-build/doc/src/recipes.xml
+share/boost-build/doc/src/reference.xml
+share/boost-build/doc/src/tutorial.xml
+share/boost-build/doc/src/userman.xml
+share/boost-build/doc/tools.html
+share/boost-build/doc/tracker.html
+share/boost-build/doc/userman.pdf
+share/boost-build/example/boost-build.jam
+share/boost-build/example/customization/Jamfile
+share/boost-build/example/customization/class.verbatim
+share/boost-build/example/customization/codegen.cpp
+share/boost-build/example/customization/inline_file.py
+share/boost-build/example/customization/project-root.jam
+share/boost-build/example/customization/readme.txt
+share/boost-build/example/customization/t1.verbatim
+share/boost-build/example/customization/t2.verbatim
+share/boost-build/example/customization/usage.verbatim
+share/boost-build/example/customization/verbatim.jam
+share/boost-build/example/gettext/Jamfile
+share/boost-build/example/gettext/main.cpp
+share/boost-build/example/gettext/project-root.jam
+share/boost-build/example/gettext/readme.txt
+share/boost-build/example/gettext/russian.po
+share/boost-build/example/hello/Jamroot
+share/boost-build/example/hello/hello.cpp
+share/boost-build/example/libraries/Jamroot
+share/boost-build/example/libraries/app/Jamfile
+share/boost-build/example/libraries/app/app.cpp
+share/boost-build/example/libraries/util/foo/Jamfile
+share/boost-build/example/libraries/util/foo/bar.cpp
+share/boost-build/example/libraries/util/foo/include/lib1.h
+share/boost-build/example/make/Jamfile
+share/boost-build/example/make/a.cpp
+share/boost-build/example/make/extlib/Jamfile
+share/boost-build/example/make/extlib/c.cpp
+share/boost-build/example/make/extlib/gcc.jam
+share/boost-build/example/make/extlib/project-root.jam
+share/boost-build/example/make/gcc.jam
+share/boost-build/example/make/lib/Jamfile
+share/boost-build/example/make/lib/b.cpp
+share/boost-build/example/make/project-root.jam
+share/boost-build/example/make/readme.txt
+share/boost-build/example/qt-ui/Jamfile
+share/boost-build/example/qt-ui/hello_world_widget.ui
+share/boost-build/example/qt-ui/main.cpp
+share/boost-build/example/qt-ui/project-root.jam
+share/boost-build/example/qt/Jamfile
+share/boost-build/example/qt/canvas.cpp
+share/boost-build/example/qt/canvas.h
+share/boost-build/example/qt/main.cpp
+share/boost-build/example/qt/project-root.jam
+share/boost-build/example/variant/Jamfile
+share/boost-build/example/variant/a.cpp
+share/boost-build/example/variant/libs/Jamfile
+share/boost-build/example/variant/libs/l.cpp
+share/boost-build/example/variant/project-root.jam
+share/boost-build/example/variant/readme.txt
+share/boost-build/example/versioned/hello.cpp
+share/boost-build/example/versioned/jamfile.jam
+share/boost-build/example/versioned/project-root.jam
+share/boost-build/generators_prototype.py
+share/boost-build/hacking.txt
+share/boost-build/index.html
+share/boost-build/kernel/boost-build.jam
+share/boost-build/kernel/bootstrap.jam
+share/boost-build/kernel/class.jam
+share/boost-build/kernel/errors.jam
+share/boost-build/kernel/modules.jam
+share/boost-build/nightly.sh
+share/boost-build/notes/README.txt
+share/boost-build/notes/build_dir_option.txt
+share/boost-build/options/help.jam
+share/boost-build/release_procedure.txt
+share/boost-build/roll.sh
+share/boost-build/site-config.jam
+share/boost-build/test/BoostBuild.py
+share/boost-build/test/Jamfile
+share/boost-build/test/Jamrules
+share/boost-build/test/TestCmd.py
+share/boost-build/test/abs_workdir.py
+share/boost-build/test/absolute_sources.py
+share/boost-build/test/alias.py
+share/boost-build/test/alternatives.py
+share/boost-build/test/assert-equal.jam
+share/boost-build/test/bad_dirname.py
+share/boost-build/test/boost-build.jam
+share/boost-build/test/boostbook.py
+share/boost-build/test/boostbook/Jamroot
+share/boost-build/test/boostbook/a.hpp
+share/boost-build/test/boostbook/docs.xml
+share/boost-build/test/build_dir.py
+share/boost-build/test/c_file.py
+share/boost-build/test/chain.py
+share/boost-build/test/check-arguments.jam
+share/boost-build/test/check-bindrule.jam
+share/boost-build/test/check-jam-patches.jam
+share/boost-build/test/check-test-tools.jam
+share/boost-build/test/composite.py
+share/boost-build/test/conditionals.py
+share/boost-build/test/conditionals2.py
+share/boost-build/test/conditionals3.py
+share/boost-build/test/core_d12.py
+share/boost-build/test/core_delete_module.py
+share/boost-build/test/core_dependencies.py
+share/boost-build/test/core_import_module.py
+share/boost-build/test/core_modifiers.py
+share/boost-build/test/core_typecheck.py
+share/boost-build/test/core_varnames.py
+share/boost-build/test/custom_generator.py
+share/boost-build/test/default_build.py
+share/boost-build/test/default_features.py
+share/boost-build/test/dependency-test/Jamfile
+share/boost-build/test/dependency-test/a.cpp
+share/boost-build/test/dependency-test/a.h
+share/boost-build/test/dependency-test/a_c.c
+share/boost-build/test/dependency-test/b.cpp
+share/boost-build/test/dependency-test/b.h
+share/boost-build/test/dependency-test/c.cpp
+share/boost-build/test/dependency-test/e.cpp
+share/boost-build/test/dependency-test/foo.jam
+share/boost-build/test/dependency-test/project-root.jam
+share/boost-build/test/dependency-test/src1/a.h
+share/boost-build/test/dependency-test/src1/b.h
+share/boost-build/test/dependency-test/src1/c.h
+share/boost-build/test/dependency-test/src1/z.h
+share/boost-build/test/dependency-test/src2/b.h
+share/boost-build/test/dependency-test/x.foo
+share/boost-build/test/dependency-test/y.foo
+share/boost-build/test/dependency_property.py
+share/boost-build/test/dependency_test.py
+share/boost-build/test/direct-request-test/Jamfile
+share/boost-build/test/direct-request-test/Jamfile2
+share/boost-build/test/direct-request-test/a.cpp
+share/boost-build/test/direct-request-test/b.cpp
+share/boost-build/test/direct-request-test/b_inverse.cpp
+share/boost-build/test/direct-request-test/project-root.jam
+share/boost-build/test/direct_request_test.py
+share/boost-build/test/dll_path.py
+share/boost-build/test/double_loading.py
+share/boost-build/test/duplicate.py
+share/boost-build/test/echo_args.jam
+share/boost-build/test/empty.jam
+share/boost-build/test/expansion.py
+share/boost-build/test/explicit.py
+share/boost-build/test/gcc_runtime.py
+share/boost-build/test/generators-test/Jamfile
+share/boost-build/test/generators-test/a.cpp
+share/boost-build/test/generators-test/b.cxx
+share/boost-build/test/generators-test/c.ui
+share/boost-build/test/generators-test/d.wd
+share/boost-build/test/generators-test/e.cpp
+share/boost-build/test/generators-test/extra.jam
+share/boost-build/test/generators-test/lex.jam
+share/boost-build/test/generators-test/lib/Jamfile
+share/boost-build/test/generators-test/lib/c.cpp
+share/boost-build/test/generators-test/nm.jam
+share/boost-build/test/generators-test/project-root.jam
+share/boost-build/test/generators-test/qt.jam
+share/boost-build/test/generators-test/x.l
+share/boost-build/test/generators-test/y.x_pro
+share/boost-build/test/generators-test/z.cpp
+share/boost-build/test/generators_test.py
+share/boost-build/test/glob.py
+share/boost-build/test/inherit_toolset.py
+share/boost-build/test/inline.py
+share/boost-build/test/library_chain.py
+share/boost-build/test/library_order.py
+share/boost-build/test/library_property.py
+share/boost-build/test/load_dir.py
+share/boost-build/test/load_order.py
+share/boost-build/test/loop.py
+share/boost-build/test/m1-01.py
+share/boost-build/test/m1-02.py
+share/boost-build/test/m1-03.py
+share/boost-build/test/make_rule.py
+share/boost-build/test/module-actions/boost-build.jam
+share/boost-build/test/module-actions/bootstrap.jam
+share/boost-build/test/module_actions.py
+share/boost-build/test/ndebug.py
+share/boost-build/test/no_type.py
+share/boost-build/test/notfile.py
+share/boost-build/test/ordered_properties.py
+share/boost-build/test/out_of_tree.py
+share/boost-build/test/path_features.py
+share/boost-build/test/prebuilt.py
+share/boost-build/test/prebuilt/Jamfile
+share/boost-build/test/prebuilt/ext/Jamfile
+share/boost-build/test/prebuilt/ext/Jamfile2
+share/boost-build/test/prebuilt/ext/Jamfile3
+share/boost-build/test/prebuilt/ext/a.cpp
+share/boost-build/test/prebuilt/ext/debug/a.h
+share/boost-build/test/prebuilt/ext/project-root.jam
+share/boost-build/test/prebuilt/ext/release/a.h
+share/boost-build/test/prebuilt/hello.cpp
+share/boost-build/test/prebuilt/project-root.jam
+share/boost-build/test/print.py
+share/boost-build/test/project-test1.jam
+share/boost-build/test/project-test1/Jamfile
+share/boost-build/test/project-test1/dir/Jamfile
+share/boost-build/test/project-test1/dir2/Jamfile
+share/boost-build/test/project-test1/dir2/project-root.jam
+share/boost-build/test/project-test1/project-root.jam
+share/boost-build/test/project-test1/project-test1.jam
+share/boost-build/test/project-test1/readme.txt
+share/boost-build/test/project-test1/standalone-project.jam
+share/boost-build/test/project-test3/Jamfile
+share/boost-build/test/project-test3/a.cpp
+share/boost-build/test/project-test3/lib/Jamfile
+share/boost-build/test/project-test3/lib/b.cpp
+share/boost-build/test/project-test3/lib2/Jamfile
+share/boost-build/test/project-test3/lib2/c.cpp
+share/boost-build/test/project-test3/lib2/d.cpp
+share/boost-build/test/project-test3/lib2/helper/Jamfile
+share/boost-build/test/project-test3/lib2/helper/e.cpp
+share/boost-build/test/project-test3/lib3/Jamfile
+share/boost-build/test/project-test3/lib3/f.cpp
+share/boost-build/test/project-test3/lib3/project-root.jam
+share/boost-build/test/project-test3/project-root.jam
+share/boost-build/test/project-test3/readme.txt
+share/boost-build/test/project-test4/Jamfile
+share/boost-build/test/project-test4/Jamfile3
+share/boost-build/test/project-test4/Jamfile4
+share/boost-build/test/project-test4/Jamfile5
+share/boost-build/test/project-test4/a.cpp
+share/boost-build/test/project-test4/a_gcc.cpp
+share/boost-build/test/project-test4/lib/Jamfile
+share/boost-build/test/project-test4/lib/Jamfile1
+share/boost-build/test/project-test4/lib/Jamfile2
+share/boost-build/test/project-test4/lib/Jamfile3
+share/boost-build/test/project-test4/lib/b.cpp
+share/boost-build/test/project-test4/lib2/Jamfile
+share/boost-build/test/project-test4/lib2/Jamfile2
+share/boost-build/test/project-test4/project-root.jam
+share/boost-build/test/project-test4/readme.txt
+share/boost-build/test/project_dependencies.py
+share/boost-build/test/project_root_constants.py
+share/boost-build/test/project_test1.py
+share/boost-build/test/project_test3.py
+share/boost-build/test/project_test4.py
+share/boost-build/test/property_expansion.py
+share/boost-build/test/railsys.py
+share/boost-build/test/railsys/libx/include/test_libx.h
+share/boost-build/test/railsys/libx/project-root.jam
+share/boost-build/test/railsys/libx/src/Jamfile
+share/boost-build/test/railsys/libx/src/test_libx.cpp
+share/boost-build/test/railsys/program/Jamfile
+share/boost-build/test/railsys/program/include/test_a.h
+share/boost-build/test/railsys/program/liba/Jamfile
+share/boost-build/test/railsys/program/liba/test_a.cpp
+share/boost-build/test/railsys/program/main/Jamfile
+share/boost-build/test/railsys/program/main/main.cpp
+share/boost-build/test/railsys/program/project-root.jam
+share/boost-build/test/readme.txt
+share/boost-build/test/rebuilds.py
+share/boost-build/test/recursive.jam
+share/boost-build/test/regression.py
+share/boost-build/test/relative_sources.py
+share/boost-build/test/searched_lib.py
+share/boost-build/test/skipping.py
+share/boost-build/test/source_locations.py
+share/boost-build/test/stage.py
+share/boost-build/test/standalone.py
+share/boost-build/test/startup/boost-root/boost-build.jam
+share/boost-build/test/startup/boost-root/build/boost-build.jam
+share/boost-build/test/startup/boost-root/build/bootstrap.jam
+share/boost-build/test/startup/bootstrap-env/boost-build.jam
+share/boost-build/test/startup/bootstrap-explicit/boost-build.jam
+share/boost-build/test/startup/bootstrap-implicit/readme.txt
+share/boost-build/test/startup/no-bootstrap1/boost-build.jam
+share/boost-build/test/startup/no-bootstrap1/subdir/readme.txt
+share/boost-build/test/startup/no-bootstrap2/boost-build.jam
+share/boost-build/test/startup/no-bootstrap3/boost-build.jam
+share/boost-build/test/startup_v1.py
+share/boost-build/test/startup_v2.py
+share/boost-build/test/subdir1/file-to-bind
+share/boost-build/test/suffix.py
+share/boost-build/test/svn_tree.py
+share/boost-build/test/symlink.py
+share/boost-build/test/tag.py
+share/boost-build/test/template.py
+share/boost-build/test/test-config-example.jam
+share/boost-build/test/test.jam
+share/boost-build/test/test1.py
+share/boost-build/test/test2.py
+share/boost-build/test/test2/Jamfile
+share/boost-build/test/test2/Jamrules
+share/boost-build/test/test2/foo.cpp
+share/boost-build/test/test_all.py
+share/boost-build/test/test_nt_line_length.jam
+share/boost-build/test/test_system.html
+share/boost-build/test/testing-primitives/boost-build.jam
+share/boost-build/test/testing-primitives/bootstrap.jam
+share/boost-build/test/testing_primitives.py
+share/boost-build/test/timedata.py
+share/boost-build/test/tree.py
+share/boost-build/test/unit-tests.jam
+share/boost-build/test/unit_test.py
+share/boost-build/test/unit_tests.py
+share/boost-build/test/unused.py
+share/boost-build/test/unused/Jamfile
+share/boost-build/test/unused/a.cpp
+share/boost-build/test/unused/b.cpp
+share/boost-build/test/unused/b.x
+share/boost-build/test/unused/project-root.jam
+share/boost-build/test/use_requirements.py
+share/boost-build/test/using.py
+share/boost-build/test/v1-testing/Jamfile
+share/boost-build/test/v1-testing/a.cpp
+share/boost-build/test/v1-testing/b.cpp
+share/boost-build/test/v1-testing/boost-build.jam
+share/boost-build/test/v1-testing/c.cpp
+share/boost-build/test/v1_testing.py
+share/boost-build/test/v1_testing/Jamfile
+share/boost-build/test/v1_testing/Jamrules
+share/boost-build/test/v1_testing/boost-build.jam
+share/boost-build/test/v1_testing/foo.cpp
+share/boost-build/test/v1_testing/lib-err.cpp
+share/boost-build/test/v1_testing/lib.cpp
+share/boost-build/test/v1_testing/project-root.jam
+share/boost-build/test/wrapper.py
+share/boost-build/test/wrong_project.py
+share/boost-build/tools/acc.jam
+share/boost-build/tools/bison.jam
+share/boost-build/tools/boostbook-config.jam
+share/boost-build/tools/boostbook.jam
+share/boost-build/tools/borland.jam
+share/boost-build/tools/builtin.jam
+share/boost-build/tools/common.jam
+share/boost-build/tools/como-linux.jam
+share/boost-build/tools/como-win.jam
+share/boost-build/tools/como.jam
+share/boost-build/tools/cw-config.jam
+share/boost-build/tools/cw.jam
+share/boost-build/tools/${LOWER_OPSYS}.jam
+share/boost-build/tools/docutils.jam
+share/boost-build/tools/doxygen-config.jam
+share/boost-build/tools/doxygen.jam
+share/boost-build/tools/fop.jam
+share/boost-build/tools/fortran.jam
+share/boost-build/tools/gcc.jam
+share/boost-build/tools/gettext.jam
+share/boost-build/tools/gfortran.jam
+share/boost-build/tools/hpfortran.jam
+share/boost-build/tools/ifort.jam
+share/boost-build/tools/intel-linux.jam
+share/boost-build/tools/intel-win.jam
+share/boost-build/tools/intel.jam
+share/boost-build/tools/kylix.jam
+share/boost-build/tools/lex.jam
+share/boost-build/tools/make.jam
+share/boost-build/tools/msvc-config.jam
+share/boost-build/tools/msvc.jam
+share/boost-build/tools/notfile.jam
+share/boost-build/tools/package.jam
+share/boost-build/tools/python-config.jam
+share/boost-build/tools/python.jam
+share/boost-build/tools/qt.jam
+share/boost-build/tools/quickbook-config.jam
+share/boost-build/tools/quickbook.jam
+share/boost-build/tools/rc.jam
+share/boost-build/tools/stage.jam
+share/boost-build/tools/stlport.jam
+share/boost-build/tools/sun.jam
+share/boost-build/tools/symlink.jam
+share/boost-build/tools/testing.jam
+share/boost-build/tools/types/cpp.jam
+share/boost-build/tools/types/exe.jam
+share/boost-build/tools/types/html.jam
+share/boost-build/tools/types/lib.jam
+share/boost-build/tools/types/obj.jam
+share/boost-build/tools/types/register.jam
+share/boost-build/tools/types/rsp.jam
+share/boost-build/tools/unix.jam
+share/boost-build/tools/vacpp.jam
+share/boost-build/tools/whale.jam
+share/boost-build/tools/xlf.jam
+share/boost-build/tools/xsltproc-config.jam
+share/boost-build/tools/xsltproc.jam
+share/boost-build/user-config.jam
+share/boost-build/util/assert.jam
+share/boost-build/util/container.jam
+share/boost-build/util/doc.jam
+share/boost-build/util/indirect.jam
+share/boost-build/util/numbers.jam
+share/boost-build/util/option.jam
+share/boost-build/util/order.jam
+share/boost-build/util/os.jam
+share/boost-build/util/path.jam
+share/boost-build/util/print.jam
+share/boost-build/util/regex.jam
+share/boost-build/util/sequence.jam
+share/boost-build/util/set.jam
+share/boost-build/util/string.jam
+share/boost-build/util/utility.jam
+share/examples/boost-build/site-config.jam
+@dirrm share/examples/boost-build
+@dirrm share/boost-build/util
+@dirrm share/boost-build/tools/types
+@dirrm share/boost-build/tools
+@dirrm share/boost-build/test/v1_testing
+@dirrm share/boost-build/test/v1-testing
+@dirrm share/boost-build/test/unused
+@dirrm share/boost-build/test/testing-primitives
+@dirrm share/boost-build/test/test2
+@dirrm share/boost-build/test/subdir1
+@dirrm share/boost-build/test/startup/no-bootstrap3
+@dirrm share/boost-build/test/startup/no-bootstrap2
+@dirrm share/boost-build/test/startup/no-bootstrap1/subdir
+@dirrm share/boost-build/test/startup/no-bootstrap1
+@dirrm share/boost-build/test/startup/bootstrap-implicit
+@dirrm share/boost-build/test/startup/bootstrap-explicit
+@dirrm share/boost-build/test/startup/bootstrap-env
+@dirrm share/boost-build/test/startup/boost-root/build
+@dirrm share/boost-build/test/startup/boost-root
+@dirrm share/boost-build/test/railsys/program/main
+@dirrm share/boost-build/test/railsys/program/liba
+@dirrm share/boost-build/test/railsys/program/include
+@dirrm share/boost-build/test/railsys/program
+@dirrm share/boost-build/test/railsys/libx/src
+@dirrm share/boost-build/test/railsys/libx/include
+@dirrm share/boost-build/test/railsys/libx
+@dirrm share/boost-build/test/project-test4/lib2
+@dirrm share/boost-build/test/project-test4/lib
+@dirrm share/boost-build/test/project-test4
+@dirrm share/boost-build/test/project-test3/lib3
+@dirrm share/boost-build/test/project-test3/lib2/helper
+@dirrm share/boost-build/test/project-test3/lib2
+@dirrm share/boost-build/test/project-test3/lib
+@dirrm share/boost-build/test/project-test3
+@dirrm share/boost-build/test/project-test1/dir2
+@dirrm share/boost-build/test/project-test1/dir
+@dirrm share/boost-build/test/project-test1
+@dirrm share/boost-build/test/prebuilt/ext/release
+@dirrm share/boost-build/test/prebuilt/ext/debug
+@dirrm share/boost-build/test/prebuilt/ext
+@dirrm share/boost-build/test/prebuilt
+@dirrm share/boost-build/test/module-actions
+@dirrm share/boost-build/test/generators-test/lib
+@dirrm share/boost-build/test/generators-test
+@dirrm share/boost-build/test/direct-request-test
+@dirrm share/boost-build/test/dependency-test/src2
+@dirrm share/boost-build/test/dependency-test/src1
+@dirrm share/boost-build/test/dependency-test
+@dirrm share/boost-build/test/boostbook
+@dirrm share/boost-build/test
+@dirrm share/boost-build/options
+@dirrm share/boost-build/notes
+@dirrm share/boost-build/kernel
+@dirrm share/boost-build/example/versioned
+@dirrm share/boost-build/example/variant/libs
+@dirrm share/boost-build/example/variant
+@dirrm share/boost-build/example/qt-ui
+@dirrm share/boost-build/example/qt
+@dirrm share/boost-build/example/make/lib
+@dirrm share/boost-build/example/make/extlib
+@dirrm share/boost-build/example/make
+@dirrm share/boost-build/example/libraries/util/foo/include
+@dirrm share/boost-build/example/libraries/util/foo
+@dirrm share/boost-build/example/libraries/app
+@dirrm share/boost-build/example/libraries
+@dirrm share/boost-build/example/hello
+@dirrm share/boost-build/example/gettext
+@dirrm share/boost-build/example/customization
+@dirrm share/boost-build/example
+@dirrm share/boost-build/doc/src
+@dirrm share/boost-build/doc
+@dirrm share/boost-build/debian
+@dirrm share/boost-build/build
+@dirrm share/boost-build
diff --git a/devel/boost-build/bjam.mk b/devel/boost-build/bjam.mk
deleted file mode 100644
index 8479d695d97..00000000000
--- a/devel/boost-build/bjam.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: bjam.mk,v 1.5 2006/01/21 16:10:54 jmmv Exp $
-#
-
-.include "../../devel/boost-build/buildlink3.mk"
-
-.include "toolset.mk"
-.include "../../mk/bsd.prefs.mk"
-
-BJAM=			${BUILDLINK_PREFIX.boost-build}/bin/bjam
-BJAM_ARGS+=		--builddir=${WRKSRC}/build
-BJAM_ARGS+=		--layout=system
-BJAM_ARGS+=		--prefix=${PREFIX}
-BJAM_ARGS+=		-sBUILD=${BJAM_BUILD:Q}
-BJAM_ARGS+=		-sTOOLS=${BOOST_TOOLSET}
-.if ${OPSYS} == "Darwin"
-BJAM_ARGS+=		-sTARGET_LIBDIR=${PREFIX}/lib
-.endif
-.if defined(BOOST_DEBUG) && !empty(BOOST_DEBUG:M[Yy][Ee][Ss])
-BJAM_BUILD+=		debug
-.endif
-BJAM_BUILD+=		<linkflags>${COMPILER_RPATH_FLAG}${PREFIX}/lib
-BJAM_BUILD+=		<threading>multi
-BJAM_BUILD+=		release
-BJAM_CMD=		${SETENV} ${MAKE_ENV} ${BJAM} ${BJAM_ARGS}
-
-bjam-build:
-	@cd ${WRKSRC} && ${BJAM_CMD} stage
-
-bjam-install:
-	@cd ${WRKSRC} && ${BJAM_CMD} install