diff --git a/devel/kBuild/Makefile b/devel/kBuild/Makefile index 3c876ac090f6..b6791172e226 100644 --- a/devel/kBuild/Makefile +++ b/devel/kBuild/Makefile @@ -1,67 +1,67 @@ PORTNAME= kBuild DISTVERSION= ${KBUILD_VERSION} -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= devel -MASTER_SITES= LOCAL/jkim -DISTNAME= ${PORTNAME}-${DISTVERSION}r3127-src +MASTER_SITES= LOCAL/vvd +DISTNAME= ${PORTNAME}-${DISTVERSION}r3660-src MAINTAINER= vbox@FreeBSD.org COMMENT= Makefile framework WWW= https://svn.netlabs.org/kbuild LICENSE= BSD3CLAUSE GPLv3+ LICENSE_COMB= multi USES= autoreconf:build gmake makeinfo tar:xz CONFLICTS_INSTALL= kBuild-devel WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} KBUILD_VERSION= 0.1.9998 KBUILD_ARCH= ${MACHINE_ARCH:S/aarch64/arm64/:S/i386/x86/:S/x86_64/amd64/:C/powerpc64.*/ppc64/:C/powerpc.*/ppc32/:C/armv.*/arm32/} KBUILD_ENV= AUTORECONF=${AUTORECONF} \ AUTOPOINT=true \ CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" \ LDFLAGS="${LDFLAGS}" MAKE="${MAKE_CMD}" KBUILD_TARGET= ${OPSYS:tl} 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 PORTDOCS= QuickReference-kmk.html \ QuickReference-kmk.txt ENV= .export ENV OPTIONS_DEFINE= DOCS GCC OPTIONS_DEFAULT=GCC GCC_DESC= Build with GCC (should almost always be enabled) GCC_USE= GCC=yes post-patch: @${REINPLACE_CMD} 's|gcc|${CC}|g' ${WRKSRC}/kBuild/tools/*.kmk 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 diff --git a/devel/kBuild/distinfo b/devel/kBuild/distinfo index 1f8e0a9adcf4..ad1342bc3389 100644 --- a/devel/kBuild/distinfo +++ b/devel/kBuild/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1511906864 -SHA256 (kBuild-0.1.9998r3127-src.tar.xz) = b98fced9ba0ddae5a080463db43003b8f963d04da3bd588c86025cbf6dda7c61 -SIZE (kBuild-0.1.9998r3127-src.tar.xz) = 2144704 +TIMESTAMP = 1738249857 +SHA256 (kBuild-0.1.9998r3660-src.tar.xz) = 4a1d9e4ec253bb97a9f6be057515539d271c3f6e1ea1eb0f7d55d761f0409b85 +SIZE (kBuild-0.1.9998r3660-src.tar.xz) = 4202220 diff --git a/devel/kBuild/files/patch-src_kmk_configure.in b/devel/kBuild/files/patch-src_kmk_configure.in deleted file mode 100644 index e04b5458aa73..000000000000 --- a/devel/kBuild/files/patch-src_kmk_configure.in +++ /dev/null @@ -1,10 +0,0 @@ ---- src/kmk/configure.in.orig 2017-07-18 19:08:54 UTC -+++ src/kmk/configure.in -@@ -134,6 +134,7 @@ AC_CACHE_CHECK([for standard gettimeofday], ac_cv_func - AC_CACHE_CHECK([for standard gettimeofday], ac_cv_func_gettimeofday, - [ac_cv_func_gettimeofday=no - AC_RUN_IFELSE([AC_LANG_SOURCE([[#include -+#include - int main () - { - struct timeval t; t.tv_sec = -1; t.tv_usec = -1; diff --git a/devel/kBuild/files/patch-src_kmk_make.h b/devel/kBuild/files/patch-src_kmk_make.h deleted file mode 100644 index b07e30a302b2..000000000000 --- a/devel/kBuild/files/patch-src_kmk_make.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/kmk/make.h.orig 2020-06-21 16:45:45 UTC -+++ src/kmk/make.h -@@ -472,7 +472,7 @@ extern int unixy_shell; - #endif - #ifdef SET_STACK_SIZE - # include --struct rlimit stack_limit; -+extern struct rlimit stack_limit; - #endif - - struct floc diff --git a/devel/kBuild/files/patch-src_sed_configure b/devel/kBuild/files/patch-src_sed_configure deleted file mode 100644 index 95f97cce21a6..000000000000 --- a/devel/kBuild/files/patch-src_sed_configure +++ /dev/null @@ -1,15 +0,0 @@ ---- 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 ;; diff --git a/devel/kBuild/files/patch-src_sed_lib_getline.c b/devel/kBuild/files/patch-src_sed_lib_getline.c deleted file mode 100644 index 6af2c2be38af..000000000000 --- a/devel/kBuild/files/patch-src_sed_lib_getline.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/sed/lib/getline.c.orig 2017-07-18 19:08:55 UTC -+++ src/sed/lib/getline.c -@@ -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; diff --git a/devel/kBuild/files/patch-src_sed_lib_utils.h b/devel/kBuild/files/patch-src_sed_lib_utils.h deleted file mode 100644 index 7448a9dd124c..000000000000 --- a/devel/kBuild/files/patch-src_sed_lib_utils.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/sed/lib/utils.h.orig 2017-07-18 19:08:55 UTC -+++ src/sed/lib/utils.h -@@ -17,6 +17,8 @@ - Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - - #include -+#include -+#include - - #include "basicdefs.h" - diff --git a/devel/kBuild/pkg-plist b/devel/kBuild/pkg-plist index 89bb7d47d9ec..fa7da327c210 100644 --- a/devel/kBuild/pkg-plist +++ b/devel/kBuild/pkg-plist @@ -1,141 +1,197 @@ bin/kDepIDB bin/kDepObj bin/kDepPre bin/kObjCache bin/kmk bin/kmk_append bin/kmk_ash bin/kmk_cat bin/kmk_chmod 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_printf bin/kmk_redirect bin/kmk_rm bin/kmk_rmdir bin/kmk_sed bin/kmk_sleep bin/kmk_test bin/kmk_time +%%DATADIR%%/darwin-common.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/LIBSDL2.kmk +%%DATADIR%%/sdks/MACOSX1010.kmk +%%DATADIR%%/sdks/MACOSX1013.kmk +%%DATADIR%%/sdks/MACOSX1013INCS.kmk +%%DATADIR%%/sdks/MACOSX1014.kmk +%%DATADIR%%/sdks/MACOSX1014INCS.kmk +%%DATADIR%%/sdks/MACOSX1015.kmk +%%DATADIR%%/sdks/MACOSX1015INCS.kmk %%DATADIR%%/sdks/MACOSX104.kmk %%DATADIR%%/sdks/MACOSX104INCS.kmk %%DATADIR%%/sdks/MACOSX105.kmk %%DATADIR%%/sdks/MACOSX105INCS.kmk +%%DATADIR%%/sdks/MACOSX110.kmk +%%DATADIR%%/sdks/MACOSX110INCS.kmk +%%DATADIR%%/sdks/MACOSX120.kmk +%%DATADIR%%/sdks/MACOSX120INCS.kmk +%%DATADIR%%/sdks/MACOSX123.kmk +%%DATADIR%%/sdks/MACOSX123INCS.kmk +%%DATADIR%%/sdks/MACOSX130.kmk +%%DATADIR%%/sdks/MACOSX130INCS.kmk +%%DATADIR%%/sdks/MACOSX133.kmk +%%DATADIR%%/sdks/MACOSX133INCS.kmk +%%DATADIR%%/sdks/MACOSX140.kmk +%%DATADIR%%/sdks/MACOSX140INCS.kmk +%%DATADIR%%/sdks/MACOSX150.kmk +%%DATADIR%%/sdks/MACOSX150INCS.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/WINDDK71.kmk %%DATADIR%%/sdks/WINDDK71WLH.kmk %%DATADIR%%/sdks/WINDDK71WNET.kmk %%DATADIR%%/sdks/WINDDK71WXP.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/WINPSDK.kmk %%DATADIR%%/sdks/WINPSDK71.kmk %%DATADIR%%/sdks/WINPSDK71INCS.kmk %%DATADIR%%/sdks/WINPSDKINCS.kmk +%%DATADIR%%/sdks/WINSDK10-KM-W7.kmk +%%DATADIR%%/sdks/WINSDK10-KM-W8.kmk +%%DATADIR%%/sdks/WINSDK10-KM-W81.kmk +%%DATADIR%%/sdks/WINSDK10-KM-WLH.kmk +%%DATADIR%%/sdks/WINSDK10-KM.kmk +%%DATADIR%%/sdks/WINSDK10-UCRT-INCS.kmk +%%DATADIR%%/sdks/WINSDK10-UCRT-STATIC.kmk +%%DATADIR%%/sdks/WINSDK10-UCRT.kmk +%%DATADIR%%/sdks/WINSDK10-UCRTD-STATIC.kmk +%%DATADIR%%/sdks/WINSDK10-UCRTD.kmk +%%DATADIR%%/sdks/WINSDK10-UM-INCS.kmk +%%DATADIR%%/sdks/WINSDK10-UM.kmk +%%DATADIR%%/sdks/WINSDK10.kmk %%DATADIR%%/subfooter.kmk %%DATADIR%%/subheader.kmk %%DATADIR%%/templates/DUMMY.kmk +%%DATADIR%%/tools/7ZIP.kmk %%DATADIR%%/tools/ALP.kmk %%DATADIR%%/tools/BISON.kmk +%%DATADIR%%/tools/CLANGCCMACHO.kmk +%%DATADIR%%/tools/CLANGXXMACHO.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/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/GXX42MACHO.kmk %%DATADIR%%/tools/GXX4MACHO.kmk %%DATADIR%%/tools/GXX64.kmk %%DATADIR%%/tools/JWASM.kmk %%DATADIR%%/tools/LLVMGCC42MACHO.kmk %%DATADIR%%/tools/LLVMGXX42MACHO.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/VCC140.kmk +%%DATADIR%%/tools/VCC140AMD64.kmk +%%DATADIR%%/tools/VCC140X86.kmk +%%DATADIR%%/tools/VCC141.kmk +%%DATADIR%%/tools/VCC141AMD64.kmk +%%DATADIR%%/tools/VCC141X86.kmk +%%DATADIR%%/tools/VCC142.kmk +%%DATADIR%%/tools/VCC142AMD64.kmk +%%DATADIR%%/tools/VCC142X86.kmk +%%DATADIR%%/tools/VCC143-CLANGXX.kmk +%%DATADIR%%/tools/VCC143.kmk +%%DATADIR%%/tools/VCC143AMD64.kmk +%%DATADIR%%/tools/VCC143ARM64.kmk +%%DATADIR%%/tools/VCC143X86.kmk %%DATADIR%%/tools/VCC70.kmk %%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/YACC.kmk %%DATADIR%%/tools/YASM.kmk %%DATADIR%%/tools/ZIP.kmk %%DATADIR%%/units/dtrace.kmk +%%DATADIR%%/units/gccprecomp.kmk %%DATADIR%%/units/lex.kmk %%DATADIR%%/units/qt3.kmk %%DATADIR%%/units/qt4.kmk %%DATADIR%%/units/qt5.kmk +%%DATADIR%%/units/qt6.kmk %%DATADIR%%/units/vccprecomp.kmk %%DATADIR%%/units/yacc.kmk %%DATADIR%%/up.kmk +%%DATADIR%%/win-common.kmk