Update to 6.0.39

This commit is contained in:
dcoppa 2014-02-03 10:24:06 +00:00
parent dbdc121178
commit 905c4b193f
6 changed files with 45 additions and 24 deletions

View File

@ -1,11 +1,14 @@
# $OpenBSD: Makefile,v 1.24 2013/10/30 15:35:22 dcoppa Exp $
# $OpenBSD: Makefile,v 1.25 2014/02/03 10:24:06 dcoppa Exp $
COMMENT-main = Java servlet 2.5 and Java server pages 2.1 server
MAJ_VER = 6
MIN_VER = 0
MICRO_VER = 37
MICRO_VER = 39
RUN_DEPENDS-examples =www/tomcat/v${MAJ_VER},-main>=${MAJ_VER},<7
pre-patch:
perl -pi -e "s/\r$$//" ${WRKSRC}/webapps/ROOT/index.*
.include <bsd.port.mk>

View File

@ -1,4 +1,4 @@
SHA256 (apache-tomcat-6.0.37-fulldocs.tar.gz) = 0298RpvXFX1cuk2wT1a3DUzr/OuyyrZbgBC+4u3oq6U=
SHA256 (apache-tomcat-6.0.37.tar.gz) = PpGrx1K/K2yhnfnIZEvM3ZK6g3OXqMGnRdcvWNUwGwA=
SIZE (apache-tomcat-6.0.37-fulldocs.tar.gz) = 3600791
SIZE (apache-tomcat-6.0.37.tar.gz) = 6885442
SHA256 (apache-tomcat-6.0.39-fulldocs.tar.gz) = FxlNpLkUfTpTE6JCd4U6GYB6pZTWbmRfRcW9qe2TBnw=
SHA256 (apache-tomcat-6.0.39.tar.gz) = 3r3q/pAPXrhfiBbqI1q34+UmEHGy6gGsKIJB55TpEac=
SIZE (apache-tomcat-6.0.39-fulldocs.tar.gz) = 3663154
SIZE (apache-tomcat-6.0.39.tar.gz) = 7065481

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-webapps_ROOT_index_html,v 1.1 2011/10/17 11:11:46 dcoppa Exp $
--- webapps/ROOT/index.html.orig Tue Aug 16 14:25:24 2011
+++ webapps/ROOT/index.html Mon Oct 17 10:39:10 2011
$OpenBSD: patch-webapps_ROOT_index_html,v 1.2 2014/02/03 10:24:07 dcoppa Exp $
--- webapps/ROOT/index.html.orig Mon Feb 3 11:04:23 2014
+++ webapps/ROOT/index.html Mon Feb 3 11:06:26 2014
@@ -115,7 +115,8 @@
<tr>
<td class="menu">
<a href="/manager/status">Status</a><br/>
<td class="menu">
<a href="/manager/status">Status</a><br/>
- <a href="/manager/html">Tomcat&nbsp;Manager</a><br/>
+ <a href="/manager/html">Web&nbsp;Application&nbsp;Manager</a><br/>
+ <a href="/host-manager/html">Virtual&nbsp;Host&nbsp;Manager</a><br/>

View File

@ -1,13 +1,13 @@
$OpenBSD: patch-webapps_ROOT_index_jsp,v 1.1 2011/10/17 11:11:46 dcoppa Exp $
--- webapps/ROOT/index.jsp.orig Tue Aug 16 14:25:24 2011
+++ webapps/ROOT/index.jsp Mon Oct 17 10:37:08 2011
@@ -117,7 +117,8 @@
<td class="menu">
<a href="manager/status">Status</a><br/>
<!--<a href="admin">Tomcat&nbsp;Administration</a><br/>-->
- <a href="manager/html">Tomcat&nbsp;Manager</a><br/>
+ <a href="manager/html">Web&nbsp;Application&nbsp;Manager</a><br/>
+ <a href="host-manager/html">Virtual&nbsp;Host&nbsp;Manager</a><br/>
$OpenBSD: patch-webapps_ROOT_index_jsp,v 1.2 2014/02/03 10:24:07 dcoppa Exp $
--- webapps/ROOT/index.jsp.orig Mon Feb 3 11:04:23 2014
+++ webapps/ROOT/index.jsp Mon Feb 3 11:07:34 2014
@@ -116,7 +116,8 @@
<tr>
<td class="menu">
<a href="/manager/status">Status</a><br/>
- <a href="/manager/html">Tomcat&nbsp;Manager</a><br/>
+ <a href="/manager/html">Web&nbsp;Application&nbsp;Manager</a><br/>
+ <a href="/host-manager/html">Virtual&nbsp;Host&nbsp;Manager</a><br/>
&nbsp;
</td>
</tr>

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-examples,v 1.8 2013/05/17 12:42:34 dcoppa Exp $
@comment $OpenBSD: PLIST-examples,v 1.9 2014/02/03 10:24:07 dcoppa Exp $
@conflict jakarta-tomcat-examples-*
@pkgpath www/jakarta-tomcat/v6,-examples
@owner _tomcat
@ -928,6 +928,7 @@ webapps/docs/api/org/apache/jasper/compiler/AttributeParser.html
webapps/docs/api/org/apache/jasper/compiler/BeanRepository.html
webapps/docs/api/org/apache/jasper/compiler/Compiler.html
webapps/docs/api/org/apache/jasper/compiler/ELFunctionMapper.html
webapps/docs/api/org/apache/jasper/compiler/ELParser.TextBuilder.html
webapps/docs/api/org/apache/jasper/compiler/ELParser.html
webapps/docs/api/org/apache/jasper/compiler/ErrorDispatcher.html
webapps/docs/api/org/apache/jasper/compiler/ErrorHandler.html
@ -1297,6 +1298,7 @@ webapps/docs/api/org/apache/tomcat/util/buf/package-frame.html
webapps/docs/api/org/apache/tomcat/util/buf/package-summary.html
webapps/docs/api/org/apache/tomcat/util/buf/package-tree.html
webapps/docs/api/org/apache/tomcat/util/collections/
webapps/docs/api/org/apache/tomcat/util/collections/ConcurrentCache.html
webapps/docs/api/org/apache/tomcat/util/collections/EmptyEnumeration.html
webapps/docs/api/org/apache/tomcat/util/collections/LRUCache.html
webapps/docs/api/org/apache/tomcat/util/collections/MultiMap.html
@ -1307,6 +1309,15 @@ webapps/docs/api/org/apache/tomcat/util/collections/SimplePool.html
webapps/docs/api/org/apache/tomcat/util/collections/package-frame.html
webapps/docs/api/org/apache/tomcat/util/collections/package-summary.html
webapps/docs/api/org/apache/tomcat/util/collections/package-tree.html
webapps/docs/api/org/apache/tomcat/util/descriptor/
webapps/docs/api/org/apache/tomcat/util/descriptor/Constants.html
webapps/docs/api/org/apache/tomcat/util/descriptor/DigesterFactory.html
webapps/docs/api/org/apache/tomcat/util/descriptor/LocalResolver.html
webapps/docs/api/org/apache/tomcat/util/descriptor/XmlErrorHandler.html
webapps/docs/api/org/apache/tomcat/util/descriptor/XmlIdentifiers.html
webapps/docs/api/org/apache/tomcat/util/descriptor/package-frame.html
webapps/docs/api/org/apache/tomcat/util/descriptor/package-summary.html
webapps/docs/api/org/apache/tomcat/util/descriptor/package-tree.html
webapps/docs/api/org/apache/tomcat/util/digester/
webapps/docs/api/org/apache/tomcat/util/digester/AbstractObjectCreationFactory.html
webapps/docs/api/org/apache/tomcat/util/digester/AbstractRulesImpl.html
@ -1382,6 +1393,13 @@ webapps/docs/api/org/apache/tomcat/util/http/mapper/package-tree.html
webapps/docs/api/org/apache/tomcat/util/http/package-frame.html
webapps/docs/api/org/apache/tomcat/util/http/package-summary.html
webapps/docs/api/org/apache/tomcat/util/http/package-tree.html
webapps/docs/api/org/apache/tomcat/util/http/parser/
webapps/docs/api/org/apache/tomcat/util/http/parser/HttpParser.html
webapps/docs/api/org/apache/tomcat/util/http/parser/MediaType.html
webapps/docs/api/org/apache/tomcat/util/http/parser/MediaTypeCache.html
webapps/docs/api/org/apache/tomcat/util/http/parser/package-frame.html
webapps/docs/api/org/apache/tomcat/util/http/parser/package-summary.html
webapps/docs/api/org/apache/tomcat/util/http/parser/package-tree.html
webapps/docs/api/org/apache/tomcat/util/log/
webapps/docs/api/org/apache/tomcat/util/log/SystemLogHandler.html
webapps/docs/api/org/apache/tomcat/util/log/UserDataHelper.Mode.html

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.9 2013/05/17 12:42:35 dcoppa Exp $
@comment $OpenBSD: PLIST-main,v 1.10 2014/02/03 10:24:07 dcoppa Exp $
@conflict jakarta-tomcat-*
@pkgpath www/tomcat/v6
@newgroup _tomcat:526
@ -93,7 +93,7 @@ tomcat/lib/catalina-ant.jar
tomcat/lib/catalina-ha.jar
tomcat/lib/catalina-tribes.jar
tomcat/lib/catalina.jar
tomcat/lib/ecj-4.2.2.jar
tomcat/lib/ecj-4.3.1.jar
tomcat/lib/el-api.jar
tomcat/lib/jasper-el.jar
tomcat/lib/jasper.jar