Index: head/devel/jakarta-commons-daemon/Makefile =================================================================== --- head/devel/jakarta-commons-daemon/Makefile (revision 513395) +++ head/devel/jakarta-commons-daemon/Makefile (revision 513396) @@ -1,40 +1,40 @@ # Created by: Ronald Klop # $FreeBSD$ PORTNAME= commons-daemon -PORTVERSION= 1.1.0 +PORTVERSION= 1.2.1 CATEGORIES= devel java MASTER_SITES= APACHE_COMMONS_SOURCE:src \ APACHE_COMMONS_BINARIES:bin PKGNAMEPREFIX= jakarta- DISTFILES= ${PORTNAME}-${PORTVERSION}-native-src${EXTRACT_SUFX}:src \ ${PORTNAME}-${PORTVERSION}-bin${EXTRACT_SUFX}:bin MAINTAINER= ale@FreeBSD.org COMMENT= Wrapper code to start/stop a Java application as a daemon LICENSE= APACHE20 OPTIONS_DEFINE= DOCS USE_JAVA= yes JAVA_VERSION= 1.6+ JAVA_OS= native 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 PORTDOCS= * do-install: ${INSTALL_PROGRAM} ${WRKSRC}/jsvc ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKBIN}/${DISTNAME}.jar \ ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKBIN} && ${COPYTREE_SHARE} apidocs ${STAGEDIR}${DOCSDIR} .include Index: head/devel/jakarta-commons-daemon/distinfo =================================================================== --- head/devel/jakarta-commons-daemon/distinfo (revision 513395) +++ head/devel/jakarta-commons-daemon/distinfo (revision 513396) @@ -1,5 +1,5 @@ -TIMESTAMP = 1511441946 -SHA256 (commons-daemon-1.1.0-native-src.tar.gz) = 11962bc602619fd2eeb840f74a8c63cc1055221f0cc385a1fa906e758d39888d -SIZE (commons-daemon-1.1.0-native-src.tar.gz) = 207125 -SHA256 (commons-daemon-1.1.0-bin.tar.gz) = 0e2c282da674cc5d351b4d7884997eb63472f03f37bf54b210cdef62d07120d7 -SIZE (commons-daemon-1.1.0-bin.tar.gz) = 199681 +TIMESTAMP = 1569854872 +SHA256 (commons-daemon-1.2.1-native-src.tar.gz) = dabefec25192db997fcbd6d1d0d606e59bd57fc41bc61ec53625d3d12b57f2e3 +SIZE (commons-daemon-1.2.1-native-src.tar.gz) = 1582098 +SHA256 (commons-daemon-1.2.1-bin.tar.gz) = b8617b2b5a5d19f9d11a5640ac2d0a72198cae64b372aec268a1ecab0ee8b0ce +SIZE (commons-daemon-1.2.1-bin.tar.gz) = 178789 Index: head/devel/jakarta-commons-daemon/files/patch-native_arguments.c =================================================================== --- head/devel/jakarta-commons-daemon/files/patch-native_arguments.c (revision 513395) +++ head/devel/jakarta-commons-daemon/files/patch-native_arguments.c (revision 513396) @@ -1,22 +1,22 @@ ---- native/arguments.c.orig 2017-11-02 13:10:04 UTC +--- native/arguments.c.orig 2019-09-04 15:44:04 UTC +++ native/arguments.c -@@ -157,7 +157,7 @@ static arg_data *parse(int argc, char *a - args->help = false; /* Don't display help */ - args->chck = false; /* Don't do a check-only startup */ - args->stop = false; /* Stop a running jsvc */ -- args->wait = 0; /* Wait until jsvc has started the JVM */ -+ args->wait = 10; /* Wait until jsvc has started the JVM */ - args->restarts = -1; /* Infinite restarts by default */ - args->install = false; /* Don't install as a service */ - args->remove = false; /* Don't remove the installed service */ -@@ -270,10 +270,6 @@ static arg_data *parse(int argc, char *a +@@ -157,7 +157,7 @@ static arg_data *parse(int argc, char *argv[]) + args->help = false; /* Don't display help */ + args->chck = false; /* Don't do a check-only startup */ + args->stop = false; /* Stop a running jsvc */ +- args->wait = 0; /* Wait until jsvc has started the JVM */ ++ args->wait = 10; /* Wait until jsvc has started the JVM */ + args->restarts = -1; /* Infinite restarts by default */ + args->install = false; /* Don't install as a service */ + args->remove = false; /* Don't remove the installed service */ +@@ -266,10 +266,6 @@ static arg_data *parse(int argc, char *argv[]) temp = optional(argc, argv, x++); if (temp) args->wait = atoi(temp); - if (args->wait < 10) { - log_error("Invalid wait time specified (min=10)"); - return NULL; - } } else if (!strcmp(argv[x], "-restarts")) { temp = optional(argc, argv, x++);