head 1.6; access; symbols pkgsrc-2026Q1:1.6.0.82 pkgsrc-2026Q1-base:1.6 pkgsrc-2025Q4:1.6.0.80 pkgsrc-2025Q4-base:1.6 pkgsrc-2025Q3:1.6.0.78 pkgsrc-2025Q3-base:1.6 pkgsrc-2025Q2:1.6.0.76 pkgsrc-2025Q2-base:1.6 pkgsrc-2025Q1:1.6.0.74 pkgsrc-2025Q1-base:1.6 pkgsrc-2024Q4:1.6.0.72 pkgsrc-2024Q4-base:1.6 pkgsrc-2024Q3:1.6.0.70 pkgsrc-2024Q3-base:1.6 pkgsrc-2024Q2:1.6.0.68 pkgsrc-2024Q2-base:1.6 pkgsrc-2024Q1:1.6.0.66 pkgsrc-2024Q1-base:1.6 pkgsrc-2023Q4:1.6.0.64 pkgsrc-2023Q4-base:1.6 pkgsrc-2023Q3:1.6.0.62 pkgsrc-2023Q3-base:1.6 pkgsrc-2023Q2:1.6.0.60 pkgsrc-2023Q2-base:1.6 pkgsrc-2023Q1:1.6.0.58 pkgsrc-2023Q1-base:1.6 pkgsrc-2022Q4:1.6.0.56 pkgsrc-2022Q4-base:1.6 pkgsrc-2022Q3:1.6.0.54 pkgsrc-2022Q3-base:1.6 pkgsrc-2022Q2:1.6.0.52 pkgsrc-2022Q2-base:1.6 pkgsrc-2022Q1:1.6.0.50 pkgsrc-2022Q1-base:1.6 pkgsrc-2021Q4:1.6.0.48 pkgsrc-2021Q4-base:1.6 pkgsrc-2021Q3:1.6.0.46 pkgsrc-2021Q3-base:1.6 pkgsrc-2021Q2:1.6.0.44 pkgsrc-2021Q2-base:1.6 pkgsrc-2021Q1:1.6.0.42 pkgsrc-2021Q1-base:1.6 pkgsrc-2020Q4:1.6.0.40 pkgsrc-2020Q4-base:1.6 pkgsrc-2020Q3:1.6.0.38 pkgsrc-2020Q3-base:1.6 pkgsrc-2020Q2:1.6.0.34 pkgsrc-2020Q2-base:1.6 pkgsrc-2020Q1:1.6.0.14 pkgsrc-2020Q1-base:1.6 pkgsrc-2019Q4:1.6.0.36 pkgsrc-2019Q4-base:1.6 pkgsrc-2019Q3:1.6.0.32 pkgsrc-2019Q3-base:1.6 pkgsrc-2019Q2:1.6.0.30 pkgsrc-2019Q2-base:1.6 pkgsrc-2019Q1:1.6.0.28 pkgsrc-2019Q1-base:1.6 pkgsrc-2018Q4:1.6.0.26 pkgsrc-2018Q4-base:1.6 pkgsrc-2018Q3:1.6.0.24 pkgsrc-2018Q3-base:1.6 pkgsrc-2018Q2:1.6.0.22 pkgsrc-2018Q2-base:1.6 pkgsrc-2018Q1:1.6.0.20 pkgsrc-2018Q1-base:1.6 pkgsrc-2017Q4:1.6.0.18 pkgsrc-2017Q4-base:1.6 pkgsrc-2017Q3:1.6.0.16 pkgsrc-2017Q3-base:1.6 pkgsrc-2017Q2:1.6.0.12 pkgsrc-2017Q2-base:1.6 pkgsrc-2017Q1:1.6.0.10 pkgsrc-2017Q1-base:1.6 pkgsrc-2016Q4:1.6.0.8 pkgsrc-2016Q4-base:1.6 pkgsrc-2016Q3:1.6.0.6 pkgsrc-2016Q3-base:1.6 pkgsrc-2016Q2:1.6.0.4 pkgsrc-2016Q2-base:1.6 pkgsrc-2016Q1:1.6.0.2 pkgsrc-2016Q1-base:1.6 pkgsrc-2015Q4:1.5.0.28 pkgsrc-2015Q4-base:1.5 pkgsrc-2015Q3:1.5.0.26 pkgsrc-2015Q3-base:1.5 pkgsrc-2015Q2:1.5.0.24 pkgsrc-2015Q2-base:1.5 pkgsrc-2015Q1:1.5.0.22 pkgsrc-2015Q1-base:1.5 pkgsrc-2014Q4:1.5.0.20 pkgsrc-2014Q4-base:1.5 pkgsrc-2014Q3:1.5.0.18 pkgsrc-2014Q3-base:1.5 pkgsrc-2014Q2:1.5.0.16 pkgsrc-2014Q2-base:1.5 pkgsrc-2014Q1:1.5.0.14 pkgsrc-2014Q1-base:1.5 pkgsrc-2013Q4:1.5.0.12 pkgsrc-2013Q4-base:1.5 pkgsrc-2013Q3:1.5.0.10 pkgsrc-2013Q3-base:1.5 pkgsrc-2013Q2:1.5.0.8 pkgsrc-2013Q2-base:1.5 pkgsrc-2013Q1:1.5.0.6 pkgsrc-2013Q1-base:1.5 pkgsrc-2012Q4:1.5.0.4 pkgsrc-2012Q4-base:1.5 pkgsrc-2012Q3:1.5.0.2 pkgsrc-2012Q3-base:1.5 pkgsrc-2012Q2:1.3.0.10 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.8 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.6 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.4 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.2 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.2.0.66 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.64 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.62 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.60 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.58 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.56 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.54 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.52 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.50 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.48 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.46 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.44 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.42 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.40 pkgsrc-2008Q1:1.2.0.38 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.36 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.34 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.32 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.30 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.28 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.26 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.24 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.22 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.20 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.18 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.16 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.14 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.12 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.10 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.8 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.6 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.4 pkgsrc-2003Q4-base:1.2 netbsd-1-6-1:1.2.0.2 netbsd-1-6-1-base:1.2 netbsd-1-6:1.1.1.1.0.8 netbsd-1-6-RELEASE-base:1.1.1.1 pkgviews:1.1.1.1.0.4 pkgviews-base:1.1.1.1 buildlink2:1.1.1.1.0.2 buildlink2-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.6 date 2016.03.25.21.02.26; author joerg; state Exp; branches; next 1.5; commitid dRDOwIfD2cmAe40z; 1.5 date 2012.09.03.11.13.29; author marino; state Exp; branches; next 1.4; 1.4 date 2012.08.28.11.46.33; author he; state Exp; branches; next 1.3; 1.3 date 2011.07.02.18.06.50; author dholland; state Exp; branches; next 1.2; 1.2 date 2002.08.25.21.52.47; author jlam; state Exp; branches; next 1.1; 1.1 date 2002.04.15.08.19.02; author he; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2002.04.15.08.19.02; author he; state Exp; branches 1.1.1.1.2.1; next ; 1.1.1.1.2.1 date 2002.06.30.06.24.44; author jlam; state Exp; branches; next ; desc @@ 1.6 log @Avoid using the linker directly, otherwise rpath flags might not stick. Regen configure explicitly. Bump revision. @ text @$NetBSD: patch-aa,v 1.5 2012/09/03 11:13:29 marino Exp $ IF AC_PATH_X fails, also look for /usr/X11R7. Don't use ld directly, use the compiler. Additionally, also specify run-path to the X libraries. Add DragonFly support. --- tclconfig/tcl.m4.orig 2007-02-21 22:09:05.000000000 +0000 +++ tclconfig/tcl.m4 @@@@ -1536,13 +1536,13 @@@@ dnl AC_CHECK_TOOL(AR, ar) NetBSD-*|FreeBSD-[[1-2]].*) # NetBSD/SPARC needs -fPIC, -fpic will not do. SHLIB_CFLAGS="-fPIC" - SHLIB_LD="ld -Bshareable -x" + SHLIB_LD="${CC} -shared" SHLIB_LD_LIBS='${LIBS}' SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="" CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' - LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' + LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' AC_CACHE_CHECK([for ELF], tcl_cv_ld_elf, [ AC_EGREP_CPP(yes, [ #ifdef __ELF__ @@@@ -1592,17 +1592,17 @@@@ dnl AC_CHECK_TOOL(AR, ar) UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' TCL_LIB_VERSIONS_OK=nodots ;; - FreeBSD-*) + FreeBSD-*|DragonFly-*) # FreeBSD 3.* and greater have ELF. SHLIB_CFLAGS="-fPIC" - SHLIB_LD="ld -Bshareable -x" + SHLIB_LD="${CC} -shared" SHLIB_LD_LIBS='${LIBS}' SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="" LDFLAGS="$LDFLAGS -export-dynamic" CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' - LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' + LD_SEARCH_FLAGS='-Wl,rpath,${LIB_RUNTIME_DIR}' if test "${TCL_THREADS}" = "1" ; then # The -pthread needs to go in the CFLAGS, not LIBS LIBS=`echo $LIBS | sed s/-pthread//` @@@@ -1610,7 +1610,7 @@@@ dnl AC_CHECK_TOOL(AR, ar) LDFLAGS="$LDFLAGS -pthread" fi 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' @@@@ -1781,7 +1781,7 @@@@ dnl AC_CHECK_TOOL(AR, ar) # QNX RTP # This may work for all QNX, but it was only reported for v6. SHLIB_CFLAGS="-fPIC" - SHLIB_LD="ld -Bshareable -x" + SHLIB_LD="${CC} -shared" SHLIB_LD_LIBS="" SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" @@@@ -2313,7 +2313,7 @@@@ AC_DEFUN([TEA_PATH_UNIX_X], [ found_xincludes="no" AC_TRY_CPP([#include ], found_xincludes="yes", found_xincludes="no") if test "$found_xincludes" = "no"; then - dirs="/usr/unsupported/include /usr/local/include /usr/X386/include /usr/X11R6/include /usr/X11R5/include /usr/include/X11R5 /usr/include/X11R4 /usr/openwin/include /usr/X11/include /usr/sww/include" + dirs="/usr/unsupported/include /usr/local/include /usr/X386/include /usr/X11R7/include /usr/X11R6/include /usr/X11R5/include /usr/include/X11R5 /usr/include/X11R4 /usr/openwin/include /usr/X11/include /usr/sww/include /usr/pkg/include" for i in $dirs ; do if test -r $i/X11/Intrinsic.h; then AC_MSG_RESULT([$i]) @@@@ -2336,7 +2336,7 @@@@ AC_DEFUN([TEA_PATH_UNIX_X], [ if test "$no_x" = yes; then AC_MSG_CHECKING([for X11 libraries]) XLIBSW=nope - dirs="/usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/X11R6/lib /usr/X11R5/lib /usr/lib/X11R5 /usr/lib/X11R4 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib" + dirs="/usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/X11R7/lib /usr/X11R6/lib /usr/X11R5/lib /usr/lib/X11R5 /usr/lib/X11R4 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib /usr/pkg/lib" for i in $dirs ; do if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl; then AC_MSG_RESULT([$i]) @@@@ -2349,7 +2349,7 @@@@ AC_DEFUN([TEA_PATH_UNIX_X], [ if test "$x_libraries" = ""; then XLIBSW=-lX11 else - XLIBSW="-L$x_libraries -lX11" + XLIBSW="-L$x_libraries -Wl,-R,$x_libraries -lX11" fi fi if test "$XLIBSW" = nope ; then @ 1.5 log @x11/tk-Tix: Add DragonFly support (and fix FreeBSD) DragonFly wasn't represented in the configure script. FreeBSD wasn't defining library name correctly. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.4 2012/08/28 11:46:33 he Exp $ d4 1 d10 17 a26 1 @@@@ -1592,7 +1592,7 @@@@ dnl AC_CHECK_TOOL(AR, ar) d34 13 a46 1 SHLIB_LD="ld -Bshareable -x" d56 9 @ 1.4 log @Update tk-Tix from using http://tixlibrary.sourceforge.net/, which seems to be stuck at version 8.2.0b1, to http://tix.sourceforge.net/, which offers version 8.4.3, straight-forward buildable with the recently updated tcl. Gone is "tixwish" as a separate program, instead use tk's "wish" + "package require Tix" instead. For a complete set of changes, see ChangeLog in the source. The major changes for 8.4.0 were: + Complete rewrite of the build system to use TEA + Separation of Tix package require and Tix style usage + Code cleanup to use Tcl 8.4 as a base version @ text @d1 1 a1 1 $NetBSD$ d5 1 d9 18 @ 1.3 log @Don't use ../ in patch paths as GNU patch doesn't like it. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.2 2002/08/25 21:52:47 jlam Exp $ d3 32 a34 46 --- unix/Makefile.in.orig Thu Jan 11 02:43:46 2001 +++ unix/Makefile.in @@@@ -217,6 +217,7 @@@@ STLIB_LD = @@STLIB_LD@@ TCL_BIN_DIR = @@TCL_BIN_DIR@@ +TCL_CC = @@TCL_CC@@ TCL_DEFS = @@TCL_DEFS@@ TCL_EXTRA_CFLAGS = @@TCL_EXTRA_CFLAGS@@ TCL_LD_FLAGS = @@TCL_LD_FLAGS@@ @@@@ -242,17 +243,20 @@@@ TIX_DEFS = @@TIX_DEFS@@ TIX_SRC_DIR = @@TIX_SRC_DIR@@ +X_INCLUDES = @@x_includes@@ + AUTOCONF = autoconf LDFLAGS = $(LDFLAGS_DEFAULT) -INCLUDES = -I$(TCL_SRC_DIR)/generic \ - -I$(TCL_SRC_DIR)/unix \ - -I$(TK_SRC_DIR)/generic \ - -I$(TK_SRC_DIR)/unix \ +INCLUDES = -I$(TCL_DIR)/include/tcl/generic \ + -I$(TCL_DIR)/include/tcl/unix \ + -I$(TK_DIR)/include/tk/generic \ + -I$(TK_DIR)/include/tk/unix \ -I$(GENERIC_DIR) \ -I$(UNIX_DIR) \ - -I$(WIN_DIR) + -I$(WIN_DIR) \ + -I$(X_INCLUDES) EXTRA_CFLAGS = $(TCL_DEFS) $(TK_DEFS) \ $(PROTO_FLAGS) $(SECURITY_FLAGS) $(MEM_DEBUG_FLAGS) \ @@@@ -343,7 +347,8 @@@@ $(TIX_EXE_FILE): tixAppInit.o $(CC) @@LDFLAGS@@ tixAppInit.o \ @@TIX_BUILD_LIB_SPEC@@ \ - @@TK_BUILD_LIB_SPEC@@ @@TCL_BUILD_LIB_SPEC@@ \ + @@TK_LIB_SPEC@@ @@TCL_LIB_SPEC@@ \ + @@TK_LIBS@@ @@TCL_LIBS@@ \ -o $(TIX_EXE_FILE) #======================================================================== @ 1.2 log @Merge packages from the buildlink2 branch back into the main trunk that have been converted to USE_BUILDLINK2. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1.1.1.2.1 2002/06/30 06:24:44 jlam Exp $ d3 2 a4 2 --- Makefile.in.orig Thu Jan 11 02:43:46 2001 +++ Makefile.in @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- Makefile.in.orig Thu Jan 11 08:43:46 2001 d27 4 a30 4 +INCLUDES = -I$(BUILDLINK_DIR)/include/tcl/generic \ + -I$(BUILDLINK_DIR)/include/tcl/unix \ + -I$(BUILDLINK_DIR)/include/tk/generic \ + -I$(BUILDLINK_DIR)/include/tk/unix \ @ 1.1.1.1 log @Bring back tk-Tix package to pkgsrc, in version 8.2.0b1. Tix is a powerful widget library for Tcl/Tk. Reviewed and fully buildlinkified by Stoned Elipot. @ text @@ 1.1.1.1.2.1 log @Convert to use the buildlink2 framework. Trim any unnecessary changes in the patches or remove them entirely. @ text @d3 1 a3 1 --- Makefile.in.orig Thu Jan 11 02:43:46 2001 d27 4 a30 4 +INCLUDES = -I$(TCL_DIR)/include/tcl/generic \ + -I$(TCL_DIR)/include/tcl/unix \ + -I$(TK_DIR)/include/tk/generic \ + -I$(TK_DIR)/include/tk/unix \ @