Attachment 146522 Details for Bug 193142 – apache-poi.diff

[patch] apache-poi.diff

apache-poi.diff (text/plain), 7.95 KB, created by TsurutaniNaoki on 2014-08-30 08:26:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: TsurutaniNaoki

Created: 2014-08-30 08:26:41 UTC

Size: 7.95 KB

patch

obsolete

>diff -urN apache-poi.orig/Makefile apache-poi/Makefile
>--- apache-poi.orig/Makefile	2014-08-29 02:26:23.000000000 +0900
>+++ apache-poi/Makefile	2014-08-30 17:09:45.000000000 +0900
>@@ -4,18 +4,35 @@
> PORTNAME=	poi
> PORTVERSION=	3.9
> CATEGORIES=	textproc devel java
>-MASTER_SITES=	${MASTER_SITE_APACHE}
>-MASTER_SITE_SUBDIR=	${PORTNAME:S,-,/,}/release/src
>+MASTER_SITES=	${MASTER_SITE_APACHE} \
>+		http://repo1.maven.org/maven2/%SUBDIR%/:s1,s2,s3,s4,s5,s6,s7,s8 \
>+		http://www.ecma-international.org/publications/files/ECMA-ST/:s9
>+MASTER_SITE_SUBDIR=	${PORTNAME:S,-,/,}/release/src/ \
>+		commons-logging/commons-logging/1.1/:s1 \
>+		commons-codec/commons-codec/1.5/:s2 \
>+		log4j/log4j/1.2.13/:s3 \
>+		junit/junit/3.8.1/:s4 \
>+		org/apache/ant/ant/1.8.2/:s5 \
>+		dom4j/dom4j/1.6.1/:s6 \
>+		org/apache/xmlbeans/xmlbeans/2.3.0/:s7 \
>+		stax/stax-api/1.0.1/:s8
> PKGNAMEPREFIX=	apache-
>-DISTNAME=	${PORTNAME}-src-${PORTVERSION}-20121203
>+DISTFILES=	${PORTNAME}-src-${PORTVERSION}-20121203${EXTRACT_SUFX} \
>+		commons-logging-1.1.jar:s1 \
>+		commons-codec-1.5.jar:s2 \
>+		log4j-1.2.13.jar:s3 \
>+		junit-3.8.1.jar:s4 \
>+		ant-1.8.2.jar:s5 \
>+		dom4j-1.6.1.jar:s6 \
>+		xmlbeans-2.3.0.jar:s7 \
>+		stax-api-1.0.1.jar:s8 \
>+		Office%20Open%20XML%201st%20edition%20Part%204%20$PDF$.zip:s9
>+DIST_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}
>+EXTRACT_ONLY=	${PORTNAME}-src-${PORTVERSION}-20121203${EXTRACT_SUFX}
> 
> 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
>@@ -42,10 +59,14 @@
> PLIST_FILES+=%%JAVAJARDIR%%/${PORTNAME}-${i}.jar
> .endfor
> 
>+post-patch:
>+	@${REINPLACE_CMD} -e 's|XX__EDITPATH__XX|file://${DISTDIR}/${PKGNAMEPREFIX}${PORTNAME}|' \
>+		${WRKSRC}/build.xml
>+
> do-install:
>-	${INSTALL_DATA} ${WRKSRC}/build/dist/${JARFILE} ${JAVAJARDIR}/${DESTJARFILE}
>+	${INSTALL_DATA} ${WRKSRC}/build/dist/${JARFILE} ${STAGEDIR}${JAVAJARDIR}/${DESTJARFILE}
> .for i in ${JARNAMES}
>-	${INSTALL_DATA} ${WRKSRC}/build/dist/${PORTNAME}-${i}-${PORTVERSION}-${DSTAMP}.jar ${JAVAJARDIR}/${PORTNAME}-${i}.jar
>+	${INSTALL_DATA} ${WRKSRC}/build/dist/${PORTNAME}-${i}-${PORTVERSION}-${DSTAMP}.jar ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}-${i}.jar
> .endfor
> 	cd ${WRKSRC}/docs/apidocs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
> 
>diff -urN apache-poi.orig/distinfo apache-poi/distinfo
>--- apache-poi.orig/distinfo	2014-01-23 00:30:13.000000000 +0900
>+++ apache-poi/distinfo	2014-08-30 16:40:34.000000000 +0900
>@@ -1,2 +1,20 @@
>-SHA256 (poi-src-3.9-20121203.tar.gz) = 15f948546525a73438ef6544e8ba006813b79a4a7e8529582c99e3926c238ead
>-SIZE (poi-src-3.9-20121203.tar.gz) = 48227396
>+SHA256 (apache-poi/poi-src-3.9-20121203.tar.gz) = 15f948546525a73438ef6544e8ba006813b79a4a7e8529582c99e3926c238ead
>+SIZE (apache-poi/poi-src-3.9-20121203.tar.gz) = 48227396
>+SHA256 (apache-poi/commons-logging-1.1.jar) = 9e8d01f172301b966f1f404aa6fc0bdbec478ae9197256ad95bfcad1ef927601
>+SIZE (apache-poi/commons-logging-1.1.jar) = 52915
>+SHA256 (apache-poi/commons-codec-1.5.jar) = c7956fe621708e45314ebdf6a35e35c57f2ff80ba9c85dfafb1e43620af6c797
>+SIZE (apache-poi/commons-codec-1.5.jar) = 73098
>+SHA256 (apache-poi/log4j-1.2.13.jar) = c8ed615889a62d7957c4ea44b0d1d290b9f308c88edabac325526957259d7f14
>+SIZE (apache-poi/log4j-1.2.13.jar) = 358180
>+SHA256 (apache-poi/junit-3.8.1.jar) = b58e459509e190bed737f3592bc1950485322846cf10e78ded1d065153012d70
>+SIZE (apache-poi/junit-3.8.1.jar) = 121070
>+SHA256 (apache-poi/ant-1.8.2.jar) = 952d86ae0bbe30447034ed1d318b41a8dc92e2fb74cadf2e913f04fd1925a970
>+SIZE (apache-poi/ant-1.8.2.jar) = 1933743
>+SHA256 (apache-poi/dom4j-1.6.1.jar) = 593552ffea3c5823c6602478b5002a7c525fd904a3c44f1abe4065c22edfac73
>+SIZE (apache-poi/dom4j-1.6.1.jar) = 313898
>+SHA256 (apache-poi/xmlbeans-2.3.0.jar) = c63808344ea50d9741b266362996557bac8587cdc4f3faf13bbec95296d353e3
>+SIZE (apache-poi/xmlbeans-2.3.0.jar) = 2666695
>+SHA256 (apache-poi/stax-api-1.0.1.jar) = d1968436fc216c901fb9b82c7e878b50fd1d30091676da95b2edd3a9c0ccf92e
>+SIZE (apache-poi/stax-api-1.0.1.jar) = 26514
>+SHA256 (apache-poi/Office%20Open%20XML%201st%20edition%20Part%204%20(PDF).zip) = 4d9e0833e6977fb3b56f2761f6b3143f98fb99430943620b25309093fc60b884
>+SIZE (apache-poi/Office%20Open%20XML%201st%20edition%20Part%204%20(PDF).zip) = 33175399
>diff -urN apache-poi.orig/files/patch-build.xml apache-poi/files/patch-build.xml
>--- apache-poi.orig/files/patch-build.xml	1970-01-01 09:00:00.000000000 +0900
>+++ apache-poi/files/patch-build.xml	2014-08-30 16:45:20.000000000 +0900
>@@ -0,0 +1,44 @@
>+--- build.xml.orig	2012-11-25 21:36:35.000000000 +0900
>++++ build.xml	2014-08-30 14:56:12.000000000 +0900
>+@@ -128,32 +128,32 @@
>+     
>+     <property name="main.commons-logging.jar" location="${main.lib}/commons-logging-1.1.jar"/>
>+     <property name="main.commons-logging.url"
>+-              value="${repository.m2}/maven2/commons-logging/commons-logging/1.1/commons-logging-1.1.jar"/>
>++              value="XX__EDITPATH__XX/commons-logging-1.1.jar"/>
>+     <property name="main.commons-codec.jar" location="${main.lib}/commons-codec-1.5.jar"/>
>+     <property name="main.commons-codec.url"
>+-              value="${repository.m2}/maven2/commons-codec/commons-codec/1.5/commons-codec-1.5.jar"/>
>++              value="XX__EDITPATH__XX/commons-codec-1.5.jar"/>
>+     <property name="main.log4j.jar" location="${main.lib}/log4j-1.2.13.jar"/>
>+-    <property name="main.log4j.url" value="${repository.m2}/maven2/log4j/log4j/1.2.13/log4j-1.2.13.jar"/>
>++    <property name="main.log4j.url" value="XX__EDITPATH__XX/log4j-1.2.13.jar"/>
>+     <property name="main.junit.jar" location="${main.lib}/junit-3.8.1.jar"/>
>+-    <property name="main.junit.url" value="${repository.m2}/maven2/junit/junit/3.8.1/junit-3.8.1.jar"/>
>++    <property name="main.junit.url" value="XX__EDITPATH__XX/junit-3.8.1.jar"/>
>+     <property name="main.ant.jar" location="${main.lib}/ant-1.8.2.jar"/>
>+-    <property name="main.ant.url" value="${repository.m2}/maven2/org/apache/ant/ant/1.8.2/ant-1.8.2.jar"/>
>++    <property name="main.ant.url" value="XX__EDITPATH__XX/ant-1.8.2.jar"/>
>+ 
>+     
>+     <property name="ooxml.dom4j.jar" location="${ooxml.lib}/dom4j-1.6.1.jar"/>
>+-    <property name="ooxml.dom4j.url" value="${repository.m2}/maven2/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
>++    <property name="ooxml.dom4j.url" value="XX__EDITPATH__XX/dom4j-1.6.1.jar"/>
>+     <property name="ooxml.xmlbeans.jar" location="${ooxml.lib}/xmlbeans-2.3.0.jar"/>
>+     <property name="ooxml.xmlbeans.url"
>+-              value="${repository.m2}/maven2/org/apache/xmlbeans/xmlbeans/2.3.0/xmlbeans-2.3.0.jar"/>
>++              value="XX__EDITPATH__XX/xmlbeans-2.3.0.jar"/>
>+     <property name="ooxml.jsr173.jar" location="${ooxml.lib}/stax-api-1.0.1.jar"/>
>+-    <property name="ooxml.jsr173.url" value="${repository.m2}/maven2/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/>
>++    <property name="ooxml.jsr173.url" value="XX__EDITPATH__XX/stax-api-1.0.1.jar"/>
>+ 
>+     
>+     
>+     <property name="ooxml.xsds.ozip" location="${ooxml.lib}/OfficeOpenXML-Part4.zip"/>
>+     <property name="ooxml.xsds.izip" location="${ooxml.lib}/OfficeOpenXML-XMLSchema.zip"/>
>+     <property name="ooxml.xsds.url"
>+-              value="http://www.ecma-international.org/publications/files/ECMA-ST/Office%20Open%20XML%201st%20edition%20Part%204%20(PDF).zip"/>
>++              value="XX__EDITPATH__XX/Office%2520Open%2520XML%25201st%2520edition%2520Part%25204%2520(PDF).zip"/>
>+     <property name="ooxml.xsds.src.dir" location="build/ooxml-xsds-src"/>
>+     <property name="ooxml.xsds.src.jar" location="${ooxml.lib}/ooxml-schemas-src-1.1.jar"/>
>+     <property name="ooxml.xsds.jar" location="${ooxml.lib}/ooxml-schemas-1.1.jar"/>
>--- apache-poi.diff ends here ---

Actions: View | Diff

Attachments on bug 193142: 146522 | 146615 | 147529 | 147534 | 147650 | 147653