summaryrefslogtreecommitdiff
path: root/math/scilab/files/patch-etc-librarypath.xml
diff options
context:
space:
mode:
authorMax Brazhnikov <makc@FreeBSD.org>2014-09-04 18:20:53 +0000
committerMax Brazhnikov <makc@FreeBSD.org>2014-09-04 18:20:53 +0000
commit57a37508d64df473440f50a1a100f8e2fde75e83 (patch)
treedb50ff5a576642bdf908099008ccc9591ab66ca8 /math/scilab/files/patch-etc-librarypath.xml
parentFix misleading option name: the option uses plotutils, not gnuplot (diff)
math/scilab:
- Update to 5.5.0 - Populate USES with desktop-file-utils, iconv, libtool, pathfix, and shared-mime-info - Add dependency on xdg-utils - Remove needless USE_LDCONFIG - Clean up CONFIGURE_ENV from stale stuff - Update options: . remove DOCS, FFTW, MATIO, UMFPACK (always build with them for simplicity) . remove NLS (doesn't build without it) . merge HELP with GUI . PVM is not supported anymore . Enable OCAML and TK by default - Use options heplers - Clean up post-patch section from stale fixes - Convert to static pkg-plist
Notes
Notes: svn path=/head/; revision=367295
Diffstat (limited to 'math/scilab/files/patch-etc-librarypath.xml')
-rw-r--r--math/scilab/files/patch-etc-librarypath.xml58
1 files changed, 35 insertions, 23 deletions
diff --git a/math/scilab/files/patch-etc-librarypath.xml b/math/scilab/files/patch-etc-librarypath.xml
index 45e3a88a45a2..ded1b6a6705c 100644
--- a/math/scilab/files/patch-etc-librarypath.xml
+++ b/math/scilab/files/patch-etc-librarypath.xml
@@ -1,24 +1,36 @@
---- etc/librarypath.xml.orig 2010-08-29 23:41:41.000000000 -0700
-+++ etc/librarypath.xml 2010-08-29 23:42:38.000000000 -0700
-@@ -29,19 +29,11 @@
- <path value="$SCILAB/modules/scinotes/.libs"/>
- <path value="$SCILAB/.libs"/>
-
--<!-- Default path to the JNI classes under some Linux (JoGL under Debian for example) -->
--<path value="/usr/lib/jni/"/>
--
--<!-- Some distributions (like openSUSE) put gluegen-rt in /usr/lib instead pf /usr/lib/jni -->
--<path value="/usr/lib" />
--
- <!-- 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"/>
-
+--- etc/librarypath.xml.orig 2014-04-11 09:51:34.000000000 +0000
++++ etc/librarypath.xml 2014-05-08 06:41:45.257546863 +0000
+@@ -35,30 +35,12 @@
+ <path value="$SCILAB/modules/javasci/.libs"/>
+ <path value="$SCILAB/modules/.libs"/>
+ <path value="$SCILAB/.libs"/>
+-
+- <!-- Default path to the JNI classes under some Linux (JoGL under Debian for example) -->
+- <path value="/usr/lib/jni/"/>
+-
+- <!-- Standard path for %{_jnidir} rpm macro (jpackage) -->
+- <path value="/usr/lib/java/"/>
+- <path value="/usr/lib64/java/"/>
+-
+- <!-- RedHat put JNI on /usr/%{libdir}/%{name} instead of /usr/lib/jni -->
+- <path value="/usr/lib/jogl2/"/>
+- <path value="/usr/lib64/jogl2/"/>
+- <path value="/usr/lib/gluegen2/"/>
+- <path value="/usr/lib64/gluegen2/"/>
+-
+- <!-- Some distributions (like openSUSE) put gluegen-rt in /usr/lib instead pf /usr/lib/jni -->
+- <path value="/usr/lib" />
+-
++
+ <!-- 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="%%LOCALBASE%%/lib"/>
+
</librarypaths>