head 1.3; access; symbols pkgsrc-2024Q4:1.2.0.72 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.70 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.68 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.66 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.64 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.62 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.60 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.58 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.56 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.54 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.52 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.50 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.48 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.46 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.44 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.42 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.40 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.38 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.34 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.14 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.36 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.32 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.30 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.28 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.26 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.24 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.22 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.20 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.18 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.16 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.12 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.10 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.8 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.6 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.4 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.2 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.1.0.16 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.14 pkgsrc-2015Q3-base:1.1 pkgsrc-2015Q2:1.1.0.12 pkgsrc-2015Q2-base:1.1 pkgsrc-2015Q1:1.1.0.10 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.8 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.6 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.4 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.2 pkgsrc-2014Q1-base:1.1; locks; strict; comment @# @; 1.3 date 2025.01.03.16.49.52; author gdt; state dead; branches; next 1.2; commitid TAxnpgy0H7X5N3EF; 1.2 date 2016.03.03.21.16.46; author bsiegert; state Exp; branches; next 1.1; commitid xM0p3PDHanuZ0fXy; 1.1 date 2014.03.10.14.20.44; author taca; state Exp; branches; next ; commitid DiVb3ApCKG69Z9sx; desc @@ 1.3 log @lang/tcl85: Remove As proposed on pkgsrc-users. Obsolete version added to ease tcl86 migration. No users in pkgsrc, and no comments on the mailinglist. @ text @$NetBSD: patch-unix_configure,v 1.2 2016/03/03 21:16:46 bsiegert Exp $ Add MirBSD and DragonFly support. --- unix/configure.orig 2016-02-08 20:44:53.000000000 +0000 +++ unix/configure @@@@ -7565,7 +7565,7 @@@@ fi CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" ;; - OpenBSD-*) + OpenBSD-*|MirBSD-*) arch=`arch -s` case "$arch" in vax) @@@@ -7646,11 +7646,10 @@@@ fi fi ;; - FreeBSD-*) + FreeBSD-*|DragonFly-*) # This configuration from FreeBSD Ports. SHLIB_CFLAGS="-fPIC" SHLIB_LD="${CC} -shared" - SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,-soname,\$@@" SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="" @@@@ -7680,7 +7679,6 @@@@ fi esac ;; Darwin-*) - CFLAGS_OPTIMIZE="-Os" SHLIB_CFLAGS="-fno-common" # To avoid discrepancies between what headers configure sees during # preprocessing tests and compiling tests, move any -isysroot and @@@@ -8854,7 +8852,7 @@@@ fi BSD/OS*) ;; CYGWIN_*|MINGW32_*) ;; IRIX*) ;; - NetBSD-*|FreeBSD-*|OpenBSD-*) ;; + NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*|MirBSD-*) ;; Darwin-*) ;; SCO_SV-3.2*) ;; *) SHLIB_CFLAGS="-fPIC" ;; @@@@ -8885,7 +8883,11 @@@@ fi else - INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)"' + if test "${SHLIB_SUFFIX}" = ".dylib" ; then + INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/libtcl$(MAJOR_VERSION)$(MINOR_VERSION).$(SHLIB_VERSION)$(SHLIB_SUFFIX)"' + else + INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE).$(SHLIB_VERSION)"' + fi fi @@@@ -8919,7 +8921,7 @@@@ fi else MAKE_STUB_LIB='${STLIB_LD} $@@ ${STUB_LIB_OBJS} ; ${RANLIB} $@@' - INSTALL_STUB_LIB='$(INSTALL_LIBRARY) $(STUB_LIB_FILE) "$(LIB_INSTALL_DIR)/$(STUB_LIB_FILE)" ; (cd "$(LIB_INSTALL_DIR)" ; $(RANLIB) $(STUB_LIB_FILE))' + INSTALL_STUB_LIB='$(INSTALL_DATA) $(STUB_LIB_FILE) "$(LIB_INSTALL_DIR)/$(STUB_LIB_FILE)" ; (cd "$(LIB_INSTALL_DIR)" ; $(RANLIB) $(STUB_LIB_FILE))' fi @@@@ -18692,9 +18694,9 @@@@ fi # building libtcl as a shared library instead of a static library. #-------------------------------------------------------------------- -TCL_UNSHARED_LIB_SUFFIX=${UNSHARED_LIB_SUFFIX} -TCL_SHARED_LIB_SUFFIX=${SHARED_LIB_SUFFIX} -eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" +TCL_UNSHARED_LIB_SUFFIX=${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}.a +TCL_SHARED_LIB_SUFFIX=${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${SHLIB_SUFFIX} +eval "TCL_LIB_FILE=libtcl${TCL_SHARED_LIB_SUFFIX}" # tclConfig.sh needs a version of the _LIB_SUFFIX that has been eval'ed # since on some platforms TCL_LIB_FILE contains shell escapes. @@@@ -18799,13 +18801,10 @@@@ _ACEOF else # libdir must be a fully qualified path and not ${exec_prefix}/lib eval libdir="$libdir" - if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then - TCL_LIB_FLAG="-ltcl${TCL_VERSION}" - else - TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`" - fi + TCL_LIB_FLAG="-ltcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}" TCL_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TCL_LIB_FLAG}" - TCL_LIB_SPEC="-L${libdir} ${TCL_LIB_FLAG}" + TCL_LIB_SPEC_RPATH="${COMPILER_RPATH_FLAG}${libdir}" + TCL_LIB_SPEC="${TCL_LIB_SPEC_RPATH} -L${libdir} ${TCL_LIB_FLAG}" fi VERSION='${VERSION}' eval "CFG_TCL_SHARED_LIB_SUFFIX=${TCL_SHARED_LIB_SUFFIX}" @@@@ -18824,12 +18823,11 @@@@ if test "$FRAMEWORK_BUILD" = "1" ; then TCL_PACKAGE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl ~/Library/Frameworks /Library/Frameworks /System/Library/Frameworks" test -z "$TCL_MODULE_PATH" && \ TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl" -elif test "$prefix/lib" != "$libdir"; then - TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}" else - TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}" + TCL_PACKAGE_PATH="${prefix}/lib/tcl ${prefix}/lib" fi + #-------------------------------------------------------------------- # The statements below define various symbols relating to Tcl # stub support. @@@@ -18842,12 +18840,7 @@@@ eval "TCL_STUB_LIB_FILE=libtclstub${TCL_ eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\"" eval "TCL_STUB_LIB_DIR=${libdir}" -if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then - TCL_STUB_LIB_FLAG="-ltclstub${TCL_VERSION}" -else - TCL_STUB_LIB_FLAG="-ltclstub`echo ${TCL_VERSION} | tr -d .`" -fi - +TCL_STUB_LIB_FLAG="-ltclstub${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}" TCL_BUILD_STUB_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TCL_STUB_LIB_FLAG}" TCL_STUB_LIB_SPEC="-L${TCL_STUB_LIB_DIR} ${TCL_STUB_LIB_FLAG}" TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}" @@@@ -18999,34 +18992,15 @@@@ fi # Transform confdefs.h into DEFS. # Protect against shell expansion while executing Makefile rules. # Protect against Makefile macro expansion. -# -# If the first sed substitution is executed (which looks for macros that -# take arguments), then we branch to the quote section. Otherwise, -# look for a macro that doesn't take arguments. -cat >confdef2opt.sed <<\_ACEOF -t clear -: clear -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g -t quote -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g -t quote -d -: quote -s,[ `~#$^&*(){}\\|;'"<>?],\\&,g -s,\[,\\&,g -s,\],\\&,g -s,\$,$$,g -p -_ACEOF -# We use echo to avoid assuming a particular line-breaking character. -# The extra dot is to prevent the shell from consuming trailing -# line-breaks from the sub-command output. A line-break within -# single-quotes doesn't work because, if this script is created in a -# platform that uses two characters for line-breaks (e.g., DOS), tr -# would break. -ac_LF_and_DOT=`echo; echo .` -DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` -rm -f confdef2opt.sed +cat > conftest.defs <<\EOF +s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g +s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g +s%\[%\\&%g +s%\]%\\&%g +s%\$%$$%g +EOF +DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` +rm -f conftest.defs @@@@ -19648,6 +19622,7 @@@@ s,@@EXTRA_BUILD_HTML@@,$EXTRA_BUILD_HTML,; s,@@EXTRA_TCLSH_LIBS@@,$EXTRA_TCLSH_LIBS,;t t s,@@DLTEST_LD@@,$DLTEST_LD,;t t s,@@DLTEST_SUFFIX@@,$DLTEST_SUFFIX,;t t +s,@@SHLIB_VERSION@@,$SHLIB_VERSION,;t t CEOF _ACEOF @ 1.2 log @Update Tcl to 8.5.19. Changes in 8.5.16 Changed Tcl behavior - Unicode 7.0 charset (within BMP) - [scan %E%G%X]. Updated packages - http 2.7.13 - tcltest 2.3.8 - platform 1.0.13 Changes in 8.5.17 Changed Tcl behavior - Fixed several I/O bugs introduced in 8.5.16. Changes in 8.5.18 (none) Changes in 8.5.19 New global variables - tcl_platform(engine) TIP440 Changed Tcl behavior - Update to Unicode 8.0 support. @ text @d1 1 a1 1 $NetBSD: patch-unix_configure,v 1.1 2014/03/10 14:20:44 taca Exp $ @ 1.1 log @Restore tcl-8.5.15 package as lang/tcl85 with bump PKGREVISION since x11/ruby-tk package needs tcl/tk 8.5 and it dosen't support tcl/tk 8.6 and later. @ text @d1 1 a1 1 $NetBSD$ d5 1 a5 1 --- unix/configure.orig 2013-09-13 16:07:56.000000000 +0000 d7 1 a7 1 @@@@ -7560,7 +7560,7 @@@@ fi d16 3 a18 3 @@@@ -7642,11 +7642,10 @@@@ fi ;; esac d25 1 a25 1 - TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\$@@" d29 2 a30 2 @@@@ -7672,7 +7671,6 @@@@ fi TCL_LIB_VERSIONS_OK=nodots d37 1 a37 1 @@@@ -8846,7 +8844,7 @@@@ fi d46 1 a46 1 @@@@ -8877,7 +8875,11 @@@@ fi d59 1 a59 1 @@@@ -8911,7 +8913,7 @@@@ fi d68 1 a68 1 @@@@ -18684,9 +18686,9 @@@@ fi d81 1 a81 1 @@@@ -18791,13 +18793,10 @@@@ _ACEOF d98 1 a98 1 @@@@ -18816,12 +18815,11 @@@@ if test "$FRAMEWORK_BUILD" = "1" ; then d113 1 a113 1 @@@@ -18834,12 +18832,7 @@@@ eval "TCL_STUB_LIB_FILE=libtclstub${TCL_ d127 1 a127 1 @@@@ -18991,34 +18984,15 @@@@ fi d171 1 a171 1 @@@@ -19639,6 +19613,7 @@@@ s,@@EXTRA_BUILD_HTML@@,$EXTRA_BUILD_HTML,; @