From db2cbd73155af0ba80fec1cff4a6ffb128f8179c Mon Sep 17 00:00:00 2001 From: Dirk Meyer Date: Tue, 14 Aug 2001 08:01:45 +0000 Subject: [PATCH] - Fix Content of LD_SEARCH_FLAGS - make FreeBSD-* switch in confugure work as intendend - add a patch to make manual autoconf work - PORTREVISION bumped PR: 28726 --- lang/tcl83/Makefile | 2 +- lang/tcl83/files/patch-ab | 31 ------------------------------- lang/tcl83/files/patch-configure | 15 +++++++++++++++ lang/tcl83/files/patch-tcl.m4 | 15 +++++++++++++++ lang/tcl84/Makefile | 2 +- lang/tcl84/files/patch-ab | 31 ------------------------------- lang/tcl84/files/patch-configure | 15 +++++++++++++++ lang/tcl84/files/patch-tcl.m4 | 15 +++++++++++++++ 8 files changed, 62 insertions(+), 64 deletions(-) delete mode 100644 lang/tcl83/files/patch-ab create mode 100644 lang/tcl83/files/patch-configure create mode 100644 lang/tcl83/files/patch-tcl.m4 delete mode 100644 lang/tcl84/files/patch-ab create mode 100644 lang/tcl84/files/patch-configure create mode 100644 lang/tcl84/files/patch-tcl.m4 diff --git a/lang/tcl83/Makefile b/lang/tcl83/Makefile index 28cf946dc746..3117d1288a9f 100644 --- a/lang/tcl83/Makefile +++ b/lang/tcl83/Makefile @@ -7,7 +7,7 @@ PORTNAME= tcl PORTVERSION= 8.3.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= lang tcl83 MASTER_SITES= ${MASTER_SITE_TCLTK} MASTER_SITE_SUBDIR= tcl8_3 diff --git a/lang/tcl83/files/patch-ab b/lang/tcl83/files/patch-ab deleted file mode 100644 index 1899ae9dfbc2..000000000000 --- a/lang/tcl83/files/patch-ab +++ /dev/null @@ -1,31 +0,0 @@ ---- configure.orig Tue Aug 8 15:17:11 2000 -+++ configure Tue Dec 5 11:37:50 2000 -@@ -5032,7 +5032,7 @@ - LDFLAGS="-Wl,-Bexport" - LD_SEARCH_FLAGS="" - ;; -- NetBSD-*|FreeBSD-[1-2].*|OpenBSD-*) -+ NetBSD-*|FreeBSD-*|OpenBSD-*) - # Not available on all versions: check for include file. - ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 -@@ -5116,18 +5116,8 @@ - # FreeBSD doesn't handle version numbers with dots. - - UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' -+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1' - TCL_LIB_VERSIONS_OK=nodots -- ;; -- FreeBSD-*) -- # FreeBSD 3.* and greater have ELF. -- SHLIB_CFLAGS="-fPIC" -- SHLIB_LD="ld -Bshareable -x" -- SHLIB_LD_LIBS="" -- SHLIB_SUFFIX=".so" -- DL_OBJS="tclLoadDl.o" -- DL_LIBS="" -- LDFLAGS="-export-dynamic" -- LD_SEARCH_FLAGS="" - ;; - NEXTSTEP-*) - SHLIB_CFLAGS="" diff --git a/lang/tcl83/files/patch-configure b/lang/tcl83/files/patch-configure new file mode 100644 index 000000000000..f067b9b47e74 --- /dev/null +++ b/lang/tcl83/files/patch-configure @@ -0,0 +1,15 @@ +--- configure.orig Fri Apr 6 20:51:46 2001 ++++ configure Tue Aug 14 09:25:13 2001 +@@ -5175,8 +5175,11 @@ + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="" +- LDFLAGS="-export-dynamic" ++ LDFLAGS="" + LD_SEARCH_FLAGS="" ++ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' ++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1' ++ TCL_LIB_VERSIONS_OK=nodots + ;; + Rhapsody-*|Darwin-*) + SHLIB_CFLAGS="-fno-common" diff --git a/lang/tcl83/files/patch-tcl.m4 b/lang/tcl83/files/patch-tcl.m4 new file mode 100644 index 000000000000..b081b46ad2b5 --- /dev/null +++ b/lang/tcl83/files/patch-tcl.m4 @@ -0,0 +1,15 @@ +--- tcl.m4.orig Fri Apr 6 20:51:46 2001 ++++ tcl.m4 Tue Aug 14 09:24:56 2001 +@@ -890,8 +890,11 @@ + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="" +- LDFLAGS="-export-dynamic" ++ LDFLAGS="" + LD_SEARCH_FLAGS="" ++ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' ++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1' ++ TCL_LIB_VERSIONS_OK=nodots + ;; + Rhapsody-*|Darwin-*) + SHLIB_CFLAGS="-fno-common" diff --git a/lang/tcl84/Makefile b/lang/tcl84/Makefile index 28cf946dc746..3117d1288a9f 100644 --- a/lang/tcl84/Makefile +++ b/lang/tcl84/Makefile @@ -7,7 +7,7 @@ PORTNAME= tcl PORTVERSION= 8.3.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= lang tcl83 MASTER_SITES= ${MASTER_SITE_TCLTK} MASTER_SITE_SUBDIR= tcl8_3 diff --git a/lang/tcl84/files/patch-ab b/lang/tcl84/files/patch-ab deleted file mode 100644 index 1899ae9dfbc2..000000000000 --- a/lang/tcl84/files/patch-ab +++ /dev/null @@ -1,31 +0,0 @@ ---- configure.orig Tue Aug 8 15:17:11 2000 -+++ configure Tue Dec 5 11:37:50 2000 -@@ -5032,7 +5032,7 @@ - LDFLAGS="-Wl,-Bexport" - LD_SEARCH_FLAGS="" - ;; -- NetBSD-*|FreeBSD-[1-2].*|OpenBSD-*) -+ NetBSD-*|FreeBSD-*|OpenBSD-*) - # Not available on all versions: check for include file. - ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 -@@ -5116,18 +5116,8 @@ - # FreeBSD doesn't handle version numbers with dots. - - UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' -+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1' - TCL_LIB_VERSIONS_OK=nodots -- ;; -- FreeBSD-*) -- # FreeBSD 3.* and greater have ELF. -- SHLIB_CFLAGS="-fPIC" -- SHLIB_LD="ld -Bshareable -x" -- SHLIB_LD_LIBS="" -- SHLIB_SUFFIX=".so" -- DL_OBJS="tclLoadDl.o" -- DL_LIBS="" -- LDFLAGS="-export-dynamic" -- LD_SEARCH_FLAGS="" - ;; - NEXTSTEP-*) - SHLIB_CFLAGS="" diff --git a/lang/tcl84/files/patch-configure b/lang/tcl84/files/patch-configure new file mode 100644 index 000000000000..f067b9b47e74 --- /dev/null +++ b/lang/tcl84/files/patch-configure @@ -0,0 +1,15 @@ +--- configure.orig Fri Apr 6 20:51:46 2001 ++++ configure Tue Aug 14 09:25:13 2001 +@@ -5175,8 +5175,11 @@ + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="" +- LDFLAGS="-export-dynamic" ++ LDFLAGS="" + LD_SEARCH_FLAGS="" ++ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' ++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1' ++ TCL_LIB_VERSIONS_OK=nodots + ;; + Rhapsody-*|Darwin-*) + SHLIB_CFLAGS="-fno-common" diff --git a/lang/tcl84/files/patch-tcl.m4 b/lang/tcl84/files/patch-tcl.m4 new file mode 100644 index 000000000000..b081b46ad2b5 --- /dev/null +++ b/lang/tcl84/files/patch-tcl.m4 @@ -0,0 +1,15 @@ +--- tcl.m4.orig Fri Apr 6 20:51:46 2001 ++++ tcl.m4 Tue Aug 14 09:24:56 2001 +@@ -890,8 +890,11 @@ + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="" +- LDFLAGS="-export-dynamic" ++ LDFLAGS="" + LD_SEARCH_FLAGS="" ++ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' ++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1' ++ TCL_LIB_VERSIONS_OK=nodots + ;; + Rhapsody-*|Darwin-*) + SHLIB_CFLAGS="-fno-common"