diff options
| -rw-r--r-- | lang/tcl84/Makefile | 10 | ||||
| -rw-r--r-- | lang/tcl84/files/patch-configure | 2 | ||||
| -rw-r--r-- | x11-toolkits/tk84/Makefile | 5 | ||||
| -rw-r--r-- | x11-toolkits/tk84/files/patch-aa | 2 |
4 files changed, 11 insertions, 8 deletions
diff --git a/lang/tcl84/Makefile b/lang/tcl84/Makefile index ff70ef9..272c3e9a 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 0272fb1..1ccf4b3 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" 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" |
