Attachment #44711 for bug #69143

View | Details | Raw Unified | Return to bug 69143
Collapse All | Expand All





PORTNAME=	gnuplot371+
PORTVERSION=	1.2.0
PORTREVISION=	2
CATEGORIES=	math japanese graphics
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
		http://www.yama-ga.com/gnuplot/:patch \


.include <bsd.port.pre.mk>

.if ${ARCH} == "amd64"
BROKEN=		"Does not compile on amd64"
.endif

post-extract:
	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/gnuplot3.7.1+${PORTVERSION}.patch.tar.gz ${EXTRACT_AFTER_ARGS} -C ${WRKSRC}





--- gplt_x11.c.orig	Fri Jul 16 17:52:57 2004
+++ gplt_x11.c	Fri Jul 16 17:54:38 2004
@@ -169,6 +169,10 @@
 # define EINTR	E_ILLFNC
 #endif
 
+#if defined(__FreeBSD__) && defined(__i386__)
+# include <floatingpoint.h>
+#endif
+

 int argc;
 char *argv[];
 {
+#if defined(__FreeBSD__) && defined(__i386__)
+  /* allow divide by zero -- Inf */
+  fpsetmask(fpgetmask() & ~(FP_X_DZ | FP_X_INV));
+#endif

     }
     XCloseDisplay(dpy);
+
+#if defined(__FreeBSD__) && defined(__i386__)
+  fpresetsticky(FP_X_DZ | FP_X_INV);
+  fpsetmask(fpgetmask() | (FP_X_DZ | FP_X_INV));
+#endif

 
     FPRINTF((stderr, "exiting\n"));
 
--- plot.c.orig	Fri Jul 16 17:52:57 2004
+++ plot.c	Fri Jul 16 17:54:08 2004
@@ -73,6 +73,10 @@
 # endif
 #endif /* _Windows */
 
+#if defined(__FreeBSD__) && defined(__i386__)
+# include <floatingpoint.h>
+#endif
+

     _control87(MCW_EM, MCW_EM);
 #endif
 
+#if defined(__FreeBSD__) && defined(__i386__)
+  /* allow divide by zero -- Inf */
+  fpsetmask(fpgetmask() & ~(FP_X_DZ | FP_X_INV));
+#endif

 	RexxDeregisterSubcom("GNUPLOT", NULL);
+#endif
+
+#if defined(__FreeBSD__) && defined(__i386__)
+  fpresetsticky(FP_X_DZ | FP_X_INV);
+  fpsetmask(fpgetmask() | (FP_X_DZ | FP_X_INV));
 #endif

Return to bug 69143

Lines 7-13 Link Here

(-)Makefile (-5 / +1 lines)
7		7
8	PORTNAME= gnuplot371+	8	PORTNAME= gnuplot371+
9	PORTVERSION= 1.2.0	9	PORTVERSION= 1.2.0
10	PORTREVISION= 1	10	PORTREVISION= 2
11	CATEGORIES= math japanese graphics	11	CATEGORIES= math japanese graphics
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
13	http://www.yama-ga.com/gnuplot/:patch \	13	http://www.yama-ga.com/gnuplot/:patch \
Lines 54-63 Link Here
54		54
55	.include <bsd.port.pre.mk>	55	.include <bsd.port.pre.mk>
56		56
57	.if ${ARCH} == "amd64"
58	BROKEN= "Does not compile on amd64"
59	.endif
60
61	post-extract:	57	post-extract:
62	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/gnuplot3.7.1+${PORTVERSION}.patch.tar.gz ${EXTRACT_AFTER_ARGS} -C ${WRKSRC}	58	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/gnuplot3.7.1+${PORTVERSION}.patch.tar.gz ${EXTRACT_AFTER_ARGS} -C ${WRKSRC}
63		59

Lines 1-10 Link Here

(-)files/patch-za (-10 / +10 lines)
1	--- gplt_x11.c.orig Wed May 7 14:21:25 2003	1	--- gplt_x11.c.orig Fri Jul 16 17:52:57 2004
2	+++ gplt_x11.c Wed May 7 14:55:22 2003	2	+++ gplt_x11.c Fri Jul 16 17:54:38 2004
3	@@ -169,6 +169,10 @@	3	@@ -169,6 +169,10 @@
4	# define EINTR E_ILLFNC	4	# define EINTR E_ILLFNC
5	#endif	5	#endif
6		6
7	+#if defined(__FreeBSD__) && ( defined(__i386__) \|\| defined(__amd64__) )	7	+#if defined(__FreeBSD__) && defined(__i386__)
8	+# include <floatingpoint.h>	8	+# include <floatingpoint.h>
9	+#endif	9	+#endif
10	+	10	+
Lines 15-21 Link Here
15	int argc;	15	int argc;
16	char *argv[];	16	char *argv[];
17	{	17	{
18	+#if defined(__FreeBSD__) && ( defined(__i386__) \|\| defined(__amd64__) )	18	+#if defined(__FreeBSD__) && defined(__i386__)
19	+ /* allow divide by zero -- Inf */	19	+ /* allow divide by zero -- Inf */
20	+ fpsetmask(fpgetmask() & ~(FP_X_DZ \| FP_X_INV));	20	+ fpsetmask(fpgetmask() & ~(FP_X_DZ \| FP_X_INV));
21	+#endif	21	+#endif
Lines 27-33 Link Here
27	}	27	}
28	XCloseDisplay(dpy);	28	XCloseDisplay(dpy);
29	+	29	+
30	+#if defined(__FreeBSD__) && ( defined(__i386__) \|\| defined(__amd64__) )	30	+#if defined(__FreeBSD__) && defined(__i386__)
31	+ fpresetsticky(FP_X_DZ \| FP_X_INV);	31	+ fpresetsticky(FP_X_DZ \| FP_X_INV);
32	+ fpsetmask(fpgetmask() \| (FP_X_DZ \| FP_X_INV));	32	+ fpsetmask(fpgetmask() \| (FP_X_DZ \| FP_X_INV));
33	+#endif	33	+#endif
Lines 35-47 Link Here
35		35
36	FPRINTF((stderr, "exiting\n"));	36	FPRINTF((stderr, "exiting\n"));
37		37
38	--- plot.c.orig Wed May 7 14:21:25 2003	38	--- plot.c.orig Fri Jul 16 17:52:57 2004
39	+++ plot.c Wed May 7 14:45:09 2003	39	+++ plot.c Fri Jul 16 17:54:08 2004
40	@@ -73,6 +73,10 @@	40	@@ -73,6 +73,10 @@
41	# endif	41	# endif
42	#endif /* _Windows */	42	#endif /* _Windows */
43		43
44	+#if defined(__FreeBSD__) && ( defined(__i386__) \|\| defined(__amd64__) )	44	+#if defined(__FreeBSD__) && defined(__i386__)
45	+# include <floatingpoint.h>	45	+# include <floatingpoint.h>
46	+#endif	46	+#endif
47	+	47	+
Lines 52-58 Link Here
52	_control87(MCW_EM, MCW_EM);	52	_control87(MCW_EM, MCW_EM);
53	#endif	53	#endif
54		54
55	+#if defined(__FreeBSD__) && ( defined(__i386__) \|\| defined(__amd64__) )	55	+#if defined(__FreeBSD__) && defined(__i386__)
56	+ /* allow divide by zero -- Inf */	56	+ /* allow divide by zero -- Inf */
57	+ fpsetmask(fpgetmask() & ~(FP_X_DZ \| FP_X_INV));	57	+ fpsetmask(fpgetmask() & ~(FP_X_DZ \| FP_X_INV));
58	+#endif	58	+#endif
Lines 66-72 Link Here
66	RexxDeregisterSubcom("GNUPLOT", NULL);	66	RexxDeregisterSubcom("GNUPLOT", NULL);
67	+#endif	67	+#endif
68	+	68	+
69	+#if defined(__FreeBSD__) && ( defined(__i386__) \|\| defined(__amd64__) )	69	+#if defined(__FreeBSD__) && defined(__i386__)
70	+ fpresetsticky(FP_X_DZ \| FP_X_INV);	70	+ fpresetsticky(FP_X_DZ \| FP_X_INV);
71	+ fpsetmask(fpgetmask() \| (FP_X_DZ \| FP_X_INV));	71	+ fpsetmask(fpgetmask() \| (FP_X_DZ \| FP_X_INV));
72	#endif	72	#endif