Bug 183127

Summary: Update java/jakarta-struts to version 1.2.9
Product: Ports & Packages Reporter: Pedro F. Giffuni <giffunip>
Component: Individual Port(s)Assignee: Gerald Pfeifer <gerald>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff none

Description Pedro F. Giffuni 2013-10-20 17:00:00 UTC 
"Jakarta" can now be dropped from the name as this is apache-struts now.

The 1.x.x versions of this software have been EOL'd by the Apache Foundation.
Nevertheless provide a small update JIC someone is still using it.

Fix: Patch attached with submission follows:
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-10-20 17:00:07 UTC 
Maintainer of java/jakarta-struts,

Please note that PR ports/183127 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/183127

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2013-10-20 17:00:08 UTC 
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 3 Gerald Pfeifer freebsd_committer freebsd_triage 2014-03-09 01:27:57 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->gerald

I'm taking this.
Comment 4 gerald 2014-03-09 18:01:21 UTC 
I am wondering, shouldn't the package just be renamed to struts, 
and "PKGNAMEPREFIX=apache-" be removed from the Makefile?

Gerald
Comment 5 Pedro Giffuni 2014-03-10 16:25:36 UTC 
For the record;

The Apache Software Foundation has some strong branding policies and all 
the released products have to carry the Apache name on it so it's better 
to keep the apache- prefix.

Pedro.
Comment 6 dfilter service freebsd_committer freebsd_triage 2014-03-15 10:28:12 UTC 
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@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@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
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 7 Gerald Pfeifer freebsd_committer freebsd_triage 2014-03-15 10:32:28 UTC 
State Changed
From-To: feedback->closed

Committed, thanks!