svn commit: r348307 - head/java/jakarta-struts

[Gerald Pfeifer]

Author: gerald
Date: Sat Mar 15 10:28:08 2014
New Revision: 348307
URL: http://svnweb.freebsd.org/changeset/ports/348307
QAT: https://qat.redports.org/buildarchive/r348307/

Log:
  Move to version 1.2.9, the final in the 1.2 series.
  
  Support staging.
  
  Struts is now an Apache project, adjust the package name and comment
  accordingly to honor their branding guidelines.
  
  PR:		183127
  Submitted by:	pfg

Modified:
  head/java/jakarta-struts/Makefile
  head/java/jakarta-struts/distinfo
  head/java/jakarta-struts/pkg-descr
  head/java/jakarta-struts/pkg-plist

Modified: head/java/jakarta-struts/Makefile
==============================================================================
--- head/java/jakarta-struts/Makefile	Sat Mar 15 10:27:51 2014	(r348306)
+++ head/java/jakarta-struts/Makefile	Sat Mar 15 10:28:08 2014	(r348307)
@@ -1,16 +1,16 @@
 # Created by: Anton Yudin <toha at toha.org.ua>
 # $FreeBSD$
 
-PORTNAME=	jakarta-struts
-PORTVERSION=	1.2.4
-PORTREVISION=	2
+PORTNAME=	struts
+PORTVERSION=	1.2.9
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=struts/binaries
-DIST_SUBDIR=	jakarta
+PKGNAMEPREFIX=	apache-
+DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
 
 MAINTAINER=	ports at FreeBSD.org
-COMMENT=	Struts framework
+COMMENT=	Apache Struts framework
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
@@ -21,9 +21,8 @@ JAVASHAREDIR=	share/java
 TDIR=		${JAVASHAREDIR}/${PKGNAME}
 PLIST_SUB+=	T=${TDIR}
 
-NO_STAGE=	yes
 do-install:
-	cd ${WRKSRC} && ${FIND} . -type d -exec ${INSTALL} -d ${PREFIX}/${TDIR}/'{}' \; && \
-	${FIND} . -type f -exec ${INSTALL_DATA} '{}' ${PREFIX}/${TDIR}/'{}' \;
+	cd ${WRKSRC} && ${FIND} . -type d -exec ${INSTALL} -d ${STAGEDIR}${PREFIX}/${TDIR}/'{}' \; && \
+	${FIND} . -type f -exec ${INSTALL_DATA} '{}' ${STAGEDIR}${PREFIX}/${TDIR}/'{}' \;
 
 .include <bsd.port.mk>

Modified: head/java/jakarta-struts/distinfo
==============================================================================
--- head/java/jakarta-struts/distinfo	Sat Mar 15 10:27:51 2014	(r348306)
+++ head/java/jakarta-struts/distinfo	Sat Mar 15 10:28:08 2014	(r348307)
@@ -1,2 +1,2 @@
-SHA256 (jakarta/jakarta-struts-1.2.4.zip) = c9ea31571f2e1b113628b7eb77d28563385029b7f31e2478f1e0fa53cb0ae2f4
-SIZE (jakarta/jakarta-struts-1.2.4.zip) = 12895640
+SHA256 (struts-1.2.9-bin.zip) = 9015e990eaaeb9a659ca34d042520618b98fff65287f0d05f668b01e9330805f
+SIZE (struts-1.2.9-bin.zip) = 14483492

Modified: head/java/jakarta-struts/pkg-descr
==============================================================================
--- head/java/jakarta-struts/pkg-descr	Sat Mar 15 10:27:51 2014	(r348306)
+++ head/java/jakarta-struts/pkg-descr	Sat Mar 15 10:28:08 2014	(r348307)
@@ -18,7 +18,4 @@ professional web application needs to su
 create an extensible development environment for your application,
 based on published standards and proven design patterns.
 
-Struts is part of the Apache Jakarta Project, sponsored by the
-Apache Software Foundation. The official Struts home page is at
-
-WWW: http://jakarta.apache.org/struts/
+WWW: http://struts.apache.org

Modified: head/java/jakarta-struts/pkg-plist
==============================================================================
--- head/java/jakarta-struts/pkg-plist	Sat Mar 15 10:27:51 2014	(r348306)
+++ head/java/jakarta-struts/pkg-plist	Sat Mar 15 10:28:08 2014	(r348307)
@@ -27,7 +27,6 @@
 %%T%%/contrib/struts-el/webapps/strutsel-exercise-taglib.war
 %%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-logging.jar