From owner-svn-ports-head@FreeBSD.ORG Mon Nov 4 14:20:40 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id C2023275; Mon, 4 Nov 2013 14:20:40 +0000 (UTC) (envelope-from wg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A01DE2847; Mon, 4 Nov 2013 14:20:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA4EKevD002071; Mon, 4 Nov 2013 14:20:40 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA4EKdGj002066; Mon, 4 Nov 2013 14:20:39 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201311041420.rA4EKdGj002066@svn.freebsd.org> From: William Grzybowski Date: Mon, 4 Nov 2013 14:20:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332726 - in head: . databases/jasperreports textproc/apache-poi textproc/jakarta-poi X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Nov 2013 14:20:40 -0000 Author: wg Date: Mon Nov 4 14:20:39 2013 New Revision: 332726 URL: http://svnweb.freebsd.org/changeset/ports/332726 Log: textproc/apache-poi: update to 3.9 - Update to 3.9 - Rename it to jakarta-poi - Allow staging PR: ports/181308 Submitted by: Pedro Giffuni Approved by: maintainer (timeout) Added: head/textproc/apache-poi/ - copied from r332703, head/textproc/jakarta-poi/ Deleted: head/textproc/jakarta-poi/ Modified: head/MOVED head/databases/jasperreports/Makefile head/textproc/apache-poi/Makefile head/textproc/apache-poi/distinfo head/textproc/apache-poi/pkg-descr Modified: head/MOVED ============================================================================== --- head/MOVED Mon Nov 4 14:20:06 2013 (r332725) +++ head/MOVED Mon Nov 4 14:20:39 2013 (r332726) @@ -5164,3 +5164,4 @@ databases/ruby-memcache||2013-11-03|Has deskutils/blogtk||2013-11-03|Has expired: This is dead upstream and is no longer being maintained devel/ruby-io-reactor||2013-11-03|Has expired: Does not work with Ruby 1.9 textproc/p5-Text-Emoticon-MSN||2013-11-03|Has expired: Primary MSN Messenger service terminated 30 APR 2013 +textproc/jakarta-poi|textproc/apache-poi|2013-11-04|Replaced with apache-poi Modified: head/databases/jasperreports/Makefile ============================================================================== --- head/databases/jasperreports/Makefile Mon Nov 4 14:20:06 2013 (r332725) +++ head/databases/jasperreports/Makefile Mon Nov 4 14:20:39 2013 (r332726) @@ -13,7 +13,7 @@ COMMENT= JasperReports is a powerful ope RUN_DEPENDS= ${JAVALIBDIR}/itext.jar:${PORTSDIR}/devel/itext \ ${JAVALIBDIR}/xalan.jar:${PORTSDIR}/textproc/xalan-j \ ${JAVALIBDIR}/crimson.jar:${PORTSDIR}/textproc/crimson \ - ${JAVALIBDIR}/poi.jar:${PORTSDIR}/textproc/jakarta-poi \ + ${JAVALIBDIR}/poi.jar:${PORTSDIR}/textproc/apache-poi \ ${JAVALIBDIR}/jfreechart.jar:${PORTSDIR}/java/jfreechart \ ${JAVASHAREDIR}/batik/batik.jar:${PORTSDIR}/graphics/batik \ ${JAVALIBDIR}/commons-beanutils.jar:${PORTSDIR}/java/jakarta-commons-beanutils\ Modified: head/textproc/apache-poi/Makefile ============================================================================== --- head/textproc/jakarta-poi/Makefile Mon Nov 4 12:40:38 2013 (r332703) +++ head/textproc/apache-poi/Makefile Mon Nov 4 14:20:39 2013 (r332726) @@ -2,13 +2,12 @@ # $FreeBSD$ PORTNAME= poi -PORTVERSION= 2.5.1 -PORTREVISION= 2 +PORTVERSION= 3.9 CATEGORIES= textproc devel java -MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA} +MASTER_SITES= ${MASTER_SITE_APACHE} MASTER_SITE_SUBDIR= ${PORTNAME:S,-,/,}/release/src -PKGNAMEPREFIX= jakarta- -DISTNAME= ${PORTNAME}-src-${PORTVERSION}-final-20040804 +PKGNAMEPREFIX= apache- +DISTNAME= ${PORTNAME}-src-${PORTVERSION}-20121203 MAINTAINER= toha@toha.org.ua COMMENT= Java API To Access Microsoft Format Files @@ -18,33 +17,35 @@ BUILD_DEPENDS= ${JAVALIBDIR}/xalan.jar:$ USE_JAVA= yes JAVA_VERSION= 1.6+ -NO_WRKSUBDIR= yes +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} DSTAMP= `date +%Y%m%d` USE_ANT= yes +MAKE_ARGS= MAKE_ENV+= ANT_INCLUDE_SHARED_JARS=YES -.if !defined(NOPORTDOCS) PORTDOCS= * -.endif ALL_TARGET= jar -JARFILE= ${PORTNAME}-${PORTVERSION}-final-${DSTAMP}.jar +JARFILE= ${PORTNAME}-${PORTVERSION}-${DSTAMP}.jar DESTJARFILE= ${PORTNAME}.jar +JARNAMES= examples excelant scratchpad ooxml ooxml-schemas PLIST_FILES= %%JAVAJARDIR%%/${DESTJARFILE} -NO_STAGE= yes +.for i in ${JARNAMES} +PLIST_FILES+=%%JAVAJARDIR%%/${PORTNAME}-${i}.jar +.endfor + do-install: - @${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${DESTJARFILE}..." - @${INSTALL_DATA} ${WRKSRC}/build/dist/${JARFILE} ${JAVAJARDIR}/${DESTJARFILE} - @${ECHO_MSG} " [ DONE ]" - -.if !defined(NOPORTDOCS) - @${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..." - @cd ${WRKSRC}/docs/apidocs \ - && ${FIND} . -type d -exec ${MKDIR} ${DOCSDIR}/{} \; \ - && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \; - @${ECHO_MSG} " [ DONE ]" -.endif + ${INSTALL_DATA} ${WRKSRC}/build/dist/${JARFILE} ${JAVAJARDIR}/${DESTJARFILE} +.for i in ${JARNAMES} + ${INSTALL_DATA} ${WRKSRC}/build/dist/${PORTNAME}-${i}-${PORTVERSION}-${DSTAMP}.jar ${JAVAJARDIR}/${PORTNAME}-${i}.jar +.endfor + cd ${WRKSRC}/docs/apidocs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} + +# Workaround stage and ANT bug +do-build: + @(cd ${BUILD_WRKSRC}; \ + ${SETENV} ${MAKE_ENV} ${ANT} ${ALL_TARGET}) .include Modified: head/textproc/apache-poi/distinfo ============================================================================== --- head/textproc/jakarta-poi/distinfo Mon Nov 4 12:40:38 2013 (r332703) +++ head/textproc/apache-poi/distinfo Mon Nov 4 14:20:39 2013 (r332726) @@ -1,2 +1,2 @@ -SHA256 (poi-src-2.5.1-final-20040804.tar.gz) = 783c6c36b9762aafd3386adcfbe71ad46aaa14d9fe20545c4a60eb591cfe0cc1 -SIZE (poi-src-2.5.1-final-20040804.tar.gz) = 6870414 +SHA256 (poi-src-3.9-20121203.tar.gz) = 15f948546525a73438ef6544e8ba006813b79a4a7e8529582c99e3926c238ead +SIZE (poi-src-3.9-20121203.tar.gz) = 48227396 Modified: head/textproc/apache-poi/pkg-descr ============================================================================== --- head/textproc/jakarta-poi/pkg-descr Mon Nov 4 12:40:38 2013 (r332703) +++ head/textproc/apache-poi/pkg-descr Mon Nov 4 14:20:39 2013 (r332726) @@ -5,4 +5,4 @@ write Word files using Java. POI is your Word Excel solution. However, we have a complete API for porting other OLE 2 Compound Document formats and welcome others to participate. -WWW: http://jakarta.apache.org/poi/ +WWW: http://poi.apache.org/