diff options
| author | mm <mm@FreeBSD.org> | 2007-06-05 13:26:58 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2007-06-05 13:26:58 +0000 |
| commit | 1747c39e1e44e9b5c872fdc03a2a4e1c947f9c5f (patch) | |
| tree | 8677c6ad16ae0a332207c271db80236ceaf4b002 /x11-toolkits/tk84 | |
| parent | bc4762e418f0f4f35709ad494516730f1568d562 (diff) | |
| download | FreeBSD-ports-1747c39e1e44e9b5c872fdc03a2a4e1c947f9c5f.zip FreeBSD-ports-1747c39e1e44e9b5c872fdc03a2a4e1c947f9c5f.tar.gz | |
- fix shared build on -CURRENT
- change tr to ${TR}
lang/tcl84 only:
- sync MASTER_SITES with other tcl ports
- change sysctl to ${SYSCTL}
Suggested by: stas
Approved by: garga (mentor)
Diffstat (limited to 'x11-toolkits/tk84')
| -rw-r--r-- | x11-toolkits/tk84/Makefile | 5 | ||||
| -rw-r--r-- | x11-toolkits/tk84/files/patch-aa | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile index d8b9b5f..452e5b3 100644 --- a/x11-toolkits/tk84/Makefile +++ b/x11-toolkits/tk84/Makefile @@ -7,6 +7,7 @@ PORTNAME= tk PORTVERSION= 8.4.15 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= x11-toolkits tk84 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -386,9 +387,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$${VERSION}|-ltk$${VERSION}${THREADS_SUFFIX}|g' \ - -e 's/-ltk`echo $${VERSION} | tr -d .`/-ltk`echo $${VERSION} | tr -d .`${THREADS_SUFFIX}/g' \ + -e 's/-ltk`echo $${VERSION} | ${TR} -d .`/-ltk`echo $${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/tk84/files/patch-aa b/x11-toolkits/tk84/files/patch-aa index 326322b..d2d0814 100644 --- a/x11-toolkits/tk84/files/patch-aa +++ b/x11-toolkits/tk84/files/patch-aa @@ -6,7 +6,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" |
