Mon May 2 04:00:25 2016 UTC ()
Fix handling of tcl and tk versions: don't demand exact version when
the version we have doesn't include the teeny version number.

Possibly we should arrange to pass that in and require it exactly; I'm
not sure exactly what the compatibility semantics of version numbers
are supposed to be in tcl-land; but it's definitely wrong the way it
has been.

Fixes PR 50244 wherein tkined fails to run.


(dholland)
diff -r1.16 -r1.17 pkgsrc/net/tcl-scotty/distinfo
diff -r0 -r1.1 pkgsrc/net/tcl-scotty/patches/patch-tkined_generic_tkiInit.c
cvs diff -r1.16 -r1.17 pkgsrc/net/tcl-scotty/distinfo (expand / switch to unified diff)

--- pkgsrc/net/tcl-scotty/distinfo 2015/11/04 00:35:39 1.16
+++ pkgsrc/net/tcl-scotty/distinfo 2016/05/02 04:00:25 1.17
@@ -1,21 +1,22 @@ @@ -1,21 +1,22 @@
1$NetBSD: distinfo,v 1.16 2015/11/04 00:35:39 agc Exp $ 1$NetBSD: distinfo,v 1.17 2016/05/02 04:00:25 dholland Exp $
2 2
3SHA1 (scotty-2.1.11.tar.gz) = 819011f908c57e4591d6f50e51677c01eb55dc13 3SHA1 (scotty-2.1.11.tar.gz) = 819011f908c57e4591d6f50e51677c01eb55dc13
4RMD160 (scotty-2.1.11.tar.gz) = 3b4d45f3db73f05b49a46017bf2ffed6d6464b00 4RMD160 (scotty-2.1.11.tar.gz) = 3b4d45f3db73f05b49a46017bf2ffed6d6464b00
5SHA512 (scotty-2.1.11.tar.gz) = a75eb6bc54e183a8f6b5995122f35133b0f76a7a1061c177d09b4082994d6f05c1b1826bf230945dd699b65d491863c4b74353bc0d4901da5b068217ac376a87 5SHA512 (scotty-2.1.11.tar.gz) = a75eb6bc54e183a8f6b5995122f35133b0f76a7a1061c177d09b4082994d6f05c1b1826bf230945dd699b65d491863c4b74353bc0d4901da5b068217ac376a87
6Size (scotty-2.1.11.tar.gz) = 1381059 bytes 6Size (scotty-2.1.11.tar.gz) = 1381059 bytes
7SHA1 (patch-snmp_tnmMibQuery.c) = 86f2cecac8a0766e7075836569d76671a3d15547 7SHA1 (patch-snmp_tnmMibQuery.c) = 86f2cecac8a0766e7075836569d76671a3d15547
8SHA1 (patch-tkined_apps_ip__discover.tcl) = bf067f64474dc3ed6306caa468f29a040023e165 8SHA1 (patch-tkined_apps_ip__discover.tcl) = bf067f64474dc3ed6306caa468f29a040023e165
 9SHA1 (patch-tkined_generic_tkiInit.c) = 8092655b067d6d03827d421eaa9027d96263b96e
9SHA1 (patch-tnm_gdmo_tnmGdmoTcl.c) = cc67acec2df2cc34a73b0319d452b7ee0aafc5cc 10SHA1 (patch-tnm_gdmo_tnmGdmoTcl.c) = cc67acec2df2cc34a73b0319d452b7ee0aafc5cc
10SHA1 (patch-tnm_generic_tnm.h) = 781250970f5d6e1b0653175ce024d8310168f611 11SHA1 (patch-tnm_generic_tnm.h) = 781250970f5d6e1b0653175ce024d8310168f611
11SHA1 (patch-tnm_generic_tnmDns.c) = f6c3279b84c8cd23e46acfb94ffbff7b1e50a898 12SHA1 (patch-tnm_generic_tnmDns.c) = f6c3279b84c8cd23e46acfb94ffbff7b1e50a898
12SHA1 (patch-tnm_generic_tnmEvent.c) = daddbfef94daea1c6e6530a3a23fb612bb590637 13SHA1 (patch-tnm_generic_tnmEvent.c) = daddbfef94daea1c6e6530a3a23fb612bb590637
13SHA1 (patch-tnm_generic_tnmHttp.c) = 6798640bcad7eb09ecf706bee94bba26d291dbce 14SHA1 (patch-tnm_generic_tnmHttp.c) = 6798640bcad7eb09ecf706bee94bba26d291dbce
14SHA1 (patch-tnm_generic_tnmIcmp.c) = 73a981d2a976fc7a2de5029703e0584712424e21 15SHA1 (patch-tnm_generic_tnmIcmp.c) = 73a981d2a976fc7a2de5029703e0584712424e21
15SHA1 (patch-tnm_generic_tnmIned.c) = df6e0f305490c414fa4b2a488fc9fac1eb6d23fb 16SHA1 (patch-tnm_generic_tnmIned.c) = df6e0f305490c414fa4b2a488fc9fac1eb6d23fb
16SHA1 (patch-tnm_generic_tnmInit.c) = ac786794a15eed1ca53fcaf799120a66b835f5ee 17SHA1 (patch-tnm_generic_tnmInit.c) = ac786794a15eed1ca53fcaf799120a66b835f5ee
17SHA1 (patch-tnm_generic_tnmInt.h) = 50eec2ecb348e63245a9851518e729db4cce3a38 18SHA1 (patch-tnm_generic_tnmInt.h) = 50eec2ecb348e63245a9851518e729db4cce3a38
18SHA1 (patch-tnm_generic_tnmJob.c) = 5891e534c0be96b33165097d60f447e0247dba00 19SHA1 (patch-tnm_generic_tnmJob.c) = 5891e534c0be96b33165097d60f447e0247dba00
19SHA1 (patch-tnm_generic_tnmNetdb.c) = d8a8bfc5f92004ea774ca113c1f7de8915d2d8c0 20SHA1 (patch-tnm_generic_tnmNetdb.c) = d8a8bfc5f92004ea774ca113c1f7de8915d2d8c0
20SHA1 (patch-tnm_generic_tnmNtp.c) = a4c0bb8d28bb9d83f80fc444d4e170e7035c885f 21SHA1 (patch-tnm_generic_tnmNtp.c) = a4c0bb8d28bb9d83f80fc444d4e170e7035c885f
21SHA1 (patch-tnm_generic_tnmRpc.c) = d3dd34e2022da00116b383640efec2baf7b1e7ec 22SHA1 (patch-tnm_generic_tnmRpc.c) = d3dd34e2022da00116b383640efec2baf7b1e7ec
File Added: pkgsrc/net/tcl-scotty/patches/patch-tkined_generic_tkiInit.c
$NetBSD: patch-tkined_generic_tkiInit.c,v 1.1 2016/05/02 04:00:25 dholland Exp $

Don't demand exactly TCL_VERSION and TK_VERSION as these do not
include the patchlevel (e.g. they're 8.6 instead of 8.6.5).

--- tkined/generic/tkiInit.c~	1998-09-16 17:11:01.000000000 +0000
+++ tkined/generic/tkiInit.c
@@ -62,11 +62,11 @@ TkiInit(interp)
 
     buffersize(1024);
 
-    if (Tcl_PkgRequire(interp, "Tcl", TCL_VERSION, 1) == NULL) {
+    if (Tcl_PkgRequire(interp, "Tcl", TCL_VERSION, 0) == NULL) {
         return TCL_ERROR;
     }
 
-    if (Tcl_PkgRequire(interp, "Tk", TK_VERSION, 1) == NULL) {
+    if (Tcl_PkgRequire(interp, "Tk", TK_VERSION, 0) == NULL) {
         return TCL_ERROR;
     }