From owner-svn-ports-all@freebsd.org Tue Aug 15 16:02:44 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CC417DDCB6C; Tue, 15 Aug 2017 16:02:44 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A83A675237; Tue, 15 Aug 2017 16:02:44 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7FG2h1o024737; Tue, 15 Aug 2017 16:02:43 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7FG2h7s024733; Tue, 15 Aug 2017 16:02:43 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201708151602.v7FG2h7s024733@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Tue, 15 Aug 2017 16:02:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r447988 - in head/cad/calculix: . files X-SVN-Group: ports-head X-SVN-Commit-Author: pfg X-SVN-Commit-Paths: in head/cad/calculix: . files X-SVN-Commit-Revision: 447988 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2017 16:02:44 -0000 Author: pfg (src committer) Date: Tue Aug 15 16:02:43 2017 New Revision: 447988 URL: https://svnweb.freebsd.org/changeset/ports/447988 Log: cad/calculix: attempt to fix build from pkg-fallout. Attempt to cleanup the multiple min/max definitions at the cost of some macro redefining. The issue has been reported upstream, hopefully they will provide a better cleanup in the future. Either some versions of clang/libc++ are more strict or this may have been causing issues from a while back. Approved by: gerald (implicit) Added: head/cad/calculix/files/patch-cgx__VER_src_extUtil.h (contents, props changed) Modified: head/cad/calculix/Makefile head/cad/calculix/files/patch-cgx__VER_src_Makefile head/cad/calculix/files/patch-cgx__VER_src_userFunction.c Modified: head/cad/calculix/Makefile ============================================================================== --- head/cad/calculix/Makefile Tue Aug 15 15:08:25 2017 (r447987) +++ head/cad/calculix/Makefile Tue Aug 15 16:02:43 2017 (r447988) @@ -3,7 +3,7 @@ PORTNAME= CalculiX PORTVERSION= 2.12 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= cad MASTER_SITES= http://www.dhondt.de/ PKGNAMEPREFIX= CalculiX- Modified: head/cad/calculix/files/patch-cgx__VER_src_Makefile ============================================================================== --- head/cad/calculix/files/patch-cgx__VER_src_Makefile Tue Aug 15 15:08:25 2017 (r447987) +++ head/cad/calculix/files/patch-cgx__VER_src_Makefile Tue Aug 15 16:02:43 2017 (r447988) @@ -1,11 +1,7 @@ --- cgx_2.12/src/Makefile.orig 2017-03-11 16:25:39 UTC +++ cgx_2.12/src/Makefile -@@ -1,14 +1,14 @@ - CFLAGS = -O2 -Wall \ - -I./ \ - -I/usr/include \ -- -I/usr/include/GL \ -+ -I$(LOCALBASE)/include/GL \ +@@ -4,11 +4,11 @@ CFLAGS = -O2 -Wall \ + -I/usr/include/GL \ -I../../libSNL/src \ -I../../glut-3.5/src \ - -I/usr/X11/include Added: head/cad/calculix/files/patch-cgx__VER_src_extUtil.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/calculix/files/patch-cgx__VER_src_extUtil.h Tue Aug 15 16:02:43 2017 (r447988) @@ -0,0 +1,27 @@ +--- cgx_2.12/src/extUtil.h.orig 2017-04-28 10:12:50 UTC ++++ cgx_2.12/src/extUtil.h +@@ -9,6 +9,7 @@ + #else + #define DEV_NULL " >/dev/null" + #define DEV_NULL2 " 2>/dev/null" ++ #include + #include + #endif + +@@ -52,12 +53,10 @@ void printf_fflush(const char *fmt,...); + /* from #include "f2c.h" */ + #define abs(x) ((x) >= 0 ? (x) : -(x)) + #define dabs(x) (double)abs(x) +-#define min(a,b) ((a) <= (b) ? (a) : (b)) +-#define max(a,b) ((a) >= (b) ? (a) : (b)) +-#define smin(a,b) (float)min(a,b) +-#define smax(a,b) (float)max(a,b) +-#define dmin(a,b) (double)min(a,b) +-#define dmax(a,b) (double)max(a,b) ++#define smin(a,b) (float)MIN(a,b) ++#define smax(a,b) (float)MAX(a,b) ++#define dmin(a,b) (double)MIN(a,b) ++#define dmax(a,b) (double)MAX(a,b) + + + typedef struct { Modified: head/cad/calculix/files/patch-cgx__VER_src_userFunction.c ============================================================================== --- head/cad/calculix/files/patch-cgx__VER_src_userFunction.c Tue Aug 15 15:08:25 2017 (r447987) +++ head/cad/calculix/files/patch-cgx__VER_src_userFunction.c Tue Aug 15 16:02:43 2017 (r447988) @@ -1,4 +1,4 @@ ---- cgx_2.12/src/userFunction.c.orig 2017-07-01 17:49:32 UTC +--- cgx_2.12/src/userFunction.c.orig 2017-04-30 15:13:54 UTC +++ cgx_2.12/src/userFunction.c @@ -57,7 +57,12 @@ void sendFacesNodes( char *setname ); /* */