diff options
| author | Thierry Thomas <thierry@FreeBSD.org> | 2005-07-17 21:50:28 +0000 |
|---|---|---|
| committer | Thierry Thomas <thierry@FreeBSD.org> | 2005-07-17 21:50:28 +0000 |
| commit | a3d52947c85cc9ecd6641343054a257dfc8887d9 (patch) | |
| tree | ba0299c98dc0f6e9fc5eceecbf03f7096bd499d3 /cad | |
| parent | Fix the build on FreeBSD 7.x by teach it. I need to contact with mainstream (diff) | |
Chase TK upgrade and unbreak.
Notes
Notes:
svn path=/head/; revision=139438
Diffstat (limited to 'cad')
| -rw-r--r-- | cad/netgen/Makefile | 2 | ||||
| -rw-r--r-- | cad/netgen/files/patch-togl::togl.cpp | 16 |
2 files changed, 13 insertions, 5 deletions
diff --git a/cad/netgen/Makefile b/cad/netgen/Makefile index dd6cfc263a40..5abc4da67680 100644 --- a/cad/netgen/Makefile +++ b/cad/netgen/Makefile @@ -14,8 +14,6 @@ DISTNAME= ngs${PORTVERSION:S/.//g} MAINTAINER= ports@FreeBSD.org COMMENT= An automatic 3D tetrahedral mesh generator -BROKEN= Does not build - LIB_DEPENDS= tix8184:${PORTSDIR}/x11-toolkits/tix USE_GCC= 3.3 # netgen-4.4 is BROKEN with gcc-3.4 on 5.3-STABLE. diff --git a/cad/netgen/files/patch-togl::togl.cpp b/cad/netgen/files/patch-togl::togl.cpp index bdc42914e223..9716867be853 100644 --- a/cad/netgen/files/patch-togl::togl.cpp +++ b/cad/netgen/files/patch-togl::togl.cpp @@ -1,11 +1,21 @@ --- togl/togl.cpp.orig Wed Sep 29 19:48:06 2004 -+++ togl/togl.cpp Wed Nov 17 22:15:57 2004 -@@ -140,6 +140,8 @@ ++++ togl/togl.cpp Sun Jul 17 22:22:17 2005 +@@ -140,12 +140,16 @@ # include "tkInt8.4p4.h" #elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==4 && TK_RELEASE_SERIAL==6 # include "tkInt8.4p6.h" +#elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==4 && TK_RELEASE_SERIAL==7 +# include "tkInt8.4p6.h" ++#elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==4 && TK_RELEASE_SERIAL==11 ++# include "tkInt8.4p6.h" #else - Sorry, you will have to edit togl.c to include the right tkInt.h file +- Sorry, you will have to edit togl.c to include the right tkInt.h file ++ #error Sorry, you will have to edit togl.c to include the right tkInt.h file + #endif + #elif defined(WIN32) + #if TK_MAJOR_VERSION<8 +- Sorry Windows version requires Tcl/Tk ver 8.0 or higher. ++ #error Sorry Windows version requires Tcl/Tk ver 8.0 or higher. #endif + #include "tkInt.h" + #include "tkWinInt.h" |