summaryrefslogtreecommitdiff
path: root/devel/apache-commons-daemon
diff options
context:
space:
mode:
Diffstat (limited to 'devel/apache-commons-daemon')
-rw-r--r--devel/apache-commons-daemon/Makefile17
-rw-r--r--devel/apache-commons-daemon/distinfo10
-rw-r--r--devel/apache-commons-daemon/files/patch-configure11
-rw-r--r--devel/apache-commons-daemon/files/patch-native_arguments.c13
-rw-r--r--devel/apache-commons-daemon/files/patch-native_help.c11
-rw-r--r--devel/apache-commons-daemon/files/patch-native_jsvc-unix.c16
6 files changed, 46 insertions, 32 deletions
diff --git a/devel/apache-commons-daemon/Makefile b/devel/apache-commons-daemon/Makefile
index 9f705811de95..2b44b7552c4a 100644
--- a/devel/apache-commons-daemon/Makefile
+++ b/devel/apache-commons-daemon/Makefile
@@ -1,11 +1,11 @@
PORTNAME= commons-daemon
-PORTVERSION= 1.4.0
+DISTVERSION= 1.4.1
CATEGORIES= devel java
MASTER_SITES= https://archive.apache.org/dist/commons/daemon/source/:src \
https://archive.apache.org/dist/commons/daemon/binaries/:bin
PKGNAMEPREFIX= apache-
-DISTFILES= ${PORTNAME}-${PORTVERSION}-native-src${EXTRACT_SUFX}:src \
- ${PORTNAME}-${PORTVERSION}-bin${EXTRACT_SUFX}:bin
+DISTFILES= ${PORTNAME}-${DISTVERSION}-native-src${EXTRACT_SUFX}:src \
+ ${PORTNAME}-${DISTVERSION}-bin${EXTRACT_SUFX}:bin
MAINTAINER= ale@FreeBSD.org
COMMENT= Wrapper code to start/stop a Java application as a daemon
@@ -16,23 +16,26 @@ LICENSE= APACHE20
USES= java
JAVA_OS= native
-OPTIONS_DEFINE= DOCS
-
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-java=${JAVA_HOME}
WRKSRC= ${WRKDIR}/${DISTNAME}-native-src/unix
WRKBIN= ${WRKDIR}/${DISTNAME}
-PLIST_FILES= bin/jsvc %%JAVAJARDIR%%/${PORTNAME}.jar
+PLIST_FILES= bin/jsvc ${JAVAJARDIR}/${PORTNAME}.jar
PORTDOCS= *
+OPTIONS_DEFINE= DOCS
+
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/jsvc ${STAGEDIR}${PREFIX}/bin
${INSTALL_DATA} ${WRKBIN}/${DISTNAME}.jar \
${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
+
+do-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}
- cd ${WRKBIN} && ${COPYTREE_SHARE} apidocs ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKBIN}/${PORTNAME}-${DISTVERSION}-javadoc.jar \
+ ${STAGEDIR}${DOCSDIR}/${PORTNAME}-javadoc.jar
.include <bsd.port.mk>
diff --git a/devel/apache-commons-daemon/distinfo b/devel/apache-commons-daemon/distinfo
index dd544290c57d..775d71ef789f 100644
--- a/devel/apache-commons-daemon/distinfo
+++ b/devel/apache-commons-daemon/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1717668909
-SHA256 (commons-daemon-1.4.0-native-src.tar.gz) = e05fab8f752457a70b2aadaf7f1702f14a162200809ade6cb6f9a52add3c310d
-SIZE (commons-daemon-1.4.0-native-src.tar.gz) = 214459
-SHA256 (commons-daemon-1.4.0-bin.tar.gz) = 0a7b1dd79c91103b64a0d15102c2290029c286771536075d4c9d4212f84a9f8f
-SIZE (commons-daemon-1.4.0-bin.tar.gz) = 244710
+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
diff --git a/devel/apache-commons-daemon/files/patch-configure b/devel/apache-commons-daemon/files/patch-configure
deleted file mode 100644
index 240a0979310e..000000000000
--- a/devel/apache-commons-daemon/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig 2018-06-29 12:40:33 UTC
-+++ configure
-@@ -3504,7 +3504,7 @@ then
- $as_echo "jni_md.h found in $JAVA_HOME/$JAVA_INC" >&6; }
- INCLUDES="$INCLUDES -I$JAVA_HOME/include -I$JAVA_HOME/$JAVA_INC"
- else
-- INCLUDES="$INCLUDES -I$JAVA_HOME/include -I$JAVA_HOME/include/$supported_os"
-+ INCLUDES="$INCLUDES -I$JAVA_HOME/include -I$JAVA_HOME/include/$JAVA_OS"
- fi
-
- if test "$GCC" = "yes"
diff --git a/devel/apache-commons-daemon/files/patch-native_arguments.c b/devel/apache-commons-daemon/files/patch-native_arguments.c
index a60ca3b03803..ea9a407ecbdc 100644
--- a/devel/apache-commons-daemon/files/patch-native_arguments.c
+++ b/devel/apache-commons-daemon/files/patch-native_arguments.c
@@ -1,4 +1,4 @@
---- native/arguments.c.orig 2019-09-04 15:44:04 UTC
+--- native/arguments.c.orig 2025-01-06 00:00:00 UTC
+++ native/arguments.c
@@ -157,7 +157,7 @@ static arg_data *parse(int argc, char *argv[])
args->help = false; /* Don't display help */
@@ -20,3 +20,14 @@
}
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
new file mode 100644
index 000000000000..84af961ceafa
--- /dev/null
+++ b/devel/apache-commons-daemon/files/patch-native_help.c
@@ -0,0 +1,11 @@
+--- 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=<module name>\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");
+
diff --git a/devel/apache-commons-daemon/files/patch-native_jsvc-unix.c b/devel/apache-commons-daemon/files/patch-native_jsvc-unix.c
index c94778a6a1af..8b2486ff416f 100644
--- a/devel/apache-commons-daemon/files/patch-native_jsvc-unix.c
+++ b/devel/apache-commons-daemon/files/patch-native_jsvc-unix.c
@@ -1,6 +1,6 @@
---- native/jsvc-unix.c.orig 2017-11-15 11:51:22 UTC
+--- native/jsvc-unix.c.orig 2025-01-06 00:00:00 UTC
+++ native/jsvc-unix.c
-@@ -717,18 +717,13 @@ static void remove_tmp_file(arg_data *ar
+@@ -731,18 +731,13 @@ static int wait_child(arg_data *args, int pid)
*/
static int wait_child(arg_data *args, int pid)
{
@@ -21,7 +21,7 @@
while (count > 0) {
sleep(1);
/* check if the controler is still running */
-@@ -767,7 +762,6 @@ static int wait_child(arg_data *args, in
+@@ -781,7 +776,6 @@ static int wait_child(arg_data *args, int pid)
}
}
}
@@ -29,7 +29,7 @@
count--;
}
/* It takes more than the wait time to start,
-@@ -901,11 +895,11 @@ static int child(arg_data *args, home_da
+@@ -915,11 +909,11 @@ static int child(arg_data *args, home_data *data, uid_
create_tmp_file(args);
while (!stopping) {
#if defined(OSD_POSIX)
@@ -41,9 +41,9 @@
- sleep(60);
+ sleep(1);
#endif
- if(doreopen) {
+ if (doreopen) {
doreopen = false;
-@@ -924,7 +918,7 @@ static int child(arg_data *args, home_da
+@@ -938,7 +932,7 @@ static int child(arg_data *args, home_data *data, uid_
return 6;
if (doreload == true)
@@ -52,7 +52,7 @@
else
ret = 0;
-@@ -1341,10 +1335,10 @@ static int run_controller(arg_data *args
+@@ -1348,10 +1342,10 @@ static int run_controller(arg_data *args, home_data *d
if (args->vers != true && args->chck != true && status != 122)
remove_pid_file(args, pid);
@@ -65,7 +65,7 @@
if (args->restarts == 0) {
log_debug("Service failure, restarts disabled");
return 1;
-@@ -1356,7 +1350,7 @@ static int run_controller(arg_data *args
+@@ -1363,7 +1357,7 @@ static int run_controller(arg_data *args, home_data *d
log_debug("Reloading service");
restarts++;
/* prevent looping */
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-05 04:26:15 +0000