summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2013-05-31 20:15:04 +0000
committeradam <adam@pkgsrc.org>2013-05-31 20:15:04 +0000
commit385a7e2f993cb4ee869d13809b9e2709ce273dab (patch)
treeae3b3cdadab82da5bbee3a1bebcf7dcb1315bda5
parent7cf213330b718e196865d67299d1e8f429d6e7d8 (diff)
downloadpkgsrc-385a7e2f993cb4ee869d13809b9e2709ce273dab.tar.gz
Changes 8.5.14:
Bug-fix release.
Diffstat
-rw-r--r--lang/tcl/Makefile.version4
-rw-r--r--lang/tcl/distinfo16
-rw-r--r--lang/tcl/patches/patch-generic_tclPort.h14
-rw-r--r--lang/tcl/patches/patch-unix_Makefile.in16
-rw-r--r--lang/tcl/patches/patch-unix_configure28
-rw-r--r--lang/tcl/patches/patch-unix_tclUnixPort.h25
-rw-r--r--x11/tk/Makefile3
-rw-r--r--x11/tk/Makefile.version4
-rw-r--r--x11/tk/buildlink3.mk7
-rw-r--r--x11/tk/distinfo12
-rw-r--r--x11/tk/options.mk9
-rw-r--r--x11/tk/patches/patch-unix_Makefile.in28
-rw-r--r--x11/tk/patches/patch-unix_configure32
13 files changed, 94 insertions, 104 deletions
diff --git a/lang/tcl/Makefile.version b/lang/tcl/Makefile.version
index a0f35517654..9c8fd1d9587 100644
--- a/lang/tcl/Makefile.version
+++ b/lang/tcl/Makefile.version
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile.version,v 1.10 2012/11/24 21:38:49 adam Exp $
+# $NetBSD: Makefile.version,v 1.11 2013/05/31 20:15:04 adam Exp $
TCL_SONUM= 85
TCL_BASEVER= 8.5
-TCL_VERSION= 8.5.13
+TCL_VERSION= 8.5.14
diff --git a/lang/tcl/distinfo b/lang/tcl/distinfo
index c21ea8de5dc..576dadf0ea7 100644
--- a/lang/tcl/distinfo
+++ b/lang/tcl/distinfo
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.55 2013/04/08 14:19:38 kivinen Exp $
+$NetBSD: distinfo,v 1.56 2013/05/31 20:15:04 adam Exp $
-SHA1 (tcl8.5.13-src.tar.gz) = 65b677dc699426233b926edfa9e304d456da7cad
-RMD160 (tcl8.5.13-src.tar.gz) = 20cfb8adebd77a6d037f67a9af7e88d80032b3c2
-Size (tcl8.5.13-src.tar.gz) = 4513204 bytes
+SHA1 (tcl8.5.14-src.tar.gz) = 9bc452eec453c2ed37625874b9011563db687b07
+RMD160 (tcl8.5.14-src.tar.gz) = 32ed2009f28c357af87cad7815c56488f5bd5222
+Size (tcl8.5.14-src.tar.gz) = 4528533 bytes
SHA1 (patch-generic_tclInt.h) = 13289d8fcf5021898b06a9608bc05fc968a1ba5c
-SHA1 (patch-generic_tclPort.h) = cd44f24c79048a70e2c4929aa1499ee336602ba5
+SHA1 (patch-generic_tclPort.h) = 36ff05b22591d588952e55d0f13c2ef52e371d1e
SHA1 (patch-generic_tclPosixStr.c) = 8c252a4f3d8898fb48544d15123d6a8ddc3172f0
SHA1 (patch-tests_load.test) = 438695ab76e01646e49aadc01c44344a5495eabb
SHA1 (patch-tests_pkgMkIndex.test) = 70d1042c1f4743052c5fa191fa7c4732a08e28a2
-SHA1 (patch-unix_Makefile.in) = c87f98382790ff40aa54aabb99361f6c469dc050
-SHA1 (patch-unix_configure) = 2e1e6d2020e68b91b94c0b05cb1d349126989adc
+SHA1 (patch-unix_Makefile.in) = 5944654dcecf8bac76776d22a033e384a8f33cf8
+SHA1 (patch-unix_configure) = 2e37252168e24b133d7888d1e3f47b332e162977
SHA1 (patch-unix_tclConfig.sh.in) = 5a32d8e97240d14f3a03e205637fe3bf8307d868
SHA1 (patch-unix_tclUnixCompat.c) = 7ffa40a1a56345f5b86cd896e8e3b0d5748d8c5e
SHA1 (patch-unix_tclUnixFCmd.c) = a56a12b8a0068e914d10336076347ca2b0ba9ac7
SHA1 (patch-unix_tclUnixInit.c) = 4cbddb3e1a9ed4bbbf2d8de0df1a9032fc5b2629
-SHA1 (patch-unix_tclUnixPort.h) = 2965dd6ef6560e0a6385c6cb286754f63c98c827
+SHA1 (patch-unix_tclUnixPort.h) = c4f1c26228b36563c44e5c27824955882c3a675f
diff --git a/lang/tcl/patches/patch-generic_tclPort.h b/lang/tcl/patches/patch-generic_tclPort.h
index 2a8d3b6ac72..6247896a0ac 100644
--- a/lang/tcl/patches/patch-generic_tclPort.h
+++ b/lang/tcl/patches/patch-generic_tclPort.h
@@ -1,13 +1,13 @@
-$NetBSD: patch-generic_tclPort.h,v 1.1 2012/08/21 21:31:47 marino Exp $
+$NetBSD: patch-generic_tclPort.h,v 1.2 2013/05/31 20:15:04 adam Exp $
---- generic/tclPort.h.orig 2012-07-16 11:57:05.000000000 +0000
+--- generic/tclPort.h.orig 2013-03-21 12:57:40.000000000 +0000
+++ generic/tclPort.h
-@@ -22,7 +22,7 @@
- #endif
- #include "tcl.h"
- #if !defined(_WIN32)
+@@ -20,7 +20,7 @@
+ #if defined(_WIN32)
+ # include "tclWinPort.h"
+ #else
-# include "tclUnixPort.h"
+# include "../unix/tclUnixPort.h"
#endif
+ #include "tcl.h"
- #if !defined(LLONG_MIN)
diff --git a/lang/tcl/patches/patch-unix_Makefile.in b/lang/tcl/patches/patch-unix_Makefile.in
index 55f986664e5..198932c8fa9 100644
--- a/lang/tcl/patches/patch-unix_Makefile.in
+++ b/lang/tcl/patches/patch-unix_Makefile.in
@@ -118,8 +118,8 @@
@@ -767,21 +789,26 @@
$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \
done;
- @echo "Installing package http 2.7.10 as a Tcl Module";
-- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.10.tm;
+ @echo "Installing package http 2.7.11 as a Tcl Module";
+- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.11.tm;
+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/http/http.tcl;
+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/http/pkgIndex.tcl;
@echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/";
@@ -127,17 +127,17 @@
do \
$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/opt0.4; \
done;
- @echo "Installing package msgcat 1.5.0 as a Tcl Module";
-- @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.5.0.tm;
+ @echo "Installing package msgcat 1.5.1 as a Tcl Module";
+- @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.5.1.tm;
+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat1.4/msgcat.tcl;
+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat1.4/pkgIndex.tcl;
- @echo "Installing package tcltest 2.3.4 as a Tcl Module";
-- @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.4.tm;
+ @echo "Installing package tcltest 2.3.5 as a Tcl Module";
+- @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.5.tm;
+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest2.3/tcltest.tcl;
+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest2.3/pkgIndex.tcl;
- @echo "Installing package platform 1.0.10 as a Tcl Module";
-- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.10.tm;
+ @echo "Installing package platform 1.0.11 as a Tcl Module";
+- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.11.tm;
+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/platform1.0/platform.tcl;
+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/platform1.0/pkgIndex.tcl;
@echo "Installing package platform::shell 1.1.4 as a Tcl Module";
diff --git a/lang/tcl/patches/patch-unix_configure b/lang/tcl/patches/patch-unix_configure
index d925b598a3c..263d1b186b6 100644
--- a/lang/tcl/patches/patch-unix_configure
+++ b/lang/tcl/patches/patch-unix_configure
@@ -1,8 +1,8 @@
-$NetBSD: patch-unix_configure,v 1.3 2012/08/23 16:14:43 adam Exp $
+$NetBSD: patch-unix_configure,v 1.4 2013/05/31 20:15:04 adam Exp $
---- unix/configure.orig 2012-07-25 16:45:05.000000000 +0000
+--- unix/configure.orig 2013-04-01 18:36:35.000000000 +0000
+++ unix/configure
-@@ -7631,7 +7631,7 @@ fi
+@@ -7616,7 +7616,7 @@ fi
UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
TCL_LIB_VERSIONS_OK=nodots
;;
@@ -11,7 +11,7 @@ $NetBSD: patch-unix_configure,v 1.3 2012/08/23 16:14:43 adam Exp $
arch=`arch -s`
case "$arch" in
m88k|vax)
-@@ -7749,11 +7749,10 @@ fi
+@@ -7734,11 +7734,10 @@ fi
;;
esac
;;
@@ -24,7 +24,7 @@ $NetBSD: patch-unix_configure,v 1.3 2012/08/23 16:14:43 adam Exp $
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS=""
-@@ -7779,7 +7778,6 @@ fi
+@@ -7764,7 +7763,6 @@ fi
TCL_LIB_VERSIONS_OK=nodots
;;
Darwin-*)
@@ -32,7 +32,7 @@ $NetBSD: patch-unix_configure,v 1.3 2012/08/23 16:14:43 adam Exp $
SHLIB_CFLAGS="-fno-common"
# To avoid discrepancies between what headers configure sees during
# preprocessing tests and compiling tests, move any -isysroot and
-@@ -8953,7 +8951,7 @@ fi
+@@ -8938,7 +8936,7 @@ fi
BSD/OS*) ;;
CYGWIN_*|MINGW32_*) ;;
IRIX*) ;;
@@ -41,7 +41,7 @@ $NetBSD: patch-unix_configure,v 1.3 2012/08/23 16:14:43 adam Exp $
Darwin-*) ;;
SCO_SV-3.2*) ;;
*) SHLIB_CFLAGS="-fPIC" ;;
-@@ -8984,7 +8982,11 @@ fi
+@@ -8969,7 +8967,11 @@ fi
else
@@ -54,7 +54,7 @@ $NetBSD: patch-unix_configure,v 1.3 2012/08/23 16:14:43 adam Exp $
fi
-@@ -9018,7 +9020,7 @@ fi
+@@ -9003,7 +9005,7 @@ fi
else
MAKE_STUB_LIB='${STLIB_LD} $@ ${STUB_LIB_OBJS} ; ${RANLIB} $@'
@@ -63,7 +63,7 @@ $NetBSD: patch-unix_configure,v 1.3 2012/08/23 16:14:43 adam Exp $
fi
-@@ -18893,9 +18895,9 @@ fi
+@@ -18878,9 +18880,9 @@ fi
# building libtcl as a shared library instead of a static library.
#--------------------------------------------------------------------
@@ -76,7 +76,7 @@ $NetBSD: patch-unix_configure,v 1.3 2012/08/23 16:14:43 adam Exp $
# tclConfig.sh needs a version of the _LIB_SUFFIX that has been eval'ed
# since on some platforms TCL_LIB_FILE contains shell escapes.
-@@ -19000,13 +19002,10 @@ _ACEOF
+@@ -18985,13 +18987,10 @@ _ACEOF
else
# libdir must be a fully qualified path and not ${exec_prefix}/lib
eval libdir="$libdir"
@@ -93,7 +93,7 @@ $NetBSD: patch-unix_configure,v 1.3 2012/08/23 16:14:43 adam Exp $
fi
VERSION='${VERSION}'
eval "CFG_TCL_SHARED_LIB_SUFFIX=${TCL_SHARED_LIB_SUFFIX}"
-@@ -19025,12 +19024,11 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
+@@ -19010,12 +19009,11 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
TCL_PACKAGE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl ~/Library/Frameworks /Library/Frameworks /System/Library/Frameworks"
test -z "$TCL_MODULE_PATH" && \
TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl"
@@ -108,7 +108,7 @@ $NetBSD: patch-unix_configure,v 1.3 2012/08/23 16:14:43 adam Exp $
#--------------------------------------------------------------------
# The statements below define various symbols relating to Tcl
# stub support.
-@@ -19043,12 +19041,7 @@ eval "TCL_STUB_LIB_FILE=libtclstub${TCL_
+@@ -19028,12 +19026,7 @@ eval "TCL_STUB_LIB_FILE=libtclstub${TCL_
eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\""
eval "TCL_STUB_LIB_DIR=${libdir}"
@@ -122,7 +122,7 @@ $NetBSD: patch-unix_configure,v 1.3 2012/08/23 16:14:43 adam Exp $
TCL_BUILD_STUB_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TCL_STUB_LIB_FLAG}"
TCL_STUB_LIB_SPEC="-L${TCL_STUB_LIB_DIR} ${TCL_STUB_LIB_FLAG}"
TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}"
-@@ -19200,34 +19193,15 @@ fi
+@@ -19185,34 +19178,15 @@ fi
# Transform confdefs.h into DEFS.
# Protect against shell expansion while executing Makefile rules.
# Protect against Makefile macro expansion.
@@ -166,7 +166,7 @@ $NetBSD: patch-unix_configure,v 1.3 2012/08/23 16:14:43 adam Exp $
-@@ -19848,6 +19822,7 @@ s,@EXTRA_BUILD_HTML@,$EXTRA_BUILD_HTML,;
+@@ -19833,6 +19807,7 @@ s,@EXTRA_BUILD_HTML@,$EXTRA_BUILD_HTML,;
s,@EXTRA_TCLSH_LIBS@,$EXTRA_TCLSH_LIBS,;t t
s,@DLTEST_LD@,$DLTEST_LD,;t t
s,@DLTEST_SUFFIX@,$DLTEST_SUFFIX,;t t
diff --git a/lang/tcl/patches/patch-unix_tclUnixPort.h b/lang/tcl/patches/patch-unix_tclUnixPort.h
index db939689f6f..36d6ace7284 100644
--- a/lang/tcl/patches/patch-unix_tclUnixPort.h
+++ b/lang/tcl/patches/patch-unix_tclUnixPort.h
@@ -1,25 +1,8 @@
-$NetBSD: patch-unix_tclUnixPort.h,v 1.1 2012/08/21 21:31:47 marino Exp $
+$NetBSD: patch-unix_tclUnixPort.h,v 1.2 2013/05/31 20:15:04 adam Exp $
---- unix/tclUnixPort.h.orig 2012-07-16 11:57:06.000000000 +0000
+--- unix/tclUnixPort.h.orig 2013-05-31 19:30:55.000000000 +0000
+++ unix/tclUnixPort.h
-@@ -45,15 +45,7 @@
- # include <sys/param.h>
- #endif
- #include <sys/types.h>
--#ifdef USE_DIRENT2_H
--# include "../compat/dirent2.h"
--#else
--#ifdef NO_DIRENT_H
--# include "../compat/dirent.h"
--#else
--# include <dirent.h>
--#endif
--#endif
-+#include <dirent.h>
-
- /*
- *---------------------------------------------------------------------------
-@@ -135,19 +127,11 @@ typedef off_t Tcl_SeekOffset;
+@@ -121,19 +121,11 @@ typedef off_t Tcl_SeekOffset;
#if HAVE_INTTYPES_H
# include <inttypes.h>
#endif
@@ -39,5 +22,5 @@ $NetBSD: patch-unix_tclUnixPort.h,v 1.1 2012/08/21 21:31:47 marino Exp $
-#endif
+#include <unistd.h>
- MODULE_SCOPE int TclUnixSetBlockingMode(int fd, int mode);
+ extern int TclUnixSetBlockingMode(int fd, int mode);
diff --git a/x11/tk/Makefile b/x11/tk/Makefile
index ee3852f8a4b..acd973d07ce 100644
--- a/x11/tk/Makefile
+++ b/x11/tk/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.70 2012/12/12 15:30:52 wiz Exp $
+# $NetBSD: Makefile,v 1.71 2013/05/31 20:15:32 adam Exp $
DISTNAME= tk${TK_VERSION}-src
PKGNAME= tk-${TK_VERSION}
-PKGREVISION= 1
CATEGORIES= x11 lang
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/}
diff --git a/x11/tk/Makefile.version b/x11/tk/Makefile.version
index 8348d01078d..e72413d6dac 100644
--- a/x11/tk/Makefile.version
+++ b/x11/tk/Makefile.version
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile.version,v 1.10 2012/11/24 21:38:50 adam Exp $
+# $NetBSD: Makefile.version,v 1.11 2013/05/31 20:15:32 adam Exp $
TK_SONUM= 85
TK_BASEVER= 8.5
-TK_VERSION= 8.5.13
+TK_VERSION= 8.5.14
diff --git a/x11/tk/buildlink3.mk b/x11/tk/buildlink3.mk
index eb5b7d195be..8769db8f5fd 100644
--- a/x11/tk/buildlink3.mk
+++ b/x11/tk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.29 2012/12/20 22:17:23 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.30 2013/05/31 20:15:32 adam Exp $
BUILDLINK_TREE+= tk
@@ -32,9 +32,12 @@ pkgbase := tk
. include "../../x11/libXft/buildlink3.mk"
.endif
+.include "../../mk/bsd.fast.prefs.mk"
+.if ${OPSYS} != "Darwin"
+. include "../../x11/libX11/buildlink3.mk"
+.endif
.include "../../lang/tcl/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
.endif # TK_BUILDLINK3_MK
BUILDLINK_TREE+= -tk
diff --git a/x11/tk/distinfo b/x11/tk/distinfo
index 0d96814ead1..e8808b329f8 100644
--- a/x11/tk/distinfo
+++ b/x11/tk/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.39 2012/11/24 21:38:50 adam Exp $
+$NetBSD: distinfo,v 1.40 2013/05/31 20:15:32 adam Exp $
-SHA1 (tk8.5.13-src.tar.gz) = a7dc1a979201376d7e7d48ec9280839ebb52a09f
-RMD160 (tk8.5.13-src.tar.gz) = f832c61d5006f9ddef93a63db9789d158b1d6202
-Size (tk8.5.13-src.tar.gz) = 4086092 bytes
+SHA1 (tk8.5.14-src.tar.gz) = 4d0f8775746f0c780172e1e4f1fb7d78363a4b28
+RMD160 (tk8.5.14-src.tar.gz) = 8c10ae4ff0f01c1ee955b0d9664917fc06f2e192
+Size (tk8.5.14-src.tar.gz) = 4093990 bytes
SHA1 (patch-macosx_tkMacOSXClipboard.c) = ac5a5de7c0e4259a347fcb7449d304e6edb91343
SHA1 (patch-macosx_tkMacOSXDraw.c) = b241b7d70436340a5b55b7568da994465f45d2f8
-SHA1 (patch-unix_Makefile.in) = f3b1ee8ae65b1ee341ffc21aab2d7d37ffe26198
-SHA1 (patch-unix_configure) = 459a2688731fd86c4b88fb90aa2401949ff5b74f
+SHA1 (patch-unix_Makefile.in) = 6acc76bce0ecf813abf0905da19ae0d669a2e7db
+SHA1 (patch-unix_configure) = 4e7fe48d2aba0a645bb5947e920d9615c4339b9c
diff --git a/x11/tk/options.mk b/x11/tk/options.mk
index 17b364938c7..f9d011319b0 100644
--- a/x11/tk/options.mk
+++ b/x11/tk/options.mk
@@ -1,10 +1,15 @@
-# $NetBSD: options.mk,v 1.2 2012/12/12 15:30:52 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2013/05/31 20:15:32 adam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.tk
PKG_SUPPORTED_OPTIONS= threads debug xft2
-PKG_SUGGESTED_OPTIONS= threads xft2
+PKG_SUGGESTED_OPTIONS= threads
.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} != "Darwin"
+PKG_SUGGESTED_OPTIONS+= xft2
+.endif
+
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mdebug)
diff --git a/x11/tk/patches/patch-unix_Makefile.in b/x11/tk/patches/patch-unix_Makefile.in
index 5805847dadc..839c7bcfe6a 100644
--- a/x11/tk/patches/patch-unix_Makefile.in
+++ b/x11/tk/patches/patch-unix_Makefile.in
@@ -1,8 +1,8 @@
-$NetBSD: patch-unix_Makefile.in,v 1.2 2012/11/24 21:38:50 adam Exp $
+$NetBSD: patch-unix_Makefile.in,v 1.3 2013/05/31 20:15:32 adam Exp $
---- unix/Makefile.in.orig 2012-11-09 15:15:03.000000000 +0000
+--- unix/Makefile.in.orig 2013-04-01 18:36:49.000000000 +0000
+++ unix/Makefile.in
-@@ -14,6 +14,7 @@ MAJOR_VERSION = @TK_MAJOR_VERSION@
+@@ -13,6 +13,7 @@ MAJOR_VERSION = @TK_MAJOR_VERSION@
MINOR_VERSION = @TK_MINOR_VERSION@
PATCH_LEVEL = @TK_PATCH_LEVEL@
LOCALES = @LOCALES@
@@ -10,7 +10,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.2 2012/11/24 21:38:50 adam Exp $
#----------------------------------------------------------------
# Things you can change to personalize the Makefile for your own
-@@ -64,6 +65,8 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TK
+@@ -63,6 +64,8 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TK
# Directory in which to install the include file tk.h:
INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)
@@ -19,7 +19,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.2 2012/11/24 21:38:50 adam Exp $
# Path to the private tk header dir:
PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@
-@@ -100,7 +103,7 @@ DEMO_INSTALL_DIR = $(INSTALL_ROOT)$(TK_L
+@@ -99,7 +102,7 @@ DEMO_INSTALL_DIR = $(INSTALL_ROOT)$(TK_L
# The directory containing the Tcl sources and headers appropriate
# for this version of Tk ("srcdir" will be replaced or has already
# been replaced by the configure script):
@@ -28,7 +28,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.2 2012/11/24 21:38:50 adam Exp $
# The directory containing the platform specific Tcl sources and headers
# appropriate for this version of Tk:
-@@ -137,7 +140,7 @@ CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@
+@@ -136,7 +139,7 @@ CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@
#CFLAGS = $(CFLAGS_DEBUG)
#CFLAGS = $(CFLAGS_OPTIMIZE)
#CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
@@ -37,7 +37,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.2 2012/11/24 21:38:50 adam Exp $
# Flags to pass to the linker
LDFLAGS_DEBUG = @LDFLAGS_DEBUG@
-@@ -245,6 +248,7 @@ TK_STUB_LIB_FLAG = @TK_STUB_LIB_FLAG@
+@@ -244,6 +247,7 @@ TK_STUB_LIB_FLAG = @TK_STUB_LIB_FLAG@
#TK_STUB_LIB_FLAG = -ltkstub
TK_LIB_FILE = @TK_LIB_FILE@
@@ -45,7 +45,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.2 2012/11/24 21:38:50 adam Exp $
#TK_LIB_FILE = libtk.a
# Generic lib name used in rules that apply to tcl and tk
-@@ -276,6 +280,8 @@ SHLIB_LD = @SHLIB_LD@
+@@ -275,6 +279,8 @@ SHLIB_LD = @SHLIB_LD@
SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
TK_SHLIB_LD_EXTRAS = @TK_SHLIB_LD_EXTRAS@
@@ -54,7 +54,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.2 2012/11/24 21:38:50 adam Exp $
# Additional search flags needed to find the various shared libraries
# at run-time. The first symbol is for use when creating a binary
# with cc, and the second is for use when running ld directly.
-@@ -546,6 +552,9 @@ PRIVATE_HDRS = $(GENERIC_DIR)/tkInt.h $(
+@@ -545,6 +551,9 @@ PRIVATE_HDRS = $(GENERIC_DIR)/tkInt.h $(
DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget
@@ -64,7 +64,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.2 2012/11/24 21:38:50 adam Exp $
SHELL_ENV = \
@LD_LIBRARY_PATH_VAR@="`pwd`:${TCL_BIN_DIR}:$${@LD_LIBRARY_PATH_VAR@}"; \
export @LD_LIBRARY_PATH_VAR@; \
-@@ -569,6 +578,11 @@ ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} @L
+@@ -568,6 +577,11 @@ ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} @L
rm -f $@
@MAKE_LIB@
@@ -76,7 +76,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.2 2012/11/24 21:38:50 adam Exp $
${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
rm -f $@
@MAKE_STUB_LIB@
-@@ -686,7 +700,7 @@ install-strip:
+@@ -685,7 +699,7 @@ install-strip:
# some ranlibs write to current directory, and this might not always be
# possible (e.g. if installing as root).
@@ -85,7 +85,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.2 2012/11/24 21:38:50 adam Exp $
@for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" \
"$(PKG_INSTALL_DIR)" "$(CONFIG_INSTALL_DIR)" ; \
do \
-@@ -716,13 +730,20 @@ install-binaries: $(TK_LIB_FILE) $(TK_ST
+@@ -715,13 +729,20 @@ install-binaries: $(TK_LIB_FILE) $(TK_ST
fi
@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
@@INSTALL_LIB@
@@ -107,7 +107,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.2 2012/11/24 21:38:50 adam Exp $
@echo "Installing tkConfig.sh to $(CONFIG_INSTALL_DIR)/"
@$(INSTALL_DATA) tkConfig.sh "$(CONFIG_INSTALL_DIR)/tkConfig.sh"
@if test "$(STUB_LIB_FILE)" != "" ; then \
-@@ -827,7 +848,7 @@ install-doc:
+@@ -826,7 +847,7 @@ install-doc:
install-headers:
@if test "$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)" != ""; then \
XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)"/X11; fi; \
@@ -116,7 +116,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.2 2012/11/24 21:38:50 adam Exp $
do \
if [ -n "$$i" -a ! -d "$$i" ] ; then \
echo "Making directory $$i"; \
-@@ -836,9 +857,12 @@ install-headers:
+@@ -835,9 +856,12 @@ install-headers:
fi; \
done;
@echo "Installing header files to $(INCLUDE_INSTALL_DIR)/";
diff --git a/x11/tk/patches/patch-unix_configure b/x11/tk/patches/patch-unix_configure
index 83bf58fced3..af7ff51504a 100644
--- a/x11/tk/patches/patch-unix_configure
+++ b/x11/tk/patches/patch-unix_configure
@@ -1,6 +1,6 @@
-$NetBSD: patch-unix_configure,v 1.5 2012/11/24 21:38:50 adam Exp $
+$NetBSD: patch-unix_configure,v 1.6 2013/05/31 20:15:32 adam Exp $
---- unix/configure.orig 2012-11-09 15:15:03.000000000 +0000
+--- unix/configure.orig 2013-04-01 18:36:49.000000000 +0000
+++ unix/configure
@@ -4843,10 +4843,10 @@ fi
# LDFLAGS_ARCH so they eventually end up in LDFLAGS even if [load]
@@ -15,7 +15,7 @@ $NetBSD: patch-unix_configure,v 1.5 2012/11/24 21:38:50 adam Exp $
CFLAGS_DEBUG=-g
CFLAGS_OPTIMIZE=-O
if test "$GCC" = yes; then
-@@ -5837,7 +5837,7 @@ fi
+@@ -5822,7 +5822,7 @@ fi
UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
TCL_LIB_VERSIONS_OK=nodots
;;
@@ -24,7 +24,7 @@ $NetBSD: patch-unix_configure,v 1.5 2012/11/24 21:38:50 adam Exp $
arch=`arch -s`
case "$arch" in
m88k|vax)
-@@ -5858,7 +5858,7 @@ fi
+@@ -5843,7 +5843,7 @@ fi
fi
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
@@ -33,7 +33,7 @@ $NetBSD: patch-unix_configure,v 1.5 2012/11/24 21:38:50 adam Exp $
;;
esac
case "$arch" in
-@@ -5930,7 +5930,7 @@ fi
+@@ -5915,7 +5915,7 @@ fi
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS=""
@@ -42,7 +42,7 @@ $NetBSD: patch-unix_configure,v 1.5 2012/11/24 21:38:50 adam Exp $
if test $doRpath = yes; then
CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
-@@ -5945,21 +5945,15 @@ fi
+@@ -5930,21 +5930,15 @@ fi
LDFLAGS="$LDFLAGS -pthread"
fi
@@ -69,7 +69,7 @@ $NetBSD: patch-unix_configure,v 1.5 2012/11/24 21:38:50 adam Exp $
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS=""
-@@ -5981,7 +5975,7 @@ fi
+@@ -5966,7 +5960,7 @@ fi
# Version numbers are dot-stripped by system policy.
TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
@@ -78,7 +78,7 @@ $NetBSD: patch-unix_configure,v 1.5 2012/11/24 21:38:50 adam Exp $
TCL_LIB_VERSIONS_OK=nodots
;;
Darwin-*)
-@@ -7159,7 +7153,7 @@ fi
+@@ -7144,7 +7138,7 @@ fi
BSD/OS*) ;;
CYGWIN_*|MINGW32_*) ;;
IRIX*) ;;
@@ -87,7 +87,7 @@ $NetBSD: patch-unix_configure,v 1.5 2012/11/24 21:38:50 adam Exp $
Darwin-*) ;;
SCO_SV-3.2*) ;;
*) SHLIB_CFLAGS="-fPIC" ;;
-@@ -7169,12 +7163,12 @@ fi
+@@ -7154,12 +7148,12 @@ fi
if test "$SHARED_LIB_SUFFIX" = ""; then
@@ -102,7 +102,7 @@ $NetBSD: patch-unix_configure,v 1.5 2012/11/24 21:38:50 adam Exp $
fi
DLL_INSTALL_DIR="\$(LIB_INSTALL_DIR)"
-@@ -7190,7 +7184,11 @@ fi
+@@ -7175,7 +7169,11 @@ fi
else
@@ -115,7 +115,7 @@ $NetBSD: patch-unix_configure,v 1.5 2012/11/24 21:38:50 adam Exp $
fi
-@@ -7224,7 +7222,7 @@ fi
+@@ -7209,7 +7207,7 @@ fi
else
MAKE_STUB_LIB='${STLIB_LD} $@ ${STUB_LIB_OBJS} ; ${RANLIB} $@'
@@ -124,7 +124,7 @@ $NetBSD: patch-unix_configure,v 1.5 2012/11/24 21:38:50 adam Exp $
fi
-@@ -10358,7 +10356,7 @@ echo $ECHO_N "checking for X11 libraries
+@@ -10343,7 +10341,7 @@ echo $ECHO_N "checking for X11 libraries
if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl -o -r $i/libX11.dylib; then
echo "$as_me:$LINENO: result: $i" >&5
echo "${ECHO_T}$i" >&6
@@ -133,7 +133,7 @@ $NetBSD: patch-unix_configure,v 1.5 2012/11/24 21:38:50 adam Exp $
x_libraries="$i"
break
fi
-@@ -10367,7 +10365,7 @@ echo "${ECHO_T}$i" >&6
+@@ -10352,7 +10350,7 @@ echo "${ECHO_T}$i" >&6
if test "$x_libraries" = ""; then
XLIBSW=-lX11
else
@@ -142,7 +142,7 @@ $NetBSD: patch-unix_configure,v 1.5 2012/11/24 21:38:50 adam Exp $
fi
fi
if test "$XLIBSW" = nope ; then
-@@ -11386,18 +11384,14 @@ else
+@@ -11531,18 +11529,14 @@ else
fi
# libdir must be a fully qualified path and not ${exec_prefix}/lib
eval libdir="$libdir"
@@ -163,7 +163,7 @@ $NetBSD: patch-unix_configure,v 1.5 2012/11/24 21:38:50 adam Exp $
fi
#--------------------------------------------------------------------
-@@ -11409,11 +11403,7 @@ fi
+@@ -11554,11 +11548,7 @@ fi
eval "TK_STUB_LIB_FILE=libtkstub${TK_UNSHARED_LIB_SUFFIX}"
eval "TK_STUB_LIB_DIR=${libdir}"
@@ -176,7 +176,7 @@ $NetBSD: patch-unix_configure,v 1.5 2012/11/24 21:38:50 adam Exp $
TK_BUILD_STUB_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_STUB_LIB_FLAG}"
TK_STUB_LIB_SPEC="-L${TK_STUB_LIB_DIR} ${TK_STUB_LIB_FLAG}"
-@@ -12233,6 +12223,7 @@ s,@APP_RSRC_FILE@,$APP_RSRC_FILE,;t t
+@@ -12378,6 +12368,7 @@ s,@APP_RSRC_FILE@,$APP_RSRC_FILE,;t t
s,@REZ@,$REZ,;t t
s,@REZ_FLAGS@,$REZ_FLAGS,;t t
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-12 13:02:14 +0000