diff --git a/devel/apache-commons-daemon/Makefile b/devel/apache-commons-daemon/Makefile --- a/devel/apache-commons-daemon/Makefile +++ b/devel/apache-commons-daemon/Makefile @@ -1,5 +1,5 @@ PORTNAME= commons-daemon -DISTVERSION= 1.4.1 +DISTVERSION= 1.5.0 CATEGORIES= devel java MASTER_SITES= https://archive.apache.org/dist/commons/daemon/source/:src \ https://archive.apache.org/dist/commons/daemon/binaries/:bin diff --git a/devel/apache-commons-daemon/distinfo b/devel/apache-commons-daemon/distinfo --- a/devel/apache-commons-daemon/distinfo +++ b/devel/apache-commons-daemon/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1746148831 -SHA256 (commons-daemon-1.4.1-native-src.tar.gz) = d672cbc125d448551e34b112b45655468694112e4566a87f63d602b58145e774 -SIZE (commons-daemon-1.4.1-native-src.tar.gz) = 215448 -SHA256 (commons-daemon-1.4.1-bin.tar.gz) = a5f2ab67776e0f3e702939f7f9233ec9edd434dd76f555823ce788ec94ae62db -SIZE (commons-daemon-1.4.1-bin.tar.gz) = 4314313 +TIMESTAMP = 1764768868 +SHA256 (commons-daemon-1.5.0-native-src.tar.gz) = b52cf1aa7dda7e08f726b76c12e03a7d12a7be4fdaffaa880850e464c81cfafe +SIZE (commons-daemon-1.5.0-native-src.tar.gz) = 218317 +SHA256 (commons-daemon-1.5.0-bin.tar.gz) = 515c6e8872d738913687a50befb73c2cb2818a4527287c1452771d15adc9affb +SIZE (commons-daemon-1.5.0-bin.tar.gz) = 182322 diff --git a/devel/apache-commons-daemon/files/patch-native_arguments.c b/devel/apache-commons-daemon/files/patch-native_arguments.c --- a/devel/apache-commons-daemon/files/patch-native_arguments.c +++ b/devel/apache-commons-daemon/files/patch-native_arguments.c @@ -20,14 +20,3 @@ } else if (!strcmp(argv[x], "-restarts")) { temp = optional(argc, argv, x++); -@@ -424,6 +420,10 @@ static arg_data *parse(int argc, char *argv[]) - } - /* Java 11 specific options */ - else if (!strncmp(argv[x], "--enable-preview", 16)) { -+ args->opts[args->onum++] = strdup(argv[x]); -+ } -+ /* Java 21 specific options */ -+ else if (!strncmp(argv[x], "--enable-native-access=", 23)) { - args->opts[args->onum++] = strdup(argv[x]); - } - else if (*argv[x] == '-') { diff --git a/devel/apache-commons-daemon/files/patch-native_help.c b/devel/apache-commons-daemon/files/patch-native_help.c deleted file mode 100644 --- a/devel/apache-commons-daemon/files/patch-native_help.c +++ /dev/null @@ -1,11 +0,0 @@ ---- native/help.c.orig 2025-01-06 00:00:00 UTC -+++ native/help.c -@@ -123,6 +123,8 @@ void help(home_data *data) - printf(" Refer java help for possible values.\n"); - printf(" --enable-preview\n"); - printf(" Java 11 --enable-preview option. Passed as it is to JVM\n"); -+ printf(" --enable-native-access=\n"); -+ printf(" Java 21 --enable-native-access option. Passed as it is to JVM\n"); - printf("\njsvc (Apache Commons Daemon) " JSVC_VERSION_STRING "\n"); - printf("Copyright (c) 1999-2025 Apache Software Foundation.\n"); -