cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 0.6pl2.

Browse Source 
Install improvements.
Patches went upstream.
This commit is contained in:
stu 2015-06-05 20:36:46 +00:00
parent c8334256b4
commit e81b7f5a62
10 changed files with 39 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devel/tklib/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.14 2015/02/14 07:39:00 stu Exp $
# $OpenBSD: Makefile,v 1.15 2015/06/05 20:36:46 stu Exp $
COMMENT = Tk Standard Library
DISTNAME = tklib-0.6pl1
REVISION = 0
DISTNAME = tklib-0.6pl2
CATEGORIES = devel x11/tk
HOMEPAGE = http://core.tcl.tk/tklib/home
MAINTAINER = Stuart Cassoff <stwo@users.sourceforge.net>
@ -11,7 +10,7 @@ MAINTAINER = Stuart Cassoff <stwo@users.sourceforge.net>
# BSD style
PERMIT_PACKAGE_CDROM = Yes
# Fossil checkin 2014/08/11 37ef264934e385542477652833a09b6946b3c7a6
# Fossil checkin 2015/04/22 26f7edca5c2ac53d576f5af35146da23e76a005f
MASTER_SITES = http://mirror.yellow5.com/openbsd/
MODULES = x11/tk
BUILD_DEPENDS = devel/tcllib
@ -38,6 +37,7 @@ do-install:
-app-path ${PREFIX}/share/examples/tklib/apps \
-csb ${PREFIX}/share/doc \
-tclsh ${MODTCL_BIN} \
-wish ${MODTK_BIN} \
-descr "`cat ${PKGDIR}/DESCR`"
# Define TEST_MODULES to restrict to a subset of regression tests.

4
devel/tklib/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (tklib-0.6pl1.tar.gz) = BhatMjxPGmlbJMKV+ipNBmo+icXZXFrDE0PaT0WaiZM=
SIZE (tklib-0.6pl1.tar.gz) = 5356334
SHA256 (tklib-0.6pl2.tar.gz) = eHdbkEit4HshN6zOVc3UxxWmBNdfNx50DunYN0Ojebc=
SIZE (tklib-0.6pl2.tar.gz) = 5393954

14
devel/tklib/patches/patch-apps_bitmap-editor
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-apps_bitmap-editor,v 1.1 2013/11/14 09:43:09 stu Exp $
Bug fix.
--- apps/bitmap-editor.orig Wed Oct 30 14:44:52 2013
+++ apps/bitmap-editor Fri Nov 8 11:55:42 2013
@@ -404,6 +404,7 @@ proc ParseBMP {raw} {
#
proc OpenBMP {} {
+ global S
set types { {{BMP Files} {.bmp}} {{All Files} * }}
set fname [tk_getOpenFile -defaultextension ".bmp" -initialfile $S(fname) \
-filetypes $types]

12
devel/tklib/patches/patch-apps_diagram-viewer
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-apps_diagram-viewer,v 1.1 2013/11/14 09:43:09 stu Exp $
Bad shell.
--- apps/diagram-viewer.orig Fri Nov 8 11:29:18 2013
+++ apps/diagram-viewer Fri Nov 8 11:29:35 2013
@@ -1,4 +1,4 @@
-#!bin/bash
+#! /bin/sh
# -*- tcl -*- \
exec tclsh "$0" ${1+"$@"}

15
devel/tklib/patches/patch-examples_controlwidget_demo-tachometer_tcl
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-examples_controlwidget_demo-tachometer_tcl,v 1.1 2013/11/14 09:43:09 stu Exp $
Windowsism.
--- examples/controlwidget/demo-tachometer.tcl.orig Sun Oct 27 20:53:15 2013
+++ examples/controlwidget/demo-tachometer.tcl Sun Oct 27 20:53:26 2013
@@ -36,7 +36,7 @@ proc main { argc argv } \
grid .t1 .s1 .t2 .s2 .b -padx 2 -pady 2
wm deiconify .
- console show
+ catch { console show }
vwait forever

15
devel/tklib/patches/patch-examples_plotchart_testtable_tcl
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-examples_plotchart_testtable_tcl,v 1.1 2013/11/14 09:43:09 stu Exp $
Windowsism.
--- examples/plotchart/testtable.tcl.orig Sun Oct 27 20:52:18 2013
+++ examples/plotchart/testtable.tcl Sun Oct 27 20:52:30 2013
@@ -33,7 +33,7 @@ proc setColor {table widget row col value} {
# Command must already exist ...
$t formatcommand setColor
-console show
+catch { console show }
$t title "Demonstration of table charts"
$t separator

16
devel/tklib/patches/patch-installer_tcl
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-installer_tcl,v 1.5 2014/10/21 05:10:34 stu Exp $
$OpenBSD: patch-installer_tcl,v 1.6 2015/06/05 20:36:46 stu Exp $
Install everything nicely.
Generate tcllib.n.
--- installer.tcl.orig Mon Aug 11 01:25:55 2014
+++ installer.tcl Tue Sep 16 17:20:00 2014
--- installer.tcl.orig Wed Apr 22 06:49:59 2015
+++ installer.tcl Thu Jun 4 01:43:54 2015
@@ -84,16 +84,24 @@ if {![package vsatisfies [package provide Tcl] 8.0]} {
proc xcopyfile {src dest} {
@ -60,7 +60,7 @@ Generate tcllib.n.
+ run file mkdir $config(app,path)
+ file attributes $config(app,path) -permissions 0o755
}
+ _exafile $aexe $adst $config(tclsh)
+ _exafile $aexe $adst
+ if {[file exists $aexe.man]} {
+ set fn [file tail $aexe].n
+ _manfile [file join $distribution embedded man files apps $fn] [file join $config(doc,nroff,path) $fn]
@ -108,7 +108,7 @@ Generate tcllib.n.
xcopy $distribution/embedded/www $config(doc,html,path) 1
}
- if {$config(exa)} {xinstall exa $config(exa,path)}
+ if {$config(exa)} {xinstall exa [file join $distribution examples] $config(exa,path) $config(tclsh)}
+ if {$config(exa)} {xinstall exa [file join $distribution examples] $config(exa,path)}
if {$config(app)} {ainstall}
+ mkindex
log ""
@ -118,7 +118,7 @@ Generate tcllib.n.
set config(exa,path) [lindex $argv 1]
set argv [lrange $argv 1 end]
}
+ -csb - -descr - -mp - -tclsh {
+ -csb - -descr - -mp - -tclsh - -wish {
+ set config([string range [lindex $argv 0] 1 end]) [lindex $argv 1]
+ set argv [lrange $argv 1 end]
+ }
@ -150,8 +150,8 @@ Generate tcllib.n.
+
+ append mp {[section MODULES] [list_begin options]}
+ foreach mi $modinfos {
+ set s "\[opt_def {[lindex $mi 0]} [string map {\& ""} [lindex $mi 1]]\]"
+ append mp $s [string map {\& "" [ [lb] ] [rb]} " [lindex $mi 2] - [lindex $mi 3]"]
+ set s "\[opt_def {[lindex $mi 0]} [string map {& ""} [lindex $mi 1]]\]"
+ append mp $s [string map {\\& "" [ [lb] ] [rb] \\fI "" \\fR ""} " [lindex $mi 2] - [lindex $mi 3]"]
+ }
+ append mp {[list_end]}
+

15
devel/tklib/patches/patch-modules_plotchart_xyplot_tcl
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-modules_plotchart_xyplot_tcl,v 1.1 2013/11/14 09:43:09 stu Exp $
Don't run example code in the extension iteself, duh.
--- modules/plotchart/xyplot.tcl.orig Sun Oct 27 23:55:10 2013
+++ modules/plotchart/xyplot.tcl Sun Oct 27 23:55:17 2013
@@ -549,7 +549,7 @@ proc xyplot::cget { path option args } {
}
# Test
-if {1} {
+if {0} {
set xydata1 {}
set xydata2 {}
set xydata3 {}

54
devel/tklib/patches/patch-support_installation_actions_tcl
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-support_installation_actions_tcl,v 1.3 2014/10/21 05:10:34 stu Exp $
$OpenBSD: patch-support_installation_actions_tcl,v 1.4 2015/06/05 20:36:46 stu Exp $
Retrieve module info from man pages.
Perform shebang adjustments.
--- support/installation/actions.tcl.orig Mon Aug 11 01:25:55 2014
+++ support/installation/actions.tcl Tue Sep 16 17:25:20 2014
@@ -108,15 +108,106 @@ proc _tci {module libdir} {
--- support/installation/actions.tcl.orig Thu Apr 9 00:08:33 2015
+++ support/installation/actions.tcl Fri Apr 10 13:49:57 2015
@@ -108,15 +108,96 @@ proc _tci {module libdir} {
return
}
@ -14,7 +14,6 @@ Perform shebang adjustments.
+ if {[file tail $dfn] ni {tk_getString.n}} {
+ set dfn [file join [file dirname $dfn] [string map {_ ::} [file tail $dfn]]]
+ }
+ log "Installing $fn to $dfn"
+ set f [open $fn]
+ chan configure $f -buffersize 100000
+ set d [read -nonewline $f]
@ -22,10 +21,7 @@ Perform shebang adjustments.
+ if {[regexp {\n\.SH NAME\n(.*?) \\- (.*?)\n} $d -> shname shtitle] && [regexp -line {^\.TH.*$} $d th]} {
+ lappend modinfos [list $shname [lindex $th 3] [lindex $th 5] $shtitle]
+ }
+ set f [open $dfn w]
+ puts -nonewline $f $d
+ close $f
+ file attributes $dfn -permissions 0o444
+ xcopyfile $fn $dfn
+}
-proc _manfile {f format ext docdir} { return }
@ -54,49 +50,43 @@ Perform shebang adjustments.
return
+}
+
+proc _exafile {fn dfn tclsh} {
+proc _exafile {fn dfn} {
+ global config
+ set f [open $fn]
+ set d [read $f 2]
+ if {$d ne "#!"} {
+ close $f
+ xcopyfile $fn [file dirname $dfn]
+ xcopyfile $fn $dfn
+ return
+ }
+ chan configure $f -buffersize 100000
+ append d [read -nonewline $f]
+ close $f
+ log "Installing $fn to $dfn"
+ set execreplace "exec $tclsh "; append execreplace {"$0" ${1+"$@"}}
+ set envreplace "#! $tclsh"
+ set perms 0o444
+ set l [split $d \n]
+ set l2 [string trim [lindex $l 2]]
+ if {
+ [string match {#!*/*} [lindex $l 0]] &&
+ [string match {#*\\} [lindex $l 1]] &&
+ ([string match {exec*tclsh*} $l2] ||
+ [string match {exec*wish*} $l2])
+ [regexp {exec.+(tclsh|wish)} [lindex $l 2] -> whatsh]
+ } {
+ if {[string match {exec*wish*} $l2]} {
+ set execreplace [string map {tclsh wish} $execreplace]
+ }
+ lset l 2 $execreplace
+ set perms 0o555
+ } elseif {[string match {#!*/env*tclsh*} [lindex $l 0]]} {
+ lset l 0 $envreplace
+ set perms 0o555
+ lset l 2 [format {exec %s "$0" ${1+"$@"}} $config($whatsh)]
+ } elseif {[regexp {#!.*/env.+(tclsh|wish)} [lindex $l 0] -> whatsh]} {
+ lset l 0 [format "#! %s" $config($whatsh)]
+ } else {
+ xcopyfile $fn $dfn
+ return
+ }
+ log "Installing $fn to $dfn"
+ set f [open $dfn w]
+ puts $f [join $l \n]
+ close $f
+ file attributes $dfn -permissions $perms
+ file attributes $dfn -permissions 0o555
+}
+
+proc _exa {module srcdir dstdir tclsh} {
+ _exax $module $module $srcdir $dstdir $tclsh
+proc _exa {module srcdir dstdir} {
+ _exax $module $module $srcdir $dstdir
+}
+
+proc _exax {actual module srcdir dstdir tclsh} {
+proc _exax {actual module srcdir dstdir} {
+ set dstdir [file join $dstdir $module]
+ if {![file exists $dstdir]} {
+ log "Making directory $dstdir"
@ -106,7 +96,7 @@ Perform shebang adjustments.
+ foreach fn [glob -nocomplain -dir [file join $srcdir $actual] *] {
+ if {[file isdirectory $fn]} {
+ set m [file tail $fn]
+ _exax $m $m [file dirname $fn] $dstdir $tclsh
+ _exax $m $m [file dirname $fn] $dstdir
+ continue
+ }
+ set t [file tail $fn]
@ -114,7 +104,7 @@ Perform shebang adjustments.
+ if {$t eq "ChangeLog" || $e in {.orig .beforesubst}} { continue }
+ if {$t in {run.tcl}} { continue }
+ if {$e in {.tcl ""}} {
+ _exafile $fn [file join $dstdir $t] $tclsh
+ _exafile $fn [file join $dstdir $t]
+ } else {
+ xcopyfile $fn $dstdir
+ }

4
devel/tklib/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.5 2014/10/21 05:10:34 stu Exp $
@comment $OpenBSD: PLIST,v 1.6 2015/06/05 20:36:46 stu Exp $
@conflict mentry-*
@conflict wcb-*
@pkgpath devel/mentry
@ -269,6 +269,7 @@ share/doc/tablelist/embeddedWindows_tile.png
share/doc/tablelist/gtk.png
share/doc/tablelist/index.html
share/doc/tablelist/klearlooks.png
share/doc/tablelist/mate.png
share/doc/tablelist/mint.png
share/doc/tablelist/newWave.png
share/doc/tablelist/oxygen1.png
@ -369,6 +370,7 @@ share/examples/tklib/plotchart/plotdemos15.tcl
share/examples/tklib/plotchart/plotdemos16.tcl
share/examples/tklib/plotchart/plotdemos17.tcl
share/examples/tklib/plotchart/plotdemos18.tcl
share/examples/tklib/plotchart/plotdemos19.tcl
share/examples/tklib/plotchart/plotdemos2.tcl
share/examples/tklib/plotchart/plotdemos3.tcl
share/examples/tklib/plotchart/plotdemos4.tcl