head 1.3; access; symbols pkgsrc-2024Q4:1.2.0.66 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.64 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.62 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.60 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.58 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.56 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.54 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.52 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.50 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.48 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.46 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.44 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.42 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.40 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.38 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.36 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.34 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.32 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.28 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.8 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.30 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.26 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.24 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.22 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.20 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.18 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.16 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.14 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.12 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.10 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.6 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.4 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.2 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.1.0.22 pkgsrc-2016Q3-base:1.1 pkgsrc-2016Q2:1.1.0.20 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.18 pkgsrc-2016Q1-base:1.1 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.15.30.15; author gdt; state dead; branches; next 1.2; commitid gwxki4RepN4tl3EF; 1.2 date 2016.11.28.16.11.37; author wiz; state Exp; branches; next 1.1; commitid 3OHkrisLO6HVEUvz; 1.1 date 2014.03.10.14.22.01; author taca; state Exp; branches; next ; commitid aBvyfkRmNeld0asx; desc @@ 1.3 log @x11/tk85: Remove As proposed on pkgsrc-users. Obsolete version added to ease tk86 migration. No users in pkgsrc, and no comments on the mailinglist. @ text @$NetBSD: patch-unix_configure,v 1.2 2016/11/28 16:11:37 wiz Exp $ Shared library handling on pkgsrc and add support for OpenBSD and MirBSD. --- unix/configure.orig 2016-02-09 15:50:02.000000000 +0000 +++ unix/configure @@@@ -4844,10 +4844,10 @@@@ fi # LDFLAGS_ARCH so they eventually end up in LDFLAGS even if [load] # is disabled by the user. [Bug 1016796] LDFLAGS_ARCH="" - UNSHARED_LIB_SUFFIX="" TCL_TRIM_DOTS='`echo ${VERSION} | tr -d .`' ECHO_VERSION='`echo ${VERSION}`' - TCL_LIB_VERSIONS_OK=ok + TCL_LIB_VERSIONS_OK=nodots + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' CFLAGS_DEBUG=-g CFLAGS_OPTIMIZE=-O if test "$GCC" = yes; then @@@@ -5771,7 +5771,7 @@@@ fi CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" ;; - OpenBSD-*) + OpenBSD-*|MirBSD-*) arch=`arch -s` case "$arch" in vax) @@@@ -5800,7 +5800,7 @@@@ fi fi LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} - SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}' + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so' LDFLAGS="-Wl,-export-dynamic" ;; esac @@@@ -5835,7 +5835,7 @@@@ fi SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="" - LDFLAGS="$LDFLAGS -export-dynamic" + LDFLAGS="" if test $doRpath = yes; then CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' @@@@ -5852,7 +5852,7 @@@@ fi fi ;; - FreeBSD-*) + FreeBSD-*|DragonFly-*) # This configuration from FreeBSD Ports. SHLIB_CFLAGS="-fPIC" SHLIB_LD="${CC} -shared" @@@@ -7060,7 +7060,7 @@@@ fi BSD/OS*) ;; CYGWIN_*|MINGW32_*) ;; IRIX*) ;; - NetBSD-*|FreeBSD-*|OpenBSD-*) ;; + NetBSD-*|FreeBSD-*|OpenBSD-*|MirBSD-*) ;; Darwin-*) ;; SCO_SV-3.2*) ;; *) SHLIB_CFLAGS="-fPIC" ;; @@@@ -7070,12 +7070,12 @@@@ fi if test "$SHARED_LIB_SUFFIX" = ""; then - SHARED_LIB_SUFFIX='${VERSION}${SHLIB_SUFFIX}' + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}${SHLIB_SUFFIX}' fi if test "$UNSHARED_LIB_SUFFIX" = ""; then - UNSHARED_LIB_SUFFIX='${VERSION}.a' + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' fi DLL_INSTALL_DIR="\$(LIB_INSTALL_DIR)" @@@@ -7091,7 +7091,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)/libtk$(MAJOR_VERSION)$(MINOR_VERSION).$(SHLIB_VERSION)$(SHLIB_SUFFIX)"' + else + INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE).$(SHLIB_VERSION)"' + fi fi @@@@ -7125,7 +7129,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 @@@@ -10260,7 +10264,7 @@@@ echo $ECHO_N "checking for X11 libraries if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl -o -r $i/libX11.dylib; then echo "$as_me:$LINENO: result: $i" >&5 echo "${ECHO_T}$i" >&6 - XLIBSW="-L$i -lX11" + XLIBSW="-L$i ${COMPILER_RPATH_FLAG}$i -lX11" x_libraries="$i" break fi @@@@ -10269,7 +10273,7 @@@@ echo "${ECHO_T}$i" >&6 if test "$x_libraries" = ""; then XLIBSW=-lX11 else - XLIBSW="-L$x_libraries -lX11" + XLIBSW="-L$x_libraries ${COMPILER_RPATH_FLAG}$x_libraries -lX11" fi fi if test "$XLIBSW" = nope ; then @@@@ -11532,14 +11536,10 @@@@ else TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`" TK_BUILD_LIB_SPEC="-L\$(TOP_DIR)/win ${TK_LIB_FLAG}" else - if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then - TK_LIB_FLAG="-ltk${TK_VERSION}" - else TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`" - fi TK_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_LIB_FLAG}" fi - TK_LIB_SPEC="-L${libdir} ${TK_LIB_FLAG}" + TK_LIB_SPEC="-L${libdir} ${COMPILER_RPATH_FLAG}${libdir} ${TK_LIB_FLAG}" fi #-------------------------------------------------------------------- @@@@ -11551,11 +11551,7 @@@@ fi eval "TK_STUB_LIB_FILE=libtkstub${TK_UNSHARED_LIB_SUFFIX}" eval "TK_STUB_LIB_DIR=${libdir}" -if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then - TK_STUB_LIB_FLAG="-ltkstub${TK_VERSION}" -else - TK_STUB_LIB_FLAG="-ltkstub`echo ${TK_VERSION} | tr -d .`" -fi +TK_STUB_LIB_FLAG="-ltkstub`echo ${TK_VERSION} | tr -d .`" TK_BUILD_STUB_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_STUB_LIB_FLAG}" TK_STUB_LIB_SPEC="-L${TK_STUB_LIB_DIR} ${TK_STUB_LIB_FLAG}" @@@@ -12376,6 +12372,7 @@@@ s,@@APP_RSRC_FILE@@,$APP_RSRC_FILE,;t t s,@@REZ@@,$REZ,;t t s,@@REZ_FLAGS@@,$REZ_FLAGS,;t t s,@@LTLIBOBJS@@,$LTLIBOBJS,;t t +s,@@SHLIB_VERSION@@,$SHLIB_VERSION,;t t CEOF _ACEOF @ 1.2 log @Updated tk to 8.5.19. 8.5.19 Changes to Tk Commands Expanded Syntax / New Options panedwindow -proxybackground color -proxyborderwidth size -proxyrelief value TIP 437 8.5.18 Changed Tk behavior Debut of Tk Cocoa 2.0 . New binding substitution %M [TIP #433] 8.5.17 Changed Tk behavior Several improvements in Cocoa Tk. Event handling changes for browser plugins. 8.5.16 Changed Tk behavior Improved Retina display support Full PPM file write support with max 65535 @ text @d1 1 a1 1 $NetBSD: patch-unix_configure,v 1.1 2014/03/10 14:22:01 taca Exp $ @ 1.1 log @Restore tk-8.5.15 package as lang/tk85 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-16 16:45:24.000000000 +0000 d20 1 a20 1 @@@@ -5766,7 +5766,7 @@@@ fi d29 1 a29 1 @@@@ -5788,7 +5788,7 @@@@ fi d38 1 a38 1 @@@@ -5823,7 +5823,7 @@@@ fi d47 1 a47 2 @@@@ -5839,16 +5839,11 @@@@ fi a49 8 - case $system in - FreeBSD-3.*) - # FreeBSD-3 doesn't handle version numbers with dots. UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so' TCL_LIB_VERSIONS_OK=nodots - ;; - esac d56 1 a56 10 @@@@ -5874,7 +5869,7 @@@@ fi # Version numbers are dot-stripped by system policy. TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .` UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' - SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1' + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so' TCL_LIB_VERSIONS_OK=nodots ;; Darwin-*) @@@@ -7052,7 +7047,7 @@@@ fi d65 1 a65 1 @@@@ -7062,12 +7057,12 @@@@ fi d80 1 a80 1 @@@@ -7083,7 +7078,11 @@@@ fi d93 1 a93 1 @@@@ -7117,7 +7116,7 @@@@ fi d102 1 a102 1 @@@@ -10252,7 +10251,7 @@@@ echo $ECHO_N "checking for X11 libraries d111 1 a111 1 @@@@ -10261,7 +10260,7 @@@@ echo "${ECHO_T}$i" >&6 d120 1 a120 1 @@@@ -11446,14 +11445,10 @@@@ else d136 1 a136 1 @@@@ -11465,11 +11460,7 @@@@ fi d149 1 a149 1 @@@@ -12290,6 +12281,7 @@@@ s,@@APP_RSRC_FILE@@,$APP_RSRC_FILE,;t t @