svn commit: r447988 - in head/cad/calculix: . files
Pedro F. Giffuni
pfg at FreeBSD.org
Tue Aug 15 16:02:44 UTC 2017
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 <sys/param.h>
+ #include <unistd.h>
+ #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 );
/* */
More information about the svn-ports-head
mailing list