[Midnightbsd-cvs] mports [17732] trunk/devel/kBuild: iuupdate patch level

[laffer1 at midnightbsd.org]

Revision: 17732
          http://svnweb.midnightbsd.org/mports/?rev=17732
Author:   laffer1
Date:     2014-10-12 16:35:28 -0400 (Sun, 12 Oct 2014)
Log Message:
-----------
iuupdate patch level

Modified Paths:
--------------
    trunk/devel/kBuild/Makefile
    trunk/devel/kBuild/distinfo

Added Paths:
-----------
    trunk/devel/kBuild/files/patch-src__sed__lib__regex_internal.c

Modified: trunk/devel/kBuild/Makefile
===================================================================
--- trunk/devel/kBuild/Makefile	2014-10-12 20:34:47 UTC (rev 17731)
+++ trunk/devel/kBuild/Makefile	2014-10-12 20:35:28 UTC (rev 17732)
@@ -6,7 +6,7 @@
 MASTER_SITES=	ftp://ftp.netlabs.org/pub/kbuild/ \
 		http://tmp.chruetertee.ch/ \
 		http://disasterarea.chruetertee.ch/
-DISTNAME=	${PORTNAME}-${DISTVERSION}r2662-src
+DISTNAME=	${PORTNAME}-${DISTVERSION}r2695-src
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Makefile framework
@@ -14,8 +14,7 @@
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
 
-USE_AUTOTOOLS=	automake autoconf
-USE_GMAKE=	yes
+USES=		autoreconf:build gmake makeinfo
 
 CONFLICTS_INSTALL=	kBuild-devel-[0-9]*
 
@@ -22,11 +21,13 @@
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 KBUILD_VERSION=	0.1.9998
-KBUILD_ARCH=	${MACHINE_ARCH:S/i386/x86/}
+KBUILD_ARCH=	${MACHINE_ARCH:S/i386/x86/:S/x86_64/amd64/}
 KBUILD_ENV=	ACLOCAL=${ACLOCAL} \
 		AUTOMAKE=${AUTOMAKE} \
 		AUTORECONF=${AUTORECONF} \
 		AUTOPOINT=true
+USE_GCC=	any
+KBUILD_TARGET=	${OPSYS:tl}
 
 KBUILD_BINS=	kDepIDB kDepPre kObjCache kmk kmk_append kmk_ash kmk_cat \
 		kmk_chmod kmk_cmp kmk_cp kmk_echo kmk_expr kmk_gmake \
@@ -35,18 +36,27 @@
 PORTDOCS=	QuickReference-kmk.html \
 		QuickReference-kmk.txt
 
+# bmake doesn't know about unsetenv=true
+.if defined(.PARSEDIR)
+ENV=
+.export ENV
+.else
 .SHELL:		path="/bin/sh" unsetenv=true
+.endif
 
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.mport.options.mk>
+
 post-patch:
 	${REINPLACE_CMD} -e '11269d;11274d' ${WRKSRC}/src/sed/configure
 	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/Config.kmk
+	for f in ${WRKSRC}/kBuild/tools/*.kmk; do \
+		${REINPLACE_CMD} -e 's|gcc|${CC}|g' $$f ; \
+	done
 
-# Override autotools
-run-autotools:
-do-configure:
-
 do-build:
-	cd ${WRKSRC} && ${SETENV} ${KBUILD_ENV} ./kBuild/env.sh --full ${GMAKE} -f bootstrap.gmk
+	cd ${WRKSRC} && ${SETENV} ${KBUILD_ENV} ./kBuild/env.sh --full ${MAKE_CMD} -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}

Modified: trunk/devel/kBuild/distinfo
===================================================================
--- trunk/devel/kBuild/distinfo	2014-10-12 20:34:47 UTC (rev 17731)
+++ trunk/devel/kBuild/distinfo	2014-10-12 20:35:28 UTC (rev 17732)
@@ -1,2 +1,2 @@
-SHA256 (kBuild-0.1.9998r2662-src.tar.gz) = 3cfc5c6c4e065e35bf70ba5db9f7dd806cd5435353b905e890c9360ccdb7c5da
-SIZE (kBuild-0.1.9998r2662-src.tar.gz) = 2685286
+SHA256 (kBuild-0.1.9998r2695-src.tar.gz) = 8e18fe28647e84d7103ea7f67672229018f7fdf8d6eaae3662101c13c2d331de
+SIZE (kBuild-0.1.9998r2695-src.tar.gz) = 2698165

Added: trunk/devel/kBuild/files/patch-src__sed__lib__regex_internal.c
===================================================================
--- trunk/devel/kBuild/files/patch-src__sed__lib__regex_internal.c	                        (rev 0)
+++ trunk/devel/kBuild/files/patch-src__sed__lib__regex_internal.c	2014-10-12 20:35:28 UTC (rev 17732)
@@ -0,0 +1,11 @@
+--- src/sed/lib/regex_internal.c.orig	2012-07-17 18:30:18.000000000 -0400
++++ src/sed/lib/regex_internal.c	2014-03-13 12:52:57.000000000 -0400
+@@ -781,7 +781,7 @@
+ }
+ 
+ static unsigned char
+-internal_function __attribute ((pure))
++internal_function
+ re_string_fetch_byte_case (re_string_t *pstr)
+ {
+   if (BE (!pstr->mbs_allocated, 1))


Property changes on: trunk/devel/kBuild/files/patch-src__sed__lib__regex_internal.c
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property