From owner-svn-ports-head@freebsd.org Sun Jun 9 17:03:59 2019 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 08A5015CBE84; Sun, 9 Jun 2019 17:03:59 +0000 (UTC) (envelope-from ultima@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9F13D77CF2; Sun, 9 Jun 2019 17:03:58 +0000 (UTC) (envelope-from ultima@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 7A53C5EFA; Sun, 9 Jun 2019 17:03:58 +0000 (UTC) (envelope-from ultima@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x59H3wp3085236; Sun, 9 Jun 2019 17:03:58 GMT (envelope-from ultima@FreeBSD.org) Received: (from ultima@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x59H3wGl085235; Sun, 9 Jun 2019 17:03:58 GMT (envelope-from ultima@FreeBSD.org) Message-Id: <201906091703.x59H3wGl085235@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ultima set sender to ultima@FreeBSD.org using -f From: Richard Gallamore Date: Sun, 9 Jun 2019 17:03:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r503846 - head/www/guacamole-client X-SVN-Group: ports-head X-SVN-Commit-Author: ultima X-SVN-Commit-Paths: head/www/guacamole-client X-SVN-Commit-Revision: 503846 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 9F13D77CF2 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.97)[-0.972,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 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, 09 Jun 2019 17:03:59 -0000 Author: ultima Date: Sun Jun 9 17:03:57 2019 New Revision: 503846 URL: https://svnweb.freebsd.org/changeset/ports/503846 Log: Updated tomcat to version 9 due to being EOL PR: 238431 Modified: head/www/guacamole-client/Makefile head/www/guacamole-client/pkg-plist Modified: head/www/guacamole-client/Makefile ============================================================================== --- head/www/guacamole-client/Makefile Sun Jun 9 17:01:54 2019 (r503845) +++ head/www/guacamole-client/Makefile Sun Jun 9 17:03:57 2019 (r503846) @@ -3,7 +3,7 @@ PORTNAME= guacamole-client DISTVERSION= 1.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www java MASTER_SITES+= https://sourceforge.net/projects/distfiles/files/${PORTNAME}/:repo \ http://sourceforge.net/projects/distfiles/files/${PORTNAME}/:repo @@ -38,7 +38,10 @@ OPTIONS_SUB= yes SERVER_DESC= Include Guacamole Server TOMCAT_DESC= Use Tomcat as your servlet -TOMCAT_RUN_DEPENDS= ${LOCALBASE}/apache-tomcat-8.0/bin/bootstrap.jar:www/tomcat8 +TOMCAT_PLIST_SUB= TOMCAT_VER=${TOMCAT_VER} +TOMCAT_RUN_DEPENDS= ${LOCALBASE}/apache-tomcat-${TOMCAT_VER}/bin/bootstrap.jar:www/tomcat${TOMCAT_VER:C/\.[0]?//} +TOMCAT_VARS= TOMCAT_VER=9.0 + SERVER_RUN_DEPENDS= guacd:net/guacamole-server AUTH_EXTENSION= cas duo header ldap openid quickconnect totp @@ -68,8 +71,8 @@ do-install: ${INSTALL_DATA} ${FILESDIR}/guacamole.properties.sample ${STAGEDIR}${ETCDIR}/ do-install-TOMCAT-on: - @${MKDIR} ${STAGEDIR}${PREFIX}/apache-tomcat-8.0/webapps + @${MKDIR} ${STAGEDIR}${PREFIX}/apache-tomcat-${TOMCAT_VER}/webapps ${RLN} ${STAGEDIR}${DATADIR}/guacamole.war \ - ${STAGEDIR}${PREFIX}/apache-tomcat-8.0/webapps + ${STAGEDIR}${PREFIX}/apache-tomcat-${TOMCAT_VER}/webapps .include Modified: head/www/guacamole-client/pkg-plist ============================================================================== --- head/www/guacamole-client/pkg-plist Sun Jun 9 17:01:54 2019 (r503845) +++ head/www/guacamole-client/pkg-plist Sun Jun 9 17:03:57 2019 (r503846) @@ -1,4 +1,4 @@ -%%TOMCAT%%apache-tomcat-8.0/webapps/guacamole.war +%%TOMCAT%%apache-tomcat-%%TOMCAT_VER%%/webapps/guacamole.war %%ETCDIR%%/guacamole.properties.sample %%ETCDIR%%/logback.xml.sample %%ETCDIR%%/user-mapping.xml.sample