From 96499462819acc0d8f5c0609c7d5a1a3b6aca95d Mon Sep 17 00:00:00 2001 From: Wen Heping Date: Fri, 3 Sep 2010 10:53:32 +0000 Subject: [PATCH] - Update to 0.9.2 PR: ports/150136 Submitted by: Rob Farmer (maintainer) --- math/jlatexmath/Makefile | 35 ++++++++++++++++++++++++++++++++--- math/jlatexmath/distinfo | 6 +++--- math/jlatexmath/pkg-plist | 5 ++++- 3 files changed, 39 insertions(+), 7 deletions(-) diff --git a/math/jlatexmath/Makefile b/math/jlatexmath/Makefile index 8fdc662eb723..b877fefb4d5b 100644 --- a/math/jlatexmath/Makefile +++ b/math/jlatexmath/Makefile @@ -6,16 +6,16 @@ # PORTNAME= jlatexmath -PORTVERSION= 0.8.9 +PORTVERSION= 0.9.2 CATEGORIES= math java MASTER_SITES= http://forge.scilab.org/upload/jlatexmath/files/ \ http://www.predatorlabs.net/dl/ DISTNAME= ${PORTNAME}-src-all-${PORTVERSION} -EXTRACT_SUFX= .jar MAINTAINER= rfarmer@predatorlabs.net COMMENT= Java API to display mathematical formulas written in LaTeX +USE_ZIP= yes USE_JAVA= yes JAVA_VERSION= 1.5+ JAVA_BUILD= yes @@ -24,8 +24,37 @@ USE_ANT= yes NO_WRKSUBDIR= yes +OPTIONS= FOP "textproc/fop plugin (required for math/scilab)" ON + +.include + +.if defined(WITHOUT_FOP) +PLIST_SUB+= FOP="@comment " +.else +BUILD_DEPENDS+= fop:${PORTSDIR}/textproc/fop \ + ${JAVALIBDIR}/xmlgraphics-commons.jar:${PORTSDIR}/graphics/xmlgraphics-commons \ + ${LOCALBASE}/share/java/batik/batik.jar:${PORTSDIR}/graphics/batik \ + ${JAVALIBDIR}/avalon-framework.jar:${PORTSDIR}/devel/avalon-framework \ + ${JAVALIBDIR}/commons-io.jar:${PORTSDIR}/devel/jakarta-commons-io \ + ${JAVALIBDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging \ + ${JAVALIBDIR}/xml-apis-ext.jar:${PORTSDIR}/textproc/xml-commons + +RUN_DEPENDS+= ${BUILD_DEPENDS} + +ALL_TARGET+= fop + +PLIST_SUB+= FOP="" +.endif + +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 + + do-install: - ${INSTALL_DATA} ${WRKSRC}/dist/jlatexmath-0.8.9.jar ${JAVAJARDIR} + ${INSTALL_DATA} ${WRKSRC}/dist/jlatexmath-${PORTVERSION}.jar ${JAVAJARDIR}/jlatexmath.jar + ${INSTALL_DATA} ${WRKSRC}/dist/jlatexmath-fop-${PORTVERSION}.jar ${JAVAJARDIR}/jlatexmath-fop.jar .if !defined(NOPORTDOCS) (cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}) .endif diff --git a/math/jlatexmath/distinfo b/math/jlatexmath/distinfo index bdae3e5c5590..76e6abb2ea6d 100644 --- a/math/jlatexmath/distinfo +++ b/math/jlatexmath/distinfo @@ -1,3 +1,3 @@ -MD5 (jlatexmath-src-all-0.8.9.jar) = cef10764c65fd7b48e5349713a99a608 -SHA256 (jlatexmath-src-all-0.8.9.jar) = d0972c70799a16bfe9689ecc3120295fd77be32a07ab289af938ee5ed07fa8e7 -SIZE (jlatexmath-src-all-0.8.9.jar) = 1077515 +MD5 (jlatexmath-src-all-0.9.2.zip) = 53af6e2f13f7a5b80c902fc571bef87f +SHA256 (jlatexmath-src-all-0.9.2.zip) = 8737fde7569e59bff5a050b8c7e32c309c0730bfb0853f3a9d1987a385c7d02a +SIZE (jlatexmath-src-all-0.9.2.zip) = 1086897 diff --git a/math/jlatexmath/pkg-plist b/math/jlatexmath/pkg-plist index 20d3384a780d..509d1ae6dd79 100644 --- a/math/jlatexmath/pkg-plist +++ b/math/jlatexmath/pkg-plist @@ -2,6 +2,7 @@ %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Basic/Example2.java %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Basic/Example3.java %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Basic/Example4.java +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Basic/Example5.java %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Basic/Main.java %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Basic/lion.png %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Export/Convert.java @@ -9,6 +10,7 @@ %%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 @@ -17,7 +19,8 @@ %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Macros/Main.java %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Macros/Package_Foo.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Macros/README -share/java/classes/jlatexmath-0.8.9.jar +share/java/classes/jlatexmath.jar +%%FOP%%share/java/classes/jlatexmath-fop.jar %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/Macros/bin %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/Macros %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/Export