Some patching went upstream. Small update to index maker, added cvs marker to file. Test failure: doctools-text-15.4; not critical; upstream has been notified! Stu
Index: Makefile =================================================================== RCS file: /cvs/ports/devel/tcllib/Makefile,v retrieving revision 1.15 diff -u -p -r1.15 Makefile --- Makefile 4 Nov 2011 11:45:21 -0000 1.15 +++ Makefile 27 Feb 2012 23:38:06 -0000 @@ -2,7 +2,7 @@ COMMENT = Tcl Standard Library -DISTNAME = tcllib-1.13 +DISTNAME = tcllib-1.14 CATEGORIES = devel lang/tcl HOMEPAGE = http://sourceforge.net/projects/tcllib/ MAINTAINER = Stuart Cassoff <[email protected]> @@ -71,7 +71,7 @@ do-install: @chmod ${BINMODE} ${SCRIPTS_TCLSH:S!logger!log!:S!^!${PREFIX}/share/examples/tcllib/!} ${SETENV} TCLLIBPATH=${DESTDIR}${MODTCL_TCLDIR} ${MODTCL_BIN} \ ${FILESDIR}/mkindex.tcl ${PREFIX}/man/mann \ - ${PKGDIR}/DESCR ${PREFIX}/man/mann/tcllib.n tcllib "${COMMENT}" 1.13 + ${PKGDIR}/DESCR ${PREFIX}/man/mann/tcllib.n tcllib "${COMMENT}" 1.14 @chown ${MANOWN}:${MANGRP} ${PREFIX}/man/mann/tcllib.n @chmod ${MANMODE} ${PREFIX}/man/mann/tcllib.n Index: distinfo =================================================================== RCS file: /cvs/ports/devel/tcllib/distinfo,v retrieving revision 1.9 diff -u -p -r1.9 distinfo --- distinfo 4 Nov 2011 11:45:21 -0000 1.9 +++ distinfo 27 Feb 2012 23:38:06 -0000 @@ -1,5 +1,5 @@ -MD5 (tcllib-1.13.tar.gz) = W8lWezphiEcWqQjVKV1xBQ== -RMD160 (tcllib-1.13.tar.gz) = CbxN4C7FqMxezjHPDMXCC+biT0w= -SHA1 (tcllib-1.13.tar.gz) = w8PLt5vLwNgHF2VTF49vT0kYoRQ= -SHA256 (tcllib-1.13.tar.gz) = JO7GANr1FCWYCRd7e4KJbxOlIUvXX4K7B/EQeXKUMEI= -SIZE (tcllib-1.13.tar.gz) = 5319952 +MD5 (tcllib-1.14.tar.gz) = VbrJr85UwzKPNokYzC16Sw== +RMD160 (tcllib-1.14.tar.gz) = 5XWnQzXCV0dKAJkjmG0nP+HItFo= +SHA1 (tcllib-1.14.tar.gz) = jDYSCZ6vEcdn85CKl/zSmdQu4h8= +SHA256 (tcllib-1.14.tar.gz) = 3RSfyzfOsE2oNTEnap11Y4J4B9zuSfm59jvt6p4TBYQ= +SIZE (tcllib-1.14.tar.gz) = 5384078 Index: files/mkindex.tcl =================================================================== RCS file: /cvs/ports/devel/tcllib/files/mkindex.tcl,v retrieving revision 1.1 diff -u -p -r1.1 mkindex.tcl --- files/mkindex.tcl 20 Mar 2009 07:59:42 -0000 1.1 +++ files/mkindex.tcl 27 Feb 2012 23:38:06 -0000 @@ -1,7 +1,9 @@ +# $OpenBSD$ + # Generate 'index' manpage # Stuart Cassoff -# Version 0.1 -# Winter 2009 +# Version 0.2 +# Winter 2012 package require doctools @@ -12,7 +14,8 @@ foreach fn [glob -nocomplain -dir $dir * set data [read [set f [open $fn]]][close $f] if {[regexp {.SH NAME\n(.*?) \\- (.*?)\n} $data -> shname shtitle] && [regexp -line {^\.TH.*$} $data th]} { - lappend modules [list [string map {_ ::} $shname] [lindex $th 3] [lindex $th 5] $shtitle] + lappend modules [list [string map {_ ::} $shname] [lindex $th 3] \ + [string map {[ [lb] ] [rb]} [lindex $th 5]] $shtitle] } } set modules [lsort -dictionary -index 0 $modules] Index: patches/patch-apps_page =================================================================== RCS file: patches/patch-apps_page diff -N patches/patch-apps_page --- patches/patch-apps_page 4 Nov 2011 11:45:21 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -$OpenBSD: patch-apps_page,v 1.1 2011/11/04 11:45:21 stu Exp $ ---- apps/page.orig Mon Oct 17 10:29:17 2011 -+++ apps/page Mon Oct 17 10:31:22 2011 -@@ -26,6 +26,7 @@ package provide page 1.0 - - lappend auto_path [file join [file dirname [file dirname [file normalize [info script]]]] modules] - -+lappend auto_path [file join [lindex $tcl_pkgPath end] page] - #lappend auto_path [file join [file dirname [info script]] .. modules] - #source [file join [file dirname [info script]] .. modules struct tree.tcl] - Index: patches/patch-examples_tepam_tepam_demo_tcl =================================================================== RCS file: /cvs/ports/devel/tcllib/patches/patch-examples_tepam_tepam_demo_tcl,v retrieving revision 1.1 diff -u -p -r1.1 patch-examples_tepam_tepam_demo_tcl --- patches/patch-examples_tepam_tepam_demo_tcl 4 Nov 2011 11:45:21 -0000 1.1 +++ patches/patch-examples_tepam_tepam_demo_tcl 27 Feb 2012 23:38:06 -0000 @@ -1,43 +1,12 @@ $OpenBSD: patch-examples_tepam_tepam_demo_tcl,v 1.1 2011/11/04 11:45:21 stu Exp $ ---- examples/tepam/tepam_demo.tcl.orig Tue Jan 25 00:38:02 2011 -+++ examples/tepam/tepam_demo.tcl Thu Oct 13 13:41:51 2011 -@@ -1,6 +1,7 @@ --#!/bin/sh --# Evaluating the wish origin \ --exec `which wish` "$0" "$@" -+#! /bin/sh -+# the next line restarts with tclsh \ -+exec tclsh "$0" ${1+"$@"} -+ - ########################################################################## - # TEPAM - Tcl's Enhanced Procedure and Argument Manager - ########################################################################## -@@ -161,7 +162,8 @@ proc OpenConsole {} { - set OPT(slaveexit) "close" +--- examples/tepam/tepam_demo.tcl.orig Mon Feb 27 18:15:09 2012 ++++ examples/tepam/tepam_demo.tcl Mon Feb 27 18:15:19 2012 +@@ -162,7 +162,7 @@ proc OpenConsole {} { } # Search inside the *n.x envirement for TkCon ... + set TkConPath "" - catch {set TkConPath [exec csh -f -c {which tkcon.tcl}]} -+ set TkConPath "" + catch {set TkConPath [exec csh -f -c {which tkcon}]} # Search inide the Windows envirement for TkCon ... catch { package require registry -@@ -183,15 +185,15 @@ proc OpenConsole {} { - } - tkcon show - } else { -- if {$tcl_platform(platform)=={windows}} { -+ if {$::tcl_platform(platform)=={windows}} { - console show - } else { -- error "Cannot source tkcon.tcl." -+ error "Cannot source tkcon." - } - } - } else { - if {[catch {wm deiconify $::tkcon::PRIV(root)}]} { -- if {$tcl_platform(platform)=={windows}} { -+ if {$::tcl_platform(platform)=={windows}} { - console show - } else { - error "Cannot deiconify tkcon!" Index: patches/patch-support_devel_all_tcl =================================================================== RCS file: /cvs/ports/devel/tcllib/patches/patch-support_devel_all_tcl,v retrieving revision 1.3 diff -u -p -r1.3 patch-support_devel_all_tcl --- patches/patch-support_devel_all_tcl 4 Nov 2011 11:45:21 -0000 1.3 +++ patches/patch-support_devel_all_tcl 27 Feb 2012 23:38:06 -0000 @@ -1,19 +1,15 @@ $OpenBSD: patch-support_devel_all_tcl,v 1.3 2011/11/04 11:45:21 stu Exp $ ---- support/devel/all.tcl.orig Tue Jan 25 00:37:57 2011 -+++ support/devel/all.tcl Thu Oct 13 10:42:02 2011 -@@ -97,7 +97,11 @@ if {[catch {::tcltest::normalizePath ::tcltest::testsD - } +--- support/devel/all.tcl.orig Tue Dec 13 13:13:22 2011 ++++ support/devel/all.tcl Mon Feb 20 18:07:35 2012 +@@ -98,6 +98,7 @@ if {[catch {::tcltest::normalizePath ::tcltest::testsD set root $::tcltest::testsDirectory -+# Until Tcllib is fixed, do this to skip tests that require Tk -+::tcltest::skipFiles {adbox_widgets.test adbox_all.test proc_interactive.test} -+ proc Note {k v} { +return puts stdout [list @@ $k $v] flush stdout return -@@ -196,7 +200,7 @@ foreach module $modules { +@@ -196,7 +197,7 @@ foreach module $modules { set ::tcltest::testsDirectory [pSet ::tcltest::testsDirectory] # configure not present in tcltest 1.x Index: patches/patch-support_installation_actions_tcl =================================================================== RCS file: patches/patch-support_installation_actions_tcl diff -N patches/patch-support_installation_actions_tcl --- patches/patch-support_installation_actions_tcl 4 Nov 2011 11:45:21 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ -$OpenBSD: patch-support_installation_actions_tcl,v 1.1 2011/11/04 11:45:21 stu Exp $ ---- support/installation/actions.tcl.orig Mon Oct 17 12:39:01 2011 -+++ support/installation/actions.tcl Mon Oct 17 12:44:25 2011 -@@ -68,6 +68,16 @@ proc _tci {module libdir} { - return - } - -+proc _trt {module libdir} { -+ global distribution -+ -+ _tcr $module $libdir -+ xcopy \ -+ [file join $distribution modules $module] \ -+ [file join $libdir $module] \ -+ 0 *.template -+ return -+} - - proc _manfile {f format ext docdir} { - global distribution argv argc argv0 config Index: patches/patch-support_installation_modules_tcl =================================================================== RCS file: patches/patch-support_installation_modules_tcl diff -N patches/patch-support_installation_modules_tcl --- patches/patch-support_installation_modules_tcl 4 Nov 2011 11:45:21 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-support_installation_modules_tcl,v 1.3 2011/11/04 11:45:21 stu Exp $ ---- support/installation/modules.tcl.orig Mon Oct 17 12:39:50 2011 -+++ support/installation/modules.tcl Mon Oct 17 12:42:52 2011 -@@ -99,7 +99,7 @@ Module nns _tcl _man _null - Module nntp _tcl _man _exa - Module ntp _tcl _man _exa - Module otp _tcl _man _null --Module page _tcr _man _null -+Module page _trt _man _null - Module pluginmgr _tcl _man _null - Module png _tcl _man _null - Module pop3 _tcl _man _null Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/devel/tcllib/pkg/PLIST,v retrieving revision 1.8 diff -u -p -r1.8 PLIST --- pkg/PLIST 4 Nov 2011 11:45:21 -0000 1.8 +++ pkg/PLIST 27 Feb 2012 23:38:06 -0000 @@ -274,6 +274,9 @@ lib/tcl/json/ lib/tcl/json/json.tcl lib/tcl/json/json_write.tcl lib/tcl/json/pkgIndex.tcl +lib/tcl/lambda/ +lib/tcl/lambda/lambda.tcl +lib/tcl/lambda/pkgIndex.tcl lib/tcl/ldap/ lib/tcl/ldap/ldap.tcl lib/tcl/ldap/ldapx.tcl @@ -303,6 +306,7 @@ lib/tcl/math/calculus.tcl lib/tcl/math/classic_polyns.tcl lib/tcl/math/combinatorics.tcl lib/tcl/math/constants.tcl +lib/tcl/math/decimal.tcl lib/tcl/math/elliptic.tcl lib/tcl/math/exponential.tcl lib/tcl/math/fourier.tcl @@ -370,6 +374,9 @@ lib/tcl/nntp/pkgIndex.tcl lib/tcl/ntp/ lib/tcl/ntp/pkgIndex.tcl lib/tcl/ntp/time.tcl +lib/tcl/ooutil/ +lib/tcl/ooutil/ooutil.tcl +lib/tcl/ooutil/pkgIndex.tcl lib/tcl/otp/ lib/tcl/otp/otp.tcl lib/tcl/otp/pkgIndex.tcl @@ -634,6 +641,9 @@ lib/tcl/treeql/pkgIndex.tcl lib/tcl/treeql/treeql.tcl lib/tcl/treeql/treeql84.tcl lib/tcl/treeql/treeql85.tcl +lib/tcl/try/ +lib/tcl/try/pkgIndex.tcl +lib/tcl/try/try.tcl lib/tcl/uev/ lib/tcl/uev/pkgIndex.tcl lib/tcl/uev/uevent.tcl @@ -648,7 +658,24 @@ lib/tcl/uri/urn-scheme.tcl lib/tcl/uuid/ lib/tcl/uuid/pkgIndex.tcl lib/tcl/uuid/uuid.tcl +lib/tcl/valtype/ +lib/tcl/valtype/cc_amex.tcl +lib/tcl/valtype/cc_discover.tcl +lib/tcl/valtype/cc_mastercard.tcl +lib/tcl/valtype/cc_visa.tcl +lib/tcl/valtype/ean13.tcl +lib/tcl/valtype/iban.tcl +lib/tcl/valtype/imei.tcl +lib/tcl/valtype/isbn.tcl +lib/tcl/valtype/luhn.tcl +lib/tcl/valtype/luhn5.tcl +lib/tcl/valtype/pkgIndex.tcl +lib/tcl/valtype/usnpi.tcl +lib/tcl/valtype/valtype.tcl +lib/tcl/valtype/verhoeff.tcl lib/tcl/virtchannel_base/ +lib/tcl/virtchannel_base/cat.tcl +lib/tcl/virtchannel_base/facade.tcl lib/tcl/virtchannel_base/fifo.tcl lib/tcl/virtchannel_base/fifo2.tcl lib/tcl/virtchannel_base/halfpipe.tcl @@ -658,6 +685,7 @@ lib/tcl/virtchannel_base/nullzero.tcl lib/tcl/virtchannel_base/pkgIndex.tcl lib/tcl/virtchannel_base/random.tcl lib/tcl/virtchannel_base/randseed.tcl +lib/tcl/virtchannel_base/std.tcl lib/tcl/virtchannel_base/string.tcl lib/tcl/virtchannel_base/textwindow.tcl lib/tcl/virtchannel_base/variable.tcl @@ -734,6 +762,7 @@ lib/tcl/yaml/yaml.tcl @man man/mann/cvs.n @man man/mann/dacceptor.n @man man/mann/ddest.n +@man man/mann/decimal.n @man man/mann/deleg_method.n @man man/mann/deleg_proc.n @man man/mann/des.n @@ -807,6 +836,7 @@ lib/tcl/yaml/yaml.tcl @man man/mann/jpeg.n @man man/mann/json.n @man man/mann/json_write.n +@man man/mann/lambda.n @man man/mann/ldap.n @man man/mann/ldapx.n @man man/mann/linalg.n @@ -860,6 +890,7 @@ lib/tcl/yaml/yaml.tcl @man man/mann/nroff_manmacros.n @man man/mann/ntp_time.n @man man/mann/numtheory.n +@man man/mann/ooutil.n @man man/mann/optimize.n @man man/mann/otp.n @man man/mann/page.n @@ -988,6 +1019,7 @@ lib/tcl/yaml/yaml.tcl @man man/mann/traverse.n @man man/mann/treeql.n @man man/mann/trim.n +@man man/mann/try.n @man man/mann/uevent.n @man man/mann/uevent_onidle.n @man man/mann/unicode.n
