[131462] trunk/dports
mww at macports.org
mww at macports.org
Mon Jan 12 06:05:08 PST 2015
Revision: 131462
https://trac.macports.org/changeset/131462
Author: mww at macports.org
Date: 2015-01-12 06:05:08 -0800 (Mon, 12 Jan 2015)
Log Message:
-----------
tcl/tk: update to version 8.6.3
Modified Paths:
--------------
trunk/dports/lang/tcl/Portfile
trunk/dports/x11/tk/Portfile
Removed Paths:
-------------
trunk/dports/x11/tk/files/fix-yosemite-version-checking.patch
trunk/dports/x11/tk/files/patch-macosx_configure.diff
trunk/dports/x11/tk/files/patch-unix_configure.diff
Modified: trunk/dports/lang/tcl/Portfile
===================================================================
--- trunk/dports/lang/tcl/Portfile 2015-01-12 11:30:38 UTC (rev 131461)
+++ trunk/dports/lang/tcl/Portfile 2015-01-12 14:05:08 UTC (rev 131462)
@@ -3,7 +3,7 @@
PortSystem 1.0
name tcl
-version 8.6.1
+version 8.6.3
revision 0
# Tk (x11/tk) port depends on this version
categories lang
@@ -21,8 +21,8 @@
homepage http://www.tcl.tk/
master_sites sourceforge:project/tcl/Tcl/${version}
-checksums rmd160 fbb181d26bb28fe9413bc2e07f333571b8e7e190 \
- sha256 16ee769248e64ba1cae6b4834fcc4e4edd7470d881410e8d58f7dd1434343514
+checksums rmd160 7d798ddba4e0b2fce9228f2d654e2cfeef015aca \
+ sha256 6ce0778de0d50daaa9c345d7c1fd1288fb658f674028812e7eeee992e3051005
dist_subdir tcltk
distname ${name}${version}-src
Modified: trunk/dports/x11/tk/Portfile
===================================================================
--- trunk/dports/x11/tk/Portfile 2015-01-12 11:30:38 UTC (rev 131461)
+++ trunk/dports/x11/tk/Portfile 2015-01-12 14:05:08 UTC (rev 131462)
@@ -3,8 +3,8 @@
PortSystem 1.0
name tk
-version 8.6.1
-revision 2
+version 8.6.3
+revision 0
categories x11
license Tcl/Tk
maintainers mww openmaintainer
@@ -25,11 +25,11 @@
distfiles-append tcl${version}-src${extract.suffix}
checksums tk${version}-src.tar.gz \
- rmd160 9176fd2c5e7d36c84141333939e85614d3ba2e11 \
- sha256 b691a2e84907392918665fe03a0deb913663a026bed2162185b4a9a14898162c \
+ rmd160 5d816981def3f81c2c99a243c6ce099db5e5c3ab \
+ sha256 ba15d56ac27d8c0a7b1a983915a47e0f635199b9473cf6e10fbce1fc73fd8333 \
tcl${version}-src.tar.gz \
- rmd160 fbb181d26bb28fe9413bc2e07f333571b8e7e190 \
- sha256 16ee769248e64ba1cae6b4834fcc4e4edd7470d881410e8d58f7dd1434343514
+ rmd160 7d798ddba4e0b2fce9228f2d654e2cfeef015aca \
+ sha256 6ce0778de0d50daaa9c345d7c1fd1288fb658f674028812e7eeee992e3051005
depends_build port:pkgconfig
@@ -43,17 +43,8 @@
worksrcdir ${name}${version}/unix
patch.dir ${workpath}/${name}${version}
-patchfiles patch-macosx-tkMacOSXDraw.c.diff \
- patch-unix-Makefile.in.diff
+patchfiles patch-unix-Makefile.in.diff
-if {[vercmp $xcodeversion 5.1] >= 0} {
- patchfiles-append patch-macosx_configure.diff \
- patch-unix_configure.diff
-}
-
-# Remove when updated to 8.6.3 (#45444).
-patchfiles-append fix-yosemite-version-checking.patch
-
post-patch {
reinplace s|@TCL_SRC_DIR@|${workpath}/tcl${version}/|g ${worksrcpath}/Makefile.in
}
Deleted: trunk/dports/x11/tk/files/fix-yosemite-version-checking.patch
===================================================================
--- trunk/dports/x11/tk/files/fix-yosemite-version-checking.patch 2015-01-12 11:30:38 UTC (rev 131461)
+++ trunk/dports/x11/tk/files/fix-yosemite-version-checking.patch 2015-01-12 14:05:08 UTC (rev 131462)
@@ -1,27 +0,0 @@
-Index: macosx/tkMacOSXInit.c
-==================================================================
---- macosx/tkMacOSXInit.c
-+++ macosx/tkMacOSXInit.c
-@@ -234,15 +234,20 @@
- #endif
-
- if (!uname(&name)) {
- tkMacOSXMacOSXVersion = (strtod(name.release, NULL) + 96) * 10;
- }
-- if (tkMacOSXMacOSXVersion &&
-+ /*Check for new versioning scheme on Yosemite (10.10) and later.*/
-+ if (MAC_OS_X_VERSION_MIN_REQUIRED > 100000) {
-+ tkMacOSXMacOSXVersion = MAC_OS_X_VERSION_MIN_REQUIRED/100;
-+ }
-+ if (tkMacOSXMacOSXVersion && MAC_OS_X_VERSION_MIN_REQUIRED < 100000 &&
- tkMacOSXMacOSXVersion/10 < MAC_OS_X_VERSION_MIN_REQUIRED/10) {
- Tcl_Panic("Mac OS X 10.%d or later required !",
- (MAC_OS_X_VERSION_MIN_REQUIRED/10)-100);
- }
-+
-
- #ifdef TK_FRAMEWORK
- /*
- * When Tk is in a framework, force tcl_findLibrary to look in the
- * framework scripts directory.
-
Deleted: trunk/dports/x11/tk/files/patch-macosx_configure.diff
===================================================================
--- trunk/dports/x11/tk/files/patch-macosx_configure.diff 2015-01-12 11:30:38 UTC (rev 131461)
+++ trunk/dports/x11/tk/files/patch-macosx_configure.diff 2015-01-12 14:05:08 UTC (rev 131462)
@@ -1,11 +0,0 @@
---- macosx/configure.orig 2014-03-14 15:06:12.000000000 +0100
-+++ macosx/configure 2014-03-14 15:07:00.000000000 +0100
-@@ -9707,7 +9707,7 @@
- _ACEOF
-
- LIBS="$LIBS -framework Cocoa -framework Carbon -framework IOKit"
-- EXTRA_CC_SWITCHES='-std=gnu99 -x objective-c -fobjc-gc'
-+ EXTRA_CC_SWITCHES='-std=gnu99 -x objective-c'
- TK_WINDOWINGSYSTEM=AQUA
- if test -n "${enable_symbols}" -a "${enable_symbols}" != no; then
-
Deleted: trunk/dports/x11/tk/files/patch-unix_configure.diff
===================================================================
--- trunk/dports/x11/tk/files/patch-unix_configure.diff 2015-01-12 11:30:38 UTC (rev 131461)
+++ trunk/dports/x11/tk/files/patch-unix_configure.diff 2015-01-12 14:05:08 UTC (rev 131462)
@@ -1,11 +0,0 @@
---- unix/configure.orig 2014-03-14 15:06:37.000000000 +0100
-+++ unix/configure 2014-03-14 15:07:25.000000000 +0100
-@@ -9699,7 +9699,7 @@
- _ACEOF
-
- LIBS="$LIBS -framework Cocoa -framework Carbon -framework IOKit"
-- EXTRA_CC_SWITCHES='-std=gnu99 -x objective-c -fobjc-gc'
-+ EXTRA_CC_SWITCHES='-std=gnu99 -x objective-c'
- TK_WINDOWINGSYSTEM=AQUA
- if test -n "${enable_symbols}" -a "${enable_symbols}" != no; then
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150112/5d366fe7/attachment.html>
More information about the macports-changes
mailing list