- Update to 0.1.9998r2662

- Switch maintainership to vbox@ [1]
- Fix if $ENV not ash-compatible [2]

PR:		ports/167520 [2]
Approved by:	gahr (maintainer) [1]
Submitted by:	Kurt Jaeger <fbsd-ports@opsec.eu> [2]

4 files changed, 41 insertions, 25 deletions

diff --git a/devel/kBuild/Makefile b/devel/kBuild/Makefile
index 4fe62f97ff76..d947f10d0bd6 100644
--- a/devel/kBuild/Makefile
+++ b/devel/kBuild/Makefile
@@ -1,20 +1,15 @@
-# New ports collection makefile for:	kbuild
-# Date created:		Mon Jul 28 14:34:33 BST 2008
-# Whom:			Bruce Simpson
-#
+# Created by:	Bruce Simpson
 # $FreeBSD$
-#
 
 PORTNAME=	kBuild
-DISTVERSION=	${KBUILD_VERSION}-p2
-PORTREVISION=	2
+DISTVERSION=	${KBUILD_VERSION}
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.netlabs.org/pub/kbuild/ \
 		http://tmp.chruetertee.ch/ \
 		http://disasterarea.chruetertee.ch/
-DISTNAME=	${PORTNAME}-${DISTVERSION}-src
+DISTNAME=	${PORTNAME}-${DISTVERSION}r2662-src
 
-MAINTAINER=	gahr@FreeBSD.org
+MAINTAINER=	vbox@FreeBSD.org
 COMMENT=	Makefile framework
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
@@ -26,7 +21,7 @@ CONFLICTS_INSTALL=	kBuild-devel-[0-9]*
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
-KBUILD_VERSION=	0.1.5
+KBUILD_VERSION=	0.1.9998
 KBUILD_ARCH=	${MACHINE_ARCH:S/i386/x86/}
 KBUILD_ENV=	ACLOCAL=${ACLOCAL} \
 		AUTOMAKE=${AUTOMAKE} \
@@ -40,6 +35,8 @@ KBUILD_BINS=	kDepIDB kDepPre kObjCache kmk kmk_append kmk_ash kmk_cat \
 PORTDOCS=	QuickReference-kmk.html \
 		QuickReference-kmk.txt
 
+.SHELL:		path="/bin/sh" unsetenv=true
+
 post-patch:
 	${REINPLACE_CMD} -e '11269d;11274d' ${WRKSRC}/src/sed/configure
 	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/Config.kmk
@@ -56,14 +53,14 @@ do-build:
 
 do-install:
 .for bin in ${KBUILD_BINS}
-	${INSTALL_PROGRAM} ${WRKSRC}/out/freebsd.${KBUILD_ARCH}/release${PREFIX}/bin/${bin} ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/out/freebsd.${KBUILD_ARCH}/release/stage${PREFIX}/bin/${bin} ${PREFIX}/bin
 .endfor
 	${MKDIR} ${DATADIR}
-	(cd ${WRKSRC}/out/freebsd.${KBUILD_ARCH}/release${PREFIX}/share/kBuild && ${COPYTREE_SHARE} \* ${DATADIR})
+	(cd ${WRKSRC}/out/freebsd.${KBUILD_ARCH}/release/stage${PREFIX}/share/kBuild && ${COPYTREE_SHARE} \* ${DATADIR})
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for doc in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/out/freebsd.${KBUILD_ARCH}/release${PREFIX}/share/doc/${PORTNAME}-${KBUILD_VERSION}/${doc} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/out/freebsd.${KBUILD_ARCH}/release/stage${PREFIX}/share/doc/${PORTNAME}-${KBUILD_VERSION}/${doc} ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/devel/kBuild/distinfo b/devel/kBuild/distinfo
index 03e99777fa67..bd73357219ef 100644
--- a/devel/kBuild/distinfo
+++ b/devel/kBuild/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kBuild-0.1.5-p2-src.tar.gz) = 8205db5e74d27ef6394bd48118a310e4f5caab455575f0ea975f62dcb8d642a6
-SIZE (kBuild-0.1.5-p2-src.tar.gz) = 2433567
+SHA256 (kBuild-0.1.9998r2662-src.tar.gz) = 3cfc5c6c4e065e35bf70ba5db9f7dd806cd5435353b905e890c9360ccdb7c5da
+SIZE (kBuild-0.1.9998r2662-src.tar.gz) = 2685286
diff --git a/devel/kBuild/files/patch-src-kmk_Makefile.kmk b/devel/kBuild/files/patch-src-kmk_Makefile.kmk
deleted file mode 100644
index b4288f33b8c3..000000000000
--- a/devel/kBuild/files/patch-src-kmk_Makefile.kmk
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/kmk/Makefile.kmk.orig	2009-05-22 11:10:08.000000000 +0200
-+++ src/kmk/Makefile.kmk	2009-05-22 11:10:01.000000000 +0200
-@@ -219,6 +219,7 @@
- #kmk_DEFS.solaris += HAVE_MALLINFO
- 
- kmk_LIBS.freebsd.amd64 = pthread
-+kmk_LIBS.freebsd.sparc64 = pthread
- kmk_DEFS.freebsd.x86 = CONFIG_WITHOUT_THREADS
- 
- #
diff --git a/devel/kBuild/pkg-plist b/devel/kBuild/pkg-plist
index a2e2fb0a255b..266b16bacb98 100644
--- a/devel/kBuild/pkg-plist
+++ b/devel/kBuild/pkg-plist
@@ -25,8 +25,17 @@ bin/kDepPre
 bin/kObjCache
 bin/kmk_ash
 %%DATADIR%%/footer.kmk
+%%DATADIR%%/footer-inherit-uses-tools.kmk
+%%DATADIR%%/footer-misc.kmk
+%%DATADIR%%/footer-pass1.kmk
+%%DATADIR%%/footer-pass2-compiling-targets.kmk
+%%DATADIR%%/footer-pass2-fetches.kmk
+%%DATADIR%%/footer-pass2-installs.kmk
+%%DATADIR%%/footer-pass2-patches.kmk
+%%DATADIR%%/footer-passes.kmk
 %%DATADIR%%/header.kmk
 %%DATADIR%%/msgstyles/brief.kmk
+%%DATADIR%%/msgstyles/brief2.kmk
 %%DATADIR%%/rules.kmk
 %%DATADIR%%/sdks/DXSDK.kmk
 %%DATADIR%%/sdks/DXSDKAMD64.kmk
@@ -38,6 +47,7 @@ bin/kmk_ash
 %%DATADIR%%/sdks/MACOSX105INCS.kmk
 %%DATADIR%%/sdks/NT4DDK.kmk
 %%DATADIR%%/sdks/OS2DDKBASE32.kmk
+%%DATADIR%%/sdks/ReorderCompilerIncs.kmk
 %%DATADIR%%/sdks/W2K3DDK.kmk
 %%DATADIR%%/sdks/W2K3DDKAMD64.kmk
 %%DATADIR%%/sdks/W2K3DDKX86.kmk
@@ -47,9 +57,17 @@ bin/kmk_ash
 %%DATADIR%%/sdks/WIN64SDK.kmk
 %%DATADIR%%/sdks/WINDDK.kmk
 %%DATADIR%%/sdks/WINDDKW2K.kmk
+%%DATADIR%%/sdks/WINDDK71WNET.kmk
+%%DATADIR%%/sdks/WINDDK71WLH.kmk
+%%DATADIR%%/sdks/WINPSDK71INCS.kmk
+%%DATADIR%%/sdks/WINDDK71WXP.kmk
+%%DATADIR%%/sdks/WINPSDK71.kmk
+%%DATADIR%%/sdks/WINDDK71.kmk
 %%DATADIR%%/sdks/WINDDKWLH.kmk
 %%DATADIR%%/sdks/WINDDKWNET.kmk
 %%DATADIR%%/sdks/WINDDKWXP.kmk
+%%DATADIR%%/sdks/WINDDK80.kmk
+%%DATADIR%%/sdks/WINDDK80W8.kmk
 %%DATADIR%%/sdks/WINPSDK.kmk
 %%DATADIR%%/sdks/WINPSDKINCS.kmk
 %%DATADIR%%/subfooter.kmk
@@ -64,6 +82,7 @@ bin/kmk_ash
 %%DATADIR%%/tools/GCC3OMF.kmk
 %%DATADIR%%/tools/GCC3PLAIN.kmk
 %%DATADIR%%/tools/GCC4MACHO.kmk
+%%DATADIR%%/tools/GCC42MACHO.kmk
 %%DATADIR%%/tools/GCC64.kmk
 %%DATADIR%%/tools/GXX.kmk
 %%DATADIR%%/tools/GXX3.kmk
@@ -71,7 +90,11 @@ bin/kmk_ash
 %%DATADIR%%/tools/GXX3OMF.kmk
 %%DATADIR%%/tools/GXX3PLAIN.kmk
 %%DATADIR%%/tools/GXX4MACHO.kmk
+%%DATADIR%%/tools/GXX42MACHO.kmk
 %%DATADIR%%/tools/GXX64.kmk
+%%DATADIR%%/tools/JWASM.kmk
+%%DATADIR%%/tools/LLVMGCC42MACHO.kmk
+%%DATADIR%%/tools/LLVMGXX42MACHO.kmk
 %%DATADIR%%/tools/YACC.kmk
 %%DATADIR%%/tools/MASM510.kmk
 %%DATADIR%%/tools/MASM600.kmk
@@ -79,11 +102,13 @@ bin/kmk_ash
 %%DATADIR%%/tools/MASM6PLUS.kmk
 %%DATADIR%%/tools/MASM710.kmk
 %%DATADIR%%/tools/MINGW32.kmk
+%%DATADIR%%/tools/MINGWW64.kmk
 %%DATADIR%%/tools/MSLINK510.kmk
 %%DATADIR%%/tools/NASM.kmk
 %%DATADIR%%/tools/OPENWATCOM-16.kmk
 %%DATADIR%%/tools/OPENWATCOM-WL.kmk
 %%DATADIR%%/tools/OPENWATCOM.kmk
+%%DATADIR%%/tools/StandardDTrace.kmk
 %%DATADIR%%/tools/TAR.kmk
 %%DATADIR%%/tools/TARBZ2.kmk
 %%DATADIR%%/tools/TARGZ.kmk
@@ -92,6 +117,9 @@ bin/kmk_ash
 %%DATADIR%%/tools/VCC80.kmk
 %%DATADIR%%/tools/VCC80AMD64.kmk
 %%DATADIR%%/tools/VCC80X86.kmk
+%%DATADIR%%/tools/VCC100.kmk
+%%DATADIR%%/tools/VCC100AMD64.kmk
+%%DATADIR%%/tools/VCC100X86.kmk
 %%DATADIR%%/tools/WATCOMC11C-16.kmk
 %%DATADIR%%/tools/WATCOMC11C-WL.kmk
 %%DATADIR%%/tools/WATCOMC11C.kmk
@@ -99,6 +127,7 @@ bin/kmk_ash
 %%DATADIR%%/tools/XGCCAMD64LINUX.kmk
 %%DATADIR%%/tools/YASM.kmk
 %%DATADIR%%/tools/ZIP.kmk
+%%DATADIR%%/units/dtrace.kmk
 %%DATADIR%%/units/lex.kmk
 %%DATADIR%%/units/qt3.kmk
 %%DATADIR%%/units/qt4.kmk