Attachment 44711 Details for Bug 69143 – file.diff

[patch] file.diff

file.diff (text/plain), 2.98 KB, created by NAKAJI Hiroyuki on 2004-07-16 10:40:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: NAKAJI Hiroyuki

Created: 2004-07-16 10:40:18 UTC

Size: 2.98 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /net/boggy/home/ncvs/ports/math/gnuplot+/Makefile,v
>retrieving revision 1.25
>diff -u -r1.25 Makefile
>--- Makefile	25 May 2004 00:39:32 -0000	1.25
>+++ Makefile	16 Jul 2004 08:52:47 -0000
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	gnuplot371+
> PORTVERSION=	1.2.0
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	math japanese graphics
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
> 		http://www.yama-ga.com/gnuplot/:patch \
>@@ -54,10 +54,6 @@
> 
> .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}
> 
>Index: files/patch-za
>===================================================================
>RCS file: /net/boggy/home/ncvs/ports/math/gnuplot+/files/patch-za,v
>retrieving revision 1.2
>diff -u -r1.2 patch-za
>--- files/patch-za	19 Jun 2003 12:24:21 -0000	1.2
>+++ files/patch-za	16 Jul 2004 08:55:38 -0000
>@@ -1,10 +1,10 @@
>---- gplt_x11.c.orig	Wed May  7 14:21:25 2003
>-+++ gplt_x11.c	Wed May  7 14:55:22 2003
>+--- 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__) || defined(__amd64__) )
>++#if defined(__FreeBSD__) && defined(__i386__)
> +# include <floatingpoint.h>
> +#endif
> +
>@@ -15,7 +15,7 @@
>  int argc;
>  char *argv[];
>  {
>-+#if defined(__FreeBSD__) && ( defined(__i386__) || defined(__amd64__) )
>++#if defined(__FreeBSD__) && defined(__i386__)
> +  /* allow divide by zero -- Inf */
> +  fpsetmask(fpgetmask() & ~(FP_X_DZ | FP_X_INV));
> +#endif
>@@ -27,7 +27,7 @@
>      }
>      XCloseDisplay(dpy);
> +
>-+#if defined(__FreeBSD__) && ( defined(__i386__) || defined(__amd64__) )
>++#if defined(__FreeBSD__) && defined(__i386__)
> +  fpresetsticky(FP_X_DZ | FP_X_INV);
> +  fpsetmask(fpgetmask() | (FP_X_DZ | FP_X_INV));
> +#endif
>@@ -35,13 +35,13 @@
>  
>      FPRINTF((stderr, "exiting\n"));
>  
>---- plot.c.orig	Wed May  7 14:21:25 2003
>-+++ plot.c	Wed May  7 14:45:09 2003
>+--- 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__) || defined(__amd64__) )
>++#if defined(__FreeBSD__) && defined(__i386__)
> +# include <floatingpoint.h>
> +#endif
> +
>@@ -52,7 +52,7 @@
>      _control87(MCW_EM, MCW_EM);
>  #endif
>  
>-+#if defined(__FreeBSD__) && ( defined(__i386__) || defined(__amd64__) )
>++#if defined(__FreeBSD__) && defined(__i386__)
> +  /* allow divide by zero -- Inf */
> +  fpsetmask(fpgetmask() & ~(FP_X_DZ | FP_X_INV));
> +#endif
>@@ -66,7 +66,7 @@
>  	RexxDeregisterSubcom("GNUPLOT", NULL);
> +#endif
> +
>-+#if defined(__FreeBSD__) && ( defined(__i386__) || defined(__amd64__) )
>++#if defined(__FreeBSD__) && defined(__i386__)
> +  fpresetsticky(FP_X_DZ | FP_X_INV);
> +  fpsetmask(fpgetmask() | (FP_X_DZ | FP_X_INV));
>  #endif

Actions: View | Diff

Attachments on bug 69143: 44711