diff options
| author | Pietro Cerutti <gahr@FreeBSD.org> | 2013-04-18 08:20:59 +0000 |
|---|---|---|
| committer | Pietro Cerutti <gahr@FreeBSD.org> | 2013-04-18 08:20:59 +0000 |
| commit | 80feea0bb30bd2dbb0bedc105fb652ab1afeef52 (patch) | |
| tree | d5d9c36f74d1ecd4b3d080ec234fbbd428a64fa1 /x11-toolkits | |
| parent | 958adf68c7547b2c380b8fa327e87d0379454b4a (diff) | |
| download | ports-80feea0bb30bd2dbb0bedc105fb652ab1afeef52.tar.gz ports-80feea0bb30bd2dbb0bedc105fb652ab1afeef52.zip | |
- 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)
Notes
Notes:
svn path=/head/; revision=316025
Diffstat (limited to 'x11-toolkits')
| -rw-r--r-- | x11-toolkits/tk84/Makefile | 6 | ||||
| -rw-r--r-- | x11-toolkits/tk85/Makefile | 6 | ||||
| -rw-r--r-- | x11-toolkits/tk86/Makefile | 8 |
3 files changed, 20 insertions, 0 deletions
diff --git a/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile index 4daeafe03087..ef144f01c49e 100644 --- a/x11-toolkits/tk84/Makefile +++ b/x11-toolkits/tk84/Makefile @@ -63,6 +63,12 @@ CONFIGURE_ARGS+= --disable-threads .endif 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 @(cd ${WRKSRC}/..; ${PATCH} -p0 < ${PATCHDIR}/extra-lastevent-patch) @${REINPLACE_CMD} -e 's|X11/Intrinsic.h|X11/Xlib.h|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|@TK_SHARED_BUILD@|#@TK_SHARED_BUILD@|g' ${WRKSRC}/Makefile.in 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 diff --git a/x11-toolkits/tk86/Makefile b/x11-toolkits/tk86/Makefile index c1cf69ebd735..6abd657fd4df 100644 --- a/x11-toolkits/tk86/Makefile +++ b/x11-toolkits/tk86/Makefile @@ -76,6 +76,14 @@ CONFIGURE_ARGS+=--enable-threads CONFIGURE_ARGS+=--disable-threads .endif +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 + regression-test: build cd ${WRKSRC}; ${MAKE} test ${ECHO_CMD} "package require Tk" | tclsh${TK_VER} |