From owner-svn-ports-all@FreeBSD.ORG Sun Feb 17 16:14:55 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 59C3D684; Sun, 17 Feb 2013 16:14:55 +0000 (UTC) (envelope-from olgeni@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 46B01DCA; Sun, 17 Feb 2013 16:14:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1HGEtaa086568; Sun, 17 Feb 2013 16:14:55 GMT (envelope-from olgeni@svn.freebsd.org) Received: (from olgeni@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1HGEs3o086566; Sun, 17 Feb 2013 16:14:54 GMT (envelope-from olgeni@svn.freebsd.org) Message-Id: <201302171614.r1HGEs3o086566@svn.freebsd.org> From: Jimmy Olgeni Date: Sun, 17 Feb 2013 16:14:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r312422 - head/java/springframework X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Feb 2013 16:14:55 -0000 Author: olgeni Date: Sun Feb 17 16:14:54 2013 New Revision: 312422 URL: http://svnweb.freebsd.org/changeset/ports/312422 Log: Upgrade to version 3.2.1. Modified: head/java/springframework/Makefile head/java/springframework/distinfo Modified: head/java/springframework/Makefile ============================================================================== --- head/java/springframework/Makefile Sun Feb 17 16:13:48 2013 (r312421) +++ head/java/springframework/Makefile Sun Feb 17 16:14:54 2013 (r312422) @@ -2,16 +2,18 @@ # $FreeBSD$ PORTNAME= springframework -PORTVERSION= 3.1.4 +PORTVERSION= 3.2.1 CATEGORIES= java devel -MASTER_SITES= http://s3.amazonaws.com/dist.springframework.org/release/SPR/ -DISTNAME= spring-framework-${PORTVERSION}.RELEASE-with-docs +MASTER_SITES= http://repo.springsource.org/libs-release-local/org/springframework/spring/${PORTVERSION}.RELEASE/ +DISTNAME= spring-framework-${PORTVERSION}.RELEASE-dist MAINTAINER= olgeni@FreeBSD.org COMMENT= The Spring Framework for Java WRKSRC= ${WRKDIR}/spring-framework-${PORTVERSION}.RELEASE +CONFLICTS= springframework-3.1.* + NO_BUILD= yes USE_JAVA= yes USE_ZIP= yes @@ -20,29 +22,77 @@ JAVA_VERSION= 1.6+ OPTIONS_DEFINE= DOCS RESRCS RESRCS_DESC= Install resource files -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 +JAR_FILES= spring-aop.jar \ + spring-aspects.jar \ + spring-beans.jar \ + spring-build-src.jar \ + spring-context-support.jar \ + spring-context.jar \ + spring-core.jar \ + spring-expression.jar \ + spring-instrument-tomcat.jar \ + spring-instrument.jar \ + spring-jdbc.jar \ + spring-jms.jar \ + spring-orm.jar \ + spring-oxm.jar \ + spring-struts.jar \ + spring-test.jar \ + spring-tx.jar \ + spring-web.jar \ + spring-webmvc-portlet.jar \ + spring-webmvc.jar + +JAVADOC= spring-aop-javadoc.jar \ + spring-aspects-javadoc.jar \ + spring-beans-javadoc.jar \ + spring-context-javadoc.jar \ + spring-context-support-javadoc.jar \ + spring-core-javadoc.jar \ + spring-expression-javadoc.jar \ + spring-instrument-javadoc.jar \ + spring-instrument-tomcat-javadoc.jar \ + spring-jdbc-javadoc.jar \ + spring-jms-javadoc.jar \ + spring-orm-javadoc.jar \ + spring-oxm-javadoc.jar \ + spring-struts-javadoc.jar \ + spring-test-javadoc.jar \ + spring-tx-javadoc.jar \ + spring-web-javadoc.jar \ + spring-webmvc-javadoc.jar \ + spring-webmvc-portlet-javadoc.jar + +SOURCES= spring-aop-sources.jar \ + spring-aspects-sources.jar \ + spring-beans-sources.jar \ + spring-context-sources.jar \ + spring-context-support-sources.jar \ + spring-core-sources.jar \ + spring-expression-sources.jar \ + spring-instrument-sources.jar \ + spring-instrument-tomcat-sources.jar \ + spring-jdbc-sources.jar \ + spring-jms-sources.jar \ + spring-orm-sources.jar \ + spring-oxm-sources.jar \ + spring-struts-sources.jar \ + spring-test-sources.jar \ + spring-tx-sources.jar \ + spring-web-sources.jar \ + spring-webmvc-portlet-sources.jar \ + spring-webmvc-sources.jar + +.for FILE in ${JAR_FILES} +PLIST_FILES += %%JAVAJARDIR%%/${FILE} +.endfor -.for f in ${JAR_FILES} -PLIST_FILES += %%JAVAJARDIR%%/${f} +.for FILE in ${SOURCES} +PLIST_FILES += %%JAVAJARDIR%%/${FILE} +.endfor + +.for FILE in ${JAVADOC} +PLIST_FILES += %%JAVAJARDIR%%/${FILE} .endfor .include @@ -53,20 +103,17 @@ RESOURCE_FILES= spring-aop-2.0.xsd \ spring-aop-3.0.xsd \ spring-aop-3.1.xsd \ spring-aop-3.2.xsd \ - spring-beans-2.0.dtd \ spring-beans-2.0.xsd \ spring-beans-2.5.xsd \ spring-beans-3.0.xsd \ spring-beans-3.1.xsd \ spring-beans-3.2.xsd \ - spring-beans.dtd \ spring-cache-3.1.xsd \ spring-cache-3.2.xsd \ spring-context-2.5.xsd \ spring-context-3.0.xsd \ spring-context-3.1.xsd \ spring-context-3.2.xsd \ - spring-form.tld \ spring-jdbc-3.0.xsd \ spring-jdbc-3.1.xsd \ spring-jdbc-3.2.xsd \ @@ -78,6 +125,7 @@ RESOURCE_FILES= spring-aop-2.0.xsd \ spring-jms-2.5.xsd \ spring-jms-3.0.xsd \ spring-jms-3.1.xsd \ + spring-jms-3.2.xsd \ spring-lang-2.0.xsd \ spring-lang-2.5.xsd \ spring-lang-3.0.xsd \ @@ -86,7 +134,6 @@ RESOURCE_FILES= spring-aop-2.0.xsd \ spring-mvc-3.0.xsd \ spring-mvc-3.1.xsd \ spring-mvc-3.2.xsd \ - spring-oxm-1.5.xsd \ spring-oxm-3.0.xsd \ spring-oxm-3.1.xsd \ spring-oxm-3.2.xsd \ @@ -107,13 +154,10 @@ RESOURCE_FILES= spring-aop-2.0.xsd \ spring-util-2.5.xsd \ spring-util-3.0.xsd \ spring-util-3.1.xsd \ - spring-util-3.2.xsd \ - spring.ftl \ - spring.tld \ - spring.vm + spring-util-3.2.xsd -.for f in ${RESOURCE_FILES} -PLIST_FILES += %%JAVASHAREDIR%%/${f} +.for FILE in ${RESOURCE_FILES} +PLIST_FILES += %%JAVASHAREDIR%%/${FILE} .endfor .endif @@ -122,19 +166,26 @@ PORTDOCS= * .endif do-install: -.for f in ${JAR_FILES} - @${INSTALL_DATA} ${WRKSRC}/dist/${f:S/.jar/-${PORTVERSION}.RELEASE.jar/} \ - ${JAVAJARDIR}/${f} +.for FILE in ${JAR_FILES} + @${INSTALL_DATA} ${WRKSRC}/libs/${FILE:S/.jar/-${PORTVERSION}.RELEASE.jar/} \ + ${JAVAJARDIR}/${FILE} +.endfor +.for FILE in ${SOURCES} + @${INSTALL_DATA} ${WRKSRC}/libs/${FILE:S/-sources.jar/-${PORTVERSION}.RELEASE-sources.jar/} \ + ${JAVAJARDIR}/${FILE} +.endfor +.for FILE in ${JAVADOC} + @${INSTALL_DATA} ${WRKSRC}/libs/${FILE:S/-javadoc.jar/-${PORTVERSION}.RELEASE-javadoc.jar/} \ + ${JAVAJARDIR}/${FILE} .endfor .if ${PORT_OPTIONS:MRESRCS} -.for f in ${RESOURCE_FILES} - @${INSTALL_DATA} `${FIND} "${WRKSRC}" -name ${f} -print` \ - ${JAVASHAREDIR}/${f} +.for FILE in ${RESOURCE_FILES} + @${INSTALL_DATA} `${FIND} "${WRKSRC}" -name ${FILE} -print` \ + ${JAVASHAREDIR}/${FILE} .endfor .endif .if ${PORT_OPTIONS:MDOCS} @${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} Modified: head/java/springframework/distinfo ============================================================================== --- head/java/springframework/distinfo Sun Feb 17 16:13:48 2013 (r312421) +++ head/java/springframework/distinfo Sun Feb 17 16:14:54 2013 (r312422) @@ -1,2 +1,2 @@ -SHA256 (spring-framework-3.1.4.RELEASE-with-docs.zip) = b70ba31b0e5413e1d02f4f72e97fb5856eec86843bb34ebabb9fdc08118ad7ac -SIZE (spring-framework-3.1.4.RELEASE-with-docs.zip) = 123250862 +SHA256 (spring-framework-3.2.1.RELEASE-dist.zip) = 05bf8dee908dbcbf2027055749d19852c45d9148a085bc35cdb0241ee36dcb1d +SIZE (spring-framework-3.2.1.RELEASE-dist.zip) = 50123797