diff options
Diffstat (limited to 'math')
| -rw-r--r-- | math/octave/Makefile | 8 | ||||
| -rw-r--r-- | math/octave/PLIST | 16 | ||||
| -rw-r--r-- | math/octave/distinfo | 9 | ||||
| -rw-r--r-- | math/octave/patches/patch-ac | 39 | ||||
| -rw-r--r-- | math/octave/patches/patch-ad | 27 | ||||
| -rw-r--r-- | math/octave/patches/patch-af | 28 | ||||
| -rw-r--r-- | math/octave/patches/patch-ag | 85 | ||||
| -rw-r--r-- | math/octave/patches/patch-an | 12 |
8 files changed, 46 insertions, 178 deletions
diff --git a/math/octave/Makefile b/math/octave/Makefile index 0a7565f9165..bc87774d52f 100644 --- a/math/octave/Makefile +++ b/math/octave/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.92 2011/11/01 06:11:55 sbd Exp $ +# $NetBSD: Makefile,v 1.93 2011/11/28 22:51:27 drochner Exp $ DISTNAME= octave-${OCTAVE_VER} -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= math MASTER_SITES= ftp://ftp.octave.org/pub/octave/ EXTRACT_SUFX= .tar.bz2 @@ -24,7 +24,6 @@ BROKEN= Internal compiler error occurs on arm32 (even with gcc-2.95.3) PKG_DESTDIR_SUPPORT= user-destdir USE_GNU_READLINE= yes -USE_LIBTOOL= yes USE_TOOLS+= autoconf gsed gmake makeinfo perl pkg-config GNU_CONFIGURE= yes MAKE_JOBS_SAFE= no @@ -35,9 +34,8 @@ USE_LANGUAGES= c c++ fortran77 # needed for loading of shared objects such as those in the # octave-forge package or user written ones compiled with mkoctfile CONFIGURE_ARGS+= --enable-dl -# shared libraries are handled automatically in pkgsrc CONFIGURE_ARGS+= --enable-static -CONFIGURE_ARGS+= --disable-shared +CONFIGURE_ARGS+= --enable-shared # trick pkgsrc into real gsed, needed for "mkf77def" TOOLS_PLATFORM.gsed= #empty diff --git a/math/octave/PLIST b/math/octave/PLIST index 8ce11d835bf..ea014e8b7e5 100644 --- a/math/octave/PLIST +++ b/math/octave/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.21 2009/07/19 00:33:10 asau Exp $ +@comment $NetBSD: PLIST,v 1.22 2011/11/28 22:51:27 drochner Exp $ bin/mkoctfile bin/mkoctfile-${PKGVERSION} bin/octave @@ -756,9 +756,15 @@ include/${PKGNAME}/octave/xpow.h include/${PKGNAME}/octave/zfstream.h info/liboctave.info info/octave.info -lib/libcruft.la -lib/liboctave.la -lib/liboctinterp.la +lib/${PKGNAME}/libcruft.a +lib/${PKGNAME}/libcruft.so +lib/${PKGNAME}/libcruft.so.${PKGVERSION} +lib/${PKGNAME}/liboctave.a +lib/${PKGNAME}/liboctave.so +lib/${PKGNAME}/liboctave.so.${PKGVERSION} +lib/${PKGNAME}/liboctinterp.a +lib/${PKGNAME}/liboctinterp.so +lib/${PKGNAME}/liboctinterp.so.${PKGVERSION} 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}/PKG_ADD @@ -847,6 +853,7 @@ share/octave/${PKGVERSION}/doc/refcard-a4.ps share/octave/${PKGVERSION}/doc/refcard-legal.ps share/octave/${PKGVERSION}/doc/refcard-letter.ps share/octave/${PKGVERSION}/etc/NEWS +share/octave/${PKGVERSION}/etc/doc-cache share/octave/${PKGVERSION}/imagelib/default.img share/octave/${PKGVERSION}/imagelib/octave-sombrero.png share/octave/${PKGVERSION}/m/audio/lin2mu.m @@ -1773,4 +1780,3 @@ share/octave/site/m/startup/octaverc @pkgdir libexec/octave/api-v37/site/exec/${MACHINE_GNU_PLATFORM} @pkgdir libexec/octave/${PKGVERSION}/site/oct/${MACHINE_GNU_PLATFORM} @pkgdir libexec/octave/${PKGVERSION}/site/exec/${MACHINE_GNU_PLATFORM} -@pkgdir lib/${PKGNAME} diff --git a/math/octave/distinfo b/math/octave/distinfo index 2c924e75f1f..5f63f782e1f 100644 --- a/math/octave/distinfo +++ b/math/octave/distinfo @@ -1,16 +1,13 @@ -$NetBSD: distinfo,v 1.29 2011/09/12 08:31:39 obache Exp $ +$NetBSD: distinfo,v 1.30 2011/11/28 22:51:27 drochner Exp $ SHA1 (octave-3.2.4.tar.bz2) = 7de078564027108f3436f3ba7bf5993a6b411a67 RMD160 (octave-3.2.4.tar.bz2) = 6dcdea7ef2431b8427da5e6b9d2113e0e5736f43 Size (octave-3.2.4.tar.bz2) = 12080959 bytes SHA1 (patch-ab) = 55983c073f773c8f5aa6147a65f03e0351c6ece4 -SHA1 (patch-ac) = fa39afe6f033e0be57ffde20d49b845c0243f91d -SHA1 (patch-ad) = fc1fa488273878595fdef9ee1c2fcf9a4262e9e3 -SHA1 (patch-af) = b6b7c7a2c220997126769163fb1347ed7f5bfcb8 -SHA1 (patch-ag) = ec0fac7a105b8099cc0fdfa8e4ad002af66ddf0e +SHA1 (patch-ag) = a895678883a337f2f2c6b10f6ddda3c89f240a33 SHA1 (patch-ah) = a2c6e3c6cb4c4570647edb4f484f514d75dda3ba SHA1 (patch-ai) = d7b4841238f7358bea50dd1b1b22cd94ab2af229 SHA1 (patch-ak) = 98aa84ac66fac0b7b0dcdb69e911dc9d42fd6673 -SHA1 (patch-an) = 4ce4be6b91fb61e76fe8a85d5120721d562b475a +SHA1 (patch-an) = 6d5b4e7bdd4ff73a0607dba7561d1a7a899c5930 SHA1 (patch-ao) = 80be57d904d48cc48d8f3da0a3883309a343d084 SHA1 (patch-src_DLD-FUNCTIONS_urlwrite.cc) = bb731c16a1ee1aa174c7cb8f0f479ed3787ecb07 diff --git a/math/octave/patches/patch-ac b/math/octave/patches/patch-ac deleted file mode 100644 index 65e32ec53a7..00000000000 --- a/math/octave/patches/patch-ac +++ /dev/null @@ -1,39 +0,0 @@ -$NetBSD: patch-ac,v 1.7 2009/07/19 00:33:10 asau Exp $ - ---- Makeconf.in.orig 2009-05-25 10:04:58.000000000 +0400 -+++ Makeconf.in 2009-06-28 21:21:08.000000000 +0400 -@@ -99,7 +99,7 @@ - SHLBIN_VER = @SHLBIN_VER@ - SHLLINKEXT= - --LIBEXT = a -+LIBEXT = la - LIBPRE = @LIBPRE@ - SHLPRE = @SHLPRE@ - SHLLIBPRE = @SHLLIBPRE@ -@@ -208,7 +208,7 @@ - SH_LD = @SH_LD@ - SH_LDFLAGS = @SH_LDFLAGS@ - --DL_LD = @DL_LD@ -+DL_LD = ${LIBTOOL} --mode=link @DL_LD@ - DL_LDFLAGS = @DL_LDFLAGS@ - - SONAME_FLAGS = @SONAME_FLAGS@ -@@ -391,13 +391,13 @@ - # How to make .o files: - - %.o : %.f -- $(FC) -c $(ALL_FFLAGS) -o $@ $< -+ ${LIBTOOL} --mode=compile $(FC) -c $(ALL_FFLAGS) -o $@ $< - - %.o : %.c -- $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< -o $@ -+ ${LIBTOOL} --mode=compile $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< -o $@ - - %.o : %.cc -- $(CXX) -c $(CPPFLAGS) $(ALL_CXXFLAGS) $< -o $@ -+ ${LIBTOOL} --mode=compile $(CXX) -c $(CPPFLAGS) $(ALL_CXXFLAGS) $< -o $@ - - pic/%.o : %.f - $(FC) -c $(FPICFLAG) $(ALL_FFLAGS) $< -o $@ diff --git a/math/octave/patches/patch-ad b/math/octave/patches/patch-ad deleted file mode 100644 index 8a1bb384643..00000000000 --- a/math/octave/patches/patch-ad +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-ad,v 1.7 2010/02/12 00:41:48 asau Exp $ - ---- libcruft/Makefile.in.orig 2009-05-25 10:04:58.000000000 +0400 -+++ libcruft/Makefile.in 2009-06-28 21:21:33.000000000 +0400 -@@ -121,8 +121,8 @@ - - $(LIBPRE)cruft.$(LIBEXT): $(CRUFT_OBJ) - rm -f $@ -- $(AR) $(ARFLAGS) $@ $^ -- $(RANLIB) $@ -+ ${LIBTOOL} --mode=link ${CC} -o libcruft.$(LIBEXT) $(CRUFT_OBJ:.o=.lo) \ -+ -rpath ${PREFIX}/lib -version-number ${version:3.2.%=3:2:%} - - $(SHLPRE)cruft.$(SHLEXT_VER): $(SHLPRE)cruft.$(SHLEXT) - rm -f $@ -@@ -147,9 +147,8 @@ - $(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir) - if $(STATIC_LIBS); then \ - rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(LIBEXT) ; \ -- $(INSTALL_DATA) $(LIBPRE)cruft.$(LIBEXT) \ -- $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(LIBEXT) ; \ -- $(RANLIB) $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(LIBEXT) ; \ -+ ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libcruft.$(LIBEXT) \ -+ ${DESTDIR}${PREFIX}/lib; \ - fi - if $(SHARED_LIBS); then \ - rm -f $(DESTDIR)$(octlibdir)/$(SHLLIBPRE)cruft.$(SHLLIB_VER); \ diff --git a/math/octave/patches/patch-af b/math/octave/patches/patch-af deleted file mode 100644 index 7a4baddde62..00000000000 --- a/math/octave/patches/patch-af +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-af,v 1.7 2010/02/12 00:41:48 asau Exp $ - ---- liboctave/Makefile.in.orig 2009-05-25 10:04:59.000000000 +0400 -+++ liboctave/Makefile.in 2009-06-28 21:21:57.000000000 +0400 -@@ -266,8 +266,9 @@ - - $(LIBPRE)octave.$(LIBEXT): $(LIBOCTAVE_OBJECTS) - rm -f $@ -- $(TEMPLATE_AR) $(TEMPLATE_ARFLAGS) $@ $(LIBOCTAVE_OBJECTS) -- $(RANLIB) $@ -+ ${LIBTOOL} --mode=link ${CC} -o liboctave.$(LIBEXT) \ -+ $(LIBOCTAVE_OBJECTS:.o=.lo) -rpath ${PREFIX}/lib \ -+ -version-number ${version:3.2.%=3:2:%} - - $(SHLPRE)octave.$(SHLEXT_VER): $(SHLPRE)octave.$(SHLEXT) - rm -f $@ -@@ -298,9 +299,8 @@ - $(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir) - if $(STATIC_LIBS); then \ - rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octave.$(LIBEXT); \ -- $(INSTALL_DATA) $(LIBPRE)octave.$(LIBEXT) \ -- $(DESTDIR)$(octlibdir)/$(LIBPRE)octave.$(LIBEXT); \ -- $(RANLIB) $(DESTDIR)$(octlibdir)/$(LIBPRE)octave.$(LIBEXT); \ -+ ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} liboctave.$(LIBEXT) \ -+ ${DESTDIR}${PREFIX}/lib; \ - fi - if $(SHARED_LIBS); then \ - rm -f $(DESTDIR)$(octlibdir)/$(SHLLIBPRE)octave.$(SHLLIB_VER); \ diff --git a/math/octave/patches/patch-ag b/math/octave/patches/patch-ag index f6b5bb65bf1..6eb74c5b3a7 100644 --- a/math/octave/patches/patch-ag +++ b/math/octave/patches/patch-ag @@ -1,67 +1,20 @@ -$NetBSD: patch-ag,v 1.9 2010/04/24 20:58:36 asau Exp $ +$NetBSD: patch-ag,v 1.10 2011/11/28 22:51:28 drochner Exp $ ---- 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 - --EXTRA_OBJECTS := oct-errno.o octave.o builtins.o ops.o -+EXTRA_OBJECTS := oct-errno.o builtins.o ops.o - - INCLUDES_FOR_INSTALL := $(INCLUDES) $(EXTRAS) $(BUILT_EXTRAS) - -@@ -357,8 +357,9 @@ - - $(LIBPRE)octinterp.$(LIBEXT): $(OBJECTS) $(XERBLA) - rm -f $@ -- $(TEMPLATE_AR) $(TEMPLATE_ARFLAGS) $@ $^ -- $(RANLIB) $@ -+ ${LIBTOOL} --mode=link ${CC} -o liboctinterp.$(LIBEXT) \ -+ $(OBJECTS:.o=.lo) $(XERBLA:.o=.lo) -rpath ${PREFIX}/lib \ -+ -version-number ${version:3.2.%=3:2:%} $(OCTINTERP_LINK_DEPS) - - $(SHLPRE)octinterp.$(SHLEXT_VER): $(SHLPRE)octinterp.$(SHLEXT) - rm -f $@ -@@ -366,9 +367,10 @@ - - $(SHLPRE)octinterp.$(SHLEXT): $(PICOBJ) $(PIC_XERBLA) - rm -f $@ -- $(SH_LD) $(SH_LDFLAGS) $(SONAME_FLAGS) -o $@ $^ $(OCTINTERP_LINK_DEPS) -+ ${LIBTOOL} --mode=link $(SH_LD) $(SH_LDFLAGS) $(SONAME_FLAGS) -o $@ $^ $(OCTINTERP_LINK_DEPS) - - octave$(EXEEXT): $(LIBRARIES) main.o $(DLD_STATIC_OBJ) -+ ${LIBTOOL} --mode=link \ - $(LD_CXX) $(CPPFLAGS) $(ALL_CXXFLAGS) $(RDYNAMIC_FLAG) \ - $(ALL_LDFLAGS) -o $@ \ - main.o $(DLD_STATIC_OBJ) \ -@@ -460,6 +462,7 @@ - install-bin: - $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir) - rm -f $(DESTDIR)$(bindir)/octave$(EXEEXT) -+ ${LIBTOOL} --mode=install \ - $(INSTALL_PROGRAM) octave$(EXEEXT) $(DESTDIR)$(bindir)/octave-$(version)$(EXEEXT) - cd $(DESTDIR)$(bindir) ; $(LN_S) octave-$(version)$(EXEEXT) octave$(EXEEXT) - .PHONY: install-bin -@@ -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 \ -+ $(BSD_INSTALL_LIB) $$f $(DESTDIR)$(octfiledir)/$$f; \ - done; \ - fi - .PHONY: install-oct -@@ -479,9 +483,8 @@ - $(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir) - if $(STATIC_LIBS); then \ - rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(LIBEXT); \ -- $(INSTALL_DATA) $(LIBPRE)octinterp.$(LIBEXT) \ -- $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(LIBEXT); \ -- $(RANLIB) $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(LIBEXT); \ -+ ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} liboctinterp.$(LIBEXT) \ -+ ${DESTDIR}${PREFIX}/lib; \ - fi - if $(SHARED_LIBS); then \ - rm -f $(DESTDIR)$(octlibdir)/$(SHLLIBPRE)octinterp.$(SHLLIB_VER); \ +--- src/Makefile.in.orig 2009-06-03 12:32:49.000000000 +0000 ++++ src/Makefile.in +@@ -299,13 +299,13 @@ endif + + OCTINTERP_LINK_DEPS = \ + -L../liboctave $(LIBOCTAVE) -L../libcruft $(LIBCRUFT) $(LIBS) $(FLIBS) \ +- $(X11_LIBS) $(OPENGL_LIBS) $(CARBON_LIBS) ++ $(X11_LIBS) $(OPENGL_LIBS) $(CARBON_LIBS) $(RLD_FLAG) + + OCT_LINK_DEPS = \ + -L../libcruft $(LIBCRUFT) -L../liboctave $(LIBOCTAVE) \ + -L. $(LIBOCTINTERP) $(CHOLMOD_LIBS) $(UMFPACK_LIBS) $(AMD_LIBS) \ + $(CAMD_LIBS) $(COLAMD_LIBS) $(CCOLAMD_LIBS) $(CXSPARSE_LIBS) $(BLAS_LIBS) \ +- $(FFTW_LIBS) $(QRUPDATE_LIBS) $(ARPACK_LIBS) $(LIBS) $(FLIBS) ++ $(FFTW_LIBS) $(QRUPDATE_LIBS) $(ARPACK_LIBS) $(LIBS) $(FLIBS) $(RLD_FLAG) + + BUILT_DISTFILES = DOCSTRINGS oct-gperf.h parse.cc lex.cc y.tab.h \ + $(OPT_HANDLERS) $(BUILT_EXTRAS) diff --git a/math/octave/patches/patch-an b/math/octave/patches/patch-an index 6216f7f6392..3a7ffa10415 100644 --- a/math/octave/patches/patch-an +++ b/math/octave/patches/patch-an @@ -1,4 +1,4 @@ -$NetBSD: patch-an,v 1.2 2010/06/27 17:52:56 joerg Exp $ +$NetBSD: patch-an,v 1.3 2011/11/28 22:51:28 drochner Exp $ --- configure.in.orig 2010-01-19 11:13:14.000000000 +0000 +++ configure.in @@ -11,7 +11,7 @@ $NetBSD: patch-an,v 1.2 2010/06/27 17:52:56 joerg Exp $ warn_magick="GraphicsMagick++ config script not found. Assuming GraphicsMagic++ library and header files are missing, so imread will not be fully functional" else AC_DEFINE(HAVE_MAGICK, 1, [Define if GraphicsMagick++ is available.]) -@@ -1214,7 +1214,7 @@ OCTGRAPHICS_DLL_DEFS= +@@ -1214,14 +1214,14 @@ OCTGRAPHICS_DLL_DEFS= library_path_var=LD_LIBRARY_PATH SCRIPTS_EXE_SUFFIX= case "$canonical_host_type" in @@ -20,6 +20,14 @@ $NetBSD: patch-an,v 1.2 2010/06/27 17:52:56 joerg Exp $ SH_LD=ld SH_LDFLAGS=-Bshareable ;; + *-*-openbsd*) + SH_LDFLAGS='-shared -fPIC' + ;; +- *-*-freebsd*) ++ *-*-freebsd*|*-*-netbsd*) + SH_LDFLAGS="-shared -Wl,-x" + RLD_FLAG='-Wl,-rpath -Wl,$(octlibdir)' + ;; @@ -1599,8 +1599,8 @@ AC_CHECK_FUNCS(atexit basename bcopy bze _chmod _snprintf x_utime _utime32) |