diff --git a/www/vnu/Makefile b/www/vnu/Makefile index 976e4968a4a..f4ecc9ba9b7 100644 --- a/www/vnu/Makefile +++ b/www/vnu/Makefile @@ -3,7 +3,7 @@ COMMENT = HTML5 validator V = 20.6.30 DISTNAME = vnu.jar_$V PKGNAME = vnu-$V -REVISION = 1 +REVISION = 2 CATEGORIES = www diff --git a/www/vnu/pkg/vnu.rc b/www/vnu/pkg/vnu.rc index 0d34763ef7b..dc89dd0d7c8 100644 --- a/www/vnu/pkg/vnu.rc +++ b/www/vnu/pkg/vnu.rc @@ -1,18 +1,19 @@ #!/bin/ksh daemon="${TRUEPREFIX}/share/vnu/vnu.jar" -daemon_user="_vnu" daemon_flags="8888" +daemon_user="_vnu" . /etc/rc.d/rc.subr +java="$(${LOCALBASE}/bin/javaPathHelper -c vnu)" + +pexp="${java} -cp ${daemon} nu.validator.servlet.Main ${daemon_flags}" rc_bg=YES rc_reload=NO -pexp="$(${LOCALBASE}/bin/javaPathHelper -c vnu) -cp ${daemon} nu.validator.servlet.Main ${daemon_flags}" - rc_start() { - rc_exec "$(${LOCALBASE}/bin/javaPathHelper -c vnu) -cp ${daemon} nu.validator.servlet.Main ${daemon_flags}" + rc_exec "${java} -cp ${daemon} nu.validator.servlet.Main ${daemon_flags}" } rc_cmd $1