svn commit: r352749 - head/math/jlatexmath

[Max Brazhnikov]

Author: makc
Date: Thu May  1 14:28:55 2014
New Revision: 352749
URL: http://svnweb.freebsd.org/changeset/ports/352749
QAT: https://qat.redports.org/buildarchive/r352749/

Log:
  math/jlatexmath:
  - Update to 1.0.3
  - Reduce build dependencies (follow README instructions)
  - Fix packaging without FOP option
  - Take maintainership

Modified:
  head/math/jlatexmath/Makefile
  head/math/jlatexmath/distinfo
  head/math/jlatexmath/pkg-plist

Modified: head/math/jlatexmath/Makefile
==============================================================================
--- head/math/jlatexmath/Makefile	Thu May  1 14:26:32 2014	(r352748)
+++ head/math/jlatexmath/Makefile	Thu May  1 14:28:55 2014	(r352749)
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	jlatexmath
-PORTVERSION=	0.9.7
+PORTVERSION=	1.0.3
 CATEGORIES=	math java
 MASTER_SITES=	http://forge.scilab.org/upload/jlatexmath/files/
 DISTNAME=	${PORTNAME}-src-all-${PORTVERSION}
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	makc at FreeBSD.org
 COMMENT=	Java API to display mathematical formulas written in LaTeX
 
 LICENSE=	GPLv2
@@ -26,23 +26,31 @@ OPTIONS_SUB=	yes
 
 FOP_DESC=		textproc/fop plugin (required for math/scilab)
 FOP_BUILD_DEPENDS=	fop:${PORTSDIR}/textproc/fop \
-			${JAVALIBDIR}/xmlgraphics-commons.jar:${PORTSDIR}/graphics/xmlgraphics-commons \
+			${JAVALIBDIR}/xmlgraphics-commons.jar:${PORTSDIR}/graphics/xmlgraphics-commons
+FOP_RUN_DEPENDS:=	${FOP_BUILD_DEPENDS}
 			${JAVASHAREDIR}/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
-FOP_RUN_DEPENDS:=	${FOP_BUILD_DEPENDS}
 FOP_ALL_TARGET=		fop
 
+.include <bsd.port.options.mk>
+
 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
+
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/dist/jlatexmath-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}/jlatexmath.jar
+.if ${PORT_OPTIONS:MFOP}
 	${INSTALL_DATA} ${WRKSRC}/dist/jlatexmath-fop-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}/jlatexmath-fop.jar
+.endif
+	${INSTALL_DATA} ${WRKSRC}/dist/jlatexmath-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}/jlatexmath.jar
 	(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>

Modified: head/math/jlatexmath/distinfo
==============================================================================
--- head/math/jlatexmath/distinfo	Thu May  1 14:26:32 2014	(r352748)
+++ head/math/jlatexmath/distinfo	Thu May  1 14:28:55 2014	(r352749)
@@ -1,2 +1,2 @@
-SHA256 (jlatexmath-src-all-0.9.7.zip) = f27772c54e438034ea5cd70fc53b5cef8775578b50b41597bf23e2960c98d4f6
-SIZE (jlatexmath-src-all-0.9.7.zip) = 1177126
+SHA256 (jlatexmath-src-all-1.0.3.zip) = 58b14f0f30250b7cd3d1e5cfae20a8d5f999c01e9ff5e03508cbdb8f922dd7fd
+SIZE (jlatexmath-src-all-1.0.3.zip) = 1203123

Modified: head/math/jlatexmath/pkg-plist
==============================================================================
--- head/math/jlatexmath/pkg-plist	Thu May  1 14:26:32 2014	(r352748)
+++ head/math/jlatexmath/pkg-plist	Thu May  1 14:28:55 2014	(r352749)
@@ -4,6 +4,8 @@
 %%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
@@ -16,15 +18,24 @@
 %%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
-%%FOP%%share/java/classes/jlatexmath-fop.jar
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/Macros/bin
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/Macros
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/Export
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/Basic
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/Export
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/GIWS/src/org/scilab/forge/example/giws
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/GIWS/src/org/scilab/forge/example
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/GIWS/src/org/scilab/forge
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/GIWS/src/org/scilab
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/GIWS/src/org
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/GIWS/src
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/GIWS
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/Macros
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/Macros/bin