From 80feea0bb30bd2dbb0bedc105fb652ab1afeef52 Mon Sep 17 00:00:00 2001 From: Pietro Cerutti Date: Thu, 18 Apr 2013 08:20:59 +0000 Subject: - Fix a long standing problem in tclConfig.sh and tkConfig.sh, where paths were set based on WRKSRC instead of PREFIX. This mainly affected TEA-based extensions that source tclConfig.sh / tkConfig.sh to set important variables. An example is TCL_SRC_DIR, which is used to locate Tcl/Tk private header files such as tclUnixPort.h or tkUnixPort.h. This variable was previously set to WRKSRC, which caused ports to need additional tweaks to CFLAGS or CONFIGURE_ARGS. It should now be possible to build TEA-based extensions by specifying only the CONFIGURE_ARGS --with-tcl=${TCL_LIBDIR} / --with-tk=${TK_LIBDIR}. Feature safe: yes Approved by: bapt (portmgr) --- x11-toolkits/tk85/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'x11-toolkits/tk85') diff --git a/x11-toolkits/tk85/Makefile b/x11-toolkits/tk85/Makefile index 6b1583e2c030..e5bec76ca41f 100644 --- a/x11-toolkits/tk85/Makefile +++ b/x11-toolkits/tk85/Makefile @@ -82,6 +82,12 @@ INSTALL_TARGET+=install-doc TKBASE?= ${PORTSDIR}/${PKGCATEGORY}/${LATEST_LINK} post-patch: + ${REINPLACE_CMD} -e \ + 's|@TK_BUILD_LIB_SPEC@|@TK_LIB_SPEC@|; \ + s|@TK_BUILD_STUB_LIB_SPEC@|@TK_STUB_LIB_SPEC@|; \ + s|@TK_BUILD_STUB_LIB_PATH@|@TK_STUB_LIB_PATH@|; \ + s|@TK_SRC_DIR@|${PREFIX}/include/tk${TK_VER}|' \ + ${WRKSRC}/tkConfig.sh.in @${REINPLACE_CMD} -e 's|X11/Intrinsic.h|X11/Xlib.h|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|@TK_SHARED_BUILD@|#@TK_SHARED_BUILD@|g; s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/Makefile.in -- cgit v1.2.3