Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/kBuild/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- Makefile	4 Dec 2010 07:31:10 -0000	1.16
+++ Makefile	5 Aug 2011 12:36:36 -0000
@@ -6,21 +6,23 @@
 #
 
 PORTNAME=	kBuild
-DISTVERSION=	${KBUILD_VERSION}-p2
-PORTREVISION=	1
+DISTVERSION=	${KBUILD_VERSION}
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.netlabs.org/pub/kbuild/
+MASTER_SITES=	ftp://ftp.netlabs.org/pub/kbuild/ \
+		http://home.bluelife.at/ports/distfiles/
 DISTNAME=	${PORTNAME}-${DISTVERSION}-src
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	Makefile framework
 
+BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
+
 USE_AUTOTOOLS=	automake autoconf
 USE_GMAKE=	yes
 
 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} \
@@ -36,6 +38,7 @@
 
 post-patch:
 	${REINPLACE_CMD} -e '11269d;11274d' ${WRKSRC}/src/sed/configure
+	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/Config.kmk
 
 # Override autotools
 run-autotools:
@@ -49,14 +52,14 @@
 
 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
 
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/devel/kBuild/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo	3 Jul 2011 14:55:59 -0000	1.6
+++ distinfo	5 Aug 2011 11:08:36 -0000
@@ -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.9998-src.tar.gz) = b90bfb63c1e2a8c94fcd052b47788451423936e097d9494b900e436f5b6bb955
+SIZE (kBuild-0.1.9998-src.tar.gz) = 14544701
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/devel/kBuild/pkg-plist,v
retrieving revision 1.4
diff -u -r1.4 pkg-plist
--- pkg-plist	12 Apr 2009 16:44:24 -0000	1.4
+++ pkg-plist	5 Aug 2011 11:07:39 -0000
@@ -25,8 +25,17 @@
 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
@@ -92,6 +101,9 @@
 %%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
Index: files/patch-Config.mk
===================================================================
RCS file: files/patch-Config.mk
diff -N files/patch-Config.mk
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-Config.mk	5 Aug 2011 12:27:15 -0000
@@ -0,0 +1,12 @@
+--- Config.kmk.orig	2011-08-05 14:26:26.000000000 +0200
++++ Config.kmk	2011-08-05 14:27:04.000000000 +0200
+@@ -105,6 +105,9 @@
+ if1of ($(KBUILD_TARGET), openbsd)
+  TOOL_FLEX_LEX = gflex
+ endif
++if1of ($(KBUILD_TARGET), freebsd)
++ TOOL_FLEX_LEX = %%LOCALBASE%%/bin/flex
++endif
+ 
+ #
+ # The OS and Architecture indicators.
Index: files/patch-src-kmk_Makefile.kmk
===================================================================
RCS file: /home/pcvs/ports/devel/kBuild/files/patch-src-kmk_Makefile.kmk,v
retrieving revision 1.1
diff -u -r1.1 patch-src-kmk_Makefile.kmk
--- files/patch-src-kmk_Makefile.kmk	22 May 2009 12:18:45 -0000	1.1
+++ files/patch-src-kmk_Makefile.kmk	5 Aug 2011 11:07:39 -0000
@@ -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
- 
- #