diff options
| author | mm <mm@FreeBSD.org> | 2007-06-05 21:26:58 +0800 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2007-06-05 21:26:58 +0800 |
| commit | 1747c39e1e44e9b5c872fdc03a2a4e1c947f9c5f (patch) | |
| tree | 8677c6ad16ae0a332207c271db80236ceaf4b002 /lang | |
| parent | bc4762e418f0f4f35709ad494516730f1568d562 (diff) | |
| download | freebsd-ports-gnome-1747c39e1e44e9b5c872fdc03a2a4e1c947f9c5f.tar.gz freebsd-ports-gnome-1747c39e1e44e9b5c872fdc03a2a4e1c947f9c5f.tar.zst freebsd-ports-gnome-1747c39e1e44e9b5c872fdc03a2a4e1c947f9c5f.zip | |
- 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 'lang')
| -rw-r--r-- | lang/tcl84/Makefile | 10 | ||||
| -rw-r--r-- | lang/tcl84/files/patch-configure | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/lang/tcl84/Makefile b/lang/tcl84/Makefile index ff70ef95c854..272c3e9a1c61 100644 --- a/lang/tcl84/Makefile +++ b/lang/tcl84/Makefile @@ -7,9 +7,11 @@ PORTNAME= tcl PORTVERSION= 8.4.15 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= lang tcl84 -MASTER_SITES= SF +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITE_SUBDIR= tcl PKGNAMESUFFIX?= ${THREADS_SUFFIX}${PKGNAMESUFFIX2} DISTNAME= ${PORTNAME}${PORTVERSION}-src @@ -619,9 +621,9 @@ post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \ -e 's|$${TCL_TRIM_DOTS}|$${TCL_TRIM_DOTS}${THREADS_SUFFIX}|g' \ -e 's|-ltcl$${TCL_VERSION}|-ltcl$${TCL_VERSION}${THREADS_SUFFIX}|g' \ - -e 's/-ltcl`echo $${TCL_VERSION} | tr -d .`/-ltcl`echo $${TCL_VERSION} | tr -d .`${THREADS_SUFFIX}/g' \ + -e 's/-ltcl`echo $${TCL_VERSION} | ${TR} -d .`/-ltcl`echo $${TCL_VERSION} | ${TR} -d .`${THREADS_SUFFIX}/g' \ -e 's|-ltclstub$${TCL_VERSION}|-ltclstub$${TCL_VERSION}${THREADS_SUFFIX}|g' \ - -e 's/-ltclstub`echo $${TCL_VERSION} | tr -d .`/-ltclstub`echo $${TCL_VERSION} | tr -d .`${THREADS_SUFFIX}/g' \ + -e 's/-ltclstub`echo $${TCL_VERSION} | ${TR} -d .`/-ltclstub`echo $${TCL_VERSION} | ${TR} -d .`${THREADS_SUFFIX}/g' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|libtcl$${SHORT_TCL_VER}|libtcl$${SHORT_TCL_VER}${THREADS_SUFFIX}|g' \ -e 's|$$(BIN_INSTALL_DIR)/tclsh$$(VERSION)|$$(BIN_INSTALL_DIR)/tclsh$$(VERSION)${THREADS_SUFFIX}|g' \ @@ -630,7 +632,7 @@ post-patch: .endif # Where the below command fails, there is no need for concern: -BLACKHOLE!= /sbin/sysctl -n net.inet.tcp.blackhole || ${TRUE} +BLACKHOLE!= ${SYSCTL} -n net.inet.tcp.blackhole || ${TRUE} post-configure: ${REINPLACE_CMD} \ diff --git a/lang/tcl84/files/patch-configure b/lang/tcl84/files/patch-configure index 0272fb1ea667..1ccf4b3a685f 100644 --- a/lang/tcl84/files/patch-configure +++ b/lang/tcl84/files/patch-configure @@ -14,7 +14,7 @@ # FreeBSD 3.* and greater have ELF. SHLIB_CFLAGS="-fPIC" - SHLIB_LD="ld -Bshareable -x" -+ SHLIB_LD="ld -shared -x" ++ SHLIB_LD="${CC} -shared" + TCL_SHLIB_LD_EXTRAS="-soname \$@" SHLIB_LD_LIBS='${LIBS}' SHLIB_SUFFIX=".so" |