- Resurrect math/octave-forge-fits. Add patches so it builds. Bump portrevision.

- Default option FITS to on in math/octave-forge.  Bump portrevision.

8 files changed, 80 insertions, 2 deletions

diff --git a/math/Makefile b/math/Makefile
index ff9bc4f6e018..4bccacf800e7 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -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
diff --git a/math/octave-forge-fits/Makefile b/math/octave-forge-fits/Makefile
new file mode 100644
index 000000000000..629ec27e06ea
--- /dev/null
+++ b/math/octave-forge-fits/Makefile
@@ -0,0 +1,29 @@
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
+# $FreeBSD$
+
+PORTNAME=	octave-forge-fits
+PORTVERSION=	1.0.7
+PORTREVISION=	12
+CATEGORIES=	math
+
+MAINTAINER=	stephen@FreeBSD.org
+COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
+
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKDIR}/${OCTSRC}/COPYING
+
+# OCTSRC is the name of the directory of the package.
+# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
+OCTSRC=		${DISTNAME}
+
+WRKSRC=	${WRKDIR}/${OCTSRC}/src
+
+LIB_DEPENDS+=	libcfitsio.so:astro/cfitsio
+
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+
+post-build:
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
+	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
+
+.include <bsd.port.mk>
diff --git a/math/octave-forge-fits/distinfo b/math/octave-forge-fits/distinfo
new file mode 100644
index 000000000000..7b0970a26bfd
--- /dev/null
+++ b/math/octave-forge-fits/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1498101621
+SHA256 (octave-forge/fits-1.0.7.tar.gz) = 95124173f852498cb71acc97712af104027669f60c4f972bbcd8c59b2b2f4b49
+SIZE (octave-forge/fits-1.0.7.tar.gz) = 16759
diff --git a/math/octave-forge-fits/files/patch-read__fits__image.cc b/math/octave-forge-fits/files/patch-read__fits__image.cc
new file mode 100644
index 000000000000..c71dceed2f11
--- /dev/null
+++ b/math/octave-forge-fits/files/patch-read__fits__image.cc
@@ -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;
diff --git a/math/octave-forge-fits/files/patch-save__fits__image.cc b/math/octave-forge-fits/files/patch-save__fits__image.cc
new file mode 100644
index 000000000000..ce4773303ecc
--- /dev/null
+++ b/math/octave-forge-fits/files/patch-save__fits__image.cc
@@ -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;
diff --git a/math/octave-forge-fits/files/patch-save__fits__image__multi__ext.cc b/math/octave-forge-fits/files/patch-save__fits__image__multi__ext.cc
new file mode 100644
index 000000000000..fe43b29b3f81
--- /dev/null
+++ b/math/octave-forge-fits/files/patch-save__fits__image__multi__ext.cc
@@ -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;
diff --git a/math/octave-forge-fits/pkg-descr b/math/octave-forge-fits/pkg-descr
new file mode 100644
index 000000000000..df45281bac41
--- /dev/null
+++ b/math/octave-forge-fits/pkg-descr
@@ -0,0 +1,12 @@
+The octave-forge package is the result of The GNU Octave Repositry project,
+which is intended to be a central location for custom scripts, functions and
+extensions for GNU Octave. contains the source for all the functions plus
+build and install scripts.
+
+This is fits.
+
+The Octave-FITS package provides functions for reading, and writing FITS
+(Flexible Image Transport System) files. The package supports uses the
+libcfitsio library.
+
+WWW: http://octave.sourceforge.net/
diff --git a/math/octave-forge/Makefile b/math/octave-forge/Makefile
index 44f1bf0f441b..efc6ce771c28 100644
--- a/math/octave-forge/Makefile
+++ b/math/octave-forge/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge
 PORTVERSION=	20180409
-PORTREVISION=	21
+PORTREVISION=	22
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
@@ -28,7 +28,7 @@ OPTIONS_DEFINE=	ACTUARIAL BENCHMARK BIM BIOINFO BSLTL CGI \
 		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