ports/153402: [maintainer] [patch] math/scilab Build Help

[Rob Farmer]

>Number:         153402
>Category:       ports
>Synopsis:       [maintainer] [patch] math/scilab Build Help
>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:   Thu Dec 23 10:20:09 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Rob Farmer
>Release:        9.0-CURRENT
>Organization:
>Environment:
FreeBSD thinkpad.predatorlabs.net 9.0-CURRENT FreeBSD 9.0-CURRENT #0 r216634M: Tue Dec 21 20:13:42 PST 2010     rfarmer at thinkpad.predatorlabs.net:/usr/obj/usr/src/sys/THINKPAD  amd64
>Description:
-Add option (on by default) to make the help browser work [1]
-Relocate JGraphx substitution to allow running Scilab Java components from WRKDIR before install (necessary to build docs)
-DATADIR/.atoms shouldn't be GUI only

Reported by: makc@ [1]

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/math/scilab/Makefile,v
retrieving revision 1.73
diff -u -r1.73 Makefile
--- Makefile	19 Dec 2010 08:51:20 -0000	1.73
+++ Makefile	23 Dec 2010 09:43:58 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	scilab
 PORTVERSION=	5.3.0
+PORTREVISION=	1
 CATEGORIES=	math cad parallel java
 MASTER_SITES=	http://www.scilab.org/download/${PORTVERSION}/:scilab \
 		http://www.predatorlabs.net/dl/:jgraphx \
@@ -35,7 +36,8 @@
 
 OPTIONS=	ATLAS "Use Atlas instead of Blas" OFF \
 		FFTW "Use FFTW" ON \
-		GUI "Build GUI (requires Java and required for docs)" ON \
+		GUI "Build GUI (requires Java)" ON \
+		HELP "Help Browser (Java based, requires GUI)" ON \
 		NLS "Build localization" OFF \
 		MATIO "Matlab compatibility" OFF \
 		OCAML "Build ocaml modelica compiler (requires GUI)" OFF \
@@ -127,7 +129,8 @@
 USE_XORG=	x11
 
 CONFIGURE_ARGS+=	--with-jdk=${JAVA_HOME} \
-			--with-docbook=${LOCALBASE}/share/xsl/docbook
+			--with-docbook=${LOCALBASE}/share/xsl/docbook \
+			--enable-build-help
 
 DESKTOP_ENTRIES=	"SciLab" \
 			"${COMMENT}" \
@@ -136,6 +139,10 @@
 
 .endif
 
+.if !defined(WITHOUT_HELP)
+ALL_TARGET=	all doc
+.endif
+
 .if defined(WITHOUT_FFTW)
 CONFIGURE_ARGS+=	--without-fftw
 .else
@@ -213,7 +220,6 @@
 	@${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
 	@# Run fixes
 	@${REINPLACE_CMD} -e 's|%%JAVALIBDIR%%|${JAVALIBDIR}|' ${WRKSRC}/etc/librarypath.xml
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/etc/librarypath.xml
@@ -222,9 +228,10 @@
 .endif
 
 pre-install:
+	@${MKDIR} ${DATADIR}/.atoms
 .if !defined(WITHOUT_GUI)
 	@${MKDIR} ${DATADIR}/modules && ${INSTALL_DATA} ${DISTDIR}/${JGRAPHX_JAR} ${DATADIR}/modules/jgraphx.jar
-	@${MKDIR} ${DATADIR}/.atoms
+	@${REINPLACE_CMD} -e 's|${WRKSRC}/thirdparty/jgraphx.jar|${DATADIR}/modules/jgraphx.jar|g' ${WRKSRC}/etc/classpath.xml.in
 .endif
 
 post-install:


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