ports/150136: [MAINTAINER] [PATCH] math/jlatexmath Update to 0.9.2

[Rob Farmer]

>Number:         150136
>Category:       ports
>Synopsis:       [MAINTAINER] [PATCH] math/jlatexmath Update to 0.9.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Aug 31 00:30:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Rob Farmer
>Release:        9.0-CURRENT
>Organization:
>Environment:
FreeBSD peridot.predatorlabs.net 9.0-CURRENT FreeBSD 9.0-CURRENT #0: Thu Aug 19 18:44:11 PDT 2010     rfarmer at peridot.predatorlabs.net:/usr/obj/usr/src/sys/PERIDOT  i386
>Description:
Update to 0.9.2
Stop putting version in filenames
Add support for the textproc/fop plugin. This will be needed in Scilab 5.3.0

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: math/jlatexmath/Makefile
===================================================================
RCS file: /home/ncvs/ports/math/jlatexmath/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- math/jlatexmath/Makefile	13 Feb 2010 11:24:44 -0000	1.1
+++ math/jlatexmath/Makefile	30 Aug 2010 22:53:56 -0000
@@ -6,16 +6,17 @@
 #
 
 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 at 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 +25,43 @@
 
 NO_WRKSUBDIR=	yes
 
+OPTIONS=	FOP "textproc/fop plugin (required for math/scilab)" ON
+
+.include <bsd.port.options.mk>
+
+.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+=	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
+
+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
Index: math/jlatexmath/distinfo
===================================================================
RCS file: /home/ncvs/ports/math/jlatexmath/distinfo,v
retrieving revision 1.1
diff -u -r1.1 distinfo
--- math/jlatexmath/distinfo	13 Feb 2010 11:24:44 -0000	1.1
+++ math/jlatexmath/distinfo	30 Aug 2010 22:53:56 -0000
@@ -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
Index: math/jlatexmath/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/math/jlatexmath/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- math/jlatexmath/pkg-plist	13 Feb 2010 11:24:44 -0000	1.1
+++ math/jlatexmath/pkg-plist	30 Aug 2010 22:53:56 -0000
@@ -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
Index: math/scilab/Makefile
===================================================================
RCS file: /home/ncvs/ports/math/scilab/Makefile,v
retrieving revision 1.68
diff -u -r1.68 Makefile
--- math/scilab/Makefile	31 May 2010 01:59:48 -0000	1.68
+++ math/scilab/Makefile	30 Aug 2010 22:54:35 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	scilab
 PORTVERSION=	5.2.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math cad parallel java
 MASTER_SITES=	http://www.scilab.org/download/${PORTVERSION}/
 EXTRACT_SUFX=	-src.tar.gz
@@ -95,7 +95,7 @@
 		${JAVALIBDIR}/skinlf.jar:${PORTSDIR}/x11-toolkits/skinlf \
 		${JAVALIBDIR}/jrosetta-API.jar:${PORTSDIR}/java/jrosetta \
 		${JAVALIBDIR}/jhall.jar:${PORTSDIR}/java/javahelp \
-		${JAVALIBDIR}/jlatexmath-0.8.9.jar:${PORTSDIR}/math/jlatexmath \
+		${JAVALIBDIR}/jlatexmath.jar:${PORTSDIR}/math/jlatexmath \
 		fop:${PORTSDIR}/textproc/fop \
 		${LOCALBASE}/share/java/batik/batik.jar:${PORTSDIR}/graphics/batik \
 		foprep:${PORTSDIR}/math/jeuclid \
@@ -117,7 +117,7 @@
 		${JAVALIBDIR}/skinlf.jar:${PORTSDIR}/x11-toolkits/skinlf \
 		${JAVALIBDIR}/jrosetta-API.jar:${PORTSDIR}/java/jrosetta \
 		${JAVALIBDIR}/jhall.jar:${PORTSDIR}/java/javahelp \
-		${JAVALIBDIR}/jlatexmath-0.8.9.jar:${PORTSDIR}/math/jlatexmath \
+		${JAVALIBDIR}/jlatexmath.jar:${PORTSDIR}/math/jlatexmath \
 		fop:${PORTSDIR}/textproc/fop \
 		${LOCALBASE}/share/java/batik/batik.jar:${PORTSDIR}/graphics/batik \
 		foprep:${PORTSDIR}/math/jeuclid \


>Release-Note:
>Audit-Trail:
>Unformatted: