Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 25 Sep 2014 11:23:44 +0000 (UTC)
From:      John Marino <marino@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r369238 - head/textproc/apache-poi
Message-ID:  <201409251123.s8PBNiOY014577@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marino
Date: Thu Sep 25 11:23:44 2014
New Revision: 369238
URL: http://svnweb.freebsd.org/changeset/ports/369238
QAT: https://qat.redports.org/buildarchive/r369238/

Log:
  Unbreak textproc/apache-poi to save the port from deletion
  
  PR:		193142
  1st Proposal:	turutani (kyoto)
  2nd Proposal:	pfg@
  winner:		vanilla@
  
  In the final iteration, the Maven infrastructure was removed in favor
  of a precompiled binary which provides the bonus of a simpler makefile
  in additional to being poudriere-compatible.

Modified:
  head/textproc/apache-poi/Makefile
  head/textproc/apache-poi/distinfo

Modified: head/textproc/apache-poi/Makefile
==============================================================================
--- head/textproc/apache-poi/Makefile	Thu Sep 25 11:08:06 2014	(r369237)
+++ head/textproc/apache-poi/Makefile	Thu Sep 25 11:23:44 2014	(r369238)
@@ -2,56 +2,43 @@
 # $FreeBSD$
 
 PORTNAME=	poi
-PORTVERSION=	3.9
+PORTVERSION=	3.10.1
 CATEGORIES=	textproc devel java
 MASTER_SITES=	${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR=	${PORTNAME:S,-,/,}/release/src
+MASTER_SITE_SUBDIR=	${PORTNAME:S,-,/,}/release/bin
 PKGNAMEPREFIX=	apache-
-DISTNAME=	${PORTNAME}-src-${PORTVERSION}-20121203
+DISTNAME=	${PORTNAME}-bin-${PORTVERSION}-${RELEASE_DATE}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Java API To Access Microsoft Format Files
 
-BROKEN=		Tries to fetch files during build stage
-DEPRECATED=	Broken for more than 6 months
-EXPIRATION_DATE=	2014-09-28
-
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${JAVALIBDIR}/xalan.jar:${PORTSDIR}/textproc/xalan-j
-
+PORTDOCS=	*
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
-DSTAMP=		`date +%Y%m%d`
-
-USE_ANT=	yes
-MAKE_ARGS=
-MAKE_ENV+=	ANT_INCLUDE_SHARED_JARS=YES
-PORTDOCS=	*
-ALL_TARGET=	jar
-JARFILE=	${PORTNAME}-${PORTVERSION}-${DSTAMP}.jar
-DESTJARFILE=	${PORTNAME}.jar
+NO_BUILD=	yes
+RELEASE_DATE=	20140818
 JARNAMES=	examples excelant scratchpad ooxml ooxml-schemas
-
-PLIST_FILES=	%%JAVAJARDIR%%/${DESTJARFILE}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.jar
+OPTIONS_DEFINE=	DOCS
 
 .for i in ${JARNAMES}
-PLIST_FILES+=%%JAVAJARDIR%%/${PORTNAME}-${i}.jar
+PLIST_FILES+=	%%JAVAJARDIR%%/${PORTNAME}-${i}.jar
 .endfor
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/build/dist/${JARFILE} ${JAVAJARDIR}/${DESTJARFILE}
+	@${ECHO_MSG} -n ">> Installing JAR as ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}-${RELEASE_DATE}.jar..."
+	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-${PORTVERSION}-${RELEASE_DATE}.jar ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
 .for i in ${JARNAMES}
-	${INSTALL_DATA} ${WRKSRC}/build/dist/${PORTNAME}-${i}-${PORTVERSION}-${DSTAMP}.jar ${JAVAJARDIR}/${PORTNAME}-${i}.jar
+	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-${i}-${PORTVERSION}-${RELEASE_DATE}.jar ${STAGEDIR}${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})
+	@${ECHO_MSG} " [ DONE ]"
+	@${ECHO_MSG} -n ">> Installing documentation in ${STAGEDIR}${DOCSDIR}/..."
+	@cd ${WRKSRC}/docs \
+	  && ${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/{} \; \
+	  && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/{} \;
+	@${ECHO_MSG} " [ DONE ]"
 
 .include <bsd.port.mk>

Modified: head/textproc/apache-poi/distinfo
==============================================================================
--- head/textproc/apache-poi/distinfo	Thu Sep 25 11:08:06 2014	(r369237)
+++ head/textproc/apache-poi/distinfo	Thu Sep 25 11:23:44 2014	(r369238)
@@ -1,2 +1,2 @@
-SHA256 (poi-src-3.9-20121203.tar.gz) = 15f948546525a73438ef6544e8ba006813b79a4a7e8529582c99e3926c238ead
-SIZE (poi-src-3.9-20121203.tar.gz) = 48227396
+SHA256 (poi-bin-3.10.1-20140818.tar.gz) = 9b6b7fcb5e90fe128808e5ecee97ab911676fbd419df85f660417e216ca8045c
+SIZE (poi-bin-3.10.1-20140818.tar.gz) = 16653077



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409251123.s8PBNiOY014577>