Upgrade to 1.12. Update to newer Tcl layout,
Remove unecessary top-level "tcllib" dir, port Makefile improvements, many patches now upstream. ok landry@, sebastiap@
This commit is contained in:
parent
784550ed68
commit
e84e59a9a8
@ -1,12 +1,11 @@
|
||||
# $OpenBSD: Makefile,v 1.12 2010/11/15 19:46:09 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.13 2011/01/05 16:27:24 stu Exp $
|
||||
|
||||
COMMENT = Tcl Standard Library
|
||||
COMMENT = Tcl Standard Library
|
||||
|
||||
DISTNAME = tcllib-1.11.1
|
||||
CATEGORIES = devel lang/tcl
|
||||
HOMEPAGE = http://sourceforge.net/projects/tcllib/
|
||||
|
||||
MAINTAINER = Stuart Cassoff <stwo@users.sourceforge.net>
|
||||
DISTNAME = tcllib-1.12
|
||||
CATEGORIES = devel lang/tcl
|
||||
HOMEPAGE = http://sourceforge.net/projects/tcllib/
|
||||
MAINTAINER = Stuart Cassoff <stwo@users.sourceforge.net>
|
||||
|
||||
# BSD style
|
||||
PERMIT_PACKAGE_CDROM = Yes
|
||||
@ -14,49 +13,49 @@ PERMIT_PACKAGE_FTP = Yes
|
||||
PERMIT_DISTFILES_CDROM =Yes
|
||||
PERMIT_DISTFILES_FTP = Yes
|
||||
|
||||
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=tcllib/}
|
||||
MODULES = lang/tcl
|
||||
BUILD_DEPENDS = ${MODTCL_BUILD_DEPENDS}
|
||||
RUN_DEPENDS = ${MODTCL_RUN_DEPENDS}
|
||||
NO_BUILD = Yes
|
||||
USE_GROFF = Yes
|
||||
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=tcllib/}
|
||||
MODULES = lang/tcl
|
||||
BUILD_DEPENDS = ${MODTCL_BUILD_DEPENDS}
|
||||
RUN_DEPENDS = ${MODTCL_RUN_DEPENDS}
|
||||
USE_GROFF = Yes
|
||||
NO_BUILD = Yes
|
||||
PKG_ARCH = *
|
||||
|
||||
SCRIPTS_TCLSH_APPS = dtplite page tcldocstrip
|
||||
SCRIPTS_TCLSH_APPS = \
|
||||
dtplite page tcldocstrip
|
||||
|
||||
SCRIPTS_TCLSH = bibtex/bibtex.tcl \
|
||||
csv/csv2html csv/csvcut csv/csvdiff csv/csvjoin csv/csvsort csv/csvuniq \
|
||||
ftp/ftpdemo.tcl ftp/ftpvalid \
|
||||
htmlparse/webviewer.tcl \
|
||||
irc/irc_example.tcl \
|
||||
ldap/ldapChangeTest ldap/ldapquery ldap/ldifdump \
|
||||
log/logtotext.tcl \
|
||||
mapproj/tkmap.tcl \
|
||||
math/bigfloat.demo.tcl \
|
||||
ntp/rdate.tcl \
|
||||
sasl/saslclient.tcl \
|
||||
smtpd/tcl_smtpd smtpd/tk_smtpd \
|
||||
struct/diff.tcl struct/diff2.tcl \
|
||||
term/attributes term/box term/box2 term/clear term/colors term/frame \
|
||||
term/graphics term/imenu term/ipager term/menu term/menu2 term/para \
|
||||
term/title \
|
||||
tie/receiving_client.tcl tie/sending_client.tcl tie/server.tcl \
|
||||
tie/transceiver.tcl
|
||||
SCRIPTS_TCLSH = \
|
||||
bibtex/bibtex.tcl \
|
||||
csv/csv2html csv/csvcut csv/csvdiff csv/csvjoin csv/csvsort csv/csvuniq \
|
||||
ftp/ftpdemo.tcl ftp/ftpvalid \
|
||||
htmlparse/webviewer.tcl \
|
||||
irc/irc_example.tcl \
|
||||
ldap/ldapChangeTest ldap/ldapquery ldap/ldifdump \
|
||||
logger/logtotext.tcl \
|
||||
mapproj/tkmap.tcl \
|
||||
math/bigfloat.demo.tcl \
|
||||
ntp/rdate.tcl \
|
||||
sasl/saslclient.tcl \
|
||||
smtpd/tcl_smtpd smtpd/tk_smtpd \
|
||||
struct/diff.tcl struct/diff2.tcl \
|
||||
term/attributes term/box term/box2 term/clear term/colors term/frame \
|
||||
term/graphics term/imenu term/ipager term/menu term/menu2 term/para \
|
||||
term/title \
|
||||
tie/receiving_client.tcl tie/sending_client.tcl tie/server.tcl \
|
||||
tie/transceiver.tcl
|
||||
|
||||
SCRIPTS_TCLSH_NOEXEC = ftp/hpupdate.tcl ftp/mirror.tcl ftp/newer.tcl \
|
||||
ftpd/ftpd ftpd/ftpd.test ftpd/ftpd.unix \
|
||||
log/logtofile.tcl \
|
||||
mime/maildemo.tcl mime/mbot/impersonal.tcl mime/mbot/personal.tcl \
|
||||
nntp/postnews
|
||||
|
||||
# The installer maps package name to directory name.
|
||||
# Fool it so it will install the 'log' package examples.
|
||||
pre-configure:
|
||||
ln -s ${WRKSRC}/examples/logger ${WRKSRC}/examples/log
|
||||
SCRIPTS_TCLSH_NOEXEC = \
|
||||
ftp/hpupdate.tcl ftp/mirror.tcl ftp/newer.tcl \
|
||||
ftpd/ftpd ftpd/ftpd.test ftpd/ftpd.unix \
|
||||
logger/logtofile.tcl \
|
||||
mime/maildemo.tcl mime/mbot/impersonal.tcl mime/mbot/personal.tcl \
|
||||
nntp/postnews
|
||||
|
||||
do-configure:
|
||||
cp ${WRKSRC}/support/installation/man.macros \
|
||||
${WRKSRC}/modules/doctools/mpformats/man.macros
|
||||
@${MODTCL_TCLSH_ADJ} ${SCRIPTS_TCLSH_APPS:S!^!${WRKSRC}/apps/!} \
|
||||
mv ${WRKSRC}/modules/simulation/random.man \
|
||||
${WRKSRC}/modules/simulation/simulation_random.man
|
||||
@${MODTCL_TCLSH_ADJ} \
|
||||
${SCRIPTS_TCLSH_APPS:S!^!${WRKSRC}/apps/!} \
|
||||
${SCRIPTS_TCLSH:S!^!${WRKSRC}/examples/!} \
|
||||
${SCRIPTS_TCLSH_NOEXEC:S!^!${WRKSRC}/examples/!}
|
||||
|
||||
@ -64,15 +63,16 @@ do-install:
|
||||
${MODTCL_BIN} ${WRKSRC}/installer.tcl \
|
||||
-no-wait -no-gui -no-html \
|
||||
-pkgs -nroff -examples -apps \
|
||||
-pkg-path ${PREFIX}/lib/tcllib \
|
||||
-pkg-path ${DESTDIR}${MODTCL_TCLDIR} \
|
||||
-nroff-path ${PREFIX}/man/mann \
|
||||
-example-path ${PREFIX}/share/examples/tcllib \
|
||||
-app-path ${PREFIX}/bin
|
||||
@chmod 555 ${SCRIPTS_TCLSH:S!^!${PREFIX}/share/examples/tcllib/!}
|
||||
env TCLLIBPATH=${PREFIX}/lib ${MODTCL_BIN} ${FILESDIR}/mkindex.tcl ${PREFIX}/man/mann \
|
||||
${PKGDIR}/DESCR ${PREFIX}/man/mann/tcllib.n tcllib "${COMMENT}" 1.11.1
|
||||
@chown root:bin ${PREFIX}/man/mann/tcllib.n
|
||||
@chmod 444 ${PREFIX}/man/mann/tcllib.n
|
||||
@${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.12
|
||||
@${CHOWN} ${MANOWN}:${MANGRP} ${PREFIX}/man/mann/tcllib.n
|
||||
@${CHMOD} ${MANMODE} ${PREFIX}/man/mann/tcllib.n
|
||||
|
||||
# Define TEST_MODULES to restrict to a subset of regression tests.
|
||||
do-regress:
|
||||
|
@ -1,5 +1,5 @@
|
||||
MD5 (tcllib-1.11.1.tar.gz) = U6Rmn4DVeRJKkyAIJcTC6A==
|
||||
RMD160 (tcllib-1.11.1.tar.gz) = ptpKyrr2Kdzg0Y1dpSfBYhQpJik=
|
||||
SHA1 (tcllib-1.11.1.tar.gz) = OX2aO5Qu49FfPJ0zhiiyYxihp9c=
|
||||
SHA256 (tcllib-1.11.1.tar.gz) = igdTUo5NvUgVbxO3dTndhxlQfVhhWlkKD9iub+gBwbY=
|
||||
SIZE (tcllib-1.11.1.tar.gz) = 4014817
|
||||
MD5 (tcllib-1.12.tar.gz) = Z9Ikgv5WrMuHjcFuDNGdpA==
|
||||
RMD160 (tcllib-1.12.tar.gz) = 5hAi62IxQih/wrlynzzAZN+rHa0=
|
||||
SHA1 (tcllib-1.12.tar.gz) = CBakddh3cALy8zdoR/AgNX+de80=
|
||||
SHA256 (tcllib-1.12.tar.gz) = O1h8SLb19XlsPOQAgNErv5vJ0USMR29Yh2pvXYsliBo=
|
||||
SIZE (tcllib-1.12.tar.gz) = 4358889
|
||||
|
@ -1,19 +0,0 @@
|
||||
$OpenBSD: patch-examples_bibtex_bibtex_tcl,v 1.1 2009/03/19 16:54:32 sthen Exp $
|
||||
--- examples/bibtex/bibtex.tcl.orig Fri Jan 16 17:35:01 2009
|
||||
+++ examples/bibtex/bibtex.tcl Fri Jan 16 17:35:21 2009
|
||||
@@ -1,3 +1,7 @@
|
||||
+#! /bin/sh
|
||||
+# the next line restarts with tclsh \
|
||||
+exec tclsh "$0" ${1+"$@"}
|
||||
+
|
||||
#####
|
||||
#
|
||||
# "BibTeX parser" -- Example Application.
|
||||
@@ -8,7 +12,6 @@
|
||||
#
|
||||
#####
|
||||
|
||||
-lappend auto_path [file dirname [info script]]
|
||||
|
||||
# bibtex.tcl --
|
||||
#
|
@ -1,11 +0,0 @@
|
||||
$OpenBSD: patch-examples_htmlparse_webviewer_tcl,v 1.1 2009/03/19 16:54:32 sthen Exp $
|
||||
--- examples/htmlparse/webviewer.tcl.orig Sun Jan 18 00:55:12 2009
|
||||
+++ examples/htmlparse/webviewer.tcl Sun Jan 18 00:55:56 2009
|
||||
@@ -1,3 +1,7 @@
|
||||
+#! /bin/sh
|
||||
+# the next line restarts with tclsh \
|
||||
+exec tclsh "$0" ${1+"$@"}
|
||||
+
|
||||
# webviewer.tcl - Copyright (C) 2004 Pat Thoyts <patthoyts@users.sourceforge.net>
|
||||
#
|
||||
# This is a sample application to demonstrate the use of the htmlparse package.
|
@ -1,17 +0,0 @@
|
||||
$OpenBSD: patch-examples_irc_irc_example_tcl,v 1.1 2009/03/19 16:54:32 sthen Exp $
|
||||
--- examples/irc/irc_example.tcl.orig Sat Jan 17 13:57:20 2009
|
||||
+++ examples/irc/irc_example.tcl Sat Jan 17 14:05:00 2009
|
||||
@@ -7,7 +7,3 @@
|
||||
|
||||
-# I include these so that it can find both the irc package and the
|
||||
-# logger package that irc needs.
|
||||
-
|
||||
-set auto_path "[file join [file dirname [info script]] .. .. modules irc] $auto_path"
|
||||
-set auto_path "[file join [file dirname [info script]] .. .. modules log] $auto_path"
|
||||
+set scriptDir [file dirname [info script]]
|
||||
package require irc 0.4
|
||||
@@ -30,3 +26,3 @@
|
||||
while { 1 } {
|
||||
- source mainloop.tcl
|
||||
+ source [file join $::scriptDir mainloop.tcl]
|
||||
vwait ::ircclient::RELOAD
|
@ -1,11 +0,0 @@
|
||||
$OpenBSD: patch-examples_mapproj_tkmap_tcl,v 1.1 2009/03/19 16:54:32 sthen Exp $
|
||||
--- examples/mapproj/tkmap.tcl.orig Sat Jan 17 06:04:02 2009
|
||||
+++ examples/mapproj/tkmap.tcl Sat Jan 17 06:04:57 2009
|
||||
@@ -1,3 +1,7 @@
|
||||
+#! /bin/sh
|
||||
+# the next line restarts with tclsh \
|
||||
+exec tclsh "$0" ${1+"$@"}
|
||||
+
|
||||
# tkmap.tcl --
|
||||
#
|
||||
# Example application demonstrating the use of Tcllib's 'mapproj'
|
@ -1,31 +0,0 @@
|
||||
$OpenBSD: patch-examples_math_bigfloat_demo_tcl,v 1.1 2009/03/19 16:54:32 sthen Exp $
|
||||
--- examples/math/bigfloat.demo.tcl.orig Fri Dec 12 23:10:25 2008
|
||||
+++ examples/math/bigfloat.demo.tcl Fri Jan 16 14:48:18 2009
|
||||
@@ -1,3 +1,9 @@
|
||||
+#! /bin/sh
|
||||
+# the next line restarts with tclsh \
|
||||
+exec tclsh "$0" ${1+"$@"}
|
||||
+
|
||||
+set scriptDir [file dirname [info script]]
|
||||
+
|
||||
########################################################################
|
||||
# BigFloat for Tcl
|
||||
# Copyright (C) 2003-2005 ARNOLD Stephane
|
||||
@@ -45,6 +51,8 @@
|
||||
#
|
||||
########################################################################
|
||||
|
||||
+package require Tk
|
||||
+
|
||||
package require math::bigfloat
|
||||
namespace import ::math::bigfloat::*
|
||||
|
||||
@@ -248,7 +256,7 @@ proc ShowFile {filename buttonText} {
|
||||
|
||||
proc _help {args} {
|
||||
# display some help
|
||||
- ShowFile bigfloat.help Close
|
||||
+ ShowFile [file join $::scriptDir bigfloat.help] Close
|
||||
}
|
||||
|
||||
proc _del {} {
|
@ -1,11 +0,0 @@
|
||||
$OpenBSD: patch-examples_ntp_rdate_tcl,v 1.1 2009/03/19 16:54:32 sthen Exp $
|
||||
--- examples/ntp/rdate.tcl.orig Mon Jan 19 17:40:34 2009
|
||||
+++ examples/ntp/rdate.tcl Mon Jan 19 17:41:22 2009
|
||||
@@ -1,3 +1,7 @@
|
||||
+#! /bin/sh
|
||||
+# the next line restarts with tclsh \
|
||||
+exec tclsh "$0" ${1+"$@"}
|
||||
+
|
||||
# rdate.tcl - Copyright (C) 2003 Pat Thoyts <patthoyts@users.sourceforge.net>
|
||||
#
|
||||
# This is a sample implementation of the rdate(8) utility written using the
|
@ -1,11 +0,0 @@
|
||||
$OpenBSD: patch-examples_sasl_saslclient_tcl,v 1.1 2009/03/19 16:54:32 sthen Exp $
|
||||
--- examples/sasl/saslclient.tcl.orig Sun Jan 18 01:17:52 2009
|
||||
+++ examples/sasl/saslclient.tcl Sun Jan 18 01:18:29 2009
|
||||
@@ -1,3 +1,7 @@
|
||||
+#! /bin/sh
|
||||
+# the next line restarts with tclsh \
|
||||
+exec tclsh "$0" ${1+"$@"}
|
||||
+
|
||||
# saslclient.tcl - Copyright (C) 2005 Pat Thoyts <patthoyts@users.sf.net>
|
||||
#
|
||||
# This is a SMTP SASL test client. It connects to a SMTP server and uses
|
@ -1,22 +0,0 @@
|
||||
$OpenBSD: patch-examples_struct_diff2_tcl,v 1.1 2009/03/19 16:54:32 sthen Exp $
|
||||
--- examples/struct/diff2.tcl.orig Fri Jan 16 17:07:52 2009
|
||||
+++ examples/struct/diff2.tcl Fri Jan 16 17:08:10 2009
|
||||
@@ -1,3 +1,7 @@
|
||||
+#! /bin/sh
|
||||
+# the next line restarts with tclsh \
|
||||
+exec tclsh "$0" ${1+"$@"}
|
||||
+
|
||||
# MAIN PROGRAM
|
||||
#
|
||||
# Usage:
|
||||
@@ -8,10 +12,6 @@
|
||||
# in a format similar to 'patch'. It not the same as patch, but could
|
||||
# be modified to be exactly the same.
|
||||
|
||||
-lappend auto_path \
|
||||
- [file join \
|
||||
- [file dirname [file dirname [file dirname [file dirname [file join [pwd] [info script]]]]]] \
|
||||
- modules struct]
|
||||
package require struct
|
||||
|
||||
# Open the files and read the lines into memory
|
@ -1,22 +0,0 @@
|
||||
$OpenBSD: patch-examples_struct_diff_tcl,v 1.1 2009/03/19 16:54:32 sthen Exp $
|
||||
--- examples/struct/diff.tcl.orig Fri Jan 16 17:00:50 2009
|
||||
+++ examples/struct/diff.tcl Fri Jan 16 17:00:16 2009
|
||||
@@ -1,3 +1,7 @@
|
||||
+#! /bin/sh
|
||||
+# the next line restarts with tclsh \
|
||||
+exec tclsh "$0" ${1+"$@"}
|
||||
+
|
||||
# MAIN PROGRAM
|
||||
#
|
||||
# Usage:
|
||||
@@ -12,10 +16,6 @@
|
||||
# n2 is omitted, and conversely, if it appears in the second file but not the first, n1
|
||||
# is omitted.
|
||||
|
||||
-lappend auto_path \
|
||||
- [file join \
|
||||
- [file dirname [file dirname [file dirname [file dirname [file join [pwd] [info script]]]]]] \
|
||||
- modules struct]
|
||||
package require struct
|
||||
|
||||
# Open the files and read the lines into memory
|
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-installer_tcl,v 1.1 2009/03/19 16:54:32 sthen Exp $
|
||||
--- installer.tcl.orig Fri Dec 12 23:10:26 2008
|
||||
+++ installer.tcl Sat Jan 17 05:58:53 2009
|
||||
$OpenBSD: patch-installer_tcl,v 1.2 2011/01/05 16:27:24 stu Exp $
|
||||
--- installer.tcl.orig Mon Dec 7 09:56:53 2009
|
||||
+++ installer.tcl Mon Oct 4 23:59:02 2010
|
||||
@@ -79,21 +79,29 @@ if {![package vsatisfies [package provide Tcl] 8.0]} {
|
||||
puts $index "unset maindir"
|
||||
puts $index ""
|
||||
@ -39,3 +39,11 @@ $OpenBSD: patch-installer_tcl,v 1.1 2009/03/19 16:54:32 sthen Exp $
|
||||
}
|
||||
|
||||
|
||||
@@ -245,7 +254,6 @@ proc doinstall {} {
|
||||
}
|
||||
if {$config(pkg)} {
|
||||
xinstall pkg $config(pkg,path)
|
||||
- gen_main_index $config(pkg,path) $package_name $package_version
|
||||
if {$config(doc,nroff)} {
|
||||
xinstall doc nroff n $config(doc,nroff,path)
|
||||
}
|
||||
|
@ -1,18 +0,0 @@
|
||||
$OpenBSD: patch-modules_doctools_docidx_plugin_apiref_man,v 1.1 2009/03/19 16:54:32 sthen Exp $
|
||||
--- modules/doctools/docidx_plugin_apiref.man.orig Fri Jan 23 22:07:37 2009
|
||||
+++ modules/doctools/docidx_plugin_apiref.man Fri Jan 23 22:07:59 2009
|
||||
@@ -106,6 +106,14 @@ of the documentation for the package [package doctools
|
||||
Query command. It returns the name of the format associated with the
|
||||
index formatting engine.
|
||||
|
||||
+[call [cmd dt_read] [arg file]]
|
||||
+
|
||||
+Controlled filesystem access. Appends contents of file to the output.
|
||||
+
|
||||
+Only files which are either in the same directory as the file
|
||||
+containing the engine, or below it, can be loaded. Trying to load a
|
||||
+file outside of this directory causes an error.
|
||||
+
|
||||
[call [cmd dt_source] [arg file]]
|
||||
|
||||
Controlled filesystem access. This command allows the index formatting
|
@ -1,18 +0,0 @@
|
||||
$OpenBSD: patch-modules_doctools_doctoc_plugin_apiref_man,v 1.1 2009/03/19 16:54:32 sthen Exp $
|
||||
--- modules/doctools/doctoc_plugin_apiref.man.orig Fri Jan 23 22:06:27 2009
|
||||
+++ modules/doctools/doctoc_plugin_apiref.man Fri Jan 23 22:07:08 2009
|
||||
@@ -106,6 +106,14 @@ of the documentation for the package [package doctools
|
||||
Query command. It returns the name of the format associated with the
|
||||
toc formatting engine.
|
||||
|
||||
+[call [cmd dt_read] [arg file]]
|
||||
+
|
||||
+Controlled filesystem access. Appends contents of file to the output.
|
||||
+
|
||||
+Only files which are either in the same directory as the file
|
||||
+containing the engine, or below it, can be loaded. Trying to load a
|
||||
+file outside of this directory causes an error.
|
||||
+
|
||||
[call [cmd dt_source] [arg file]]
|
||||
|
||||
Controlled filesystem access. This command allows the toc formatting
|
@ -1,18 +0,0 @@
|
||||
$OpenBSD: patch-modules_doctools_doctools_plugin_apiref_man,v 1.1 2009/03/19 16:54:32 sthen Exp $
|
||||
--- modules/doctools/doctools_plugin_apiref.man.orig Fri Jan 23 22:01:41 2009
|
||||
+++ modules/doctools/doctools_plugin_apiref.man Fri Jan 23 22:05:08 2009
|
||||
@@ -132,6 +132,14 @@ Query command. It returns the number of lists currentl
|
||||
Query command. It returns the name of the module the input currently
|
||||
processed belongs to.
|
||||
|
||||
+[call [cmd dt_read] [arg file]]
|
||||
+
|
||||
+Controlled filesystem access. Appends contents of file to the output.
|
||||
+
|
||||
+Only files which are either in the same directory as the file
|
||||
+containing the engine, or below it, can be loaded. Trying to load a
|
||||
+file outside of this directory causes an error.
|
||||
+
|
||||
[call [cmd dt_source] [arg file]]
|
||||
|
||||
Controlled filesystem access. This command allows the doctools
|
@ -1,23 +0,0 @@
|
||||
$OpenBSD: patch-modules_doctools_doctools_tcl,v 1.1 2009/03/19 16:54:32 sthen Exp $
|
||||
--- modules/doctools/doctools.tcl.orig Fri Dec 12 23:10:24 2008
|
||||
+++ modules/doctools/doctools.tcl Thu Jan 22 12:39:52 2009
|
||||
@@ -650,6 +650,7 @@ proc ::doctools::SetupFormatter {name format} {
|
||||
$mpip invokehidden source [file join $here api.tcl]
|
||||
#$mpip eval [list source [file join $here api.tcl]]
|
||||
interp alias $mpip dt_source {} ::doctools::Source $mpip [file dirname $format]
|
||||
+ interp alias $mpip dt_read {} ::doctools::Read $mpip [file dirname $format]
|
||||
interp alias $mpip dt_package {} ::doctools::Package $mpip
|
||||
interp alias $mpip file {} ::doctools::FileOp $mpip
|
||||
interp alias $mpip puts_stderr {} ::puts stderr
|
||||
@@ -1135,6 +1136,11 @@ proc ::doctools::Source {ip path file} {
|
||||
return
|
||||
}
|
||||
|
||||
+proc ::doctools::Read {ip path file} {
|
||||
+ #puts stderr "$ip (read $path $file)"
|
||||
+
|
||||
+ return [read [set f [open [file join $path [file tail $file]]]]][close $f]
|
||||
+}
|
||||
|
||||
proc ::doctools::Locate {p} {
|
||||
# @mdgen NODEP: doctools::__undefined__
|
@ -1,7 +0,0 @@
|
||||
$OpenBSD: patch-modules_doctools_doctools_test,v 1.1 2009/03/19 16:54:32 sthen Exp $
|
||||
--- modules/doctools/doctools.test.orig Fri Dec 12 23:10:24 2008
|
||||
+++ modules/doctools/doctools.test Wed Feb 4 14:40:59 2009
|
||||
@@ -333,0 +334,3 @@
|
||||
+ if {$format eq "nroff"} {
|
||||
+ lappend map ".so man.macros\n" [fileutil::cat [localPath mpformats/man.macros]]
|
||||
+ }
|
@ -1,28 +0,0 @@
|
||||
$OpenBSD: patch-modules_doctools_mpformats__nroff_tcl,v 1.1 2009/03/19 16:54:32 sthen Exp $
|
||||
--- modules/doctools/mpformats/_nroff.tcl.orig Fri Dec 12 23:10:24 2008
|
||||
+++ modules/doctools/mpformats/_nroff.tcl Thu Jan 22 12:43:15 2009
|
||||
@@ -33,6 +33,7 @@ proc nr_title {text} {return "\n.TH $text"}
|
||||
proc nr_include {file} {return "\n.so $file"}
|
||||
proc nr_bolds {} {return \n.BS}
|
||||
proc nr_bolde {} {return \n.BE}
|
||||
+proc nr_read {fn} {return [nroffMarkup [dt_read $fn]]}
|
||||
|
||||
proc nr_section {name} {
|
||||
if {![regexp {[ ]} $name]} {
|
||||
@@ -60,11 +61,14 @@ proc nr_subsection {name} {
|
||||
#
|
||||
|
||||
global markupMap
|
||||
-set markupMap [list "\\" "\1\\"]
|
||||
+set markupMap [list \
|
||||
+ "\\" "\1\\" \
|
||||
+ "'" "\1'" \
|
||||
+ "\\\\" "\\"]
|
||||
global finalMap
|
||||
set finalMap [list \
|
||||
"\1\\" "\\" \
|
||||
- "\1'" "'" \
|
||||
+ "\1'" "'" \
|
||||
"\\" "\\\\"]
|
||||
global textMap
|
||||
set textMap [list "\\" "\\\\"]
|
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-modules_doctools_mpformats_fmt_nroff,v 1.1 2009/03/19 16:54:32 sthen Exp $
|
||||
--- modules/doctools/mpformats/fmt.nroff.orig Fri Dec 12 23:10:24 2008
|
||||
+++ modules/doctools/mpformats/fmt.nroff Thu Jan 22 12:43:40 2009
|
||||
@@ -40,7 +40,7 @@ c_pass 2 fmt_manpage_begin {title section version} {
|
||||
c_hold hdr $text
|
||||
}
|
||||
|
||||
- c_hold hdr [nr_include man.macros]
|
||||
+ c_hold hdr [nr_read man.macros]
|
||||
c_hold hdr [nr_title "\"[string trimleft $title :]\" $section $version $module \"$shortdesc\""]
|
||||
c_hold hdr [nr_bolds]
|
||||
c_hold hdr [fmt_section NAME]
|
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-modules_doctools_mpformats_idx_nroff,v 1.1 2009/03/19 16:54:33 sthen Exp $
|
||||
--- modules/doctools/mpformats/idx.nroff.orig Fri Dec 12 23:10:24 2008
|
||||
+++ modules/doctools/mpformats/idx.nroff Thu Jan 22 12:43:54 2009
|
||||
@@ -52,7 +52,7 @@ proc fmt_index_begin {label title} {
|
||||
set hdr [nr_comment $prec]\n
|
||||
}
|
||||
append hdr [nr_comment [c_provenance]]\n
|
||||
- append hdr [nr_include man.macros]\n
|
||||
+ append hdr [nr_read man.macros]\n
|
||||
append hdr [nr_title "\"[string trimleft $label :]\" n"]\n
|
||||
append hdr [nr_bolds]\n
|
||||
append hdr [nr_section INDEX]\n
|
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-modules_doctools_mpformats_toc_nroff,v 1.1 2009/03/19 16:54:33 sthen Exp $
|
||||
--- modules/doctools/mpformats/toc.nroff.orig Fri Dec 12 23:10:24 2008
|
||||
+++ modules/doctools/mpformats/toc.nroff Thu Jan 22 12:44:13 2009
|
||||
@@ -51,7 +51,7 @@ proc fmt_toc_begin {label title} {
|
||||
set hdr [nr_comment $prec]\n
|
||||
}
|
||||
append hdr [nr_comment [c_provenance]]\n
|
||||
- append hdr [nr_include man.macros]\n
|
||||
+ append hdr [nr_read man.macros]\n
|
||||
append hdr [nr_title "\"[string trimleft $label :]\" n"]\n
|
||||
append hdr [nr_bolds]\n
|
||||
append hdr [nr_section CONTENTS]\n
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-support_devel_sak_test_run_tcl,v 1.1 2008/05/09 19:45:18 sthen Exp $
|
||||
--- support/devel/sak/test/run.tcl.pat.orig Thu May 1 15:21:14 2008
|
||||
+++ support/devel/sak/test/run.tcl Thu May 1 15:20:56 2008
|
||||
@@ -675,6 +675,7 @@ proc ::sak::test::run::SetupError {} {
|
||||
$OpenBSD: patch-support_devel_sak_test_run_tcl,v 1.2 2011/01/05 16:27:24 stu Exp $
|
||||
--- support/devel/sak/test/run.tcl.orig Mon Dec 7 09:56:49 2009
|
||||
+++ support/devel/sak/test/run.tcl Mon Oct 4 15:41:21 2010
|
||||
@@ -684,6 +684,7 @@ proc ::sak::test::run::SetupError {} {
|
||||
# ###
|
||||
|
||||
proc ::sak::test::run::+= {string} {
|
||||
@ -9,7 +9,7 @@ $OpenBSD: patch-support_devel_sak_test_run_tcl,v 1.1 2008/05/09 19:45:18 sthen E
|
||||
variable araw
|
||||
if {$araw} return
|
||||
variable aprefix
|
||||
@@ -684,6 +685,7 @@ proc ::sak::test::run::+= {string} {
|
||||
@@ -693,6 +694,7 @@ proc ::sak::test::run::+= {string} {
|
||||
}
|
||||
|
||||
proc ::sak::test::run::= {string} {
|
||||
@ -17,7 +17,7 @@ $OpenBSD: patch-support_devel_sak_test_run_tcl,v 1.1 2008/05/09 19:45:18 sthen E
|
||||
variable araw
|
||||
if {$araw} return
|
||||
variable aprefix
|
||||
@@ -692,6 +694,7 @@ proc ::sak::test::run::= {string} {
|
||||
@@ -701,6 +703,7 @@ proc ::sak::test::run::= {string} {
|
||||
}
|
||||
|
||||
proc ::sak::test::run::=| {string} {
|
||||
|
@ -1,48 +0,0 @@
|
||||
$OpenBSD: patch-support_installation_modules_tcl,v 1.1 2009/03/19 16:54:33 sthen Exp $
|
||||
--- support/installation/modules.tcl.orig Fri Dec 12 23:10:20 2008
|
||||
+++ support/installation/modules.tcl Sun Jan 18 01:18:55 2009
|
||||
@@ -40,7 +40,7 @@ Module base64 _tcl _man _null
|
||||
Module base32 _tcl _man _null
|
||||
Module bee _tcl _man _null
|
||||
Module bench _tcl _null _null
|
||||
-Module bibtex _tcl _man _null
|
||||
+Module bibtex _tcl _man _exa
|
||||
Module blowfish _tcl _man _null
|
||||
Module cache _tcl _man _null
|
||||
Module calendar _tci _man _null
|
||||
@@ -63,7 +63,7 @@ Module grammar_fa _tcl _man _null
|
||||
Module grammar_me _tcl _man _null
|
||||
Module grammar_peg _tcl _man _null
|
||||
Module html _tcl _man _null
|
||||
-Module htmlparse _tcl _man _null
|
||||
+Module htmlparse _tcl _man _exa
|
||||
Module http _tcl _man _null
|
||||
Module ident _tcl _man _null
|
||||
Module inifile _tcl _man _null
|
||||
@@ -73,7 +73,7 @@ Module javascript _tcl _man _null
|
||||
Module jpeg _tcl _man _null
|
||||
Module json _tcl _man _null
|
||||
Module ldap _tcl _man _exa
|
||||
-Module log _msg _man _null
|
||||
+Module log _msg _man _exa
|
||||
Module map _tcl _man _null
|
||||
Module mapproj _tcl _man _exa
|
||||
Module math _tci _man _exa
|
||||
@@ -98,7 +98,7 @@ Module rc4 _tcl _man _null
|
||||
Module rcs _tcl _man _null
|
||||
Module report _tcl _man _null
|
||||
Module ripemd _tcl _man _null
|
||||
-Module sasl _tcl _man _null
|
||||
+Module sasl _tcl _man _exa
|
||||
Module sha1 _tcl _man _null
|
||||
Module simulation _tcl _man _null
|
||||
Module smtpd _tcl _man _exa
|
||||
@@ -110,7 +110,7 @@ Module struct _tcl _man _exa
|
||||
Module tar _tcl _man _null
|
||||
Module term _tcr _man _exa
|
||||
Module textutil _tex _man _null
|
||||
-Module tie _tcl _man _null
|
||||
+Module tie _tcl _man _exa
|
||||
Module tiff _tcl _man _null
|
||||
Module transfer _tcl _man _null
|
||||
Module treeql _tcl _man _null
|
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user