diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2007-06-05 13:32:06 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2007-06-05 13:32:06 +0000 |
| commit | 506f2b305a9919d2824f8a8ce7b26cc1ee46546f (patch) | |
| tree | 7ef011b609048517b1eab1d2fda16188e8f557d5 /x11-toolkits/tk85 | |
| parent | a5861b89dfd0ec35aa273902120726af21e3e5a3 (diff) | |
| download | ports-506f2b305a9919d2824f8a8ce7b26cc1ee46546f.tar.gz ports-506f2b305a9919d2824f8a8ce7b26cc1ee46546f.zip | |
- fix shared build on -CURRENT
- change tr to ${TR}
Suggested by: stas
Approved by: garga (mentor)
Notes
Notes:
svn path=/head/; revision=192840
Diffstat (limited to 'x11-toolkits/tk85')
| -rw-r--r-- | x11-toolkits/tk85/Makefile | 6 | ||||
| -rw-r--r-- | x11-toolkits/tk85/files/patch-unix::configure | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/x11-toolkits/tk85/Makefile b/x11-toolkits/tk85/Makefile index 883946308381..8bc4d728b053 100644 --- a/x11-toolkits/tk85/Makefile +++ b/x11-toolkits/tk85/Makefile @@ -7,7 +7,7 @@ PORTNAME= tk PORTVERSION= 8.5.a.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= tcl @@ -406,9 +406,9 @@ post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \ -e 's|$${TCL_TRIM_DOTS}|$${TCL_TRIM_DOTS}${THREADS_SUFFIX}|g' \ -e 's|-ltk$${TK_VERSION}|-ltk$${TK_VERSION}${THREADS_SUFFIX}|g' \ - -e 's/-ltk`echo $${TK_VERSION} | tr -d .`/-ltk`echo $${TK_VERSION} | tr -d .`${THREADS_SUFFIX}/g' \ + -e 's/-ltk`echo $${TK_VERSION} | ${TR} -d .`/-ltk`echo $${TK_VERSION} | ${TR} -d .`${THREADS_SUFFIX}/g' \ -e 's|-ltkstub$${TK_VERSION}|-ltkstub$${TK_VERSION}${THREADS_SUFFIX}|g' \ - -e 's/-ltkstub`echo $${TK_VERSION} | tr -d .`/-ltkstub`echo $${TK_VERSION} | tr -d .`${THREADS_SUFFIX}/g' \ + -e 's/-ltkstub`echo $${TK_VERSION} | ${TR} -d .`/-ltkstub`echo $${TK_VERSION} | ${TR} -d .`${THREADS_SUFFIX}/g' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|libtk$${SHORT_TK_VER}|libtk$${SHORT_TK_VER}${THREADS_SUFFIX}|g' \ -e 's|$$(BIN_INSTALL_DIR)/wish$$(VERSION)|$$(BIN_INSTALL_DIR)/wish$$(VERSION)${THREADS_SUFFIX}|g' \ diff --git a/x11-toolkits/tk85/files/patch-unix::configure b/x11-toolkits/tk85/files/patch-unix::configure index c110a26b28b5..4cfd9b3f72c7 100644 --- a/x11-toolkits/tk85/files/patch-unix::configure +++ b/x11-toolkits/tk85/files/patch-unix::configure @@ -14,7 +14,7 @@ SHLIB_CFLAGS="-fPIC" - SHLIB_LD="ld -Bshareable -x" + TCL_SHLIB_LD_EXTRAS="-soname \$@" -+ SHLIB_LD="ld -shared -x" ++ SHLIB_LD="${CC} -shared" SHLIB_LD_LIBS='${LIBS}' SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" |