summaryrefslogtreecommitdiff
path: root/x11/tk
diff options
context:
space:
mode:
Diffstat (limited to 'x11/tk')
-rw-r--r--x11/tk/Makefile3
-rw-r--r--x11/tk/Makefile.version4
-rw-r--r--x11/tk/PLIST3
-rw-r--r--x11/tk/buildlink3.mk6
-rw-r--r--x11/tk/distinfo15
-rw-r--r--x11/tk/patches/patch-ab58
-rw-r--r--x11/tk/patches/patch-ac54
-rw-r--r--x11/tk/patches/patch-ad8
-rw-r--r--x11/tk/patches/patch-ae18
9 files changed, 60 insertions, 109 deletions
diff --git a/x11/tk/Makefile b/x11/tk/Makefile
index cfe58ff0313..d70dee857e7 100644
--- a/x11/tk/Makefile
+++ b/x11/tk/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.55 2006/02/23 23:31:51 minskim Exp $
+# $NetBSD: Makefile,v 1.56 2006/04/27 08:18:09 adam Exp $
DISTNAME= tk${TK_VERSION}-src
PKGNAME= tk-${TK_VERSION}
-PKGREVISION= 2
CATEGORIES= x11 lang
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/}
diff --git a/x11/tk/Makefile.version b/x11/tk/Makefile.version
index e58e64d12f6..bd5f7aa6613 100644
--- a/x11/tk/Makefile.version
+++ b/x11/tk/Makefile.version
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.version,v 1.3 2006/01/16 14:48:34 adam Exp $
+# $NetBSD: Makefile.version,v 1.4 2006/04/27 08:18:09 adam Exp $
-TK_VERSION= 8.4.12
+TK_VERSION= 8.4.13
diff --git a/x11/tk/PLIST b/x11/tk/PLIST
index 1e98b51f3c6..1442645881f 100644
--- a/x11/tk/PLIST
+++ b/x11/tk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2005/07/19 11:12:25 adam Exp $
+@comment $NetBSD: PLIST,v 1.8 2006/04/27 08:18:09 adam Exp $
bin/wish
bin/wish8.4
include/tk.h
@@ -136,6 +136,7 @@ lib/tk8.4/msgs/fr.msg
lib/tk8.4/msgs/it.msg
lib/tk8.4/msgs/nl.msg
lib/tk8.4/msgs/pl.msg
+lib/tk8.4/msgs/pt.msg
lib/tk8.4/msgs/ru.msg
lib/tk8.4/obsolete.tcl
lib/tk8.4/optMenu.tcl
diff --git a/x11/tk/buildlink3.mk b/x11/tk/buildlink3.mk
index adbc3c6d40e..3c3b258bc2f 100644
--- a/x11/tk/buildlink3.mk
+++ b/x11/tk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2006/04/06 06:23:03 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2006/04/27 08:18:09 adam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
TK_BUILDLINK3_MK:= ${TK_BUILDLINK3_MK}+
@@ -11,11 +11,11 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntk}
BUILDLINK_PACKAGES+= tk
.if !empty(TK_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.tk+= tk>=8.4.6nb1
+BUILDLINK_API_DEPENDS.tk+= tk>=8.4.6nb1
BUILDLINK_ABI_DEPENDS.tk+= tk>=8.4.12nb1
BUILDLINK_PKGSRCDIR.tk?= ../../x11/tk
-BUILDLINK_FILES.tk= bin/wish*
+BUILDLINK_FILES.tk+= bin/wish*
#
# Make "-ltk" and "-ltk8.4" resolve into "-ltk84", so that we don't
# need to patch so many Makefiles.
diff --git a/x11/tk/distinfo b/x11/tk/distinfo
index e982ffbf8df..b0cf69347c4 100644
--- a/x11/tk/distinfo
+++ b/x11/tk/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.27 2006/02/23 23:31:51 minskim Exp $
+$NetBSD: distinfo,v 1.28 2006/04/27 08:18:09 adam Exp $
-SHA1 (tk8.4.12-src.tar.gz) = 05e8a82fc4ab9f825b8e7b8cbc917ea9ba31ed5d
-RMD160 (tk8.4.12-src.tar.gz) = b50e4da0bc3914e6339fc537761d550ddcf22330
-Size (tk8.4.12-src.tar.gz) = 3245547 bytes
+SHA1 (tk8.4.13-src.tar.gz) = 64d8b3e9e4a9d6408892cb5cb287b5502e56e381
+RMD160 (tk8.4.13-src.tar.gz) = a64f3672dd64024df8eb4fc8d54de23a4a764199
+Size (tk8.4.13-src.tar.gz) = 3253070 bytes
SHA1 (patch-aa) = cdb66101f4b87cb2c967f2777f8e7af9c82079cd
-SHA1 (patch-ab) = 96207d41dc0825eafc8fc70a501621e49f960f66
-SHA1 (patch-ac) = 48aec4bbe8e3d5d670f5951055f7fb2d112bac36
-SHA1 (patch-ad) = f6ea4c2fde0a916f252c30bbc2117a4af8a9f442
-SHA1 (patch-ae) = 2815cb827ee15cbdd979d4866b8a3bcdf453cc54
+SHA1 (patch-ab) = 161b15fc8743ca638befe0854b5866e0b4e3dfd0
+SHA1 (patch-ac) = 5a51c371dc819908eb20dae9ececd2bee3ed52ec
+SHA1 (patch-ad) = 811bd167aed3bab7e97aa2efcf7e3f24483230a0
diff --git a/x11/tk/patches/patch-ab b/x11/tk/patches/patch-ab
index e9288086509..dfa1fa8f654 100644
--- a/x11/tk/patches/patch-ab
+++ b/x11/tk/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.24 2006/02/23 23:31:52 minskim Exp $
+$NetBSD: patch-ab,v 1.25 2006/04/27 08:18:09 adam Exp $
---- unix/configure.orig 2005-12-06 02:42:37.000000000 +0000
+--- unix/configure.orig 2006-04-19 14:29:37.000000000 +0200
+++ unix/configure
-@@ -2007,12 +2007,13 @@ fi
+@@ -2054,12 +2054,13 @@ fi
# Step 3: set configuration options based on system name and version.
do64bit_ok=no
@@ -17,43 +17,25 @@ $NetBSD: patch-ab,v 1.24 2006/02/23 23:31:52 minskim Exp $
CFLAGS_DEBUG=-g
CFLAGS_OPTIMIZE=-O
if test "$GCC" = "yes" ; then
-@@ -2699,8 +2700,7 @@ if eval "test \"`echo '$ac_cv_header_'$a
+@@ -2746,7 +2747,6 @@ if eval "test \"`echo '$ac_cv_header_'$a
# NetBSD/SPARC needs -fPIC, -fpic will not do.
SHLIB_CFLAGS="-fPIC"
- SHLIB_LD="ld -Bshareable -x"
-- SHLIB_LD_LIBS=""
-+ SHLIB_LD_LIBS='${LIBS}'
+ SHLIB_LD_LIBS='${LIBS}'
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
- DL_LIBS=""
-@@ -2720,13 +2720,23 @@ EOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "yes" >/dev/null 2>&1; then
- rm -rf conftest*
-- echo "$ac_t""yes" 1>&6
-+
-+ echo "$ac_t""yes" 1>&6
-+ 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'
-+
- else
- rm -rf conftest*
-- echo "$ac_t""no" 1>&6
-+
-+ echo "$ac_t""no" 1>&6
-+ 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'
-
-+
+@@ -2781,6 +2781,9 @@ rm -f conftest*
fi
- rm -f conftest*
-@@ -2813,12 +2823,13 @@ rm -f conftest*
+ echo "$ac_t""$tcl_cv_ld_elf" 1>&6
++ SHLIB_LD='${TCL_CC} -shared -Wl,-x'
++ RPATH_FLAG='-Wl,-R'
++ LD_SEARCH_FLAGS='-Wl,-R${LIB_RUNTIME_DIR}'
+ if test $tcl_cv_ld_elf = yes; then
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
+ else
+@@ -2878,12 +2881,13 @@ echo "$ac_t""$tcl_cv_ld_elf" 1>&6
UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
TCL_LIB_VERSIONS_OK=nodots
;;
@@ -68,7 +50,7 @@ $NetBSD: patch-ab,v 1.24 2006/02/23 23:31:52 minskim Exp $
DL_OBJS="tclLoadDl.o"
DL_LIBS=""
LDFLAGS="$LDFLAGS -export-dynamic"
-@@ -3748,7 +3759,7 @@ fi
+@@ -3837,7 +3841,7 @@ fi
;;
IRIX*)
;;
@@ -77,7 +59,7 @@ $NetBSD: patch-ab,v 1.24 2006/02/23 23:31:52 minskim Exp $
;;
Darwin-*)
;;
-@@ -3766,16 +3777,16 @@ fi
+@@ -3855,16 +3859,16 @@ fi
fi
if test "$SHARED_LIB_SUFFIX" = "" ; then
@@ -98,7 +80,7 @@ $NetBSD: patch-ab,v 1.24 2006/02/23 23:31:52 minskim Exp $
else
LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
-@@ -5313,7 +5324,11 @@ echo "configure:5311: checking for X11 l
+@@ -5405,7 +5409,11 @@ echo "configure:5403: 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
@@ -111,7 +93,7 @@ $NetBSD: patch-ab,v 1.24 2006/02/23 23:31:52 minskim Exp $
x_libraries="$i"
break
fi
-@@ -5322,7 +5337,11 @@ echo "configure:5311: checking for X11 l
+@@ -5414,7 +5422,11 @@ echo "configure:5403: checking for X11 l
if test "$x_libraries" = ""; then
XLIBSW=-lX11
else
@@ -124,7 +106,7 @@ $NetBSD: patch-ab,v 1.24 2006/02/23 23:31:52 minskim Exp $
fi
fi
if test "$XLIBSW" = nope ; then
-@@ -5394,6 +5413,10 @@ if test "x${x_libraries}" != "x"; then
+@@ -5486,6 +5498,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'`
@@ -135,7 +117,7 @@ $NetBSD: patch-ab,v 1.24 2006/02/23 23:31:52 minskim Exp $
fi
# The statement below is very tricky! It actually *evaluates* the
-@@ -5927,11 +5950,18 @@ else
+@@ -6019,11 +6035,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 fd91bb1f618..e92b1d6a00f 100644
--- a/x11/tk/patches/patch-ac
+++ b/x11/tk/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.14 2006/02/23 23:31:52 minskim Exp $
+$NetBSD: patch-ac,v 1.15 2006/04/27 08:18:09 adam Exp $
---- unix/tcl.m4.orig 2005-12-06 02:42:37.000000000 +0000
+--- unix/tcl.m4.orig 2006-04-19 14:29:38.000000000 +0200
+++ unix/tcl.m4
-@@ -900,6 +900,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
+@@ -1032,6 +1032,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.14 2006/02/23 23:31:52 minskim Exp $
LDFLAGS_ORIG="$LDFLAGS"
TCL_EXPORT_FILE_SUFFIX=""
UNSHARED_LIB_SUFFIX=""
-@@ -1147,6 +1148,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1279,6 +1280,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.14 2006/02/23 23:31:52 minskim Exp $
;;
IRIX-6.*)
SHLIB_CFLAGS=""
-@@ -1172,6 +1176,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1304,6 +1308,9 @@ dnl AC_CHECK_TOOL(AR, ar)
esac
LDFLAGS="$LDFLAGS -n32"
fi
@@ -30,7 +30,7 @@ $NetBSD: patch-ac,v 1.14 2006/02/23 23:31:52 minskim Exp $
;;
IRIX64-6.*)
SHLIB_CFLAGS=""
-@@ -1195,6 +1202,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1327,6 +1334,9 @@ dnl AC_CHECK_TOOL(AR, ar)
LDFLAGS="$LDFLAGS -64"
fi
fi
@@ -40,7 +40,7 @@ $NetBSD: patch-ac,v 1.14 2006/02/23 23:31:52 minskim Exp $
;;
Linux*)
SHLIB_CFLAGS="-fPIC"
-@@ -1240,6 +1250,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1372,6 +1382,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.14 2006/02/23 23:31:52 minskim Exp $
;;
GNU*)
SHLIB_CFLAGS="-fPIC"
-@@ -1299,28 +1312,36 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1431,23 +1444,27 @@ dnl AC_CHECK_TOOL(AR, ar)
LD_SEARCH_FLAGS=""
;;
NetBSD-*|FreeBSD-[[1-2]].*)
@@ -62,37 +62,25 @@ $NetBSD: patch-ac,v 1.14 2006/02/23 23:31:52 minskim Exp $
# NetBSD/SPARC needs -fPIC, -fpic will not do.
SHLIB_CFLAGS="-fPIC"
- SHLIB_LD="ld -Bshareable -x"
-- SHLIB_LD_LIBS=""
-+ SHLIB_LD_LIBS='${LIBS}'
+ 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}'
- AC_MSG_CHECKING(for ELF)
- AC_EGREP_CPP(yes, [
+ AC_CACHE_CHECK([for ELF], tcl_cv_ld_elf, [
+ AC_EGREP_CPP(yes, [
#ifdef __ELF__
yes
#endif
-- ],
-+ ], [
- AC_MSG_RESULT(yes)
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so',
-+ SHLIB_LD='${TCL_CC} -shared -Wl,-x'
-+ LD_SEARCH_FLAGS='-Wl,-R${LIB_RUNTIME_DIR}'
-+ TCL_LIB_SPEC_RPATH="-Wl,-R${exec_prefix}/lib"
-+ ], [
- AC_MSG_RESULT(no)
-+ SHLIB_LD="ld -Bshareable -x"
-+ LD_SEARCH_FLAGS='-R${LIB_RUNTIME_DIR}'
-+ TCL_LIB_SPEC_RPATH="-R${exec_prefix}/lib"
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
-- )
-+ ])
- ], [
- SHLIB_CFLAGS=""
- SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r"
-@@ -1736,6 +1757,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+ ], tcl_cv_ld_elf=yes, tcl_cv_ld_elf=no)])
++ SHLIB_LD='${TCL_CC} -shared -Wl,-x'
++ LD_SEARCH_FLAGS='-Wl,-R${LIB_RUNTIME_DIR}'
++ TCL_LIB_SPEC_RPATH="-Wl,-R${exec_prefix}/lib"
+ if test $tcl_cv_ld_elf = yes; then
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
+ else
+@@ -1867,6 +1884,9 @@ dnl AC_CHECK_TOOL(AR, ar)
CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
fi
@@ -102,7 +90,7 @@ $NetBSD: patch-ac,v 1.14 2006/02/23 23:31:52 minskim Exp $
;;
ULTRIX-4.*)
SHLIB_CFLAGS="-G 0"
-@@ -1915,8 +1939,8 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -2045,8 +2065,8 @@ dnl AC_CHECK_TOOL(AR, ar)
if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then
LIB_SUFFIX=${SHARED_LIB_SUFFIX}
@@ -113,7 +101,7 @@ $NetBSD: patch-ac,v 1.14 2006/02/23 23:31:52 minskim Exp $
else
LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
-@@ -1946,10 +1970,10 @@ dnl esac
+@@ -2076,10 +2096,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 8f26a624919..b56ac2b5b64 100644
--- a/x11/tk/patches/patch-ad
+++ b/x11/tk/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.8 2006/01/16 14:48:35 adam Exp $
+$NetBSD: patch-ad,v 1.9 2006/04/27 08:18:09 adam Exp $
---- unix/configure.in.orig 2005-12-06 03:42:37.000000000 +0100
+--- unix/configure.in.orig 2006-04-19 14:29:37.000000000 +0200
+++ unix/configure.in
-@@ -301,6 +301,10 @@ if test "x${x_libraries}" != "x"; then
+@@ -296,6 +296,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'`
@@ -13,7 +13,7 @@ $NetBSD: patch-ad,v 1.8 2006/01/16 14:48:35 adam Exp $
fi
# The statement below is very tricky! It actually *evaluates* the
-@@ -475,11 +479,18 @@ else
+@@ -470,11 +474,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-ae b/x11/tk/patches/patch-ae
deleted file mode 100644
index 6cb13675d7e..00000000000
--- a/x11/tk/patches/patch-ae
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2005/11/03 23:09:24 rillig Exp $
-
---- unix/tkUnixPort.h.orig 2005-07-30 21:02:48.000000000 +0000
-+++ unix/tkUnixPort.h
-@@ -119,12 +119,7 @@
- #endif
- #define MASK_SIZE howmany(FD_SETSIZE, NFDBITS)
-
--/*
-- * Not all systems declare the errno variable in errno.h. so this
-- * file does it explicitly.
-- */
--
--extern int errno;
-+#include <errno.h>
-
- /*
- * Define "NBBY" (number of bits per byte) if it's not already defined.
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-24 20:25:19 +0000