Fixed installation problem - now all the modules should be installed correctly, and buildlinked against fftw (not fftw2)

4 files changed, 93 insertions, 8 deletions

diff --git a/math/octave-current/Makefile b/math/octave-current/Makefile
index 383e4999cac..0f34be54514 100644
--- a/math/octave-current/Makefile
+++ b/math/octave-current/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2005/01/12 15:32:01 jlam Exp $
+# $NetBSD: Makefile,v 1.40 2005/01/13 15:41:53 adam Exp $
 
 DISTNAME=	octave-${OCTAVE_VER}
 PKGNAME=	octave-current-${OCTAVE_VER}
+PKGREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.che.wisc.edu/pub/octave/bleeding-edge/ \
 		ftp://ftp.eos.hokudai.ac.jp/pub/GNU/misc/octave/bleeding-edge/ \
@@ -85,7 +86,7 @@ post-install:
 .include "../../devel/readline/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../math/blas/buildlink3.mk"
-.include "../../math/fftw2/buildlink3.mk"
+.include "../../math/fftw/buildlink3.mk"
 .include "../../math/lapack/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/octave-current/PLIST b/math/octave-current/PLIST
index 9f5ee4e773c..83f5670c942 100644
--- a/math/octave-current/PLIST
+++ b/math/octave-current/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2004/11/25 12:59:21 adam Exp $
+@comment $NetBSD: PLIST,v 1.13 2005/01/13 15:41:53 adam Exp $
 bin/mkoctfile
 bin/mkoctfile-${PKGVERSION}
 bin/octave
@@ -555,6 +555,82 @@ lib/liboctave.la
 lib/liboctinterp.la
 libexec/octave/${PKGVERSION}/exec/${MACHINE_GNU_PLATFORM}/info-emacs-info
 libexec/octave/${PKGVERSION}/exec/${MACHINE_GNU_PLATFORM}/info-emacs-octave-help
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/airy.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/balance.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/besselh.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/besseli.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/besselj.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/besselk.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/bessely.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/betainc.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/chol.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/colloc.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/daspk.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/daspk_options.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/dasrt.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/dasrt_options.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/dassl.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/dassl_options.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/det.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/eig.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/endgrent.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/endpwent.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/expm.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/fft.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/fft2.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/fftn.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/fftw_wisdom.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/filter.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/find.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/fsolve.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/fsolve_options.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/gammainc.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/gcd.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/getgrent.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/getgrgid.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/getgrnam.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/getpwent.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/getpwnam.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/getpwuid.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/getrusage.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/givens.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/gmtime.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/hess.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/ifft.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/ifft2.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/ifftn.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/inv.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/inverse.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/kron.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/localtime.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/lpsolve.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/lpsolve_options.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/lsode.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/lsode_options.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/lu.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/max.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/min.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/minmax.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/mktime.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/odessa.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/odessa_options.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/pinv.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/qr.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/quad.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/quad_options.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/qz.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/rand.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/randn.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/schur.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/setgrent.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/setpwent.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/sort.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/sqrtm.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/strftime.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/strptime.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/svd.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/syl.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/time.oct
 libexec/octave/ls-R
 man/man1/mkoctfile.1
 man/man1/octave-bug.1
diff --git a/math/octave-current/distinfo b/math/octave-current/distinfo
index 49670d6ef58..d0e729f560e 100644
--- a/math/octave-current/distinfo
+++ b/math/octave-current/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2005/01/12 06:02:29 jlam Exp $
+$NetBSD: distinfo,v 1.23 2005/01/13 15:41:53 adam Exp $
 
 SHA1 (octave-2.1.64.tar.bz2) = 90f54fd7515cc3c629ef9104d3879d62a14b2a12
 Size (octave-2.1.64.tar.bz2) = 4341798 bytes
@@ -7,5 +7,5 @@ SHA1 (patch-ac) = 201e5e6a58f6934371daa9ccac8d4f1f01533a4c
 SHA1 (patch-ad) = 03dfbfb17b1262d5094dbc42758a99011e05fdd4
 SHA1 (patch-ae) = 79544d09268d41647b081680fc839f4fe481b111
 SHA1 (patch-af) = 775eb3c4d4769aada0d01df228c8ca48c489842d
-SHA1 (patch-ag) = f6c4263cf08985e4897ea69cce6a9c8b329ec48c
+SHA1 (patch-ag) = 4a09959aa2ae9dbc9ae35d8fcf65630bb8d48788
 SHA1 (patch-ah) = f7009d8b35354a1d403d5bdeae68a211435b004c
diff --git a/math/octave-current/patches/patch-ag b/math/octave-current/patches/patch-ag
index 06123f2d669..5c1f5b0cff7 100644
--- a/math/octave-current/patches/patch-ag
+++ b/math/octave-current/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.10 2004/09/23 13:03:41 adam Exp $
+$NetBSD: patch-ag,v 1.11 2005/01/13 15:41:54 adam Exp $
 
---- src/Makefile.in.orig	2004-09-02 03:48:47.000000000 +0000
+--- src/Makefile.in.orig	2004-11-12 05:34:58.000000000 +0000
 +++ src/Makefile.in
 @@ -32,10 +32,10 @@ CXXFLAGS_NO_PT_FLAGS = $(filter-out $(PT
  ifeq ($(ENABLE_DYNAMIC_LINKING), true)
@@ -52,7 +52,15 @@ $NetBSD: patch-ag,v 1.10 2004/09/23 13:03:41 adam Exp $
  	$(INSTALL_PROGRAM) octave$(EXEEXT) $(DESTDIR)$(bindir)/octave-$(version)$(EXEEXT)
  	$(LN_S) octave-$(version)$(EXEEXT) $(DESTDIR)$(bindir)/octave$(EXEEXT)
  .PHONY: install-bin
-@@ -387,9 +390,8 @@ install-lib:
+@@ -377,6 +380,7 @@ install-oct:
+ 	  $(top_srcdir)/mkinstalldirs $(DESTDIR)$(octfiledir); \
+ 	  xfiles="$(OCT_FILES)"; \
+ 	  for f in $$xfiles; do \
++	    ${LIBTOOL} --mode=install \
+ 	    $(INSTALL_PROGRAM) $$f $(DESTDIR)$(octfiledir)/$$f; \
+ 	  done; \
+ 	  $(srcdir)/mk-oct-links $(DESTDIR)$(octfiledir) $(DLD_DEF_FILES); \
+@@ -387,9 +391,8 @@ install-lib:
  	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir)
  	if $(STATIC_LIBS); then \
  	  rm -f $(DESTDIR)$(octlibdir)/liboctinterp.$(LIBEXT); \