Re: UPDATE: tcllib
On 11/10/13 02:42, Stuart Cassoff wrote: > Update to 1.15. I have obtained distfile hosting! So, ok for this and tklib? Stu
Re: UPDATE: tcllib
On 11/10/13 11:38, Vadim Zhukov wrote: > 2013/11/10 Stuart Cassoff : >> On 11/10/13 05:27, Vadim Zhukov wrote: >>> There is also a nice "plN" feature (from the "patch level"), which pkg_add >>> knows about, too. >> >> I didn't see anything in the man page. Please explain. > > See "The last part..." paragraph in packages-specs(7). :) It's a known > suffix, which is used by almost noone these days but is recognized by > pkg_add(1). Thus you can set version to foo-1.0pl0, effectively both > preserving upstream's versioning scheme and having it higher than > foo-1.0. Great, thanks. That's what I'll do then: tcllib-1.15pl0 et al. Nice and concise. Stu
Re: UPDATE: tcllib
2013/11/10 Stuart Cassoff : > On 11/10/13 05:27, Vadim Zhukov wrote: >> There is also a nice "plN" feature (from the "patch level"), which pkg_add >> knows about, too. > > I didn't see anything in the man page. Please explain. See "The last part..." paragraph in packages-specs(7). :) It's a known suffix, which is used by almost noone these days but is recognized by pkg_add(1). Thus you can set version to foo-1.0pl0, effectively both preserving upstream's versioning scheme and having it higher than foo-1.0. -- WBR, Vadim Zhukov
Re: UPDATE: tcllib
On 11/10/13 05:27, Vadim Zhukov wrote: > There is also a nice "plN" feature (from the "patch level"), which pkg_add > knows about, too. I didn't see anything in the man page. Please explain. Stu
Re: UPDATE: tcllib
On 11/10/13 04:58, Landry Breuil wrote: > On Sun, Nov 10, 2013 at 04:55:29AM -0500, Stuart Cassoff wrote: >> On 11/10/13 04:39, Landry Breuil wrote: >>> On Sun, Nov 10, 2013 at 04:17:32AM -0500, Stuart Cassoff wrote: On 11/10/13 04:02, Landry Breuil wrote: > On Sun, Nov 10, 2013 at 02:42:22AM -0500, Stuart Cassoff wrote: >> Update to 1.15. >> Some stuff went upstream. >> Instead of doing all that ridiculous work in the Makefile, >> I've moved it all to Tcllib's installer itself. >> This should make future updates a lot less painful. >> I'll fill in MASTER_SITES before commiting. >> Distfile on cvs:~stu > > So upstream makes releases, but dont provide tarballs ? Or it's a > handrolled tarball from a git hash ? > > Landry > They make releases but there have been substantial changes since the last release. I keep pushing stuff upstream. There'd be many more patches if we used the release. For Tklib it'd be even worse, something like 40+ patches. Hand-rolled tarball from fossil. In the Makefile I should s/snapshot/checkin/. What about naming? Would tcllib-1.15..tar.gz be too much? >>> >>> something like 1.15.2013 to make it clear it's _post_ 1.15. >>> >>> Landry >>> >>> >>> >> >> Gr. Chekin id is wrong in the Makefile. >> >> Base version + shortened checkin id. Points to the exact spot that it came >> from. >> >> tcllib-1.15_fdbe5cb1bc.tar.gz > > Problem with that is that it's not a real version, so you cant use it as > a PKGNAME. Your call, use the checking hash for DISTNAME then handroll > PKGNAME with a .201311xx, or just use a date for both so you dont have > to futze PKGNAME. > Ok so I'll go with tcllib-1.15.2013.tar.gz (assuming tomorrow ;) or whatever date, and mention the checkin id in the Makefile. Stu
Re: UPDATE: tcllib
10.11.2013 13:58 пользователь "Landry Breuil" написал: > > On Sun, Nov 10, 2013 at 04:55:29AM -0500, Stuart Cassoff wrote: > > On 11/10/13 04:39, Landry Breuil wrote: > > > On Sun, Nov 10, 2013 at 04:17:32AM -0500, Stuart Cassoff wrote: > > >> On 11/10/13 04:02, Landry Breuil wrote: > > >>> On Sun, Nov 10, 2013 at 02:42:22AM -0500, Stuart Cassoff wrote: > > Update to 1.15. > > Some stuff went upstream. > > Instead of doing all that ridiculous work in the Makefile, > > I've moved it all to Tcllib's installer itself. > > This should make future updates a lot less painful. > > I'll fill in MASTER_SITES before commiting. > > Distfile on cvs:~stu > > >>> > > >>> So upstream makes releases, but dont provide tarballs ? Or it's a > > >>> handrolled tarball from a git hash ? > > >>> > > >>> Landry > > >>> > > >> > > >> They make releases but there have been substantial changes since the last release. > > >> I keep pushing stuff upstream. There'd be many more patches if we used the release. > > >> For Tklib it'd be even worse, something like 40+ patches. > > >> > > >> Hand-rolled tarball from fossil. > > >> > > >> In the Makefile I should s/snapshot/checkin/. > > >> > > >> What about naming? Would tcllib-1.15..tar.gz be too much? > > > > > > something like 1.15.2013 to make it clear it's _post_ 1.15. > > > > > > Landry > > > > > > > > > > > > > Gr. Chekin id is wrong in the Makefile. > > > > Base version + shortened checkin id. Points to the exact spot that it came from. > > > > tcllib-1.15_fdbe5cb1bc.tar.gz > > Problem with that is that it's not a real version, so you cant use it as > a PKGNAME. Your call, use the checking hash for DISTNAME then handroll > PKGNAME with a .201311xx, or just use a date for both so you dont have > to futze PKGNAME. There is also a nice "plN" feature (from the "patch level"), which pkg_add knows about, too.
Re: UPDATE: tcllib
On Sun, Nov 10, 2013 at 04:55:29AM -0500, Stuart Cassoff wrote: > On 11/10/13 04:39, Landry Breuil wrote: > > On Sun, Nov 10, 2013 at 04:17:32AM -0500, Stuart Cassoff wrote: > >> On 11/10/13 04:02, Landry Breuil wrote: > >>> On Sun, Nov 10, 2013 at 02:42:22AM -0500, Stuart Cassoff wrote: > Update to 1.15. > Some stuff went upstream. > Instead of doing all that ridiculous work in the Makefile, > I've moved it all to Tcllib's installer itself. > This should make future updates a lot less painful. > I'll fill in MASTER_SITES before commiting. > Distfile on cvs:~stu > >>> > >>> So upstream makes releases, but dont provide tarballs ? Or it's a > >>> handrolled tarball from a git hash ? > >>> > >>> Landry > >>> > >> > >> They make releases but there have been substantial changes since the last > >> release. > >> I keep pushing stuff upstream. There'd be many more patches if we used the > >> release. > >> For Tklib it'd be even worse, something like 40+ patches. > >> > >> Hand-rolled tarball from fossil. > >> > >> In the Makefile I should s/snapshot/checkin/. > >> > >> What about naming? Would tcllib-1.15..tar.gz be too much? > > > > something like 1.15.2013 to make it clear it's _post_ 1.15. > > > > Landry > > > > > > > > Gr. Chekin id is wrong in the Makefile. > > Base version + shortened checkin id. Points to the exact spot that it came > from. > > tcllib-1.15_fdbe5cb1bc.tar.gz Problem with that is that it's not a real version, so you cant use it as a PKGNAME. Your call, use the checking hash for DISTNAME then handroll PKGNAME with a .201311xx, or just use a date for both so you dont have to futze PKGNAME. Landry
Re: UPDATE: tcllib
On 11/10/13 04:39, Landry Breuil wrote: > On Sun, Nov 10, 2013 at 04:17:32AM -0500, Stuart Cassoff wrote: >> On 11/10/13 04:02, Landry Breuil wrote: >>> On Sun, Nov 10, 2013 at 02:42:22AM -0500, Stuart Cassoff wrote: Update to 1.15. Some stuff went upstream. Instead of doing all that ridiculous work in the Makefile, I've moved it all to Tcllib's installer itself. This should make future updates a lot less painful. I'll fill in MASTER_SITES before commiting. Distfile on cvs:~stu >>> >>> So upstream makes releases, but dont provide tarballs ? Or it's a >>> handrolled tarball from a git hash ? >>> >>> Landry >>> >> >> They make releases but there have been substantial changes since the last >> release. >> I keep pushing stuff upstream. There'd be many more patches if we used the >> release. >> For Tklib it'd be even worse, something like 40+ patches. >> >> Hand-rolled tarball from fossil. >> >> In the Makefile I should s/snapshot/checkin/. >> >> What about naming? Would tcllib-1.15..tar.gz be too much? > > something like 1.15.2013 to make it clear it's _post_ 1.15. > > Landry > > > Gr. Chekin id is wrong in the Makefile. Base version + shortened checkin id. Points to the exact spot that it came from. tcllib-1.15_fdbe5cb1bc.tar.gz Bikeshedder^W Stu
Re: UPDATE: tcllib
On Sun, Nov 10, 2013 at 04:17:32AM -0500, Stuart Cassoff wrote: > On 11/10/13 04:02, Landry Breuil wrote: > > On Sun, Nov 10, 2013 at 02:42:22AM -0500, Stuart Cassoff wrote: > >> Update to 1.15. > >> Some stuff went upstream. > >> Instead of doing all that ridiculous work in the Makefile, > >> I've moved it all to Tcllib's installer itself. > >> This should make future updates a lot less painful. > >> I'll fill in MASTER_SITES before commiting. > >> Distfile on cvs:~stu > > > > So upstream makes releases, but dont provide tarballs ? Or it's a > > handrolled tarball from a git hash ? > > > > Landry > > > > They make releases but there have been substantial changes since the last > release. > I keep pushing stuff upstream. There'd be many more patches if we used the > release. > For Tklib it'd be even worse, something like 40+ patches. > > Hand-rolled tarball from fossil. > > In the Makefile I should s/snapshot/checkin/. > > What about naming? Would tcllib-1.15..tar.gz be too much? something like 1.15.2013 to make it clear it's _post_ 1.15. Landry
Re: UPDATE: tcllib
On 11/10/13 04:02, Landry Breuil wrote: > On Sun, Nov 10, 2013 at 02:42:22AM -0500, Stuart Cassoff wrote: >> Update to 1.15. >> Some stuff went upstream. >> Instead of doing all that ridiculous work in the Makefile, >> I've moved it all to Tcllib's installer itself. >> This should make future updates a lot less painful. >> I'll fill in MASTER_SITES before commiting. >> Distfile on cvs:~stu > > So upstream makes releases, but dont provide tarballs ? Or it's a > handrolled tarball from a git hash ? > > Landry > They make releases but there have been substantial changes since the last release. I keep pushing stuff upstream. There'd be many more patches if we used the release. For Tklib it'd be even worse, something like 40+ patches. Hand-rolled tarball from fossil. In the Makefile I should s/snapshot/checkin/. What about naming? Would tcllib-1.15..tar.gz be too much? Stu
Re: UPDATE: tcllib
On Sun, Nov 10, 2013 at 02:42:22AM -0500, Stuart Cassoff wrote: > Update to 1.15. > Some stuff went upstream. > Instead of doing all that ridiculous work in the Makefile, > I've moved it all to Tcllib's installer itself. > This should make future updates a lot less painful. > I'll fill in MASTER_SITES before commiting. > Distfile on cvs:~stu So upstream makes releases, but dont provide tarballs ? Or it's a handrolled tarball from a git hash ? Landry
UPDATE: tcllib
Update to 1.15.
Some stuff went upstream.
Instead of doing all that ridiculous work in the Makefile,
I've moved it all to Tcllib's installer itself.
This should make future updates a lot less painful.
I'll fill in MASTER_SITES before commiting.
Distfile on cvs:~stu
Stu
Index: Makefile
===
RCS file: /cvs/ports/devel/tcllib/Makefile,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 Makefile
--- Makefile9 Nov 2013 18:22:02 - 1.18
+++ Makefile10 Nov 2013 07:18:48 -
@@ -2,7 +2,7 @@
COMMENT = Tcl Standard Library
-DISTNAME = tcllib-1.14
+DISTNAME = tcllib-1.15
CATEGORIES = devel lang/tcl
HOMEPAGE = http://sourceforge.net/projects/tcllib/
MAINTAINER = Stuart Cassoff
@@ -10,51 +10,14 @@ MAINTAINER =Stuart Cassoff
Index: distinfo
===
RCS file: /cvs/ports/devel/tcllib/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- distinfo9 Mar 2012 14:15:32 - 1.10
+++ distinfo10 Nov 2013 07:18:48 -
@@ -1,5 +1,2 @@
-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
+SHA256 (tcllib-1.15.tar.gz) = JJNOb9/02KoGYNDEaFTxMsfw7wlRI9miiylIYLddwxM=
+SIZE (tcllib-1.15.tar.gz) = 7623045
Index: files/mkindex.tcl
===
RCS file: files/mkindex.tcl
diff -N files/mkindex.tcl
--- files/mkindex.tcl 9 Mar 2012 14:15:32 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,48 +0,0 @@
-# $OpenBSD: mkindex.tcl,v 1.2 2012/03/09 14:15:32 stu Exp $
-
-# Generate 'index' manpage
-# Stuart Cassoff
-# Version 0.2
-# Winter 2012
-
-package require doctools
-
-lassign $argv dir descrfn outfn name title version
-
-set modules {}
-foreach fn [glob -nocomplain -dir $dir *.n] {
- 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] \
- [string map {[ [lb] ] [rb]} [lindex $th 5]] $shtitle]
- }
-}
-set modules [lsort -dictionary -index 0 $modules]
-
-set mp ""
-append mp {[comment {-*- tcl -*- doctools manpage}]}
-append mp "\[manpage_begin $name n $version\]"
-append mp "\[titledesc {$title}\]"
-append mp "\[moddesc {$title}\]"
-
-append mp {[description]} \n [read [set f [open $descrfn]]][close $f]
-append mp {
-To locate a manual page for a package with "::", replace "::" with "_".
-For example, the manual page for package "foo::bar" would be "foo_bar".
-}
-
-append mp {[section MODULES] [list_begin options]}
-foreach module $modules {
- append mp "\[opt_def {[lindex $module 0]} [lindex $module 1]\] [lindex
$module 2] - [lindex $module 3]" \n
-}
-append mp {[list_end]}
-
-append mp {[manpage_end]}
-
-set f [open $outfn w]
-puts -nonewline $f [[::doctools::new mp -format nroff] format $mp]
-close $f
-
-
-# EOF
Index: patches/patch-apps_pt
===
RCS file: patches/patch-apps_pt
diff -N patches/patch-apps_pt
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-apps_pt 10 Nov 2013 07:18:48 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+
+Bad shell.
+
+--- apps/pt.orig Fri Nov 8 15:54:53 2013
apps/ptFri Nov 8 15:54:59 2013
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#! /bin/sh
+ # -*- tcl -*- \
+ exec tclsh8.5 "$0" ${1+"$@"}
+ # activate commands below for execution from within the pt directory
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.2
diff -u -p -u -p -r1.2 patch-examples_tepam_tepam_demo_tcl
--- patches/patch-examples_tepam_tepam_demo_tcl 9 Mar 2012 14:15:32 -
1.2
+++ patches/patch-examples_tepam_tepam_demo_tcl 10 Nov 2013 07:18:48 -
@@ -1,12 +1,12 @@
$OpenBSD: patch-examples_tepam_tepam_demo_tcl,v 1.2 2012/03/09 14:15:32 stu
Exp $
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 {} {
+--- examples/tepam/tepam_demo.tcl.orig Sun Nov 3 06:57:31 2013
examples/tepam/tepam_demo.tcl Mon Nov 4 11:59:36 2013
+@@ -189,7 +189,7 @@ proc OpenConsole {} {
}
# Search inside the *n.x envirement for TkCon ...
set TkConPath ""
- catch {set TkConPath [exec csh -f -c {which tkcon.tcl}]}
-+ catch {set TkConPath [exec csh -f -c {which tkcon}]}
++ catch {set TkConPath [exec
Re: UPDATE: tcllib 1.13 -> 1.14
On 02/27/12 18:48, Stuart Cassoff wrote: > 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 No responses? Turns out the test failure is a failure on the part of the test, so no worries there. Stu
UPDATE: tcllib 1.13 -> 1.14
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
--- Makefile4 Nov 2011 11:45:21 - 1.15
+++ Makefile27 Feb 2012 23:38:06 -
@@ -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
@@ -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
--- distinfo4 Nov 2011 11:45:21 - 1.9
+++ distinfo27 Feb 2012 23:38:06 -
@@ -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 - 1.1
+++ files/mkindex.tcl 27 Feb 2012 23:38:06 -
@@ -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 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -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 -
1.1
+++ patches/patch-examples_tepam_tepam_demo_tcl 27 Feb 2012 23:38:06 -
@@ -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
- ###
UPDATE: Tcllib 1.12 -> 1.13
Upgrade to tcllib-1.13. Some new patches, some patches went upstream.
Move less-used apps to examples/tcllib/apps. Stop using ${CHMOD} et al.
Stop writing and overwriting regress.log.
Index: devel/tcllib/Makefile
===
RCS file: /cvs/ports/devel/tcllib/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- devel/tcllib/Makefile 5 Jan 2011 16:27:24 - 1.13
+++ devel/tcllib/Makefile 18 Oct 2011 13:58:35 -
@@ -2,7 +2,7 @@
COMMENT = Tcl Standard Library
-DISTNAME = tcllib-1.12
+DISTNAME = tcllib-1.13
CATEGORIES = devel lang/tcl
HOMEPAGE = http://sourceforge.net/projects/tcllib/
MAINTAINER = Stuart Cassoff
@@ -22,9 +22,9 @@ NO_BUILD =Yes
PKG_ARCH = *
SCRIPTS_TCLSH_APPS = \
- dtplite page tcldocstrip
+ dtplite page nns nnsd nnslog tcldocstrip
-SCRIPTS_TCLSH =\
+SCRIPTS_TCLSH = \
bibtex/bibtex.tcl \
csv/csv2html csv/csvcut csv/csvdiff csv/csvjoin csv/csvsort csv/csvuniq
\
ftp/ftpdemo.tcl ftp/ftpvalid \
@@ -38,6 +38,7 @@ SCRIPTS_TCLSH = \
sasl/saslclient.tcl \
smtpd/tcl_smtpd smtpd/tk_smtpd \
struct/diff.tcl struct/diff2.tcl \
+ tepam/tepam_demo.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 \
@@ -52,8 +53,6 @@ SCRIPTS_TCLSH_NOEXEC = \
nntp/postnews
do-configure:
- 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/!} \
@@ -66,18 +65,19 @@ do-install:
-pkg-path ${DESTDIR}${MODTCL_TCLDIR} \
-nroff-path ${PREFIX}/man/mann \
-example-path ${PREFIX}/share/examples/tcllib \
- -app-path ${PREFIX}/bin
- @${CHMOD} ${BINMODE}
${SCRIPTS_TCLSH:S!logger!log!:S!^!${PREFIX}/share/examples/tcllib/!}
+ -app-path ${PREFIX}/share/examples/tcllib/apps
+ ${INSTALL_PROGRAM_DIR} ${PREFIX}/bin
+ mv ${PREFIX}/share/examples/tcllib/apps/dtplite ${PREFIX}/bin
+ @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
+ ${PKGDIR}/DESCR ${PREFIX}/man/mann/tcllib.n tcllib "${COMMENT}"
1.13
+ @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:
${SETENV} ${MAKE_ENV} ${MODTCL_BIN} \
- ${WRKSRC}/sak.tcl test run -v ${TEST_MODULES} \
- ${REGRESS_LOG}
+ ${WRKSRC}/sak.tcl test run -v ${TEST_MODULES}
.include
Index: devel/tcllib/distinfo
===
RCS file: /cvs/ports/devel/tcllib/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- devel/tcllib/distinfo 5 Jan 2011 16:27:24 - 1.8
+++ devel/tcllib/distinfo 18 Oct 2011 13:58:35 -
@@ -1,5 +1,5 @@
-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
+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
Index: devel/tcllib/patches/patch-apps_page
===
RCS file: devel/tcllib/patches/patch-apps_page
diff -N devel/tcllib/patches/patch-apps_page
--- /dev/null 1 Jan 1970 00:00:00 -
+++ devel/tcllib/patches/patch-apps_page18 Oct 2011 13:58:35 -
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- 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: devel/tcllib/patches/patch-examples_mime_maildemo_tcl
=
Re: UPDATE: Tcllib 1.11.1
On 2009/03/17 23:21, Stuart Cassoff wrote: > Moo? thunderbird said "nom nom nom" and thanks you for feeding it the diff. :-) I've just done some tests with someone else, to get thunderbird to send good diffs you need to disable both mailnews.send_plaintext_flowed and line-wrapping.
Re: UPDATE: Tcllib 1.11.1
Moo? Stuart Cassoff wrote: This incredibly hideous and huge patch brings Tcllib up to 1.11.1. Many more bits are now installed and all the examples should work nicely as well as the port Makefile being tidied-up. Additionally, I'm generating a cheapo index man page since I'm tired of doing it by hand. All relevant patches have gone upstream, hopefully making the next update less painful. Theoretically, the next release of Tcllib will generate its own index man page whereupon the cheapo index can be tossed out. Port tarball attached as well, contains the index generator. Makes use of the changes to tcl.port.mk. Stu
UPDATE: tcllib
This patch fixes tcllib's "_writes_to_HOME" regression test problem.
I have some other Tcl updates but they'll have to wait until unlock;
this seemed like it might be important enough to submit now.
Stu
Index: devel/tcllib/Makefile
===
RCS file: /cvs/ports/devel/tcllib/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- devel/tcllib/Makefile9 May 2008 19:45:18 -1.9
+++ devel/tcllib/Makefile30 Jul 2008 02:51:37 -
@@ -22,6 +22,9 @@
NO_BUILD=Yes
+# Regression test "_writes_to_HOME".
+PORTHOME=${WRKDIR}/testhome
+
do-install:
${LOCALBASE}/bin/tclsh8.5 ${WRKSRC}/installer.tcl \
-no-wait -no-gui -no-html -no-apps \
@@ -31,6 +34,7 @@
# Define TEST_MODULES to restrict to a subset of regression tests.
do-regress:
+mkdir -p ${PORTHOME}
${SETENV} ${MAKE_ENV} ${LOCALBASE}/bin/tclsh8.5 \
${WRKSRC}/sak.tcl test run -v ${TEST_MODULES} \
${REGRESS_LOG}
