Attachment #108751 for bug #149659

View | Details | Raw Unified | Return to bug 149659
Collapse All | Expand All

Lines 7-13 Link Here

(-)Makefile (-1 / +5 lines)
7		7
8	PORTNAME= scilab	8	PORTNAME= scilab
9	PORTVERSION= 5.2.2	9	PORTVERSION= 5.2.2
10	PORTREVISION= 2	10	PORTREVISION= 3
11	CATEGORIES= math cad parallel java	11	CATEGORIES= math cad parallel java
12	MASTER_SITES= http://www.scilab.org/download/${PORTVERSION}/	12	MASTER_SITES= http://www.scilab.org/download/${PORTVERSION}/
13	EXTRACT_SUFX= -src.tar.gz	13	EXTRACT_SUFX= -src.tar.gz
Lines 223-228 Link Here
223	${WRKSRC}/modules/call_scilab/examples/call_scilab/NET/VB.NET/My_Project/	223	${WRKSRC}/modules/call_scilab/examples/call_scilab/NET/VB.NET/My_Project/
224	${REINPLACE_CMD} -e 's\|My Project\|My_Project\|g' ${WRKSRC}/modules/call_scilab/examples/call_scilab/NET/VB.NET/VB.NET.vbproj	224	${REINPLACE_CMD} -e 's\|My Project\|My_Project\|g' ${WRKSRC}/modules/call_scilab/examples/call_scilab/NET/VB.NET/VB.NET.vbproj
225	${REINPLACE_CMD} -e 's\|$$(libdir)/pkgconfig\|${PREFIX}/libdata/pkgconfig\|' ${WRKSRC}/Makefile.in	225	${REINPLACE_CMD} -e 's\|$$(libdir)/pkgconfig\|${PREFIX}/libdata/pkgconfig\|' ${WRKSRC}/Makefile.in
		226	# Run fixes
		227	${REINPLACE_CMD} -e 's\|%%JAVALIBDIR%%\|${JAVALIBDIR}\|' ${WRKSRC}/etc/librarypath.xml
		228	${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|' ${WRKSRC}/etc/librarypath.xml
		229
226	.if defined(NOPORTDOCS)	230	.if defined(NOPORTDOCS)
227	@${REINPLACE_CMD} -e '/%%PORTDOCS%%/d' ${WRKSRC}/Makefile.in	231	@${REINPLACE_CMD} -e '/%%PORTDOCS%%/d' ${WRKSRC}/Makefile.in
228	.else	232	.else




--- 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>

Return to bug 149659

Added Link Here

(-)files/patch-etc-librarypath.xml (+21 lines)
1	--- etc/librarypath.xml.orig 2010-08-18 22:12:51.000000000 -0700
2	+++ etc/librarypath.xml 2010-08-18 22:15:41.000000000 -0700
3	@@ -29,16 +29,11 @@
4	<path value="$SCILAB/modules/xpad/.libs"/>
5	<path value="$SCILAB/.libs"/>
6
7	-<!-- Default path to the JNI classes under some Linux (JoGL under Debian for example) -->
8	-<path value="/usr/lib/jni/"/>
9	-
10	<!-- Make install with prefix -->
11	<path value="$SCILAB/../../lib/scilab/"/>
12
13	<!-- Standard path -->
14	-<path value="/usr/lib/scilab/"/>
15	-
16	-<!-- Standard path for 64 bits -->
17	-<path value="/usr/lib64/scilab/"/>
18	+<path value="%%JAVALIBDIR%%/"/>
19	+<path value="%%PREFIX%%/lib/"/>
20
21	</librarypaths>