4 files changed, 43 insertions, 5 deletions

diff --git a/math/scilab/Makefile b/math/scilab/Makefile
index a8cd0c47863c..af4ac9997bed 100644
--- a/math/scilab/Makefile
+++ b/math/scilab/Makefile
@@ -9,8 +9,12 @@ PORTNAME=	scilab
 PORTVERSION=	5.2.2
 PORTREVISION=	3
 CATEGORIES=	math cad parallel java
-MASTER_SITES=	http://www.scilab.org/download/${PORTVERSION}/
-EXTRACT_SUFX=	-src.tar.gz
+MASTER_SITES=	http://www.scilab.org/download/${PORTVERSION}/:scilab \
+		http://www.bayofrum.net/dist/jgraphx/:jgraphx \
+		http://cerberus.bayofrum.net/dist/jgraphx/:jgraphx \
+		http://www.predatorlabs.net/dl/:jgraphx
+DISTFILES=	${DISTNAME}-src.tar.gz:scilab
+EXTRACT_ONLY=	${DISTNAME}-src.tar.gz
 
 MAINTAINER=	rfarmer@predatorlabs.net
 COMMENT=	Scientific software package for numerical computations
@@ -21,7 +25,7 @@ LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
 		pcre.0:${PORTSDIR}/devel/pcre \
 		readline.6:${PORTSDIR}/devel/readline
 
-MAKE_JOBS_UNSAFE=	yes
+MAKE_JOBS_SAFE=	yes
 
 USE_FORTRAN=	yes
 USE_GETTEXT=	yes
@@ -84,13 +88,16 @@ PLIST_SUB+=	GUI="@comment "
 PLIST_SUB+=	NOGUI=""
 NOPORTDOCS=	YES
 .else
+DISTFILES+=	${JGRAPHX_JAR}:jgraphx
+JGRAPHX_VERSION=	1.3.0.0
+JGRAPHX_JAR=	jgraphx-${JGRAPHX_VERSION:C/\./_/g}.jar
+
 LIB_DEPENDS+=	hdf5.6:${PORTSDIR}/science/hdf5-18
 
 BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant \
 		${JAVALIBDIR}/flexdock-0.5.1.jar:${PORTSDIR}/devel/flexdock \
 		${JAVALIBDIR}/jogl.jar:${PORTSDIR}/graphics/jogl \
 		${JAVALIBDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging \
-		${JAVALIBDIR}/jgraphx.jar:${PORTSDIR}/java/jgraphx \
 		${JAVALIBDIR}/looks.jar:${PORTSDIR}/devel/looks \
 		${JAVALIBDIR}/skinlf.jar:${PORTSDIR}/x11-toolkits/skinlf \
 		${JAVALIBDIR}/jrosetta-API.jar:${PORTSDIR}/java/jrosetta \
@@ -112,7 +119,6 @@ BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant \
 RUN_DEPENDS+=	${JAVALIBDIR}/flexdock-0.5.1.jar:${PORTSDIR}/devel/flexdock \
 		${JAVALIBDIR}/jogl.jar:${PORTSDIR}/graphics/jogl \
 		${JAVALIBDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging \
-		${JAVALIBDIR}/jgraphx.jar:${PORTSDIR}/java/jgraphx \
 		${JAVALIBDIR}/looks.jar:${PORTSDIR}/devel/looks \
 		${JAVALIBDIR}/skinlf.jar:${PORTSDIR}/x11-toolkits/skinlf \
 		${JAVALIBDIR}/jrosetta-API.jar:${PORTSDIR}/java/jrosetta \
@@ -209,6 +215,9 @@ post-patch:
 	${REINPLACE_CMD} -e 's|$$jardir/batik.jar|${LOCALBASE}/share/java/batik/batik.jar|g' ${WRKSRC}/configure
 	${REINPLACE_CMD} -e 's|$$jardir/fop.jar|${LOCALBASE}/share/java/fop/build/fop.jar|' ${WRKSRC}/configure
 	${REINPLACE_CMD} -e 's|$$jardir/jeuclid-core*.jar|${LOCALBASE}/share/java/jeuclid/repo/jeuclid-core*.jar|' ${WRKSRC}/configure
+	${MKDIR} ${WRKSRC}/thirdparty
+	${CP} ${DISTDIR}/${JGRAPHX_JAR} ${WRKSRC}/thirdparty/jgraphx.jar
+	${REINPLACE_CMD} -e 's|@JGRAPHX@|${DATADIR}/modules/jgraphx.jar|g' ${WRKSRC}/etc/classpath.xml.in
 	# Build fixes
 	${REINPLACE_CMD} -e 's|$$(CFLAGS:-O%=)|-I${LOCALBASE}/include -L${LOCALBASE}/lib|' ${WRKSRC}/modules/elementary_functions/Makefile.in
 	${REINPLACE_CMD} -e 's|freebsd|__FreeBSD__|g' ${WRKSRC}/modules/sparse/includes/spConfig.h
@@ -223,6 +232,9 @@ post-patch:
 		${WRKSRC}/modules/call_scilab/examples/call_scilab/NET/VB.NET/My_Project/
 	${REINPLACE_CMD} -e 's|My Project|My_Project|g' ${WRKSRC}/modules/call_scilab/examples/call_scilab/NET/VB.NET/VB.NET.vbproj
 	${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|' ${WRKSRC}/Makefile.in
+	# Run fixes
+	${REINPLACE_CMD} -e 's|%%JAVALIBDIR%%|${JAVALIBDIR}|' ${WRKSRC}/etc/librarypath.xml
+	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/etc/librarypath.xml
 .if defined(NOPORTDOCS)
 	@${REINPLACE_CMD} -e '/%%PORTDOCS%%/d' ${WRKSRC}/Makefile.in
 .else
@@ -233,5 +245,6 @@ pre-install:
 	@${FIND} ${WRKSRC} -name \*.orig -delete
 	@${FIND} ${WRKSRC} -name \*.bak -delete
 	@${FIND} ${WRKSRC} -name .cvsignore -delete
+	@${MKDIR} ${DATADIR}/modules && ${INSTALL_DATA} ${DISTDIR}/${JGRAPHX_JAR} ${DATADIR}/modules/jgraphx.jar
 
 .include <bsd.port.mk>
diff --git a/math/scilab/distinfo b/math/scilab/distinfo
index d81758dfdfde..d8aa40b23409 100644
--- a/math/scilab/distinfo
+++ b/math/scilab/distinfo
@@ -1,3 +1,6 @@
 MD5 (scilab-5.2.2-src.tar.gz) = 35e8a22edb348f405360d3a07ed4faab
 SHA256 (scilab-5.2.2-src.tar.gz) = 6f8800bc8ac9128187d1f9a98a5e459bbfa2b66967caed8ab659ff2ba51f1cf2
 SIZE (scilab-5.2.2-src.tar.gz) = 54088580
+MD5 (jgraphx-1_3_0_0.jar) = b9e24f0b428c679697e763e9b0ba5671
+SHA256 (jgraphx-1_3_0_0.jar) = 0f3728b47c9fd3977a063212f68e43639c2283eb84fbce437275b679e6e4a6b2
+SIZE (jgraphx-1_3_0_0.jar) = 326596
diff --git a/math/scilab/files/patch-etc-librarypath.xml b/math/scilab/files/patch-etc-librarypath.xml
new file mode 100644
index 000000000000..3e9f2c260ddc
--- /dev/null
+++ b/math/scilab/files/patch-etc-librarypath.xml
@@ -0,0 +1,21 @@
+--- etc/librarypath.xml.orig	2010-08-18 22:12:51.000000000 -0700
++++ etc/librarypath.xml	2010-08-18 22:15:41.000000000 -0700
+@@ -29,16 +29,11 @@
+ <path value="$SCILAB/modules/xpad/.libs"/>
+ <path value="$SCILAB/.libs"/>
+ 
+-<!-- Default path to the JNI classes under some Linux (JoGL under Debian for example) -->
+-<path value="/usr/lib/jni/"/>
+-
+ <!-- Make install with prefix -->
+ <path value="$SCILAB/../../lib/scilab/"/>
+ 
+ <!-- Standard path -->
+-<path value="/usr/lib/scilab/"/>
+-
+-<!-- Standard path for 64 bits -->
+-<path value="/usr/lib64/scilab/"/>
++<path value="%%JAVALIBDIR%%/"/>
++<path value="%%PREFIX%%/lib/"/>
+ 
+ </librarypaths>
diff --git a/math/scilab/pkg-plist b/math/scilab/pkg-plist
index 1479fbe5bf2c..977e86779926 100644
--- a/math/scilab/pkg-plist
+++ b/math/scilab/pkg-plist
@@ -5704,6 +5704,7 @@ libdata/pkgconfig/scilab.pc
 %%GUI%%%%DATADIR%%/modules/javasci/tests/unit_tests/javac.sci
 %%GUI%%%%DATADIR%%/modules/javasci/tests/unit_tests/test_java.sci
 %%GUI%%%%DATADIR%%/modules/javasci/version.xml
+%%GUI%%%%DATADIR%%/modules/jgraphx.jar
 %%DATADIR%%/modules/jvm/changelog.txt
 %%DATADIR%%/modules/jvm/etc/jvm.quit
 %%DATADIR%%/modules/jvm/etc/jvm.start