Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2015Q2

Browse Source
This commit is contained in:
Lionel Sambuc
2015-08-30 02:56:09 -07:00
committed by Lionel Sambuc
parent 4af1cdf7a9
commit f641581404
15409 changed files with 267784 additions and 121624 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
math/octave/Makefile
View File

@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.123 2014/06/27 23:04:38 asau Exp $
# $NetBSD: Makefile,v 1.128 2015/06/27 22:38:07 joerg Exp $
DISTNAME= octave-${OCTAVE_VER}
PKGREVISION= 6
PKGREVISION= 9
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_GNU:=octave/}
MASTER_SITES+= ftp://ftp.octave.org/pub/octave/
@@ -14,7 +14,11 @@ COMMENT= High-level language, intended for numerical computations
LICENSE= gnu-gpl-v3
BUILD_DEPENDS+= gperf>=2.7:../../devel/gperf
BUILD_DEPENDS+= teTeX-[0-9]*:../../print/teTeX
BUILD_DEPENDS+= tex-latex-fonts-[0-9]*:../../fonts/tex-latex-fonts
BUILD_DEPENDS+= dvipsk-[0-9]*:../../print/dvipsk
BUILD_DEPENDS+= tex-epsf-[0-9]*:../../print/tex-epsf
BUILD_DEPENDS+= tex-tex-[0-9]*:../../print/tex-tex
BUILD_DEPENDS+= tex-pdftex-[0-9]*:../../print/tex-pdftex
TOOL_DEPENDS+= gtexinfo>=5.1:../../devel/gtexinfo
DEPENDS+= gnuplot>=3.7:../../graphics/gnuplot
@@ -39,6 +43,9 @@ CONFIGURE_ARGS+= --enable-shared
CONFIGURE_ARGS+= --without-opengl
# We use this to install .oct files so it doesn't strip them.
CONFIGURE_ENV+= INSTALL_LIB=${INSTALL_LIB:Q}
.include "options.mk"
INFO_FILES= yes

4
math/octave/PLIST
View File

@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.24 2012/07/05 19:18:29 asau Exp $
@comment $NetBSD: PLIST,v 1.25 2015/04/23 06:49:40 dbj Exp $
bin/mkoctfile
bin/mkoctfile-${PKGVERSION}
bin/octave
@@ -765,7 +765,7 @@ include/${PKGNAME}/octave/zfstream.h
info/OctaveFAQ.info
info/liboctave.info
info/octave.info
lib/charset.alias
@comment belongs to libiconv: lib/charset.alias
lib/octave/${PKGVERSION}/__contourc__.a
lib/octave/${PKGVERSION}/__delaunayn__.a
lib/octave/${PKGVERSION}/__dispatch__.a

9
math/octave/distinfo
View File

@@ -1,9 +1,10 @@
$NetBSD: distinfo,v 1.41 2014/06/05 18:33:07 joerg Exp $
$NetBSD: distinfo,v 1.42 2015/04/23 06:50:41 dbj Exp $
SHA1 (octave-3.6.4.tar.bz2) = 3cc9366b6dbbd336eaf90fe70ad16e63705d82c4
RMD160 (octave-3.6.4.tar.bz2) = b0356f0c5d9366b8129d72ac58bbde837fee1a95
Size (octave-3.6.4.tar.bz2) = 15627315 bytes
SHA1 (patch-configure) = 627b8868d2cdd3c3a44e1485c8e7c47f481ca63e
SHA1 (patch-configure) = 5525211ee777d0c3afd55ba3f1c4d24d23b0bf4b
SHA1 (patch-configure.ac) = 1ccb10f67fd18646ab8b6c740dffa7ca5fe33191
SHA1 (patch-doc_interpreter_plot.txi) = b205f704ce625694a25ab57f4fad4460d1fbc0e9
SHA1 (patch-doc_liboctave_liboctave.texi) = c53484c70adea766ba1378a1f118942c924a88a5
SHA1 (patch-fflush-fpos_t.c) = 24ed7f95f8431b59bc5ee0dfb0e6624b8029f512
@@ -18,6 +19,7 @@ SHA1 (patch-scripts_miscellaneous_getappdata.m) = 55f9c9d5f30c85b3e8b5af82a271f1
SHA1 (patch-scripts_miscellaneous_license.m) = 79f0f590df09a1659aea7b157ed4735ec1be55c4
SHA1 (patch-scripts_miscellaneous_ver.m) = 62a23545f808bdd5895ffbb107ed7ca58f157f98
SHA1 (patch-scripts_pkg_pkg.m) = e6fa838e3910d52164d7cb3ca084c748cd68abb9
SHA1 (patch-scripts_plot_____gnuplot__drawnow____.m) = 6e93e3dd3e12daf2f6f2c6b06cb6d32e888bd3c5
SHA1 (patch-scripts_plot_daspect.m) = 34281cae27ce447feb5ee9f1dc0d7a29e0c621a4
SHA1 (patch-scripts_plot_legend.m) = 3932ce6e6d19c89e852be35809502afa05a6ac4c
SHA1 (patch-scripts_plot_pbaspect.m) = 193f186be2c3e3ffc170cb0ed84900e14ab4e81b
@@ -26,5 +28,8 @@ SHA1 (patch-scripts_polynomial_polyval.m) = d6655d2b9d2755788a02720c2a28ecf2e11a
SHA1 (patch-scripts_set_union.m) = ff976eaa4aa76d19ad73144192aee81c8e60d8bc
SHA1 (patch-scripts_signal_freqz.m) = cc9ba19c5b1b60af64f7c7ec0906ec7eedcea8d4
SHA1 (patch-src_DLD-FUNCTIONS_rand.cc) = 4992844f8ed53963e03e05adab2446397c2f4f02
SHA1 (patch-src_Makefile.am) = 940da74e979e0b4b69b786b8ce8d246ced38c8a0
SHA1 (patch-src_Makefile.in) = 65fd14523446a6c8310f123b786108a51811d057
SHA1 (patch-src_dirfns.cc) = fad1c09d28e6b93a7d9c5de69b5b218b72d5c7c5
SHA1 (patch-src_display.cc) = 486322373656065c3f8d0e95fa1684a6c08028ed
SHA1 (patch-src_oct-conf.h.in) = d3fa5166db289fbd9eba355911341e891fb6d822

25
math/octave/patches/patch-configure
View File

@@ -1,8 +1,16 @@
$NetBSD: patch-configure,v 1.1 2013/10/27 20:35:16 joerg Exp $
$NetBSD: patch-configure,v 1.2 2015/04/23 06:50:41 dbj Exp $
--- configure.orig 2013-10-27 16:08:37.000000000 +0000
--- configure.orig 2013-02-21 20:21:49.000000000 +0000
+++ configure
@@ -33819,7 +33819,12 @@ else
@@ -663,6 +663,7 @@ GPERF
DEFAULT_PAGER
GNUPLOT
DESKTOP_FILE_INSTALL
+INSTALL_LIB
YFLAGS
YACC
LFLAGS
@@ -33819,7 +33820,12 @@ else
fi
done
;;
@@ -16,3 +24,14 @@ $NetBSD: patch-configure,v 1.1 2013/10/27 20:35:16 joerg Exp $
ac_exists=false
for ac_i in $ac_cv_f77_libs; do
if test x"$ac_arg" = x"$ac_i"; then
@@ -60080,7 +60086,9 @@ fi
-INSTALL_SCRIPT='${INSTALL}'
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_LIB" && INSTALL_LIB='${INSTALL_SCRIPT}'
# Extract the first word of "desktop-file-install", so it can be a program name with args.

16
math/octave/patches/patch-configure.ac Normal file
View File

@@ -0,0 +1,16 @@
$NetBSD: patch-configure.ac,v 1.1 2015/04/23 06:50:41 dbj Exp $
--- configure.ac.orig 2013-02-21 20:19:23.000000000 +0000
+++ configure.ac
@@ -1927,8 +1927,10 @@ OCTAVE_PROG_BISON
AC_PROG_LN_S
AC_PROG_INSTALL
-INSTALL_SCRIPT='${INSTALL}'
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
AC_SUBST(INSTALL_SCRIPT)
+test -z "$INSTALL_LIB" && INSTALL_LIB='${INSTALL_SCRIPT}'
+AC_SUBST(INSTALL_LIB)
OCTAVE_PROG_DESKTOP_FILE_INSTALL

16
math/octave/patches/patch-scripts_plot_____gnuplot__drawnow____.m Normal file
View File

@@ -0,0 +1,16 @@
$NetBSD: patch-scripts_plot_____gnuplot__drawnow____.m,v 1.1 2015/04/23 06:48:53 dbj Exp $
We don't currently install libaquaterm on pkgsrc, so making the gnuplot
"aqua" term the default on the mac is unlikely to work.
--- scripts/plot/__gnuplot_drawnow__.m.orig 2013-02-21 20:19:24.000000000 +0000
+++ scripts/plot/__gnuplot_drawnow__.m
@@ -328,7 +328,7 @@ function term = gnuplot_default_term ()
term = getenv ("GNUTERM");
## If not specified, guess the terminal type.
if (isempty (term))
- if (ismac ())
+ if (0 && ismac ()) ## disabled in pkgsrc because libaquaterm is not installed
term = "aqua";
elseif (! isunix ())
term = "windows";

13
math/octave/patches/patch-src_Makefile.am Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-src_Makefile.am,v 1.1 2015/04/23 06:50:41 dbj Exp $
--- src/Makefile.am.orig 2013-02-21 20:19:24.000000000 +0000
+++ src/Makefile.am
@@ -739,7 +739,7 @@ install-oct:
f=`echo $$ltlib | $(SED) 's,.*/,,'`; \
dl=`$(SED) -n -e "s/dlname='\([^']*\)'/\1/p" < $$f`; \
if [ -n "$$dl" ]; then \
- $(INSTALL_PROGRAM) $$dl $(DESTDIR)$(octfiledir)/`echo $$f | $(SED) 's,^lib,,; s,\.la$$,.oct,'`; \
+ $(INSTALL_LIB) $$dl $(DESTDIR)$(octfiledir)/`echo $$f | $(SED) 's,^lib,,; s,\.la$$,.oct,'`; \
else \
echo "error: dlname is empty in $$ltlib!"; \
exit 1; \

21
math/octave/patches/patch-src_Makefile.in Normal file
View File

@@ -0,0 +1,21 @@
$NetBSD: patch-src_Makefile.in,v 1.1 2015/04/23 06:50:41 dbj Exp $
--- src/Makefile.in.orig 2013-02-21 20:21:48.000000000 +0000
+++ src/Makefile.in
@@ -2572,6 +2572,7 @@ INCLUDE_NEXT = @INCLUDE_NEXT@
INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
+INSTALL_LIB = @INSTALL_LIB@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -9236,7 +9237,7 @@ remove-version-links:
@AMCOND_ENABLE_DYNAMIC_LINKING_TRUE@ f=`echo $$ltlib | $(SED) 's,.*/,,'`; \
@AMCOND_ENABLE_DYNAMIC_LINKING_TRUE@ dl=`$(SED) -n -e "s/dlname='\([^']*\)'/\1/p" < $$f`; \
@AMCOND_ENABLE_DYNAMIC_LINKING_TRUE@ if [ -n "$$dl" ]; then \
-@AMCOND_ENABLE_DYNAMIC_LINKING_TRUE@ $(INSTALL_PROGRAM) $$dl $(DESTDIR)$(octfiledir)/`echo $$f | $(SED) 's,^lib,,; s,\.la$$,.oct,'`; \
+@AMCOND_ENABLE_DYNAMIC_LINKING_TRUE@ $(INSTALL_LIB) $$dl $(DESTDIR)$(octfiledir)/`echo $$f | $(SED) 's,^lib,,; s,\.la$$,.oct,'`; \
@AMCOND_ENABLE_DYNAMIC_LINKING_TRUE@ else \
@AMCOND_ENABLE_DYNAMIC_LINKING_TRUE@ echo "error: dlname is empty in $$ltlib!"; \
@AMCOND_ENABLE_DYNAMIC_LINKING_TRUE@ exit 1; \

25
math/octave/patches/patch-src_display.cc Normal file
View File

@@ -0,0 +1,25 @@
$NetBSD: patch-src_display.cc,v 1.1 2015/04/23 06:47:56 dbj Exp $
CGDisplayBitsPerPixel is only good on osx 10.5 or earlier.
CGDisplayModeCopyPixelEncoding should work on 10.6 and later.
--- src/display.cc.orig 2013-02-21 20:19:24.000000000 +0000
+++ src/display.cc
@@ -72,7 +72,16 @@ display_info::init (bool query)
if (display)
{
- dp = CGDisplayBitsPerPixel (display);
+ CGDisplayModeRef mode = CGDisplayCopyDisplayMode (display);
+ CFStringRef pixelEncoding = CGDisplayModeCopyPixelEncoding(mode);
+ CFRelease(mode);
+ if (CFStringCompare (pixelEncoding, CFSTR (IO32BitDirectPixels), 0) == 0)
+ dp = 32;
+ else if (CFStringCompare (pixelEncoding, CFSTR (IO16BitDirectPixels), 0) == 0)
+ dp = 16;
+ else
+ dp = 8; // Unknown pixel encoding (probably not really depth 8)
+ CFRelease(pixelEncoding);
ht = CGDisplayPixelsHigh (display);
wd = CGDisplayPixelsWide (display);