- Update to 0.1.4

- UNBREAK
- Beautify Makefile and make portlint happy

Approved by:	maintainer timeout

6 files changed, 66 insertions, 28 deletions

diff --git a/devel/kBuild-devel/Makefile b/devel/kBuild-devel/Makefile
index 9d758f8a4df5..237e18db959d 100644
--- a/devel/kBuild-devel/Makefile
+++ b/devel/kBuild-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kBuild
-PORTVERSION=	0.1.3
+PORTVERSION=	0.1.4
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.netlabs.org/pub/kbuild/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
@@ -14,26 +14,38 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	que_deseja@hotmail.com
 COMMENT=	Makefile framework
 
-# XXX: This case is not handled by USE_AUTOTOOLS as kmk bootstrap involves
-# running these directly.
-BUILD_DEPENDS=	automake-1.9:${PORTSDIR}/devel/automake19 \
-		autoconf-2.62:${PORTSDIR}/devel/autoconf262
-
-BROKEN=		changes permissions on already installed binaries
+USE_AUTOTOOLS=	automake:19 autoconf:262
+USE_GMAKE=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-USE_GMAKE=	yes
+KBUILD_ARCH=	${MACHINE_ARCH:S/i386/x86/}
+KBUILD_ENV=	ACLOCAL=${ACLOCAL} \
+		AUTOMAKE=${AUTOMAKE} \
+		AUTORECONF=${AUTORECONF}
+KBUILD_BINS=	kmk_sed kmk kmk_append kmk_cat kmk_chmod kmk_cp kmk_cmp \
+		kmk_echo kmk_expr kmk_md5sum kmk_mkdir kmk_mv kmk_install \
+		kmk_ln kmk_printf kmk_redirect kmk_rm kmk_rmdir kmk_test \
+		kDepIDB kmk_gmake kmk_ash kDepPre kObjCache
+
+post-patch:
+	${REINPLACE_CMD} -e '161d' ${WRKSRC}/bootstrap.gmk
+
+# Override autotools
+run-autotools:
+do-configure:
 
 do-build:
-	cd ${WRKSRC} && ${SETENV} ACLOCAL=aclocal-1.9 AUTOMAKE=automake-1.9 AUTORECONF=autoreconf-2.62 ./kBuild/env.sh --full ${GMAKE} -f bootstrap.gmk
+	cd ${WRKSRC} && ${SETENV} ${KBUILD_ENV} ./kBuild/env.sh --full ${GMAKE} -f bootstrap.gmk
 	cd ${WRKSRC} && ${RM} -rf out
 	cd ${WRKSRC} && ./kBuild/env.sh kmk
 	cd ${WRKSRC} && ./kBuild/env.sh kmk NIX_INSTALL_DIR=${PREFIX} BUILD_TYPE=release -C ${WRKSRC}
 
 do-install:
-	(cd ${WRKSRC}/out/freebsd.${MACHINE_ARCH}/release${PREFIX}/bin && ${COPYTREE_BIN} \* ${PREFIX}/bin)
+.for bin in ${KBUILD_BINS}
+	${INSTALL_PROGRAM} ${WRKSRC}/out/freebsd.${KBUILD_ARCH}/release${PREFIX}/bin/${bin} ${PREFIX}/bin
+.endfor
 	${MKDIR) ${DATADIR}
-	(cd ${WRKSRC}/out/freebsd.${MACHINE_ARCH}/release${PREFIX}/share/kBuild && ${COPYTREE_SHARE} \* ${DATADIR})
+	(cd ${WRKSRC}/out/freebsd.${KBUILD_ARCH}/release${PREFIX}/share/kBuild && ${COPYTREE_SHARE} \* ${DATADIR})
 
 .include <bsd.port.mk>
diff --git a/devel/kBuild-devel/distinfo b/devel/kBuild-devel/distinfo
index 10764616ff88..122ae9cc85e9 100644
--- a/devel/kBuild-devel/distinfo
+++ b/devel/kBuild-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (kBuild-0.1.3-src.tar.gz) = eef91473ea68e6ea189999ed64cd80a5
-SHA256 (kBuild-0.1.3-src.tar.gz) = 79d085b395b87fdf06d24bbf4e03801b5c35d61c7f41d5b0df6fa0b275b6b1b1
-SIZE (kBuild-0.1.3-src.tar.gz) = 10070233
+MD5 (kBuild-0.1.4-src.tar.gz) = 4d35dbe6177c934838a893712759a89b
+SHA256 (kBuild-0.1.4-src.tar.gz) = fe17d9e7603206c4ee4f93ab328f3fd79863928c933bbc42d2f5cf3c789c4c68
+SIZE (kBuild-0.1.4-src.tar.gz) = 2293916
diff --git a/devel/kBuild-devel/pkg-plist b/devel/kBuild-devel/pkg-plist
index f072904480f9..ab799e409480 100644
--- a/devel/kBuild-devel/pkg-plist
+++ b/devel/kBuild-devel/pkg-plist
@@ -1,9 +1,11 @@
 bin/kmk
 bin/kmk_append
 bin/kmk_cat
+bin/kmk_chmod
 bin/kmk_cp
 bin/kmk_cmp
 bin/kmk_echo
+bin/kmk_expr
 bin/kmk_md5sum
 bin/kmk_mkdir
 bin/kmk_mv
@@ -71,6 +73,11 @@ bin/kmk_ash
 %%DATADIR%%/sdks/WIN32SDK.kmk
 %%DATADIR%%/sdks/WIN32SDK2002.kmk
 %%DATADIR%%/sdks/WIN64SDK.kmk
+%%DATADIR%%/sdks/WINDDK.kmk
+%%DATADIR%%/sdks/WINDDKW2K.kmk
+%%DATADIR%%/sdks/WINDDKWLH.kmk
+%%DATADIR%%/sdks/WINDDKWNET.kmk
+%%DATADIR%%/sdks/WINDDKWXP.kmk
 %%DATADIR%%/sdks/WINPSDK.kmk
 %%DATADIR%%/sdks/WINPSDKINCS.kmk
 %%DATADIR%%/msgstyles/brief.kmk
diff --git a/devel/kBuild/Makefile b/devel/kBuild/Makefile
index 9d758f8a4df5..237e18db959d 100644
--- a/devel/kBuild/Makefile
+++ b/devel/kBuild/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kBuild
-PORTVERSION=	0.1.3
+PORTVERSION=	0.1.4
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.netlabs.org/pub/kbuild/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
@@ -14,26 +14,38 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	que_deseja@hotmail.com
 COMMENT=	Makefile framework
 
-# XXX: This case is not handled by USE_AUTOTOOLS as kmk bootstrap involves
-# running these directly.
-BUILD_DEPENDS=	automake-1.9:${PORTSDIR}/devel/automake19 \
-		autoconf-2.62:${PORTSDIR}/devel/autoconf262
-
-BROKEN=		changes permissions on already installed binaries
+USE_AUTOTOOLS=	automake:19 autoconf:262
+USE_GMAKE=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-USE_GMAKE=	yes
+KBUILD_ARCH=	${MACHINE_ARCH:S/i386/x86/}
+KBUILD_ENV=	ACLOCAL=${ACLOCAL} \
+		AUTOMAKE=${AUTOMAKE} \
+		AUTORECONF=${AUTORECONF}
+KBUILD_BINS=	kmk_sed kmk kmk_append kmk_cat kmk_chmod kmk_cp kmk_cmp \
+		kmk_echo kmk_expr kmk_md5sum kmk_mkdir kmk_mv kmk_install \
+		kmk_ln kmk_printf kmk_redirect kmk_rm kmk_rmdir kmk_test \
+		kDepIDB kmk_gmake kmk_ash kDepPre kObjCache
+
+post-patch:
+	${REINPLACE_CMD} -e '161d' ${WRKSRC}/bootstrap.gmk
+
+# Override autotools
+run-autotools:
+do-configure:
 
 do-build:
-	cd ${WRKSRC} && ${SETENV} ACLOCAL=aclocal-1.9 AUTOMAKE=automake-1.9 AUTORECONF=autoreconf-2.62 ./kBuild/env.sh --full ${GMAKE} -f bootstrap.gmk
+	cd ${WRKSRC} && ${SETENV} ${KBUILD_ENV} ./kBuild/env.sh --full ${GMAKE} -f bootstrap.gmk
 	cd ${WRKSRC} && ${RM} -rf out
 	cd ${WRKSRC} && ./kBuild/env.sh kmk
 	cd ${WRKSRC} && ./kBuild/env.sh kmk NIX_INSTALL_DIR=${PREFIX} BUILD_TYPE=release -C ${WRKSRC}
 
 do-install:
-	(cd ${WRKSRC}/out/freebsd.${MACHINE_ARCH}/release${PREFIX}/bin && ${COPYTREE_BIN} \* ${PREFIX}/bin)
+.for bin in ${KBUILD_BINS}
+	${INSTALL_PROGRAM} ${WRKSRC}/out/freebsd.${KBUILD_ARCH}/release${PREFIX}/bin/${bin} ${PREFIX}/bin
+.endfor
 	${MKDIR) ${DATADIR}
-	(cd ${WRKSRC}/out/freebsd.${MACHINE_ARCH}/release${PREFIX}/share/kBuild && ${COPYTREE_SHARE} \* ${DATADIR})
+	(cd ${WRKSRC}/out/freebsd.${KBUILD_ARCH}/release${PREFIX}/share/kBuild && ${COPYTREE_SHARE} \* ${DATADIR})
 
 .include <bsd.port.mk>
diff --git a/devel/kBuild/distinfo b/devel/kBuild/distinfo
index 10764616ff88..122ae9cc85e9 100644
--- a/devel/kBuild/distinfo
+++ b/devel/kBuild/distinfo
@@ -1,3 +1,3 @@
-MD5 (kBuild-0.1.3-src.tar.gz) = eef91473ea68e6ea189999ed64cd80a5
-SHA256 (kBuild-0.1.3-src.tar.gz) = 79d085b395b87fdf06d24bbf4e03801b5c35d61c7f41d5b0df6fa0b275b6b1b1
-SIZE (kBuild-0.1.3-src.tar.gz) = 10070233
+MD5 (kBuild-0.1.4-src.tar.gz) = 4d35dbe6177c934838a893712759a89b
+SHA256 (kBuild-0.1.4-src.tar.gz) = fe17d9e7603206c4ee4f93ab328f3fd79863928c933bbc42d2f5cf3c789c4c68
+SIZE (kBuild-0.1.4-src.tar.gz) = 2293916
diff --git a/devel/kBuild/pkg-plist b/devel/kBuild/pkg-plist
index f072904480f9..ab799e409480 100644
--- a/devel/kBuild/pkg-plist
+++ b/devel/kBuild/pkg-plist
@@ -1,9 +1,11 @@
 bin/kmk
 bin/kmk_append
 bin/kmk_cat
+bin/kmk_chmod
 bin/kmk_cp
 bin/kmk_cmp
 bin/kmk_echo
+bin/kmk_expr
 bin/kmk_md5sum
 bin/kmk_mkdir
 bin/kmk_mv
@@ -71,6 +73,11 @@ bin/kmk_ash
 %%DATADIR%%/sdks/WIN32SDK.kmk
 %%DATADIR%%/sdks/WIN32SDK2002.kmk
 %%DATADIR%%/sdks/WIN64SDK.kmk
+%%DATADIR%%/sdks/WINDDK.kmk
+%%DATADIR%%/sdks/WINDDKW2K.kmk
+%%DATADIR%%/sdks/WINDDKWLH.kmk
+%%DATADIR%%/sdks/WINDDKWNET.kmk
+%%DATADIR%%/sdks/WINDDKWXP.kmk
 %%DATADIR%%/sdks/WINPSDK.kmk
 %%DATADIR%%/sdks/WINPSDKINCS.kmk
 %%DATADIR%%/msgstyles/brief.kmk