Index: head/cad/calculix/Makefile =================================================================== --- head/cad/calculix/Makefile (revision 447987) +++ head/cad/calculix/Makefile (revision 447988) @@ -1,87 +1,87 @@ # Created by: Pedro Giffuni # $FreeBSD$ PORTNAME= CalculiX PORTVERSION= 2.12 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= cad MASTER_SITES= http://www.dhondt.de/ PKGNAMEPREFIX= CalculiX- DISTFILES= ${DIST_SOURCES} DIST_SUBDIR= calculix EXTRACT_ONLY= ${DIST_SOURCES} MAINTAINER= pfg@FreeBSD.org COMMENT= Three-Dimensional Structural Finite Element Program LICENSE= GPLv2 RUN_DEPENDS= ccx:cad/calculix-ccx DIST_SOURCES= cgx_${PORTVERSION}.all${EXTRACT_SUFX} DIST_HTM= cgx_${PORTVERSION}.htm${EXTRACT_SUFX} DIST_PDF= cgx_${PORTVERSION}.pdf DIST_EXAMPLES= cgx_${PORTVERSION}.exa${EXTRACT_SUFX} WRKSRC= ${WRKDIR}/CalculiX CGX_VER= cgx_${PORTVERSION} USES= gmake tar:bzip2 USE_XORG= ice sm x11 xext xi xmu xt USE_GL= gl glu # uses its own glut BROWSER?= firefox PSVIEWER?= gv OPTIONS_DEFINE= DOCS EXAMPLES .include .if ${PORT_OPTIONS:MEXAMPLES} DISTFILES+= ${DIST_EXAMPLES} EXTRACT_ONLY+= ${DIST_EXAMPLES} .endif .if ${PORT_OPTIONS:MDOCS} DISTFILES+= ${DIST_HTM} ${DIST_PDF} EXTRACT_ONLY+= ${DIST_HTM} DOCSDIR= ${PREFIX}/share/doc/CalculiX .endif .if ${ARCH} == "sparc64" CFLAGS+= -fPIC FFLAGS+= -fPIC .else CFLAGS+= -fpic FFLAGS+= -fpic .endif pre-build: @${REINPLACE_CMD} -e 's/c++/${CXX}/g;' \ ${WRKSRC}/libSNL/src/makefile @${REINPLACE_CMD} -e 's+%%DOCSDIR%%+${DOCSDIR}+g; \ s+"firefox"+"${BROWSER}"+ ; \ s+"gv"+"${PSVIEWER}"+ ;' \ ${WRKSRC}/${CGX_VER}/src/cgx.h do-build: @(cd ${WRKSRC}/libSNL/src; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ) @(cd ${WRKSRC}/${CGX_VER}/src; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${CGX_VER}/src/cgx \ ${STAGEDIR}${PREFIX}/bin/cgx .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR}/cgx @(cd ${WRKSRC}/${CGX_VER}/doc/cgx && ${COPYTREE_SHARE} . \ ${STAGEDIR}${DOCSDIR}/cgx) ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/cgx_${PORTVERSION}.pdf \ ${STAGEDIR}${DOCSDIR} .endif .if ${PORT_OPTIONS:MEXAMPLES} @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} @(cd ${WRKSRC}/${CGX_VER}/examples && ${COPYTREE_SHARE} . \ ${STAGEDIR}${EXAMPLESDIR}) .endif .include Index: head/cad/calculix/files/patch-cgx__VER_src_Makefile =================================================================== --- head/cad/calculix/files/patch-cgx__VER_src_Makefile (revision 447987) +++ head/cad/calculix/files/patch-cgx__VER_src_Makefile (revision 447988) @@ -1,30 +1,26 @@ --- 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 + -I$(LOCALBASE)/include LFLAGS = \ - -L/usr/lib64 -lGL -lGLU \ - -L/usr/X11R6/lib64 -lX11 -lXi -lXmu -lXext -lXt -lSM -lICE \ + -L$(LOCALBASE)/lib -lGL -lGLU \ + -lX11 -lXi -lXmu -lXext -lXt -lSM -lICE \ -lm -lpthread -lrt @@ -66,7 +66,7 @@ OULIB = $(ULIB:.c=.o) OUTIL = $(SUTIL:.c=.o) cgx: $(OLIB) $(OUTIL) $(OULIB) - g++ $(OULIB) $(OLIB) $(OUTIL) $(CFLAGS) $(LFLAGS) -o $@ + ${CXX} $(OULIB) $(OLIB) $(OUTIL) $(CFLAGS) $(LFLAGS) -o $@ Index: head/cad/calculix/files/patch-cgx__VER_src_extUtil.h =================================================================== --- head/cad/calculix/files/patch-cgx__VER_src_extUtil.h (nonexistent) +++ head/cad/calculix/files/patch-cgx__VER_src_extUtil.h (revision 447988) @@ -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 { Property changes on: head/cad/calculix/files/patch-cgx__VER_src_extUtil.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/cad/calculix/files/patch-cgx__VER_src_userFunction.c =================================================================== --- head/cad/calculix/files/patch-cgx__VER_src_userFunction.c (revision 447987) +++ head/cad/calculix/files/patch-cgx__VER_src_userFunction.c (revision 447988) @@ -1,28 +1,28 @@ ---- 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 ); /* */ /* */ /* -------------------------------------------------------------------- */ - + + int assembleFEM(char *parameters, Summen *sum, SumGeo *sumGeo ) { return(0); } + int assembleFEMVane(char *parameters, Summen *sum, SumGeo *sumGeo ) { return(0); } + int createAF(char *sections, char *parameters, Summen *sum, SumGeo *sumGeo ){ return(0); } + int createAF_nlb(char *sections, char *parameters, Summen *sum, SumGeo *sumGeo ){ return(0); } + int sendFlutter(Summen *sum, char string[2][MAX_LINE_LENGTH] ) { return(0); } void userFunction(char *string, Summen *sum, SumGeo *sumGeo ) { int i,j,k,l,n; @@ -89,11 +94,6 @@ void userFunction(char *string, Summen // aflib addons char buf[12][MAX_LINE_LENGTH]; - int assembleFEM(char *parameters, Summen *sum, SumGeo *sumGeo ) { return(0); } - int assembleFEMVane(char *parameters, Summen *sum, SumGeo *sumGeo ){ return(0); } - int createAF(char *sections, char *parameters, Summen *sum, SumGeo *sumGeo ){ return(0); } - int createAF_nlb(char *sections, char *parameters, Summen *sum, SumGeo *sumGeo ){ return(0); } - int sendFlutter(Summen *sum, char string[2][MAX_LINE_LENGTH] ) { return(0); } // end /* list the implemented user-functions if no parameter was provided for the "call" command */