- Add CONFLICTS_INSTALL for kBuild-devel

- Fix possible build breakage in tinderbox
- Bump PORTREVISION

Submitted by:		gahr

devel/kBuild/Makefile

@@ -7,7 +7,7 @@
 
 PORTNAME=	kBuild
 DISTVERSION=	${KBUILD_VERSION}-p2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.netlabs.org/pub/kbuild/
 DISTNAME=	${PORTNAME}-${DISTVERSION}-src
@@ -15,9 +15,13 @@ 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-devel-[0-9]*
+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 KBUILD_VERSION=	0.1.5
@@ -36,6 +40,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:

devel/kBuild/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.