diff options
| author | jschauma <jschauma> | 2005-04-11 02:44:26 +0000 |
|---|---|---|
| committer | jschauma <jschauma> | 2005-04-11 02:44:26 +0000 |
| commit | 035213957261618427f78254726eb0278e058bae (patch) | |
| tree | 684868e4e0114f8b366c7c1b2742a821d7619111 /lang | |
| parent | 7651aa3d1dd453fea1efe2b66dd0be94a090e17c (diff) | |
| download | pkgsrc-035213957261618427f78254726eb0278e058bae.tar.gz | |
patch tclConfig.sh and tkConfig.sh so that they do not contain references
to the build environment, which of course no longer exists once we
install the file. Also make sure that variables are set using
double quotes, so that variables inside are expanded. Ok jwise@.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/tcl/Makefile | 9 | ||||
| -rw-r--r-- | lang/tcl83/Makefile | 9 |
2 files changed, 15 insertions, 3 deletions
diff --git a/lang/tcl/Makefile b/lang/tcl/Makefile index 162a99e1040..dc7f3b488a1 100644 --- a/lang/tcl/Makefile +++ b/lang/tcl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2005/03/08 00:26:31 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.49 2005/04/11 02:44:26 jschauma Exp $ DISTNAME= tcl${TCL_VERSION}-src PKGNAME= tcl-${TCL_VERSION} @@ -52,6 +52,13 @@ CONFIGURE_ENV+= TCL_PACKAGE_PATH="${VIEWBASE}/lib/tcl" CONFIGURE_ARGS+= --enable-64bit .endif +post-build: + ${SED} -e "s|^\(.*\)='\(.*\)'|\1=\"\2\"|" \ + -e "s|${WRKSRC}|${PREFIX}/lib|" \ + -e "s|${WRKDIR}/${DISTNAME:C/-src//}|${PREFIX}|" \ + ${WRKSRC}/tclConfig.sh > ${WRKSRC}/tclConfig.sh.tmp && \ + ${MV} ${WRKSRC}/tclConfig.sh.tmp ${WRKSRC}/tclConfig.sh + post-install: cd ${WRKDIR} && ${PAX} -rwpm man ${PREFIX} ${RM} -rf ${WRKDIR}/man diff --git a/lang/tcl83/Makefile b/lang/tcl83/Makefile index 00555f0b491..31e2086b8f3 100644 --- a/lang/tcl83/Makefile +++ b/lang/tcl83/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/03/08 13:04:14 tv Exp $ +# $NetBSD: Makefile,v 1.7 2005/04/11 02:44:26 jschauma Exp $ # DISTNAME= tcl8.3.4 @@ -65,12 +65,17 @@ post-patch: ${RM} -f mkLinks.tmp; \ ${CHMOD} +x mkLinks; -pre-install: +post-build: cd ${WRKSRC}; for file in \ tclUnixInit.o libtcl83.so tclsh; \ do \ ${TOUCH} $${file}; \ done + ${SED} -e "s|^\(.*\)='\(.*\)'|\1=\"\2\"|" \ + -e "s|${WRKSRC}|${PREFIX}/lib|" \ + -e "s|${WRKDIR}/${DISTNAME:C/-src//}|${PREFIX}|" \ + ${WRKSRC}/tclConfig.sh > ${WRKSRC}/tclConfig.sh.tmp && \ + ${MV} ${WRKSRC}/tclConfig.sh.tmp ${WRKSRC}/tclConfig.sh post-install: cd ${WRKDIR} && ${PAX} -rwpm man ${PREFIX} |