mirror of
https://git.freebsd.org/ports.git
synced 2025-06-04 20:36:30 -04:00
upgrade to 0.40
This commit is contained in:
parent
8adde7d147
commit
ae8958eaed
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=73187
12 changed files with 18 additions and 165 deletions
|
@ -7,10 +7,9 @@
|
|||
#
|
||||
|
||||
PORTNAME= flounder
|
||||
PORTVERSION= 0.32a
|
||||
PORTVERSION= 0.40
|
||||
CATEGORIES= science
|
||||
MASTER_SITES= http://www.enel.ucalgary.ca/~vigmond/flounder/
|
||||
DISTNAME= ${PORTNAME}
|
||||
EXTRACT_SUFX= .tgz
|
||||
|
||||
MAINTAINER= ports@FreeBSD.org
|
||||
|
|
|
@ -1 +1 @@
|
|||
MD5 (flounder.tgz) = 0c07ff0a044c7611eb6723c38c660ee6
|
||||
MD5 (flounder-0.40.tgz) = 967863abdc9e8d2925a7886368ff60d4
|
||||
|
|
|
@ -1,13 +1,11 @@
|
|||
--- src/Colourscale.cc.orig Tue Oct 15 00:12:17 2002
|
||||
+++ src/Colourscale.cc Tue Oct 15 00:15:30 2002
|
||||
@@ -18,7 +18,9 @@
|
||||
--- src/Colourscale.cc.orig Thu Jan 16 02:38:50 2003
|
||||
+++ src/Colourscale.cc Thu Jan 16 02:39:10 2003
|
||||
@@ -18,6 +18,8 @@
|
||||
*/
|
||||
#include "Colourscale.h"
|
||||
|
||||
-Colourscale :: Colourscale( int ts=64, CScale_t tcs=CS_BL_RAINBOW )
|
||||
+using namespace std;
|
||||
+
|
||||
+Colourscale :: Colourscale( int ts, CScale_t tcs )
|
||||
Colourscale :: Colourscale( int ts, CScale_t tcs )
|
||||
{
|
||||
n = 0;
|
||||
mindat = 0;
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
--- src/GlAreaUI.cc.orig Thu Mar 28 04:28:54 2002
|
||||
+++ src/GlAreaUI.cc Tue Oct 15 03:56:58 2002
|
||||
--- src/GlAreaUI.cc.orig Thu Jan 16 02:49:11 2003
|
||||
+++ src/GlAreaUI.cc Thu Jan 16 02:50:08 2003
|
||||
@@ -19,6 +19,7 @@
|
||||
#include "../config.h"
|
||||
#include "flguppy.h"
|
||||
|
@ -8,34 +8,12 @@
|
|||
#ifdef HAVE_VALUES_H
|
||||
#include <values.h>
|
||||
#endif
|
||||
@@ -30,9 +31,11 @@
|
||||
#include <avifile/videoencoder.h>
|
||||
#include <avifile/avifile.h>
|
||||
#include <avifile/aviplay.h>
|
||||
-#include <avifile/aviutil.h>
|
||||
+#include <avifile/fourcc.h>
|
||||
@@ -34,6 +35,8 @@
|
||||
#include <avifile/utils.h>
|
||||
#include <avifile/fourcc.h>
|
||||
#endif
|
||||
|
||||
+using namespace std;
|
||||
+
|
||||
+using namespace std;
|
||||
|
||||
Fl_Font fontset[] = {
|
||||
FL_HELVETICA, FL_HELVETICA_BOLD,
|
||||
FL_HELVETICA_ITALIC, FL_HELVETICA_BOLD_ITALIC,
|
||||
@@ -164,7 +167,7 @@
|
||||
}
|
||||
|
||||
//update the settings to reflect the current model window
|
||||
-void GlAreaUI :: setcurrent( GLView *a, bool force=false )
|
||||
+void GlAreaUI :: setcurrent( GLView *a, bool force )
|
||||
{
|
||||
if( a == curr_glwin && force==false ) return;
|
||||
|
||||
@@ -435,7 +438,7 @@
|
||||
inline int square( int a ){return a*a; }
|
||||
|
||||
// make gif images
|
||||
-void GlAreaUI :: movie( bool single=false )
|
||||
+void GlAreaUI :: movie( bool single )
|
||||
{
|
||||
char *fn;
|
||||
if( single == true )
|
||||
|
|
|
@ -1,29 +0,0 @@
|
|||
--- src/Glarea.cc.orig Tue Oct 15 01:18:55 2002
|
||||
+++ src/Glarea.cc Tue Oct 15 01:22:10 2002
|
||||
@@ -1064,7 +1064,7 @@
|
||||
|
||||
|
||||
// Constructor for Glarea class
|
||||
-Glarea::Glarea (int X, int Y, int W, int H, const char *L=0):
|
||||
+Glarea::Glarea (int X, int Y, int W, int H, const char *L):
|
||||
Fl_Gl_Window(X, Y, W, H, L)
|
||||
{
|
||||
maxdim = 0;
|
||||
@@ -1695,7 +1695,7 @@
|
||||
}
|
||||
|
||||
// update the tableau user interface widget
|
||||
-void Glarea :: tableau( TableauUI *tb, bool update=false )
|
||||
+void Glarea :: tableau( TableauUI *tb, bool update )
|
||||
{
|
||||
if( tb->window->visible() == false ) return;
|
||||
|
||||
@@ -1917,7 +1917,7 @@
|
||||
// set update to return the values into the vars, otherwise
|
||||
// set the variables from the supplied parameters
|
||||
void Glarea :: contours( bool& con, bool& dat, int& nc, double& st, double& inc,
|
||||
- bool update=false )
|
||||
+ bool update )
|
||||
{
|
||||
if( update == false ) {
|
||||
showcontour = con;
|
|
@ -1,11 +0,0 @@
|
|||
--- src/Myslider.cc.orig Tue Oct 15 02:08:12 2002
|
||||
+++ src/Myslider.cc Tue Oct 15 02:08:22 2002
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
const int w_valout = 40;
|
||||
|
||||
-Myslider :: Myslider( int X, int Y, int W, int H, char *L=0):
|
||||
+Myslider :: Myslider( int X, int Y, int W, int H, char *L):
|
||||
Fl_Group(X,Y,W,H,L),
|
||||
valout(X,Y,w_valout,H),
|
||||
slider( X+w_valout, Y, W-w_valout, H )
|
|
@ -1,11 +0,0 @@
|
|||
--- src/PlotWin.cc.orig Tue Oct 15 02:09:34 2002
|
||||
+++ src/PlotWin.cc Tue Oct 15 02:10:22 2002
|
||||
@@ -21,7 +21,7 @@
|
||||
#include <FL/Fl_Widget.H>
|
||||
|
||||
// set the data to plot
|
||||
-void PlotWin :: set_data( int n, double *d, int t=-1, double *xd=NULL )
|
||||
+void PlotWin :: set_data( int n, double *d, int t, double *xd )
|
||||
{
|
||||
if( n != datasize ) {
|
||||
delete[] xv;
|
|
@ -1,11 +0,0 @@
|
|||
--- src/RenderEPS.cc.orig Tue Oct 15 02:11:32 2002
|
||||
+++ src/RenderEPS.cc Tue Oct 15 02:11:44 2002
|
||||
@@ -48,7 +48,7 @@
|
||||
|
||||
|
||||
// constructor
|
||||
-RenderEPS :: RenderEPS( char *fn, int sz=FB_BUFSIZE )
|
||||
+RenderEPS :: RenderEPS( char *fn, int sz )
|
||||
{
|
||||
bufsize = sz;
|
||||
feedbackBuffer = (GLfloat *)malloc( bufsize*sizeof(GLfloat) );
|
|
@ -1,11 +0,0 @@
|
|||
--- src/SubsampUI.cc.orig Tue Oct 15 02:14:13 2002
|
||||
+++ src/SubsampUI.cc Tue Oct 15 02:14:19 2002
|
||||
@@ -28,7 +28,7 @@
|
||||
((Strideslide *)p)->update();
|
||||
}
|
||||
|
||||
-Strideslide :: Strideslide( int X, int Y, int W, int H, char *L=0):
|
||||
+Strideslide :: Strideslide( int X, int Y, int W, int H, char *L):
|
||||
Fl_Group(X,Y,W,H,L),
|
||||
slider( X, Y, W-w_valout-w_sep-w_samplabel, H ),
|
||||
valout(X+W-w_valout-w_samplabel,Y,w_valout, H ),
|
|
@ -1,20 +0,0 @@
|
|||
--- src/flguppy.cc.orig Tue Oct 15 01:04:33 2002
|
||||
+++ src/flguppy.cc Tue Oct 15 01:05:24 2002
|
||||
@@ -20,6 +20,8 @@
|
||||
|
||||
#include "flguppy.h"
|
||||
|
||||
+using namespace std;
|
||||
+
|
||||
inline void TableauUI::cb_window_i(Fl_Window*, void*) {
|
||||
closebutton->do_callback();
|
||||
}
|
||||
@@ -322,7 +324,7 @@
|
||||
}
|
||||
class GlAreaUI;
|
||||
|
||||
-GLView::GLView(GlAreaUI *g, char *fn, void *d=NULL) {
|
||||
+GLView::GLView(GlAreaUI *g, char *fn, void *d) {
|
||||
Fl_Double_Window* w;
|
||||
{ Fl_Double_Window* o = window = new Fl_Double_Window(365, 355);
|
||||
w = o;
|
|
@ -1,12 +0,0 @@
|
|||
--- utils/igbhead.cc.orig Tue Oct 15 02:20:12 2002
|
||||
+++ utils/igbhead.cc Tue Oct 15 02:20:30 2002
|
||||
@@ -11,6 +11,9 @@
|
||||
#include<string>
|
||||
#include "IGBheader.h"
|
||||
#include "cmdline.h"
|
||||
+#include <iostream>
|
||||
+
|
||||
+using namespace std;
|
||||
|
||||
void output_header( IGBheader* );
|
||||
|
|
@ -1,28 +1,11 @@
|
|||
--- src/isosurf.cc.orig Tue Oct 15 02:05:22 2002
|
||||
+++ src/isosurf.cc Tue Oct 15 02:07:26 2002
|
||||
@@ -138,7 +138,7 @@
|
||||
* N.B. the array is subscripted as data[z][y][x]
|
||||
*/
|
||||
void
|
||||
-Isosurf::alloc_3d_data_array(int nx, int ny, int nz, float *dp = NULL)
|
||||
+Isosurf::alloc_3d_data_array(int nx, int ny, int nz, float *dp)
|
||||
{
|
||||
register int i, j;
|
||||
|
||||
@@ -550,7 +550,7 @@
|
||||
int dfprintf(int fd, int i);
|
||||
/**************************************************************/
|
||||
|
||||
-int perr(char *s, int a1=0, int a2=0, int a3=0, int a4=0, int a5=0, int a6=0)
|
||||
+int perr(char *s, int a1, int a2, int a3, int a4, int a5, int a6)
|
||||
{
|
||||
fprintf(stderr, "%s: ", Progname);
|
||||
fprintf(stderr, s, a1, a2, a3, a4, a5, a6);
|
||||
@@ -2241,7 +2241,6 @@
|
||||
--- src/isosurf.cc.orig Thu Jan 16 03:24:03 2003
|
||||
+++ src/isosurf.cc Thu Jan 16 03:24:16 2003
|
||||
@@ -2241,8 +2241,6 @@
|
||||
* the University of Illinois at Urbana-Champaign.
|
||||
*/
|
||||
|
||||
-#include <malloc.h>
|
||||
|
||||
-
|
||||
/********************************************************/
|
||||
float *
|
||||
alloc_list(unsigned int size)
|
||||
|
|
Loading…
Add table
Reference in a new issue