Bug 71728

Summary: update java/jakarta-struts port
Product: Ports & Packages Reporter: toha <toha>
Component: Individual Port(s)Assignee: Thierry Thomas <thierry>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff none

Description toha 2004-09-14 14:10:17 UTC 
	Update java/jakarta-struts to 1.2.2.

Fix: Apply this patch:
Comment 1 Thierry Thomas freebsd_committer freebsd_triage 2004-10-16 15:47:14 UTC 
State Changed
From-To: open->feedback


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
Comment 2 Thierry Thomas freebsd_committer freebsd_triage 2004-10-16 15:47:14 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->thierry


Take it.
Comment 3 toha 2004-10-19 10:17:01 UTC 
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
Comment 4 Thierry Thomas freebsd_committer freebsd_triage 2004-10-19 23:27:03 UTC 
State Changed
From-To: feedback->closed


Committed, thanks!