Sun Mar 6 11:47:50 2016 UTC ()
Changes 8.6.5:
Bug fixes.


(adam)
diff -r1.88 -r1.89 pkgsrc/lang/tcl/Makefile
diff -r1.17 -r1.18 pkgsrc/lang/tcl/Makefile.version
diff -r1.18 -r1.19 pkgsrc/lang/tcl/PLIST
diff -r1.67 -r1.68 pkgsrc/lang/tcl/distinfo
diff -r1.2 -r0 pkgsrc/lang/tcl/patches/patch-pkgs_itcl4.0.3_configure
diff -r1.2 -r0 pkgsrc/lang/tcl/patches/patch-pkgs_sqlite3.8.8.3_configure
diff -r1.2 -r0 pkgsrc/lang/tcl/patches/patch-pkgs_tdbc1.0.3_configure
diff -r1.2 -r0 pkgsrc/lang/tcl/patches/patch-pkgs_tdbcmysql1.0.3_configure
diff -r1.2 -r0 pkgsrc/lang/tcl/patches/patch-pkgs_tdbcodbc1.0.3_configure
diff -r1.2 -r0 pkgsrc/lang/tcl/patches/patch-pkgs_tdbcpostgres1.0.3_configure
diff -r1.2 -r0 pkgsrc/lang/tcl/patches/patch-pkgs_thread2.7.2_configure
diff -r0 -r1.1 pkgsrc/lang/tcl/patches/patch-pkgs_itcl4.0.4_configure
diff -r0 -r1.1 pkgsrc/lang/tcl/patches/patch-pkgs_sqlite3.11.0_Makefile.in
diff -r0 -r1.1 pkgsrc/lang/tcl/patches/patch-pkgs_sqlite3.11.0_configure
diff -r0 -r1.1 pkgsrc/lang/tcl/patches/patch-pkgs_tdbc1.0.4_configure
diff -r0 -r1.1 pkgsrc/lang/tcl/patches/patch-pkgs_tdbcmysql1.0.4_configure
diff -r0 -r1.1 pkgsrc/lang/tcl/patches/patch-pkgs_tdbcodbc1.0.4_configure
diff -r0 -r1.1 pkgsrc/lang/tcl/patches/patch-pkgs_tdbcpostgres1.0.4_configure
diff -r0 -r1.1 pkgsrc/lang/tcl/patches/patch-pkgs_thread2.7.3_configure
diff -r1.9 -r1.10 pkgsrc/lang/tcl/patches/patch-unix_Makefile.in
diff -r1.8 -r1.9 pkgsrc/lang/tcl/patches/patch-unix_configure
diff -r1.3 -r1.4 pkgsrc/lang/tcl/patches/patch-unix_tclUnixPort.h
diff -r1.16 -r1.17 pkgsrc/x11/tk/Makefile.version
diff -r1.14 -r1.15 pkgsrc/x11/tk/PLIST
diff -r1.46 -r1.47 pkgsrc/x11/tk/distinfo
diff -r1.6 -r1.7 pkgsrc/x11/tk/patches/patch-unix_Makefile.in
diff -r1.9 -r1.10 pkgsrc/x11/tk/patches/patch-unix_configure
cvs diff -r1.88 -r1.89 pkgsrc/lang/tcl/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/tcl/Makefile 2016/02/25 14:42:57 1.88
+++ pkgsrc/lang/tcl/Makefile 2016/03/06 11:47:49 1.89
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.88 2016/02/25 14:42:57 jperkin Exp $ 1# $NetBSD: Makefile,v 1.89 2016/03/06 11:47:49 adam Exp $
2 2
3DISTNAME= tcl${TCL_VERSION}-src 3DISTNAME= tcl${TCL_VERSION}-src
4PKGNAME= tcl-${TCL_VERSION} 4PKGNAME= tcl-${TCL_VERSION}
5PKGREVISION= 6 
6CATEGORIES= lang 5CATEGORIES= lang
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/}
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.tcl.tk/ 9HOMEPAGE= http://www.tcl.tk/
11COMMENT= Tool Command Language, a dynamic language 10COMMENT= Tool Command Language, a dynamic language
12LICENSE= 2-clause-bsd 11LICENSE= 2-clause-bsd
13 12
14.include "../../lang/tcl/Makefile.version" 13.include "../../lang/tcl/Makefile.version"
15 14
16WRKSRC= ${WRKDIR}/tcl${TCL_VERSION} 15WRKSRC= ${WRKDIR}/tcl${TCL_VERSION}
17 16
18USE_GCC_RUNTIME= yes 17USE_GCC_RUNTIME= yes
@@ -40,33 +39,33 @@ CONFIGURE_ARGS.NetBSD+= ac_cv_func_getho @@ -40,33 +39,33 @@ CONFIGURE_ARGS.NetBSD+= ac_cv_func_getho
40 39
41SUBST_CLASSES+= tcl-config 40SUBST_CLASSES+= tcl-config
42SUBST_STAGE.tcl-config= post-build 41SUBST_STAGE.tcl-config= post-build
43SUBST_FILES.tcl-config= unix/tclConfig.sh 42SUBST_FILES.tcl-config= unix/tclConfig.sh
44SUBST_SED.tcl-config+= -e "s|${WRKSRC}/unix|${PREFIX}/lib|" 43SUBST_SED.tcl-config+= -e "s|${WRKSRC}/unix|${PREFIX}/lib|"
45SUBST_SED.tcl-config+= -e "s|${WRKSRC}|${PREFIX}/include/tcl|" 44SUBST_SED.tcl-config+= -e "s|${WRKSRC}|${PREFIX}/include/tcl|"
46 45
47PLIST_SUBST+= SONUM=${TCL_SONUM} 46PLIST_SUBST+= SONUM=${TCL_SONUM}
48PLIST_SUBST+= BASEVER=${TCL_BASEVER} 47PLIST_SUBST+= BASEVER=${TCL_BASEVER}
49 48
50CONFIGURE_ARGS+= --with-system-sqlite 49CONFIGURE_ARGS+= --with-system-sqlite
51SUBST_CLASSES+= sqllink 50SUBST_CLASSES+= sqllink
52SUBST_STAGE.sqllink= pre-configure 51SUBST_STAGE.sqllink= pre-configure
53SUBST_FILES.sqllink= pkgs/sqlite3.8.8.3/configure 52SUBST_FILES.sqllink= pkgs/sqlite3.11.0/configure
54SUBST_SED.sqllink= -e "/LIBS=/s|-lsqlite3|-L${BUILDLINK_PREFIX.sqlite3}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.sqlite3}/lib -lsqlite3|g" 53SUBST_SED.sqllink= -e "/LIBS=/s|-lsqlite3|-L${BUILDLINK_PREFIX.sqlite3}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.sqlite3}/lib -lsqlite3|g"
55 54
56.if ${OPSYS} == "Darwin" 55.if ${OPSYS} == "Darwin"
57post-build: 56post-build:
58. for lib in itcl4.0.3/libitcl4.0.3.dylib \ 57. for lib in itcl4.0.4/libitcl4.0.4.dylib \
59 sqlite3.8.8.3/libsqlite3.8.8.3.dylib \ 58 sqlite3.11.0/libsqlite3.11.0.dylib \
60 tdbc1.0.3/libtdbc1.0.3.dylib \ 59 tdbc1.0.4/libtdbc1.0.4.dylib \
61 tdbcmysql1.0.3/libtdbcmysql1.0.3.dylib \ 60 tdbcmysql1.0.4/libtdbcmysql1.0.4.dylib \
62 tdbcodbc1.0.3/libtdbcodbc1.0.3.dylib \ 61 tdbcodbc1.0.4/libtdbcodbc1.0.4.dylib \
63 tdbcpostgres1.0.3/libtdbcpostgres1.0.3.dylib \ 62 tdbcpostgres1.0.4/libtdbcpostgres1.0.4.dylib \
64 thread2.7.2/libthread2.7.2.dylib 63 thread2.7.3/libthread2.7.3.dylib
65 install_name_tool -id ${PREFIX}/lib/${lib} ${WRKSRC}/unix/pkgs/${lib} 64 install_name_tool -id ${PREFIX}/lib/${lib} ${WRKSRC}/unix/pkgs/${lib}
66. endfor 65. endfor
67.endif 66.endif
68 67
69BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.8.3 68BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.11.0
70.include "../../databases/sqlite3/buildlink3.mk" 69.include "../../databases/sqlite3/buildlink3.mk"
71.include "../../devel/zlib/buildlink3.mk" 70.include "../../devel/zlib/buildlink3.mk"
72.include "../../mk/bsd.pkg.mk" 71.include "../../mk/bsd.pkg.mk"
cvs diff -r1.17 -r1.18 pkgsrc/lang/tcl/Makefile.version (expand / switch to unified diff)

--- pkgsrc/lang/tcl/Makefile.version 2015/06/28 17:11:12 1.17
+++ pkgsrc/lang/tcl/Makefile.version 2016/03/06 11:47:49 1.18
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1# $NetBSD: Makefile.version,v 1.17 2015/06/28 17:11:12 joerg Exp $ 1# $NetBSD: Makefile.version,v 1.18 2016/03/06 11:47:49 adam Exp $
2# used by cad/xcircuit/Makefile 2# used by cad/xcircuit/Makefile
3# used by devel/tcl-tclcl/Makefile 3# used by devel/tcl-tclcl/Makefile
4# used by lang/tcl/Makefile 4# used by lang/tcl/Makefile
5# used by lang/tcl-otcl/Makefile 5# used by lang/tcl-otcl/Makefile
6# used by print/tcl-pdflib/Makefile 6# used by print/tcl-pdflib/Makefile
7 7
8TCL_SONUM= 86 8TCL_SONUM= 86
9TCL_BASEVER= 8.6 9TCL_BASEVER= 8.6
10TCL_VERSION= 8.6.4 10TCL_VERSION= 8.6.5
cvs diff -r1.18 -r1.19 pkgsrc/lang/tcl/PLIST (expand / switch to unified diff)

--- pkgsrc/lang/tcl/PLIST 2015/05/21 10:37:59 1.18
+++ pkgsrc/lang/tcl/PLIST 2016/03/06 11:47:49 1.19
@@ -1,14 +1,15 @@ @@ -1,14 +1,15 @@
1@comment $NetBSD: PLIST,v 1.18 2015/05/21 10:37:59 adam Exp $ 1@comment $NetBSD: PLIST,v 1.19 2016/03/06 11:47:49 adam Exp $
 2bin/sqlite3_analyzer
2bin/tclsh 3bin/tclsh
3bin/tclsh${BASEVER} 4bin/tclsh${BASEVER}
4include/fakemysql.h 5include/fakemysql.h
5include/fakepq.h 6include/fakepq.h
6include/fakesql.h 7include/fakesql.h
7include/itcl.h 8include/itcl.h
8include/itcl2TclOO.h 9include/itcl2TclOO.h
9include/itclDecls.h 10include/itclDecls.h
10include/itclInt.h 11include/itclInt.h
11include/itclIntDecls.h 12include/itclIntDecls.h
12include/itclMigrate2TclCore.h 13include/itclMigrate2TclCore.h
13include/itclTclIntStubsFcn.h 14include/itclTclIntStubsFcn.h
14include/mysqlStubs.h 15include/mysqlStubs.h
@@ -40,40 +41,40 @@ include/tcl/generic/tclTomMath.h @@ -40,40 +41,40 @@ include/tcl/generic/tclTomMath.h
40include/tcl/generic/tclTomMathDecls.h 41include/tcl/generic/tclTomMathDecls.h
41include/tcl/generic/tclTomMathInt.h 42include/tcl/generic/tclTomMathInt.h
42include/tcl/generic/tommath.h 43include/tcl/generic/tommath.h
43include/tcl/unix/tclUnixPort.h 44include/tcl/unix/tclUnixPort.h
44include/tcl/unix/tclUnixThrd.h 45include/tcl/unix/tclUnixThrd.h
45include/tclDecls.h 46include/tclDecls.h
46include/tclOO.h 47include/tclOO.h
47include/tclOODecls.h 48include/tclOODecls.h
48include/tclPlatDecls.h 49include/tclPlatDecls.h
49include/tclThread.h 50include/tclThread.h
50include/tdbc.h 51include/tdbc.h
51include/tdbcDecls.h 52include/tdbcDecls.h
52include/tdbcInt.h 53include/tdbcInt.h
53lib/itcl4.0.3/itcl.tcl 54lib/itcl4.0.4/itcl.tcl
54lib/itcl4.0.3/itclConfig.sh 55lib/itcl4.0.4/itclConfig.sh
55lib/itcl4.0.3/itclHullCmds.tcl 56lib/itcl4.0.4/itclHullCmds.tcl
56lib/itcl4.0.3/itclWidget.tcl 57lib/itcl4.0.4/itclWidget.tcl
57lib/itcl4.0.3/libitcl4.0.3.so 58lib/itcl4.0.4/libitcl4.0.4.so
58lib/itcl4.0.3/libitclstub4.0.3.a 59lib/itcl4.0.4/libitclstub4.0.4.a
59lib/itcl4.0.3/pkgIndex.tcl 60lib/itcl4.0.4/pkgIndex.tcl
60lib/libtcl${SONUM}.a 61lib/libtcl${SONUM}.a
61lib/libtcl${SONUM}.so 62lib/libtcl${SONUM}.so
62lib/libtcl${SONUM}.so.1.0 63lib/libtcl${SONUM}.so.1.0
63lib/libtclstub${SONUM}.a 64lib/libtclstub${SONUM}.a
64lib/pkgconfig/tcl.pc 65lib/pkgconfig/tcl.pc
65lib/sqlite3.8.8.3/libsqlite3.8.8.3.so 66lib/sqlite3.11.0/libsqlite3.11.0.so
66lib/sqlite3.8.8.3/pkgIndex.tcl 67lib/sqlite3.11.0/pkgIndex.tcl
67lib/tcl${BASEVER}/auto.tcl 68lib/tcl${BASEVER}/auto.tcl
68lib/tcl${BASEVER}/clock.tcl 69lib/tcl${BASEVER}/clock.tcl
69lib/tcl${BASEVER}/encoding/ascii.enc 70lib/tcl${BASEVER}/encoding/ascii.enc
70lib/tcl${BASEVER}/encoding/big5.enc 71lib/tcl${BASEVER}/encoding/big5.enc
71lib/tcl${BASEVER}/encoding/cp1250.enc 72lib/tcl${BASEVER}/encoding/cp1250.enc
72lib/tcl${BASEVER}/encoding/cp1251.enc 73lib/tcl${BASEVER}/encoding/cp1251.enc
73lib/tcl${BASEVER}/encoding/cp1252.enc 74lib/tcl${BASEVER}/encoding/cp1252.enc
74lib/tcl${BASEVER}/encoding/cp1253.enc 75lib/tcl${BASEVER}/encoding/cp1253.enc
75lib/tcl${BASEVER}/encoding/cp1254.enc 76lib/tcl${BASEVER}/encoding/cp1254.enc
76lib/tcl${BASEVER}/encoding/cp1255.enc 77lib/tcl${BASEVER}/encoding/cp1255.enc
77lib/tcl${BASEVER}/encoding/cp1256.enc 78lib/tcl${BASEVER}/encoding/cp1256.enc
78lib/tcl${BASEVER}/encoding/cp1257.enc 79lib/tcl${BASEVER}/encoding/cp1257.enc
79lib/tcl${BASEVER}/encoding/cp1258.enc 80lib/tcl${BASEVER}/encoding/cp1258.enc
@@ -140,28 +141,28 @@ lib/tcl${BASEVER}/encoding/macRoman.enc @@ -140,28 +141,28 @@ lib/tcl${BASEVER}/encoding/macRoman.enc
140lib/tcl${BASEVER}/encoding/macRomania.enc 141lib/tcl${BASEVER}/encoding/macRomania.enc
141lib/tcl${BASEVER}/encoding/macThai.enc 142lib/tcl${BASEVER}/encoding/macThai.enc
142lib/tcl${BASEVER}/encoding/macTurkish.enc 143lib/tcl${BASEVER}/encoding/macTurkish.enc
143lib/tcl${BASEVER}/encoding/macUkraine.enc 144lib/tcl${BASEVER}/encoding/macUkraine.enc
144lib/tcl${BASEVER}/encoding/shiftjis.enc 145lib/tcl${BASEVER}/encoding/shiftjis.enc
145lib/tcl${BASEVER}/encoding/symbol.enc 146lib/tcl${BASEVER}/encoding/symbol.enc
146lib/tcl${BASEVER}/encoding/tis-620.enc 147lib/tcl${BASEVER}/encoding/tis-620.enc
147lib/tcl${BASEVER}/history.tcl 148lib/tcl${BASEVER}/history.tcl
148lib/tcl${BASEVER}/http/http.tcl 149lib/tcl${BASEVER}/http/http.tcl
149lib/tcl${BASEVER}/http/pkgIndex.tcl 150lib/tcl${BASEVER}/http/pkgIndex.tcl
150lib/tcl${BASEVER}/http1.0/http.tcl 151lib/tcl${BASEVER}/http1.0/http.tcl
151lib/tcl${BASEVER}/http1.0/pkgIndex.tcl 152lib/tcl${BASEVER}/http1.0/pkgIndex.tcl
152lib/tcl${BASEVER}/init.tcl 153lib/tcl${BASEVER}/init.tcl
153lib/tcl${BASEVER}/msgcat1.5/msgcat.tcl 154lib/tcl${BASEVER}/msgcat1.6/msgcat.tcl
154lib/tcl${BASEVER}/msgcat1.5/pkgIndex.tcl 155lib/tcl${BASEVER}/msgcat1.6/pkgIndex.tcl
155lib/tcl${BASEVER}/msgs/af.msg 156lib/tcl${BASEVER}/msgs/af.msg
156lib/tcl${BASEVER}/msgs/af_za.msg 157lib/tcl${BASEVER}/msgs/af_za.msg
157lib/tcl${BASEVER}/msgs/ar.msg 158lib/tcl${BASEVER}/msgs/ar.msg
158lib/tcl${BASEVER}/msgs/ar_in.msg 159lib/tcl${BASEVER}/msgs/ar_in.msg
159lib/tcl${BASEVER}/msgs/ar_jo.msg 160lib/tcl${BASEVER}/msgs/ar_jo.msg
160lib/tcl${BASEVER}/msgs/ar_lb.msg 161lib/tcl${BASEVER}/msgs/ar_lb.msg
161lib/tcl${BASEVER}/msgs/ar_sy.msg 162lib/tcl${BASEVER}/msgs/ar_sy.msg
162lib/tcl${BASEVER}/msgs/be.msg 163lib/tcl${BASEVER}/msgs/be.msg
163lib/tcl${BASEVER}/msgs/bg.msg 164lib/tcl${BASEVER}/msgs/bg.msg
164lib/tcl${BASEVER}/msgs/bn.msg 165lib/tcl${BASEVER}/msgs/bn.msg
165lib/tcl${BASEVER}/msgs/bn_in.msg 166lib/tcl${BASEVER}/msgs/bn_in.msg
166lib/tcl${BASEVER}/msgs/ca.msg 167lib/tcl${BASEVER}/msgs/ca.msg
167lib/tcl${BASEVER}/msgs/cs.msg 168lib/tcl${BASEVER}/msgs/cs.msg
@@ -284,51 +285,53 @@ lib/tcl${BASEVER}/opt0.4/pkgIndex.tcl @@ -284,51 +285,53 @@ lib/tcl${BASEVER}/opt0.4/pkgIndex.tcl
284lib/tcl${BASEVER}/package.tcl 285lib/tcl${BASEVER}/package.tcl
285lib/tcl${BASEVER}/parray.tcl 286lib/tcl${BASEVER}/parray.tcl
286lib/tcl${BASEVER}/platform1.0/pkgIndex.tcl 287lib/tcl${BASEVER}/platform1.0/pkgIndex.tcl
287lib/tcl${BASEVER}/platform1.0/platform.tcl 288lib/tcl${BASEVER}/platform1.0/platform.tcl
288lib/tcl${BASEVER}/safe.tcl 289lib/tcl${BASEVER}/safe.tcl
289lib/tcl${BASEVER}/shell1.1/pkgIndex.tcl 290lib/tcl${BASEVER}/shell1.1/pkgIndex.tcl
290lib/tcl${BASEVER}/shell1.1/shell.tcl 291lib/tcl${BASEVER}/shell1.1/shell.tcl
291lib/tcl${BASEVER}/tclAppInit.c 292lib/tcl${BASEVER}/tclAppInit.c
292lib/tcl${BASEVER}/tclIndex 293lib/tcl${BASEVER}/tclIndex
293lib/tcl${BASEVER}/tcltest2.3/tcltest.tcl 294lib/tcl${BASEVER}/tcltest2.3/tcltest.tcl
294lib/tcl${BASEVER}/tcltest2.3/pkgIndex.tcl 295lib/tcl${BASEVER}/tcltest2.3/pkgIndex.tcl
295lib/tcl${BASEVER}/tm.tcl 296lib/tcl${BASEVER}/tm.tcl
296lib/tcl${BASEVER}/word.tcl 297lib/tcl${BASEVER}/word.tcl
297lib/tcl8/8.4/platform-1.0.13.tm 298lib/tcl8.6/msgcat1.6/msgcat.tcl
 299lib/tcl8.6/msgcat1.6/pkgIndex.tcl
 300lib/tcl8/8.4/platform-1.0.14.tm
298lib/tcl8/8.4/platform/shell-1.1.4.tm 301lib/tcl8/8.4/platform/shell-1.1.4.tm
299lib/tcl8/8.5/msgcat-1.5.2.tm 302lib/tcl8/8.5/msgcat-1.6.0.tm
300lib/tcl8/8.5/tcltest-2.3.8.tm 303lib/tcl8/8.5/tcltest-2.3.8.tm
301lib/tcl8/8.6/http-2.8.8.tm 304lib/tcl8/8.6/http-2.8.9.tm
302lib/tcl8/8.6/tdbc/sqlite3-1.0.3.tm 305lib/tcl8/8.6/tdbc/sqlite3-1.0.4.tm
303lib/tclConfig.sh 306lib/tclConfig.sh
304lib/tclooConfig.sh 307lib/tclooConfig.sh
305lib/tdbc1.0.3/libtdbc1.0.3.so 308lib/tdbc1.0.4/libtdbc1.0.4.so
306lib/tdbc1.0.3/libtdbcstub1.0.3.a 309lib/tdbc1.0.4/libtdbcstub1.0.4.a
307lib/tdbc1.0.3/pkgIndex.tcl 310lib/tdbc1.0.4/pkgIndex.tcl
308lib/tdbc1.0.3/tdbc.tcl 311lib/tdbc1.0.4/tdbc.tcl
309lib/tdbc1.0.3/tdbcConfig.sh 312lib/tdbc1.0.4/tdbcConfig.sh
310lib/tdbcmysql1.0.3/libtdbcmysql1.0.3.so 313lib/tdbcmysql1.0.4/libtdbcmysql1.0.4.so
311lib/tdbcmysql1.0.3/pkgIndex.tcl 314lib/tdbcmysql1.0.4/pkgIndex.tcl
312lib/tdbcmysql1.0.3/tdbcmysql.tcl 315lib/tdbcmysql1.0.4/tdbcmysql.tcl
313lib/tdbcodbc1.0.3/libtdbcodbc1.0.3.so 316lib/tdbcodbc1.0.4/libtdbcodbc1.0.4.so
314lib/tdbcodbc1.0.3/pkgIndex.tcl 317lib/tdbcodbc1.0.4/pkgIndex.tcl
315lib/tdbcodbc1.0.3/tdbcodbc.tcl 318lib/tdbcodbc1.0.4/tdbcodbc.tcl
316lib/tdbcpostgres1.0.3/libtdbcpostgres1.0.3.so 319lib/tdbcpostgres1.0.4/libtdbcpostgres1.0.4.so
317lib/tdbcpostgres1.0.3/pkgIndex.tcl 320lib/tdbcpostgres1.0.4/pkgIndex.tcl
318lib/tdbcpostgres1.0.3/tdbcpostgres.tcl 321lib/tdbcpostgres1.0.4/tdbcpostgres.tcl
319lib/thread2.7.2/libthread2.7.2.so 322lib/thread2.7.3/libthread2.7.3.so
320lib/thread2.7.2/pkgIndex.tcl 323lib/thread2.7.3/pkgIndex.tcl
321lib/thread2.7.2/ttrace.tcl 324lib/thread2.7.3/ttrace.tcl
322man/man1/tclsh.1 325man/man1/tclsh.1
323man/man3/TCL_MEM_DEBUG.3 326man/man3/TCL_MEM_DEBUG.3
324man/man3/Tcl_Access.3 327man/man3/Tcl_Access.3
325man/man3/Tcl_AddErrorInfo.3 328man/man3/Tcl_AddErrorInfo.3
326man/man3/Tcl_AddObjErrorInfo.3 329man/man3/Tcl_AddObjErrorInfo.3
327man/man3/Tcl_AlertNotifier.3 330man/man3/Tcl_AlertNotifier.3
328man/man3/Tcl_Alloc.3 331man/man3/Tcl_Alloc.3
329man/man3/Tcl_AllocStatBuf.3 332man/man3/Tcl_AllocStatBuf.3
330man/man3/Tcl_AllowExceptions.3 333man/man3/Tcl_AllowExceptions.3
331man/man3/Tcl_AppInit.3 334man/man3/Tcl_AppInit.3
332man/man3/Tcl_AppendAllObjTypes.3 335man/man3/Tcl_AppendAllObjTypes.3
333man/man3/Tcl_AppendElement.3 336man/man3/Tcl_AppendElement.3
334man/man3/Tcl_AppendExportList.3 337man/man3/Tcl_AppendExportList.3
@@ -921,26 +924,28 @@ man/man3/Tcl_UnsetVar.3 @@ -921,26 +924,28 @@ man/man3/Tcl_UnsetVar.3
921man/man3/Tcl_UnsetVar2.3 924man/man3/Tcl_UnsetVar2.3
922man/man3/Tcl_UnstackChannel.3 925man/man3/Tcl_UnstackChannel.3
923man/man3/Tcl_UntraceCommand.3 926man/man3/Tcl_UntraceCommand.3
924man/man3/Tcl_UntraceVar.3 927man/man3/Tcl_UntraceVar.3
925man/man3/Tcl_UntraceVar2.3 928man/man3/Tcl_UntraceVar2.3
926man/man3/Tcl_UpVar.3 929man/man3/Tcl_UpVar.3
927man/man3/Tcl_UpVar2.3 930man/man3/Tcl_UpVar2.3
928man/man3/Tcl_UpdateLinkedVar.3 931man/man3/Tcl_UpdateLinkedVar.3
929man/man3/Tcl_UtfAtIndex.3 932man/man3/Tcl_UtfAtIndex.3
930man/man3/Tcl_UtfBackslash.3 933man/man3/Tcl_UtfBackslash.3
931man/man3/Tcl_UtfCharComplete.3 934man/man3/Tcl_UtfCharComplete.3
932man/man3/Tcl_UtfFindFirst.3 935man/man3/Tcl_UtfFindFirst.3
933man/man3/Tcl_UtfFindLast.3 936man/man3/Tcl_UtfFindLast.3
 937man/man3/Tcl_UtfNcasecmp.3
 938man/man3/Tcl_UtfNcmp.3
934man/man3/Tcl_UtfNext.3 939man/man3/Tcl_UtfNext.3
935man/man3/Tcl_UtfPrev.3 940man/man3/Tcl_UtfPrev.3
936man/man3/Tcl_UtfToExternal.3 941man/man3/Tcl_UtfToExternal.3
937man/man3/Tcl_UtfToExternalDString.3 942man/man3/Tcl_UtfToExternalDString.3
938man/man3/Tcl_UtfToLower.3 943man/man3/Tcl_UtfToLower.3
939man/man3/Tcl_UtfToTitle.3 944man/man3/Tcl_UtfToTitle.3
940man/man3/Tcl_UtfToUniChar.3 945man/man3/Tcl_UtfToUniChar.3
941man/man3/Tcl_UtfToUniCharDString.3 946man/man3/Tcl_UtfToUniCharDString.3
942man/man3/Tcl_UtfToUpper.3 947man/man3/Tcl_UtfToUpper.3
943man/man3/Tcl_ValidateAllMemory.3 948man/man3/Tcl_ValidateAllMemory.3
944man/man3/Tcl_VarEval.3 949man/man3/Tcl_VarEval.3
945man/man3/Tcl_VarEvalVA.3 950man/man3/Tcl_VarEvalVA.3
946man/man3/Tcl_VarTraceInfo.3 951man/man3/Tcl_VarTraceInfo.3
cvs diff -r1.67 -r1.68 pkgsrc/lang/tcl/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/tcl/distinfo 2015/11/03 22:50:45 1.67
+++ pkgsrc/lang/tcl/distinfo 2016/03/06 11:47:49 1.68
@@ -1,25 +1,26 @@ @@ -1,25 +1,26 @@
1$NetBSD: distinfo,v 1.67 2015/11/03 22:50:45 agc Exp $ 1$NetBSD: distinfo,v 1.68 2016/03/06 11:47:49 adam Exp $
2 2
3SHA1 (tcl8.6.4-src.tar.gz) = 33c5a083a23cf54f15e25a9e787dc39ef3fa0a2b 3SHA1 (tcl8.6.5-src.tar.gz) = c3a50ea58dac00a3c7e83cb4a4651c40d0f55160
4RMD160 (tcl8.6.4-src.tar.gz) = 9a30b9083edba13aeef53ba6483b88202264f6dc 4RMD160 (tcl8.6.5-src.tar.gz) = 6c31d99775fb7b2c7aeb0d0fb20f2796d75215c2
5SHA512 (tcl8.6.4-src.tar.gz) = f348224f6c63aa899345a5c9b84d6ad1c0bfce5e22a86e4319900b561787855473888bd284f7ee55edf552ce32792b78649526af3641b0dff46590cad53b2489 5SHA512 (tcl8.6.5-src.tar.gz) = e58177728eea14df0492f9e3ec20ce5ad53150954ea901f0f337ac07d5b2d2196709f1364d94104043b0f2939eeb7296888a3b6d4f92df209b5c6174638f039f
6Size (tcl8.6.4-src.tar.gz) = 8915556 bytes 6Size (tcl8.6.5-src.tar.gz) = 9398130 bytes
7SHA1 (patch-generic_tclInt.h) = 13289d8fcf5021898b06a9608bc05fc968a1ba5c 7SHA1 (patch-generic_tclInt.h) = 13289d8fcf5021898b06a9608bc05fc968a1ba5c
8SHA1 (patch-generic_tclPort.h) = 36ff05b22591d588952e55d0f13c2ef52e371d1e 8SHA1 (patch-generic_tclPort.h) = 36ff05b22591d588952e55d0f13c2ef52e371d1e
9SHA1 (patch-generic_tclPosixStr.c) = 68da211865282fe7124cad71381658f8dfb986d6 9SHA1 (patch-generic_tclPosixStr.c) = 68da211865282fe7124cad71381658f8dfb986d6
10SHA1 (patch-pkgs_itcl4.0.3_configure) = 8350140809004c1157f9650b9c29e49af0120304 10SHA1 (patch-pkgs_itcl4.0.4_configure) = 29ecea7c992486dfa86305bddf4be4bf1c9dd2c1
11SHA1 (patch-pkgs_sqlite3.8.8.3_configure) = e49e8b345330a08e4f931bf21d45d89c72b9099f 11SHA1 (patch-pkgs_sqlite3.11.0_Makefile.in) = 33e2aefcd0e85ee14c4913280b317205e82e15b8
12SHA1 (patch-pkgs_tdbc1.0.3_configure) = 39c1f010155a9b10ebcdefce065b3dfe26a09491 12SHA1 (patch-pkgs_sqlite3.11.0_configure) = 5a02597479936a844f04501d2bc76979e7c669f7
13SHA1 (patch-pkgs_tdbcmysql1.0.3_configure) = b38503fce5fe49213cf3612a0fe589dd79e4ab9c 13SHA1 (patch-pkgs_tdbc1.0.4_configure) = 058f0ec3a6cf506c1998a30a81364f7856d17508
14SHA1 (patch-pkgs_tdbcodbc1.0.3_configure) = 5e4d10312768ad42e6b5d2a033ca4b3ee98cf861 14SHA1 (patch-pkgs_tdbcmysql1.0.4_configure) = e633bb54d886f72dae485c2110488bb1441c965b
15SHA1 (patch-pkgs_tdbcpostgres1.0.3_configure) = 57e99769900fc8d55f61096badc037aed6c4b60e 15SHA1 (patch-pkgs_tdbcodbc1.0.4_configure) = 5e93d9edc663f31e714726b4e3f9f4af6221fac8
16SHA1 (patch-pkgs_thread2.7.2_configure) = 1912b6411bf7b0dc0719fcb6d67c0aa848de85e3 16SHA1 (patch-pkgs_tdbcpostgres1.0.4_configure) = 182a106fd8559d08bb4d8d611972473640e9838a
 17SHA1 (patch-pkgs_thread2.7.3_configure) = b7834c89b1dbad3aff82ab77434883e297466dc9
17SHA1 (patch-tests_load.test) = 438695ab76e01646e49aadc01c44344a5495eabb 18SHA1 (patch-tests_load.test) = 438695ab76e01646e49aadc01c44344a5495eabb
18SHA1 (patch-tests_pkgMkIndex.test) = 70d1042c1f4743052c5fa191fa7c4732a08e28a2 19SHA1 (patch-tests_pkgMkIndex.test) = 70d1042c1f4743052c5fa191fa7c4732a08e28a2
19SHA1 (patch-unix_Makefile.in) = 70cd193ca4bf93a0dc635c4ea0681686699277bf 20SHA1 (patch-unix_Makefile.in) = d074b0e93c915be137f537050a80c549c9808b72
20SHA1 (patch-unix_configure) = a3a0965e82b81093ba53cb5bb31842138272450a 21SHA1 (patch-unix_configure) = 497eebc6dfa614647a400c94847f5fdb82d6e361
21SHA1 (patch-unix_tclConfig.sh.in) = 341ac4f1bbfb29551dea87ade98b3b7b59652a31 22SHA1 (patch-unix_tclConfig.sh.in) = 341ac4f1bbfb29551dea87ade98b3b7b59652a31
22SHA1 (patch-unix_tclUnixCompat.c) = 7ffa40a1a56345f5b86cd896e8e3b0d5748d8c5e 23SHA1 (patch-unix_tclUnixCompat.c) = 7ffa40a1a56345f5b86cd896e8e3b0d5748d8c5e
23SHA1 (patch-unix_tclUnixFCmd.c) = e715d9419a36a8414355252bb3da0ef48b07fe4f 24SHA1 (patch-unix_tclUnixFCmd.c) = e715d9419a36a8414355252bb3da0ef48b07fe4f
24SHA1 (patch-unix_tclUnixInit.c) = 50eafafdd10e35266f9fe5b73a80e7b50f393f88 25SHA1 (patch-unix_tclUnixInit.c) = 50eafafdd10e35266f9fe5b73a80e7b50f393f88
25SHA1 (patch-unix_tclUnixPort.h) = 6efe848c16c550f6adee4bec011891755bb23620 26SHA1 (patch-unix_tclUnixPort.h) = f7d2e7b8912b9bff1709ac2c34aee1f4725e90ac
File Deleted: pkgsrc/lang/tcl/patches/Attic/patch-pkgs_itcl4.0.3_configure
File Deleted: pkgsrc/lang/tcl/patches/Attic/patch-pkgs_sqlite3.8.8.3_configure
File Deleted: pkgsrc/lang/tcl/patches/Attic/patch-pkgs_tdbc1.0.3_configure
File Deleted: pkgsrc/lang/tcl/patches/Attic/patch-pkgs_tdbcmysql1.0.3_configure
File Deleted: pkgsrc/lang/tcl/patches/Attic/patch-pkgs_tdbcodbc1.0.3_configure
File Deleted: pkgsrc/lang/tcl/patches/Attic/patch-pkgs_tdbcpostgres1.0.3_configure
File Deleted: pkgsrc/lang/tcl/patches/Attic/patch-pkgs_thread2.7.2_configure
File Added: pkgsrc/lang/tcl/patches/Attic/patch-pkgs_itcl4.0.4_configure
$NetBSD: patch-pkgs_itcl4.0.4_configure,v 1.1 2016/03/06 11:47:49 adam Exp $

Add support for DragonFly.

--- pkgs/itcl4.0.4/configure.orig	2016-02-11 21:01:59.000000000 +0000
+++ pkgs/itcl4.0.4/configure
@@ -7397,8 +7397,7 @@ fi
 		    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
 fi
 		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
-		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
-		LDFLAGS="-Wl,-export-dynamic"
+		LDFLAGS="-Wl,--export-dynamic"
 		;;
 	    esac
 	    case "$arch" in
@@ -7418,8 +7417,6 @@ fi
 
 fi
 	    # OpenBSD doesn't do version numbers with dots.
-	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-	    TCL_LIB_VERSIONS_OK=nodots
 	    ;;
 	NetBSD-*)
 	    # NetBSD has ELF and can use 'cc -shared' to build shared libs
@@ -7441,7 +7438,7 @@ fi
 
 fi
 	    ;;
-	FreeBSD-*)
+	FreeBSD-*|DragonFly-*)
 	    # This configuration from FreeBSD Ports.
 	    SHLIB_CFLAGS="-fPIC"
 	    SHLIB_LD="${CC} -shared"
@@ -7463,10 +7460,6 @@ fi
 	    case $system in
 	    FreeBSD-3.*)
 		# Version numbers are dot-stripped by system policy.
-		TCL_TRIM_DOTS=`echo ${PACKAGE_VERSION} | tr -d .`
-		UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
-		TCL_LIB_VERSIONS_OK=nodots
 		;;
 	    esac
 	    ;;
@@ -8077,7 +8070,7 @@ fi
 	    BSD/OS*) ;;
 	    CYGWIN_*|MINGW32_*) ;;
 	    IRIX*) ;;
-	    NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
+	    NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
 	    Darwin-*) ;;
 	    SCO_SV-3.2*) ;;
 	    windows) ;;
File Added: pkgsrc/lang/tcl/patches/Attic/patch-pkgs_sqlite3.11.0_Makefile.in
$NetBSD: patch-pkgs_sqlite3.11.0_Makefile.in,v 1.1 2016/03/06 11:47:49 adam Exp $

Fix building with system sqlite3.

--- pkgs/sqlite3.11.0/Makefile.in.orig	2016-03-06 11:25:44.000000000 +0000
+++ pkgs/sqlite3.11.0/Makefile.in
@@ -150,7 +150,7 @@ SHARED_BUILD	= @SHARED_BUILD@
 INCLUDES	= @PKG_INCLUDES@ @TCL_INCLUDES@ -I$(srcdir)/..
 #INCLUDES	= @PKG_INCLUDES@ @TCL_INCLUDES@ @TK_INCLUDES@ @TK_XINCLUDES@
 
-PKG_CFLAGS	= @PKG_CFLAGS@ -DSQLITE_API=MODULE_SCOPE -DSQLITE_EXTERN=
+PKG_CFLAGS	= @PKG_CFLAGS@
 
 # TCL_DEFS is not strictly need here, but if you remove it, then you
 # must make sure that configure.in checks for the necessary components
File Added: pkgsrc/lang/tcl/patches/Attic/patch-pkgs_sqlite3.11.0_configure
$NetBSD: patch-pkgs_sqlite3.11.0_configure,v 1.1 2016/03/06 11:47:49 adam Exp $

Add support for DragonFly.

--- pkgs/sqlite3.11.0/configure.orig	2016-02-16 18:34:47.000000000 +0000
+++ pkgs/sqlite3.11.0/configure
@@ -7361,8 +7361,7 @@ fi
 		    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
 fi
 		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
-		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
-		LDFLAGS="-Wl,-export-dynamic"
+		LDFLAGS="-Wl,--export-dynamic"
 		;;
 	    esac
 	    case "$arch" in
@@ -7382,8 +7381,6 @@ fi
 
 fi
 	    # OpenBSD doesn't do version numbers with dots.
-	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-	    TCL_LIB_VERSIONS_OK=nodots
 	    ;;
 	NetBSD-*)
 	    # NetBSD has ELF and can use 'cc -shared' to build shared libs
@@ -7405,7 +7402,7 @@ fi
 
 fi
 	    ;;
-	FreeBSD-*)
+	FreeBSD-*|DragonFly-*)
 	    # This configuration from FreeBSD Ports.
 	    SHLIB_CFLAGS="-fPIC"
 	    SHLIB_LD="${CC} -shared"
@@ -7427,10 +7424,6 @@ fi
 	    case $system in
 	    FreeBSD-3.*)
 		# Version numbers are dot-stripped by system policy.
-		TCL_TRIM_DOTS=`echo ${PACKAGE_VERSION} | tr -d .`
-		UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
-		TCL_LIB_VERSIONS_OK=nodots
 		;;
 	    esac
 	    ;;
@@ -8041,7 +8034,7 @@ fi
 	    BSD/OS*) ;;
 	    CYGWIN_*|MINGW32_*) ;;
 	    IRIX*) ;;
-	    NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
+	    NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
 	    Darwin-*) ;;
 	    SCO_SV-3.2*) ;;
 	    windows) ;;
File Added: pkgsrc/lang/tcl/patches/Attic/patch-pkgs_tdbc1.0.4_configure
$NetBSD: patch-pkgs_tdbc1.0.4_configure,v 1.1 2016/03/06 11:47:49 adam Exp $

Add support for DragonFly.

--- pkgs/tdbc1.0.4/configure.orig	2016-01-28 18:05:47.000000000 +0000
+++ pkgs/tdbc1.0.4/configure
@@ -7518,8 +7518,7 @@ fi
 		    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
 fi
 		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
-		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
-		LDFLAGS="-Wl,-export-dynamic"
+		LDFLAGS="-Wl,--export-dynamic"
 		;;
 	    esac
 	    case "$arch" in
@@ -7539,8 +7538,6 @@ fi
 
 fi
 	    # OpenBSD doesn't do version numbers with dots.
-	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-	    TCL_LIB_VERSIONS_OK=nodots
 	    ;;
 	NetBSD-*)
 	    # NetBSD has ELF and can use 'cc -shared' to build shared libs
@@ -7562,7 +7559,7 @@ fi
 
 fi
 	    ;;
-	FreeBSD-*)
+	FreeBSD-*|DragonFly-*)
 	    # This configuration from FreeBSD Ports.
 	    SHLIB_CFLAGS="-fPIC"
 	    SHLIB_LD="${CC} -shared"
@@ -7584,10 +7581,6 @@ fi
 	    case $system in
 	    FreeBSD-3.*)
 		# Version numbers are dot-stripped by system policy.
-		TCL_TRIM_DOTS=`echo ${PACKAGE_VERSION} | tr -d .`
-		UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
-		TCL_LIB_VERSIONS_OK=nodots
 		;;
 	    esac
 	    ;;
@@ -8198,7 +8191,7 @@ fi
 	    BSD/OS*) ;;
 	    CYGWIN_*|MINGW32_*) ;;
 	    IRIX*) ;;
-	    NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
+	    NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
 	    Darwin-*) ;;
 	    SCO_SV-3.2*) ;;
 	    windows) ;;
File Added: pkgsrc/lang/tcl/patches/Attic/patch-pkgs_tdbcmysql1.0.4_configure
$NetBSD: patch-pkgs_tdbcmysql1.0.4_configure,v 1.1 2016/03/06 11:47:49 adam Exp $

Add support for DragonFly.

--- pkgs/tdbcmysql1.0.4/configure.orig	2016-01-28 18:06:23.000000000 +0000
+++ pkgs/tdbcmysql1.0.4/configure
@@ -7864,8 +7864,7 @@ fi
 		    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
 fi
 		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
-		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
-		LDFLAGS="-Wl,-export-dynamic"
+		LDFLAGS="-Wl,--export-dynamic"
 		;;
 	    esac
 	    case "$arch" in
@@ -7885,8 +7884,6 @@ fi
 
 fi
 	    # OpenBSD doesn't do version numbers with dots.
-	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-	    TCL_LIB_VERSIONS_OK=nodots
 	    ;;
 	NetBSD-*)
 	    # NetBSD has ELF and can use 'cc -shared' to build shared libs
@@ -7908,7 +7905,7 @@ fi
 
 fi
 	    ;;
-	FreeBSD-*)
+	FreeBSD-*|DragonFly-*)
 	    # This configuration from FreeBSD Ports.
 	    SHLIB_CFLAGS="-fPIC"
 	    SHLIB_LD="${CC} -shared"
@@ -7930,10 +7927,6 @@ fi
 	    case $system in
 	    FreeBSD-3.*)
 		# Version numbers are dot-stripped by system policy.
-		TCL_TRIM_DOTS=`echo ${PACKAGE_VERSION} | tr -d .`
-		UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
-		TCL_LIB_VERSIONS_OK=nodots
 		;;
 	    esac
 	    ;;
@@ -8544,7 +8537,7 @@ fi
 	    BSD/OS*) ;;
 	    CYGWIN_*|MINGW32_*) ;;
 	    IRIX*) ;;
-	    NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
+	    NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
 	    Darwin-*) ;;
 	    SCO_SV-3.2*) ;;
 	    windows) ;;
File Added: pkgsrc/lang/tcl/patches/Attic/patch-pkgs_tdbcodbc1.0.4_configure
$NetBSD: patch-pkgs_tdbcodbc1.0.4_configure,v 1.1 2016/03/06 11:47:49 adam Exp $

Add support for DragonFly.

--- pkgs/tdbcodbc1.0.4/configure.orig	2016-01-28 18:06:52.000000000 +0000
+++ pkgs/tdbcodbc1.0.4/configure
@@ -7864,8 +7864,7 @@ fi
 		    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
 fi
 		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
-		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
-		LDFLAGS="-Wl,-export-dynamic"
+		LDFLAGS="-Wl,--export-dynamic"
 		;;
 	    esac
 	    case "$arch" in
@@ -7885,8 +7884,6 @@ fi
 
 fi
 	    # OpenBSD doesn't do version numbers with dots.
-	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-	    TCL_LIB_VERSIONS_OK=nodots
 	    ;;
 	NetBSD-*)
 	    # NetBSD has ELF and can use 'cc -shared' to build shared libs
@@ -7908,7 +7905,7 @@ fi
 
 fi
 	    ;;
-	FreeBSD-*)
+	FreeBSD-*|DragonFly-*)
 	    # This configuration from FreeBSD Ports.
 	    SHLIB_CFLAGS="-fPIC"
 	    SHLIB_LD="${CC} -shared"
@@ -7930,10 +7927,6 @@ fi
 	    case $system in
 	    FreeBSD-3.*)
 		# Version numbers are dot-stripped by system policy.
-		TCL_TRIM_DOTS=`echo ${PACKAGE_VERSION} | tr -d .`
-		UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
-		TCL_LIB_VERSIONS_OK=nodots
 		;;
 	    esac
 	    ;;
@@ -8544,7 +8537,7 @@ fi
 	    BSD/OS*) ;;
 	    CYGWIN_*|MINGW32_*) ;;
 	    IRIX*) ;;
-	    NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
+	    NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
 	    Darwin-*) ;;
 	    SCO_SV-3.2*) ;;
 	    windows) ;;
File Added: pkgsrc/lang/tcl/patches/Attic/patch-pkgs_tdbcpostgres1.0.4_configure
$NetBSD: patch-pkgs_tdbcpostgres1.0.4_configure,v 1.1 2016/03/06 11:47:49 adam Exp $

Add support for DragonFly.

--- pkgs/tdbcpostgres1.0.4/configure.orig	2016-01-28 18:07:18.000000000 +0000
+++ pkgs/tdbcpostgres1.0.4/configure
@@ -7864,8 +7864,7 @@ fi
 		    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
 fi
 		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
-		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
-		LDFLAGS="-Wl,-export-dynamic"
+		LDFLAGS="-Wl,--export-dynamic"
 		;;
 	    esac
 	    case "$arch" in
@@ -7885,8 +7884,6 @@ fi
 
 fi
 	    # OpenBSD doesn't do version numbers with dots.
-	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-	    TCL_LIB_VERSIONS_OK=nodots
 	    ;;
 	NetBSD-*)
 	    # NetBSD has ELF and can use 'cc -shared' to build shared libs
@@ -7908,7 +7905,7 @@ fi
 
 fi
 	    ;;
-	FreeBSD-*)
+	FreeBSD-*|DragonFly-*)
 	    # This configuration from FreeBSD Ports.
 	    SHLIB_CFLAGS="-fPIC"
 	    SHLIB_LD="${CC} -shared"
@@ -7930,10 +7927,6 @@ fi
 	    case $system in
 	    FreeBSD-3.*)
 		# Version numbers are dot-stripped by system policy.
-		TCL_TRIM_DOTS=`echo ${PACKAGE_VERSION} | tr -d .`
-		UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
-		TCL_LIB_VERSIONS_OK=nodots
 		;;
 	    esac
 	    ;;
@@ -8544,7 +8537,7 @@ fi
 	    BSD/OS*) ;;
 	    CYGWIN_*|MINGW32_*) ;;
 	    IRIX*) ;;
-	    NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
+	    NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
 	    Darwin-*) ;;
 	    SCO_SV-3.2*) ;;
 	    windows) ;;
File Added: pkgsrc/lang/tcl/patches/Attic/patch-pkgs_thread2.7.3_configure
$NetBSD: patch-pkgs_thread2.7.3_configure,v 1.1 2016/03/06 11:47:49 adam Exp $

Add support for DragonFly.

--- pkgs/thread2.7.3/configure.orig	2016-01-28 17:45:52.000000000 +0000
+++ pkgs/thread2.7.3/configure
@@ -9315,7 +9315,7 @@ fi
 
 		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
 		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
-		LDFLAGS="-Wl,-export-dynamic"
+		LDFLAGS="-Wl,--export-dynamic"
 		;;
 	    esac
 	    case "$arch" in
@@ -9336,8 +9336,6 @@ fi
 fi
 
 	    # OpenBSD doesn't do version numbers with dots.
-	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-	    TCL_LIB_VERSIONS_OK=nodots
 	    ;;
 	NetBSD-*)
 	    # NetBSD has ELF and can use 'cc -shared' to build shared libs
@@ -9361,7 +9359,7 @@ fi
 fi
 
 	    ;;
-	FreeBSD-*)
+	FreeBSD-*|DragonFly-*)
 	    # This configuration from FreeBSD Ports.
 	    SHLIB_CFLAGS="-fPIC"
 	    SHLIB_LD="${CC} -shared"
@@ -9385,10 +9383,6 @@ fi
 	    case $system in
 	    FreeBSD-3.*)
 		# Version numbers are dot-stripped by system policy.
-		TCL_TRIM_DOTS=`echo ${PACKAGE_VERSION} | tr -d .`
-		UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
-		TCL_LIB_VERSIONS_OK=nodots
 		;;
 	    esac
 	    ;;
@@ -10239,7 +10233,7 @@ fi
 	    BSD/OS*) ;;
 	    CYGWIN_*|MINGW32_*) ;;
 	    IRIX*) ;;
-	    NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
+	    NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
 	    Darwin-*) ;;
 	    SCO_SV-3.2*) ;;
 	    windows) ;;
cvs diff -r1.9 -r1.10 pkgsrc/lang/tcl/patches/patch-unix_Makefile.in (expand / switch to unified diff)

--- pkgsrc/lang/tcl/patches/patch-unix_Makefile.in 2015/03/16 13:30:02 1.9
+++ pkgsrc/lang/tcl/patches/patch-unix_Makefile.in 2016/03/06 11:47:49 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-unix_Makefile.in,v 1.9 2015/03/16 13:30:02 jperkin Exp $ 1$NetBSD: patch-unix_Makefile.in,v 1.10 2016/03/06 11:47:49 adam Exp $
2 2
3Honour LDFLAGS. 3Honour LDFLAGS.
4 4
5--- unix/Makefile.in.orig 2014-11-12 02:36:22.000000000 +0000 5--- unix/Makefile.in.orig 2014-11-12 02:36:22.000000000 +0000
6+++ unix/Makefile.in 6+++ unix/Makefile.in
7@@ -8,6 +8,7 @@ VERSION = @TCL_VERSION@ 7@@ -8,6 +8,7 @@ VERSION = @TCL_VERSION@
8 MAJOR_VERSION = @TCL_MAJOR_VERSION@ 8 MAJOR_VERSION = @TCL_MAJOR_VERSION@
9 MINOR_VERSION = @TCL_MINOR_VERSION@ 9 MINOR_VERSION = @TCL_MINOR_VERSION@
10 PATCH_LEVEL = @TCL_PATCH_LEVEL@ 10 PATCH_LEVEL = @TCL_PATCH_LEVEL@
11+SHLIB_VERSION = @SHLIB_VERSION@ 11+SHLIB_VERSION = @SHLIB_VERSION@
12  12
13 #-------------------------------------------------------------------------- 13 #--------------------------------------------------------------------------
14 # Things you can change to personalize the Makefile for your own site (you can 14 # Things you can change to personalize the Makefile for your own site (you can
@@ -87,46 +87,46 @@ Honour LDFLAGS. @@ -87,46 +87,46 @@ Honour LDFLAGS.
87 @$(INSTALL_DATA) tclConfig.sh "$(CONFIG_INSTALL_DIR)/tclConfig.sh" 87 @$(INSTALL_DATA) tclConfig.sh "$(CONFIG_INSTALL_DIR)/tclConfig.sh"
88 @echo "Installing tclooConfig.sh to $(CONFIG_INSTALL_DIR)/" 88 @echo "Installing tclooConfig.sh to $(CONFIG_INSTALL_DIR)/"
89@@ -825,7 +841,7 @@ install-libraries: libraries 89@@ -825,7 +841,7 @@ install-libraries: libraries
90 else true; \ 90 else true; \
91 fi; \ 91 fi; \
92 done; 92 done;
93- @for i in opt0.4 http1.0 encoding ../tcl8 ../tcl8/8.4 ../tcl8/8.4/platform ../tcl8/8.5 ../tcl8/8.6; \ 93- @for i in opt0.4 http1.0 encoding ../tcl8 ../tcl8/8.4 ../tcl8/8.4/platform ../tcl8/8.5 ../tcl8/8.6; \
94+ @for i in opt0.4 http1.0 encoding; \ 94+ @for i in opt0.4 http1.0 encoding; \
95 do \ 95 do \
96 if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \ 96 if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \
97 echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \ 97 echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
98@@ -846,6 +862,8 @@ install-libraries: libraries 98@@ -846,6 +862,8 @@ install-libraries: libraries
99 done; 99 done;
100 @echo "Installing package http 2.8.8 as a Tcl Module"; 100 @echo "Installing package http 2.8.9 as a Tcl Module";
101 @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.8.8.tm; 101 @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.8.9.tm;
102+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/http/http.tcl; 102+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/http/http.tcl;
103+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/http/pkgIndex.tcl; 103+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/http/pkgIndex.tcl;
104 @echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/"; 104 @echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/";
105 @for i in $(TOP_DIR)/library/opt/*.tcl ; \ 105 @for i in $(TOP_DIR)/library/opt/*.tcl ; \
106 do \ 106 do \
107@@ -853,13 +871,21 @@ install-libraries: libraries 107@@ -853,13 +871,21 @@ install-libraries: libraries
108 done; 108 done;
109 @echo "Installing package msgcat 1.5.2 as a Tcl Module"; 109 @echo "Installing package msgcat 1.6.0 as a Tcl Module";
110 @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.5.2.tm; 110 @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.6.0.tm;
111+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat1.5/msgcat.tcl; 111+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat1.6/msgcat.tcl;
112+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat1.5/pkgIndex.tcl; 112+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat1.6/pkgIndex.tcl;
113 @echo "Installing package tcltest 2.3.8 as a Tcl Module"; 113 @echo "Installing package tcltest 2.3.8 as a Tcl Module";
114 @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.8.tm; 114 @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.8.tm;
115+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest2.3/tcltest.tcl; 115+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest2.3/tcltest.tcl;
116+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest2.3/pkgIndex.tcl; 116+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest2.3/pkgIndex.tcl;
117  117
118 @echo "Installing package platform 1.0.13 as a Tcl Module"; 118 @echo "Installing package platform 1.0.14 as a Tcl Module";
119 @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.13.tm; 119 @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.14.tm;
120+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/platform1.0/platform.tcl; 120+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/platform1.0/platform.tcl;
121+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/platform1.0/pkgIndex.tcl; 121+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/platform1.0/pkgIndex.tcl;
122 @echo "Installing package platform::shell 1.1.4 as a Tcl Module"; 122 @echo "Installing package platform::shell 1.1.4 as a Tcl Module";
123 @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform/shell-1.1.4.tm; 123 @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform/shell-1.1.4.tm;
124+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/shell1.1/shell.tcl 124+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/shell1.1/shell.tcl
125+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/shell1.1/pkgIndex.tcl 125+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/shell1.1/pkgIndex.tcl
126  126
127 @echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/"; 127 @echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/";
128 @for i in $(TOP_DIR)/library/encoding/*.enc ; do \ 128 @for i in $(TOP_DIR)/library/encoding/*.enc ; do \
129@@ -944,7 +970,7 @@ install-doc: doc 129@@ -944,7 +970,7 @@ install-doc: doc
130 done 130 done
131  131
132 install-headers: 132 install-headers:
cvs diff -r1.8 -r1.9 pkgsrc/lang/tcl/patches/patch-unix_configure (expand / switch to unified diff)

--- pkgsrc/lang/tcl/patches/patch-unix_configure 2015/06/29 09:49:51 1.8
+++ pkgsrc/lang/tcl/patches/patch-unix_configure 2016/03/06 11:47:49 1.9
@@ -1,167 +1,167 @@ @@ -1,167 +1,167 @@
1$NetBSD: patch-unix_configure,v 1.8 2015/06/29 09:49:51 joerg Exp $ 1$NetBSD: patch-unix_configure,v 1.9 2016/03/06 11:47:49 adam Exp $
2 2
3--- unix/configure.orig 2015-03-11 13:59:56.000000000 +0000 3--- unix/configure.orig 2016-03-01 01:59:35.000000000 +0000
4+++ unix/configure 4+++ unix/configure
5@@ -6989,12 +6989,12 @@ fi 5@@ -6837,12 +6837,12 @@ fi
6 LD_SEARCH_FLAGS="" 6 LD_SEARCH_FLAGS=""
7 ;; 7 ;;
8 BSD/OS-4.*) 8 BSD/OS-4.*)
9- SHLIB_CFLAGS="-export-dynamic -fPIC" 9- SHLIB_CFLAGS="-export-dynamic -fPIC"
10+ SHLIB_CFLAGS="-Wl,--export-dynamic -fPIC" 10+ SHLIB_CFLAGS="-Wl,--export-dynamic -fPIC"
11 SHLIB_LD='${CC} -shared' 11 SHLIB_LD='${CC} -shared'
12 SHLIB_SUFFIX=".so" 12 SHLIB_SUFFIX=".so"
13 DL_OBJS="tclLoadDl.o" 13 DL_OBJS="tclLoadDl.o"
14 DL_LIBS="-ldl" 14 DL_LIBS="-ldl"
15- LDFLAGS="$LDFLAGS -export-dynamic" 15- LDFLAGS="$LDFLAGS -export-dynamic"
16+ LDFLAGS="$LDFLAGS --export-dynamic" 16+ LDFLAGS="$LDFLAGS --export-dynamic"
17 CC_SEARCH_FLAGS="" 17 CC_SEARCH_FLAGS=""
18 LD_SEARCH_FLAGS="" 18 LD_SEARCH_FLAGS=""
19 ;; 19 ;;
20@@ -7665,7 +7665,7 @@ fi 20@@ -7513,7 +7513,7 @@ fi
21 CC_SEARCH_FLAGS="" 21 CC_SEARCH_FLAGS=""
22 LD_SEARCH_FLAGS="" 22 LD_SEARCH_FLAGS=""
23 ;; 23 ;;
24- OpenBSD-*) 24- OpenBSD-*)
25+ OpenBSD-*|MirBSD-*) 25+ OpenBSD-*|MirBSD-*)
26 arch=`arch -s` 26 arch=`arch -s`
27 case "$arch" in 27 case "$arch" in
28 vax) 28 vax)
29@@ -7695,7 +7695,7 @@ fi 29@@ -7543,7 +7543,7 @@ fi
30  30
31 LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} 31 LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
32 SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}' 32 SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
33- LDFLAGS="-Wl,-export-dynamic" 33- LDFLAGS="-Wl,-export-dynamic"
34+ LDFLAGS="-Wl,--export-dynamic" 34+ LDFLAGS="-Wl,--export-dynamic"
35 ;; 35 ;;
36 esac 36 esac
37 case "$arch" in 37 case "$arch" in
38@@ -7729,7 +7729,7 @@ fi 38@@ -7577,7 +7577,7 @@ fi
39 SHLIB_SUFFIX=".so" 39 SHLIB_SUFFIX=".so"
40 DL_OBJS="tclLoadDl.o" 40 DL_OBJS="tclLoadDl.o"
41 DL_LIBS="" 41 DL_LIBS=""
42- LDFLAGS="$LDFLAGS -export-dynamic" 42- LDFLAGS="$LDFLAGS -export-dynamic"
43+ LDFLAGS="$LDFLAGS -Wl,--export-dynamic" 43+ LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
44 if test $doRpath = yes; then 44 if test $doRpath = yes; then
45  45
46 CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' 46 CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
47@@ -7746,7 +7746,7 @@ fi 47@@ -7594,7 +7594,7 @@ fi
48 fi 48 fi
49  49
50 ;; 50 ;;
51- FreeBSD-*) 51- FreeBSD-*)
52+ FreeBSD-*|DragonFly-*) 52+ FreeBSD-*|DragonFly-*)
53 # This configuration from FreeBSD Ports. 53 # This configuration from FreeBSD Ports.
54 SHLIB_CFLAGS="-fPIC" 54 SHLIB_CFLAGS="-fPIC"
55 SHLIB_LD="${CC} -shared" 55 SHLIB_LD="${CC} -shared"
56@@ -7780,7 +7780,6 @@ fi 56@@ -7628,7 +7628,6 @@ fi
57 esac 57 esac
58 ;; 58 ;;
59 Darwin-*) 59 Darwin-*)
60- CFLAGS_OPTIMIZE="-Os" 60- CFLAGS_OPTIMIZE="-Os"
61 SHLIB_CFLAGS="-fno-common" 61 SHLIB_CFLAGS="-fno-common"
62 # To avoid discrepancies between what headers configure sees during 62 # To avoid discrepancies between what headers configure sees during
63 # preprocessing tests and compiling tests, move any -isysroot and 63 # preprocessing tests and compiling tests, move any -isysroot and
64@@ -8954,7 +8953,7 @@ fi 64@@ -8802,7 +8801,7 @@ fi
65 BSD/OS*) ;; 65 BSD/OS*) ;;
66 CYGWIN_*|MINGW32_*) ;; 66 CYGWIN_*|MINGW32_*) ;;
67 IRIX*) ;; 67 IRIX*) ;;
68- NetBSD-*|FreeBSD-*|OpenBSD-*) ;; 68- NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
69+ NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*|MirBSD-*) ;; 69+ NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*|MirBSD-*) ;;
70 Darwin-*) ;; 70 Darwin-*) ;;
71 SCO_SV-3.2*) ;; 71 SCO_SV-3.2*) ;;
72 *) SHLIB_CFLAGS="-fPIC" ;; 72 *) SHLIB_CFLAGS="-fPIC" ;;
73@@ -8996,7 +8995,11 @@ fi 73@@ -8844,7 +8843,11 @@ fi
74  74
75 else 75 else
76  76
77- INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)"' 77- INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)"'
78+ if test "${SHLIB_SUFFIX}" = ".dylib" ; then 78+ if test "${SHLIB_SUFFIX}" = ".dylib" ; then
79+ INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/libtcl$(MAJOR_VERSION)$(MINOR_VERSION).$(SHLIB_VERSION)$(SHLIB_SUFFIX)"' 79+ INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/libtcl$(MAJOR_VERSION)$(MINOR_VERSION).$(SHLIB_VERSION)$(SHLIB_SUFFIX)"'
80+ else 80+ else
81+ INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE).$(SHLIB_VERSION)"' 81+ INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE).$(SHLIB_VERSION)"'
82+ fi 82+ fi
83  83
84 fi 84 fi
85  85
86@@ -9030,7 +9033,7 @@ fi 86@@ -8879,7 +8882,7 @@ else
87 else 
88  
89 MAKE_STUB_LIB='${STLIB_LD} $@ ${STUB_LIB_OBJS} ; ${RANLIB} $@' 
90- INSTALL_STUB_LIB='$(INSTALL_LIBRARY) $(STUB_LIB_FILE) "$(LIB_INSTALL_DIR)/$(STUB_LIB_FILE)" ; (cd "$(LIB_INSTALL_DIR)" ; $(RANLIB) $(STUB_LIB_FILE))' 
91+ INSTALL_STUB_LIB='$(INSTALL_DATA) $(STUB_LIB_FILE) "$(LIB_INSTALL_DIR)/$(STUB_LIB_FILE)" ; (cd "$(LIB_INSTALL_DIR)" ; $(RANLIB) $(STUB_LIB_FILE))' 
92  87
93 fi 88 fi
94  89
95@@ -19064,9 +19067,9 @@ fi 90- INSTALL_STUB_LIB='$(INSTALL_LIBRARY) $(STUB_LIB_FILE) "$(LIB_INSTALL_DIR)/$(STUB_LIB_FILE)"'
 91+ INSTALL_STUB_LIB='$(INSTALL_DATA) $(STUB_LIB_FILE) "$(LIB_INSTALL_DIR)/$(STUB_LIB_FILE)"'
 92
 93 # Define TCL_LIBS now that we know what DL_LIBS is.
 94 # The trick here is that we don't want to change the value of TCL_LIBS if
 95@@ -18910,9 +18913,9 @@ fi
96 # building libtcl as a shared library instead of a static library. 96 # building libtcl as a shared library instead of a static library.
97 #-------------------------------------------------------------------- 97 #--------------------------------------------------------------------
98  98
99-TCL_UNSHARED_LIB_SUFFIX=${UNSHARED_LIB_SUFFIX} 99-TCL_UNSHARED_LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
100-TCL_SHARED_LIB_SUFFIX=${SHARED_LIB_SUFFIX} 100-TCL_SHARED_LIB_SUFFIX=${SHARED_LIB_SUFFIX}
101-eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" 101-eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}"
102+TCL_UNSHARED_LIB_SUFFIX=${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}.a 102+TCL_UNSHARED_LIB_SUFFIX=${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}.a
103+TCL_SHARED_LIB_SUFFIX=${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${SHLIB_SUFFIX} 103+TCL_SHARED_LIB_SUFFIX=${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${SHLIB_SUFFIX}
104+eval "TCL_LIB_FILE=libtcl${TCL_SHARED_LIB_SUFFIX}" 104+eval "TCL_LIB_FILE=libtcl${TCL_SHARED_LIB_SUFFIX}"
105  105
106 # tclConfig.sh needs a version of the _LIB_SUFFIX that has been eval'ed 106 # tclConfig.sh needs a version of the _LIB_SUFFIX that has been eval'ed
107 # since on some platforms TCL_LIB_FILE contains shell escapes. 107 # since on some platforms TCL_LIB_FILE contains shell escapes.
108@@ -19179,13 +19182,10 @@ else 108@@ -19025,13 +19028,10 @@ else
109 eval libdir="$libdir" 109 eval libdir="$libdir"
110 # default install directory for bundled packages 110 # default install directory for bundled packages
111 PACKAGE_DIR="$libdir" 111 PACKAGE_DIR="$libdir"
112- if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then 112- if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
113- TCL_LIB_FLAG="-ltcl${TCL_VERSION}" 113- TCL_LIB_FLAG="-ltcl${TCL_VERSION}"
114- else 114- else
115- TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`" 115- TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`"
116- fi 116- fi
117+ TCL_LIB_FLAG="-ltcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}" 117+ TCL_LIB_FLAG="-ltcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
118 TCL_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TCL_LIB_FLAG}" 118 TCL_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TCL_LIB_FLAG}"
119- TCL_LIB_SPEC="-L${libdir} ${TCL_LIB_FLAG}" 119- TCL_LIB_SPEC="-L${libdir} ${TCL_LIB_FLAG}"
120+ TCL_LIB_SPEC_RPATH="${COMPILER_RPATH_FLAG}${libdir}" 120+ TCL_LIB_SPEC_RPATH="${COMPILER_RPATH_FLAG}${libdir}"
121+ TCL_LIB_SPEC="${TCL_LIB_SPEC_RPATH} -L${libdir} ${TCL_LIB_FLAG}" 121+ TCL_LIB_SPEC="${TCL_LIB_SPEC_RPATH} -L${libdir} ${TCL_LIB_FLAG}"
122 fi 122 fi
123 VERSION='${VERSION}' 123 VERSION='${VERSION}'
124 eval "CFG_TCL_SHARED_LIB_SUFFIX=${TCL_SHARED_LIB_SUFFIX}" 124 eval "CFG_TCL_SHARED_LIB_SUFFIX=${TCL_SHARED_LIB_SUFFIX}"
125@@ -19204,12 +19204,11 @@ if test "$FRAMEWORK_BUILD" = "1" ; then 125@@ -19050,12 +19050,11 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
126 TCL_PACKAGE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl ~/Library/Frameworks /Library/Frameworks /System/Library/Frameworks" 126 TCL_PACKAGE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl ~/Library/Frameworks /Library/Frameworks /System/Library/Frameworks"
127 test -z "$TCL_MODULE_PATH" && \ 127 test -z "$TCL_MODULE_PATH" && \
128 TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl" 128 TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl"
129-elif test "$prefix/lib" != "$libdir"; then 129-elif test "$prefix/lib" != "$libdir"; then
130- TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}" 130- TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}"
131 else 131 else
132- TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}" 132- TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}"
133+ TCL_PACKAGE_PATH="${prefix}/lib/tcl ${prefix}/lib" 133+ TCL_PACKAGE_PATH="${prefix}/lib/tcl ${prefix}/lib"
134 fi 134 fi
135  135
136+ 136+
137 #-------------------------------------------------------------------- 137 #--------------------------------------------------------------------
138 # The statements below define various symbols relating to Tcl 138 # The statements below define various symbols relating to Tcl
139 # stub support. 139 # stub support.
140@@ -19222,12 +19221,7 @@ eval "TCL_STUB_LIB_FILE=libtclstub${TCL_ 140@@ -19068,12 +19067,7 @@ eval "TCL_STUB_LIB_FILE=libtclstub${TCL_
141 eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\"" 141 eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\""
142 eval "TCL_STUB_LIB_DIR=${libdir}" 142 eval "TCL_STUB_LIB_DIR=${libdir}"
143  143
144-if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then 144-if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
145- TCL_STUB_LIB_FLAG="-ltclstub${TCL_VERSION}" 145- TCL_STUB_LIB_FLAG="-ltclstub${TCL_VERSION}"
146-else 146-else
147- TCL_STUB_LIB_FLAG="-ltclstub`echo ${TCL_VERSION} | tr -d .`" 147- TCL_STUB_LIB_FLAG="-ltclstub`echo ${TCL_VERSION} | tr -d .`"
148-fi 148-fi
149- 149-
150+TCL_STUB_LIB_FLAG="-ltclstub${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}" 150+TCL_STUB_LIB_FLAG="-ltclstub${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
151 TCL_BUILD_STUB_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TCL_STUB_LIB_FLAG}" 151 TCL_BUILD_STUB_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TCL_STUB_LIB_FLAG}"
152 TCL_STUB_LIB_SPEC="-L${TCL_STUB_LIB_DIR} ${TCL_STUB_LIB_FLAG}" 152 TCL_STUB_LIB_SPEC="-L${TCL_STUB_LIB_DIR} ${TCL_STUB_LIB_FLAG}"
153 TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}" 153 TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}"
154@@ -19381,34 +19375,15 @@ fi 154@@ -19227,34 +19221,15 @@ fi
155 # Transform confdefs.h into DEFS. 155 # Transform confdefs.h into DEFS.
156 # Protect against shell expansion while executing Makefile rules. 156 # Protect against shell expansion while executing Makefile rules.
157 # Protect against Makefile macro expansion. 157 # Protect against Makefile macro expansion.
158-# 158-#
159-# If the first sed substitution is executed (which looks for macros that 159-# If the first sed substitution is executed (which looks for macros that
160-# take arguments), then we branch to the quote section. Otherwise, 160-# take arguments), then we branch to the quote section. Otherwise,
161-# look for a macro that doesn't take arguments. 161-# look for a macro that doesn't take arguments.
162-cat >confdef2opt.sed <<\_ACEOF 162-cat >confdef2opt.sed <<\_ACEOF
163-t clear 163-t clear
164-: clear 164-: clear
165-s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g 165-s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g
166-t quote 166-t quote
167-s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g 167-s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g
@@ -185,21 +185,21 @@ $NetBSD: patch-unix_configure,v 1.8 2015 @@ -185,21 +185,21 @@ $NetBSD: patch-unix_configure,v 1.8 2015
185-rm -f confdef2opt.sed 185-rm -f confdef2opt.sed
186+cat > conftest.defs <<\EOF 186+cat > conftest.defs <<\EOF
187+s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g 187+s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
188+s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g 188+s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g
189+s%\[%\\&%g 189+s%\[%\\&%g
190+s%\]%\\&%g 190+s%\]%\\&%g
191+s%\$%$$%g 191+s%\$%$$%g
192+EOF 192+EOF
193+DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` 193+DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
194+rm -f conftest.defs 194+rm -f conftest.defs
195  195
196  196
197  197
198@@ -20036,6 +20013,7 @@ s,@EXTRA_BUILD_HTML@,$EXTRA_BUILD_HTML,; 198@@ -19882,6 +19857,7 @@ s,@EXTRA_BUILD_HTML@,$EXTRA_BUILD_HTML,;
199 s,@EXTRA_TCLSH_LIBS@,$EXTRA_TCLSH_LIBS,;t t 199 s,@EXTRA_TCLSH_LIBS@,$EXTRA_TCLSH_LIBS,;t t
200 s,@DLTEST_LD@,$DLTEST_LD,;t t 200 s,@DLTEST_LD@,$DLTEST_LD,;t t
201 s,@DLTEST_SUFFIX@,$DLTEST_SUFFIX,;t t 201 s,@DLTEST_SUFFIX@,$DLTEST_SUFFIX,;t t
202+s,@SHLIB_VERSION@,$SHLIB_VERSION,;t t 202+s,@SHLIB_VERSION@,$SHLIB_VERSION,;t t
203 CEOF 203 CEOF
204  204
205 _ACEOF 205 _ACEOF
cvs diff -r1.3 -r1.4 pkgsrc/lang/tcl/patches/patch-unix_tclUnixPort.h (expand / switch to unified diff)

--- pkgsrc/lang/tcl/patches/patch-unix_tclUnixPort.h 2014/01/11 14:41:05 1.3
+++ pkgsrc/lang/tcl/patches/patch-unix_tclUnixPort.h 2016/03/06 11:47:49 1.4
@@ -1,26 +1,17 @@ @@ -1,26 +1,17 @@
1$NetBSD: patch-unix_tclUnixPort.h,v 1.3 2014/01/11 14:41:05 adam Exp $ 1$NetBSD: patch-unix_tclUnixPort.h,v 1.4 2016/03/06 11:47:49 adam Exp $
2 2
3--- unix/tclUnixPort.h.orig 2013-05-31 19:30:55.000000000 +0000 3--- unix/tclUnixPort.h.orig 2016-02-25 20:12:38.000000000 +0000
4+++ unix/tclUnixPort.h 4+++ unix/tclUnixPort.h
5@@ -141,19 +141,11 @@ typedef off_t Tcl_SeekOffset; 5@@ -145,11 +145,7 @@ typedef off_t Tcl_SeekOffset;
6 #if HAVE_INTTYPES_H 
7 # include <inttypes.h> 
8 #endif 
9-#ifdef NO_LIMITS_H 
10-# include "../compat/limits.h" 
11-#else 
12-# include <limits.h> 
13-#endif 
14+#include <limits.h> 
15 #if HAVE_STDINT_H 6 #if HAVE_STDINT_H
16 # include <stdint.h> 7 # include <stdint.h>
17 #endif 8 #endif
18-#ifdef HAVE_UNISTD_H 9-#ifdef HAVE_UNISTD_H
19-# include <unistd.h> 10-# include <unistd.h>
20-#else 11-#else
21-# include "../compat/unistd.h" 12-# include "../compat/unistd.h"
22-#endif 13-#endif
23+#include <unistd.h> 14+#include <unistd.h>
24  15
25 extern int TclUnixSetBlockingMode(int fd, int mode); 16 extern int TclUnixSetBlockingMode(int fd, int mode);
26  17
cvs diff -r1.16 -r1.17 pkgsrc/x11/tk/Makefile.version (expand / switch to unified diff)

--- pkgsrc/x11/tk/Makefile.version 2015/05/21 10:38:00 1.16
+++ pkgsrc/x11/tk/Makefile.version 2016/03/06 11:47:49 1.17
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1# $NetBSD: Makefile.version,v 1.16 2015/05/21 10:38:00 adam Exp $ 1# $NetBSD: Makefile.version,v 1.17 2016/03/06 11:47:49 adam Exp $
2# used by cad/xcircuit/Makefile 2# used by cad/xcircuit/Makefile
3# used by devel/tcl-tclcl/Makefile 3# used by devel/tcl-tclcl/Makefile
4# used by lang/tcl/Makefile 4# used by lang/tcl/Makefile
5# used by lang/tcl-otcl/Makefile 5# used by lang/tcl-otcl/Makefile
6# used by x11/tk/Makefile 6# used by x11/tk/Makefile
7 7
8TK_SONUM= 86 8TK_SONUM= 86
9TK_BASEVER= 8.6 9TK_BASEVER= 8.6
10TK_VERSION= 8.6.4 10TK_VERSION= 8.6.5
cvs diff -r1.14 -r1.15 pkgsrc/x11/tk/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/tk/PLIST 2014/10/31 21:11:18 1.14
+++ pkgsrc/x11/tk/PLIST 2016/03/06 11:47:49 1.15
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.14 2014/10/31 21:11:18 adam Exp $ 1@comment $NetBSD: PLIST,v 1.15 2016/03/06 11:47:49 adam Exp $
2bin/wish 2bin/wish
3bin/wish${BASEVER} 3bin/wish${BASEVER}
4${PLIST.aqua}include/X11/X.h 4${PLIST.aqua}include/X11/X.h
5${PLIST.aqua}include/X11/Xatom.h 5${PLIST.aqua}include/X11/Xatom.h
6${PLIST.aqua}include/X11/Xfuncproto.h 6${PLIST.aqua}include/X11/Xfuncproto.h
7${PLIST.aqua}include/X11/Xlib.h 7${PLIST.aqua}include/X11/Xlib.h
8${PLIST.aqua}include/X11/Xutil.h 8${PLIST.aqua}include/X11/Xutil.h
9${PLIST.aqua}include/X11/cursorfont.h 9${PLIST.aqua}include/X11/cursorfont.h
10${PLIST.aqua}include/X11/keysym.h 10${PLIST.aqua}include/X11/keysym.h
11${PLIST.aqua}include/X11/keysymdef.h 11${PLIST.aqua}include/X11/keysymdef.h
12${PLIST.aqua}include/X11/xbytes.h 12${PLIST.aqua}include/X11/xbytes.h
13include/tk.h 13include/tk.h
14include/tk/generic/default.h 14include/tk/generic/default.h
@@ -81,26 +81,27 @@ lib/tk${BASEVER}/demos/entry2.tcl @@ -81,26 +81,27 @@ lib/tk${BASEVER}/demos/entry2.tcl
81lib/tk${BASEVER}/demos/entry3.tcl 81lib/tk${BASEVER}/demos/entry3.tcl
82lib/tk${BASEVER}/demos/filebox.tcl 82lib/tk${BASEVER}/demos/filebox.tcl
83lib/tk${BASEVER}/demos/floor.tcl 83lib/tk${BASEVER}/demos/floor.tcl
84lib/tk${BASEVER}/demos/fontchoose.tcl 84lib/tk${BASEVER}/demos/fontchoose.tcl
85lib/tk${BASEVER}/demos/form.tcl 85lib/tk${BASEVER}/demos/form.tcl
86lib/tk${BASEVER}/demos/goldberg.tcl 86lib/tk${BASEVER}/demos/goldberg.tcl
87lib/tk${BASEVER}/demos/hello 87lib/tk${BASEVER}/demos/hello
88lib/tk${BASEVER}/demos/hscale.tcl 88lib/tk${BASEVER}/demos/hscale.tcl
89lib/tk${BASEVER}/demos/icon.tcl 89lib/tk${BASEVER}/demos/icon.tcl
90lib/tk${BASEVER}/demos/image1.tcl 90lib/tk${BASEVER}/demos/image1.tcl
91lib/tk${BASEVER}/demos/image2.tcl 91lib/tk${BASEVER}/demos/image2.tcl
92lib/tk${BASEVER}/demos/images/earth.gif 92lib/tk${BASEVER}/demos/images/earth.gif
93lib/tk${BASEVER}/demos/images/earthris.gif 93lib/tk${BASEVER}/demos/images/earthris.gif
 94lib/tk${BASEVER}/demos/images/face.xbm
94lib/tk${BASEVER}/demos/images/flagdown.xbm 95lib/tk${BASEVER}/demos/images/flagdown.xbm
95lib/tk${BASEVER}/demos/images/flagup.xbm 96lib/tk${BASEVER}/demos/images/flagup.xbm
96lib/tk${BASEVER}/demos/images/gray25.xbm 97lib/tk${BASEVER}/demos/images/gray25.xbm
97lib/tk${BASEVER}/demos/images/letters.xbm 98lib/tk${BASEVER}/demos/images/letters.xbm
98lib/tk${BASEVER}/demos/images/noletter.xbm 99lib/tk${BASEVER}/demos/images/noletter.xbm
99lib/tk${BASEVER}/demos/images/ouster.png 100lib/tk${BASEVER}/demos/images/ouster.png
100lib/tk${BASEVER}/demos/images/pattern.xbm 101lib/tk${BASEVER}/demos/images/pattern.xbm
101lib/tk${BASEVER}/demos/images/tcllogo.gif 102lib/tk${BASEVER}/demos/images/tcllogo.gif
102lib/tk${BASEVER}/demos/images/teapot.ppm 103lib/tk${BASEVER}/demos/images/teapot.ppm
103lib/tk${BASEVER}/demos/items.tcl 104lib/tk${BASEVER}/demos/items.tcl
104lib/tk${BASEVER}/demos/ixset 105lib/tk${BASEVER}/demos/ixset
105lib/tk${BASEVER}/demos/knightstour.tcl 106lib/tk${BASEVER}/demos/knightstour.tcl
106lib/tk${BASEVER}/demos/label.tcl 107lib/tk${BASEVER}/demos/label.tcl
@@ -139,28 +140,26 @@ lib/tk${BASEVER}/demos/ttkpane.tcl @@ -139,28 +140,26 @@ lib/tk${BASEVER}/demos/ttkpane.tcl
139lib/tk${BASEVER}/demos/ttkprogress.tcl 140lib/tk${BASEVER}/demos/ttkprogress.tcl
140lib/tk${BASEVER}/demos/ttkscale.tcl 141lib/tk${BASEVER}/demos/ttkscale.tcl
141lib/tk${BASEVER}/demos/twind.tcl 142lib/tk${BASEVER}/demos/twind.tcl
142lib/tk${BASEVER}/demos/unicodeout.tcl 143lib/tk${BASEVER}/demos/unicodeout.tcl
143lib/tk${BASEVER}/demos/vscale.tcl 144lib/tk${BASEVER}/demos/vscale.tcl
144lib/tk${BASEVER}/demos/widget 145lib/tk${BASEVER}/demos/widget
145lib/tk${BASEVER}/dialog.tcl 146lib/tk${BASEVER}/dialog.tcl
146lib/tk${BASEVER}/entry.tcl 147lib/tk${BASEVER}/entry.tcl
147lib/tk${BASEVER}/focus.tcl 148lib/tk${BASEVER}/focus.tcl
148lib/tk${BASEVER}/fontchooser.tcl 149lib/tk${BASEVER}/fontchooser.tcl
149lib/tk${BASEVER}/iconlist.tcl 150lib/tk${BASEVER}/iconlist.tcl
150lib/tk${BASEVER}/icons.tcl 151lib/tk${BASEVER}/icons.tcl
151lib/tk${BASEVER}/images/README 152lib/tk${BASEVER}/images/README
152lib/tk${BASEVER}/images/lamp.png 
153lib/tk${BASEVER}/images/lamp.svg 
154lib/tk${BASEVER}/images/logo.eps 153lib/tk${BASEVER}/images/logo.eps
155lib/tk${BASEVER}/images/logo100.gif 154lib/tk${BASEVER}/images/logo100.gif
156lib/tk${BASEVER}/images/logo64.gif 155lib/tk${BASEVER}/images/logo64.gif
157lib/tk${BASEVER}/images/logoLarge.gif 156lib/tk${BASEVER}/images/logoLarge.gif
158lib/tk${BASEVER}/images/logoMed.gif 157lib/tk${BASEVER}/images/logoMed.gif
159lib/tk${BASEVER}/images/pwrdLogo.eps 158lib/tk${BASEVER}/images/pwrdLogo.eps
160lib/tk${BASEVER}/images/pwrdLogo100.gif 159lib/tk${BASEVER}/images/pwrdLogo100.gif
161lib/tk${BASEVER}/images/pwrdLogo150.gif 160lib/tk${BASEVER}/images/pwrdLogo150.gif
162lib/tk${BASEVER}/images/pwrdLogo175.gif 161lib/tk${BASEVER}/images/pwrdLogo175.gif
163lib/tk${BASEVER}/images/pwrdLogo200.gif 162lib/tk${BASEVER}/images/pwrdLogo200.gif
164lib/tk${BASEVER}/images/pwrdLogo75.gif 163lib/tk${BASEVER}/images/pwrdLogo75.gif
165lib/tk${BASEVER}/images/tai-ku.gif 164lib/tk${BASEVER}/images/tai-ku.gif
166lib/tk${BASEVER}/listbox.tcl 165lib/tk${BASEVER}/listbox.tcl
cvs diff -r1.46 -r1.47 pkgsrc/x11/tk/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/tk/distinfo 2015/11/04 03:28:55 1.46
+++ pkgsrc/x11/tk/distinfo 2016/03/06 11:47:49 1.47
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.46 2015/11/04 03:28:55 agc Exp $ 1$NetBSD: distinfo,v 1.47 2016/03/06 11:47:49 adam Exp $
2 2
3SHA1 (tk8.6.4-src.tar.gz) = ad24c59ac2e7453d1ed2bad0d7d18a01eabc5226 3SHA1 (tk8.6.5-src.tar.gz) = e63f9e46cfd4ea37799554b003958b54b51dc347
4RMD160 (tk8.6.4-src.tar.gz) = 83ee22124e6afffba535ac45e60b3f815a7aac9e 4RMD160 (tk8.6.5-src.tar.gz) = dc34fe23e2aa018dfe70d082d99793a48b37aa84
5SHA512 (tk8.6.4-src.tar.gz) = d0a1d1fd0938af4a9e532aa1bd4488647cff05f98e9e09b5fa16b773364a5d61030b7975541c688c7e0afc0bde60d49ce50a24d842549bab1622a0255e267909 5SHA512 (tk8.6.5-src.tar.gz) = 9acf2ef993a566a7cdd1efe21dc896b09125c65d86df53ab5a78542b21d3f031e9f9d72b81738705636c268b5ce72934c483eb087d5c0114f913c9075db9a3b1
6Size (tk8.6.4-src.tar.gz) = 4266426 bytes 6Size (tk8.6.5-src.tar.gz) = 4417393 bytes
7SHA1 (patch-unix_Makefile.in) = 553800ef42c328618980962c6b78d478ab4d2e2b 7SHA1 (patch-unix_Makefile.in) = bfb693af19ace5386a73cebdfe09c92a356e14ea
8SHA1 (patch-unix_configure) = 97139ed28a2cb8528da5c53cfcbc8f8fb43670f6 8SHA1 (patch-unix_configure) = 05d47c85f889d53f326c7a64223e435411744771
cvs diff -r1.6 -r1.7 pkgsrc/x11/tk/patches/patch-unix_Makefile.in (expand / switch to unified diff)

--- pkgsrc/x11/tk/patches/patch-unix_Makefile.in 2014/10/31 21:11:18 1.6
+++ pkgsrc/x11/tk/patches/patch-unix_Makefile.in 2016/03/06 11:47:49 1.7
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-unix_Makefile.in,v 1.6 2014/10/31 21:11:18 adam Exp $ 1$NetBSD: patch-unix_Makefile.in,v 1.7 2016/03/06 11:47:49 adam Exp $
2 2
3--- unix/Makefile.in.orig 2014-08-27 16:23:13.000000000 +0000 3--- unix/Makefile.in.orig 2016-02-29 19:13:21.000000000 +0000
4+++ unix/Makefile.in 4+++ unix/Makefile.in
5@@ -14,6 +14,7 @@ MAJOR_VERSION = @TK_MAJOR_VERSION@ 5@@ -14,6 +14,7 @@ MAJOR_VERSION = @TK_MAJOR_VERSION@
6 MINOR_VERSION = @TK_MINOR_VERSION@ 6 MINOR_VERSION = @TK_MINOR_VERSION@
7 PATCH_LEVEL = @TK_PATCH_LEVEL@ 7 PATCH_LEVEL = @TK_PATCH_LEVEL@
8 LOCALES = @LOCALES@ 8 LOCALES = @LOCALES@
9+SHLIB_VERSION = @SHLIB_VERSION@ 9+SHLIB_VERSION = @SHLIB_VERSION@
10  10
11 #---------------------------------------------------------------- 11 #----------------------------------------------------------------
12 # Things you can change to personalize the Makefile for your own 12 # Things you can change to personalize the Makefile for your own
13@@ -64,6 +65,8 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TK 13@@ -64,6 +65,8 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TK
14  14
15 # Directory in which to install the include file tk.h: 15 # Directory in which to install the include file tk.h:
16 INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) 16 INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)
@@ -44,90 +44,90 @@ $NetBSD: patch-unix_Makefile.in,v 1.6 20 @@ -44,90 +44,90 @@ $NetBSD: patch-unix_Makefile.in,v 1.6 20
44+TK_LIB_A_FILE = ${TK_LIB_FILE:@SHLIB_SUFFIX@=.a} 44+TK_LIB_A_FILE = ${TK_LIB_FILE:@SHLIB_SUFFIX@=.a}
45 #TK_LIB_FILE = libtk.a 45 #TK_LIB_FILE = libtk.a
46  46
47 # Generic lib name used in rules that apply to tcl and tk 47 # Generic lib name used in rules that apply to tcl and tk
48@@ -276,6 +280,8 @@ SHLIB_LD = @SHLIB_LD@ 48@@ -276,6 +280,8 @@ SHLIB_LD = @SHLIB_LD@
49 SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ 49 SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
50 TK_SHLIB_LD_EXTRAS = @TK_SHLIB_LD_EXTRAS@ 50 TK_SHLIB_LD_EXTRAS = @TK_SHLIB_LD_EXTRAS@
51  51
52+SHLIB_SUFFIX = @SHLIB_SUFFIX@ 52+SHLIB_SUFFIX = @SHLIB_SUFFIX@
53+ 53+
54 # Additional search flags needed to find the various shared libraries 54 # Additional search flags needed to find the various shared libraries
55 # at run-time. The first symbol is for use when creating a binary 55 # at run-time. The first symbol is for use when creating a binary
56 # with cc, and the second is for use when running ld directly. 56 # with cc, and the second is for use when running ld directly.
57@@ -562,6 +567,9 @@ PRIVATE_HDRS = $(GENERIC_DIR)/tkInt.h $( 57@@ -562,6 +568,9 @@ PRIVATE_HDRS = $(GENERIC_DIR)/tkInt.h $(
58  58
59 DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget 59 DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget
60  60
61+INSTALL_HDRS = tk.h tkInt.h tkDecls.h tkIntDecls.h tkPlatDecls.h \ 61+INSTALL_HDRS = tk.h tkInt.h tkDecls.h tkIntDecls.h tkPlatDecls.h \
62+ tkIntPlatDecls.h tkIntXlibDecls.h 62+ tkIntPlatDecls.h tkIntXlibDecls.h
63+ 63+
64 SHELL_ENV = \ 64 SHELL_ENV = \
65 @LD_LIBRARY_PATH_VAR@="`pwd`:${TCL_BIN_DIR}:$${@LD_LIBRARY_PATH_VAR@}"; \ 65 @LD_LIBRARY_PATH_VAR@="`pwd`:${TCL_BIN_DIR}:$${@LD_LIBRARY_PATH_VAR@}"; \
66 export @LD_LIBRARY_PATH_VAR@; \ 66 export @LD_LIBRARY_PATH_VAR@; \
67@@ -585,6 +593,11 @@ ${LIB_FILE}: ${STUB_LIB_FILE} @LIB_RSRC_ 67@@ -585,6 +594,11 @@ ${LIB_FILE}: ${STUB_LIB_FILE} @LIB_RSRC_
68 rm -f $@ 68 rm -f $@
69 @MAKE_LIB@ 69 @MAKE_LIB@
70  70
71+${TK_LIB_A_FILE}: ${OBJS} 71+${TK_LIB_A_FILE}: ${OBJS}
72+ rm -f $@ 72+ rm -f $@
73+ ar cr $@ ${OBJS} 73+ ar cr $@ ${OBJS}
74+ $(RANLIB) $@ 74+ $(RANLIB) $@
75+ 75+
76 ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} 76 ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
77 @if test "x${LIB_FILE}" = "xlibtk${MAJOR_VERSION}.${MINOR_VERSION}.dll"; then \ 77 @if test "x${LIB_FILE}" = "xlibtk${MAJOR_VERSION}.${MINOR_VERSION}.dll"; then \
78 (cd ${TOP_DIR}/win; ${MAKE} tk${MAJOR_VERSION}${MINOR_VERSION}.dll); \ 78 (cd ${TOP_DIR}/win; ${MAKE} tk${MAJOR_VERSION}${MINOR_VERSION}.dll); \
79@@ -713,7 +726,7 @@ install-strip: 79@@ -709,7 +723,7 @@ install-strip:
80 # some ranlibs write to current directory, and this might not always be 80 INSTALL_PROGRAM="$(INSTALL_PROGRAM) ${INSTALL_STRIP_PROGRAM}" \
81 # possible (e.g. if installing as root). 81 INSTALL_LIBRARY="$(INSTALL_LIBRARY) ${INSTALL_STRIP_LIBRARY}"
82  82
83-install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) ${WISH_EXE} 83-install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) ${WISH_EXE}
84+install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) $(TK_LIB_A_FILE) ${WISH_EXE} ${TK_LIB_A_FILE} 84+install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) $(TK_LIB_A_FILE) ${WISH_EXE} ${TK_LIB_A_FILE}
85 @for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" \ 85 @for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" \
86 "$(PKG_INSTALL_DIR)" "$(CONFIG_INSTALL_DIR)" ; \ 86 "$(PKG_INSTALL_DIR)" "$(CONFIG_INSTALL_DIR)" ; \
87 do \ 87 do \
88@@ -743,7 +756,13 @@ install-binaries: $(TK_STUB_LIB_FILE) $( 88@@ -739,7 +753,13 @@ install-binaries: $(TK_STUB_LIB_FILE) $(
89 fi 89 fi
90 @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" 90 @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
91 @@INSTALL_LIB@ 91 @@INSTALL_LIB@
92- @chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)" 92- @chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)"
93+ @cd "$(DLL_INSTALL_DIR)" && if test "$(SHLIB_SUFFIX)" = ".dylib"; then \ 93+ @cd "$(DLL_INSTALL_DIR)" && if test "$(SHLIB_SUFFIX)" = ".dylib"; then \
94+ ln -sf libtk$(MAJOR_VERSION)$(MINOR_VERSION).$(SHLIB_VERSION)$(SHLIB_SUFFIX) $(LIB_FILE) ; \ 94+ ln -sf libtk$(MAJOR_VERSION)$(MINOR_VERSION).$(SHLIB_VERSION)$(SHLIB_SUFFIX) $(LIB_FILE) ; \
95+ else \ 95+ else \
96+ ln -sf libtk$(MAJOR_VERSION)$(MINOR_VERSION)$(SHLIB_SUFFIX).$(SHLIB_VERSION) $(LIB_FILE) ; \ 96+ ln -sf libtk$(MAJOR_VERSION)$(MINOR_VERSION)$(SHLIB_SUFFIX).$(SHLIB_VERSION) $(LIB_FILE) ; \
97+ fi 97+ fi
98+ @echo "Installing ${TK_LIB_A_FILE} to $(DLL_INSTALL_DIR)/" 98+ @echo "Installing ${TK_LIB_A_FILE} to $(DLL_INSTALL_DIR)/"
99+ @$(INSTALL_DATA) ${TK_LIB_A_FILE} $(DLL_INSTALL_DIR)/${TK_LIB_A_FILE} 99+ @$(INSTALL_DATA) ${TK_LIB_A_FILE} $(DLL_INSTALL_DIR)/${TK_LIB_A_FILE}
100 @if test -f "tk${MAJOR_VERSION}${MINOR_VERSION}.dll"; then \ 100 @if test -f "tk${MAJOR_VERSION}${MINOR_VERSION}.dll"; then \
101 $(INSTALL_LIBRARY) "tk${MAJOR_VERSION}${MINOR_VERSION}.dll" "$(DLL_INSTALL_DIR)";\ 101 $(INSTALL_LIBRARY) "tk${MAJOR_VERSION}${MINOR_VERSION}.dll" "$(DLL_INSTALL_DIR)";\
102 chmod 555 "$(DLL_INSTALL_DIR)/tk${MAJOR_VERSION}${MINOR_VERSION}.dll";\ 102 chmod 555 "$(DLL_INSTALL_DIR)/tk${MAJOR_VERSION}${MINOR_VERSION}.dll";\
103@@ -752,6 +771,7 @@ install-binaries: $(TK_STUB_LIB_FILE) $( 103@@ -748,6 +768,7 @@ install-binaries: $(TK_STUB_LIB_FILE) $(
104 fi 104 fi
105 @echo "Installing ${WISH_EXE} as $(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}" 105 @echo "Installing ${WISH_EXE} as $(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}"
106 @$(INSTALL_PROGRAM) ${WISH_EXE} "$(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}" 106 @$(INSTALL_PROGRAM) ${WISH_EXE} "$(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}"
107+ @cd "$(BIN_INSTALL_DIR)" && ln -sf wish$(VERSION)@EXEEXT@ wish 107+ @cd "$(BIN_INSTALL_DIR)" && ln -sf wish$(VERSION)@EXEEXT@ wish
108 @echo "Installing tkConfig.sh to $(CONFIG_INSTALL_DIR)/" 108 @echo "Installing tkConfig.sh to $(CONFIG_INSTALL_DIR)/"
109 @$(INSTALL_DATA) tkConfig.sh "$(CONFIG_INSTALL_DIR)/tkConfig.sh" 109 @$(INSTALL_DATA) tkConfig.sh "$(CONFIG_INSTALL_DIR)/tkConfig.sh"
110 @if test "$(STUB_LIB_FILE)" != "" ; then \ 110 @if test "$(STUB_LIB_FILE)" != "" ; then \
111@@ -859,7 +879,7 @@ install-doc: 111@@ -855,7 +876,7 @@ install-doc:
112 install-headers: 112 install-headers:
113 @if test "$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)" != ""; then \ 113 @if test "$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)" != ""; then \
114 XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)"/X11; fi; \ 114 XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)"/X11; fi; \
115- for i in "$(INCLUDE_INSTALL_DIR)" "$${XLIB_INCLUDE_INSTALL_DIR}"; \ 115- for i in "$(INCLUDE_INSTALL_DIR)" "$${XLIB_INCLUDE_INSTALL_DIR}"; \
116+ for i in "$(INCLUDE_INSTALL_DIR)" "$${XLIB_INCLUDE_INSTALL_DIR}" "$(GENERIC_INCLUDE_INSTALL_DIR)" "$(UNIX_INCLUDE_INSTALL_DIR)"; \ 116+ for i in "$(INCLUDE_INSTALL_DIR)" "$${XLIB_INCLUDE_INSTALL_DIR}" "$(GENERIC_INCLUDE_INSTALL_DIR)" "$(UNIX_INCLUDE_INSTALL_DIR)"; \
117 do \ 117 do \
118 if [ -n "$$i" -a ! -d "$$i" ] ; then \ 118 if [ -n "$$i" -a ! -d "$$i" ] ; then \
119 echo "Making directory $$i"; \ 119 echo "Making directory $$i"; \
120@@ -868,9 +888,12 @@ install-headers: 120@@ -864,9 +885,12 @@ install-headers:
121 fi; \ 121 fi; \
122 done; 122 done;
123 @echo "Installing header files to $(INCLUDE_INSTALL_DIR)/"; 123 @echo "Installing header files to $(INCLUDE_INSTALL_DIR)/";
124- @for i in $(PUBLIC_HDRS); \ 124- @for i in $(PUBLIC_HDRS); \
125+ $(INSTALL_DATA) $(GENERIC_DIR)/*.h "$(GENERIC_INCLUDE_INSTALL_DIR)"/ 125+ $(INSTALL_DATA) $(GENERIC_DIR)/*.h "$(GENERIC_INCLUDE_INSTALL_DIR)"/
126+ $(INSTALL_DATA) $(UNIX_DIR)/*.h "$(UNIX_INCLUDE_INSTALL_DIR)"/ 126+ $(INSTALL_DATA) $(UNIX_DIR)/*.h "$(UNIX_INCLUDE_INSTALL_DIR)"/
127+ @for i in $(INSTALL_HDRS); \ 127+ @for i in $(INSTALL_HDRS); \
128 do \ 128 do \
129- $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \ 129- $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \
130+ j=`basename $$i` ; \ 130+ j=`basename $$i` ; \
131+ cd "$(INCLUDE_INSTALL_DIR)" && ln -sf tk/generic/$$j $$j ; \ 131+ cd "$(INCLUDE_INSTALL_DIR)" && ln -sf tk/generic/$$j $$j ; \
132 done; 132 done;
133 @list='$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)'; for i in $$list ; \ 133 @list='$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)'; for i in $$list ; \
cvs diff -r1.9 -r1.10 pkgsrc/x11/tk/patches/patch-unix_configure (expand / switch to unified diff)

--- pkgsrc/x11/tk/patches/patch-unix_configure 2014/10/31 21:11:18 1.9
+++ pkgsrc/x11/tk/patches/patch-unix_configure 2016/03/06 11:47:49 1.10
@@ -1,166 +1,166 @@ @@ -1,166 +1,166 @@
1$NetBSD: patch-unix_configure,v 1.9 2014/10/31 21:11:18 adam Exp $ 1$NetBSD: patch-unix_configure,v 1.10 2016/03/06 11:47:49 adam Exp $
2 2
3--- unix/configure.orig 2014-08-27 16:23:13.000000000 +0000 3--- unix/configure.orig 2016-02-29 19:13:21.000000000 +0000
4+++ unix/configure 4+++ unix/configure
5@@ -4543,10 +4543,10 @@ fi 5@@ -4388,10 +4388,10 @@ fi
6 # LDFLAGS_ARCH so they eventually end up in LDFLAGS even if [load] 6 # LDFLAGS_ARCH so they eventually end up in LDFLAGS even if [load]
7 # is disabled by the user. [Bug 1016796] 7 # is disabled by the user. [Bug 1016796]
8 LDFLAGS_ARCH="" 8 LDFLAGS_ARCH=""
9- UNSHARED_LIB_SUFFIX="" 9- UNSHARED_LIB_SUFFIX=""
10+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' 10+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
11 TCL_TRIM_DOTS='`echo ${VERSION} | tr -d .`' 11 TCL_TRIM_DOTS='`echo ${VERSION} | tr -d .`'
12 ECHO_VERSION='`echo ${VERSION}`' 12 ECHO_VERSION='`echo ${VERSION}`'
13- TCL_LIB_VERSIONS_OK=ok 13- TCL_LIB_VERSIONS_OK=ok
14+ TCL_LIB_VERSIONS_OK=nodots 14+ TCL_LIB_VERSIONS_OK=nodots
15 CFLAGS_DEBUG=-g 15 CFLAGS_DEBUG=-g
16 if test "$GCC" = yes; then 16 if test "$GCC" = yes; then
17  17
18@@ -5508,7 +5508,7 @@ fi 18@@ -5352,7 +5352,7 @@ fi
19 CC_SEARCH_FLAGS="" 19 CC_SEARCH_FLAGS=""
20 LD_SEARCH_FLAGS="" 20 LD_SEARCH_FLAGS=""
21 ;; 21 ;;
22- OpenBSD-*) 22- OpenBSD-*)
23+ OpenBSD-*|MirBSD-*) 23+ OpenBSD-*|MirBSD-*)
24 arch=`arch -s` 24 arch=`arch -s`
25 case "$arch" in 25 case "$arch" in
26 vax) 26 vax)
27@@ -5530,7 +5530,7 @@ fi 27@@ -5381,7 +5381,7 @@ fi
28 fi 28 fi
29  29
30 LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} 30 LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
31- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}' 31- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
32+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so' 32+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so'
33 LDFLAGS="-Wl,-export-dynamic" 33 LDFLAGS="-Wl,-export-dynamic"
34 ;; 34 ;;
35 esac 35 esac
36@@ -5565,7 +5565,7 @@ fi 36@@ -5416,7 +5416,7 @@ fi
37 SHLIB_SUFFIX=".so" 37 SHLIB_SUFFIX=".so"
38 DL_OBJS="tclLoadDl.o" 38 DL_OBJS="tclLoadDl.o"
39 DL_LIBS="" 39 DL_LIBS=""
40- LDFLAGS="$LDFLAGS -export-dynamic" 40- LDFLAGS="$LDFLAGS -export-dynamic"
41+ LDFLAGS="" 41+ LDFLAGS=""
42 if test $doRpath = yes; then 42 if test $doRpath = yes; then
43  43
44 CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' 44 CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
45@@ -5582,7 +5582,7 @@ fi 45@@ -5433,7 +5433,7 @@ fi
46 fi 46 fi
47  47
48 ;; 48 ;;
49- FreeBSD-*) 49- FreeBSD-*)
50+ FreeBSD-*|DragonFly-*) 50+ FreeBSD-*|DragonFly-*)
51 # This configuration from FreeBSD Ports. 51 # This configuration from FreeBSD Ports.
52 SHLIB_CFLAGS="-fPIC" 52 SHLIB_CFLAGS="-fPIC"
53 SHLIB_LD="${CC} -shared" 53 SHLIB_LD="${CC} -shared"
54@@ -6791,7 +6791,7 @@ fi 54@@ -6641,7 +6641,7 @@ fi
55 BSD/OS*) ;; 55 BSD/OS*) ;;
56 CYGWIN_*|MINGW32_*) ;; 56 CYGWIN_*|MINGW32_*) ;;
57 IRIX*) ;; 57 IRIX*) ;;
58- NetBSD-*|FreeBSD-*|OpenBSD-*) ;; 58- NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
59+ NetBSD-*|FreeBSD-*|OpenBSD-*|MirBSD-*) ;; 59+ NetBSD-*|FreeBSD-*|OpenBSD-*|MirBSD-*) ;;
60 Darwin-*) ;; 60 Darwin-*) ;;
61 SCO_SV-3.2*) ;; 61 SCO_SV-3.2*) ;;
62 *) SHLIB_CFLAGS="-fPIC" ;; 62 *) SHLIB_CFLAGS="-fPIC" ;;
63@@ -6812,12 +6812,12 @@ fi 63@@ -6662,12 +6662,12 @@ fi
64  64
65 if test "$SHARED_LIB_SUFFIX" = ""; then 65 if test "$SHARED_LIB_SUFFIX" = ""; then
66  66
67- SHARED_LIB_SUFFIX='${VERSION}${SHLIB_SUFFIX}' 67- SHARED_LIB_SUFFIX='${VERSION}${SHLIB_SUFFIX}'
68+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}${SHLIB_SUFFIX}' 68+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}${SHLIB_SUFFIX}'
69 fi 69 fi
70  70
71 if test "$UNSHARED_LIB_SUFFIX" = ""; then 71 if test "$UNSHARED_LIB_SUFFIX" = ""; then
72  72
73- UNSHARED_LIB_SUFFIX='${VERSION}.a' 73- UNSHARED_LIB_SUFFIX='${VERSION}.a'
74+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' 74+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
75 fi 75 fi
76  76
77 DLL_INSTALL_DIR="\$(LIB_INSTALL_DIR)" 77 DLL_INSTALL_DIR="\$(LIB_INSTALL_DIR)"
78@@ -6833,7 +6833,11 @@ fi 78@@ -6683,7 +6683,11 @@ fi
79  79
80 else 80 else
81  81
82- INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)"' 82- INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)"'
83+ if test "${SHLIB_SUFFIX}" = ".dylib" ; then 83+ if test "${SHLIB_SUFFIX}" = ".dylib" ; then
84+ INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/libtk$(MAJOR_VERSION)$(MINOR_VERSION).$(SHLIB_VERSION)$(SHLIB_SUFFIX)"' 84+ INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/libtk$(MAJOR_VERSION)$(MINOR_VERSION).$(SHLIB_VERSION)$(SHLIB_SUFFIX)"'
85+ else 85+ else
86+ INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE).$(SHLIB_VERSION)"' 86+ INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE).$(SHLIB_VERSION)"'
87+ fi 87+ fi
88  88
89 fi 89 fi
90  90
91@@ -6867,7 +6871,7 @@ fi 91@@ -6718,7 +6722,7 @@ else
92 else 
93  
94 MAKE_STUB_LIB='${STLIB_LD} $@ ${STUB_LIB_OBJS} ; ${RANLIB} $@' 
95- INSTALL_STUB_LIB='$(INSTALL_LIBRARY) $(STUB_LIB_FILE) "$(LIB_INSTALL_DIR)/$(STUB_LIB_FILE)" ; (cd "$(LIB_INSTALL_DIR)" ; $(RANLIB) $(STUB_LIB_FILE))' 
96+ INSTALL_STUB_LIB='$(INSTALL_DATA) $(STUB_LIB_FILE) "$(LIB_INSTALL_DIR)/$(STUB_LIB_FILE)" ; (cd "$(LIB_INSTALL_DIR)" ; $(RANLIB) $(STUB_LIB_FILE))' 
97  92
98 fi 93 fi
99  94
100@@ -10002,7 +10006,7 @@ echo $ECHO_N "checking for X11 libraries 95- INSTALL_STUB_LIB='$(INSTALL_LIBRARY) $(STUB_LIB_FILE) "$(LIB_INSTALL_DIR)/$(STUB_LIB_FILE)"'
 96+ INSTALL_STUB_LIB='$(INSTALL_DATA) $(STUB_LIB_FILE) "$(LIB_INSTALL_DIR)/$(STUB_LIB_FILE)"'
 97
 98 # Define TCL_LIBS now that we know what DL_LIBS is.
 99 # The trick here is that we don't want to change the value of TCL_LIBS if
 100@@ -9850,7 +9854,7 @@ echo $ECHO_N "checking for X11 libraries
101 if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl -o -r $i/libX11.dylib; then 101 if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl -o -r $i/libX11.dylib; then
102 echo "$as_me:$LINENO: result: $i" >&5 102 echo "$as_me:$LINENO: result: $i" >&5
103 echo "${ECHO_T}$i" >&6 103 echo "${ECHO_T}$i" >&6
104- XLIBSW="-L$i -lX11" 104- XLIBSW="-L$i -lX11"
105+ XLIBSW="-L$i ${COMPILER_RPATH_FLAG}$i -lX11" 105+ XLIBSW="-L$i ${COMPILER_RPATH_FLAG}$i -lX11"
106 x_libraries="$i" 106 x_libraries="$i"
107 break 107 break
108 fi 108 fi
109@@ -10011,7 +10015,7 @@ echo "${ECHO_T}$i" >&6 109@@ -9859,7 +9863,7 @@ echo "${ECHO_T}$i" >&6
110 if test "$x_libraries" = ""; then 110 if test "$x_libraries" = ""; then
111 XLIBSW=-lX11 111 XLIBSW=-lX11
112 else 112 else
113- XLIBSW="-L$x_libraries -lX11" 113- XLIBSW="-L$x_libraries -lX11"
114+ XLIBSW="-L$x_libraries ${COMPILER_RPATH_FLAG}$x_libraries -lX11" 114+ XLIBSW="-L$x_libraries ${COMPILER_RPATH_FLAG}$x_libraries -lX11"
115 fi 115 fi
116 fi 116 fi
117 if test "$XLIBSW" = nope ; then 117 if test "$XLIBSW" = nope ; then
118@@ -10107,11 +10111,6 @@ fi 118@@ -9955,11 +9959,6 @@ fi
119 # be replaced by spaces. 119 # be replaced by spaces.
120 #-------------------------------------------------------------------- 120 #--------------------------------------------------------------------
121  121
122-if test "x${x_libraries}" != "x"; then 122-if test "x${x_libraries}" != "x"; then
123- if test "x${x_libraries}" != "xNONE"; then 123- if test "x${x_libraries}" != "xNONE"; then
124- LIB_RUNTIME_DIR="${LIB_RUNTIME_DIR}:${x_libraries}" 124- LIB_RUNTIME_DIR="${LIB_RUNTIME_DIR}:${x_libraries}"
125- fi 125- fi
126-fi 126-fi
127 if test "${TCL_LD_SEARCH_FLAGS}" = '-L${LIB_RUNTIME_DIR}'; then 127 if test "${TCL_LD_SEARCH_FLAGS}" = '-L${LIB_RUNTIME_DIR}'; then
128 LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -L/g'` 128 LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -L/g'`
129 fi 129 fi
130@@ -11347,14 +11346,10 @@ else 130@@ -11195,14 +11194,10 @@ else
131 TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`" 131 TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`"
132 TK_BUILD_LIB_SPEC="-L\$(TOP_DIR)/win ${TK_LIB_FLAG}" 132 TK_BUILD_LIB_SPEC="-L\$(TOP_DIR)/win ${TK_LIB_FLAG}"
133 else 133 else
134- if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then 134- if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
135- TK_LIB_FLAG="-ltk${TK_VERSION}" 135- TK_LIB_FLAG="-ltk${TK_VERSION}"
136- else 136- else
137 TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`" 137 TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`"
138- fi 138- fi
139 TK_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_LIB_FLAG}" 139 TK_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_LIB_FLAG}"
140 fi 140 fi
141- TK_LIB_SPEC="-L${libdir} ${TK_LIB_FLAG}" 141- TK_LIB_SPEC="-L${libdir} ${TK_LIB_FLAG}"
142+ TK_LIB_SPEC="-L${libdir} ${COMPILER_RPATH_FLAG}${libdir} ${TK_LIB_FLAG}" 142+ TK_LIB_SPEC="-L${libdir} ${COMPILER_RPATH_FLAG}${libdir} ${TK_LIB_FLAG}"
143 fi 143 fi
144  144
145 #-------------------------------------------------------------------- 145 #--------------------------------------------------------------------
146@@ -11366,11 +11361,7 @@ fi 146@@ -11214,11 +11209,7 @@ fi
147 eval "TK_STUB_LIB_FILE=libtkstub${TK_UNSHARED_LIB_SUFFIX}" 147 eval "TK_STUB_LIB_FILE=libtkstub${TK_UNSHARED_LIB_SUFFIX}"
148 eval "TK_STUB_LIB_DIR=${libdir}" 148 eval "TK_STUB_LIB_DIR=${libdir}"
149  149
150-if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then 150-if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
151- TK_STUB_LIB_FLAG="-ltkstub${TK_VERSION}" 151- TK_STUB_LIB_FLAG="-ltkstub${TK_VERSION}"
152-else 152-else
153- TK_STUB_LIB_FLAG="-ltkstub`echo ${TK_VERSION} | tr -d .`" 153- TK_STUB_LIB_FLAG="-ltkstub`echo ${TK_VERSION} | tr -d .`"
154-fi 154-fi
155+TK_STUB_LIB_FLAG="-ltkstub`echo ${TK_VERSION} | tr -d .`" 155+TK_STUB_LIB_FLAG="-ltkstub`echo ${TK_VERSION} | tr -d .`"
156  156
157 TK_BUILD_STUB_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_STUB_LIB_FLAG}" 157 TK_BUILD_STUB_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_STUB_LIB_FLAG}"
158 TK_STUB_LIB_SPEC="-L${TK_STUB_LIB_DIR} ${TK_STUB_LIB_FLAG}" 158 TK_STUB_LIB_SPEC="-L${TK_STUB_LIB_DIR} ${TK_STUB_LIB_FLAG}"
159@@ -12191,6 +12182,7 @@ s,@APP_RSRC_FILE@,$APP_RSRC_FILE,;t t 159@@ -12039,6 +12030,7 @@ s,@APP_RSRC_FILE@,$APP_RSRC_FILE,;t t
160 s,@REZ@,$REZ,;t t 160 s,@REZ@,$REZ,;t t
161 s,@REZ_FLAGS@,$REZ_FLAGS,;t t 161 s,@REZ_FLAGS@,$REZ_FLAGS,;t t
162 s,@LTLIBOBJS@,$LTLIBOBJS,;t t 162 s,@LTLIBOBJS@,$LTLIBOBJS,;t t
163+s,@SHLIB_VERSION@,$SHLIB_VERSION,;t t 163+s,@SHLIB_VERSION@,$SHLIB_VERSION,;t t
164 CEOF 164 CEOF
165  165
166 _ACEOF 166 _ACEOF