While trying to remove the last port depending on TK 8.4/TCL 8.4, it fails to build when only TK 8.5/TCL 8.5 is installed. The ports ${WRKSRC}/Makefile.config{,.freebsd} has hard coded the locations of the TK 8.4/TCL 8.4 libs and include directories. The ${WRKSRC}/Togl/src/Togl/togl.c file fails to include the appropriate tkInt*.h, due to it only checks for TK versions up to 8.4. Fix: The attached patch replaces the TK/TCL libs and include directories, as well as fixing the include for tkInt8.4.h in Togl/src/Togl/togl.c. Patch attached with submission follows: How-To-Repeat: Uninstall tk8.4 and tcl8.4, and then install tk8.5 and tcl8.5 cd /usr/ports/graphics/ocaml-lablgl make build gmake[1]: Entering directory `/usr/ports/graphics/ocaml-lablgl/work/lablgl-1.03/Togl/src' ocamlrun ../../src/var2def < togl_tags.var > togl_tags.h ocamlrun ../../src/var2switch TOGL_ < togl_tags.var > togl_tags.c ocamlc -c -w s -ccopt "-c -O2 -pipe -fno-strict-aliasing -I../../src -ITogl -I/usr/local/include/tcl8.4 -I/usr/local/include/tk8.4 -I. -I/usr/local/include" ml_togl.c ml_togl.c:12:17: error: tcl.h: No such file or directory ml_togl.c:13:16: error: tk.h: No such file or directory In file included from ml_togl.c:19: Togl/togl.h:146: error: expected ')' before '*' token Togl/togl.h:184: error: expected ')' before '*' token Togl/togl.h:207: error: expected '=', ',', ';', 'asm' or '__attribute__' before '*' token Togl/togl.h:209: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'Togl_TkWin' Togl/togl.h:266: error: expected ')' before 'clientData' Togl/togl.h:268: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'Togl_GetClientData' Togl/togl.h:270: error: expected declaration specifiers or '...' before 'ClientData' ml_togl.c: In function 'ml_Togl_Init': ml_togl.c:47: error: 'Tcl_Interp' undeclared (first use in this function) ml_togl.c:47: error: (Each undeclared identifier is reported only once ml_togl.c:47: error: for each function it appears in.) ml_togl.c:47: error: 'cltclinterp' undeclared (first use in this function) ml_togl.c:48: error: expected expression before ')' token ml_togl.c:49: warning: implicit declaration of function 'Togl_Init' ml_togl.c:49: error: 'TCL_ERROR' undeclared (first use in this function) ml_togl.c: In function 'ml_Togl_DumpToEpsFile': ml_togl.c:146: error: 'TCL_ERROR' undeclared (first use in this function) gmake[1]: *** [ml_togl.o] Error 2 gmake[1]: Leaving directory `/usr/ports/graphics/ocaml-lablgl/work/lablgl-1.03/Togl/src' gmake: *** [togl] Error 2 *** Error code 2
Responsible Changed From-To: freebsd-ports-bugs->stas Over to maintainer (via the GNATS Auto Assign Tool)
stas 2009-04-06 19:43:29 UTC FreeBSD ports repository Modified files: graphics/ocaml-lablgl Makefile Log: - Make ocaml-lablgl to work with tk versions above 8.4. PR: ports/133113 Submitted by: Scot Hetzel <swhetzel@gmail.com> Revision Changes Path 1.22 +3 -0 ports/graphics/ocaml-lablgl/Makefile _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed. Thanks!