cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

major update to octave 2.9.12

Browse Source
This commit is contained in:
steven 2007-06-20 08:51:42 +00:00
parent 2e35a1da4d
commit ec5f4453ba
17 changed files with 1054 additions and 440 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
math/octave/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.23 2007/02/14 11:51:07 steven Exp $
# $OpenBSD: Makefile,v 1.24 2007/06/20 08:51:42 steven Exp $
# vax: no IEEE arithmetic
# sparc: fPIC version of libgcc.a needed but not available
@ -6,26 +6,25 @@ NOT_FOR_ARCHS= vax sparc
COMMENT= "high-level language for numerical computations"
VERSION= 2.1.72
VERSION= 2.9.12
DISTNAME= octave-${VERSION}
PKGNAME= $(DISTNAME)p6
CATEGORIES= math
SHARED_LIBS= cruft 4.0 \
octave 3.0 \
octinterp 3.0
SHARED_LIBS= cruft 5.0 \
octave 4.0 \
octinterp 4.0
HOMEPAGE= http://www.octave.org/
MAINTAINER= Steven Mestdagh <steven@openbsd.org>
# GNU GPL
# GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c g2c m ncurses readline stdc++
WANTLIB= c g2c m ncurses readline stdc++ z
MASTER_SITES= ftp://ftp.octave.org/pub/octave/bleeding-edge/ \
ftp://neacm.fe.up.pt/pub/octave/bleeding-edge/ \
@ -33,14 +32,14 @@ MASTER_SITES= ftp://ftp.octave.org/pub/octave/bleeding-edge/ \
LIB_DEPENDS= fftw3.>=3::math/fftw3 \
lapack.>=3::math/lapack \
blas.>=1::math/blas
REGRESS_DEPENDS=::devel/dejagnu
blas.>=1::math/blas \
pcre.>=1::devel/pcre
USE_GMAKE= Yes
SEPARATE_BUILD= simple
CONFIGURE_STYLE=autoconf
AUTOCONF_VERSION=2.59
AUTOCONF_VERSION=2.61
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--with-fftw \
--without-mpi \
@ -73,7 +72,7 @@ post-regress:
@rm -f /tmp/oct-*
# fix ls-R and install HTML documentation
HTMLDOCS= interpreter liboctave faq
HTMLDOCS= interpreter liboctave
post-install:
@cd ${PREFIX}/share/octave && \
perl -pi -e "s,${PREFIX},${TRUEPREFIX}," ls-R

10
math/octave/distinfo
View File

@ -1,5 +1,5 @@
MD5 (octave-2.1.72.tar.gz) = jXoeMaNmn6hJPQxn8yH4uA==
RMD160 (octave-2.1.72.tar.gz) = eIf7vHZfGDSAR/NajJnaeCOVFns=
SHA1 (octave-2.1.72.tar.gz) = 2AjOceF2CuQ1IAeSLsurFhI+064=
SHA256 (octave-2.1.72.tar.gz) = MJRhqD9FstvBKIVYuKnvOjAIcTckBYc0Jpm8E2Rrhh8=
SIZE (octave-2.1.72.tar.gz) = 6901980
MD5 (octave-2.9.12.tar.gz) = LW21wEAGcczAOdHixStCgA==
RMD160 (octave-2.9.12.tar.gz) = CrKcjtST5fr02SuW927yZFrMWK8=
SHA1 (octave-2.9.12.tar.gz) = MvHXCzitFW9Ee0WUmu+hJGOk10c=
SHA256 (octave-2.9.12.tar.gz) = P4ow7pnM/VxA21ZFnDgOBmcHwcbwFIbwpemEXSgKOgM=
SIZE (octave-2.9.12.tar.gz) = 8974882

23
math/octave/patches/patch-aclocal_m4
View File

@ -1,23 +0,0 @@
$OpenBSD: patch-aclocal_m4,v 1.1 2005/11/02 18:20:58 alek Exp $
--- aclocal.m4.orig Sun Sep 25 11:59:39 2005
+++ aclocal.m4 Sun Sep 25 12:00:17 2005
@@ -539,18 +539,9 @@ dnl Is DejaGNU installed?
dnl
dnl OCTAVE_PROG_RUNTEST
AC_DEFUN(OCTAVE_PROG_RUNTEST,
-[if test "$cross_compiling" = yes; then
- RUNTEST=runtest
+[ RUNTEST=runtest
AC_MSG_RESULT(assuming $RUNTEST exists on $canonical_host_type host)
AC_SUBST(RUNTEST)
-else
- AC_CHECK_PROG(RUNTEST, runtest, runtest, [])
- if test -z "$RUNTEST"; then
- warn_runtest="I didn't find runtest -- install DejaGNU if you want to run \`make check'"
- AC_MSG_WARN($warn_runtest)
- fi
- AC_SUBST(RUNTEST)
-fi
])
dnl
dnl Is gperf installed?

22
math/octave/patches/patch-configure_in
View File

@ -1,26 +1,26 @@
$OpenBSD: patch-configure_in,v 1.3 2005/12/24 20:05:27 steven Exp $
--- configure.in.orig Fri Nov 11 20:46:55 2005
+++ configure.in Sun Nov 20 16:53:15 2005
@@ -57,7 +57,7 @@ OCTAVE_SET_DEFAULT(localapifcnfiledir,
$OpenBSD: patch-configure_in,v 1.4 2007/06/20 08:51:42 steven Exp $
--- configure.in.orig Thu Apr 26 21:00:48 2007
+++ configure.in Sat May 26 22:28:32 2007
@@ -95,7 +95,7 @@ OCTAVE_SET_DEFAULT(localfcnfiledir, '$(datadir)/octave
OCTAVE_SET_DEFAULT(localapifcnfiledir,
'$(datadir)/octave/site/$(api_version)/m')
OCTAVE_SET_DEFAULT(localverfcnfiledir, '$(datadir)/octave/$(version)/site/m')
OCTAVE_SET_DEFAULT(localfcnfilepath,
'$(localverfcnfiledir)//:$(localapifcnfiledir)//:$(localfcnfiledir)//')
-OCTAVE_SET_DEFAULT(octlibdir, '$(libdir)/octave-$(version)')
+OCTAVE_SET_DEFAULT(octlibdir, '$(libdir)')
OCTAVE_SET_DEFAULT(archlibdir,
'$(libexecdir)/octave/$(version)/exec/$(canonical_host_type)')
OCTAVE_SET_DEFAULT(localarchlibdir,
@@ -413,7 +413,7 @@ AC_ARG_WITH(fftw,
if test "$with_fftw" = "yes"; then
@@ -561,7 +561,7 @@ AC_ARG_WITH(fftw,
if test "$with_fftw" = yes; then
have_fftw3_header=no
with_fftw3=no
- AC_CHECK_HEADER(fftw3.h, [have_fftw3_header=yes; break])
+ AC_CHECK_HEADER(fftw3.h, [have_fftw3_header=yes])
if test "$have_fftw3_header" = yes; then
AC_CHECK_LIB(fftw3, fftw_plan_dft_1d, [FFTW_LIBS="-lfftw3"; with_fftw3=yes])
AC_CHECK_LIB(fftw3, fftw_plan_dft_1d, [FFTW_LIBS="-lfftw3"; with_fftw3=yes])
fi
@@ -678,9 +678,13 @@ TEMPLATE_AR='$(AR)'
TEMPLATE_ARFLAGS="$ARFLAGS"
@@ -1084,9 +1084,13 @@ OCTAVE_DLL_DEFS=
OCTINTERP_DLL_DEFS=
library_path_var=LD_LIBRARY_PATH
case "$canonical_host_type" in
- *-*-386bsd* | *-*-openbsd* | *-*-netbsd*)

8
math/octave/patches/patch-doc_faq_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-doc_faq_Makefile_in,v 1.1 2005/11/20 17:44:20 naddy Exp $
--- doc/faq/Makefile.in.orig Sun Nov 13 01:00:03 2005
+++ doc/faq/Makefile.in Sun Nov 13 01:00:14 2005
@@ -36,7 +36,7 @@ SPELL := $(patsubst %.texi, %.spell, $(A
$OpenBSD: patch-doc_faq_Makefile_in,v 1.2 2007/06/20 08:51:42 steven Exp $
--- doc/faq/Makefile.in.orig Tue Mar 27 19:31:54 2007
+++ doc/faq/Makefile.in Sat May 26 22:28:32 2007
@@ -35,7 +35,7 @@ SPELL := $(patsubst %.texi, %.spell, $(ALL_TEXINFO))
$(SED) -e 's/@@/ at /g' -e 's/@[a-zA-Z]*//g' $< | spell > $@.tmp
mv $@.tmp $@

17
math/octave/patches/patch-doc_interpreter_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-doc_interpreter_Makefile_in,v 1.2 2005/11/20 17:44:20 naddy Exp $
--- doc/interpreter/Makefile.in.orig Fri Nov 11 20:46:57 2005
+++ doc/interpreter/Makefile.in Sat Nov 12 19:43:14 2005
@@ -65,7 +65,7 @@ SPELL = $(patsubst %.texi, %.spell, $(TE
$OpenBSD: patch-doc_interpreter_Makefile_in,v 1.3 2007/06/20 08:51:42 steven Exp $
--- doc/interpreter/Makefile.in.orig Tue May 22 18:33:06 2007
+++ doc/interpreter/Makefile.in Mon May 28 19:41:51 2007
@@ -109,7 +109,7 @@ SPELL = $(patsubst %.texi, %.spell, $(TEXINFO))
$(SED) -e 's/@@/ at /g' -e 's/@[a-zA-Z]*//g' $< | spell > $@.tmp
mv $@.tmp $@
@ -10,3 +10,12 @@ $OpenBSD: patch-doc_interpreter_Makefile_in,v 1.2 2005/11/20 17:44:20 naddy Exp
.PHONY: all
$(TEXINFO): src-DOCSTRINGS scripts-DOCSTRINGS munge-texi$(BUILD_EXEEXT)
@@ -174,7 +174,7 @@ $(HTML_IMAGES_PNG): HTML/%.png : %.png
echo "creating HTML directory"; \
mkdir HTML; \
fi
- $(INSTALL_DATA) $(filter-out html-dir, $<) HTML
+ cp $(filter-out html-dir, $<) HTML
## Unset DISPLAY here to avoid problems with the -title option for
## gnuplot (it doesn't work if we are calling pgnuplot). Sleep for

17
math/octave/patches/patch-doc_liboctave_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-doc_liboctave_Makefile_in,v 1.3 2005/11/20 17:44:20 naddy Exp $
--- doc/liboctave/Makefile.in.orig Fri Nov 11 20:47:01 2005
+++ doc/liboctave/Makefile.in Sat Nov 12 19:43:47 2005
@@ -44,7 +44,7 @@ SPELL = $(patsubst %.texi, %.spell, $(TE
$OpenBSD: patch-doc_liboctave_Makefile_in,v 1.4 2007/06/20 08:51:42 steven Exp $
--- doc/liboctave/Makefile.in.orig Tue Mar 27 19:31:54 2007
+++ doc/liboctave/Makefile.in Sat May 26 22:28:32 2007
@@ -43,7 +43,7 @@ SPELL = $(patsubst %.texi, %.spell, $(TEXINFO))
$(SED) -e 's/@@/ at /g' -e 's/@[a-zA-Z]*//g' $< | spell > $@.tmp
mv $@.tmp $@
@ -10,12 +10,3 @@ $OpenBSD: patch-doc_liboctave_Makefile_in,v 1.3 2005/11/20 17:44:20 naddy Exp $
.PHONY: all
liboctave.info: $(TEXINFO)
@@ -60,7 +60,7 @@ liboctave.pdf: $(TEXINFO)
-TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):" $(TEXI2PDF) $<
HTML/index.html: $(TEXINFO)
- -$(MAKEINFO) --html --ifinfo --output=HTML -I $(srcdir)/.. $<
+ -$(MAKEINFO) --html --ifinfo --output=HTML -I $(srcdir) -I $(srcdir)/.. $<
check:
.PHONY: check

33
math/octave/patches/patch-libcruft_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-libcruft_Makefile_in,v 1.4 2005/12/24 20:05:27 steven Exp $
--- libcruft/Makefile.in.orig Fri Nov 11 20:47:15 2005
+++ libcruft/Makefile.in Sat Dec 24 12:28:55 2005
@@ -78,6 +78,9 @@ ifeq ($(SHARED_LIBS), true)
$OpenBSD: patch-libcruft_Makefile_in,v 1.5 2007/06/20 08:51:42 steven Exp $
--- libcruft/Makefile.in.orig Wed Apr 4 18:10:26 2007
+++ libcruft/Makefile.in Sat May 26 22:33:24 2007
@@ -82,6 +82,9 @@ ifeq ($(SHARED_LIBS), true)
endif
endif
@ -10,29 +10,30 @@ $OpenBSD: patch-libcruft_Makefile_in,v 1.4 2005/12/24 20:05:27 steven Exp $
+
ifeq ($(SHARED_LIBS), true)
ifeq ($(STATIC_LIBS), true)
LIBRARIES = libcruft.$(LIBEXT) libcruft.$(SHLEXT_VER)
@@ -101,12 +104,8 @@ libcruft.$(LIBEXT): $(CRUFT_OBJ)
LIBRARIES = $(LIBPRE)cruft.$(LIBEXT) $(LIBPRE)cruft.$(SHLEXT_VER)
@@ -111,12 +114,8 @@ $(LIBPRE)cruft.$(LIBEXT): $(CRUFT_OBJ)
$(AR) $(ARFLAGS) $@ $^
$(RANLIB) $@
-libcruft.$(SHLEXT_VER): libcruft.$(SHLEXT)
+libcruft.$(SHLEXT_VER): $(CRUFT_PICOBJ)
-$(LIBPRE)cruft.$(SHLEXT_VER): $(LIBPRE)cruft.$(SHLEXT)
+$(LIBPRE)cruft.$(SHLEXT_VER): $(CRUFT_PICOBJ)
rm -f $@
- $(LN_S) $< $@
-
-libcruft.$(SHLEXT): $(CRUFT_PICOBJ)
-$(LIBPRE)cruft.$(SHLEXT): $(CRUFT_PICOBJ)
- rm -f $@
$(SH_LD) $(SH_LDFLAGS) $(SONAME_FLAGS) -o $@ $^ $(LINK_DEPS)
$(CRUFT_OBJ):
@@ -131,9 +130,7 @@ install::
@@ -141,10 +140,7 @@ install::
if $(SHARED_LIBS); then \
rm -f $(DESTDIR)$(octlibdir)/libcruft.$(SHLLIB_VER); \
rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(SHLLIB_VER); \
$(INSTALL) \
- libcruft.$(SHLLIB) $(DESTDIR)$(octlibdir)/libcruft.$(SHLLIB_VER); \
- rm -f $(DESTDIR)$(octlibdir)/libcruft.$(SHLLIB); \
- $(LN_S) libcruft.$(SHLLIB_VER) $(DESTDIR)$(octlibdir)/libcruft.$(SHLLIB); \
+ libcruft.$(SHLLIB_VER) $(DESTDIR)$(octlibdir)/libcruft.$(SHLLIB_VER); \
- $(LIBPRE)cruft.$(SHLLIB) $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(SHLLIB_VER); \
- rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(SHLLIB); \
- (cd $(DESTDIR)$(octlibdir); \
- $(LN_S) $(LIBPRE)cruft.$(SHLLIB_VER) $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(SHLLIB)); \
+ $(LIBPRE)cruft.$(SHLLIB_VER) $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(SHLLIB_VER); \
if test x$(SHLBIN) != x ; then \
rm -f $(DESTDIR)$(bindir)/libcruft.$(SHLBIN); \
rm -f $(DESTDIR)$(bindir)/$(LIBPRE)cruft.$(SHLBIN); \
$(INSTALL_PROGRAM) \

17
math/octave/patches/patch-libcruft_mkf77def_in Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-libcruft_mkf77def_in,v 1.1 2007/06/20 08:51:42 steven Exp $
--- libcruft/mkf77def.in.orig Sun May 27 04:23:55 2007
+++ libcruft/mkf77def.in Sun May 27 04:24:59 2007
@@ -25,7 +25,10 @@ else
awkcmd="$AWK '{ printf (\"%s%s\n\", tolower (\$0), \"$uscore\"); }'"
fi
-$SED -n \
- -e 'y/ABCDEFGHIJLKMNOPQRSTUVWXYZ/abcdefghijlkmnopqrstuvwxyz/' \
- -e 's/^\( \| \)[ ]*\(.*function\|subroutine\|entry\)[ ]*\([^ (]*\).*$/\3/p' | \
+#$SED -n \
+# -e 'y/ABCDEFGHIJLKMNOPQRSTUVWXYZ/abcdefghijlkmnopqrstuvwxyz/' \
+# -e 's/^\( \| \)[ ]*\(.*function\|subroutine\|entry\)[ ]*\([^ (]*\).*$/\3/p' | \
+perl -pi \
+ -e 's/([A-Z])/\l\1/g;' \
+ -e 's/^\s+(.*function|subroutine|entry)\s*([^\s(]*).*$/\2/ or $_=undef' | \
eval $awkcmd

32
math/octave/patches/patch-liboctave_Makefile_in
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-liboctave_Makefile_in,v 1.3 2005/12/24 20:05:27 steven Exp $
--- liboctave/Makefile.in.orig Fri Nov 11 20:47:31 2005
+++ liboctave/Makefile.in Sat Dec 24 13:08:00 2005
@@ -185,6 +185,9 @@ pic:
stamp-prereq: $(OPTS_INC) $(VX_OP_INC) $(VX_OP_SRC) $(MX_OP_INC) $(MX_OP_SRC) mx-ops.h
$OpenBSD: patch-liboctave_Makefile_in,v 1.4 2007/06/20 08:51:42 steven Exp $
--- liboctave/Makefile.in.orig Tue Mar 27 18:05:15 2007
+++ liboctave/Makefile.in Sat May 26 22:34:11 2007
@@ -210,6 +210,9 @@ stamp-prereq: $(OPTS_INC) $(VX_OP_INC) $(VX_OP_SRC) \
$(SPARSE_MX_OP_INC) $(SPARSE_MX_OP_SRC)
touch stamp-prereq
+SHLLIB_VER=$(SHLEXT).$(LIBoctave_VERSION)
@ -11,28 +11,28 @@ $OpenBSD: patch-liboctave_Makefile_in,v 1.3 2005/12/24 20:05:27 steven Exp $
ifeq ($(SHARED_LIBS), true)
ifeq ($(STATIC_LIBS), true)
libraries: \
@@ -211,12 +214,8 @@ liboctave.$(LIBEXT): $(LIBOCTAVE_OBJECTS
@@ -236,12 +239,8 @@ $(LIBPRE)octave.$(LIBEXT): $(LIBOCTAVE_OBJECTS)
$(TEMPLATE_AR) $(TEMPLATE_ARFLAGS) $@ $(LIBOCTAVE_OBJECTS)
$(RANLIB) $@
-liboctave.$(SHLEXT_VER): liboctave.$(SHLEXT)
+liboctave.$(SHLEXT_VER): $(LIBOCTAVE_PICOBJ)
-$(LIBPRE)octave.$(SHLEXT_VER): $(LIBPRE)octave.$(SHLEXT)
+$(LIBPRE)octave.$(SHLEXT_VER): $(LIBOCTAVE_PICOBJ)
rm -f $@
- $(LN_S) $< $@
-
-liboctave.$(SHLEXT): $(LIBOCTAVE_PICOBJ)
-$(LIBPRE)octave.$(SHLEXT): $(LIBOCTAVE_PICOBJ)
- rm -f $@
$(SH_LD) $(SH_LDFLAGS) $(SONAME_FLAGS) -o $@ \
$(LIBOCTAVE_PICOBJ) $(LINK_DEPS)
@@ -243,9 +242,7 @@ install-lib:
@@ -268,9 +267,7 @@ install-lib:
if $(SHARED_LIBS); then \
rm -f $(DESTDIR)$(octlibdir)/liboctave.$(SHLLIB_VER); \
rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octave.$(SHLLIB_VER); \
$(INSTALL) \
- liboctave.$(SHLLIB) $(DESTDIR)$(octlibdir)/liboctave.$(SHLLIB_VER); \
- rm -f $(DESTDIR)$(octlibdir)/liboctave.$(SHLLIB); \
- $(LN_S) liboctave.$(SHLLIB_VER) $(DESTDIR)$(octlibdir)/liboctave.$(SHLLIB); \
+ liboctave.$(SHLLIB_VER) $(DESTDIR)$(octlibdir)/liboctave.$(SHLLIB_VER); \
- $(LIBPRE)octave.$(SHLLIB) $(DESTDIR)$(octlibdir)/$(LIBPRE)octave.$(SHLLIB_VER); \
- rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octave.$(SHLLIB); \
- (cd $(DESTDIR)$(octlibdir) ; $(LN_S) $(LIBPRE)octave.$(SHLLIB_VER) $(DESTDIR)$(octlibdir)/$(LIBPRE)octave.$(SHLLIB)); \
+ $(LIBPRE)octave.$(SHLLIB_VER) $(DESTDIR)$(octlibdir)/$(LIBPRE)octave.$(SHLLIB_VER); \
if test x$(SHLBIN) != x ; then \
rm -f $(DESTDIR)$(bindir)/liboctave.$(SHLBIN); \
rm -f $(DESTDIR)$(bindir)/$(LIBPRE)octave.$(SHLBIN); \
$(INSTALL_PROGRAM) \

8
math/octave/patches/patch-liboctave_kpse-xfns_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-liboctave_kpse-xfns_c,v 1.1 2005/11/20 17:44:20 naddy Exp $
--- liboctave/kpse-xfns.c.orig Mon Nov 14 16:54:46 2005
+++ liboctave/kpse-xfns.c Mon Nov 14 16:55:54 2005
@@ -24,6 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fi
$OpenBSD: patch-liboctave_kpse-xfns_c,v 1.2 2007/06/20 08:51:42 steven Exp $
--- liboctave/kpse-xfns.c.orig Tue Apr 26 21:24:29 2005
+++ liboctave/kpse-xfns.c Sat May 26 22:28:32 2007
@@ -24,6 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Bos
#endif
#include <string.h>

14
math/octave/patches/patch-octMakefile_in
View File

@ -1,22 +1,22 @@
$OpenBSD: patch-octMakefile_in,v 1.1 2005/11/02 18:20:58 alek Exp $
--- octMakefile.in.orig Wed Nov 2 10:35:36 2005
+++ octMakefile.in Wed Nov 2 10:35:54 2005
$OpenBSD: patch-octMakefile_in,v 1.2 2007/06/20 08:51:42 steven Exp $
--- octMakefile.in.orig Tue Mar 27 18:05:15 2007
+++ octMakefile.in Sat May 26 22:28:32 2007
@@ -107,15 +107,12 @@ BUGS INSTALL.OCTAVE:
install install-strip ::
$(top_srcdir)/mkinstalldirs $(addprefix $(DESTDIR), $(DIRS_TO_MAKE))
rm -f $(DESTDIR)$(bindir)/octave-bug
- $(INSTALL_SCRIPT) octave-bug $(DESTDIR)$(bindir)/octave-bug-$(version)
- $(LN_S) octave-bug-$(version) $(DESTDIR)$(bindir)/octave-bug
- (cd $(DESTDIR)$(bindir); $(LN_S) octave-bug-$(version) $(DESTDIR)$(bindir)/octave-bug)
+ $(INSTALL_SCRIPT) octave-bug $(DESTDIR)$(bindir)/octave-bug
rm -f $(DESTDIR)$(bindir)/octave-config
$(INSTALL_SCRIPT) \
- octave-config $(DESTDIR)$(bindir)/octave-config-$(version)
- $(LN_S) octave-config-$(version) $(DESTDIR)$(bindir)/octave-config
- (cd $(DESTDIR)$(bindir); $(LN_S) octave-config-$(version) $(DESTDIR)$(bindir)/octave-config)
+ octave-config $(DESTDIR)$(bindir)/octave-config
rm -f $(DESTDIR)$(bindir)/mkoctfile
- $(INSTALL_SCRIPT) mkoctfile $(DESTDIR)$(bindir)/mkoctfile-$(version)
- $(LN_S) mkoctfile-$(version) $(DESTDIR)$(bindir)/mkoctfile
- (cd $(DESTDIR)$(bindir); $(LN_S) mkoctfile-$(version) $(DESTDIR)$(bindir)/mkoctfile)
+ $(INSTALL_SCRIPT) mkoctfile $(DESTDIR)$(bindir)/mkoctfile
$(INSTALL_DATA) config.h $(DESTDIR)$(octincludedir)/octave/config.h
$(INSTALL_DATA) $(srcdir)/NEWS $(DESTDIR)$(datadir)/octave/$(version)/NEWS
uninstall::

18
math/octave/patches/patch-run-octave_in Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-run-octave_in,v 1.1 2007/06/20 08:51:42 steven Exp $
--- run-octave.in.orig Mon May 28 18:03:29 2007
+++ run-octave.in Mon May 28 18:19:11 2007
@@ -53,12 +53,12 @@ fi
if [ -n "$args" ]; then
OCTAVE_SITE_INITFILE="$top_srcdir/scripts/startup/main-rcfile" \
- LD_PRELOAD="$liboctinterp $liboctave $libcruft" \
+# LD_PRELOAD="$liboctinterp $liboctave $libcruft" \
%library_path_var%="$builddir/src:$builddir/liboctave:$builddir/libcruft:$%library_path_var%" \
exec $driver "$builddir/src/octave" --no-initial-path --path="$LOADPATH" --image-path="$IMAGEPATH" "$@"
else
OCTAVE_SITE_INITFILE="$top_srcdir/scripts/startup/main-rcfile" \
- LD_PRELOAD="$liboctinterp $liboctave $libcruft" \
+# LD_PRELOAD="$liboctinterp $liboctave $libcruft" \
%library_path_var%="$builddir/src:$builddir/liboctave:$builddir/libcruft:$%library_path_var%" \
exec $driver "$builddir/src/octave" "$@"
fi

42
math/octave/patches/patch-src_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_Makefile_in,v 1.3 2005/12/24 20:05:27 steven Exp $
--- src/Makefile.in.orig Fri Nov 11 20:48:22 2005
+++ src/Makefile.in Sat Dec 24 12:30:10 2005
@@ -247,6 +247,9 @@ else
$OpenBSD: patch-src_Makefile_in,v 1.4 2007/06/20 08:51:42 steven Exp $
--- src/Makefile.in.orig Tue May 22 18:33:06 2007
+++ src/Makefile.in Sat May 26 22:35:32 2007
@@ -277,6 +277,9 @@ else
PIC_XERBLA = $(XERBLA)
endif
@ -10,40 +10,40 @@ $OpenBSD: patch-src_Makefile_in,v 1.3 2005/12/24 20:05:27 steven Exp $
+
ifeq ($(SHARED_LIBS), true)
ifeq ($(STATIC_LIBS), true)
LIBRARIES = liboctinterp.$(LIBEXT) liboctinterp.$(SHLEXT_VER)
@@ -270,12 +273,8 @@ liboctinterp.$(LIBEXT): $(OBJECTS) $(XER
LIBRARIES = $(LIBPRE)octinterp.$(LIBEXT) $(LIBPRE)octinterp.$(SHLEXT_VER)
@@ -300,12 +303,8 @@ $(LIBPRE)octinterp.$(LIBEXT): $(OBJECTS) $(XERBLA)
$(TEMPLATE_AR) $(TEMPLATE_ARFLAGS) $@ $^
$(RANLIB) $@
-liboctinterp.$(SHLEXT_VER): liboctinterp.$(SHLEXT)
+liboctinterp.$(SHLEXT_VER): $(PICOBJ) $(PIC_XERBLA)
-$(LIBPRE)octinterp.$(SHLEXT_VER): $(LIBPRE)octinterp.$(SHLEXT)
+$(LIBPRE)octinterp.$(SHLEXT_VER): $(PICOBJ) $(PIC_XERBLA)
rm -f $@
- $(LN_S) $< $@
-
-liboctinterp.$(SHLEXT): $(PICOBJ) $(PIC_XERBLA)
-$(LIBPRE)octinterp.$(SHLEXT): $(PICOBJ) $(PIC_XERBLA)
- rm -f $@
$(SH_LD) $(SH_LDFLAGS) $(SONAME_FLAGS) -o $@ $^ $(OCTINTERP_LINK_DEPS)
stamp-oct-links: $(OCT_FILES)
@@ -368,8 +367,7 @@ install-strip:
stamp-prereq: defaults.h oct-conf.h oct-gperf.h parse.cc lex.cc __gnuplot_raw__.cc $(OPT_HANDLERS)
@@ -397,8 +396,7 @@ install-strip:
install-bin:
$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
rm -f $(DESTDIR)$(bindir)/octave$(EXEEXT)
- $(INSTALL_PROGRAM) octave$(EXEEXT) $(DESTDIR)$(bindir)/octave-$(version)$(EXEEXT)
- $(LN_S) octave-$(version)$(EXEEXT) $(DESTDIR)$(bindir)/octave$(EXEEXT)
+ $(INSTALL_PROGRAM) octave$(EXEEXT) $(DESTDIR)$(bindir)/octave
- cd $(DESTDIR)$(bindir) ; $(LN_S) octave-$(version)$(EXEEXT) octave$(EXEEXT)
+ $(INSTALL_PROGRAM) octave$(EXEEXT) $(DESTDIR)$(bindir)/octave$(EXEEXT)
.PHONY: install-bin
install-oct:
@@ -393,10 +391,8 @@ install-lib:
@@ -422,10 +420,8 @@ install-lib:
fi
if $(SHARED_LIBS); then \
rm -f $(DESTDIR)$(octlibdir)/liboctinterp.$(SHLEXT_VER); \
- $(INSTALL) liboctinterp.$(SHLLIB) \
+ $(INSTALL) liboctinterp.$(SHLLIB_VER) \
$(DESTDIR)$(octlibdir)/liboctinterp.$(SHLLIB_VER); \
- rm -f $(DESTDIR)$(octlibdir)/liboctinterp.$(SHLLIB); \
- $(LN_S) liboctinterp.$(SHLLIB_VER) $(DESTDIR)$(octlibdir)/liboctinterp.$(SHLLIB); \
rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(SHLEXT_VER); \
- $(INSTALL) $(LIBPRE)octinterp.$(SHLLIB) \
+ $(INSTALL) $(LIBPRE)octinterp.$(SHLLIB_VER) \
$(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(SHLLIB_VER); \
- rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(SHLLIB); \
- (cd $(DESTDIR)$(octlibdir) ; $(LN_S) $(LIBPRE)octinterp.$(SHLLIB_VER) $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(SHLLIB)); \
if test x$(SHLBIN) != x ; then \
rm -f $(DESTDIR)$(bindir)/liboctinterp.$(SHLBIN); \
rm -f $(DESTDIR)$(bindir)/$(LIBPRE)octinterp.$(SHLBIN); \
$(INSTALL_PROGRAM) \

14
math/octave/patches/patch-src_pt-loop_cc Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src_pt-loop_cc,v 1.1 2007/06/20 08:51:42 steven Exp $
--- src/pt-loop.cc.orig Mon Apr 30 19:12:45 2007
+++ src/pt-loop.cc Mon May 28 17:59:32 2007
@@ -263,7 +263,9 @@ tree_simple_for_command::do_for_loop_once (octave_lval
{ \
if (nrows == 0) \
{ \
- octave_value val (MTYPE (dim_vector (0, 1))); \
+ MTYPE tarray (dim_vector (0, 1)); \
+ \
+ octave_value val (tarray); \
\
for (octave_idx_type i = 0; i < steps; i++) \
{ \

10
math/octave/patches/patch-test_octave_test_system_tilde_expand-1_m
View File

@ -1,10 +0,0 @@
$OpenBSD: patch-test_octave_test_system_tilde_expand-1_m,v 1.1 2005/11/02 18:20:58 alek Exp $
--- test/octave.test/system/tilde_expand-1.m.orig Sat Oct 29 08:30:28 2005
+++ test/octave.test/system/tilde_expand-1.m Sat Oct 29 08:56:56 2005
@@ -1,4 +1,3 @@
-x = getpwuid (getuid ());
-(strcmp (x.dir, tilde_expand ("~"))
- && strcmp (x.dir, tilde_expand (sprintf ("~%s", x.name)))
+x = getpwuid (32767);
+(strcmp (x.dir, tilde_expand (sprintf ("~%s", x.name)))
&& strcmp ("foobar", tilde_expand ("foobar")))

1186
math/octave/pkg/PLIST
View File

File diff suppressed because it is too large Load Diff