Attachment 200223 Details for Bug 234124 – patch

[patch] patch

jlatexmath.patch (text/plain), 5.64 KB, created by Yuri Victorovich on 2018-12-18 09:33:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Victorovich

Created: 2018-12-18 09:33:03 UTC

Size: 5.64 KB

patch

obsolete

>Index: math/jlatexmath/Makefile
>===================================================================
>--- math/jlatexmath/Makefile	(revision 486491)
>+++ math/jlatexmath/Makefile	(working copy)
>@@ -2,10 +2,10 @@
> # $FreeBSD$
> 
> PORTNAME=	jlatexmath
>-PORTVERSION=	1.0.3
>+PORTVERSION=	1.0.7
> CATEGORIES=	math java
>-MASTER_SITES=	http://forge.scilab.org/upload/jlatexmath/files/
>-DISTNAME=	${PORTNAME}-src-all-${PORTVERSION}
>+MASTER_SITES=	LOCAL/yuri/:maven
>+DISTFILES=	FreeBSD-${PORTNAME}-${PORTVERSION}-maven-repository.tar.gz:maven
> 
> MAINTAINER=	makc@FreeBSD.org
> COMMENT=	Java API to display mathematical formulas written in LaTeX
>@@ -12,14 +12,14 @@
> 
> LICENSE=	GPLv2
> 
>-USES=		zip
>+BUILD_DEPENDS=	mvn:devel/maven
>+
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	opencollab
> USE_JAVA=	yes
> JAVA_BUILD=	yes
> JAVA_RUN=	yes
>-USE_ANT=	yes
> 
>-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
>-
> OPTIONS_DEFINE=	FOP EXAMPLES
> OPTIONS_DEFAULT=	FOP
> OPTIONS_SUB=	yes
>@@ -28,7 +28,7 @@
> FOP_BUILD_DEPENDS=	fop:textproc/fop \
> 			${JAVALIBDIR}/xmlgraphics-commons.jar:graphics/xmlgraphics-commons
> FOP_RUN_DEPENDS:=	${FOP_BUILD_DEPENDS} \
>-			${LOCALBASE}/share/java/batik/batik.jar:graphics/batik \
>+			batik>0:graphics/batik \
> 			${JAVALIBDIR}/avalon-framework.jar:devel/avalon-framework \
> 			${JAVALIBDIR}/commons-io.jar:devel/jakarta-commons-io \
> 			${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging \
>@@ -35,22 +35,28 @@
> 			${JAVALIBDIR}/xml-apis-ext.jar:textproc/xml-commons
> FOP_ALL_TARGET=		fop
> 
>-post-patch:
>-	${REINPLACE_CMD} -e 's|/usr/share/java/fop.jar|${LOCALBASE}/share/java/fop/build/fop.jar|' ${WRKSRC}/fop.properties
>-	${REINPLACE_CMD} -e 's|/usr/share/java/batik.jar|${LOCALBASE}/share/java/batik/batik.jar|' ${WRKSRC}/fop.properties
>-	${REINPLACE_CMD} -e 's|/usr/share/java/|${JAVALIBDIR}/|' ${WRKSRC}/fop.properties
>+PORTEXAMPLES=	*
> 
>+do-build:
>+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
>+		${LOCALBASE}/bin/mvn --offline \
>+		-fae install \
>+		-Dmaven.test.skip=true \
>+		-Duser.home=${WRKDIR}
>+
> pre-install:
> # Remove empty directory
> 	-${RMDIR} ${WRKSRC}/examples/Macros/bin
> 
> do-install:
>-	${INSTALL_DATA} ${WRKSRC}/dist/jlatexmath-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}/jlatexmath.jar
>+	${INSTALL_DATA} ${WRKSRC}/jlatexmath/target/jlatexmath-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}/jlatexmath.jar
>+	${INSTALL_DATA} ${WRKSRC}/jlatexmath-font-cyrillic/target/jlatexmath-font-cyrillic-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}/jlatexmath-font-cyrillic.jar
>+	${INSTALL_DATA} ${WRKSRC}/jlatexmath-font-greek/target/jlatexmath-font-greek-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}/jlatexmath-font-greek.jar
> 
> do-install-EXAMPLES-on:
>-	(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR})
>+	(cd ${WRKSRC}/jlatexmath/src/test/java/org/scilab/forge/jlatexmath/examples && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR})
> 
> do-install-FOP-on:
>-	${INSTALL_DATA} ${WRKSRC}/dist/jlatexmath-fop-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}/jlatexmath-fop.jar
>+	${INSTALL_DATA} ${WRKSRC}/jlatexmath-fop/target/jlatexmath-fop-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}/jlatexmath-fop.jar
> 
> .include <bsd.port.mk>
>Index: math/jlatexmath/distinfo
>===================================================================
>--- math/jlatexmath/distinfo	(revision 486491)
>+++ math/jlatexmath/distinfo	(working copy)
>@@ -1,2 +1,5 @@
>-SHA256 (jlatexmath-src-all-1.0.3.zip) = 58b14f0f30250b7cd3d1e5cfae20a8d5f999c01e9ff5e03508cbdb8f922dd7fd
>-SIZE (jlatexmath-src-all-1.0.3.zip) = 1203123
>+TIMESTAMP = 1545124625
>+SHA256 (FreeBSD-jlatexmath-1.0.7-maven-repository.tar.gz) = 7481f2670993b27512a13ae1287e0f588d86ea2390f586278c6ecfb4a8c4fd53
>+SIZE (FreeBSD-jlatexmath-1.0.7-maven-repository.tar.gz) = 41164626
>+SHA256 (opencollab-jlatexmath-1.0.7_GH0.tar.gz) = 9e691090af94d6421d12744db86829d6f2115a5a4790a46f4815817a46e32436
>+SIZE (opencollab-jlatexmath-1.0.7_GH0.tar.gz) = 1787823
>Index: math/jlatexmath/pkg-plist
>===================================================================
>--- math/jlatexmath/pkg-plist	(revision 486491)
>+++ math/jlatexmath/pkg-plist	(working copy)
>@@ -1,30 +1,4 @@
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Basic/Example1.java
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Basic/Example2.java
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Basic/Example3.java
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Basic/Example4.java
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Basic/Example5.java
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Basic/Example6.java
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Basic/Example7.java
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Basic/ExampleSwing2.java
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Basic/Main.java
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Basic/lion.png
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Export/Convert.java
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Export/Example1.java
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Export/Example2.java
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Export/Example3.java
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Export/Example4.java
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Export/Example5.java
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Export/Main.java
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Export/README
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Export/build.xml
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Export/lion.png
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/GIWS/LaTeXGenerator.giws.xml
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/GIWS/README
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/GIWS/build.xml
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/GIWS/src/org/scilab/forge/example/giws/LaTeXGenerator.java
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Macros/FooPackage.java
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Macros/Main.java
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Macros/Package_Foo.xml
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Macros/README
> %%FOP%%%%JAVAJARDIR%%/jlatexmath-fop.jar
> %%JAVAJARDIR%%/jlatexmath.jar
>+%%JAVAJARDIR%%/jlatexmath-font-cyrillic.jar
>+%%JAVAJARDIR%%/jlatexmath-font-greek.jar

Actions: View | Diff

Attachments on bug 234124: 200223