diff options
| author | Thierry Thomas <thierry@FreeBSD.org> | 2006-07-04 21:54:35 +0000 |
|---|---|---|
| committer | Thierry Thomas <thierry@FreeBSD.org> | 2006-07-04 21:54:35 +0000 |
| commit | 1c0722ff51345b7b03900dce1f7e390e8deb65c1 (patch) | |
| tree | ab8b2d1523056fcbabd53ae13e098f2f890bb909 /cad | |
| parent | e853da086063a06363b2b93d754cd31ef7d9c001 (diff) | |
| download | ports-1c0722ff51345b7b03900dce1f7e390e8deb65c1.tar.gz ports-1c0722ff51345b7b03900dce1f7e390e8deb65c1.zip | |
Teach about TCL / TK v. 8.4.13 and unbreak.
Notes
Notes:
svn path=/head/; revision=166940
Diffstat (limited to 'cad')
| -rw-r--r-- | cad/netgen/Makefile | 20 | ||||
| -rw-r--r-- | cad/netgen/files/patch-libsrc::makefile.mach.FREEBSD | 5 | ||||
| -rw-r--r-- | cad/netgen/files/patch-togl::togl.cpp | 6 |
3 files changed, 11 insertions, 20 deletions
diff --git a/cad/netgen/Makefile b/cad/netgen/Makefile index e4236c2ca164..a88dffb062b5 100644 --- a/cad/netgen/Makefile +++ b/cad/netgen/Makefile @@ -18,7 +18,8 @@ LIB_DEPENDS= tix8184:${PORTSDIR}/x11-toolkits/tix USE_GCC= 3.3+ USE_GMAKE= yes -USE_GL= yes +USE_TCL_BUILD= yes +USE_TK= yes ALL_TARGET= ng @@ -37,24 +38,11 @@ DIRTCL= demoapp ngsolve ngtcltk BROKEN= internal gcc error (Bug 23159) .endif -.if ${OSVERSION} > 600000 -BROKEN= does not compile on 6-STABLE -DEPRECATED= ${BROKEN} -EXPIRATION_DATE=2006-09-02 -.endif - -TK_VER?= 8.4 -SHORT_TK_VER= ${TK_VER:S/.//} - -TCL_VER?= ${TK_VER} -SHORT_TCL_VER= ${TCL_VER:S/.//} - -LIB_DEPENDS+= tcl${SHORT_TCL_VER}:${PORTSDIR}/lang/tcl${SHORT_TCL_VER} \ - tk${SHORT_TK_VER}:${PORTSDIR}/x11-toolkits/tk${SHORT_TK_VER} - MACHINE= ${OPSYS:U} MAKE_ENV= TK_VER=${TK_VER} TCL_VER=${TCL_VER} \ + TCL_INCLUDEDIR="${TCL_INCLUDEDIR}" \ + TK_INCLUDEDIR="${TK_INCLUDEDIR}" \ MACHINE=${MACHINE} MAKE=${GMAKE} \ PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS} diff --git a/cad/netgen/files/patch-libsrc::makefile.mach.FREEBSD b/cad/netgen/files/patch-libsrc::makefile.mach.FREEBSD index 3f46d5a81229..c2f72da916e3 100644 --- a/cad/netgen/files/patch-libsrc::makefile.mach.FREEBSD +++ b/cad/netgen/files/patch-libsrc::makefile.mach.FREEBSD @@ -1,15 +1,16 @@ --- libsrc/makefile.mach.FREEBSD.orig Wed May 5 23:24:29 2004 -+++ libsrc/makefile.mach.FREEBSD Sun Nov 21 20:32:57 2004 ++++ libsrc/makefile.mach.FREEBSD Tue Jul 4 22:56:34 2006 @@ -18,9 +18,15 @@ tcltklib = `echo $(TIX_BUILD_LIB_SPEC)` `echo $(TK_LIB_SPEC)` `echo $(TCL_LIB_FLAG)` CFLAGS2 = -CPLUSPLUSFLAGS2 = $(CXXFLAGS) -I$(X11BASE)/include -DLINUX -DOPENGL +-CPLUSPLUSFLAGS3 = -I$(LIBSRC_DIR)/step `echo $(TCL_INCLUDE_SPEC)` `echo -I$(TK_PREFIX)`/include/tk`echo $(TK_VERSION)` +CPLUSPLUSFLAGS2 = $(CXXFLAGS) -I$(X11BASE)/include -DLINUX -DOPENGL -DNGSOLVE \ + -ftemplate-depth-99 -finline-limit=20000 \ + -funroll-loops + - CPLUSPLUSFLAGS3 = -I$(LIBSRC_DIR)/step `echo $(TCL_INCLUDE_SPEC)` `echo -I$(TK_PREFIX)`/include/tk`echo $(TK_VERSION)` ++CPLUSPLUSFLAGS3 = -I$(LIBSRC_DIR)/step -I$(TCL_INCLUDEDIR) -I$(TK_INCLUDEDIR) # LINKFLAGS2 = -L$(LOCALBASE)/lib -L$(X11BASE)/lib diff --git a/cad/netgen/files/patch-togl::togl.cpp b/cad/netgen/files/patch-togl::togl.cpp index 9716867be853..bbd05f3e06be 100644 --- a/cad/netgen/files/patch-togl::togl.cpp +++ b/cad/netgen/files/patch-togl::togl.cpp @@ -1,6 +1,6 @@ --- togl/togl.cpp.orig Wed Sep 29 19:48:06 2004 -+++ togl/togl.cpp Sun Jul 17 22:22:17 2005 -@@ -140,12 +140,16 @@ ++++ togl/togl.cpp Tue Jul 4 23:05:23 2006 +@@ -140,12 +140,18 @@ # include "tkInt8.4p4.h" #elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==4 && TK_RELEASE_SERIAL==6 # include "tkInt8.4p6.h" @@ -8,6 +8,8 @@ +# include "tkInt8.4p6.h" +#elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==4 && TK_RELEASE_SERIAL==11 +# include "tkInt8.4p6.h" ++#elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==4 && TK_RELEASE_SERIAL==13 ++# include "tkInt8.4p6.h" #else - 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 |