diff options
| author | Adam Weinberger <adamw@FreeBSD.org> | 2014-07-29 16:36:06 +0000 |
|---|---|---|
| committer | Adam Weinberger <adamw@FreeBSD.org> | 2014-07-29 16:36:06 +0000 |
| commit | 0ce9c970cf1f04781b118a59f97f3eb1664b66e8 (patch) | |
| tree | f7a394b0aac405fa51a73c089493e2d03e9df09a /x11-fonts/tkfont/files/patch-tkfont | |
| parent | - Fix the implicit requirement lines of the pkg-config files to use libav's (diff) | |
Rename x11-*/ patch-xy patches to reflect the files they modify.
Finally, this is the last of it.
Notes
Notes:
svn path=/head/; revision=363358
Diffstat (limited to 'x11-fonts/tkfont/files/patch-tkfont')
| -rw-r--r-- | x11-fonts/tkfont/files/patch-tkfont | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/x11-fonts/tkfont/files/patch-tkfont b/x11-fonts/tkfont/files/patch-tkfont new file mode 100644 index 000000000000..7ba658346e40 --- /dev/null +++ b/x11-fonts/tkfont/files/patch-tkfont @@ -0,0 +1,32 @@ +--- /usr/local/bin/tkfont Tue Oct 12 13:37:45 1999 ++++ tkfont Tue Oct 12 14:27:43 1999 +@@ -33,11 +33,4 @@ +-proc GetFontDirs { } { +- global FontDirList +- set TempFileName "/tmp/dirs.list.[pid]" +- exec /usr/local/lib/tkfont/GetFontDirs > $TempFileName +- list FontDirList_a +- +- set Chan [open $TempFileName r] +- set chars 1 +- while {$chars > 0} { +- set chars [gets $Chan onedirname] +- lappend FontDirList_a $onedirname ++proc GetFontDirs {} { ++ global FontDirList errorCode ++ if {[catch {exec xset -q} result] && $errorCode != "NONE"} { ++ error $result +@@ -45,5 +38,8 @@ +- close $Chan +- exec rm $TempFileName +- set FontDirList [lreplace $FontDirList_a 0 0 \ +- [string trim [lindex $FontDirList_a 0]]] +- set FontDirList [lreplace $FontDirList end end] ++ set lines [split $result \n] ++ set i [lsearch -exact $lines "Font Path:"] ++ if {$i == -1} { ++ error "Output of `xset -q' did not contain\ ++ `Font Path:'\n$result" ++ } ++ set dirLine [string trim [lindex $lines [incr i]]] ++ set FontDirList [split $dirLine ,] |