svn commit: r332726 - in head: . databases/jasperreports textproc/apache-poi textproc/jakarta-poi

[William Grzybowski]

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 <giffunip tutopia.com>
  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 at 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 <bsd.port.mk>

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/