svn commit: r515342 - in head: . math math/octave-forge math/octave-forge-fits math/octave-forge-fits/files
Stephen Montgomery-Smith
stephen at FreeBSD.org
Thu Oct 24 14:44:50 UTC 2019
Author: stephen
Date: Thu Oct 24 14:44:48 2019
New Revision: 515342
URL: https://svnweb.freebsd.org/changeset/ports/515342
Log:
- Resurrect math/octave-forge-fits. Add patches so it builds. Bump portrevision.
- Default option FITS to on in math/octave-forge. Bump portrevision.
Added:
head/math/octave-forge-fits/
- copied from r511179, head/math/octave-forge-fits/
head/math/octave-forge-fits/files/
head/math/octave-forge-fits/files/patch-read__fits__image.cc (contents, props changed)
head/math/octave-forge-fits/files/patch-save__fits__image.cc (contents, props changed)
head/math/octave-forge-fits/files/patch-save__fits__image__multi__ext.cc (contents, props changed)
Modified:
head/MOVED
head/math/Makefile
head/math/octave-forge-fits/Makefile
head/math/octave-forge/Makefile
Modified: head/MOVED
==============================================================================
--- head/MOVED Thu Oct 24 14:30:30 2019 (r515341)
+++ head/MOVED Thu Oct 24 14:44:48 2019 (r515342)
@@ -12921,7 +12921,6 @@ irc/irssi-otr||2019-09-05|Has expired: Broken for more
mail/p5-Mail-ClamAV||2019-09-05|Has expired: Broken for more than 6 months
mail/qmail-ldap||2019-09-05|Has expired: Broken for more than 6 months
math/fityk||2019-09-05|Has expired: Broken for more than 6 months
-math/octave-forge-fits||2019-09-05|Has expired: Broken for more than 6 months
math/octave-forge-linear-algebra||2019-09-05|Has expired: Broken for more than 6 months
math/octave-forge-mechanics||2019-09-05|Has expired: Broken for more than 6 months
math/octave-forge-parallel||2019-09-05|Has expired: Broken for more than 6 months
Modified: head/math/Makefile
==============================================================================
--- head/math/Makefile Thu Oct 24 14:30:30 2019 (r515341)
+++ head/math/Makefile Thu Oct 24 14:44:48 2019 (r515342)
@@ -410,6 +410,7 @@
SUBDIR += octave-forge-econometrics
SUBDIR += octave-forge-fenv
SUBDIR += octave-forge-financial
+ SUBDIR += octave-forge-fits
SUBDIR += octave-forge-fpl
SUBDIR += octave-forge-fuzzy-logic-toolkit
SUBDIR += octave-forge-ga
Modified: head/math/octave-forge-fits/Makefile
==============================================================================
--- head/math/octave-forge-fits/Makefile Thu Sep 5 11:27:14 2019 (r511179)
+++ head/math/octave-forge-fits/Makefile Thu Oct 24 14:44:48 2019 (r515342)
@@ -3,7 +3,7 @@
PORTNAME= octave-forge-fits
PORTVERSION= 1.0.7
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= math
MAINTAINER= stephen at FreeBSD.org
@@ -11,10 +11,6 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
LICENSE= GPLv3
LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
-
-BROKEN= does not build with octave>=5.1.0
-DEPRECATED= Broken for more than 6 months
-EXPIRATION_DATE= 2019-09-04
# OCTSRC is the name of the directory of the package.
# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
Added: head/math/octave-forge-fits/files/patch-read__fits__image.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/math/octave-forge-fits/files/patch-read__fits__image.cc Thu Oct 24 14:44:48 2019 (r515342)
@@ -0,0 +1,11 @@
+--- read_fits_image.cc.orig 2015-06-11 11:19:38 UTC
++++ read_fits_image.cc
+@@ -194,7 +194,7 @@ static bool any_bad_argument( const octave_value_list&
+ return true;
+ }
+ double val = args(1).double_value();
+- if( (D_NINT( val ) != val) || (val < 0) )
++ if( (round( val ) != val) || (val < 0) )
+ {
+ error( "read_fits_image: second argument must be a non-negative scalar integer value" );
+ return true;
Added: head/math/octave-forge-fits/files/patch-save__fits__image.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/math/octave-forge-fits/files/patch-save__fits__image.cc Thu Oct 24 14:44:48 2019 (r515342)
@@ -0,0 +1,11 @@
+--- save_fits_image.cc.orig 2015-06-11 11:19:38 UTC
++++ save_fits_image.cc
+@@ -81,7 +81,7 @@ DEFUN_DLD( save_fits_image, args, nargout,
+ else if( args(2).is_scalar_type() )
+ {
+ double val = args(2).double_value();
+- if( (D_NINT( val ) == val) )
++ if( (round( val ) == val) )
+ {
+ if( BYTE_IMG == val )
+ bitperpixel = BYTE_IMG;
Added: head/math/octave-forge-fits/files/patch-save__fits__image__multi__ext.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/math/octave-forge-fits/files/patch-save__fits__image__multi__ext.cc Thu Oct 24 14:44:48 2019 (r515342)
@@ -0,0 +1,11 @@
+--- save_fits_image_multi_ext.cc.orig 2015-06-11 11:19:38 UTC
++++ save_fits_image_multi_ext.cc
+@@ -78,7 +78,7 @@ DEFUN_DLD( save_fits_image_multi_ext, args, nargout,
+ else if( args(2).is_scalar_type() )
+ {
+ double val = args(2).double_value();
+- if( (D_NINT( val ) == val) )
++ if( (round( val ) == val) )
+ {
+ if( BYTE_IMG == val )
+ bitperpixel = BYTE_IMG;
Modified: head/math/octave-forge/Makefile
==============================================================================
--- head/math/octave-forge/Makefile Thu Oct 24 14:30:30 2019 (r515341)
+++ head/math/octave-forge/Makefile Thu Oct 24 14:44:48 2019 (r515342)
@@ -3,7 +3,7 @@
PORTNAME= octave-forge
PORTVERSION= 20180409
-PORTREVISION= 21
+PORTREVISION= 22
CATEGORIES= math
MAINTAINER= stephen at FreeBSD.org
@@ -28,7 +28,7 @@ OPTIONS_DEFINE= ACTUARIAL BENCHMARK BIM BIOINFO BSLTL
STRUCT SYMBAND SYMBOLIC TCL_OCTAVE TISEAN TSA VIDEO \
ZENITY ZEROMQ
-OPTIONS_DEFAULT= ${OPTIONS_DEFINE:NDATA_SMOOTHING:NFITS:NLINEAR_ALGEBRA:NMECHANICS:NPARALLEL:NSTRINGS:NTISEAN:NVIDEO}
+OPTIONS_DEFAULT= ${OPTIONS_DEFINE:NDATA_SMOOTHING:NLINEAR_ALGEBRA:NMECHANICS:NPARALLEL:NSTRINGS:NTISEAN:NVIDEO}
TARBALLS_DIR= ${LOCALBASE}/share/octave/tarballs
More information about the svn-ports-all
mailing list