Attachment #130099 for bug #174167




# Created by: ijliao
# Ports collection Makefile for:	flounder
# Date created:			Oct 14, 2002
# Whom:				ijliao
#
# $FreeBSD: head/science/flounder/Makefile 302037 2012-08-04 22:52:02Z kwm $
#

PORTNAME=	flounder
PORTVERSION=	0.40
PORTREVISION=	15
CATEGORIES=	science
MASTER_SITES=	http://www.enel.ucalgary.ca/People/vigmond/flounder/
EXTRACT_SUFX=	.tgz

MAINTAINER=	ports@FreeBSD.org
COMMENT=	A quick way to visualize regularly spaced 4D data

LIB_DEPENDS=	gif:${PORTSDIR}/graphics/giflib \
		png15:${PORTSDIR}/graphics/png \
		fltk:${PORTSDIR}/x11-toolkits/fltk

OPTIONS_DEFINE=	GNUPLOT GRACE
OPTIONS_DEFAULT=GNUPLOT GRACE
GRACE_DESC=	Plotting via GRACE

USE_GL=		glut
GNU_CONFIGURE=	yes
CPPFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lstdc++
USE_GMAKE=	yes
GNU_CONFIGURE=	yes
MAKE_JOBS_SAFE=	yes

CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}

PLIST_FILES=	bin/flounder bin/igbhead

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MGNUPLOT}
BUILD_DEPENDS+=	gnuplot:${PORTSDIR}/math/gnuplot
RUN_DEPENDS+=	gnuplot:${PORTSDIR}/math/gnuplot
CONFIGURE_ARGS+=	--enable-gnuplot
.endif

.if ${PORT_OPTIONS:MGRACE}
BUILD_DEPENDS+=	xmgrace:${PORTSDIR}/math/grace
RUN_DEPENDS+=	xmgrace:${PORTSDIR}/math/grace
CONFIGURE_ARGS+=	--enable-grace
.endif

post-patch:
	@${REINPLACE_CMD} -e \
		's|-lungif|-lgif|' ${WRKSRC}/configure
	@${REINPLACE_CMD} -e \
		's|cmdline.o.*|cmdline.o| ; \
		 /getopt.o/d ; \
		 /getopt1.o/d ; \
		 s|g++ |$$(CXX) | ; \
		 s|-g | |' ${WRKSRC}/utils/Makefile
	@${REINPLACE_CMD} -e \
		's|^main(|int main(|' ${WRKSRC}/utils/igbhead.cc

do-install:
	cd ${WRKSRC}/src && ${INSTALL_PROGRAM} flounder ${PREFIX}/bin
	cd ${WRKSRC}/utils && ${INSTALL_PROGRAM} igbhead ${PREFIX}/bin

.include <bsd.port.mk>

Lines 1-6 Link Here

(-)science/flounder/files/patch-Fl_Gnuplot.cc (-4 / +9 lines)
1	--- src/Fl_Gnuplot.cc.orig Tue Oct 15 03:59:41 2002	1	--- src/Fl_Gnuplot.cc.orig 2002-12-20 03:56:35.000000000 +0900
2	+++ src/Fl_Gnuplot.cc Tue Oct 15 04:02:05 2002	2	+++ src/Fl_Gnuplot.cc 2012-10-23 23:22:44.000000000 +0900
3	@@ -44,6 +44,7 @@	3	@@ -39,11 +39,11 @@
		4
		5	#include <stdlib.h>
		6	#include <stdio.h>
		7	-#include <fstream.h>
		8	#include <unistd.h>
4	#include <sys/types.h>	9	#include <sys/types.h>
5	#include <sys/stat.h>	10	#include <sys/stat.h>
6	#include <fcntl.h>	11	#include <fcntl.h>
Lines 8-14 Link Here
8		13
9	#include "FL/fl_draw.H"	14	#include "FL/fl_draw.H"
10	#include "FL/fl_ask.H"	15	#include "FL/fl_ask.H"
11	@@ -53,12 +54,14 @@	16	@@ -53,12 +53,14 @@
12		17
13	#define N_ENTRIES 8192	18	#define N_ENTRIES 8192
14		19

Line 0 Link Here

(-)science/flounder/files/patch-Glarea.cc (+11 lines)
	1	--- src/Glarea.cc.orig 2002-12-20 03:56:35.000000000 +0900
	2	+++ src/Glarea.cc 2012-12-12 23:16:47.000000000 +0900
	3	@@ -918,7 +918,7 @@
	4	igbname = fname + ".gz";
	5	if( (in=gzopen( igbname.c_str(), "r" )) == NULL ) {
	6	igbname = fname + ".igb.gz";
	7	- if( (in=fopen( igbname.c_str(), "rb" )) == NULL )
	8	+ if( (in=(gzFile)fopen( igbname.c_str(), "rb" )) == NULL )
	9	return 1;
	10	}
	11	}




--- src/IGBheader.cc.orig	Tue Oct 15 02:15:19 2002
+++ src/IGBheader.cc	Tue Oct 15 02:15:44 2002
@@ -17,8 +17,11 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 #include<stdlib.h>
+#include <iostream>
 #include "IGBheader.h"
+
+using namespace std;
 
+using namespace std;
+
 /* -------------- Bits de statut pour Header_Read et Header_Write ------ */
 
 #define     MOT_CLEF_INV    2
@@ -756,7 +759,7 @@
 	if (bool_comment) {
 		comment = v_comment;
 		while (*comment != NULL) {
-			n_car = gzprintf(file, "#%.80s\r\n", *comment++); 
+			n_car = gzprintf((gzFile)file, "#%.80s\r\n", *comment++); 
 			if (n_car==0) { 
 				if (!Header_Quiet) {
 					fprintf(stderr, "\nHeader_Write: Erreur a l'ecriture \n");
@@ -861,7 +864,7 @@
 			}
 
 			/* --- lit le caractere suivant --- */
-			in = gzgetc( file ) ;
+			in = gzgetc( (gzFile)file ) ;
 
 			/* --- (EOF dans l'entete) --> erreur --- */
 			if ( in == -1 ) {
@@ -1318,8 +1321,8 @@
 		}
 	}
 
-	if (gztell(file)!=1024) { 
-	    gzseek( file, 1024, SEEK_SET );
+	if (gztell((gzFile)file)!=1024) { 
+	    gzseek( (gzFile)file, 1024, SEEK_SET );
 		if (!Header_Quiet) {
 			fprintf(stderr,
 					"\nATTENTION: etiquette de grandeur non-standard \n");
@@ -1335,7 +1338,7 @@
 
 	if (bool_vect_z) {
 		v_vect_z = (float *)malloc(v_z*sizeof(float));
-		gzread(file, v_vect_z, sizeof(float)*v_z);
+		gzread((gzFile)file, v_vect_z, sizeof(float)*v_z);
 	}
 
 	return( statut ) ;

Lines 1-11 Link Here

(-)science/flounder/files/patch-RenderEPS.h (-9 / +8 lines)
1	--- src/RenderEPS.h.orig Tue Oct 15 00:35:11 2002	1	--- src/RenderEPS.h.orig 2002-12-19 13:37:24.000000000 +0900
2	+++ src/RenderEPS.h Tue Oct 15 00:35:26 2002	2	+++ src/RenderEPS.h 2012-10-23 23:23:41.000000000 +0900
3	@@ -23,6 +23,8 @@	3	@@ -20,6 +20,7 @@
		4	#include <math.h>
		5	#include <stdio.h>
		6	#include <stdlib.h>
		7	+#include <string.h>
4	#include <GL/gl.h>	8	#include <GL/gl.h>
5	#include <string>	9	#include <string>
6		10	using namespace std;
7	+using namespace std;
8	+
9	#define FB_BUFSIZE 1000000
10
11	class RenderEPS {

Lines 1-2 Link Here

(-)science/flounder/pkg-plist (-2 lines)
1	bin/flounder
2	bin/igbhead

Return to bug 174167

Lines 1-14 Link Here

(-)science/flounder/Makefile (-23 / +35 lines)
1	# ex:ts=8	1	# Created by: ijliao
2	# Ports collection Makefile for: flounder
3	# Date created: Oct 14, 2002
4	# Whom: ijliao
5	#
6	# $FreeBSD: head/science/flounder/Makefile 302037 2012-08-04 22:52:02Z kwm $	2	# $FreeBSD: head/science/flounder/Makefile 302037 2012-08-04 22:52:02Z kwm $
7	#
8		3
9	PORTNAME= flounder	4	PORTNAME= flounder
10	PORTVERSION= 0.40	5	PORTVERSION= 0.40
11	PORTREVISION= 14	6	PORTREVISION= 15
12	CATEGORIES= science	7	CATEGORIES= science
13	MASTER_SITES= http://www.enel.ucalgary.ca/People/vigmond/flounder/	8	MASTER_SITES= http://www.enel.ucalgary.ca/People/vigmond/flounder/
14	EXTRACT_SUFX= .tgz	9	EXTRACT_SUFX= .tgz
Lines 16-50 Link Here
16	MAINTAINER= ports@FreeBSD.org	11	MAINTAINER= ports@FreeBSD.org
17	COMMENT= A quick way to visualize regularly spaced 4D data	12	COMMENT= A quick way to visualize regularly spaced 4D data
18		13
19	LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk \	14	LIB_DEPENDS= gif:${PORTSDIR}/graphics/giflib \
20	gif:${PORTSDIR}/graphics/giflib \	15	png15:${PORTSDIR}/graphics/png \
21	png15:${PORTSDIR}/graphics/png	16	fltk:${PORTSDIR}/x11-toolkits/fltk
		17
		18	OPTIONS_DEFINE= GNUPLOT GRACE
		19	OPTIONS_DEFAULT=GNUPLOT GRACE
		20	GRACE_DESC= Plotting via GRACE
22		21
23	USE_GL= glut	22	USE_GL= glut
24	GNU_CONFIGURE= yes
25	CPPFLAGS+= -I${LOCALBASE}/include
26	LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lstdc++
27	USE_GMAKE= yes	23	USE_GMAKE= yes
		24	GNU_CONFIGURE= yes
		25	MAKE_JOBS_SAFE= yes
		26
		27	CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
		28	LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
		29
		30	PLIST_FILES= bin/flounder bin/igbhead
28		31
29	.if !defined(WITHOUT_PLOT)	32	.include <bsd.port.options.mk>
		33
		34	.if ${PORT_OPTIONS:MGNUPLOT}
30	BUILD_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot	35	BUILD_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot
31	RUN_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot	36	RUN_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot
32	CONFIGURE_ARGS+= --enable-gnuplot	37	CONFIGURE_ARGS+= --enable-gnuplot
33	.endif	38	.endif
34		39
35	.if !defined(WITHOUT_GRACE)	40	.if ${PORT_OPTIONS:MGRACE}
36	BUILD_DEPENDS+= xmgrace:${PORTSDIR}/math/grace	41	BUILD_DEPENDS+= xmgrace:${PORTSDIR}/math/grace
37	RUN_DEPENDS+= xmgrace:${PORTSDIR}/math/grace	42	RUN_DEPENDS+= xmgrace:${PORTSDIR}/math/grace
38	CONFIGURE_ARGS+= --enable-grace	43	CONFIGURE_ARGS+= --enable-grace
39	.endif	44	.endif
40		45
41	post-patch:	46	post-patch:
42	${REINPLACE_CMD} -e "s\|-lungif\|-lgif\|" ${WRKSRC}/configure	47	@${REINPLACE_CMD} -e \
43		48	's\|-lungif\|-lgif\|' ${WRKSRC}/configure
44	.include <bsd.port.pre.mk>	49	@${REINPLACE_CMD} -e \
45		50	's\|cmdline.o.*\|cmdline.o\| ; \
46	.if ${ARCH} == "alpha"	51	/getopt.o/d ; \
47	BROKEN= Does not compile on alpha	52	/getopt1.o/d ; \
48	.endif	53	s\|g++ \|$$(CXX) \| ; \
		54	s\|-g \| \|' ${WRKSRC}/utils/Makefile
		55	@${REINPLACE_CMD} -e \
		56	's\|^main(\|int main(\|' ${WRKSRC}/utils/igbhead.cc
		57
		58	do-install:
		59	cd ${WRKSRC}/src && ${INSTALL_PROGRAM} flounder ${PREFIX}/bin
		60	cd ${WRKSRC}/utils && ${INSTALL_PROGRAM} igbhead ${PREFIX}/bin
49		61
50	.include <bsd.port.post.mk>	62	.include <bsd.port.mk>

Lines 1-13 Link Here

(-)science/flounder/files/patch-IGBheader.cc (-3 / +42 lines)
1	--- src/IGBheader.cc.orig Tue Oct 15 02:15:19 2002	1	--- src/IGBheader.cc.orig Tue Oct 15 02:15:19 2002
2	+++ src/IGBheader.cc Tue Oct 15 02:15:44 2002	2	+++ src/IGBheader.cc Tue Oct 15 02:15:44 2002
3	@@ -17,7 +17,10 @@	3	@@ -17,8 +17,11 @@
4	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA	4	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
5	*/	5	*/
6	#include<stdlib.h>	6	#include<stdlib.h>
7	+#include <iostream>	7	+#include <iostream>
8	#include "IGBheader.h"	8	#include "IGBheader.h"
9	+
10	+using namespace std;
11		9
		10	+using namespace std;
		11	+
12	/* -------------- Bits de statut pour Header_Read et Header_Write ------ */	12	/* -------------- Bits de statut pour Header_Read et Header_Write ------ */
13		13
		14	#define MOT_CLEF_INV 2
		15	@@ -756,7 +759,7 @@
		16	if (bool_comment) {
		17	comment = v_comment;
		18	while (*comment != NULL) {
		19	- n_car = gzprintf(file, "#%.80s\r\n", *comment++);
		20	+ n_car = gzprintf((gzFile)file, "#%.80s\r\n", *comment++);
		21	if (n_car==0) {
		22	if (!Header_Quiet) {
		23	fprintf(stderr, "\nHeader_Write: Erreur a l'ecriture \n");
		24	@@ -861,7 +864,7 @@
		25	}
		26
		27	/* --- lit le caractere suivant --- */
		28	- in = gzgetc( file ) ;
		29	+ in = gzgetc( (gzFile)file ) ;
		30
		31	/* --- (EOF dans l'entete) --> erreur --- */
		32	if ( in == -1 ) {
		33	@@ -1318,8 +1321,8 @@
		34	}
		35	}
		36
		37	- if (gztell(file)!=1024) {
		38	- gzseek( file, 1024, SEEK_SET );
		39	+ if (gztell((gzFile)file)!=1024) {
		40	+ gzseek( (gzFile)file, 1024, SEEK_SET );
		41	if (!Header_Quiet) {
		42	fprintf(stderr,
		43	"\nATTENTION: etiquette de grandeur non-standard \n");
		44	@@ -1335,7 +1338,7 @@
		45
		46	if (bool_vect_z) {
		47	v_vect_z = (float )malloc(v_zsizeof(float));
		48	- gzread(file, v_vect_z, sizeof(float)*v_z);
		49	+ gzread((gzFile)file, v_vect_z, sizeof(float)*v_z);
		50	}
		51
		52	return( statut ) ;