- Update to 1.0.5

- Take maintainship

3 files changed, 73 insertions, 36 deletions

diff --git a/devel/kBuild-devel/Makefile b/devel/kBuild-devel/Makefile
index 237e18db959d..604fb9bf4f73 100644
--- a/devel/kBuild-devel/Makefile
+++ b/devel/kBuild-devel/Makefile
@@ -6,14 +6,16 @@
 #
 
 PORTNAME=	kBuild
-PORTVERSION=	0.1.4
+PORTVERSION=	0.1.5
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.netlabs.org/pub/kbuild/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
-MAINTAINER=	que_deseja@hotmail.com
+MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	Makefile framework
 
+BUILD_DEPENDS=	gsed:${PORTSDIR}/textproc/gsed
+
 USE_AUTOTOOLS=	automake:19 autoconf:262
 USE_GMAKE=	yes
 
@@ -22,14 +24,19 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 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
+		AUTORECONF=${AUTORECONF} \
+		AUTOPOINT=true
+
+KBUILD_BINS=	kDepIDB kDepPre kObjCache kmk kmk_append kmk_ash kmk_cat \
+		kmk_chmod kmk_cmp kmk_cp kmk_echo kmk_expr kmk_gmake \
+		kmk_install kmk_ln kmk_md5sum kmk_mkdir kmk_mv kmk_printf \
+		kmk_redirect kmk_rm kmk_rmdir kmk_sed kmk_sleep kmk_test kmk_time
+PORTDOCS=	QuickReference-kmk.html \
+		QuickReference-kmk.txt
 
 post-patch:
-	${REINPLACE_CMD} -e '161d' ${WRKSRC}/bootstrap.gmk
+	${REINPLACE_CMD} -e '11269d;11274d' ${WRKSRC}/src/sed/configure
+	${REINPLACE_CMD} -e '11268,11273s|sed|gsed|' ${WRKSRC}/src/sed/configure
 
 # Override autotools
 run-autotools:
@@ -47,5 +54,11 @@ do-install:
 .endfor
 	${MKDIR) ${DATADIR}
 	(cd ${WRKSRC}/out/freebsd.${KBUILD_ARCH}/release${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/${PKGNAME}/${doc} ${DOCSDIR}
+.endfor
+.endif
 
 .include <bsd.port.mk>
diff --git a/devel/kBuild-devel/distinfo b/devel/kBuild-devel/distinfo
index 122ae9cc85e9..029387cbb223 100644
--- a/devel/kBuild-devel/distinfo
+++ b/devel/kBuild-devel/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (kBuild-0.1.5-src.tar.gz) = df7e0905232e67728643f97d63cbf3f3
+SHA256 (kBuild-0.1.5-src.tar.gz) = db3b672da8f579949e4d8c41d023d6d1ca1ab5626a2e552970ba75e7a3af84b5
+SIZE (kBuild-0.1.5-src.tar.gz) = 2431964
diff --git a/devel/kBuild-devel/pkg-plist b/devel/kBuild-devel/pkg-plist
index ab799e409480..bad5f1090fd7 100644
--- a/devel/kBuild-devel/pkg-plist
+++ b/devel/kBuild-devel/pkg-plist
@@ -15,7 +15,9 @@ bin/kmk_printf
 bin/kmk_redirect
 bin/kmk_rm
 bin/kmk_rmdir
+bin/kmk_sleep
 bin/kmk_test
+bin/kmk_time
 bin/kDepIDB
 bin/kmk_gmake
 bin/kmk_sed
@@ -24,11 +26,37 @@ bin/kObjCache
 bin/kmk_ash
 %%DATADIR%%/footer.kmk
 %%DATADIR%%/header.kmk
+%%DATADIR%%/msgstyles/brief.kmk
 %%DATADIR%%/rules.kmk
+%%DATADIR%%/sdks/DXSDK.kmk
+%%DATADIR%%/sdks/DXSDKAMD64.kmk
+%%DATADIR%%/sdks/DXSDKX86.kmk
+%%DATADIR%%/sdks/LIBSDL.kmk
+%%DATADIR%%/sdks/MACOSX104.kmk
+%%DATADIR%%/sdks/MACOSX104INCS.kmk
+%%DATADIR%%/sdks/MACOSX105.kmk
+%%DATADIR%%/sdks/MACOSX105INCS.kmk
+%%DATADIR%%/sdks/NT4DDK.kmk
+%%DATADIR%%/sdks/OS2DDKBASE32.kmk
+%%DATADIR%%/sdks/W2K3DDK.kmk
+%%DATADIR%%/sdks/W2K3DDKAMD64.kmk
+%%DATADIR%%/sdks/W2K3DDKX86.kmk
+%%DATADIR%%/sdks/W32API.kmk
+%%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%%/subfooter.kmk
 %%DATADIR%%/subheader.kmk
-%%DATADIR%%/up.kmk
+%%DATADIR%%/templates/DUMMY.kmk
 %%DATADIR%%/tools/ALP.kmk
+%%DATADIR%%/tools/BISON.kmk
 %%DATADIR%%/tools/FLEX.kmk
 %%DATADIR%%/tools/GCC.kmk
 %%DATADIR%%/tools/GCC3.kmk
@@ -44,8 +72,18 @@ bin/kmk_ash
 %%DATADIR%%/tools/GXX3PLAIN.kmk
 %%DATADIR%%/tools/GXX4MACHO.kmk
 %%DATADIR%%/tools/GXX64.kmk
+%%DATADIR%%/tools/YACC.kmk
+%%DATADIR%%/tools/MASM510.kmk
+%%DATADIR%%/tools/MASM600.kmk
+%%DATADIR%%/tools/MASM610.kmk
+%%DATADIR%%/tools/MASM6PLUS.kmk
+%%DATADIR%%/tools/MASM710.kmk
 %%DATADIR%%/tools/MINGW32.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/TAR.kmk
 %%DATADIR%%/tools/TARGZ.kmk
 %%DATADIR%%/tools/VAC308.kmk
@@ -53,35 +91,21 @@ bin/kmk_ash
 %%DATADIR%%/tools/VCC80.kmk
 %%DATADIR%%/tools/VCC80AMD64.kmk
 %%DATADIR%%/tools/VCC80X86.kmk
+%%DATADIR%%/tools/WATCOMC11C-16.kmk
+%%DATADIR%%/tools/WATCOMC11C-WL.kmk
+%%DATADIR%%/tools/WATCOMC11C.kmk
 %%DATADIR%%/tools/WGET.kmk
 %%DATADIR%%/tools/XGCCAMD64LINUX.kmk
 %%DATADIR%%/tools/YASM.kmk
 %%DATADIR%%/tools/ZIP.kmk
-%%DATADIR%%/sdks/DXSDK.kmk
-%%DATADIR%%/sdks/DXSDKAMD64.kmk
-%%DATADIR%%/sdks/DXSDKX86.kmk
-%%DATADIR%%/sdks/LIBSDL.kmk
-%%DATADIR%%/sdks/MACOSX104.kmk
-%%DATADIR%%/sdks/MACOSX104INCS.kmk
-%%DATADIR%%/sdks/MACOSX105.kmk
-%%DATADIR%%/sdks/MACOSX105INCS.kmk
-%%DATADIR%%/sdks/NT4DDK.kmk
-%%DATADIR%%/sdks/W2K3DDK.kmk
-%%DATADIR%%/sdks/W2K3DDKAMD64.kmk
-%%DATADIR%%/sdks/W2K3DDKX86.kmk
-%%DATADIR%%/sdks/W32API.kmk
-%%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
+%%DATADIR%%/units/lex.kmk
+%%DATADIR%%/units/qt3.kmk
+%%DATADIR%%/units/qt4.kmk
+%%DATADIR%%/units/yacc.kmk
+%%DATADIR%%/up.kmk
 @dirrm %%DATADIR%%/tools
 @dirrm %%DATADIR%%/sdks
+@dirrm %%DATADIR%%/units
+@dirrm %%DATADIR%%/templates
 @dirrm %%DATADIR%%/msgstyles
 @dirrm %%DATADIR%%