aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lang/tcl85/Makefile2
-rw-r--r--lang/tcl85/distinfo4
-rw-r--r--lang/tcl85/files/patch-unix-configure17
-rw-r--r--lang/tcl85/pkg-plist132
-rw-r--r--x11-toolkits/tk85/Makefile2
-rw-r--r--x11-toolkits/tk85/distinfo4
-rw-r--r--x11-toolkits/tk85/files/patch-unix-configure45
7 files changed, 89 insertions, 117 deletions
diff --git a/lang/tcl85/Makefile b/lang/tcl85/Makefile
index a54364314141..58f4a2ab41d7 100644
--- a/lang/tcl85/Makefile
+++ b/lang/tcl85/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= tcl
-PORTVERSION= 8.5.17
+PORTVERSION= 8.5.18
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_TCLTK} \
SF/tcl/Tcl/${PORTVERSION}
diff --git a/lang/tcl85/distinfo b/lang/tcl85/distinfo
index 31c264854b61..ce2135dad8a6 100644
--- a/lang/tcl85/distinfo
+++ b/lang/tcl85/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tcl8.5.17-src.tar.gz) = 4c7cd8f2e0900cb36dde899b3f9f4d5c471ee3c4f8304cf9ec71fd18cd5e98d6
-SIZE (tcl8.5.17-src.tar.gz) = 4546317
+SHA256 (tcl8.5.18-src.tar.gz) = 032be57a607bdf252135b52fac9e3a7016e526242374ac7637b083ecc4c5d3c9
+SIZE (tcl8.5.18-src.tar.gz) = 4534628
diff --git a/lang/tcl85/files/patch-unix-configure b/lang/tcl85/files/patch-unix-configure
index 0aac70ad4a8f..532f42345f10 100644
--- a/lang/tcl85/files/patch-unix-configure
+++ b/lang/tcl85/files/patch-unix-configure
@@ -13,20 +13,3 @@
SHLIB_CFLAGS="-fPIC"
SHLIB_LD="${CC} -shared"
TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\$@"
-@@ -7663,16 +7667,6 @@
- CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
- LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
- fi
--
-- case $system in
-- FreeBSD-3.*)
-- # Version numbers are dot-stripped by system policy.
-- TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
-- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so'
-- TCL_LIB_VERSIONS_OK=nodots
-- ;;
-- esac
- ;;
- Darwin-*)
- CFLAGS_OPTIMIZE="-Os"
diff --git a/lang/tcl85/pkg-plist b/lang/tcl85/pkg-plist
index 17cf76fdd84e..e225c8e1f2b4 100644
--- a/lang/tcl85/pkg-plist
+++ b/lang/tcl85/pkg-plist
@@ -940,47 +940,6 @@ libdata/pkgconfig/tcl85.pc
%%MAN%%man/mann/variable.tcl85.n.gz
%%MAN%%man/mann/vwait.tcl85.n.gz
%%MAN%%man/mann/while.tcl85.n.gz
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/CST6CDT
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/CET
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/PST8PDT
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Cuba
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/EET
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/EST
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/EST5EDT
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Egypt
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Eire
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/GB
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/GB-Eire
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/GMT
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/GMT+0
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/GMT-0
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/GMT0
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Greenwich
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/HST
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Hongkong
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Iceland
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Iran
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Israel
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Jamaica
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Japan
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Kwajalein
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Libya
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/MET
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/MST
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/MST7MDT
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/NZ
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/NZ-CHAT
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Navajo
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/PRC
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Portugal
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Poland
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Singapore
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/ROC
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/ROK
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Universal
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Turkey
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/UCT
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/UTC
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Africa/Abidjan
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Africa/Accra
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Africa/Addis_Ababa
@@ -1035,11 +994,11 @@ libdata/pkgconfig/tcl85.pc
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Africa/Tripoli
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Africa/Tunis
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Africa/Windhoek
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/W-SU
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/WET
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Zulu
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Anchorage
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Adak
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Anchorage
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Anguilla
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Antigua
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Araguaina
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Argentina/Buenos_Aires
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Argentina/Catamarca
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Argentina/ComodRivadavia
@@ -1053,9 +1012,6 @@ libdata/pkgconfig/tcl85.pc
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Argentina/San_Luis
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Argentina/Tucuman
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Argentina/Ushuaia
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Anguilla
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Antigua
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Araguaina
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Aruba
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Asuncion
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Atikokan
@@ -1104,10 +1060,11 @@ libdata/pkgconfig/tcl85.pc
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Grenada
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Guadeloupe
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Guatemala
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Guyana
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Guayaquil
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Guyana
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Halifax
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Havana
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Hermosillo
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Indiana/Indianapolis
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Indiana/Knox
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Indiana/Marengo
@@ -1116,8 +1073,6 @@ libdata/pkgconfig/tcl85.pc
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Indiana/Vevay
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Indiana/Vincennes
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Indiana/Winamac
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Lima
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Hermosillo
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Indianapolis
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Inuvik
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Iqaluit
@@ -1129,6 +1084,7 @@ libdata/pkgconfig/tcl85.pc
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Knox_IN
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Kralendijk
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/La_Paz
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Lima
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Los_Angeles
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Louisville
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Lower_Princes
@@ -1189,8 +1145,8 @@ libdata/pkgconfig/tcl85.pc
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/St_Lucia
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/St_Thomas
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/St_Vincent
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Tegucigalpa
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Swift_Current
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Tegucigalpa
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Thule
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Thunder_Bay
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Tijuana
@@ -1204,23 +1160,24 @@ libdata/pkgconfig/tcl85.pc
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Yellowknife
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Antarctica/Casey
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Antarctica/Davis
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Antarctica/Mawson
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Antarctica/DumontDUrville
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Antarctica/Macquarie
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Antarctica/Mawson
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Antarctica/McMurdo
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Antarctica/Palmer
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Antarctica/Rothera
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Antarctica/South_Pole
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Antarctica/Syowa
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Antarctica/Troll
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Antarctica/Vostok
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Arctic/Longyearbyen
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Ashgabat
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Aden
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Almaty
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Amman
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Anadyr
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Aqtau
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Aqtobe
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Ashgabat
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Ashkhabad
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Baghdad
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Bahrain
@@ -1230,6 +1187,7 @@ libdata/pkgconfig/tcl85.pc
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Bishkek
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Brunei
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Calcutta
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Chita
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Choibalsan
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Chongqing
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Chungking
@@ -1275,11 +1233,11 @@ libdata/pkgconfig/tcl85.pc
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Omsk
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Oral
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Phnom_Penh
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Qatar
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Rangoon
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Pontianak
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Pyongyang
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Qatar
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Qyzylorda
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Rangoon
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Riyadh
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Saigon
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Sakhalin
@@ -1287,6 +1245,7 @@ libdata/pkgconfig/tcl85.pc
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Seoul
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Shanghai
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Singapore
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Srednekolymsk
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Taipei
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Tashkent
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Tbilisi
@@ -1305,8 +1264,8 @@ libdata/pkgconfig/tcl85.pc
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Yakutsk
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Yekaterinburg
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Asia/Yerevan
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Atlantic/Bermuda
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Atlantic/Azores
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Atlantic/Bermuda
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Atlantic/Canary
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Atlantic/Cape_Verde
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Atlantic/Faeroe
@@ -1317,8 +1276,8 @@ libdata/pkgconfig/tcl85.pc
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Atlantic/South_Georgia
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Atlantic/St_Helena
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Atlantic/Stanley
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Australia/Adelaide
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Australia/ACT
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Australia/Adelaide
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Australia/Brisbane
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Australia/Broken_Hill
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Australia/Canberra
@@ -1340,10 +1299,12 @@ libdata/pkgconfig/tcl85.pc
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Australia/Victoria
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Australia/West
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Australia/Yancowinna
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Brazil/DeNoronha
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Brazil/Acre
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Brazil/DeNoronha
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Brazil/East
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Brazil/West
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/CET
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/CST6CDT
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Canada/Atlantic
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Canada/Central
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Canada/East-Saskatchewan
@@ -1355,6 +1316,12 @@ libdata/pkgconfig/tcl85.pc
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Canada/Yukon
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Chile/Continental
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Chile/EasterIsland
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Cuba
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/EET
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/EST
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/EST5EDT
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Egypt
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Eire
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Etc/GMT
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Etc/GMT+0
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Etc/GMT+1
@@ -1385,8 +1352,8 @@ libdata/pkgconfig/tcl85.pc
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Etc/GMT-8
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Etc/GMT-9
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Etc/GMT0
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Etc/UCT
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Etc/Greenwich
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Etc/UCT
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Etc/UTC
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Etc/Universal
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Etc/Zulu
@@ -1447,8 +1414,18 @@ libdata/pkgconfig/tcl85.pc
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Europe/Volgograd
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Europe/Warsaw
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Europe/Zagreb
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Europe/Zurich
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Europe/Zaporozhye
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Europe/Zurich
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/GB
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/GB-Eire
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/GMT
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/GMT+0
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/GMT-0
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/GMT0
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Greenwich
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/HST
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Hongkong
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Iceland
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Indian/Antananarivo
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Indian/Chagos
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Indian/Christmas
@@ -1460,11 +1437,26 @@ libdata/pkgconfig/tcl85.pc
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Indian/Mauritius
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Indian/Mayotte
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Indian/Reunion
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Iran
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Israel
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Jamaica
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Japan
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Kwajalein
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Libya
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/MET
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/MST
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/MST7MDT
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Mexico/BajaNorte
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Mexico/BajaSur
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Mexico/General
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Pacific/Auckland
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/NZ
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/NZ-CHAT
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Navajo
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/PRC
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/PST8PDT
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Pacific/Apia
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Pacific/Auckland
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Pacific/Bougainville
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Pacific/Chatham
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Pacific/Chuuk
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Pacific/Easter
@@ -1505,8 +1497,13 @@ libdata/pkgconfig/tcl85.pc
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Pacific/Wake
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Pacific/Wallis
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Pacific/Yap
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/SystemV/AST4ADT
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Poland
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Portugal
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/ROC
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/ROK
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Singapore
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/SystemV/AST4
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/SystemV/AST4ADT
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/SystemV/CST6
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/SystemV/CST6CDT
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/SystemV/EST5
@@ -1518,8 +1515,10 @@ libdata/pkgconfig/tcl85.pc
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/SystemV/PST8PDT
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/SystemV/YST9
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/SystemV/YST9YDT
-%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/US/Aleutian
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Turkey
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/UCT
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/US/Alaska
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/US/Aleutian
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/US/Arizona
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/US/Central
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/US/East-Indiana
@@ -1531,6 +1530,11 @@ libdata/pkgconfig/tcl85.pc
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/US/Pacific
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/US/Pacific-New
%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/US/Samoa
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/UTC
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Universal
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/W-SU
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/WET
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/Zulu
%%MODULES%%lib/tcl%%TCL_VER%%/http-2.7.13.tm
%%MODULES%%lib/tcl%%TCL_VER%%/http1.0/http.tcl
%%MODULES%%lib/tcl%%TCL_VER%%/http1.0/pkgIndex.tcl
diff --git a/x11-toolkits/tk85/Makefile b/x11-toolkits/tk85/Makefile
index 01f564599c27..e84bdd3fe772 100644
--- a/x11-toolkits/tk85/Makefile
+++ b/x11-toolkits/tk85/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= tk
-PORTVERSION= 8.5.17
+PORTVERSION= 8.5.18
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_TCLTK} \
SF/tcl/Tcl/${PORTVERSION}
diff --git a/x11-toolkits/tk85/distinfo b/x11-toolkits/tk85/distinfo
index 3712e564ad7f..65db4507c291 100644
--- a/x11-toolkits/tk85/distinfo
+++ b/x11-toolkits/tk85/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tk8.5.17-src.tar.gz) = b517914d076fba047c4bbc02f7dd7f0b0b06d1931826ae440129162d8bba92d3
-SIZE (tk8.5.17-src.tar.gz) = 4095985
+SHA256 (tk8.5.18-src.tar.gz) = 0328aa32a5674f9ae6079d7abfeed5597765cee7ca0e9aa8c1ded32f27e6c32a
+SIZE (tk8.5.18-src.tar.gz) = 4101233
diff --git a/x11-toolkits/tk85/files/patch-unix-configure b/x11-toolkits/tk85/files/patch-unix-configure
index 214b20436a77..6bd6e10f12e3 100644
--- a/x11-toolkits/tk85/files/patch-unix-configure
+++ b/x11-toolkits/tk85/files/patch-unix-configure
@@ -1,43 +1,28 @@
---- configure.orig 2014-10-22 12:32:42.000000000 +0000
-+++ configure 2014-11-15 10:50:06.000000000 +0000
-@@ -3538,6 +3538,7 @@
- # Threads support - this auto-enables if Tcl was compiled threaded
- #------------------------------------------------------------------------
+--- configure.orig 2015-03-06 15:14:59.000000000 +0000
++++ configure 2015-03-07 10:23:19.000000000 +0000
+@@ -3547,6 +3547,7 @@
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+TCL_SRC_DIR=${prefix}/include/tcl${TCLVERSION}
- # Check whether --enable-threads or --disable-threads was given.
- if test "${enable_threads+set}" = set; then
-@@ -5835,7 +5836,7 @@
- SHLIB_SUFFIX=".so"
- DL_OBJS="tclLoadDl.o"
- DL_LIBS=""
-- LDFLAGS="$LDFLAGS -export-dynamic"
-+ LDFLAGS=""
- if test $doRpath = yes; then
-
- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
-@@ -5857,10 +5858,14 @@
- SHLIB_CFLAGS="-fPIC"
- SHLIB_LD="${CC} -shared"
- SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,-soname,\$@"
-- SHLIB_SUFFIX=".so"
-+ SHLIB_SUFFIX=".so.${SHLIB_VERSION}"
- DL_OBJS="tclLoadDl.o"
- DL_LIBS=""
- LDFLAGS=""
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+ $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+@@ -5467,6 +5468,10 @@
+ ;;
+ FreeBSD-*)
+ # This configuration from FreeBSD Ports.
+ TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
+ TCL_LIB_VERSIONS_OK=nodots
- if test $doRpath = yes; then
-
- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
-@@ -5874,16 +5879,6 @@
+ SHLIB_CFLAGS="-fPIC"
+ SHLIB_LD="${CC} -shared"
+ SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,-soname,\$@"
+@@ -5486,15 +5491,6 @@
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
fi
--
- case $system in
- FreeBSD-3.*)
- # Version numbers are dot-stripped by system policy.