From 5b4829585a005cdef02d3854f0053622c8250ee5 Mon Sep 17 00:00:00 2001 From: Max Brazhnikov Date: Wed, 21 Aug 2019 19:43:32 +0000 Subject: [PATCH] math/jlatexmath: - Update to 1.0.7 - Switch to the binary distribution since building from the sources requires maven - Remove FOP option and install fop plugin unconditionally: jlatexmath is solely used by math/scilab only and it needs fop. - Update WWW --- math/jlatexmath/Makefile | 54 +++++++++++---------------------------- math/jlatexmath/distinfo | 7 +++-- math/jlatexmath/pkg-descr | 2 +- math/jlatexmath/pkg-plist | 32 +++-------------------- 4 files changed, 24 insertions(+), 71 deletions(-) diff --git a/math/jlatexmath/Makefile b/math/jlatexmath/Makefile index d1d58fce2fef..9d485bbeb5fc 100644 --- a/math/jlatexmath/Makefile +++ b/math/jlatexmath/Makefile @@ -2,55 +2,31 @@ # $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= https://repo1.maven.org/maven2/org/scilab/forge/jlatexmath/${PORTVERSION}/:0 \ + https://repo1.maven.org/maven2/org/scilab/forge/jlatexmath-fop/${PORTVERSION}/:1 +DISTFILES= ${PORTNAME}-${PORTVERSION}.jar:0 \ + ${PORTNAME}-fop-${PORTVERSION}.jar:1 +EXTRACT_ONLY= # none MAINTAINER= makc@FreeBSD.org COMMENT= Java API to display mathematical formulas written in LaTeX LICENSE= GPLv2 -USES= zip -USE_JAVA= yes -JAVA_BUILD= yes -JAVA_RUN= yes -USE_ANT= yes +RUN_DEPENDS= ${JAVALIBDIR}/xmlgraphics-commons.jar:graphics/xmlgraphics-commons -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +USE_JAVA= 1.7+ -OPTIONS_DEFINE= FOP EXAMPLES -OPTIONS_DEFAULT= FOP -OPTIONS_SUB= yes - -FOP_DESC= textproc/fop plugin (required for math/scilab) -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 \ - ${JAVALIBDIR}/avalon-framework.jar:devel/avalon-framework \ - ${JAVALIBDIR}/commons-io.jar:devel/jakarta-commons-io \ - ${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging \ - ${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 - -pre-install: -# Remove empty directory - -${RMDIR} ${WRKSRC}/examples/Macros/bin +NO_ARCH= yes +NO_BUILD= yes +PLIST_SUB= PORTVERSION=${PORTVERSION} do-install: - ${INSTALL_DATA} ${WRKSRC}/dist/jlatexmath-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}/jlatexmath.jar - -do-install-EXAMPLES-on: - (cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}) - -do-install-FOP-on: - ${INSTALL_DATA} ${WRKSRC}/dist/jlatexmath-fop-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}/jlatexmath-fop.jar +.for f in jlatexmath jlatexmath-fop + ${INSTALL_DATA} ${DISTDIR}/${f}-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR} + ${LN} -sf ${f}-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}/${f}.jar +.endfor .include diff --git a/math/jlatexmath/distinfo b/math/jlatexmath/distinfo index 57a3fe0c3f07..3619c9531cf2 100644 --- a/math/jlatexmath/distinfo +++ b/math/jlatexmath/distinfo @@ -1,2 +1,5 @@ -SHA256 (jlatexmath-src-all-1.0.3.zip) = 58b14f0f30250b7cd3d1e5cfae20a8d5f999c01e9ff5e03508cbdb8f922dd7fd -SIZE (jlatexmath-src-all-1.0.3.zip) = 1203123 +TIMESTAMP = 1566401432 +SHA256 (jlatexmath-1.0.7.jar) = 6d04c3843fc98d2eea9ba4cff0be7b80540ca75c5a4e0b3463fd1219c48cc65d +SIZE (jlatexmath-1.0.7.jar) = 669575 +SHA256 (jlatexmath-fop-1.0.7.jar) = cd3302fd0d7f17d44b82555f87689846e0bb70814f0639aae3b976dfac145496 +SIZE (jlatexmath-fop-1.0.7.jar) = 26141 diff --git a/math/jlatexmath/pkg-descr b/math/jlatexmath/pkg-descr index 822df2d1135b..457ad5e93ef7 100644 --- a/math/jlatexmath/pkg-descr +++ b/math/jlatexmath/pkg-descr @@ -18,4 +18,4 @@ The most of LaTeX commands are available and : PDF, PS or EPS (SVG export with shaped fonts works fine too); 11) and probably other things I forgot... -WWW: http://forge.scilab.org/index.php/p/jlatexmath/ +WWW: https://wiki.scilab.org/JLaTeXMath diff --git a/math/jlatexmath/pkg-plist b/math/jlatexmath/pkg-plist index d5193f407ed6..56dc58931678 100644 --- a/math/jlatexmath/pkg-plist +++ b/math/jlatexmath/pkg-plist @@ -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-%%PORTVERSION%%.jar +%%JAVAJARDIR%%/jlatexmath-fop-%%PORTVERSION%%.jar +%%JAVAJARDIR%%/jlatexmath-fop.jar %%JAVAJARDIR%%/jlatexmath.jar