[pkgsrc/trunk]: pkgsrc/math/octave fix build: libtoolization missed to link a...

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b13fd8a6c312
branches:  trunk
changeset: 568862:b13fd8a6c312
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Tue Dec 22 17:46:17 2009 +0000

description:
fix build: libtoolization missed to link against required libraries

diffstat:

 math/octave/distinfo         |   4 ++--
 math/octave/patches/patch-ag |  20 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diffs (84 lines):

diff -r 0310c47b6afa -r b13fd8a6c312 math/octave/distinfo
--- a/math/octave/distinfo      Tue Dec 22 16:09:30 2009 +0000
+++ b/math/octave/distinfo      Tue Dec 22 17:46:17 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2009/10/12 09:28:02 adam Exp $
+$NetBSD: distinfo,v 1.25 2009/12/22 17:46:17 drochner Exp $
 
 SHA1 (octave-3.2.3.tar.bz2) = 7a188ffd55ac1efb2f480fa2aed94e66d3596f34
 RMD160 (octave-3.2.3.tar.bz2) = 30c1892544ba67054f1888758ebc2b1ede8848c0
@@ -7,7 +7,7 @@
 SHA1 (patch-ac) = fa39afe6f033e0be57ffde20d49b845c0243f91d
 SHA1 (patch-ad) = 621496f7a0c57fb6d5157ddb737366747f1e19d2
 SHA1 (patch-af) = f3080fa8afbb3863b6b88832fb3b46fe7005476e
-SHA1 (patch-ag) = 73bbc1f19be94d747b914543c7b88a3803494505
+SHA1 (patch-ag) = 0694e61d1a45c242756821ebcbefd37c1f468e9e
 SHA1 (patch-ah) = a2c6e3c6cb4c4570647edb4f484f514d75dda3ba
 SHA1 (patch-ai) = d7b4841238f7358bea50dd1b1b22cd94ab2af229
 SHA1 (patch-ak) = 98aa84ac66fac0b7b0dcdb69e911dc9d42fd6673
diff -r 0310c47b6afa -r b13fd8a6c312 math/octave/patches/patch-ag
--- a/math/octave/patches/patch-ag      Tue Dec 22 16:09:30 2009 +0000
+++ b/math/octave/patches/patch-ag      Tue Dec 22 17:46:17 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.6 2009/07/19 00:33:10 asau Exp $
+$NetBSD: patch-ag,v 1.7 2009/12/22 17:46:17 drochner Exp $
 
---- src/Makefile.in.orig       2009-06-03 16:32:49.000000000 +0400
-+++ src/Makefile.in    2009-06-28 21:54:25.000000000 +0400
-@@ -240,7 +240,7 @@
+--- src/Makefile.in.orig       2009-06-03 12:32:49.000000000 +0000
++++ src/Makefile.in
+@@ -240,7 +240,7 @@ BUILT_EXTRAS := graphics.h mxarray.h
  
  EXTRAS := ov-base-int.cc ov-base-mat.cc ov-base-diag.cc ov-base-scalar.cc graphics-props.cc
  
@@ -11,7 +11,7 @@
  
  INCLUDES_FOR_INSTALL := $(INCLUDES) $(EXTRAS) $(BUILT_EXTRAS)
  
-@@ -357,8 +357,9 @@
+@@ -357,8 +357,9 @@ libraries: $(LIBRARIES)
  
  $(LIBPRE)octinterp.$(LIBEXT): $(OBJECTS) $(XERBLA)
        rm -f $@
@@ -19,11 +19,11 @@
 -      $(RANLIB) $@
 +      ${LIBTOOL} --mode=link ${CC} -o liboctinterp.$(LIBEXT) \
 +              $(OBJECTS:.o=.lo) $(XERBLA:.o=.lo) -rpath ${PREFIX}/lib \
-+              -version-info ${version:3.2.%=3:2:%}
++              -version-info ${version:3.2.%=3:2:%} $(OCTINTERP_LINK_DEPS)
  
  $(SHLPRE)octinterp.$(SHLEXT_VER): $(SHLPRE)octinterp.$(SHLEXT)
        rm -f $@
-@@ -366,9 +367,10 @@
+@@ -366,9 +367,10 @@ $(SHLPRE)octinterp.$(SHLEXT_VER): $(SHLP
  
  $(SHLPRE)octinterp.$(SHLEXT): $(PICOBJ) $(PIC_XERBLA)
        rm -f $@
@@ -35,7 +35,7 @@
        $(LD_CXX) $(CPPFLAGS) $(ALL_CXXFLAGS) $(RDYNAMIC_FLAG) \
        $(ALL_LDFLAGS) -o $@ \
        main.o $(DLD_STATIC_OBJ) \
-@@ -460,6 +462,7 @@
+@@ -460,6 +462,7 @@ install-strip:
  install-bin:
        $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
        rm -f $(DESTDIR)$(bindir)/octave$(EXEEXT)
@@ -43,7 +43,7 @@
        $(INSTALL_PROGRAM) octave$(EXEEXT) $(DESTDIR)$(bindir)/octave-$(version)$(EXEEXT)
        cd $(DESTDIR)$(bindir) ; $(LN_S) octave-$(version)$(EXEEXT) octave$(EXEEXT)
  .PHONY: install-bin
-@@ -470,6 +473,7 @@
+@@ -470,6 +473,7 @@ install-oct:
        if [ -n "$(OCT_FILES)" ]; then \
          xfiles="$(OCT_FILES)"; \
          for f in $$xfiles; do \
@@ -51,7 +51,7 @@
            $(INSTALL_PROGRAM) $$f $(DESTDIR)$(octfiledir)/$$f; \
          done; \
        fi
-@@ -479,9 +483,8 @@
+@@ -479,9 +483,8 @@ install-lib:
        $(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir)
        if $(STATIC_LIBS); then \
          rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(LIBEXT); \