From toha@ib.com.ua  Tue Sep 14 13:04:57 2004
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 1743D16A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 14 Sep 2004 13:04:57 +0000 (GMT)
Received: from ib.com.ua (ib.com.ua [217.144.67.33])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 524DA43D54
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 14 Sep 2004 13:04:55 +0000 (GMT)
	(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.10/8.12.10) with ESMTP id i8ECtLNx040831
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 14 Sep 2004 15:55:21 +0300 (EEST)
	(envelope-from toha@ib.com.ua)
Received: (from toha@localhost)
	by ib.com.ua (8.12.10/8.12.10/Submit) id i8ECtGrn040830;
	Tue, 14 Sep 2004 15:55:16 +0300 (EEST)
	(envelope-from toha)
Message-Id: <200409141255.i8ECtGrn040830@ib.com.ua>
Date: Tue, 14 Sep 2004 15:55:16 +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: update java/jakarta-struts port
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         71728
>Category:       ports
>Synopsis:       update java/jakarta-struts port
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    thierry
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 14 13:10:17 GMT 2004
>Closed-Date:    Tue Oct 19 22:27:34 GMT 2004
>Last-Modified:  Tue Oct 19 22:27:34 GMT 2004
>Originator:     Anton Yudin
>Release:        FreeBSD 4.9-RELEASE-p10 i386
>Organization:
>Environment:
System: FreeBSD .ua 4.9-RELEASE-p10 FreeBSD 4.9-RELEASE-p10 #0: Fri Jul 16 10:53:40 EEST 2004 root@.ua:/usr/src/sys/compile/ i386


>Description:
	Update java/jakarta-struts to 1.2.2.
>How-To-Repeat:
>Fix:
	Apply this patch:

diff -ruN java/jakarta-struts.orig/Makefile java/jakarta-struts/Makefile
--- java/jakarta-struts.orig/Makefile	Tue Sep 14 15:44:00 2004
+++ java/jakarta-struts/Makefile	Tue Sep 14 15:26:56 2004
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	jakarta-struts
-PORTVERSION=	1.1
-PORTREVISION=	1
+PORTVERSION=	1.2.2
 CATEGORIES=	java
 MASTER_SITES=	http://www.apache.org/dist/jakarta/struts/binaries/ \
 		http://apache.dnepr.net/jakarta/struts/binaries/
@@ -18,10 +17,12 @@
 
 USE_JAVA=	1.3+
 NO_BUILD=	YES
+USE_ZIP=	YES
 
 JAVASHAREDIR=	share/java
 TDIR=		${JAVASHAREDIR}/${PKGNAME}
 PLIST_SUB+=	T=${TDIR}
+WRKSRC=		${WRKDIR}/${DISTNAME}/dist
 
 do-install:
 	cd ${WRKSRC} && ${FIND} . -type d -exec ${INSTALL} -d ${PREFIX}/${TDIR}/'{}' \; && \
diff -ruN java/jakarta-struts.orig/distinfo java/jakarta-struts/distinfo
--- java/jakarta-struts.orig/distinfo	Tue Sep 14 15:44:00 2004
+++ java/jakarta-struts/distinfo	Tue Sep 14 16:01:26 2004
@@ -1,2 +1,2 @@
-MD5 (jakarta/jakarta-struts-1.1.tar.gz) = 95077828cc1a8203999fa12efaf318d3
-SIZE (jakarta/jakarta-struts-1.1.tar.gz) = 16773379
+MD5 (jakarta/jakarta-struts-1.2.2.zip) = 4144b980c4d73b29bc1dd2c2be44b1fc
+SIZE (jakarta/jakarta-struts-1.2.2.zip) = 12655552
diff -ruN java/jakarta-struts.orig/pkg-plist java/jakarta-struts/pkg-plist
--- java/jakarta-struts.orig/pkg-plist	Tue Sep 14 15:44:00 2004
+++ java/jakarta-struts/pkg-plist	Tue Sep 14 15:49:18 2004
@@ -1,15 +1,12 @@
-%%T%%/contrib/struts-el/lib/x.tld
+%%T%%/INSTALL
+%%T%%/LICENSE
+%%T%%/NOTICE
+%%T%%/README
+%%T%%/contrib/struts-el/README.txt
+%%T%%/contrib/struts-el/lib/c-rt.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
@@ -17,54 +14,43 @@
 %%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-el.tld
 %%T%%/contrib/struts-el/lib/struts-tiles.tld
+%%T%%/contrib/struts-el/lib/struts.jar
 %%T%%/contrib/struts-el/lib/x-rt.tld
-%%T%%/contrib/struts-el/lib/c-rt.tld
+%%T%%/contrib/struts-el/lib/x.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/antlr.jar
+%%T%%/lib/commons-beanutils.jar
 %%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-config_1_2.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/struts.jar
 %%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%%/lib/web-app_2_3.dtd
 %%T%%/webapps/struts-blank.war
-%%T%%/INSTALL
-%%T%%/LICENSE
-%%T%%/README
+%%T%%/webapps/struts-documentation.war
+%%T%%/webapps/struts-examples.war
+%%T%%/webapps/struts-mailreader.war
+%%T%%/webapps/tiles-documentation.war
 @dirrm %%T%%/contrib/struts-el/lib
 @dirrm %%T%%/contrib/struts-el/webapps
 @dirrm %%T%%/contrib/struts-el
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: thierry 
State-Changed-When: Sat Oct 16 14:47:14 GMT 2004 
State-Changed-Why:  

This release seems unfetchable. 
According to <http://struts.apache.org/download.cgi> 
one could download release 1.2.4. 

Could you please check it? 

Note: what about using 
MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA} 
MASTER_SITE_SUBDIR=struts/binaries 



Responsible-Changed-From-To: freebsd-ports-bugs->thierry 
Responsible-Changed-By: thierry 
Responsible-Changed-When: Sat Oct 16 14:47:14 GMT 2004 
Responsible-Changed-Why:  

Take it. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=71728 

From: Anton Yudin <toha@toha.org.ua>
To: freebsd-gnats-submit@FreeBSD.org, toha@toha.org.ua
Cc:  
Subject: Re: ports/71728: update java/jakarta-struts port
Date: Tue, 19 Oct 2004 12:17:01 +0300

 new diff for update to jakarta-struts-1.2.4:
 
 diff -ruN java/jakarta-struts.orig/Makefile java/jakarta-struts/Makefile
 --- java/jakarta-struts.orig/Makefile    Tue Sep 14 15:44:00 2004
 +++ java/jakarta-struts/Makefile    Tue Oct 19 09:13:57 2004
 @@ -6,11 +6,11 @@
  #
  
  PORTNAME=    jakarta-struts
 -PORTVERSION=    1.1
 -PORTREVISION=    1
 +PORTVERSION=    1.2.4
  CATEGORIES=    java
 -MASTER_SITES=    http://www.apache.org/dist/jakarta/struts/binaries/ \
 -        http://apache.dnepr.net/jakarta/struts/binaries/
 +MASTER_SITES=    ${MASTER_SITE_APACHE}
 +MASTER_SITE_SUBDIR=struts/binaries
 +
  DIST_SUBDIR=    jakarta
  
  MAINTAINER=    toha@toha.org.ua
 @@ -18,6 +18,7 @@
  
  USE_JAVA=    1.3+
  NO_BUILD=    YES
 +USE_ZIP=    YES
  
  JAVASHAREDIR=    share/java
  TDIR=        ${JAVASHAREDIR}/${PKGNAME}
 diff -ruN java/jakarta-struts.orig/distinfo java/jakarta-struts/distinfo
 --- java/jakarta-struts.orig/distinfo    Tue Sep 14 15:44:00 2004
 +++ java/jakarta-struts/distinfo    Tue Oct 19 09:04:45 2004
 @@ -1,2 +1,2 @@
 -MD5 (jakarta/jakarta-struts-1.1.tar.gz) = 95077828cc1a8203999fa12efaf318d3
 -SIZE (jakarta/jakarta-struts-1.1.tar.gz) = 16773379
 +MD5 (jakarta/jakarta-struts-1.2.4.zip) = fe5e0efd842b81ca29aa9c65acbd7e4a
 +SIZE (jakarta/jakarta-struts-1.2.4.zip) = 12895640
 diff -ruN java/jakarta-struts.orig/pkg-plist java/jakarta-struts/pkg-plist
 --- java/jakarta-struts.orig/pkg-plist    Tue Sep 14 15:44:00 2004
 +++ java/jakarta-struts/pkg-plist    Tue Sep 14 15:49:18 2004
 @@ -1,15 +1,12 @@
 -%%T%%/contrib/struts-el/lib/x.tld
 +%%T%%/INSTALL
 +%%T%%/LICENSE
 +%%T%%/NOTICE
 +%%T%%/README
 +%%T%%/contrib/struts-el/README.txt
 +%%T%%/contrib/struts-el/lib/c-rt.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
 @@ -17,54 +14,43 @@
  %%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-el.tld
  %%T%%/contrib/struts-el/lib/struts-tiles.tld
 +%%T%%/contrib/struts-el/lib/struts.jar
  %%T%%/contrib/struts-el/lib/x-rt.tld
 -%%T%%/contrib/struts-el/lib/c-rt.tld
 +%%T%%/contrib/struts-el/lib/x.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/antlr.jar
 +%%T%%/lib/commons-beanutils.jar
  %%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-config_1_2.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/struts.jar
  %%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%%/lib/web-app_2_3.dtd
  %%T%%/webapps/struts-blank.war
 -%%T%%/INSTALL
 -%%T%%/LICENSE
 -%%T%%/README
 +%%T%%/webapps/struts-documentation.war
 +%%T%%/webapps/struts-examples.war
 +%%T%%/webapps/struts-mailreader.war
 +%%T%%/webapps/tiles-documentation.war
  @dirrm %%T%%/contrib/struts-el/lib
  @dirrm %%T%%/contrib/struts-el/webapps
  @dirrm %%T%%/contrib/struts-el
 
State-Changed-From-To: feedback->closed 
State-Changed-By: thierry 
State-Changed-When: Tue Oct 19 22:27:03 GMT 2004 
State-Changed-Why:  

Committed, thanks! 


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