summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lang/tcl/Makefile13
-rw-r--r--lang/tcl/PLIST13
-rw-r--r--lang/tcl/distinfo14
-rw-r--r--lang/tcl/patches/patch-aa16
-rw-r--r--lang/tcl/patches/patch-ab20
-rw-r--r--lang/tcl/patches/patch-ae8
-rw-r--r--lang/tcl/patches/patch-af22
-rw-r--r--x11/tk/Makefile16
-rw-r--r--x11/tk/PLIST13
-rw-r--r--x11/tk/distinfo12
-rw-r--r--x11/tk/patches/patch-aa8
-rw-r--r--x11/tk/patches/patch-ab20
-rw-r--r--x11/tk/patches/patch-ac22
13 files changed, 92 insertions, 105 deletions
diff --git a/lang/tcl/Makefile b/lang/tcl/Makefile
index acbde3e7fed..653ec7b0350 100644
--- a/lang/tcl/Makefile
+++ b/lang/tcl/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2004/11/16 22:44:51 jlam Exp $
+# $NetBSD: Makefile,v 1.42 2004/11/26 10:30:01 adam Exp $
-DISTNAME= tcl8.4.7-src
-PKGNAME= tcl-8.4.7
-PKGREVISION= 3
+DISTNAME= tcl8.4.8-src
+PKGNAME= tcl-8.4.8
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/}
@@ -15,14 +14,14 @@ CONFLICTS+= tclman80-[0-9]*
PKG_INSTALLATION_TYPES= overwrite pkgviews
WRKSRC= ${WRKDIR}/${DISTNAME:C/-src//}/unix
-GNU_CONFIGURE= yes
-MAKE_ENV+= TOUCH="${TOUCH}"
-TEST_TARGET= test
USE_BUILDLINK3= yes
USE_LIBTOOL= yes
+GNU_CONFIGURE= yes
+MAKE_ENV+= TOUCH="${TOUCH}"
INSTALL_TARGET= install
+TEST_TARGET= test
# Initially install the man pages into ${WRKDIR}/man, as we need a staged
# install to avoid overwriting existing manpages in ${PREFIX}/man.
diff --git a/lang/tcl/PLIST b/lang/tcl/PLIST
index 1b2d3859950..1d3d11c464f 100644
--- a/lang/tcl/PLIST
+++ b/lang/tcl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2004/10/30 05:18:52 minskim Exp $
+@comment $NetBSD: PLIST,v 1.9 2004/11/26 10:30:01 adam Exp $
bin/tclsh
bin/tclsh8.4
include/tcl.h
@@ -102,8 +102,8 @@ lib/tcl8.4/encoding/tis-620.enc
lib/tcl8.4/history.tcl
lib/tcl8.4/http1.0/http.tcl
lib/tcl8.4/http1.0/pkgIndex.tcl
-lib/tcl8.4/http2.4/http.tcl
-lib/tcl8.4/http2.4/pkgIndex.tcl
+lib/tcl8.4/http2.5/http.tcl
+lib/tcl8.4/http2.5/pkgIndex.tcl
lib/tcl8.4/init.tcl
lib/tcl8.4/ldAix
lib/tcl8.4/ldAout.tcl
@@ -422,6 +422,7 @@ man/man3/Tcl_MacConvertTextResource.3
man/man3/Tcl_MacEvalResource.3
man/man3/Tcl_MacFindResource.3
man/man3/Tcl_MacSetEventProc.3
+man/man3/Tcl_Main.3
man/man3/Tcl_MakeFileChannel.3
man/man3/Tcl_MakeSafe.3
man/man3/Tcl_MakeTcpClientChannel.3
@@ -671,7 +672,6 @@ man/mann/info.n
man/mann/interp.n
man/mann/join.n
man/mann/lappend.n
-man/mann/library.n
man/mann/lindex.n
man/mann/linsert.n
man/mann/list.n
@@ -687,11 +687,9 @@ man/mann/msgcat.n
man/mann/namespace.n
man/mann/open.n
man/mann/package.n
-man/mann/packagens.n
man/mann/parray.n
man/mann/pid.n
man/mann/pkg::create.n
-man/mann/pkgMkIndex.n
man/mann/pkg_mkIndex.n
man/mann/proc.n
man/mann/puts.n
@@ -704,7 +702,6 @@ man/mann/regsub.n
man/mann/rename.n
man/mann/resource.n
man/mann/return.n
-man/mann/safe.n
man/mann/scan.n
man/mann/seek.n
man/mann/set.n
@@ -736,7 +733,7 @@ man/mann/while.n
@dirrm lib/tcl8.4/tcltest2.2
@dirrm lib/tcl8.4/opt0.4
@dirrm lib/tcl8.4/msgcat1.3
-@dirrm lib/tcl8.4/http2.4
+@dirrm lib/tcl8.4/http2.5
@dirrm lib/tcl8.4/http1.0
@dirrm lib/tcl8.4/encoding
@dirrm lib/tcl8.4
diff --git a/lang/tcl/distinfo b/lang/tcl/distinfo
index a9d8f2aba3a..33db5f4ef37 100644
--- a/lang/tcl/distinfo
+++ b/lang/tcl/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.26 2004/10/04 02:15:52 minskim Exp $
+$NetBSD: distinfo,v 1.27 2004/11/26 10:30:01 adam Exp $
-SHA1 (tcl8.4.7-src.tar.gz) = 1529d8473bde5ba3430a93047d546697fe6dee7b
-Size (tcl8.4.7-src.tar.gz) = 3472974 bytes
-SHA1 (patch-aa) = 5c5034b02b753f129124ee3a337772abaf83ef48
-SHA1 (patch-ab) = 7981c3ec9c4aaa1fb81755705478a996adcdf967
+SHA1 (tcl8.4.8-src.tar.gz) = 6b3f618aa8525cde1f10a613bd013fb9138f618b
+Size (tcl8.4.8-src.tar.gz) = 3492731 bytes
+SHA1 (patch-aa) = b9a40bcc2873065714f802e8605709da8532eeee
+SHA1 (patch-ab) = 44aff6dfb3c87d36a9aca16e33f693e356346238
SHA1 (patch-ac) = ca2409270eee18ca2c8ddf9a002d9fff95053e4d
-SHA1 (patch-ae) = 1a5d12dc602dcde257e6b3e139f0d975ece74983
-SHA1 (patch-af) = e28694b1dcd5ffd423469b3c15a7786398c187d1
+SHA1 (patch-ae) = f086af46134e7698e71a9cf1b5668f32ae722d46
+SHA1 (patch-af) = 86a31fbab57616868991661afbccaedc2dadaa32
SHA1 (patch-ag) = 0a11bfc878d43b15f6444923fac18b4876b62398
SHA1 (patch-ah) = 0aaa349fcf9ce736e1f7d3dad377ee355f549ecb
diff --git a/lang/tcl/patches/patch-aa b/lang/tcl/patches/patch-aa
index b9fb68a272e..fb47dc43e1e 100644
--- a/lang/tcl/patches/patch-aa
+++ b/lang/tcl/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.12 2004/10/01 13:35:37 adam Exp $
+$NetBSD: patch-aa,v 1.13 2004/11/26 10:30:01 adam Exp $
---- Makefile.in.orig 2004-07-26 21:40:46.000000000 +0000
+--- Makefile.in.orig 2004-11-19 18:49:51.000000000 +0000
+++ Makefile.in
@@ -172,8 +172,8 @@ SHELL = /bin/sh
INSTALL_STRIP_PROGRAM = -s
@@ -39,9 +39,9 @@ $NetBSD: patch-aa,v 1.12 2004/10/01 13:35:37 adam Exp $
+CC = ${LIBTOOL} --mode=compile @CC@
+LD = ${LIBTOOL} --mode=link @CC@
- # Flags to be passed to mkLinks to control whether the manpages
+ # Flags to be passed to installManPage to control whether the manpages
# should be compressed and linked with softlinks
-@@ -445,7 +447,7 @@ SRCS = $(GENERIC_SRCS) $(UNIX_SRCS) $(ST
+@@ -447,7 +449,7 @@ SRCS = $(GENERIC_SRCS) $(UNIX_SRCS) $(ST
all: binaries libraries doc
@@ -50,7 +50,7 @@ $NetBSD: patch-aa,v 1.12 2004/10/01 13:35:37 adam Exp $
libraries:
-@@ -453,7 +455,7 @@ doc:
+@@ -455,7 +457,7 @@ doc:
# The following target is configured by autoconf to generate either
# a shared library or non-shared library for Tcl.
@@ -59,7 +59,7 @@ $NetBSD: patch-aa,v 1.12 2004/10/01 13:35:37 adam Exp $
rm -f $@
@MAKE_LIB@
-@@ -473,8 +475,8 @@ tclLibObjs:
+@@ -475,8 +477,8 @@ tclLibObjs:
objs: ${OBJS}
@@ -70,7 +70,7 @@ $NetBSD: patch-aa,v 1.12 2004/10/01 13:35:37 adam Exp $
${CC_SEARCH_FLAGS} -o tclsh
# Resetting the LIB_RUNTIME_DIR below is required so that
-@@ -482,11 +484,11 @@ tclsh: ${TCLSH_OBJS} ${TCL_LIB_FILE}
+@@ -484,11 +486,11 @@ tclsh: ${TCLSH_OBJS} ${TCL_LIB_FILE}
# burned into its ld search path. This keeps tcltest from
# picking up an already installed version of the Tcl library.
@@ -84,7 +84,7 @@ $NetBSD: patch-aa,v 1.12 2004/10/01 13:35:37 adam Exp $
${CC_SEARCH_FLAGS} -o tcltest
# Note, in the target below TCL_LIBRARY needs to be set or else
-@@ -1054,7 +1056,7 @@ tclMacOSXBundle.o: $(MAC_OSX_DIR)/tclMac
+@@ -1040,7 +1042,7 @@ tclMacOSXBundle.o: $(MAC_OSX_DIR)/tclMac
xttest: ${XTTEST_OBJS} ${GENERIC_OBJS} ${UNIX_OBJS} ${COMPAT_OBJS} \
@DL_OBJS@ ${BUILD_DLTEST}
diff --git a/lang/tcl/patches/patch-ab b/lang/tcl/patches/patch-ab
index c1eecc8fb24..5b7c8d4688e 100644
--- a/lang/tcl/patches/patch-ab
+++ b/lang/tcl/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.26 2004/10/01 13:35:37 adam Exp $
+$NetBSD: patch-ab,v 1.27 2004/11/26 10:30:01 adam Exp $
---- configure.orig 2004-07-26 21:40:46.000000000 +0000
+--- configure.orig 2004-11-19 18:49:51.000000000 +0000
+++ configure
-@@ -2076,12 +2076,13 @@ fi
+@@ -2103,12 +2103,13 @@ fi
# Step 3: set configuration options based on system name and version.
do64bit_ok=no
@@ -17,7 +17,7 @@ $NetBSD: patch-ab,v 1.26 2004/10/01 13:35:37 adam Exp $
CFLAGS_DEBUG=-g
CFLAGS_OPTIMIZE=-O
if test "$GCC" = "yes" ; then
-@@ -2751,6 +2752,9 @@ fi
+@@ -2778,6 +2779,9 @@ fi
LD_SEARCH_FLAGS=""
;;
NetBSD-*|FreeBSD-[1-2].*)
@@ -27,7 +27,7 @@ $NetBSD: patch-ab,v 1.26 2004/10/01 13:35:37 adam Exp $
# Not available on all versions: check for include file.
ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-@@ -2783,13 +2787,11 @@ if eval "test \"`echo '$ac_cv_header_'$a
+@@ -2810,13 +2814,11 @@ if eval "test \"`echo '$ac_cv_header_'$a
# NetBSD/SPARC needs -fPIC, -fpic will not do.
SHLIB_CFLAGS="-fPIC"
@@ -39,9 +39,9 @@ $NetBSD: patch-ab,v 1.26 2004/10/01 13:35:37 adam Exp $
CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
- LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
echo $ac_n "checking for ELF""... $ac_c" 1>&6
- echo "configure:2795: checking for ELF" >&5
+ echo "configure:2822: checking for ELF" >&5
cat > conftest.$ac_ext <<EOF
-@@ -2804,11 +2806,20 @@ EOF
+@@ -2831,11 +2833,20 @@ EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "yes" >/dev/null 2>&1; then
rm -rf conftest*
@@ -64,7 +64,7 @@ $NetBSD: patch-ab,v 1.26 2004/10/01 13:35:37 adam Exp $
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
fi
-@@ -3424,16 +3435,16 @@ fi
+@@ -3451,16 +3462,16 @@ fi
fi
if test "$SHARED_LIB_SUFFIX" = "" ; then
@@ -85,7 +85,7 @@ $NetBSD: patch-ab,v 1.26 2004/10/01 13:35:37 adam Exp $
else
LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
-@@ -7251,7 +7262,7 @@ elif test "$SHARED_BUILD" = "0" || test
+@@ -7282,7 +7293,7 @@ elif test "$SHARED_BUILD" = "0" || test
TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}"
fi
TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}"
@@ -94,7 +94,7 @@ $NetBSD: patch-ab,v 1.26 2004/10/01 13:35:37 adam Exp $
else
TCL_BUILD_EXP_FILE="lib.exp"
eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}"
-@@ -7281,13 +7292,19 @@ VERSION=${TCL_VERSION}
+@@ -7312,13 +7323,19 @@ VERSION=${TCL_VERSION}
#--------------------------------------------------------------------
if test "$FRAMEWORK_BUILD" = "1" ; then
diff --git a/lang/tcl/patches/patch-ae b/lang/tcl/patches/patch-ae
index caa1372f83e..15648dc4dd0 100644
--- a/lang/tcl/patches/patch-ae
+++ b/lang/tcl/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.5 2004/10/01 13:35:37 adam Exp $
+$NetBSD: patch-ae,v 1.6 2004/11/26 10:30:01 adam Exp $
---- configure.in.orig 2004-07-26 21:40:46.000000000 +0000
+--- configure.in.orig 2004-11-19 18:49:51.000000000 +0000
+++ configure.in
-@@ -478,7 +478,7 @@ elif test "$SHARED_BUILD" = "0" || test
+@@ -479,7 +479,7 @@ elif test "$SHARED_BUILD" = "0" || test
TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}"
fi
TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}"
@@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.5 2004/10/01 13:35:37 adam Exp $
else
TCL_BUILD_EXP_FILE="lib.exp"
eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}"
-@@ -508,13 +508,19 @@ VERSION=${TCL_VERSION}
+@@ -509,13 +509,19 @@ VERSION=${TCL_VERSION}
#--------------------------------------------------------------------
if test "$FRAMEWORK_BUILD" = "1" ; then
diff --git a/lang/tcl/patches/patch-af b/lang/tcl/patches/patch-af
index 135f4f3ed9d..7f27ea9788f 100644
--- a/lang/tcl/patches/patch-af
+++ b/lang/tcl/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.12 2004/10/01 13:35:37 adam Exp $
+$NetBSD: patch-af,v 1.13 2004/11/26 10:30:01 adam Exp $
---- tcl.m4.orig 2004-07-26 21:40:46.000000000 +0000
+--- tcl.m4.orig 2004-11-19 18:49:51.000000000 +0000
+++ tcl.m4
-@@ -802,6 +802,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
+@@ -826,6 +826,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
# Step 3: set configuration options based on system name and version.
do64bit_ok=no
@@ -10,7 +10,7 @@ $NetBSD: patch-af,v 1.12 2004/10/01 13:35:37 adam Exp $
LDFLAGS_ORIG="$LDFLAGS"
TCL_EXPORT_FILE_SUFFIX=""
UNSHARED_LIB_SUFFIX=""
-@@ -1076,6 +1077,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1100,6 +1101,9 @@ dnl AC_CHECK_TOOL(AR, ar)
DL_LIBS=""
CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
@@ -20,7 +20,7 @@ $NetBSD: patch-af,v 1.12 2004/10/01 13:35:37 adam Exp $
;;
IRIX-6.*)
SHLIB_CFLAGS=""
-@@ -1101,6 +1105,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1125,6 +1129,9 @@ dnl AC_CHECK_TOOL(AR, ar)
esac
LDFLAGS="$LDFLAGS -n32"
fi
@@ -30,7 +30,7 @@ $NetBSD: patch-af,v 1.12 2004/10/01 13:35:37 adam Exp $
;;
IRIX64-6.*)
SHLIB_CFLAGS=""
-@@ -1124,6 +1131,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1148,6 +1155,9 @@ dnl AC_CHECK_TOOL(AR, ar)
LDFLAGS="$LDFLAGS -64"
fi
fi
@@ -40,7 +40,7 @@ $NetBSD: patch-af,v 1.12 2004/10/01 13:35:37 adam Exp $
;;
Linux*)
SHLIB_CFLAGS="-fPIC"
-@@ -1169,6 +1179,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1193,6 +1203,9 @@ dnl AC_CHECK_TOOL(AR, ar)
# XIM peeking works under XFree86.
AC_DEFINE(PEEK_XCLOSEIM)
@@ -50,7 +50,7 @@ $NetBSD: patch-af,v 1.12 2004/10/01 13:35:37 adam Exp $
;;
GNU*)
SHLIB_CFLAGS="-fPIC"
-@@ -1216,28 +1229,36 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1240,28 +1253,36 @@ dnl AC_CHECK_TOOL(AR, ar)
LD_SEARCH_FLAGS=""
;;
NetBSD-*|FreeBSD-[[1-2]].*)
@@ -91,7 +91,7 @@ $NetBSD: patch-af,v 1.12 2004/10/01 13:35:37 adam Exp $
], [
SHLIB_CFLAGS=""
SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r"
-@@ -1546,6 +1567,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1570,6 +1591,9 @@ dnl AC_CHECK_TOOL(AR, ar)
CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
fi
@@ -101,7 +101,7 @@ $NetBSD: patch-af,v 1.12 2004/10/01 13:35:37 adam Exp $
;;
ULTRIX-4.*)
SHLIB_CFLAGS="-G 0"
-@@ -1725,8 +1749,8 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1749,8 +1773,8 @@ dnl AC_CHECK_TOOL(AR, ar)
if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then
LIB_SUFFIX=${SHARED_LIB_SUFFIX}
@@ -112,7 +112,7 @@ $NetBSD: patch-af,v 1.12 2004/10/01 13:35:37 adam Exp $
else
LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
-@@ -1756,10 +1780,10 @@ dnl esac
+@@ -1780,10 +1804,10 @@ dnl esac
# Stub lib does not depend on shared/static configuration
if test "$RANLIB" = "" ; then
diff --git a/x11/tk/Makefile b/x11/tk/Makefile
index dc7caa5e619..817666898b0 100644
--- a/x11/tk/Makefile
+++ b/x11/tk/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2004/10/03 00:18:38 tv Exp $
+# $NetBSD: Makefile,v 1.38 2004/11/26 10:31:08 adam Exp $
-DISTNAME= tk8.4.7-src
-PKGNAME= tk-8.4.7
-PKGREVISION= 1
-CATEGORIES= x11
+DISTNAME= tk8.4.8-src
+PKGNAME= tk-8.4.8
+CATEGORIES= x11 lang
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/}
MAINTAINER= jwise@NetBSD.org
@@ -13,14 +12,15 @@ COMMENT= Graphical toolkit for TCL
PKG_INSTALLATION_TYPES= overwrite pkgviews
WRKSRC= ${WRKDIR}/${DISTNAME:C/-src//}/unix
+
+USE_X11= yes
+USE_LIBTOOL= yes
+USE_BUILDLINK3= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib
CONFIGURE_ARGS+= --enable-threads
MAKE_ENV+= TOUCH="${TOUCH}"
-USE_X11= yes
-USE_LIBTOOL= yes
-USE_BUILDLINK3= yes
TEST_TARGET= test
# Initially install the man pages into ${WRKDIR}/man, as we need a staged
diff --git a/x11/tk/PLIST b/x11/tk/PLIST
index 9f2a2250ae2..2d8e8ab04aa 100644
--- a/x11/tk/PLIST
+++ b/x11/tk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2004/09/22 08:10:07 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/11/26 10:31:08 adam Exp $
bin/wish
bin/wish8.4
include/tk.h
@@ -311,6 +311,7 @@ man/man3/Tk_HandleEvent.3
man/man3/Tk_Height.3
man/man3/Tk_IdToWindow.3
man/man3/Tk_ImageChanged.3
+man/man3/Tk_Init.3
man/man3/Tk_InitImageArgs.3
man/man3/Tk_InitOptions.3
man/man3/Tk_InitStubs.3
@@ -417,21 +418,16 @@ man/mann/bitmap.n
man/mann/button.n
man/mann/canvas.n
man/mann/checkbutton.n
-man/mann/chooseColor.n
-man/mann/chooseDirectory.n
man/mann/clipboard.n
man/mann/colors.n
man/mann/console.n
man/mann/cursors.n
man/mann/destroy.n
-man/mann/dialog.n
man/mann/entry.n
man/mann/event.n
man/mann/focus.n
-man/mann/focusNext.n
man/mann/font.n
man/mann/frame.n
-man/mann/getOpenFile.n
man/mann/grab.n
man/mann/grid.n
man/mann/image.n
@@ -442,20 +438,15 @@ man/mann/listbox.n
man/mann/loadTk.n
man/mann/lower.n
man/mann/menu.n
-man/mann/menubar.n
man/mann/menubutton.n
man/mann/message.n
-man/mann/messageBox.n
man/mann/option.n
-man/mann/optionMenu.n
man/mann/options.n
man/mann/pack-old.n
man/mann/pack.n
-man/mann/palette.n
man/mann/panedwindow.n
man/mann/photo.n
man/mann/place.n
-man/mann/popup.n
man/mann/radiobutton.n
man/mann/raise.n
man/mann/scale.n
diff --git a/x11/tk/distinfo b/x11/tk/distinfo
index 5d630d07b13..660d731ce62 100644
--- a/x11/tk/distinfo
+++ b/x11/tk/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.17 2004/10/01 13:35:53 adam Exp $
+$NetBSD: distinfo,v 1.18 2004/11/26 10:31:08 adam Exp $
-SHA1 (tk8.4.7-src.tar.gz) = e91c16a640ce38c8f5b870647fb659fe7c7ae513
-Size (tk8.4.7-src.tar.gz) = 3186531 bytes
-SHA1 (patch-aa) = 55cbfbe84c3b952276b6ab7866f96680cd3d2b5b
-SHA1 (patch-ab) = e98e9b26d59326ac6f5bb9ee07c6fc4442bbc84a
-SHA1 (patch-ac) = 23ab38fa66e75b491e6652e8b0e4f3bd83618fa0
+SHA1 (tk8.4.8-src.tar.gz) = 0d4d50de5877ece0e6c1d63a2bcf28206fca2200
+Size (tk8.4.8-src.tar.gz) = 3265937 bytes
+SHA1 (patch-aa) = 0a241f1b2803f3d9bd998947d3284a3ee6659a76
+SHA1 (patch-ab) = c204afea18379273e97a14708d92635a0b7c3220
+SHA1 (patch-ac) = d0373617f76f6e62ecf80d7290fb4ae8388521bf
SHA1 (patch-ad) = 24a677844b702f82b57af88ecc6659c858f87130
diff --git a/x11/tk/patches/patch-aa b/x11/tk/patches/patch-aa
index 48df80d03a0..83f172c8ceb 100644
--- a/x11/tk/patches/patch-aa
+++ b/x11/tk/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.12 2004/10/01 13:35:53 adam Exp $
+$NetBSD: patch-aa,v 1.13 2004/11/26 10:31:08 adam Exp $
---- Makefile.in.orig Mon Mar 1 19:04:48 2004
+--- Makefile.in.orig 2004-11-19 18:50:17.000000000 +0000
+++ Makefile.in
@@ -80,7 +80,7 @@ MANN_INSTALL_DIR = $(MAN_INSTALL_DIR)/ma
# The directory containing the Tcl sources and headers appropriate
@@ -41,7 +41,7 @@ $NetBSD: patch-aa,v 1.12 2004/10/01 13:35:53 adam Exp $
TK_SHLIB_LD_EXTRAS = @TK_SHLIB_LD_EXTRAS@
@@ -274,7 +275,8 @@ TOOL_DIR = @TCL_SRC_DIR@/tools
# should be compressed and linked with softlinks
- MKLINKS_FLAGS = @MKLINKS_FLAGS@
+ MAN_FLAGS = @MAN_FLAGS@
-CC = @CC@
+CC = ${LIBTOOL} --mode=compile @CC@
@@ -96,7 +96,7 @@ $NetBSD: patch-aa,v 1.12 2004/10/01 13:35:53 adam Exp $
@TK_BUILD_LIB_SPEC@ \
$(WISH_LIBS) $(LD_SEARCH_FLAGS) -lXt -o xttest
-@@ -507,7 +509,7 @@ install-strip:
+@@ -513,7 +515,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 21bbdb97210..cae94b77b96 100644
--- a/x11/tk/patches/patch-ab
+++ b/x11/tk/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.17 2004/10/01 13:35:53 adam Exp $
+$NetBSD: patch-ab,v 1.18 2004/11/26 10:31:09 adam Exp $
---- configure.orig 2004-07-29 21:57:48.000000000 +0000
+--- configure.orig 2004-11-19 18:50:17.000000000 +0000
+++ configure
-@@ -1788,12 +1788,13 @@ fi
+@@ -1815,12 +1815,13 @@ fi
# Step 3: set configuration options based on system name and version.
do64bit_ok=no
@@ -17,7 +17,7 @@ $NetBSD: patch-ab,v 1.17 2004/10/01 13:35:53 adam Exp $
CFLAGS_DEBUG=-g
CFLAGS_OPTIMIZE=-O
if test "$GCC" = "yes" ; then
-@@ -2495,7 +2496,6 @@ if eval "test \"`echo '$ac_cv_header_'$a
+@@ -2522,7 +2523,6 @@ if eval "test \"`echo '$ac_cv_header_'$a
# NetBSD/SPARC needs -fPIC, -fpic will not do.
SHLIB_CFLAGS="-fPIC"
@@ -25,7 +25,7 @@ $NetBSD: patch-ab,v 1.17 2004/10/01 13:35:53 adam Exp $
SHLIB_LD_LIBS=""
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
-@@ -2516,13 +2516,23 @@ EOF
+@@ -2543,13 +2543,23 @@ EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "yes" >/dev/null 2>&1; then
rm -rf conftest*
@@ -51,7 +51,7 @@ $NetBSD: patch-ab,v 1.17 2004/10/01 13:35:53 adam Exp $
fi
rm -f conftest*
-@@ -3136,16 +3146,16 @@ fi
+@@ -3163,16 +3173,16 @@ fi
fi
if test "$SHARED_LIB_SUFFIX" = "" ; then
@@ -72,7 +72,7 @@ $NetBSD: patch-ab,v 1.17 2004/10/01 13:35:53 adam Exp $
else
LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
-@@ -4499,7 +4509,11 @@ echo "configure:4497: checking for X11 l
+@@ -4526,7 +4536,11 @@ echo "configure:4524: 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
@@ -85,7 +85,7 @@ $NetBSD: patch-ab,v 1.17 2004/10/01 13:35:53 adam Exp $
x_libraries="$i"
break
fi
-@@ -4508,7 +4522,11 @@ echo "configure:4497: checking for X11 l
+@@ -4535,7 +4549,11 @@ echo "configure:4524: checking for X11 l
if test "$x_libraries" = ""; then
XLIBSW=-lX11
else
@@ -98,7 +98,7 @@ $NetBSD: patch-ab,v 1.17 2004/10/01 13:35:53 adam Exp $
fi
fi
if test "$XLIBSW" = nope ; then
-@@ -4578,6 +4596,10 @@ if test "x${x_libraries}" != "x"; then
+@@ -4605,6 +4623,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'`
@@ -109,7 +109,7 @@ $NetBSD: patch-ab,v 1.17 2004/10/01 13:35:53 adam Exp $
fi
# The statement below is very tricky! It actually *evaluates* the
-@@ -5129,11 +5151,18 @@ eval "TK_LIB_FILE=${TK_LIB_FILE}"
+@@ -5156,11 +5178,18 @@ eval "TK_LIB_FILE=${TK_LIB_FILE}"
if test "$SHARED_BUILD" = 0 -o $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 d1f89d2fb41..85438bc8bad 100644
--- a/x11/tk/patches/patch-ac
+++ b/x11/tk/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.9 2004/10/01 13:35:53 adam Exp $
+$NetBSD: patch-ac,v 1.10 2004/11/26 10:31:09 adam Exp $
---- tcl.m4.orig 2004-07-29 21:57:48.000000000 +0000
+--- tcl.m4.orig 2004-11-19 18:50:17.000000000 +0000
+++ tcl.m4
-@@ -802,6 +802,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
+@@ -826,6 +826,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
# Step 3: set configuration options based on system name and version.
do64bit_ok=no
@@ -10,7 +10,7 @@ $NetBSD: patch-ac,v 1.9 2004/10/01 13:35:53 adam Exp $
LDFLAGS_ORIG="$LDFLAGS"
TCL_EXPORT_FILE_SUFFIX=""
UNSHARED_LIB_SUFFIX=""
-@@ -1076,6 +1077,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1100,6 +1101,9 @@ dnl AC_CHECK_TOOL(AR, ar)
DL_LIBS=""
CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
@@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.9 2004/10/01 13:35:53 adam Exp $
;;
IRIX-6.*)
SHLIB_CFLAGS=""
-@@ -1101,6 +1105,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1125,6 +1129,9 @@ dnl AC_CHECK_TOOL(AR, ar)
esac
LDFLAGS="$LDFLAGS -n32"
fi
@@ -30,7 +30,7 @@ $NetBSD: patch-ac,v 1.9 2004/10/01 13:35:53 adam Exp $
;;
IRIX64-6.*)
SHLIB_CFLAGS=""
-@@ -1124,6 +1131,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1148,6 +1155,9 @@ dnl AC_CHECK_TOOL(AR, ar)
LDFLAGS="$LDFLAGS -64"
fi
fi
@@ -40,7 +40,7 @@ $NetBSD: patch-ac,v 1.9 2004/10/01 13:35:53 adam Exp $
;;
Linux*)
SHLIB_CFLAGS="-fPIC"
-@@ -1169,6 +1179,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1193,6 +1203,9 @@ dnl AC_CHECK_TOOL(AR, ar)
# XIM peeking works under XFree86.
AC_DEFINE(PEEK_XCLOSEIM)
@@ -50,7 +50,7 @@ $NetBSD: patch-ac,v 1.9 2004/10/01 13:35:53 adam Exp $
;;
GNU*)
SHLIB_CFLAGS="-fPIC"
-@@ -1216,28 +1229,36 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1240,28 +1253,36 @@ dnl AC_CHECK_TOOL(AR, ar)
LD_SEARCH_FLAGS=""
;;
NetBSD-*|FreeBSD-[[1-2]].*)
@@ -91,7 +91,7 @@ $NetBSD: patch-ac,v 1.9 2004/10/01 13:35:53 adam Exp $
], [
SHLIB_CFLAGS=""
SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r"
-@@ -1546,6 +1567,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1570,6 +1591,9 @@ dnl AC_CHECK_TOOL(AR, ar)
CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
fi
@@ -101,7 +101,7 @@ $NetBSD: patch-ac,v 1.9 2004/10/01 13:35:53 adam Exp $
;;
ULTRIX-4.*)
SHLIB_CFLAGS="-G 0"
-@@ -1725,8 +1749,8 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1749,8 +1773,8 @@ dnl AC_CHECK_TOOL(AR, ar)
if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then
LIB_SUFFIX=${SHARED_LIB_SUFFIX}
@@ -112,7 +112,7 @@ $NetBSD: patch-ac,v 1.9 2004/10/01 13:35:53 adam Exp $
else
LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
-@@ -1756,10 +1780,10 @@ dnl esac
+@@ -1780,10 +1804,10 @@ dnl esac
# Stub lib does not depend on shared/static configuration
if test "$RANLIB" = "" ; then
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-10 16:43:52 +0000