From 3949d5209197ef87f909d5fd7cf565fc876da5c7 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Wed, 15 Jul 2015 19:19:16 +0000 Subject: [PATCH] Better pexp. --- www/tomcat/v6/Makefile | 3 ++- www/tomcat/v6/pkg/tomcat.rc | 4 ++-- www/tomcat/v7/Makefile | 3 ++- www/tomcat/v7/pkg/tomcat.rc | 4 ++-- www/tomcat/v8/Makefile | 3 ++- www/tomcat/v8/pkg/tomcat.rc | 4 ++-- 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/www/tomcat/v6/Makefile b/www/tomcat/v6/Makefile index f1a874486f6..f26a62b337f 100644 --- a/www/tomcat/v6/Makefile +++ b/www/tomcat/v6/Makefile @@ -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 diff --git a/www/tomcat/v6/pkg/tomcat.rc b/www/tomcat/v6/pkg/tomcat.rc index b372f5b9811..4f4c55ca168 100755 --- a/www/tomcat/v6/pkg/tomcat.rc +++ b/www/tomcat/v6/pkg/tomcat.rc @@ -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 diff --git a/www/tomcat/v7/Makefile b/www/tomcat/v7/Makefile index eba4ce31156..9a0322de5c8 100644 --- a/www/tomcat/v7/Makefile +++ b/www/tomcat/v7/Makefile @@ -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 diff --git a/www/tomcat/v7/pkg/tomcat.rc b/www/tomcat/v7/pkg/tomcat.rc index 038944dc90e..4f4c55ca168 100755 --- a/www/tomcat/v7/pkg/tomcat.rc +++ b/www/tomcat/v7/pkg/tomcat.rc @@ -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 diff --git a/www/tomcat/v8/Makefile b/www/tomcat/v8/Makefile index f165ef9c359..450c86b389a 100644 --- a/www/tomcat/v8/Makefile +++ b/www/tomcat/v8/Makefile @@ -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 diff --git a/www/tomcat/v8/pkg/tomcat.rc b/www/tomcat/v8/pkg/tomcat.rc index 10d2ec1ffb3..4f4c55ca168 100644 --- a/www/tomcat/v8/pkg/tomcat.rc +++ b/www/tomcat/v8/pkg/tomcat.rc @@ -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