diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2004-11-01 13:22:12 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2004-11-01 13:22:12 +0000 |
| commit | 94e5af0a22137049db9d770e0f6608559650d1a3 (patch) | |
| tree | 8bae1775af0a7a9ae4651b61fad714d193e4988e /x11-toolkits | |
| parent | - allow to overwrite TKBASE (diff) | |
- override source path for symlinked portsdirs
This allows tk84 build, when tcl84 was build in a different environment.
portrevision not bumped, no affected package can exist.
Notes
Notes:
svn path=/head/; revision=120577
Diffstat (limited to 'x11-toolkits')
| -rw-r--r-- | x11-toolkits/tk84/Makefile | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile index 7def498b9af8..e2fb89858bf8 100644 --- a/x11-toolkits/tk84/Makefile +++ b/x11-toolkits/tk84/Makefile @@ -351,7 +351,9 @@ MLINKS= 3DBorder.3 Tk_Alloc3DBorderFromObj.3 \ .endif -TCL_CHECK!= ( cd ${PORTSDIR}/${PKGCATEGORY}/${TCL84_PORT} && make WRKDIRPREFIX= -V WRKSRC | sed -e 's|/unix$$||' ) +TKBASE?= ${PORTSDIR}/${PKGCATEGORY}/${LATEST_LINK} +TCLBASE!= ( cd ${PORTSDIR}/${TCL84_PORT} && make -V TCLBASE ) +TCLWRK!= ( cd ${PORTSDIR}/${TCL84_PORT} && make -V WRKDIR ) pre-everything:: @if ${TEST} -e "${NONEXISTENT}"; then ${ECHO_MSG} "=== Aborted, please remove ${NONEXISTENT}"; exit 1; fi @@ -362,13 +364,15 @@ post-patch: post-configure: ${REINPLACE_CMD} \ - -e 's=${WRKDIRPREFIX}${.CURDIR}=$${WRKDIRPREFIX}${PORTSDIR}/${PKGCATEGORY}/${LATEST_LINK}=' \ + -e 's|${WRKDIRPREFIX}${.CURDIR}|$${WRKDIRPREFIX}${TKBASE}|' \ ${WRKSRC}/tkConfig.sh + ${REINPLACE_CMD} \ + -e 's|$${WRKDIRPREFIX}${TCLBASE}/work|${TCLWRK}|' \ + ${WRKSRC}/Makefile .if defined(WITHOUT_TK84_MAN) ${REINPLACE_CMD} -e 's|^MAN_INSTALL_DIR.*$$|MAN_INSTALL_DIR = ${WRKDIR}|' \ ${WRKSRC}/Makefile .endif - @if ! grep "TCL_SRC_DIR=.\$${WRKDIRPREFIX}${TCL_CHECK}" "${LOCALBASE}/lib/tcl8.4/tclConfig.sh"; then ${ECHO_MSG} "=== Aborted, this configuration is not supported, set PORTSDIR and rebuild tcl84"; exit 1; fi post-install: ${INSTALL_DATA} ${FILESDIR}/pkgIndex.tcl ${PREFIX}/lib/tk${TK_VER}/ |