From toha@ib.com.ua  Fri Jul 18 06:58:52 2003
Return-Path: <toha@ib.com.ua>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id AA56537B401
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 18 Jul 2003 06:58:52 -0700 (PDT)
Received: from ib.com.ua (ib.com.ua [217.144.67.33])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7D44543F93
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 18 Jul 2003 06:58:44 -0700 (PDT)
	(envelope-from toha@ib.com.ua)
Received: from ib.com.ua (localhost.ib.com.ua [127.0.0.1])
	by ib.com.ua (8.12.9/8.12.9) with ESMTP id h6IDvSun043131
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 18 Jul 2003 16:57:28 +0300 (EEST)
	(envelope-from toha@ib.com.ua)
Received: (from toha@localhost)
	by ib.com.ua (8.12.9/8.12.9/Submit) id h6IDvSJF043130;
	Fri, 18 Jul 2003 16:57:28 +0300 (EEST)
Message-Id: <200307181357.h6IDvSJF043130@ib.com.ua>
Date: Fri, 18 Jul 2003 16:57:28 +0300 (EEST)
From: Anton Yudin <toha@toha.org.ua>
Reply-To: Anton Yudin <toha@toha.org.ua>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [maintainer-update] update java/jakarta-struts port
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         54615
>Category:       ports
>Synopsis:       [maintainer-update] update java/jakarta-struts port
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jul 18 07:00:30 PDT 2003
>Closed-Date:    Mon Jul 21 03:06:06 PDT 2003
>Last-Modified:  Mon Jul 21 03:06:06 PDT 2003
>Originator:     Anton Yudin
>Release:        FreeBSD 4.8-STABLE i386
>Organization:
>Environment:


	
>Description:
	update java/jakarta-struts port to 1.1 release
	
>How-To-Repeat:
	
>Fix:

diff -ruN jakarta-struts.bak/Makefile jakarta-struts/Makefile
--- jakarta-struts.bak/Makefile	Mon Jul  7 09:54:52 2003
+++ jakarta-struts/Makefile	Fri Jul 18 16:47:04 2003
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	jakarta-struts
-PORTVERSION=	1.1-rc2
+PORTVERSION=	1.1
 CATEGORIES=	java
-MASTER_SITES=	http://apache.dnepr.net/jakarta/struts/binaries/
+MASTER_SITES=	http://apache.dnepr.net/jakarta/struts/binaries/ \
+		http://www.apache.org/dist/jakarta/struts/binaries/
 DIST_SUBDIR=	jakarta
 
 MAINTAINER=	toha@toha.org.ua
diff -ruN jakarta-struts.bak/distinfo jakarta-struts/distinfo
--- jakarta-struts.bak/distinfo	Mon Jul  7 09:54:52 2003
+++ jakarta-struts/distinfo	Fri Jul 18 16:45:30 2003
@@ -1 +1 @@
-MD5 (jakarta/jakarta-struts-1.1-rc2.tar.gz) = 75a6b9e0355dfda74b18a94902df7a19
+MD5 (jakarta/jakarta-struts-1.1.tar.gz) = 95077828cc1a8203999fa12efaf318d3
diff -ruN jakarta-struts.bak/pkg-plist jakarta-struts/pkg-plist
--- jakarta-struts.bak/pkg-plist	Mon Jul  7 09:54:52 2003
+++ jakarta-struts/pkg-plist	Fri Jul 18 16:45:30 2003
@@ -1,75 +1,74 @@
-share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/x.tld
-share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/c.tld
-share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/commons-beanutils.jar
-share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/commons-collections.jar
-share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/commons-digester.jar
-share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/commons-fileupload.jar
-share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/commons-lang.jar
-share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/commons-logging.jar
-share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/commons-validator.jar
-share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/fmt-rt.tld
-share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/fmt.tld
-share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/jakarta-oro.jar
-share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/jstl.jar
-share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/sql-rt.tld
-share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/sql.tld
-share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/standard.jar
-share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/struts-bean-el.tld
-share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/struts-bean.tld
-share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/struts-el.jar
-share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/struts.jar
-share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/struts-html-el.tld
-share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/struts-html.tld
-share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/struts-legacy.jar
-share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/struts-logic-el.tld
-share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/struts-logic.tld
-share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/struts-nested.tld
-share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/struts-template.tld
-share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/struts-tiles.tld
-share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/x-rt.tld
-share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/c-rt.tld
-share/java/jakarta-struts-1.1-rc2/contrib/struts-el/webapps/strutsel-exercise-taglib.war
-share/java/jakarta-struts-1.1-rc2/contrib/struts-el/README.txt
-share/java/jakarta-struts-1.1-rc2/lib/web-app_2_3.dtd
-share/java/jakarta-struts-1.1-rc2/lib/commons-collections.jar
-share/java/jakarta-struts-1.1-rc2/lib/commons-digester.jar
-share/java/jakarta-struts-1.1-rc2/lib/commons-fileupload.jar
-share/java/jakarta-struts-1.1-rc2/lib/commons-lang.jar
-share/java/jakarta-struts-1.1-rc2/lib/commons-logging.jar
-share/java/jakarta-struts-1.1-rc2/lib/commons-validator.jar
-share/java/jakarta-struts-1.1-rc2/lib/jakarta-oro.jar
-share/java/jakarta-struts-1.1-rc2/lib/struts-bean.tld
-share/java/jakarta-struts-1.1-rc2/lib/struts-config_1_0.dtd
-share/java/jakarta-struts-1.1-rc2/lib/struts-config_1_1.dtd
-share/java/jakarta-struts-1.1-rc2/lib/struts-html.tld
-share/java/jakarta-struts-1.1-rc2/lib/struts-legacy.jar
-share/java/jakarta-struts-1.1-rc2/lib/struts-logic.tld
-share/java/jakarta-struts-1.1-rc2/lib/struts-nested.tld
-share/java/jakarta-struts-1.1-rc2/lib/struts-template.tld
-share/java/jakarta-struts-1.1-rc2/lib/struts.jar
-share/java/jakarta-struts-1.1-rc2/lib/struts-tiles.tld
-share/java/jakarta-struts-1.1-rc2/lib/tiles-config.dtd
-share/java/jakarta-struts-1.1-rc2/lib/tiles-config_1_1.dtd
-share/java/jakarta-struts-1.1-rc2/lib/validation_1_1.dtd
-share/java/jakarta-struts-1.1-rc2/lib/validator-rules.xml
-share/java/jakarta-struts-1.1-rc2/lib/validator-rules_1_1.dtd
-share/java/jakarta-struts-1.1-rc2/lib/web-app_2_2.dtd
-share/java/jakarta-struts-1.1-rc2/lib/commons-beanutils.jar
-share/java/jakarta-struts-1.1-rc2/webapps/tiles-documentation.war
-share/java/jakarta-struts-1.1-rc2/webapps/struts-documentation.war
-share/java/jakarta-struts-1.1-rc2/webapps/struts-example.war
-share/java/jakarta-struts-1.1-rc2/webapps/struts-exercise-taglib.war
-share/java/jakarta-struts-1.1-rc2/webapps/struts-template.war
-share/java/jakarta-struts-1.1-rc2/webapps/struts-upload.war
-share/java/jakarta-struts-1.1-rc2/webapps/struts-validator.war
-share/java/jakarta-struts-1.1-rc2/webapps/struts-blank.war
-share/java/jakarta-struts-1.1-rc2/INSTALL
-share/java/jakarta-struts-1.1-rc2/LICENSE
-share/java/jakarta-struts-1.1-rc2/README
-@dirrm share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib
-@dirrm share/java/jakarta-struts-1.1-rc2/contrib/struts-el/webapps
-@dirrm share/java/jakarta-struts-1.1-rc2/contrib/struts-el
-@dirrm share/java/jakarta-struts-1.1-rc2/contrib
-@dirrm share/java/jakarta-struts-1.1-rc2/lib
-@dirrm share/java/jakarta-struts-1.1-rc2/webapps
-@dirrm share/java/jakarta-struts-1.1-rc2
+share/java/jakarta-struts-1.1/contrib/struts-el/lib/x.tld
+share/java/jakarta-struts-1.1/contrib/struts-el/lib/c.tld
+share/java/jakarta-struts-1.1/contrib/struts-el/lib/commons-beanutils.jar
+share/java/jakarta-struts-1.1/contrib/struts-el/lib/commons-collections.jar
+share/java/jakarta-struts-1.1/contrib/struts-el/lib/commons-digester.jar
+share/java/jakarta-struts-1.1/contrib/struts-el/lib/commons-fileupload.jar
+share/java/jakarta-struts-1.1/contrib/struts-el/lib/commons-lang.jar
+share/java/jakarta-struts-1.1/contrib/struts-el/lib/commons-logging.jar
+share/java/jakarta-struts-1.1/contrib/struts-el/lib/commons-validator.jar
+share/java/jakarta-struts-1.1/contrib/struts-el/lib/fmt-rt.tld
+share/java/jakarta-struts-1.1/contrib/struts-el/lib/fmt.tld
+share/java/jakarta-struts-1.1/contrib/struts-el/lib/jakarta-oro.jar
+share/java/jakarta-struts-1.1/contrib/struts-el/lib/jstl.jar
+share/java/jakarta-struts-1.1/contrib/struts-el/lib/sql-rt.tld
+share/java/jakarta-struts-1.1/contrib/struts-el/lib/sql.tld
+share/java/jakarta-struts-1.1/contrib/struts-el/lib/standard.jar
+share/java/jakarta-struts-1.1/contrib/struts-el/lib/struts-bean-el.tld
+share/java/jakarta-struts-1.1/contrib/struts-el/lib/struts-bean.tld
+share/java/jakarta-struts-1.1/contrib/struts-el/lib/struts-el.jar
+share/java/jakarta-struts-1.1/contrib/struts-el/lib/struts.jar
+share/java/jakarta-struts-1.1/contrib/struts-el/lib/struts-html-el.tld
+share/java/jakarta-struts-1.1/contrib/struts-el/lib/struts-html.tld
+share/java/jakarta-struts-1.1/contrib/struts-el/lib/struts-logic-el.tld
+share/java/jakarta-struts-1.1/contrib/struts-el/lib/struts-logic.tld
+share/java/jakarta-struts-1.1/contrib/struts-el/lib/struts-nested.tld
+share/java/jakarta-struts-1.1/contrib/struts-el/lib/struts-template.tld
+share/java/jakarta-struts-1.1/contrib/struts-el/lib/struts-tiles.tld
+share/java/jakarta-struts-1.1/contrib/struts-el/lib/x-rt.tld
+share/java/jakarta-struts-1.1/contrib/struts-el/lib/c-rt.tld
+share/java/jakarta-struts-1.1/contrib/struts-el/webapps/strutsel-exercise-taglib.war
+share/java/jakarta-struts-1.1/contrib/struts-el/README.txt
+share/java/jakarta-struts-1.1/lib/web-app_2_3.dtd
+share/java/jakarta-struts-1.1/lib/commons-collections.jar
+share/java/jakarta-struts-1.1/lib/commons-digester.jar
+share/java/jakarta-struts-1.1/lib/commons-fileupload.jar
+share/java/jakarta-struts-1.1/lib/commons-lang.jar
+share/java/jakarta-struts-1.1/lib/commons-logging.jar
+share/java/jakarta-struts-1.1/lib/commons-validator.jar
+share/java/jakarta-struts-1.1/lib/jakarta-oro.jar
+share/java/jakarta-struts-1.1/lib/struts-bean.tld
+share/java/jakarta-struts-1.1/lib/struts-config_1_0.dtd
+share/java/jakarta-struts-1.1/lib/struts-config_1_1.dtd
+share/java/jakarta-struts-1.1/lib/struts-html.tld
+share/java/jakarta-struts-1.1/lib/struts-legacy.jar
+share/java/jakarta-struts-1.1/lib/struts-logic.tld
+share/java/jakarta-struts-1.1/lib/struts-nested.tld
+share/java/jakarta-struts-1.1/lib/struts-template.tld
+share/java/jakarta-struts-1.1/lib/struts.jar
+share/java/jakarta-struts-1.1/lib/struts-tiles.tld
+share/java/jakarta-struts-1.1/lib/tiles-config.dtd
+share/java/jakarta-struts-1.1/lib/tiles-config_1_1.dtd
+share/java/jakarta-struts-1.1/lib/validation_1_1.dtd
+share/java/jakarta-struts-1.1/lib/validator-rules.xml
+share/java/jakarta-struts-1.1/lib/validator-rules_1_1.dtd
+share/java/jakarta-struts-1.1/lib/web-app_2_2.dtd
+share/java/jakarta-struts-1.1/lib/commons-beanutils.jar
+share/java/jakarta-struts-1.1/webapps/tiles-documentation.war
+share/java/jakarta-struts-1.1/webapps/struts-documentation.war
+share/java/jakarta-struts-1.1/webapps/struts-example.war
+share/java/jakarta-struts-1.1/webapps/struts-exercise-taglib.war
+share/java/jakarta-struts-1.1/webapps/struts-template.war
+share/java/jakarta-struts-1.1/webapps/struts-upload.war
+share/java/jakarta-struts-1.1/webapps/struts-validator.war
+share/java/jakarta-struts-1.1/webapps/struts-blank.war
+share/java/jakarta-struts-1.1/INSTALL
+share/java/jakarta-struts-1.1/LICENSE
+share/java/jakarta-struts-1.1/README
+@dirrm share/java/jakarta-struts-1.1/contrib/struts-el/lib
+@dirrm share/java/jakarta-struts-1.1/contrib/struts-el/webapps
+@dirrm share/java/jakarta-struts-1.1/contrib/struts-el
+@dirrm share/java/jakarta-struts-1.1/contrib
+@dirrm share/java/jakarta-struts-1.1/lib
+@dirrm share/java/jakarta-struts-1.1/webapps
+@dirrm share/java/jakarta-struts-1.1

>Release-Note:
>Audit-Trail:

From: Anton Yudin <toha@ib.com.ua>
To: freebsd-gnats-submit@FreeBSD.org, toha@toha.org.ua
Cc:  
Subject: Re: ports/54615: [maintainer-update] update java/jakarta-struts port
Date: Fri, 18 Jul 2003 18:16:06 +0300 (EEST)

 diff -ruN jakarta-struts.bak/Makefile jakarta-struts/Makefile
 --- jakarta-struts.bak/Makefile	Mon Jul  7 09:54:52 2003
 +++ jakarta-struts/Makefile	Fri Jul 18 17:25:24 2003
 @@ -6,9 +6,10 @@
  #
  
  PORTNAME=	jakarta-struts
 -PORTVERSION=	1.1-rc2
 +PORTVERSION=	1.1
  CATEGORIES=	java
 -MASTER_SITES=	http://apache.dnepr.net/jakarta/struts/binaries/
 +MASTER_SITES=	http://apache.dnepr.net/jakarta/struts/binaries/ \
 +		http://www.apache.org/dist/jakarta/struts/binaries/
  DIST_SUBDIR=	jakarta
  
  MAINTAINER=	toha@toha.org.ua
 @@ -17,9 +18,11 @@
  USE_JAVA=	1.3+
  NO_BUILD=	YES
  
 -JAVASHAREDIR=	${PREFIX}/share/java
 +JAVASHAREDIR=	share/java
 +TDIR=		${JAVASHAREDIR}/${PKGNAME}
 +PLIST_SUB+=	T=${TDIR}
  
  do-install:
 -	${CP} -r ${WRKSRC}/ ${JAVASHAREDIR}/${PORTNAME}-${PORTVERSION}
 +	${CP} -r ${WRKSRC}/ ${PREFIX}/${TDIR}
  
  .include <bsd.port.mk>
 diff -ruN jakarta-struts.bak/distinfo jakarta-struts/distinfo
 --- jakarta-struts.bak/distinfo	Mon Jul  7 09:54:52 2003
 +++ jakarta-struts/distinfo	Fri Jul 18 16:45:30 2003
 @@ -1 +1 @@
 -MD5 (jakarta/jakarta-struts-1.1-rc2.tar.gz) = 75a6b9e0355dfda74b18a94902df7a19
 +MD5 (jakarta/jakarta-struts-1.1.tar.gz) = 95077828cc1a8203999fa12efaf318d3
 diff -ruN jakarta-struts.bak/pkg-plist jakarta-struts/pkg-plist
 --- jakarta-struts.bak/pkg-plist	Mon Jul  7 09:54:52 2003
 +++ jakarta-struts/pkg-plist	Fri Jul 18 17:13:24 2003
 @@ -1,75 +1,74 @@
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/x.tld
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/c.tld
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/commons-beanutils.jar
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/commons-collections.jar
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/commons-digester.jar
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/commons-fileupload.jar
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/commons-lang.jar
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/commons-logging.jar
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/commons-validator.jar
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/fmt-rt.tld
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/fmt.tld
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/jakarta-oro.jar
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/jstl.jar
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/sql-rt.tld
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/sql.tld
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/standard.jar
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/struts-bean-el.tld
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/struts-bean.tld
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/struts-el.jar
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/struts.jar
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/struts-html-el.tld
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/struts-html.tld
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/struts-legacy.jar
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/struts-logic-el.tld
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/struts-logic.tld
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/struts-nested.tld
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/struts-template.tld
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/struts-tiles.tld
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/x-rt.tld
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/c-rt.tld
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/webapps/strutsel-exercise-taglib.war
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/README.txt
 -share/java/jakarta-struts-1.1-rc2/lib/web-app_2_3.dtd
 -share/java/jakarta-struts-1.1-rc2/lib/commons-collections.jar
 -share/java/jakarta-struts-1.1-rc2/lib/commons-digester.jar
 -share/java/jakarta-struts-1.1-rc2/lib/commons-fileupload.jar
 -share/java/jakarta-struts-1.1-rc2/lib/commons-lang.jar
 -share/java/jakarta-struts-1.1-rc2/lib/commons-logging.jar
 -share/java/jakarta-struts-1.1-rc2/lib/commons-validator.jar
 -share/java/jakarta-struts-1.1-rc2/lib/jakarta-oro.jar
 -share/java/jakarta-struts-1.1-rc2/lib/struts-bean.tld
 -share/java/jakarta-struts-1.1-rc2/lib/struts-config_1_0.dtd
 -share/java/jakarta-struts-1.1-rc2/lib/struts-config_1_1.dtd
 -share/java/jakarta-struts-1.1-rc2/lib/struts-html.tld
 -share/java/jakarta-struts-1.1-rc2/lib/struts-legacy.jar
 -share/java/jakarta-struts-1.1-rc2/lib/struts-logic.tld
 -share/java/jakarta-struts-1.1-rc2/lib/struts-nested.tld
 -share/java/jakarta-struts-1.1-rc2/lib/struts-template.tld
 -share/java/jakarta-struts-1.1-rc2/lib/struts.jar
 -share/java/jakarta-struts-1.1-rc2/lib/struts-tiles.tld
 -share/java/jakarta-struts-1.1-rc2/lib/tiles-config.dtd
 -share/java/jakarta-struts-1.1-rc2/lib/tiles-config_1_1.dtd
 -share/java/jakarta-struts-1.1-rc2/lib/validation_1_1.dtd
 -share/java/jakarta-struts-1.1-rc2/lib/validator-rules.xml
 -share/java/jakarta-struts-1.1-rc2/lib/validator-rules_1_1.dtd
 -share/java/jakarta-struts-1.1-rc2/lib/web-app_2_2.dtd
 -share/java/jakarta-struts-1.1-rc2/lib/commons-beanutils.jar
 -share/java/jakarta-struts-1.1-rc2/webapps/tiles-documentation.war
 -share/java/jakarta-struts-1.1-rc2/webapps/struts-documentation.war
 -share/java/jakarta-struts-1.1-rc2/webapps/struts-example.war
 -share/java/jakarta-struts-1.1-rc2/webapps/struts-exercise-taglib.war
 -share/java/jakarta-struts-1.1-rc2/webapps/struts-template.war
 -share/java/jakarta-struts-1.1-rc2/webapps/struts-upload.war
 -share/java/jakarta-struts-1.1-rc2/webapps/struts-validator.war
 -share/java/jakarta-struts-1.1-rc2/webapps/struts-blank.war
 -share/java/jakarta-struts-1.1-rc2/INSTALL
 -share/java/jakarta-struts-1.1-rc2/LICENSE
 -share/java/jakarta-struts-1.1-rc2/README
 -@dirrm share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib
 -@dirrm share/java/jakarta-struts-1.1-rc2/contrib/struts-el/webapps
 -@dirrm share/java/jakarta-struts-1.1-rc2/contrib/struts-el
 -@dirrm share/java/jakarta-struts-1.1-rc2/contrib
 -@dirrm share/java/jakarta-struts-1.1-rc2/lib
 -@dirrm share/java/jakarta-struts-1.1-rc2/webapps
 -@dirrm share/java/jakarta-struts-1.1-rc2
 +%%T%%/contrib/struts-el/lib/x.tld
 +%%T%%/contrib/struts-el/lib/c.tld
 +%%T%%/contrib/struts-el/lib/commons-beanutils.jar
 +%%T%%/contrib/struts-el/lib/commons-collections.jar
 +%%T%%/contrib/struts-el/lib/commons-digester.jar
 +%%T%%/contrib/struts-el/lib/commons-fileupload.jar
 +%%T%%/contrib/struts-el/lib/commons-lang.jar
 +%%T%%/contrib/struts-el/lib/commons-logging.jar
 +%%T%%/contrib/struts-el/lib/commons-validator.jar
 +%%T%%/contrib/struts-el/lib/fmt-rt.tld
 +%%T%%/contrib/struts-el/lib/fmt.tld
 +%%T%%/contrib/struts-el/lib/jakarta-oro.jar
 +%%T%%/contrib/struts-el/lib/jstl.jar
 +%%T%%/contrib/struts-el/lib/sql-rt.tld
 +%%T%%/contrib/struts-el/lib/sql.tld
 +%%T%%/contrib/struts-el/lib/standard.jar
 +%%T%%/contrib/struts-el/lib/struts-bean-el.tld
 +%%T%%/contrib/struts-el/lib/struts-bean.tld
 +%%T%%/contrib/struts-el/lib/struts-el.jar
 +%%T%%/contrib/struts-el/lib/struts.jar
 +%%T%%/contrib/struts-el/lib/struts-html-el.tld
 +%%T%%/contrib/struts-el/lib/struts-html.tld
 +%%T%%/contrib/struts-el/lib/struts-logic-el.tld
 +%%T%%/contrib/struts-el/lib/struts-logic.tld
 +%%T%%/contrib/struts-el/lib/struts-nested.tld
 +%%T%%/contrib/struts-el/lib/struts-template.tld
 +%%T%%/contrib/struts-el/lib/struts-tiles.tld
 +%%T%%/contrib/struts-el/lib/x-rt.tld
 +%%T%%/contrib/struts-el/lib/c-rt.tld
 +%%T%%/contrib/struts-el/webapps/strutsel-exercise-taglib.war
 +%%T%%/contrib/struts-el/README.txt
 +%%T%%/lib/web-app_2_3.dtd
 +%%T%%/lib/commons-collections.jar
 +%%T%%/lib/commons-digester.jar
 +%%T%%/lib/commons-fileupload.jar
 +%%T%%/lib/commons-lang.jar
 +%%T%%/lib/commons-logging.jar
 +%%T%%/lib/commons-validator.jar
 +%%T%%/lib/jakarta-oro.jar
 +%%T%%/lib/struts-bean.tld
 +%%T%%/lib/struts-config_1_0.dtd
 +%%T%%/lib/struts-config_1_1.dtd
 +%%T%%/lib/struts-html.tld
 +%%T%%/lib/struts-legacy.jar
 +%%T%%/lib/struts-logic.tld
 +%%T%%/lib/struts-nested.tld
 +%%T%%/lib/struts-template.tld
 +%%T%%/lib/struts.jar
 +%%T%%/lib/struts-tiles.tld
 +%%T%%/lib/tiles-config.dtd
 +%%T%%/lib/tiles-config_1_1.dtd
 +%%T%%/lib/validation_1_1.dtd
 +%%T%%/lib/validator-rules.xml
 +%%T%%/lib/validator-rules_1_1.dtd
 +%%T%%/lib/web-app_2_2.dtd
 +%%T%%/lib/commons-beanutils.jar
 +%%T%%/webapps/tiles-documentation.war
 +%%T%%/webapps/struts-documentation.war
 +%%T%%/webapps/struts-example.war
 +%%T%%/webapps/struts-exercise-taglib.war
 +%%T%%/webapps/struts-template.war
 +%%T%%/webapps/struts-upload.war
 +%%T%%/webapps/struts-validator.war
 +%%T%%/webapps/struts-blank.war
 +%%T%%/INSTALL
 +%%T%%/LICENSE
 +%%T%%/README
 +@dirrm %%T%%/contrib/struts-el/lib
 +@dirrm %%T%%/contrib/struts-el/webapps
 +@dirrm %%T%%/contrib/struts-el
 +@dirrm %%T%%/contrib
 +@dirrm %%T%%/lib
 +@dirrm %%T%%/webapps
 +@dirrm %%T%%
 

From: Anton Yudin <toha@ib.com.ua>
To: freebsd-gnats-submit@FreeBSD.org, toha@toha.org.ua
Cc:  
Subject: Re: ports/54615: [maintainer-update] update java/jakarta-struts port
Date: Mon, 21 Jul 2003 12:37:58 +0300 (EEST)

 diff -ruN jakarta-struts.bak/Makefile jakarta-struts/Makefile
 --- jakarta-struts.bak/Makefile	Mon Jul  7 09:54:52 2003
 +++ jakarta-struts/Makefile	Mon Jul 21 12:33:46 2003
 @@ -6,9 +6,10 @@
  #
  
  PORTNAME=	jakarta-struts
 -PORTVERSION=	1.1-rc2
 +PORTVERSION=	1.1
  CATEGORIES=	java
 -MASTER_SITES=	http://apache.dnepr.net/jakarta/struts/binaries/
 +MASTER_SITES=	http://apache.dnepr.net/jakarta/struts/binaries/ \
 +		http://www.apache.org/dist/jakarta/struts/binaries/
  DIST_SUBDIR=	jakarta
  
  MAINTAINER=	toha@toha.org.ua
 @@ -17,9 +18,12 @@
  USE_JAVA=	1.3+
  NO_BUILD=	YES
  
 -JAVASHAREDIR=	${PREFIX}/share/java
 +JAVASHAREDIR=	share/java
 +TDIR=		${JAVASHAREDIR}/${PKGNAME}
 +PLIST_SUB+=	T=${TDIR}
  
  do-install:
 -	${CP} -r ${WRKSRC}/ ${JAVASHAREDIR}/${PORTNAME}-${PORTVERSION}
 +	cd ${WRKSRC} && ${FIND} . -type d -exec ${INSTALL} -d ${PREFIX}/${TDIR}/'{}' \; && \
 +	${FIND} . -type f -exec ${INSTALL_DATA} '{}' ${PREFIX}/${TDIR}/'{}' \;
  
  .include <bsd.port.mk>
 diff -ruN jakarta-struts.bak/distinfo jakarta-struts/distinfo
 --- jakarta-struts.bak/distinfo	Mon Jul  7 09:54:52 2003
 +++ jakarta-struts/distinfo	Fri Jul 18 16:45:30 2003
 @@ -1 +1 @@
 -MD5 (jakarta/jakarta-struts-1.1-rc2.tar.gz) = 75a6b9e0355dfda74b18a94902df7a19
 +MD5 (jakarta/jakarta-struts-1.1.tar.gz) = 95077828cc1a8203999fa12efaf318d3
 diff -ruN jakarta-struts.bak/pkg-plist jakarta-struts/pkg-plist
 --- jakarta-struts.bak/pkg-plist	Mon Jul  7 09:54:52 2003
 +++ jakarta-struts/pkg-plist	Fri Jul 18 17:13:24 2003
 @@ -1,75 +1,74 @@
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/x.tld
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/c.tld
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/commons-beanutils.jar
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/commons-collections.jar
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/commons-digester.jar
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/commons-fileupload.jar
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/commons-lang.jar
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/commons-logging.jar
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/commons-validator.jar
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/fmt-rt.tld
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/fmt.tld
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/jakarta-oro.jar
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/jstl.jar
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/sql-rt.tld
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/sql.tld
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/standard.jar
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/struts-bean-el.tld
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/struts-bean.tld
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/struts-el.jar
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/struts.jar
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/struts-html-el.tld
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/struts-html.tld
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/struts-legacy.jar
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/struts-logic-el.tld
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/struts-logic.tld
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/struts-nested.tld
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/struts-template.tld
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/struts-tiles.tld
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/x-rt.tld
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib/c-rt.tld
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/webapps/strutsel-exercise-taglib.war
 -share/java/jakarta-struts-1.1-rc2/contrib/struts-el/README.txt
 -share/java/jakarta-struts-1.1-rc2/lib/web-app_2_3.dtd
 -share/java/jakarta-struts-1.1-rc2/lib/commons-collections.jar
 -share/java/jakarta-struts-1.1-rc2/lib/commons-digester.jar
 -share/java/jakarta-struts-1.1-rc2/lib/commons-fileupload.jar
 -share/java/jakarta-struts-1.1-rc2/lib/commons-lang.jar
 -share/java/jakarta-struts-1.1-rc2/lib/commons-logging.jar
 -share/java/jakarta-struts-1.1-rc2/lib/commons-validator.jar
 -share/java/jakarta-struts-1.1-rc2/lib/jakarta-oro.jar
 -share/java/jakarta-struts-1.1-rc2/lib/struts-bean.tld
 -share/java/jakarta-struts-1.1-rc2/lib/struts-config_1_0.dtd
 -share/java/jakarta-struts-1.1-rc2/lib/struts-config_1_1.dtd
 -share/java/jakarta-struts-1.1-rc2/lib/struts-html.tld
 -share/java/jakarta-struts-1.1-rc2/lib/struts-legacy.jar
 -share/java/jakarta-struts-1.1-rc2/lib/struts-logic.tld
 -share/java/jakarta-struts-1.1-rc2/lib/struts-nested.tld
 -share/java/jakarta-struts-1.1-rc2/lib/struts-template.tld
 -share/java/jakarta-struts-1.1-rc2/lib/struts.jar
 -share/java/jakarta-struts-1.1-rc2/lib/struts-tiles.tld
 -share/java/jakarta-struts-1.1-rc2/lib/tiles-config.dtd
 -share/java/jakarta-struts-1.1-rc2/lib/tiles-config_1_1.dtd
 -share/java/jakarta-struts-1.1-rc2/lib/validation_1_1.dtd
 -share/java/jakarta-struts-1.1-rc2/lib/validator-rules.xml
 -share/java/jakarta-struts-1.1-rc2/lib/validator-rules_1_1.dtd
 -share/java/jakarta-struts-1.1-rc2/lib/web-app_2_2.dtd
 -share/java/jakarta-struts-1.1-rc2/lib/commons-beanutils.jar
 -share/java/jakarta-struts-1.1-rc2/webapps/tiles-documentation.war
 -share/java/jakarta-struts-1.1-rc2/webapps/struts-documentation.war
 -share/java/jakarta-struts-1.1-rc2/webapps/struts-example.war
 -share/java/jakarta-struts-1.1-rc2/webapps/struts-exercise-taglib.war
 -share/java/jakarta-struts-1.1-rc2/webapps/struts-template.war
 -share/java/jakarta-struts-1.1-rc2/webapps/struts-upload.war
 -share/java/jakarta-struts-1.1-rc2/webapps/struts-validator.war
 -share/java/jakarta-struts-1.1-rc2/webapps/struts-blank.war
 -share/java/jakarta-struts-1.1-rc2/INSTALL
 -share/java/jakarta-struts-1.1-rc2/LICENSE
 -share/java/jakarta-struts-1.1-rc2/README
 -@dirrm share/java/jakarta-struts-1.1-rc2/contrib/struts-el/lib
 -@dirrm share/java/jakarta-struts-1.1-rc2/contrib/struts-el/webapps
 -@dirrm share/java/jakarta-struts-1.1-rc2/contrib/struts-el
 -@dirrm share/java/jakarta-struts-1.1-rc2/contrib
 -@dirrm share/java/jakarta-struts-1.1-rc2/lib
 -@dirrm share/java/jakarta-struts-1.1-rc2/webapps
 -@dirrm share/java/jakarta-struts-1.1-rc2
 +%%T%%/contrib/struts-el/lib/x.tld
 +%%T%%/contrib/struts-el/lib/c.tld
 +%%T%%/contrib/struts-el/lib/commons-beanutils.jar
 +%%T%%/contrib/struts-el/lib/commons-collections.jar
 +%%T%%/contrib/struts-el/lib/commons-digester.jar
 +%%T%%/contrib/struts-el/lib/commons-fileupload.jar
 +%%T%%/contrib/struts-el/lib/commons-lang.jar
 +%%T%%/contrib/struts-el/lib/commons-logging.jar
 +%%T%%/contrib/struts-el/lib/commons-validator.jar
 +%%T%%/contrib/struts-el/lib/fmt-rt.tld
 +%%T%%/contrib/struts-el/lib/fmt.tld
 +%%T%%/contrib/struts-el/lib/jakarta-oro.jar
 +%%T%%/contrib/struts-el/lib/jstl.jar
 +%%T%%/contrib/struts-el/lib/sql-rt.tld
 +%%T%%/contrib/struts-el/lib/sql.tld
 +%%T%%/contrib/struts-el/lib/standard.jar
 +%%T%%/contrib/struts-el/lib/struts-bean-el.tld
 +%%T%%/contrib/struts-el/lib/struts-bean.tld
 +%%T%%/contrib/struts-el/lib/struts-el.jar
 +%%T%%/contrib/struts-el/lib/struts.jar
 +%%T%%/contrib/struts-el/lib/struts-html-el.tld
 +%%T%%/contrib/struts-el/lib/struts-html.tld
 +%%T%%/contrib/struts-el/lib/struts-logic-el.tld
 +%%T%%/contrib/struts-el/lib/struts-logic.tld
 +%%T%%/contrib/struts-el/lib/struts-nested.tld
 +%%T%%/contrib/struts-el/lib/struts-template.tld
 +%%T%%/contrib/struts-el/lib/struts-tiles.tld
 +%%T%%/contrib/struts-el/lib/x-rt.tld
 +%%T%%/contrib/struts-el/lib/c-rt.tld
 +%%T%%/contrib/struts-el/webapps/strutsel-exercise-taglib.war
 +%%T%%/contrib/struts-el/README.txt
 +%%T%%/lib/web-app_2_3.dtd
 +%%T%%/lib/commons-collections.jar
 +%%T%%/lib/commons-digester.jar
 +%%T%%/lib/commons-fileupload.jar
 +%%T%%/lib/commons-lang.jar
 +%%T%%/lib/commons-logging.jar
 +%%T%%/lib/commons-validator.jar
 +%%T%%/lib/jakarta-oro.jar
 +%%T%%/lib/struts-bean.tld
 +%%T%%/lib/struts-config_1_0.dtd
 +%%T%%/lib/struts-config_1_1.dtd
 +%%T%%/lib/struts-html.tld
 +%%T%%/lib/struts-legacy.jar
 +%%T%%/lib/struts-logic.tld
 +%%T%%/lib/struts-nested.tld
 +%%T%%/lib/struts-template.tld
 +%%T%%/lib/struts.jar
 +%%T%%/lib/struts-tiles.tld
 +%%T%%/lib/tiles-config.dtd
 +%%T%%/lib/tiles-config_1_1.dtd
 +%%T%%/lib/validation_1_1.dtd
 +%%T%%/lib/validator-rules.xml
 +%%T%%/lib/validator-rules_1_1.dtd
 +%%T%%/lib/web-app_2_2.dtd
 +%%T%%/lib/commons-beanutils.jar
 +%%T%%/webapps/tiles-documentation.war
 +%%T%%/webapps/struts-documentation.war
 +%%T%%/webapps/struts-example.war
 +%%T%%/webapps/struts-exercise-taglib.war
 +%%T%%/webapps/struts-template.war
 +%%T%%/webapps/struts-upload.war
 +%%T%%/webapps/struts-validator.war
 +%%T%%/webapps/struts-blank.war
 +%%T%%/INSTALL
 +%%T%%/LICENSE
 +%%T%%/README
 +@dirrm %%T%%/contrib/struts-el/lib
 +@dirrm %%T%%/contrib/struts-el/webapps
 +@dirrm %%T%%/contrib/struts-el
 +@dirrm %%T%%/contrib
 +@dirrm %%T%%/lib
 +@dirrm %%T%%/webapps
 +@dirrm %%T%%
State-Changed-From-To: open->closed 
State-Changed-By: osa 
State-Changed-When: Mon Jul 21 03:05:53 PDT 2003 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=54615 
>Unformatted:
