From 207c64909a15fd6dc7e1d4bb9ad8ece00e201bfc Mon Sep 17 00:00:00 2001
From: John Marino <marino@FreeBSD.org>
Date: Sat, 2 May 2015 15:48:08 +0000
Subject: math/reduce: upgrade version 20110414 => 20141130

This version can be built by system compilers (gcc 4.2 & clang) and
also ports gcc compilers, unlike its predecessor which would segfault
and even lock up during build.

PR:		199832, 199853
Submitted by:	pfg (maintainer)
---
 math/reduce/Makefile                          | 17 ++++++++++-------
 math/reduce/distinfo                          |  4 ++--
 math/reduce/files/patch-csl_cslbase_headers.h | 22 ----------------------
 3 files changed, 12 insertions(+), 31 deletions(-)
 delete mode 100644 math/reduce/files/patch-csl_cslbase_headers.h

diff --git a/math/reduce/Makefile b/math/reduce/Makefile
index 364c7a2eb1cc..a46ff4b6aed0 100644
--- a/math/reduce/Makefile
+++ b/math/reduce/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	reduce
-PORTVERSION=	20110414
-PORTREVISION=	2
+PORTVERSION=	20141130
 CATEGORIES=	math lang
-MASTER_SITES=	SF/${PORTNAME}-algebra/
-DISTNAME=	${PORTNAME}-src-${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}-algebra/Snapshot_2014-11-30/
+DISTNAME=	${PORTNAME}-src-2014-11-30
 
 MAINTAINER=	pfg@FreeBSD.org
 COMMENT=	Portable general-purpose computer algebra system (CSL version)
@@ -18,13 +17,14 @@ LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libpng.so:${PORTSDIR}/graphics/png \
 		libtiff.so:${PORTSDIR}/graphics/tiff
 
-USES=		gmake tar:bzip2
+USES=		autoreconf:build gmake tar:bzip2
 USE_XORG=	xext x11 xft
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC=		${WRKDIR}/${DISTNAME}
 
+# Avoid GNU_CONFIGURE because it breaks staging
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-csl
+CONFIGURE_ARGS+=	--with-csl
 ALL_TARGET=
 
 MAKE_JOBS_UNSAFE=	yes
@@ -38,6 +38,9 @@ TARGET_SDIR=	${ARCH}-unknown-${OPSYS:tl}${OSREL}
 .endif
 REDUCECSL=	${WRKSRC}/cslbuild/${TARGET_SDIR}/csl
 
+CPPFLAGS+=	`freetype-config --cflags`
+LDFLAGS+=	`freetype-config --libs`
+
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_PROGRAM} ${REDUCECSL}/reduce ${STAGEDIR}${DATADIR}
diff --git a/math/reduce/distinfo b/math/reduce/distinfo
index 9ee43e1fa297..5e3a65dad14e 100644
--- a/math/reduce/distinfo
+++ b/math/reduce/distinfo
@@ -1,2 +1,2 @@
-SHA256 (reduce-src-20110414.tar.bz2) = d6ac7a30e817ea71555d21b03a119a5236967b251eae8946a1817ae9a81cee03
-SIZE (reduce-src-20110414.tar.bz2) = 136783974
+SHA256 (reduce-src-2014-11-30.tar.bz2) = b15debc944475d4daee1bcbdbaff415693522306785507f2d3110d75df6e7006
+SIZE (reduce-src-2014-11-30.tar.bz2) = 253343100
diff --git a/math/reduce/files/patch-csl_cslbase_headers.h b/math/reduce/files/patch-csl_cslbase_headers.h
deleted file mode 100644
index 535004a26723..000000000000
--- a/math/reduce/files/patch-csl_cslbase_headers.h
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: csl/cslbase/headers.h
-===================================================================
---- csl/cslbase/headers.h	(revision 1603)
-+++ csl/cslbase/headers.h	(working copy)
-@@ -97,6 +97,17 @@
- #define PRIxPTR "llx"
- #endif
- 
-+/*
-+ * This is necessary to for timeval in BSD systems.
-+ */
-+#if (defined(__unix__) || defined(unix)) && !defined(USG)
-+#include <sys/param.h>
-+#endif
-+
-+#if (defined(BSD) && (BSD >= 199103))
-+#include <sys/time.h>
-+#endif
-+
- #ifndef UNDER_CE
- /*
-  * The test for UNDER_CE is a little odd here, but when I once compiled a
-- 
cgit v1.2.3