From owner-svn-ports-head@freebsd.org Sun Aug 11 18:56:03 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1FAF5BF666; Sun, 11 Aug 2019 18:56:03 +0000 (UTC) (envelope-from rene@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 4667VB74yJz4FhL; Sun, 11 Aug 2019 18:56:02 +0000 (UTC) (envelope-from rene@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 D08AF1A95E; Sun, 11 Aug 2019 18:56:02 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7BIu27n000774; Sun, 11 Aug 2019 18:56:02 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7BIu2T0000773; Sun, 11 Aug 2019 18:56:02 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201908111856.x7BIu2T0000773@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Sun, 11 Aug 2019 18:56:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r508664 - head/www/madsonic X-SVN-Group: ports-head X-SVN-Commit-Author: rene X-SVN-Commit-Paths: head/www/madsonic X-SVN-Commit-Revision: 508664 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.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, 11 Aug 2019 18:56:03 -0000 Author: rene Date: Sun Aug 11 18:56:02 2019 New Revision: 508664 URL: https://svnweb.freebsd.org/changeset/ports/508664 Log: www/madsonic: remove optional dependency on expired www/tomcat6 Modified: head/www/madsonic/Makefile Modified: head/www/madsonic/Makefile ============================================================================== --- head/www/madsonic/Makefile Sun Aug 11 18:53:02 2019 (r508663) +++ head/www/madsonic/Makefile Sun Aug 11 18:56:02 2019 (r508664) @@ -16,9 +16,8 @@ LICENSE= GPLv3 OPTIONS_SINGLE= APPSERVER APPSERVER_DESC= Java Application Server -OPTIONS_SINGLE_APPSERVER= JETTY TOMCAT7 TOMCAT6 RESIN3 +OPTIONS_SINGLE_APPSERVER= JETTY TOMCAT7 RESIN3 TOMCAT7_DESC= Use Tomcat 7.x -TOMCAT6_DESC= Use Tomcat 6.x JETTY_DESC= Use Jetty RESIN3_DESC= Use Resin 3 @@ -42,8 +41,6 @@ RUN_DEPENDS+= ${JAVALIBDIR}/servlet-api.jar:www/servle ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins TOMCAT7_BUILD_DEPENDS= ${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:www/tomcat7 TOMCAT7_RUN_DEPENDS= ${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:www/tomcat7 -TOMCAT6_BUILD_DEPENDS= ${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:www/tomcat6 -TOMCAT6_RUN_DEPENDS= ${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:www/tomcat6 JETTY_BUILD_DEPENDS= ${LOCALBASE}/${SERVERDIR}/start.jar:www/jetty8 JETTY_RUN_DEPENDS= ${LOCALBASE}/${SERVERDIR}/start.jar:www/jetty8 RESIN3_BUILD_DEPENDS= ${LOCALBASE}/${SERVERDIR}/lib/resin.jar:www/resin3 @@ -84,14 +81,6 @@ DISTVER= tomcat PKGNAMESUFFIX= -tomcat7 SERVERDIR= apache-tomcat-7.0 SUB_LIST+= CONTAINERFLAGS="tomcat7_java_opts" -.endif - -.if ${PORT_OPTIONS:MTOMCAT6} -APPPKGMESSAGE= pkg-message-tomcat -DISTVER= tomcat -PKGNAMESUFFIX= -tomcat6 -SERVERDIR= apache-tomcat-6.0 -SUB_LIST+= CONTAINERFLAGS="tomcat60_java_opts" .endif .if ${PORT_OPTIONS:MJETTY}