summaryrefslogtreecommitdiff
path: root/x11-fonts/tkfont
diff options
context:
space:
mode:
authorSteve Price <steve@FreeBSD.org>1999-11-26 18:32:51 +0000
committerSteve Price <steve@FreeBSD.org>1999-11-26 18:32:51 +0000
commiteae0a606820070bd1b8b5fe4ee2dc6346d3c6848 (patch)
tree47525eca5c1e3c68128fc8fa42508f850423b560 /x11-fonts/tkfont
parentFix problems with ROM-dump. (diff)
Work around the fact that Tcl's exec treats non-empty stderr as an
indication of error. Also update to use Tk version 8.2. PR: 14292 Submitted by: Mikhail Teterin <mi@aldan.algebra.com>
Notes
Notes: svn path=/head/; revision=23370
Diffstat (limited to 'x11-fonts/tkfont')
-rw-r--r--x11-fonts/tkfont/Makefile12
-rw-r--r--x11-fonts/tkfont/files/patch-aa32
-rw-r--r--x11-fonts/tkfont/pkg-plist1
3 files changed, 39 insertions, 6 deletions
diff --git a/x11-fonts/tkfont/Makefile b/x11-fonts/tkfont/Makefile
index ff85ef8735e5..304443f4289e 100644
--- a/x11-fonts/tkfont/Makefile
+++ b/x11-fonts/tkfont/Makefile
@@ -7,25 +7,27 @@
#
DISTNAME= tkfont-1.1
-CATEGORIES= x11-fonts tk80
+CATEGORIES= x11-fonts tk82
MASTER_SITES= ftp://ftp.cdrom.com/pub/linux/tsx-11/sources/usr.bin.X11/ \
http://www.FreeBSD.org/~billf/
-MAINTAINER= brett@peloton.runet.edu
+MAINTAINER= brett@peloton.runet.edu
-RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80
+RUN_DEPENDS= wish8.2:${PORTSDIR}/x11-toolkits/tk82
NO_BUILD= yes
post-patch:
- ${SED} -e "s,#!/usr/X11/bin/wish,#!$(LOCALBASE)/bin/wish8.0," < ${WRKSRC}/tkfont > ${WRKSRC}/tkfont.new
+ ${SED} -e "s,/usr/local,${LOCALBASE}," \
+ -e "s,#!/usr/X11/bin/wish,#!$(LOCALBASE)/bin/wish8.2," \
+ < ${WRKSRC}/tkfont > ${WRKSRC}/tkfont.new
${MV} ${WRKSRC}/tkfont.new ${WRKSRC}/tkfont
do-install:
@${INSTALL_SCRIPT} ${WRKSRC}/tkfont ${PREFIX}/bin
@${MKDIR} ${PREFIX}/lib/tkfont
- @${INSTALL_SCRIPT} ${WRKSRC}/GetFontDirs ${PREFIX}/lib/tkfont
@for file in COPYING Bugs.txt FileMenu.txt FindFont FontDirs.txt FontTypes.txt HelpText.txt README WhatsNew.txt; do \
${INSTALL_DATA} ${WRKSRC}/$$file ${PREFIX}/lib/tkfont; \
done
+
.include <bsd.port.mk>
diff --git a/x11-fonts/tkfont/files/patch-aa b/x11-fonts/tkfont/files/patch-aa
new file mode 100644
index 000000000000..7ba658346e40
--- /dev/null
+++ b/x11-fonts/tkfont/files/patch-aa
@@ -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 ,]
diff --git a/x11-fonts/tkfont/pkg-plist b/x11-fonts/tkfont/pkg-plist
index 3418ad6894b1..33634d4914a2 100644
--- a/x11-fonts/tkfont/pkg-plist
+++ b/x11-fonts/tkfont/pkg-plist
@@ -6,7 +6,6 @@ lib/tkfont/FontTypes.txt
lib/tkfont/FontDirs.txt
lib/tkfont/FileMenu.txt
lib/tkfont/Bugs.txt
-lib/tkfont/GetFontDirs
lib/tkfont/FindFont
lib/tkfont/WhatsNew.txt
@dirrm lib/tkfont