5 files changed, 39 insertions, 19 deletions

diff --git a/devel/kBuild-devel/Makefile b/devel/kBuild-devel/Makefile
index 88ac7778ee58..22f340c2e73e 100644
--- a/devel/kBuild-devel/Makefile
+++ b/devel/kBuild-devel/Makefile
@@ -6,21 +6,26 @@
 #
 
 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/
+PKGNAMESUFFIX=  -devel
 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
 
+CONFLICTS_INSTALL=	kBuild-[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} \
@@ -36,6 +41,7 @@ PORTDOCS=	QuickReference-kmk.html \
 
 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 +55,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-devel/distinfo b/devel/kBuild-devel/distinfo
index 03e99777fa67..97df4ad5dfcd 100644
--- a/devel/kBuild-devel/distinfo
+++ b/devel/kBuild-devel/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.9998-src.tar.gz) = 83280bf47078eff9623892ca24f8c9eded4c375cd491ec5aec8de6ffbf6e33c9
+SIZE (kBuild-0.1.9998-src.tar.gz) = 2604001
diff --git a/devel/kBuild-devel/files/patch-Config.mk b/devel/kBuild-devel/files/patch-Config.mk
new file mode 100644
index 000000000000..140ca289171b
--- /dev/null
+++ b/devel/kBuild-devel/files/patch-Config.mk
@@ -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.
diff --git a/devel/kBuild-devel/files/patch-src-kmk_Makefile.kmk b/devel/kBuild-devel/files/patch-src-kmk_Makefile.kmk
deleted file mode 100644
index b4288f33b8c3..000000000000
--- a/devel/kBuild-devel/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-devel/pkg-plist b/devel/kBuild-devel/pkg-plist
index a2e2fb0a255b..715e7f7027e6 100644
--- a/devel/kBuild-devel/pkg-plist
+++ b/devel/kBuild-devel/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
@@ -92,6 +101,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