As noted by niklas@ when updating an old system, jakarta-tomcat-examples
does not automatically get upgraded to tomcat-examples; the -examples
packages are missing @conflict lines.
This diff adds these, moves to REVISION, and fixes example pf.conf
fragments for the PF changes in 4.7. Ok?
Index: v4/Makefile
===================================================================
RCS file: /cvs/ports/www/tomcat/v4/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- v4/Makefile 9 Nov 2009 11:03:26 -0000 1.15
+++ v4/Makefile 3 Sep 2010 11:03:19 -0000
@@ -6,9 +6,13 @@ COMMENT-examples=example applications an
V= 4.1.40
DISTNAME= apache-tomcat-${V}-LE-jdk14
-PKGNAME-main= tomcat-${V}p0
-PKGNAME-admin= tomcat-admin-${V}p0
-PKGNAME-examples=tomcat-examples-${V}p0
+REVISION-main= 1
+REVISION-admin= 0
+REVISION-examples= 1
+
+PKGNAME-main= tomcat-${V}
+PKGNAME-admin= tomcat-admin-${V}
+PKGNAME-examples=tomcat-examples-${V}
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_APACHE:=tomcat/tomcat-4/v$V/bin/} \
Index: v4/files/README.OpenBSD
===================================================================
RCS file: /cvs/ports/www/tomcat/v4/files/README.OpenBSD,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 README.OpenBSD
--- v4/files/README.OpenBSD 25 Oct 2006 18:10:17 -0000 1.1.1.1
+++ v4/files/README.OpenBSD 3 Sep 2010 11:03:19 -0000
@@ -33,7 +33,7 @@ sure the Connector port is 80 in your `%
more secure: redirect all tcp traffic to port 80 to Tomcat's default
listener port 8080 using a pf.conf(5) rule like:
- rdr on $NIC proto tcp from any to any port 80 -> 127.0.0.1 port 8080
+ pass quick on $NIC proto tcp to port 80 rdr-to 127.0.0.1 port 8080
If you are upgrading and use database drivers, don't forget to copy them
into %%PREFIX%%/tomcat/common/lib. If you use ssi or cgi, remember to
Index: v4/pkg/PLIST-examples
===================================================================
RCS file: /cvs/ports/www/tomcat/v4/pkg/PLIST-examples,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST-examples
--- v4/pkg/PLIST-examples 17 Jul 2009 13:38:56 -0000 1.4
+++ v4/pkg/PLIST-examples 3 Sep 2010 11:03:19 -0000
@@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST-examples,v 1.4 2009/07/17 13:38:56 kurt Exp $
@pkgpath www/jakarta-tomcat/v4,-examples
+...@conflict jakarta-tomcat-examples-*
@owner _tomcat
@group _tomcat
webapps/ROOT/
Index: v5/Makefile
===================================================================
RCS file: /cvs/ports/www/tomcat/v5/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- v5/Makefile 20 Jul 2009 14:24:15 -0000 1.11
+++ v5/Makefile 3 Sep 2010 11:03:19 -0000
@@ -6,10 +6,14 @@ COMMENT-examples=example applications an
V= 5.5.27
DISTNAME= apache-tomcat-${V}
+REVISION-main= 2
+REVISION-admin= 0
+REVISION-examples= 1
+
PKGNAME= tomcat-${V}
-PKGNAME-main= tomcat-${V}p1
-PKGNAME-admin= tomcat-admin-${V}p0
-PKGNAME-examples=tomcat-examples-${V}p0
+PKGNAME-main= tomcat-${V}
+PKGNAME-admin= tomcat-admin-${V}
+PKGNAME-examples= tomcat-examples-${V}
CATEGORIES= www
DISTFILES= ${DISTNAME}.tar.gz \
Index: v5/files/README.OpenBSD
===================================================================
RCS file: /cvs/ports/www/tomcat/v5/files/README.OpenBSD,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 README.OpenBSD
--- v5/files/README.OpenBSD 25 Oct 2006 18:10:18 -0000 1.1.1.1
+++ v5/files/README.OpenBSD 3 Sep 2010 11:03:19 -0000
@@ -33,7 +33,7 @@ sure the Connector port is 80 in your `%
more secure: redirect all tcp traffic to port 80 to Tomcat's default
listener port 8080 using a pf.conf(5) rule like:
- rdr on $NIC proto tcp from any to any port 80 -> 127.0.0.1 port 8080
+ pass quick on $NIC proto tcp to port 80 rdr-to 127.0.0.1 port 8080
If you are upgrading and use database drivers, don't forget to copy them
into %%PREFIX%%/tomcat/common/lib. If you use ssi or cgi, remember to
Index: v5/pkg/PLIST-examples
===================================================================
RCS file: /cvs/ports/www/tomcat/v5/pkg/PLIST-examples,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST-examples
--- v5/pkg/PLIST-examples 4 Jan 2009 23:28:59 -0000 1.5
+++ v5/pkg/PLIST-examples 3 Sep 2010 11:03:19 -0000
@@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST-examples,v 1.5 2009/01/04 23:28:59 kurt Exp $
@pkgpath www/jakarta-tomcat/v5,-examples
+...@conflict jakarta-tomcat-examples-*
@owner _tomcat
@group _tomcat
webapps/ROOT/
Index: v6/Makefile
===================================================================
RCS file: /cvs/ports/www/tomcat/v6/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- v6/Makefile 20 Jul 2009 14:24:15 -0000 1.5
+++ v6/Makefile 3 Sep 2010 11:03:19 -0000
@@ -5,9 +5,11 @@ COMMENT-examples=example applications an
V= 6.0.20
DISTNAME= apache-tomcat-${V}
+REVISION-examples= 1
+
PKGNAME= tomcat-${V}
PKGNAME-main= tomcat-${V}
-PKGNAME-examples=tomcat-examples-${V}p0
+PKGNAME-examples= tomcat-examples-${V}
CATEGORIES= www
DISTFILES= ${DISTNAME}.tar.gz \
Index: v6/pkg/PLIST-examples
===================================================================
RCS file: /cvs/ports/www/tomcat/v6/pkg/PLIST-examples,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-examples
--- v6/pkg/PLIST-examples 12 Jun 2009 17:46:56 -0000 1.2
+++ v6/pkg/PLIST-examples 3 Sep 2010 11:03:19 -0000
@@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST-examples,v 1.2 2009/06/12 17:46:56 kurt Exp $
@pkgpath www/jakarta-tomcat/v6,-examples
+...@conflict jakarta-tomcat-examples-*
@owner _tomcat
@group _tomcat
webapps/ROOT/
