git: 9e782d2fea50 - main - devel/kBuild: Update 0.1.9998 r3127 → r3660

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Vladimir Druzenko <vvd_at_FreeBSD.org>
Date: Sun, 02 Feb 2025 18:13:13 UTC
The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9e782d2fea50a1097feadec2a5c61dea806c1ebd

commit 9e782d2fea50a1097feadec2a5c61dea806c1ebd
Author:     Jesper Schmitz Mouridsen <jsm@FreeBSD.org>
AuthorDate: 2025-02-02 18:09:41 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-02-02 18:09:41 +0000

    devel/kBuild: Update 0.1.9998 r3127 → r3660
    
    The new version supports qt6, which is required for VirtualBox 7.1.x
    
    PR:     284420
---
 devel/kBuild/Makefile                          |  6 +--
 devel/kBuild/distinfo                          |  6 +--
 devel/kBuild/files/patch-src_kmk_configure.in  | 10 -----
 devel/kBuild/files/patch-src_kmk_make.h        | 11 -----
 devel/kBuild/files/patch-src_sed_configure     | 15 -------
 devel/kBuild/files/patch-src_sed_lib_getline.c | 11 -----
 devel/kBuild/files/patch-src_sed_lib_utils.h   | 11 -----
 devel/kBuild/pkg-plist                         | 56 ++++++++++++++++++++++++++
 8 files changed, 62 insertions(+), 64 deletions(-)

diff --git a/devel/kBuild/Makefile b/devel/kBuild/Makefile
index 3c876ac090f6..b6791172e226 100644
--- a/devel/kBuild/Makefile
+++ b/devel/kBuild/Makefile
@@ -1,9 +1,9 @@
 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
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 <sys/time.h>
-+#include <stdlib.h>
-                   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 <sys/resource.h>
--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 <stdio.h>
-+#include <string.h>
-+#include <unistd.h>
- 
- #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
@@ -25,6 +25,7 @@ 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
@@ -42,10 +43,32 @@ bin/kmk_time
 %%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
@@ -71,11 +94,27 @@ bin/kmk_time
 %%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
@@ -119,6 +158,20 @@ bin/kmk_time
 %%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
@@ -132,10 +185,13 @@ bin/kmk_time
 %%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