From owner-svn-ports-head@freebsd.org Sun Jul 29 12:45:19 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6F3F910568CE; Sun, 29 Jul 2018 12:45:19 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2198E8020F; Sun, 29 Jul 2018 12:45:19 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 02A8C15F59; Sun, 29 Jul 2018 12:45:19 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6TCjIDm037042; Sun, 29 Jul 2018 12:45:18 GMT (envelope-from dbaio@FreeBSD.org) Received: (from dbaio@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6TCjIAO037040; Sun, 29 Jul 2018 12:45:18 GMT (envelope-from dbaio@FreeBSD.org) Message-Id: <201807291245.w6TCjIAO037040@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dbaio set sender to dbaio@FreeBSD.org using -f From: "Danilo G. Baio" Date: Sun, 29 Jul 2018 12:45:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r475658 - in head/www/tomcat85: . files X-SVN-Group: ports-head X-SVN-Commit-Author: dbaio X-SVN-Commit-Paths: in head/www/tomcat85: . files X-SVN-Commit-Revision: 475658 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jul 2018 12:45:19 -0000 Author: dbaio Date: Sun Jul 29 12:45:18 2018 New Revision: 475658 URL: https://svnweb.freebsd.org/changeset/ports/475658 Log: www/tomcat85: Remove start_precmd from rcfile This is not being used, users can use $tomcat85_env to pass variables. PR: 228418 Submitted by: VVD (maintainer) Reported by: Michael Osipov <1983-01-06@gmx.net> Modified: head/www/tomcat85/Makefile head/www/tomcat85/files/tomcat85.in Modified: head/www/tomcat85/Makefile ============================================================================== --- head/www/tomcat85/Makefile Sun Jul 29 12:36:50 2018 (r475657) +++ head/www/tomcat85/Makefile Sun Jul 29 12:45:18 2018 (r475658) @@ -3,6 +3,7 @@ PORTNAME= tomcat PORTVERSION= 8.5.30 +PORTREVISION= 1 CATEGORIES= www java MASTER_SITES= APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9])(.*)/\1/}/v${PORTVERSION}/bin PKGNAMESUFFIX= 85 Modified: head/www/tomcat85/files/tomcat85.in ============================================================================== --- head/www/tomcat85/files/tomcat85.in Sun Jul 29 12:36:50 2018 (r475657) +++ head/www/tomcat85/files/tomcat85.in Sun Jul 29 12:45:18 2018 (r475658) @@ -131,15 +131,4 @@ command_args="-java-home '${_tomcat_java_home}' \ org.apache.catalina.startup.Bootstrap \ ${_tomcat_pipe_cmd}" -start_precmd="tomcat_prestart" - -tomcat_prestart() -{ - if [ -r "${_tomcat_catalina_base}/bin/setenv.sh" ]; then - . "${_tomcat_catalina_base}/bin/setenv.sh" - elif [ -r "${_tomcat_catalina_home}/bin/setenv.sh" ]; then - . "${_tomcat_catalina_home}/bin/setenv.sh" - fi -} - run_rc_command "$1"