diff options
-rw-r--r-- | lang/tcl/Makefile | 12 | ||||
-rw-r--r-- | lang/tcl/PLIST | 6 | ||||
-rw-r--r-- | lang/tcl/distinfo | 6 | ||||
-rw-r--r-- | lang/tcl/patches/patch-aa | 21 | ||||
-rw-r--r-- | lang/tcl/patches/patch-ab | 67 |
5 files changed, 66 insertions, 46 deletions
diff --git a/lang/tcl/Makefile b/lang/tcl/Makefile index 62f28659382..4552d14d980 100644 --- a/lang/tcl/Makefile +++ b/lang/tcl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2003/07/17 21:45:29 grant Exp $ +# $NetBSD: Makefile,v 1.21 2003/10/08 03:13:21 jschauma Exp $ # DISTNAME= tcl8.3.4 @@ -25,6 +25,8 @@ USE_LIBTOOL= yes INSTALL_TARGET= install +PLIST_SUBST+= SHLIB_SUFX="${SHLIB_SUFX}" + # Initially install the man pages into ${WRKDIR}/man, as we need a staged # install to avoid overwriting existing manpages in ${PREFIX}/man. # @@ -32,6 +34,14 @@ CONFIGURE_ARGS+= --mandir=${WRKDIR}/man .include "../../mk/bsd.prefs.mk" +.if ${OPSYS} == "Darwin" +PLIST_SUBST+= SHLIB_CMT="@comment " +SHLIB_SUFX= dylib +.else +PLIST_SUBST+= SHLIB_CMT="" +SHLIB_SUFX= la +.endif + # NetBSD-1.5.x-m68k platforms apparently have a compiler optimization bug # tickled by the Tcl code that manifests in code generation problems. # diff --git a/lang/tcl/PLIST b/lang/tcl/PLIST index 4370d9143c7..b10b01c9636 100644 --- a/lang/tcl/PLIST +++ b/lang/tcl/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2001/12/23 17:02:31 bjoern Exp $ +@comment $NetBSD: PLIST,v 1.3 2003/10/08 03:13:21 jschauma Exp $ bin/tclsh bin/tclsh8.3 include/tcl.h @@ -17,8 +17,8 @@ include/tcl/generic/tclRegexp.h include/tcl/unix/tclUnixPort.h include/tclDecls.h include/tclPlatDecls.h -lib/libtcl83.a -lib/libtcl83.la +${SHLIB_CMT}lib/libtcl83.a +lib/libtcl83.${SHLIB_SUFX} lib/libtcl83.so lib/libtcl83.so.1 lib/libtcl83.so.1.0 diff --git a/lang/tcl/distinfo b/lang/tcl/distinfo index 58a2d8351e3..62bb026972c 100644 --- a/lang/tcl/distinfo +++ b/lang/tcl/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.13 2003/04/02 04:25:23 jschauma Exp $ +$NetBSD: distinfo,v 1.14 2003/10/08 03:13:21 jschauma Exp $ SHA1 (tcl8.3.4.tar.gz) = b179f1f51b322b7045cf152b73df4f3d01da82ec Size (tcl8.3.4.tar.gz) = 2654756 bytes -SHA1 (patch-aa) = 3efcf17b823fb878f04a849a3f4913d73dcdb922 -SHA1 (patch-ab) = 339629f48ca1ee18a0aac953028f56b939ad694e +SHA1 (patch-aa) = 3e9fa9427f40a4c6b1f97bcda58fefe9d5cf20ce +SHA1 (patch-ab) = c5c0092bdcb0f7d5d44a36b5c3e05af805987e5b SHA1 (patch-ac) = d1e1b6ed334ff424140a678ed098504cc14614e8 SHA1 (patch-ae) = a0237d220cf0f8475614497cabaae738621a7729 SHA1 (patch-af) = e19764a58f5ddd6b5b62e785ae305069c535f865 diff --git a/lang/tcl/patches/patch-aa b/lang/tcl/patches/patch-aa index 6bfcb307e47..6ea7ae8e39f 100644 --- a/lang/tcl/patches/patch-aa +++ b/lang/tcl/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.7 2003/04/02 04:25:24 jschauma Exp $ +$NetBSD: patch-aa,v 1.8 2003/10/08 03:13:21 jschauma Exp $ ---- Makefile.in.orig Sat Oct 20 02:24:15 2001 -+++ Makefile.in +--- Makefile.in.orig Fri Oct 19 20:24:15 2001 ++++ Makefile.in Tue Oct 7 21:57:52 2003 @@ -87,7 +87,7 @@ #CFLAGS = $(CFLAGS_DEBUG) #CFLAGS = $(CFLAGS_OPTIMIZE) @@ -33,15 +33,6 @@ $NetBSD: patch-aa,v 1.7 2003/04/02 04:25:24 jschauma Exp $ SHLIB_CFLAGS = @SHLIB_CFLAGS@ SHLIB_SUFFIX = @SHLIB_SUFFIX@ -@@ -207,7 +207,7 @@ - TCL_LIB_FILE = @TCL_LIB_FILE@ - #TCL_LIB_FILE = libtcl.a - --TCL_LIB_FLAG = @TCL_LIB_FLAG@ -+TCL_LIB_FLAG = libtcl83.la - #TCL_LIB_FLAG = -ltcl - - TCL_EXP_FILE = @TCL_EXP_FILE@ @@ -235,8 +235,9 @@ # Must be absolute to so the corresponding tcltest's tcl_library is absolute. TCL_BUILDTIME_LIBRARY = @TCL_SRC_DIR@/library @@ -49,7 +40,7 @@ $NetBSD: patch-aa,v 1.7 2003/04/02 04:25:24 jschauma Exp $ -CC = @CC@ #CC = purify -best-effort @CC@ -DPURIFY +CC = ${LIBTOOL} --mode=compile @CC@ -+LD = ${LIBTOOL} --mode=link @CC@ -Wl,${RPATH_FLAG}${PREFIX}/lib ++LD = ${LIBTOOL} --mode=link @CC@ ${LDFLAGS} #---------------------------------------------------------------- # The information below should be usable as is. The configure @@ -66,12 +57,12 @@ $NetBSD: patch-aa,v 1.7 2003/04/02 04:25:24 jschauma Exp $ tclsh: ${TCLSH_OBJS} ${TCL_LIB_FILE} - ${CC} ${LDFLAGS} ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \ -+ ${LD} ${LDFLAGS} ${TCLSH_OBJS} libtcl83.la ${LIBS} \ ++ ${LD} ${LDFLAGS} ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \ @TCL_LD_SEARCH_FLAGS@ -o tclsh tcltest: ${TCLTEST_OBJS} ${TCL_LIB_FILE} ${BUILD_DLTEST} - ${CC} ${LDFLAGS} ${TCLTEST_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \ -+ ${LD} ${LDFLAGS} ${TCLTEST_OBJS} libtcl83.la ${LIBS} \ ++ ${LD} ${LDFLAGS} ${TCLTEST_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \ @TCL_LD_SEARCH_FLAGS@ -o tcltest # Note, in the target below TCL_LIBRARY needs to be set or else diff --git a/lang/tcl/patches/patch-ab b/lang/tcl/patches/patch-ab index 45778de3c53..4233613fa36 100644 --- a/lang/tcl/patches/patch-ab +++ b/lang/tcl/patches/patch-ab @@ -1,6 +1,7 @@ -$NetBSD: patch-ab,v 1.17 2003/04/21 20:27:29 cjep Exp $ ---- configure.orig Fri Oct 19 17:24:15 2001 -+++ configure Tue Apr 1 19:47:04 2003 +$NetBSD: patch-ab,v 1.18 2003/10/08 03:13:21 jschauma Exp $ + +--- configure.orig Fri Oct 19 20:24:15 2001 ++++ configure Tue Oct 7 21:40:04 2003 @@ -4776,6 +4776,7 @@ # Step 3: set configuration options based on system name and version. @@ -235,7 +236,26 @@ $NetBSD: patch-ab,v 1.17 2003/04/21 20:27:29 cjep Exp $ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0' fi -@@ -5569,6 +5589,9 @@ +@@ -5401,7 +5421,7 @@ + Rhapsody-*|Darwin-*) + SHLIB_CFLAGS="-fno-common" + SHLIB_LD="cc -dynamiclib \${LDFLAGS}" +- TCL_SHLIB_LD_EXTRAS="-compatibility_version ${TCL_MAJOR_VERSION} -current_version \${VERSION} -install_name \${LIB_RUNTIME_DIR}/\${TCL_LIB_FILE} -prebind -seg1addr a000000" ++ TCL_SHLIB_LD_EXTRAS="-compatibility_version ${TCL_MAJOR_VERSION} -current_version \${VERSION} -install_name \${LIB_RUNTIME_DIR}/\${TCL_LIB_FILE} -prebind -seg1addr a000000 -dynamiclib" + SHLIB_LD_LIBS="${LIBS}" + SHLIB_SUFFIX=".dylib" + DL_OBJS="tclLoadDyld.o" +@@ -5410,6 +5430,9 @@ + LD_SEARCH_FLAGS="" + CFLAGS_OPTIMIZE="-O3" + EXTRA_CFLAGS="-arch ppc -pipe" ++ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' ++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}\$\{SHLIB_SUFFIX\}' ++ TCL_LIB_VERSIONS_OK=nodots + ;; + NEXTSTEP-*) + SHLIB_CFLAGS="" +@@ -5569,6 +5592,9 @@ DL_LIBS="-ldl" LDFLAGS="" LD_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}' @@ -245,7 +265,7 @@ $NetBSD: patch-ab,v 1.17 2003/04/21 20:27:29 cjep Exp $ ;; SunOS-5*) -@@ -5616,6 +5639,9 @@ +@@ -5616,6 +5642,9 @@ else LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}' fi @@ -255,7 +275,7 @@ $NetBSD: patch-ab,v 1.17 2003/04/21 20:27:29 cjep Exp $ ;; ULTRIX-4.*) SHLIB_CFLAGS="-G 0" -@@ -5641,10 +5667,10 @@ +@@ -5641,17 +5670,17 @@ # that don't grok the -Bexport option. Test that it does. hold_ldflags=$LDFLAGS echo $ac_n "checking for ld accepts -Bexport flag""... $ac_c" 1>&6 @@ -268,7 +288,6 @@ $NetBSD: patch-ab,v 1.17 2003/04/21 20:27:29 cjep Exp $ #include "confdefs.h" int main() { -@@ -5651,7 +5677,7 @@ int i; ; return 0; } EOF @@ -277,7 +296,7 @@ $NetBSD: patch-ab,v 1.17 2003/04/21 20:27:29 cjep Exp $ rm -rf conftest* found=yes else -@@ -5697,9 +5723,9 @@ +@@ -5697,9 +5726,9 @@ if test "x$DL_OBJS" = "xtclLoadAout.o" ; then echo $ac_n "checking sys/exec.h""... $ac_c" 1>&6 @@ -289,7 +308,7 @@ $NetBSD: patch-ab,v 1.17 2003/04/21 20:27:29 cjep Exp $ #include "confdefs.h" #include <sys/exec.h> int main() { -@@ -5717,7 +5743,7 @@ +@@ -5717,7 +5746,7 @@ ; return 0; } EOF @@ -298,7 +317,7 @@ $NetBSD: patch-ab,v 1.17 2003/04/21 20:27:29 cjep Exp $ rm -rf conftest* tcl_ok=usable else -@@ -5735,9 +5761,9 @@ +@@ -5735,9 +5764,9 @@ else echo $ac_n "checking a.out.h""... $ac_c" 1>&6 @@ -310,7 +329,7 @@ $NetBSD: patch-ab,v 1.17 2003/04/21 20:27:29 cjep Exp $ #include "confdefs.h" #include <a.out.h> int main() { -@@ -5755,7 +5781,7 @@ +@@ -5755,7 +5784,7 @@ ; return 0; } EOF @@ -319,7 +338,7 @@ $NetBSD: patch-ab,v 1.17 2003/04/21 20:27:29 cjep Exp $ rm -rf conftest* tcl_ok=usable else -@@ -5773,9 +5799,9 @@ +@@ -5773,9 +5802,9 @@ else echo $ac_n "checking sys/exec_aout.h""... $ac_c" 1>&6 @@ -331,7 +350,7 @@ $NetBSD: patch-ab,v 1.17 2003/04/21 20:27:29 cjep Exp $ #include "confdefs.h" #include <sys/exec_aout.h> int main() { -@@ -5793,7 +5819,7 @@ +@@ -5793,7 +5822,7 @@ ; return 0; } EOF @@ -340,7 +359,7 @@ $NetBSD: patch-ab,v 1.17 2003/04/21 20:27:29 cjep Exp $ rm -rf conftest* tcl_ok=usable else -@@ -5890,7 +5916,7 @@ +@@ -5890,7 +5919,7 @@ echo $ac_n "checking for build with symbols""... $ac_c" 1>&6 @@ -349,7 +368,7 @@ $NetBSD: patch-ab,v 1.17 2003/04/21 20:27:29 cjep Exp $ # Check whether --enable-symbols or --disable-symbols was given. if test "${enable_symbols+set}" = set; then enableval="$enable_symbols" -@@ -5927,17 +5953,17 @@ +@@ -5927,17 +5956,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 @@ -370,7 +389,7 @@ $NetBSD: patch-ab,v 1.17 2003/04/21 20:27:29 cjep Exp $ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -5967,17 +5993,17 @@ +@@ -5967,17 +5996,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 @@ -391,7 +410,7 @@ $NetBSD: patch-ab,v 1.17 2003/04/21 20:27:29 cjep Exp $ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -6004,7 +6030,7 @@ +@@ -6004,7 +6033,7 @@ done echo $ac_n "checking FIONBIO vs. O_NONBLOCK for nonblocking I/O""... $ac_c" 1>&6 @@ -400,7 +419,7 @@ $NetBSD: patch-ab,v 1.17 2003/04/21 20:27:29 cjep Exp $ if test -f /usr/lib/NextStep/software_version; then system=NEXTSTEP-`awk '/3/,/3/' /usr/lib/NextStep/software_version` else -@@ -6066,7 +6092,7 @@ +@@ -6066,7 +6095,7 @@ echo $ac_n "checking how to build libraries""... $ac_c" 1>&6 @@ -409,7 +428,7 @@ $NetBSD: patch-ab,v 1.17 2003/04/21 20:27:29 cjep Exp $ # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then enableval="$enable_shared" -@@ -6103,7 +6129,7 @@ +@@ -6103,7 +6132,7 @@ if test "x$DL_OBJS" = "xtclLoadAout.o"; then MAKE_LIB="\${STLIB_LD} \$@ \${OBJS}" else @@ -418,7 +437,7 @@ $NetBSD: patch-ab,v 1.17 2003/04/21 20:27:29 cjep Exp $ fi else case $system in -@@ -6141,7 +6167,7 @@ +@@ -6141,7 +6170,7 @@ TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}" fi TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}" @@ -427,7 +446,7 @@ $NetBSD: patch-ab,v 1.17 2003/04/21 20:27:29 cjep Exp $ else TCL_BUILD_EXP_FILE="lib.exp" eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}" -@@ -6171,9 +6197,9 @@ +@@ -6171,9 +6200,9 @@ #-------------------------------------------------------------------- if test "$prefix" != "$exec_prefix"; then @@ -439,7 +458,7 @@ $NetBSD: patch-ab,v 1.17 2003/04/21 20:27:29 cjep Exp $ fi #-------------------------------------------------------------------- -@@ -6186,7 +6212,7 @@ +@@ -6186,7 +6215,7 @@ # Replace DBGX with TCL_DBGX eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\"" @@ -448,7 +467,7 @@ $NetBSD: patch-ab,v 1.17 2003/04/21 20:27:29 cjep Exp $ if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then TCL_STUB_LIB_FLAG="-ltclstub${TCL_VERSION}\${TCL_DBGX}" -@@ -6262,6 +6288,8 @@ +@@ -6262,6 +6291,8 @@ @@ -457,7 +476,7 @@ $NetBSD: patch-ab,v 1.17 2003/04/21 20:27:29 cjep Exp $ trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure -@@ -6437,12 +6465,12 @@ +@@ -6437,12 +6468,12 @@ s%@CFG_TCL_SHARED_LIB_SUFFIX@%$CFG_TCL_SHARED_LIB_SUFFIX%g s%@CFG_TCL_UNSHARED_LIB_SUFFIX@%$CFG_TCL_UNSHARED_LIB_SUFFIX%g s%@CFG_TCL_EXPORT_FILE_SUFFIX@%$CFG_TCL_EXPORT_FILE_SUFFIX%g |