diff options
| author | asau <asau@pkgsrc.org> | 2010-04-24 20:58:36 +0000 |
|---|---|---|
| committer | asau <asau@pkgsrc.org> | 2010-04-24 20:58:36 +0000 |
| commit | bdfecad16e8694f483dcd0e496e30529cef1da4e (patch) | |
| tree | 72c5bdf388d5848f2b0bf83a953244bf1be643b6 /math | |
| parent | 439a4b427345b5bc6ac21a38a4bf09f8ba99c1b3 (diff) | |
| download | pkgsrc-bdfecad16e8694f483dcd0e496e30529cef1da4e.tar.gz | |
Use BSD_INSTALL_LIB to install shared objects.
Rediscovered by Taylor R. Campbell in PR 43205
Diffstat (limited to 'math')
| -rw-r--r-- | math/octave/distinfo | 4 | ||||
| -rw-r--r-- | math/octave/patches/patch-ag | 22 |
2 files changed, 14 insertions, 12 deletions
diff --git a/math/octave/distinfo b/math/octave/distinfo index cad9271f81c..a1730fe2e8e 100644 --- a/math/octave/distinfo +++ b/math/octave/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.26 2010/02/12 00:41:48 asau Exp $ +$NetBSD: distinfo,v 1.27 2010/04/24 20:58:36 asau Exp $ SHA1 (octave-3.2.4.tar.bz2) = 7de078564027108f3436f3ba7bf5993a6b411a67 RMD160 (octave-3.2.4.tar.bz2) = 6dcdea7ef2431b8427da5e6b9d2113e0e5736f43 @@ -7,7 +7,7 @@ SHA1 (patch-ab) = 55983c073f773c8f5aa6147a65f03e0351c6ece4 SHA1 (patch-ac) = fa39afe6f033e0be57ffde20d49b845c0243f91d SHA1 (patch-ad) = fc1fa488273878595fdef9ee1c2fcf9a4262e9e3 SHA1 (patch-af) = b6b7c7a2c220997126769163fb1347ed7f5bfcb8 -SHA1 (patch-ag) = c4d6f230a9761cb5d16a8e8c76a34fe1ef68c584 +SHA1 (patch-ag) = ec0fac7a105b8099cc0fdfa8e4ad002af66ddf0e SHA1 (patch-ah) = a2c6e3c6cb4c4570647edb4f484f514d75dda3ba SHA1 (patch-ai) = d7b4841238f7358bea50dd1b1b22cd94ab2af229 SHA1 (patch-ak) = 98aa84ac66fac0b7b0dcdb69e911dc9d42fd6673 diff --git a/math/octave/patches/patch-ag b/math/octave/patches/patch-ag index edf8255fa20..f6b5bb65bf1 100644 --- a/math/octave/patches/patch-ag +++ b/math/octave/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.8 2010/02/12 00:41:48 asau Exp $ +$NetBSD: patch-ag,v 1.9 2010/04/24 20:58:36 asau Exp $ ---- 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 +--- src/Makefile.in.orig 2009-06-03 16:32:49.000000000 +0400 ++++ src/Makefile.in 2010-02-21 13:57:25.000000000 +0300 +@@ -240,7 +240,7 @@ EXTRAS := ov-base-int.cc ov-base-mat.cc ov-base-diag.cc ov-base-scalar.cc graphics-props.cc @@ -11,7 +11,7 @@ $NetBSD: patch-ag,v 1.8 2010/02/12 00:41:48 asau Exp $ INCLUDES_FOR_INSTALL := $(INCLUDES) $(EXTRAS) $(BUILT_EXTRAS) -@@ -357,8 +357,9 @@ libraries: $(LIBRARIES) +@@ -357,8 +357,9 @@ $(LIBPRE)octinterp.$(LIBEXT): $(OBJECTS) $(XERBLA) rm -f $@ @@ -23,7 +23,7 @@ $NetBSD: patch-ag,v 1.8 2010/02/12 00:41:48 asau Exp $ $(SHLPRE)octinterp.$(SHLEXT_VER): $(SHLPRE)octinterp.$(SHLEXT) rm -f $@ -@@ -366,9 +367,10 @@ $(SHLPRE)octinterp.$(SHLEXT_VER): $(SHLP +@@ -366,9 +367,10 @@ $(SHLPRE)octinterp.$(SHLEXT): $(PICOBJ) $(PIC_XERBLA) rm -f $@ @@ -35,7 +35,7 @@ $NetBSD: patch-ag,v 1.8 2010/02/12 00:41:48 asau Exp $ $(LD_CXX) $(CPPFLAGS) $(ALL_CXXFLAGS) $(RDYNAMIC_FLAG) \ $(ALL_LDFLAGS) -o $@ \ main.o $(DLD_STATIC_OBJ) \ -@@ -460,6 +462,7 @@ install-strip: +@@ -460,6 +462,7 @@ install-bin: $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir) rm -f $(DESTDIR)$(bindir)/octave$(EXEEXT) @@ -43,15 +43,17 @@ $NetBSD: patch-ag,v 1.8 2010/02/12 00:41:48 asau Exp $ $(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 @@ install-oct: +@@ -470,7 +473,8 @@ if [ -n "$(OCT_FILES)" ]; then \ xfiles="$(OCT_FILES)"; \ for f in $$xfiles; do \ +- $(INSTALL_PROGRAM) $$f $(DESTDIR)$(octfiledir)/$$f; \ + ${LIBTOOL} --mode=install \ - $(INSTALL_PROGRAM) $$f $(DESTDIR)$(octfiledir)/$$f; \ ++ $(BSD_INSTALL_LIB) $$f $(DESTDIR)$(octfiledir)/$$f; \ done; \ fi -@@ -479,9 +483,8 @@ install-lib: + .PHONY: install-oct +@@ -479,9 +483,8 @@ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir) if $(STATIC_LIBS); then \ rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(LIBEXT); \ |