Better pexp.

This commit is contained in:
ajacoutot 2015-07-15 19:19:16 +00:00
parent c5e9ab5c58
commit 3949d52091
6 changed files with 12 additions and 9 deletions

View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.30 2015/05/14 09:21:01 dcoppa Exp $
# $OpenBSD: Makefile,v 1.31 2015/07/15 19:19:16 ajacoutot Exp $
COMMENT-main = Java servlet 2.5 and Java server pages 2.1 server
MAJ_VER = 6
MIN_VER = 0
MICRO_VER = 44
REVISION = 0
RUN_DEPENDS-examples =www/tomcat/v${MAJ_VER},-main>=${MAJ_VER},<7

View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# $OpenBSD: tomcat.rc,v 1.1 2011/07/24 11:11:59 dcoppa Exp $
# $OpenBSD: tomcat.rc,v 1.2 2015/07/15 19:19:16 ajacoutot Exp $
daemon="${TRUEPREFIX}/tomcat/bin/catalina.sh"
daemon_flags="-server"
@ -8,7 +8,7 @@ daemon_user="_tomcat"
. /etc/rc.d/rc.subr
pexp="$(${LOCALBASE}/bin/javaPathHelper -h tomcat).*-Dcatalina.base=${CATALINA_BASE}.*org.apache.catalina.startup.Bootstrap.*"
pexp="$(${LOCALBASE}/bin/javaPathHelper -c tomcat) .*-Dcatalina.base=${CATALINA_BASE}.*org.apache.catalina.startup.Bootstrap.*"
rc_reload=NO

View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.35 2015/07/07 14:30:36 dcoppa Exp $
# $OpenBSD: Makefile,v 1.36 2015/07/15 19:19:16 ajacoutot Exp $
COMMENT-main = Java servlet 3.0 and Java server pages 2.2 server
MAJ_VER = 7
MIN_VER = 0
MICRO_VER = 63
REVISION = 0
.include <bsd.port.mk>

View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# $OpenBSD: tomcat.rc,v 1.1.1.1 2011/10/31 08:23:38 dcoppa Exp $
# $OpenBSD: tomcat.rc,v 1.2 2015/07/15 19:19:16 ajacoutot Exp $
daemon="${TRUEPREFIX}/tomcat/bin/catalina.sh"
daemon_flags="-server"
@ -8,7 +8,7 @@ daemon_user="_tomcat"
. /etc/rc.d/rc.subr
pexp="$(${LOCALBASE}/bin/javaPathHelper -h tomcat).*-Dcatalina.base=${CATALINA_BASE}.*org.apache.catalina.startup.Bootstrap.*"
pexp="$(${LOCALBASE}/bin/javaPathHelper -c tomcat) .*-Dcatalina.base=${CATALINA_BASE}.*org.apache.catalina.startup.Bootstrap.*"
rc_reload=NO

View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.9 2015/07/07 14:33:57 dcoppa Exp $
# $OpenBSD: Makefile,v 1.10 2015/07/15 19:19:16 ajacoutot Exp $
COMMENT-main = Java servlet 3.1 and Java server pages 2.3 server
MAJ_VER = 8
MIN_VER = 0
MICRO_VER = 24
REVISION = 0
.include <bsd.port.mk>

View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# $OpenBSD: tomcat.rc,v 1.1.1.1 2014/10/06 08:15:54 dcoppa Exp $
# $OpenBSD: tomcat.rc,v 1.2 2015/07/15 19:19:16 ajacoutot Exp $
daemon="${TRUEPREFIX}/tomcat/bin/catalina.sh"
daemon_flags="-server"
@ -8,7 +8,7 @@ daemon_user="_tomcat"
. /etc/rc.d/rc.subr
pexp="$(${LOCALBASE}/bin/javaPathHelper -h tomcat).*-Dcatalina.base=${CATALINA_BASE}.*org.apache.catalina.startup.Bootstrap.*"
pexp="$(${LOCALBASE}/bin/javaPathHelper -c tomcat) .*-Dcatalina.base=${CATALINA_BASE}.*org.apache.catalina.startup.Bootstrap.*"
rc_reload=NO