diff options
Diffstat (limited to 'x11/tk')
-rw-r--r-- | x11/tk/Makefile.version | 4 | ||||
-rw-r--r-- | x11/tk/distinfo | 16 | ||||
-rw-r--r-- | x11/tk/patches/patch-aa | 18 | ||||
-rw-r--r-- | x11/tk/patches/patch-ab | 16 | ||||
-rw-r--r-- | x11/tk/patches/patch-ac | 10 | ||||
-rw-r--r-- | x11/tk/patches/patch-ad | 6 |
6 files changed, 35 insertions, 35 deletions
diff --git a/x11/tk/Makefile.version b/x11/tk/Makefile.version index f1b41092b97..c81c71bea08 100644 --- a/x11/tk/Makefile.version +++ b/x11/tk/Makefile.version @@ -1,3 +1,3 @@ -# $NetBSD: Makefile.version,v 1.6 2007/05/31 13:02:06 adam Exp $ +# $NetBSD: Makefile.version,v 1.7 2007/10/13 11:41:33 adam Exp $ -TK_VERSION= 8.4.15 +TK_VERSION= 8.4.16 diff --git a/x11/tk/distinfo b/x11/tk/distinfo index 826d3bd8f56..961e779ae3f 100644 --- a/x11/tk/distinfo +++ b/x11/tk/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.30 2007/05/31 13:02:06 adam Exp $ +$NetBSD: distinfo,v 1.31 2007/10/13 11:41:33 adam Exp $ -SHA1 (tk8.4.15-src.tar.gz) = 832b39fc3e64dcbbfff4fc192e33d3fc8ef76c43 -RMD160 (tk8.4.15-src.tar.gz) = 8facb8033ce811097a3568373581687a749dda2d -Size (tk8.4.15-src.tar.gz) = 3340313 bytes -SHA1 (patch-aa) = 8425d47efc6feab4a19a79b7d857b9da8042aedf -SHA1 (patch-ab) = 81f203519a75dd270d9eaf9d9551cde3c6c52beb -SHA1 (patch-ac) = 90cb841327d21d606bcebd9d13061115ec791581 -SHA1 (patch-ad) = 408cb4e1f6dbcc00d66e4a817c65d4ed0f0230a7 +SHA1 (tk8.4.16-src.tar.gz) = 464bd7e1411e247e365e4ff585900333b3f91f56 +RMD160 (tk8.4.16-src.tar.gz) = 8545933c172ffcd7024db91f7292190776d3a873 +Size (tk8.4.16-src.tar.gz) = 3344618 bytes +SHA1 (patch-aa) = b729957a24ce2fb6f972bbb19af27bd7d41f1846 +SHA1 (patch-ab) = 09c385b45dc7c6845086ece752b9cfdee7611e06 +SHA1 (patch-ac) = 17a266317ca7c7951794efaf5aafc60dc54ffd6e +SHA1 (patch-ad) = 14ad16e840a825e987721f23c6308c4a011dbe01 diff --git a/x11/tk/patches/patch-aa b/x11/tk/patches/patch-aa index 36f927a8a87..626f015c1e3 100644 --- a/x11/tk/patches/patch-aa +++ b/x11/tk/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.18 2006/11/02 17:42:03 adam Exp $ +$NetBSD: patch-aa,v 1.19 2007/10/13 11:41:33 adam Exp $ ---- unix/Makefile.in.orig 2006-10-19 19:27:34.000000000 +0200 +--- unix/Makefile.in.orig 2007-09-21 19:04:18.000000000 +0200 +++ unix/Makefile.in @@ -94,7 +94,7 @@ HTML_INSTALL_DIR = $(INSTALL_ROOT)$(HTML # The directory containing the Tcl sources and headers appropriate @@ -48,8 +48,8 @@ $NetBSD: patch-aa,v 1.18 2006/11/02 17:42:03 adam Exp $ +LD = ${LIBTOOL} --mode=link @CC@ -Wl,-R${PREFIX}/lib -Wl,-R${X11BASE}/lib CC_SWITCHES_NO_STUBS = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \ - -I${UNIX_DIR} -I${GENERIC_DIR} \ -@@ -481,7 +483,7 @@ DEMOPROGS = browse hello ixset rmt rolod + -I${UNIX_DIR} -I${GENERIC_DIR} -I${BMAP_DIR} -I${TCL_GENERIC_DIR} \ +@@ -482,7 +484,7 @@ DEMOPROGS = browse hello ixset rmt rolod all: binaries libraries doc @@ -58,7 +58,7 @@ $NetBSD: patch-aa,v 1.18 2006/11/02 17:42:03 adam Exp $ libraries: -@@ -493,7 +495,7 @@ doc: $(TOP_DIR)/doc/man.macros +@@ -494,7 +496,7 @@ doc: $(TOP_DIR)/doc/man.macros # The following target is configured by autoconf to generate either # a shared library or non-shared library for Tk. @@ -67,7 +67,7 @@ $NetBSD: patch-aa,v 1.18 2006/11/02 17:42:03 adam Exp $ rm -f $@ @MAKE_LIB@ -@@ -522,8 +524,8 @@ tkLibObjs: +@@ -523,8 +525,8 @@ tkLibObjs: objs: ${OBJS} @@ -78,7 +78,7 @@ $NetBSD: patch-aa,v 1.18 2006/11/02 17:42:03 adam Exp $ $(WISH_LIBS) $(CC_SEARCH_FLAGS) -o wish # Resetting the LIB_RUNTIME_DIR below is required so that -@@ -536,7 +538,7 @@ tktest: $(TKTEST_OBJS) $(TK_LIB_FILE) +@@ -537,7 +539,7 @@ tktest: $(TKTEST_OBJS) $(TK_LIB_FILE) $(MAKE) tktest-real LIB_RUNTIME_DIR=`pwd`:$(TCL_BIN_DIR) tktest-real: @@ -87,7 +87,7 @@ $NetBSD: patch-aa,v 1.18 2006/11/02 17:42:03 adam Exp $ $(WISH_LIBS) $(CC_SEARCH_FLAGS) -o tktest # FIXME: This xttest rule seems to be broken in a number of ways. -@@ -544,7 +546,7 @@ tktest-real: +@@ -545,7 +547,7 @@ tktest-real: # lib location logic from tktest, and it is not clear where this # test.o object file comes from. xttest: test.o tkTest.o tkSquare.o $(TK_LIB_FILE) @@ -96,7 +96,7 @@ $NetBSD: patch-aa,v 1.18 2006/11/02 17:42:03 adam Exp $ @TK_BUILD_LIB_SPEC@ \ $(WISH_LIBS) $(LD_SEARCH_FLAGS) -lXt -o xttest -@@ -614,7 +616,7 @@ install-strip: +@@ -615,7 +617,7 @@ install-strip: # some ranlibs write to current directory, and this might not always be # possible (e.g. if installing as root). diff --git a/x11/tk/patches/patch-ab b/x11/tk/patches/patch-ab index e0fe3a974c7..1c0632e670a 100644 --- a/x11/tk/patches/patch-ab +++ b/x11/tk/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.27 2007/05/31 13:02:06 adam Exp $ +$NetBSD: patch-ab,v 1.28 2007/10/13 11:41:33 adam Exp $ ---- unix/configure.orig 2007-05-25 18:09:53.000000000 +0200 +--- unix/configure.orig 2007-09-21 19:04:18.000000000 +0200 +++ unix/configure @@ -2062,12 +2062,13 @@ fi # Step 3: set configuration options based on system name and version. @@ -50,7 +50,7 @@ $NetBSD: patch-ab,v 1.27 2007/05/31 13:02:06 adam Exp $ DL_OBJS="tclLoadDl.o" DL_LIBS="" LDFLAGS="$LDFLAGS -export-dynamic" -@@ -3758,7 +3762,7 @@ fi +@@ -3768,7 +3772,7 @@ fi ;; IRIX*) ;; @@ -59,7 +59,7 @@ $NetBSD: patch-ab,v 1.27 2007/05/31 13:02:06 adam Exp $ ;; Darwin-*) ;; -@@ -3776,16 +3780,16 @@ fi +@@ -3786,16 +3790,16 @@ fi fi if test "$SHARED_LIB_SUFFIX" = "" ; then @@ -80,7 +80,7 @@ $NetBSD: patch-ab,v 1.27 2007/05/31 13:02:06 adam Exp $ else LIB_SUFFIX=${UNSHARED_LIB_SUFFIX} -@@ -5336,7 +5340,11 @@ echo "configure:5334: checking for X11 l +@@ -5346,7 +5350,11 @@ echo "configure:5344: checking for X11 l for i in $dirs ; do if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl; then echo "$ac_t""$i" 1>&6 @@ -93,7 +93,7 @@ $NetBSD: patch-ab,v 1.27 2007/05/31 13:02:06 adam Exp $ x_libraries="$i" break fi -@@ -5345,7 +5353,11 @@ echo "configure:5334: checking for X11 l +@@ -5355,7 +5363,11 @@ echo "configure:5344: checking for X11 l if test "$x_libraries" = ""; then XLIBSW=-lX11 else @@ -106,7 +106,7 @@ $NetBSD: patch-ab,v 1.27 2007/05/31 13:02:06 adam Exp $ fi fi if test "$XLIBSW" = nope ; then -@@ -5417,6 +5429,10 @@ if test "x${x_libraries}" != "x"; then +@@ -5427,6 +5439,10 @@ if test "x${x_libraries}" != "x"; then fi if test "${TCL_LD_SEARCH_FLAGS}" = '-L${LIB_RUNTIME_DIR}'; then LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -L/g'` @@ -117,7 +117,7 @@ $NetBSD: patch-ab,v 1.27 2007/05/31 13:02:06 adam Exp $ fi # The statement below is very tricky! It actually *evaluates* the -@@ -5951,11 +5967,18 @@ else +@@ -5965,11 +5981,18 @@ else if test "$SHARED_BUILD" = "0" || test "$TCL_NEEDS_EXP_FILE" = "0"; then if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then eval TK_LIB_FLAG="-ltk${VERSION}\${TK_DBGX}" diff --git a/x11/tk/patches/patch-ac b/x11/tk/patches/patch-ac index ee7bd33afb2..8fbaf7b73d7 100644 --- a/x11/tk/patches/patch-ac +++ b/x11/tk/patches/patch-ac @@ -1,6 +1,6 @@ -$NetBSD: patch-ac,v 1.17 2007/05/31 13:02:06 adam Exp $ +$NetBSD: patch-ac,v 1.18 2007/10/13 11:41:34 adam Exp $ ---- unix/tcl.m4.orig 2007-05-25 18:09:54.000000000 +0200 +--- unix/tcl.m4.orig 2007-09-21 19:04:18.000000000 +0200 +++ unix/tcl.m4 @@ -1033,6 +1033,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ # Step 3: set configuration options based on system name and version. @@ -80,7 +80,7 @@ $NetBSD: patch-ac,v 1.17 2007/05/31 13:02:06 adam Exp $ if test $tcl_cv_ld_elf = yes; then SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' else -@@ -1923,6 +1940,9 @@ dnl AC_CHECK_TOOL(AR, ar) +@@ -1933,6 +1950,9 @@ dnl AC_CHECK_TOOL(AR, ar) CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}' fi @@ -90,7 +90,7 @@ $NetBSD: patch-ac,v 1.17 2007/05/31 13:02:06 adam Exp $ ;; ULTRIX-4.*) SHLIB_CFLAGS="-G 0" -@@ -2107,8 +2127,8 @@ dnl # preprocessing tests use only CPPFL +@@ -2117,8 +2137,8 @@ dnl # preprocessing tests use only CPPFL if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then LIB_SUFFIX=${SHARED_LIB_SUFFIX} @@ -101,7 +101,7 @@ $NetBSD: patch-ac,v 1.17 2007/05/31 13:02:06 adam Exp $ else LIB_SUFFIX=${UNSHARED_LIB_SUFFIX} -@@ -2138,10 +2158,10 @@ dnl esac +@@ -2148,10 +2168,10 @@ dnl esac # Stub lib does not depend on shared/static configuration if test "$RANLIB" = "" ; then diff --git a/x11/tk/patches/patch-ad b/x11/tk/patches/patch-ad index e3afe578ccc..82576e22f50 100644 --- a/x11/tk/patches/patch-ad +++ b/x11/tk/patches/patch-ad @@ -1,6 +1,6 @@ -$NetBSD: patch-ad,v 1.11 2007/05/31 13:02:06 adam Exp $ +$NetBSD: patch-ad,v 1.12 2007/10/13 11:41:34 adam Exp $ ---- unix/configure.in.orig 2007-05-25 18:09:53.000000000 +0200 +--- unix/configure.in.orig 2007-09-21 19:04:18.000000000 +0200 +++ unix/configure.in @@ -301,6 +301,10 @@ if test "x${x_libraries}" != "x"; then fi @@ -13,7 +13,7 @@ $NetBSD: patch-ad,v 1.11 2007/05/31 13:02:06 adam Exp $ fi # The statement below is very tricky! It actually *evaluates* the -@@ -476,11 +480,18 @@ else +@@ -480,11 +484,18 @@ else if test "$SHARED_BUILD" = "0" || test "$TCL_NEEDS_EXP_FILE" = "0"; then if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then eval TK_LIB_FLAG="-ltk${VERSION}\${TK_DBGX}" |