head 1.5; access; symbols pkgsrc-2013Q2:1.5.0.8 pkgsrc-2013Q2-base:1.5 pkgsrc-2012Q4:1.5.0.6 pkgsrc-2012Q4-base:1.5 pkgsrc-2011Q4:1.5.0.4 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q2:1.5.0.2 pkgsrc-2011Q2-base:1.5 pkgsrc-2009Q4:1.4.0.38 pkgsrc-2009Q4-base:1.4 pkgsrc-2009Q3:1.4.0.36 pkgsrc-2009Q3-base:1.4 pkgsrc-2009Q2:1.4.0.34 pkgsrc-2009Q2-base:1.4 pkgsrc-2009Q1:1.4.0.32 pkgsrc-2009Q1-base:1.4 pkgsrc-2008Q4:1.4.0.30 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.28 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.26 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.24 pkgsrc-2008Q2-base:1.4 cwrapper:1.4.0.22 pkgsrc-2008Q1:1.4.0.20 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.18 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.16 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.14 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.12 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.10 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.8 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.6 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.4 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.4.0.2 pkgsrc-2005Q4-base:1.4 pkgsrc-2005Q3:1.3.0.2 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.2.0.4 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.2 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.1.1.1.0.8 pkgsrc-2004Q4-base:1.1.1.1 pkgsrc-2004Q3:1.1.1.1.0.6 pkgsrc-2004Q3-base:1.1.1.1 pkgsrc-2004Q2:1.1.1.1.0.4 pkgsrc-2004Q2-base:1.1.1.1 pkgsrc-2004Q1:1.1.1.1.0.2 pkgsrc-2004Q1-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.5 date 2010.02.10.18.15.29; author joerg; state dead; branches; next 1.4; 1.4 date 2005.11.05.03.27.56; author rillig; state Exp; branches; next 1.3; 1.3 date 2005.09.21.14.49.09; author joerg; state Exp; branches; next 1.2; 1.2 date 2005.03.06.22.41.28; author jschauma; state Exp; branches; next 1.1; 1.1 date 2004.03.08.20.07.43; author minskim; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2004.03.08.20.07.43; author minskim; state Exp; branches; next ; desc @@ 1.5 log @Retire tk83 @ text @$NetBSD: patch-ac,v 1.4 2005/11/05 03:27:56 rillig Exp $ --- unix/tcl.m4.orig 2001-10-20 00:24:40.000000000 +0000 +++ unix/tcl.m4 @@@@ -602,6 +602,7 @@@@ AC_DEFUN(SC_CONFIG_CFLAGS, [ do64bit_ok=no fullSrcDir=`cd $srcdir; pwd` + RPATH_FLAG="" EXTRA_CFLAGS="" TCL_EXPORT_FILE_SUFFIX="" UNSHARED_LIB_SUFFIX="" @@@@ -791,8 +792,11 @@@@ dnl AC_CHECK_TOOL(AR, ar, :) LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' EXTRA_CFLAGS="" LDFLAGS="" + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' + TCL_LIB_VERSIONS_OK=nodots ;; - IRIX-6.*|IRIX64-6.5*) + IRIX-6.*) SHLIB_CFLAGS="" SHLIB_LD="ld -n32 -shared -rdata_shared" SHLIB_LD_LIBS='${LIBS}' @@@@ -815,6 +819,9 @@@@ dnl AC_CHECK_TOOL(AR, ar, :) esac LDFLAGS="-n32" fi + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' + TCL_LIB_VERSIONS_OK=nodots ;; IRIX64-6.*) SHLIB_CFLAGS="" @@@@ -825,6 +832,15 @@@@ dnl AC_CHECK_TOOL(AR, ar, :) DL_LIBS="" LDFLAGS="" LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' + TCL_LIB_VERSIONS_OK=nodots + + # Check to enable 64-bit flags for compiler/linker + if test "${ABI}" = "64" ; then + SHLIB_LD="ld -64 -shared -rdata_shared" + LDFLAGS="$LDFLAGS -64" + fi ;; Linux*) SHLIB_CFLAGS="-fPIC" @@@@ -915,7 +931,6 @@@@ dnl AC_CHECK_TOOL(AR, ar, :) AC_CHECK_HEADER(dlfcn.h, [ # NetBSD/SPARC needs -fPIC, -fpic will not do. SHLIB_CFLAGS="-fPIC" - SHLIB_LD="ld -Bshareable -x" SHLIB_LD_LIBS="" SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" @@@@ -927,11 +942,19 @@@@ dnl AC_CHECK_TOOL(AR, ar, :) #ifdef __ELF__ yes #endif - ], + ], [ AC_MSG_RESULT(yes) - SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so', + SHLIB_LD='${TCL_CC} -shared -Wl,-x' + RPATH_FLAG='-Wl,-R' + LD_SEARCH_FLAGS='-Wl,-R${LIB_RUNTIME_DIR}' + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' + ], [ AC_MSG_RESULT(no) + SHLIB_LD="ld -Bshareable -x" + RPATH_FLAG='-R' + LD_SEARCH_FLAGS='-R${LIB_RUNTIME_DIR}' SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0' + ] ) ], [ SHLIB_CFLAGS="" @@@@ -950,7 +973,7 @@@@ dnl AC_CHECK_TOOL(AR, ar, :) UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' TCL_LIB_VERSIONS_OK=nodots ;; - FreeBSD-*) + FreeBSD-*|DragonFly-*) # FreeBSD 3.* and greater have ELF. SHLIB_CFLAGS="-fPIC" SHLIB_LD="ld -Bshareable -x" @@@@ -1130,6 +1153,9 @@@@ dnl AC_CHECK_TOOL(AR, ar, :) DL_LIBS="-ldl" LDFLAGS="" LD_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}' + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' + TCL_LIB_VERSIONS_OK=nodots ;; SunOS-5*) @@@@ -1174,6 +1200,9 @@@@ dnl AC_CHECK_TOOL(AR, ar, :) else LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}' fi + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' + TCL_LIB_VERSIONS_OK=nodots ;; ULTRIX-4.*) SHLIB_CFLAGS="-G 0" @@@@ -1329,7 +1358,7 @@@@ dnl AC_CHECK_TOOL(AR, ar, :) ;; IRIX*) ;; - NetBSD-*|FreeBSD-*|OpenBSD-*) + NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;; Rhapsody-*|Darwin-*) ;; @@@@ -1652,7 +1681,11 @@@@ AC_DEFUN(SC_PATH_X, [ 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) + if test "${RPATH_FLAG}" != ""; then + XLIBSW="-L$i ${RPATH_FLAG}$i -lX11" + else XLIBSW="-L$i -lX11" + fi x_libraries="$i" break fi @@@@ -1661,7 +1694,11 @@@@ AC_DEFUN(SC_PATH_X, [ if test "$x_libraries" = ""; then XLIBSW=-lX11 else + if test "${RPATH_FLAG}" != ""; then + XLIBSW="-L$x_libraries ${RPATH_FLAG}$x_libraries -lX11" + else XLIBSW="-L$x_libraries -lX11" + fi fi fi if test "$XLIBSW" = nope ; then @ 1.4 log @Fixed wrong use of WRKSRC. Converted explicit use of ${SED} to the SUBST framework. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.3 2005/09/21 14:49:09 joerg Exp $ @ 1.3 log @Ensure that errno really comes from errno.h and only define it as extern, if it's not a macro. Teach configure about DragonFly. OKed by maintainer. @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- tcl.m4.orig 2001-10-20 00:24:40.000000000 +0000 +++ tcl.m4 @ 1.2 log @make this build and install on irix64 @ text @d1 1 a1 1 $NetBSD: $ d3 3 a5 3 --- tcl.m4.orig Fri Oct 19 20:24:40 2001 +++ tcl.m4 Sun Mar 6 16:06:56 2005 @@@@ -602,6 +602,7 @@@@ d13 1 a13 1 @@@@ -791,8 +792,11 @@@@ d26 1 a26 1 @@@@ -815,6 +819,9 @@@@ d36 1 a36 1 @@@@ -825,6 +832,15 @@@@ d52 1 a52 1 @@@@ -915,7 +931,6 @@@@ d60 1 a60 1 @@@@ -927,11 +942,19 @@@@ d82 10 a91 1 @@@@ -1130,6 +1153,9 @@@@ d101 1 a101 1 @@@@ -1174,6 +1200,9 @@@@ d111 10 a120 1 @@@@ -1652,7 +1681,11 @@@@ d132 1 a132 1 @@@@ -1661,7 +1694,11 @@@@ @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.4 2001/12/23 17:11:30 bjoern Exp $ d3 2 a4 2 --- tcl.m4.orig Sat Oct 20 02:24:40 2001 +++ tcl.m4 d13 40 a52 1 @@@@ -915,7 +916,6 @@@@ d60 1 a60 1 @@@@ -927,11 +927,19 @@@@ d82 1 a82 1 @@@@ -1130,6 +1138,9 @@@@ d92 1 a92 1 @@@@ -1174,6 +1185,9 @@@@ d102 1 a102 1 @@@@ -1652,7 +1666,11 @@@@ a105 1 - XLIBSW="-L$i -lX11" d109 1 a109 1 + XLIBSW="-L$i -lX11" d114 1 a114 1 @@@@ -1661,7 +1679,11 @@@@ a117 1 - XLIBSW="-L$x_libraries -lX11" d121 1 a121 1 + XLIBSW="-L$x_libraries -lX11" @ 1.1.1.1 log @Reimport tk-8.3.4 into x11/tk83 before updating Tk to 8.4.5, because many packages still need 8.3. OK'ed by the maintainer (jwise@@). @ text @@