From befca8acf5af8f432f9f1bd21e123014f27430eb Mon Sep 17 00:00:00 2001
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Fri, 16 Jul 2004 10:50:50 +0000
Subject: [PATCH] [math/gnuplot+] fix amd64 build failure

	It is marked BROKEN on amd64 because FreeBSD/amd64 does not
	have some IEEE FP functions like fpresetsticky(). The build
	failure log is now available at
	http://pointyhat.freebsd.org/errorlogs/amd64-5-full/gnuplot371+-1.2.0_1.log

	I found file/patch-za causes the problem. The feature of
	this patch as reported in ports/16120 can take effect only
	on FreeBSD/i386.

PR:		ports/69143
Submitted by:	NAKAJI Hiroyuki <nakaji@jp.freebsd.org>
---
 math/gnuplot+/Makefile       | 10 ++--------
 math/gnuplot+/files/patch-za | 12 ++++++------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/math/gnuplot+/Makefile b/math/gnuplot+/Makefile
index 3a9fc70f3c81..8d57b9337444 100644
--- a/math/gnuplot+/Makefile
+++ b/math/gnuplot+/Makefile
@@ -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 \
@@ -52,12 +52,6 @@ GP_DOCS=	${WRKSRC}/Copyright.plus \
 		${WRKSRC}/gp+/plus.ps \
 		${WRKSRC}/gp+/plus.tex
 
-.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}
 
@@ -82,4 +76,4 @@ post-install:
 	${MKDIR} ${PREFIX}/share/examples/gnuplot+
 	${INSTALL_DATA} ${WRKSRC}/demo/* ${PREFIX}/share/examples/gnuplot+
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/math/gnuplot+/files/patch-za b/math/gnuplot+/files/patch-za
index ce8fa1a2cd21..143d34abc0d4 100644
--- a/math/gnuplot+/files/patch-za
+++ b/math/gnuplot+/files/patch-za
@@ -4,7 +4,7 @@
  # 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
@@ -41,7 +41,7 @@
  # 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