Index: head/devel/kBuild/Makefile =================================================================== --- head/devel/kBuild/Makefile (revision 446177) +++ head/devel/kBuild/Makefile (revision 446178) @@ -1,76 +1,74 @@ # Created by: Bruce Simpson # $FreeBSD$ PORTNAME= kBuild DISTVERSION= ${KBUILD_VERSION} -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= devel -MASTER_SITES= ftp://ftp.netlabs.org/pub/kbuild/ \ - http://tmp.chruetertee.ch/ \ - http://disasterarea.chruetertee.ch/ -DISTNAME= ${PORTNAME}-${DISTVERSION}r2695-src +MASTER_SITES= LOCAL/jkim +DISTNAME= ${PORTNAME}-${DISTVERSION}r3050-src MAINTAINER= vbox@FreeBSD.org COMMENT= Makefile framework -BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex +LICENSE= BSD3CLAUSE GPLv3+ +LICENSE_COMB= multi BROKEN_powerpc64= does not build: fatal error: xmmintrin.h: No such file or directory NOT_FOR_ARCHS= aarch64 armv6 mips mips64 NOT_FOR_ARCHS_REASON= ./kBuild/env.sh: unknown cpu/arch USE_GCC= any -USES= autoreconf:build gmake makeinfo +USES= autoreconf:build gmake makeinfo tar:xz CONFLICTS_INSTALL= kBuild-devel-[0-9]* WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} KBUILD_VERSION= 0.1.9998 KBUILD_ARCH= ${MACHINE_ARCH:S/i386/x86/:S/x86_64/amd64/:S/powerpc/ppc32/:S/armv6/arm/} KBUILD_ENV= ACLOCAL=${ACLOCAL} \ AUTOMAKE=${AUTOMAKE} \ AUTORECONF=${AUTORECONF} \ AUTOPOINT=true \ CFLAGS="-D_WITH_GETLINE -D_WITH_DPRINTF" 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 \ +KBUILD_BINS= kDepIDB kDepObj 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 + kmk_redirect kmk_rm kmk_rmdir kmk_sed kmk_sleep kmk_test \ + kmk_time PORTDOCS= QuickReference-kmk.html \ QuickReference-kmk.txt ENV= .export ENV OPTIONS_DEFINE= DOCS 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 do-build: cd ${WRKSRC} && ${SETENV} ${KBUILD_ENV} ./kBuild/env.sh --full ${MAKE_CMD} -f bootstrap.gmk cd ${WRKSRC} && ${RM} -r out cd ${WRKSRC} && ./kBuild/env.sh kmk cd ${WRKSRC} && ./kBuild/env.sh kmk NIX_INSTALL_DIR=${PREFIX} BUILD_TYPE=release -C ${WRKSRC} do-install: .for bin in ${KBUILD_BINS} ${INSTALL_PROGRAM} ${WRKSRC}/out/${KBUILD_TARGET}.${KBUILD_ARCH}/release/stage${PREFIX}/bin/${bin} ${STAGEDIR}${PREFIX}/bin .endfor ${MKDIR} ${STAGEDIR}${DATADIR} (cd ${WRKSRC}/out/${KBUILD_TARGET}.${KBUILD_ARCH}/release/stage${PREFIX}/share/kBuild && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}) do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} .for doc in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/out/${KBUILD_TARGET}.${KBUILD_ARCH}/release/stage${PREFIX}/share/doc/${PORTNAME}-${KBUILD_VERSION}/${doc} ${STAGEDIR}${DOCSDIR} .endfor .include Index: head/devel/kBuild/distinfo =================================================================== --- head/devel/kBuild/distinfo (revision 446177) +++ head/devel/kBuild/distinfo (revision 446178) @@ -1,2 +1,3 @@ -SHA256 (kBuild-0.1.9998r2695-src.tar.gz) = 8e18fe28647e84d7103ea7f67672229018f7fdf8d6eaae3662101c13c2d331de -SIZE (kBuild-0.1.9998r2695-src.tar.gz) = 2698165 +TIMESTAMP = 1500406596 +SHA256 (kBuild-0.1.9998r3050-src.tar.xz) = e515bb721e0a2a716480ab3604214833dd8adb19f03ed4e5d5f75c6ca30c13ba +SIZE (kBuild-0.1.9998r3050-src.tar.xz) = 2133300 Index: head/devel/kBuild/files/patch-src_ash_output.h =================================================================== --- head/devel/kBuild/files/patch-src_ash_output.h (revision 446177) +++ head/devel/kBuild/files/patch-src_ash_output.h (nonexistent) @@ -1,13 +0,0 @@ ---- src/ash/output.h.orig 2012-07-17 22:30:18 UTC -+++ src/ash/output.h -@@ -65,8 +65,10 @@ void outfmt(struct output *, const char - __attribute__((__format__(__printf__,2,3))); - void out1fmt(const char *, ...) - __attribute__((__format__(__printf__,1,2))); -+#if 0 - void dprintf(const char *, ...) - __attribute__((__format__(__printf__,1,2))); -+#endif - void fmtstr(char *, size_t, const char *, ...) - __attribute__((__format__(__printf__,3,4))); - void doformat(struct output *, const char *, va_list); Property changes on: head/devel/kBuild/files/patch-src_ash_output.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/kBuild/files/patch-src__sed__lib__regex_internal.c =================================================================== --- head/devel/kBuild/files/patch-src__sed__lib__regex_internal.c (revision 446177) +++ head/devel/kBuild/files/patch-src__sed__lib__regex_internal.c (nonexistent) @@ -1,11 +0,0 @@ ---- 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: head/devel/kBuild/files/patch-src__sed__lib__regex_internal.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/kBuild/files/patch-Config.mk =================================================================== --- head/devel/kBuild/files/patch-Config.mk (revision 446177) +++ head/devel/kBuild/files/patch-Config.mk (nonexistent) @@ -1,12 +0,0 @@ ---- 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. Property changes on: head/devel/kBuild/files/patch-Config.mk ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/kBuild/files/patch-src_ash_output.c =================================================================== --- head/devel/kBuild/files/patch-src_ash_output.c (revision 446177) +++ head/devel/kBuild/files/patch-src_ash_output.c (nonexistent) @@ -1,18 +0,0 @@ ---- src/ash/output.c.orig 2012-07-17 22:30:18 UTC -+++ src/ash/output.c -@@ -230,6 +230,7 @@ out1fmt(const char *fmt, ...) - va_end(ap); - } - -+#if 0 - void - dprintf(const char *fmt, ...) - { -@@ -240,6 +241,7 @@ dprintf(const char *fmt, ...) - va_end(ap); - flushout(out2); - } -+#endif - - void - fmtstr(char *outbuf, size_t length, const char *fmt, ...) Property changes on: head/devel/kBuild/files/patch-src_ash_output.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/kBuild/files/patch-src_kmk_kmkbuiltin.h =================================================================== --- head/devel/kBuild/files/patch-src_kmk_kmkbuiltin.h (revision 446177) +++ head/devel/kBuild/files/patch-src_kmk_kmkbuiltin.h (nonexistent) @@ -1,15 +0,0 @@ ---- src/kmk/kmkbuiltin.h.orig 2012-07-17 22:30:15 UTC -+++ src/kmk/kmkbuiltin.h -@@ -50,7 +50,11 @@ extern int kmk_builtin_printf(int argc, - extern int kmk_builtin_rm(int argc, char **argv, char **envp); - extern int kmk_builtin_rmdir(int argc, char **argv, char **envp); - extern int kmk_builtin_sleep(int argc, char **argv, char **envp); --extern int kmk_builtin_test(int argc, char **argv, char **envp, char ***ppapszArgvSpawn); -+extern int kmk_builtin_test(int argc, char **argv, char **envp -+#ifndef kmk_builtin_test -+ , char ***ppapszArgvSpawn -+#endif -+ ); - extern int kmk_builtin_kDepIDB(int argc, char **argv, char **envp); - extern int kmk_builtin_kDepObj(int argc, char **argv, char **envp); - Property changes on: head/devel/kBuild/files/patch-src_kmk_kmkbuiltin.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/kBuild/files/patch-src_kmk_kmkbuiltin_test.c =================================================================== --- head/devel/kBuild/files/patch-src_kmk_kmkbuiltin_test.c (revision 446177) +++ head/devel/kBuild/files/patch-src_kmk_kmkbuiltin_test.c (nonexistent) @@ -1,15 +0,0 @@ ---- src/kmk/kmkbuiltin/test.c.orig 2012-07-17 22:30:16 UTC -+++ src/kmk/kmkbuiltin/test.c -@@ -201,7 +201,11 @@ extern void *xmalloc(unsigned int sz) - } - #endif - --int kmk_builtin_test(int argc, char **argv, char **envp, char ***ppapszArgvSpawn) -+int kmk_builtin_test(int argc, char **argv, char **envp -+#ifndef kmk_builtin_test -+ , char ***ppapszArgvSpawn -+#endif -+ ) - { - int res; - char **argv_spawn; Property changes on: head/devel/kBuild/files/patch-src_kmk_kmkbuiltin_test.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/kBuild/files/patch-src_sed_configure =================================================================== --- head/devel/kBuild/files/patch-src_sed_configure (nonexistent) +++ head/devel/kBuild/files/patch-src_sed_configure (revision 446178) @@ -0,0 +1,15 @@ +--- src/sed/configure.orig 2017-07-18 19:08:56 UTC ++++ src/sed/configure +@@ -11266,12 +11266,10 @@ done + done ;; + gettext-fix ) + sed -e '/^mkinstalldirs *=/a\' \ +- -e "install_sh=$install_sh" \ + -e 's/^mkinstalldirs *=.*/mkinstalldirs=$(MKINSTALLDIRS)/' \ + intl/Makefile > intl/Makefile.tmp + mv intl/Makefile.tmp intl/Makefile + sed -e '/^mkinstalldirs *=/a\' \ +- -e "install_sh=$install_sh" \ + -e 's/^mkinstalldirs *=.*/mkinstalldirs=$(MKINSTALLDIRS)/' \ + po/Makefile > po/Makefile.tmp + mv po/Makefile.tmp po/Makefile ;; Property changes on: head/devel/kBuild/files/patch-src_sed_configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/kBuild/files/patch-src_sed_lib_getline.c =================================================================== --- head/devel/kBuild/files/patch-src_sed_lib_getline.c (revision 446177) +++ head/devel/kBuild/files/patch-src_sed_lib_getline.c (revision 446178) @@ -1,11 +1,11 @@ ---- src/sed/lib/getline.c.orig 2012-07-17 22:30:18 UTC +--- src/sed/lib/getline.c.orig 2017-07-18 19:08:55 UTC +++ src/sed/lib/getline.c -@@ -31,7 +31,7 @@ +@@ -33,7 +33,7 @@ null terminator), or -1 on error or EOF. */ size_t -getline (lineptr, n, stream) +get_line (lineptr, n, stream) char **lineptr; size_t *n; FILE *stream; Index: head/devel/kBuild/pkg-plist =================================================================== --- head/devel/kBuild/pkg-plist (revision 446177) +++ head/devel/kBuild/pkg-plist (revision 446178) @@ -1,135 +1,141 @@ +bin/kDepIDB +bin/kDepObj +bin/kDepPre +bin/kObjCache bin/kmk bin/kmk_append +bin/kmk_ash bin/kmk_cat bin/kmk_chmod -bin/kmk_cp bin/kmk_cmp +bin/kmk_cp bin/kmk_echo bin/kmk_expr +bin/kmk_gmake +bin/kmk_install +bin/kmk_ln bin/kmk_md5sum bin/kmk_mkdir bin/kmk_mv -bin/kmk_install -bin/kmk_ln bin/kmk_printf bin/kmk_redirect bin/kmk_rm bin/kmk_rmdir +bin/kmk_sed bin/kmk_sleep bin/kmk_test bin/kmk_time -bin/kDepIDB -bin/kmk_gmake -bin/kmk_sed -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%%/footer.kmk %%DATADIR%%/header.kmk %%DATADIR%%/msgstyles/brief.kmk %%DATADIR%%/msgstyles/brief2.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/ReorderCompilerIncs.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/WINDDK71WNET.kmk +%%DATADIR%%/sdks/WINDDK71.kmk %%DATADIR%%/sdks/WINDDK71WLH.kmk -%%DATADIR%%/sdks/WINPSDK71INCS.kmk +%%DATADIR%%/sdks/WINDDK71WNET.kmk %%DATADIR%%/sdks/WINDDK71WXP.kmk -%%DATADIR%%/sdks/WINPSDK71.kmk -%%DATADIR%%/sdks/WINDDK71.kmk +%%DATADIR%%/sdks/WINDDK80.kmk +%%DATADIR%%/sdks/WINDDK80W8.kmk +%%DATADIR%%/sdks/WINDDKW2K.kmk %%DATADIR%%/sdks/WINDDKWLH.kmk %%DATADIR%%/sdks/WINDDKWNET.kmk %%DATADIR%%/sdks/WINDDKWXP.kmk -%%DATADIR%%/sdks/WINDDK80.kmk -%%DATADIR%%/sdks/WINDDK80W8.kmk %%DATADIR%%/sdks/WINPSDK.kmk +%%DATADIR%%/sdks/WINPSDK71.kmk +%%DATADIR%%/sdks/WINPSDK71INCS.kmk %%DATADIR%%/sdks/WINPSDKINCS.kmk %%DATADIR%%/subfooter.kmk %%DATADIR%%/subheader.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 %%DATADIR%%/tools/GCC32.kmk %%DATADIR%%/tools/GCC3OMF.kmk %%DATADIR%%/tools/GCC3PLAIN.kmk -%%DATADIR%%/tools/GCC4MACHO.kmk %%DATADIR%%/tools/GCC42MACHO.kmk +%%DATADIR%%/tools/GCC4MACHO.kmk %%DATADIR%%/tools/GCC64.kmk %%DATADIR%%/tools/GXX.kmk %%DATADIR%%/tools/GXX3.kmk %%DATADIR%%/tools/GXX32.kmk %%DATADIR%%/tools/GXX3OMF.kmk %%DATADIR%%/tools/GXX3PLAIN.kmk -%%DATADIR%%/tools/GXX4MACHO.kmk %%DATADIR%%/tools/GXX42MACHO.kmk +%%DATADIR%%/tools/GXX4MACHO.kmk %%DATADIR%%/tools/GXX64.kmk %%DATADIR%%/tools/JWASM.kmk %%DATADIR%%/tools/LLVMGCC42MACHO.kmk %%DATADIR%%/tools/LLVMGXX42MACHO.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/MINGWW64.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/StandardDTrace.kmk %%DATADIR%%/tools/TAR.kmk %%DATADIR%%/tools/TARBZ2.kmk %%DATADIR%%/tools/TARGZ.kmk %%DATADIR%%/tools/VAC308.kmk +%%DATADIR%%/tools/VCC100.kmk +%%DATADIR%%/tools/VCC100AMD64.kmk +%%DATADIR%%/tools/VCC100X86.kmk +%%DATADIR%%/tools/VCC120.kmk +%%DATADIR%%/tools/VCC120AMD64.kmk +%%DATADIR%%/tools/VCC120X86.kmk %%DATADIR%%/tools/VCC70.kmk %%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 %%DATADIR%%/tools/WGET.kmk %%DATADIR%%/tools/XGCCAMD64LINUX.kmk +%%DATADIR%%/tools/YACC.kmk %%DATADIR%%/tools/YASM.kmk %%DATADIR%%/tools/ZIP.kmk %%DATADIR%%/units/dtrace.kmk %%DATADIR%%/units/lex.kmk %%DATADIR%%/units/qt3.kmk %%DATADIR%%/units/qt4.kmk +%%DATADIR%%/units/qt5.kmk +%%DATADIR%%/units/vccprecomp.kmk %%DATADIR%%/units/yacc.kmk %%DATADIR%%/up.kmk