diff options
| author | jschauma <jschauma> | 2005-04-11 02:44:26 +0000 |
|---|---|---|
| committer | jschauma <jschauma> | 2005-04-11 02:44:26 +0000 |
| commit | 8a6acbfb6fb64196f45e76c556c07ff6e62e969c (patch) | |
| tree | 684868e4e0114f8b366c7c1b2742a821d7619111 /x11 | |
| parent | be3e7661b040154e02a275114223f56618c7357f (diff) | |
| download | pkgsrc-8a6acbfb6fb64196f45e76c556c07ff6e62e969c.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 'x11')
| -rw-r--r-- | x11/tk/Makefile | 9 | ||||
| -rw-r--r-- | x11/tk83/Makefile | 9 |
2 files changed, 15 insertions, 3 deletions
diff --git a/x11/tk/Makefile b/x11/tk/Makefile index 6a843178cf5..3c103c83295 100644 --- a/x11/tk/Makefile +++ b/x11/tk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2005/01/05 09:15:45 adam Exp $ +# $NetBSD: Makefile,v 1.41 2005/04/11 02:44:26 jschauma Exp $ DISTNAME= tk8.4.9-src PKGNAME= tk-8.4.9 @@ -29,6 +29,13 @@ CONFIGURE_ARGS+= --mandir=${WRKDIR}/man .include "../../lang/tcl/buildlink3.mk" +post-build: + ${SED} -e "s|^\(.*\)='\(.*\)'|\1=\"\2\"|" \ + -e "s|${WRKSRC}|${PREFIX}/lib|" \ + -e "s|${WRKDIR}/${DISTNAME:C/-src//}|${PREFIX}|" \ + ${WRKSRC}/tkConfig.sh > ${WRKSRC}/tkConfig.sh.tmp && \ + ${MV} ${WRKSRC}/tkConfig.sh.tmp ${WRKSRC}/tkConfig.sh + post-install: cd ${WRKDIR} && ${PAX} -rwpm man ${PREFIX} ${RM} -rf ${WRKDIR}/man diff --git a/x11/tk83/Makefile b/x11/tk83/Makefile index 157dc4589c4..fdb64e9f1fd 100644 --- a/x11/tk83/Makefile +++ b/x11/tk83/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/03/08 17:24:45 tv Exp $ +# $NetBSD: Makefile,v 1.4 2005/04/11 02:44:26 jschauma Exp $ DISTNAME= tk8.3.4 PKGNAME= tk-8.3.4 @@ -49,12 +49,17 @@ post-patch: ${RM} -f mkLinks.tmp; \ ${CHMOD} +x mkLinks; -pre-install: +post-build: cd ${WRKSRC}; for file in \ tkUnixInit.o libtk83.so wish; \ do \ ${TOUCH} $${file}; \ done + ${SED} -e "s|^\(.*\)='\(.*\)'|\1=\"\2\"|" \ + -e "s|${WRKSRC}|${PREFIX}/lib|" \ + -e "s|${WRKDIR}/${DISTNAME:C/-src//}|${PREFIX}|" \ + ${WRKSRC}/tkConfig.sh > ${WRKSRC}/tkConfig.sh.tmp && \ + ${MV} ${WRKSRC}/tkConfig.sh.tmp ${WRKSRC}/tkConfig.sh post-install: cd ${WRKDIR} && ${PAX} -rwpm man ${PREFIX} |