diff options
author | Maho Nakata <maho@FreeBSD.org> | 2003-07-23 23:41:24 +0000 |
---|---|---|
committer | Maho Nakata <maho@FreeBSD.org> | 2003-07-23 23:41:24 +0000 |
commit | b85aa01a83b7b8719fd914d7f4737552eccac3e5 (patch) | |
tree | 78416c014b5f0bcf1eb1ce4900d88543eae9109c /math/octave | |
parent | Update URLs. (diff) |
Add simple wrapper to avoid the error
/usr/libexec/ld-elf.so.1: Shared object "liboctinterp.so" not found
PR: 54567,54653
Submitted by: Jonathan <j.e.drews@worldnet.att.net>
Notes
Notes:
svn path=/head/; revision=85496
Diffstat (limited to 'math/octave')
-rw-r--r-- | math/octave/Makefile | 12 | ||||
-rw-r--r-- | math/octave/files/octave | 8 | ||||
-rw-r--r-- | math/octave/pkg-plist | 16 |
3 files changed, 23 insertions, 13 deletions
diff --git a/math/octave/Makefile b/math/octave/Makefile index dd03b8bf3999..ec35ed086b07 100644 --- a/math/octave/Makefile +++ b/math/octave/Makefile @@ -36,8 +36,7 @@ PLIST_SUB= OCTAVE_VERSION=${OCTAVE_VERSION} GNU_HOST=${GNU_HOST} BLAS_LIBS= "-L${LOCALBASE}/lib -lf77blas -latlas" USE_GMAKE= yes GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes -LDCONFIG_DIRS= %%PREFIX%%/lib/${PORTNAME}-${PORTVERSION} +USE_REINPLACE= yes CONFIGURE_ARGS= --host=${GNU_HOST} \ --with-fftw --with-blas=${BLAS_LIBS} --with-lpack \ @@ -59,9 +58,14 @@ MAN1= octave.1 octave-bug.1 mkoctfile.1 octave-config.1 post-extract: @${RM} -f ${WRKSRC}/doc/interpreter/octave.info* @${RM} -f ${WRKSRC}/doc/liboctave/liboctave.info* - post-install: - $(INSTALL_DATA) $(WRKSRC)/doc/liboctave/liboctave.info $(PREFIX)/info + ${RM} ${PREFIX}/bin/octave + @${CP} ${FILESDIR}/octave ${WRKDIR} + @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g ; \ + s,%%OCTAVE_VERSION%%,${OCTAVE_VERSION},g' \ + ${WRKDIR}/octave + ${INSTALL_SCRIPT} ${WRKDIR}/octave ${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/doc/liboctave/liboctave.info ${PREFIX}/info install-info --entry='* Octave: (octave). Interactive language for numerical computations.' $(PREFIX)/info/octave.info $(PREFIX)/info/dir install-info --entry='* LibOctave: (liboctave). C++ class library for Octave.' $(PREFIX)/info/liboctave.info $(PREFIX)/info/dir .ifndef NOPORTDOCS diff --git a/math/octave/files/octave b/math/octave/files/octave new file mode 100644 index 000000000000..5910ee467fee --- /dev/null +++ b/math/octave/files/octave @@ -0,0 +1,8 @@ +#!/bin/sh +# +# $FreeBSD$ + +OCTAVE_EXEC=%%PREFIX%%/bin/octave-%%OCTAVE_VERSION%% +LD_LIBRARY_PATH=%%PREFIX%%/lib/octave-%%OCTAVE_VERSION%%; export LD_LIBRARY_PATH + +exec $OCTAVE_EXEC "$@" diff --git a/math/octave/pkg-plist b/math/octave/pkg-plist index faf645346b30..20a7c1c62894 100644 --- a/math/octave/pkg-plist +++ b/math/octave/pkg-plist @@ -290,8 +290,6 @@ include/octave-%%OCTAVE_VERSION%%/octave/vx-s-ccv.h include/octave-%%OCTAVE_VERSION%%/octave/vx-s-crv.h include/octave-%%OCTAVE_VERSION%%/octave/xdiv.h include/octave-%%OCTAVE_VERSION%%/octave/xpow.h -@exec /bin/ln -sf %D/include/octave-%%OCTAVE_VERSION%%/octave %D/include/octave -@unexec /bin/rm -f %D/include/octave @unexec install-info --delete --entry='* Octave: (octave). Interactive language for numerical computations.' %D/info/octave.info %D/info/dir @unexec install-info --delete --entry='* LibOctave: (liboctave). C++ class library for Octave.' %D/info/liboctave.info %D/info/dir info/octave.info @@ -384,12 +382,12 @@ libexec/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/svd.oct libexec/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/syl.oct libexec/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/time.oct libexec/octave/ls-R -share/doc/octave/Octave-FAQ.ps -share/doc/octave/liboctave.ps -share/doc/octave/octave.ps -share/doc/octave/refcard-a4.ps -share/doc/octave/refcard-legal.ps -share/doc/octave/refcard-letter.ps +%%PORTDOCS%%%%DOCSDIR%%/Octave-FAQ.ps +%%PORTDOCS%%%%DOCSDIR%%/liboctave.ps +%%PORTDOCS%%%%DOCSDIR%%/octave.ps +%%PORTDOCS%%%%DOCSDIR%%/refcard-a4.ps +%%PORTDOCS%%%%DOCSDIR%%/refcard-legal.ps +%%PORTDOCS%%%%DOCSDIR%%/refcard-letter.ps share/octave/%%OCTAVE_VERSION%%/imagelib/default.img share/octave/%%OCTAVE_VERSION%%/m/audio/lin2mu.m share/octave/%%OCTAVE_VERSION%%/m/audio/loadaudio.m @@ -1023,7 +1021,7 @@ share/octave/site/m/startup/octaverc @dirrm share/octave/%%OCTAVE_VERSION%%/imagelib @dirrm share/octave/%%OCTAVE_VERSION%% @dirrm share/octave -@dirrm share/doc/octave +%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm libexec/octave/site/oct/%%GNU_HOST%% @dirrm libexec/octave/site/oct @dirrm libexec/octave/site/exec/%%GNU_HOST%% |