From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Nov 30 18:30:11 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2BE62106566C for ; Tue, 30 Nov 2010 18:30:11 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 4C2428FC1E for ; Tue, 30 Nov 2010 18:30:10 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id oAUIU9PJ046325 for ; Tue, 30 Nov 2010 18:30:09 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id oAUIU9Fu046323; Tue, 30 Nov 2010 18:30:09 GMT (envelope-from gnats) Resent-Date: Tue, 30 Nov 2010 18:30:09 GMT Resent-Message-Id: <201011301830.oAUIU9Fu046323@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Greg Lewis Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CC989106566B for ; Tue, 30 Nov 2010 18:23:38 +0000 (UTC) (envelope-from glewis@misty.eyesbeyond.com) Received: from misty.eyesbeyond.com (gerbercreations.com [71.39.140.16]) by mx1.freebsd.org (Postfix) with ESMTP id 830DC8FC13 for ; Tue, 30 Nov 2010 18:23:37 +0000 (UTC) Received: from misty.eyesbeyond.com (localhost.eyesbeyond.com [127.0.0.1]) by misty.eyesbeyond.com (8.14.4/8.14.4) with ESMTP id oAUINap1006500; Tue, 30 Nov 2010 10:23:36 -0800 (PST) (envelope-from glewis@misty.eyesbeyond.com) Received: (from glewis@localhost) by misty.eyesbeyond.com (8.14.4/8.14.4/Submit) id oAUINanD006499; Tue, 30 Nov 2010 10:23:36 -0800 (PST) (envelope-from glewis) Message-Id: <201011301823.oAUINanD006499@misty.eyesbeyond.com> Date: Tue, 30 Nov 2010 10:23:36 -0800 (PST) From: Greg Lewis To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: gerrit.beine@gmx.de Subject: ports/152712: [PATCH] java/springframework: update to 3.0.5 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Nov 2010 18:30:11 -0000 >Number: 152712 >Category: ports >Synopsis: [PATCH] java/springframework: update to 3.0.5 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Nov 30 18:30:09 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Greg Lewis >Release: FreeBSD 8.1-RELEASE-p1 i386 >Organization: >Environment: System: FreeBSD misty.eyesbeyond.com 8.1-RELEASE-p1 FreeBSD 8.1-RELEASE-p1 #0: Mon Nov 15 22:55:42 PST 2010 >Description: - Update to 3.0.5 Port maintainer (gerrit.beine@gmx.de) is cc'd. Let me know if you'd like to keep tracking the 2.5 version instead. In that case I'll create a springframework3 port. I'd rather do the update though :) Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- springframework-3.0.5.patch begins here --- Index: Makefile =================================================================== RCS file: /var/fcvs/ports/java/springframework/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- Makefile 22 Aug 2009 00:24:28 -0000 1.8 +++ Makefile 30 Nov 2010 08:02:40 -0000 @@ -5,15 +5,15 @@ # $FreeBSD: ports/java/springframework/Makefile,v 1.8 2009/08/22 00:24:28 amdmi3 Exp $ PORTNAME= springframework -PORTVERSION= 2.5.5 +PORTVERSION= 3.0.5 CATEGORIES= java devel -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-2/${PORTVERSION} -DISTNAME= spring-framework-${PORTVERSION}-with-dependencies +MASTER_SITES= http://s3.amazonaws.com/dist.springframework.org/release/SPR/ +DISTNAME= spring-framework-${PORTVERSION}.RELEASE-with-docs MAINTAINER= gerrit.beine@gmx.de COMMENT= The Spring Framework for Java -WRKSRC= ${WRKDIR}/spring-framework-${PORTVERSION} +WRKSRC= ${WRKDIR}/spring-framework-${PORTVERSION}.RELEASE NO_BUILD= yes USE_JAVA= yes @@ -21,64 +21,79 @@ JAVA_VERSION= 1.5+ OPTIONS= DOCS "Install docs & examples" on \ - RESRCS "Install resource files" off \ - MODULES "Install modules" on \ - WEAVING "Install weaving modules" off + RESRCS "Install resource files" off -PLIST_FILES= %%JAVAJARDIR%%/spring.jar +JAR_FILES= org.springframework.aop.jar \ + org.springframework.asm.jar \ + org.springframework.aspects.jar \ + org.springframework.beans.jar \ + org.springframework.context.jar \ + org.springframework.context.support.jar \ + org.springframework.core.jar \ + org.springframework.expression.jar \ + org.springframework.instrument.jar \ + org.springframework.instrument.tomcat.jar \ + org.springframework.jdbc.jar \ + org.springframework.jms.jar \ + org.springframework.orm.jar \ + org.springframework.oxm.jar \ + org.springframework.test.jar \ + org.springframework.transaction.jar \ + org.springframework.web.jar \ + org.springframework.web.portlet.jar \ + org.springframework.web.servlet.jar \ + org.springframework.web.struts.jar + +.for f in ${JAR_FILES} +PLIST_FILES += %%JAVAJARDIR%%/${f} +.endfor -.include +.include -.if defined(WITHOUT_DOCS) || !defined(WITH_DOCS) +.if defined(WITHOUT_DOCS) NOPORTDOCS= yes .endif -.if !defined(WITHOUT_RESRCS) || defined(WITH_RESRCS) -PLIST_FILES+= %%JAVASHAREDIR%%/spring-aop-2.0.xsd \ - %%JAVASHAREDIR%%/spring-aop-2.5.xsd \ - %%JAVASHAREDIR%%/spring-beans-2.0.dtd \ - %%JAVASHAREDIR%%/spring-beans-2.0.xsd \ - %%JAVASHAREDIR%%/spring-beans-2.5.xsd \ - %%JAVASHAREDIR%%/spring-beans.dtd \ - %%JAVASHAREDIR%%/spring-context-2.5.xsd \ - %%JAVASHAREDIR%%/spring-form.tld \ - %%JAVASHAREDIR%%/spring-jee-2.0.xsd \ - %%JAVASHAREDIR%%/spring-jee-2.5.xsd \ - %%JAVASHAREDIR%%/spring-jms-2.5.xsd \ - %%JAVASHAREDIR%%/spring-lang-2.0.xsd \ - %%JAVASHAREDIR%%/spring-lang-2.5.xsd \ - %%JAVASHAREDIR%%/spring-tool-2.0.xsd \ - %%JAVASHAREDIR%%/spring-tool-2.5.xsd \ - %%JAVASHAREDIR%%/spring-tx-2.0.xsd \ - %%JAVASHAREDIR%%/spring-tx-2.5.xsd \ - %%JAVASHAREDIR%%/spring-util-2.0.xsd \ - %%JAVASHAREDIR%%/spring-util-2.5.xsd \ - %%JAVASHAREDIR%%/spring.ftl \ - %%JAVASHAREDIR%%/spring.tld \ - %%JAVASHAREDIR%%/spring.vm -.endif - -.if !defined(WITHOUT_MODULES) || defined(WITH_MODULES) -PLIST_FILES+= %%JAVAJARDIR%%/spring-aop.jar \ - %%JAVAJARDIR%%/spring-beans.jar \ - %%JAVAJARDIR%%/spring-context-support.jar \ - %%JAVAJARDIR%%/spring-context.jar \ - %%JAVAJARDIR%%/spring-core.jar \ - %%JAVAJARDIR%%/spring-jdbc.jar \ - %%JAVAJARDIR%%/spring-jms.jar \ - %%JAVAJARDIR%%/spring-orm.jar \ - %%JAVAJARDIR%%/spring-test.jar \ - %%JAVAJARDIR%%/spring-tx.jar \ - %%JAVAJARDIR%%/spring-web.jar \ - %%JAVAJARDIR%%/spring-webmvc-portlet.jar \ - %%JAVAJARDIR%%/spring-webmvc-struts.jar \ - %%JAVAJARDIR%%/spring-webmvc.jar -.endif - -.if !defined(WITHOUT_WEAVING) || defined(WITH_WEAVING) -PLIST_FILES+= %%JAVAJARDIR%%/spring-agent.jar \ - %%JAVAJARDIR%%/spring-aspects.jar \ - %%JAVAJARDIR%%/spring-tomcat-weaver.jar +.if defined(WITH_RESRCS) +RESOURCE_FILES= spring-aop-2.0.xsd \ + spring-aop-2.5.xsd \ + spring-aop-3.0.xsd \ + spring-beans-2.0.dtd \ + spring-beans-2.0.xsd \ + spring-beans-2.5.xsd \ + spring-beans-3.0.xsd \ + spring-beans.dtd \ + spring-context-2.5.xsd \ + spring-context-3.0.xsd \ + spring-form.tld \ + spring-jdbc-3.0.xsd \ + spring-jee-2.0.xsd \ + spring-jee-2.5.xsd \ + spring-jee-3.0.xsd \ + spring-jms-2.5.xsd \ + spring-jms-3.0.xsd \ + spring-lang-2.0.xsd \ + spring-lang-2.5.xsd \ + spring-lang-3.0.xsd \ + spring-mvc-3.0.xsd \ + spring-oxm-3.0.xsd \ + spring-task-3.0.xsd \ + spring-tool-2.0.xsd \ + spring-tool-2.5.xsd \ + spring-tool-3.0.xsd \ + spring-tx-2.0.xsd \ + spring-tx-2.5.xsd \ + spring-tx-3.0.xsd \ + spring-util-2.0.xsd \ + spring-util-2.5.xsd \ + spring-util-3.0.xsd \ + spring.ftl \ + spring.tld \ + spring.vm + +.for f in ${RESOURCE_FILES} +PLIST_FILES += %%JAVASHAREDIR%%/${f} +.endfor .endif .if !defined(NOPORTDOCS) @@ -86,36 +101,23 @@ .endif do-install: - @${INSTALL_DATA} ${WRKSRC}/dist/spring.jar ${JAVAJARDIR} +.for f in ${JAR_FILES} + @${INSTALL_DATA} ${WRKSRC}/dist/${f:S/.jar/-${PORTVERSION}.RELEASE.jar/} \ + ${JAVAJARDIR}/${f} +.endfor .if !defined(WITHOUT_RESRCS) || defined(WITH_RESRCS) - @${INSTALL_DATA} ${WRKSRC}/dist/resources/* ${JAVASHAREDIR} -.endif -.if !defined(WITHOUT_MODULES) || defined(WITH_MODULES) - @${INSTALL_DATA} ${WRKSRC}/dist/modules/* ${JAVAJARDIR} -.endif -.if !defined(WITHOUT_WEAVING) || defined(WITH_WEAVING) - @${INSTALL_DATA} ${WRKSRC}/dist/weaving/* ${JAVAJARDIR} +.for f in ${RESOURCE_FILES} + @${INSTALL_DATA} `${FIND} "${WRKSRC}" -name ${f} -print` \ + ${JAVASHAREDIR}/${f} +.endfor .endif .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} @${INSTALL_DATA} ${WRKSRC}/changelog.txt ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/license.txt ${DOCSDIR} @${INSTALL_DATA} ${WRKSRC}/notice.txt ${DOCSDIR} @${INSTALL_DATA} ${WRKSRC}/readme.txt ${DOCSDIR} - @cd ${WRKSRC}/docs/ \ - && ${FIND} . -type d -exec ${MKDIR} ${DOCSDIR}/{} \; \ - && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \; - @${MKDIR} ${EXAMPLESDIR} - @cd ${WRKSRC}/samples/ \ - && ${FIND} . -type d -exec ${MKDIR} ${EXAMPLESDIR}/{} \; \ - && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${EXAMPLESDIR}/{} \; -.endif - -post-install: -.if !defined(NOPORTDOCS) - @${FIND} -s ${WRKSRC}/samples -not -type d \ - | ${SED} -ne 's,^${WRKSRC}/samples,${EXAMPLESDIR:S,^${PREFIX}/,,},p' >> ${TMPPLIST} - @${FIND} -s -d ${WRKSRC}/samples -type d \ - | ${SED} -ne 's,^${WRKSRC}/samples,@dirrm ${EXAMPLESDIR:S,^${PREFIX}/,,},p' >> ${TMPPLIST} + @cd ${WRKSRC}/docs/ && ${COPYTREE_SHARE} . ${DOCSDIR} .endif -.include +.include Index: distinfo =================================================================== RCS file: /var/fcvs/ports/java/springframework/distinfo,v retrieving revision 1.6 diff -u -r1.6 distinfo --- distinfo 6 Aug 2008 16:23:09 -0000 1.6 +++ distinfo 28 Nov 2010 23:46:37 -0000 @@ -1,3 +1,2 @@ -MD5 (spring-framework-2.5.5-with-dependencies.zip) = 2c24e493d4e7b67596382460f25734bb -SHA256 (spring-framework-2.5.5-with-dependencies.zip) = 085e78fbebc0332e7a3dbb9f5530e53a04e6770cd16ef492ca9b8781ae7bc995 -SIZE (spring-framework-2.5.5-with-dependencies.zip) = 82132385 +SHA256 (spring-framework-3.0.5.RELEASE-with-docs.zip) = e05553286c076de1e3b75ffc1285b4b72da19587b1c9153d0dde946ff657cee5 +SIZE (spring-framework-3.0.5.RELEASE-with-docs.zip) = 49072252 --- springframework-3.0.5.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: