Update ucblogo to ucblogo-5.3. Many changes from older 4.6. No

change log found other than "This is a maintenance release, just
fixing a few disastrous bugs introduced in the 5.2 release." (Which doesn't
matter for this.)

Use BUILDLINK3 system.
Uses ncurses (or libtermcap).
Add HOMEPAGE.
Change MASTER_SITES, because not at GNU mirrors yet.
Also install some documentation.

Update PLIST; now using share/ucblogo instead of share/logo.

Removed un-needed patches.

New patch-aa for makefile.in also makes sure that emacs logo-mode
is disabled; if you want an option for this, please do so.

This will close a PR #24858 because now ucblogo does build under Linux.

Tested under Linux and NetBSD 1.6.2. Used graphical interface
with "showturtle" and did some minor line drawings.

7 files changed, 548 insertions, 465 deletions

diff --git a/lang/ucblogo/Makefile b/lang/ucblogo/Makefile
index 037f4a56434..79ec7af87a1 100644
--- a/lang/ucblogo/Makefile
+++ b/lang/ucblogo/Makefile
@@ -1,16 +1,28 @@
-# $NetBSD: Makefile,v 1.10 2003/07/17 21:45:35 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/07/23 00:31:23 reed Exp $
 
-DISTNAME=	ucblogo-4.6
+DISTNAME=	ucblogo-5.3
 CATEGORIES=	lang
-MASTER_SITES=	${MASTER_SITE_GNU:=non-gnu/ucblogo/}
+MASTER_SITES=	ftp://ftp.cs.berkeley.edu/pub/ucblogo/
+# Not at GNU mirrors yet
+# ${MASTER_SITE_GNU:=non-gnu/ucblogo/} \
 
 MAINTAINER=	tech-pkg@NetBSD.org
+HOMEPAGE=	http://http.cs.berkeley.edu/~bh/logo.html
 COMMENT=	Brian Harvey's logo language interpreter
 
+USE_BUILDLINK3= yes
 MAKEFILE=	makefile
 GNU_CONFIGURE=	yes
 # otherwise ./configure guesses -L incorrectly
 LIBS=		-L${X11BASE}/lib
 USE_X11=	yes
 
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ucblogo
+	${INSTALL_DATA}	${WRKSRC}/usermanual ${PREFIX}/share/doc/ucblogo/usermanual.txt
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ucblogo/html
+	${CP} ${WRKSRC}/emacs/docs/*.html ${PREFIX}/share/doc/ucblogo/html/
+
+.include "../../devel/ncurses/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/ucblogo/PLIST b/lang/ucblogo/PLIST
index 24588efbcc5..9d3e26e1d11 100644
--- a/lang/ucblogo/PLIST
+++ b/lang/ucblogo/PLIST
@@ -1,409 +1,483 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:25:22 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/07/23 00:31:23 reed Exp $
 bin/logo
-share/logo/logolib/#
-share/logo/logolib/xcor
-share/logo/logolib/while
-share/logo/logolib/until
-share/logo/logolib/unburyname
-share/logo/logolib/unburyall
-share/logo/logolib/transfer
-share/logo/logolib/setpen
-share/logo/logolib/savel
-share/logo/logolib/rseq
-share/logo/logolib/reverse
-share/logo/logolib/remove
-share/logo/logolib/remdup
-share/logo/logolib/reduce
-share/logo/logolib/quoted
-share/logo/logolib/queue
-share/logo/logolib/push
-share/logo/logolib/pots
-share/logo/logolib/pops
-share/logo/logolib/popls
-share/logo/logolib/popl
-share/logo/logolib/pop
-share/logo/logolib/pons
-share/logo/logolib/pon
-share/logo/logolib/poall
-share/logo/logolib/pllist
-share/logo/logolib/pick
-share/logo/logolib/pen
-share/logo/logolib/namelist
-share/logo/logolib/name
-share/logo/logolib/mdsetitem
-share/logo/logolib/mditem
-share/logo/logolib/mdarray
-share/logo/logolib/map.se
-share/logo/logolib/map
-share/logo/logolib/macroexpand
-share/logo/logolib/localmake
-share/logo/logolib/listtoarray
-share/logo/logolib/iseq
-share/logo/logolib/invoke
-share/logo/logolib/ignore
-share/logo/logolib/gensym
-share/logo/logolib/foreach
-share/logo/logolib/for
-share/logo/logolib/find
-share/logo/logolib/filter
-share/logo/logolib/filep
-share/logo/logolib/file?
-share/logo/logolib/erpl
-share/logo/logolib/ern
-share/logo/logolib/emacs.debug
-share/logo/logolib/edps
-share/logo/logolib/edpls
-share/logo/logolib/edpl
-share/logo/logolib/edns
-share/logo/logolib/edn
-share/logo/logolib/edall
-share/logo/logolib/do.while
-share/logo/logolib/do.until
-share/logo/logolib/dequeue
-share/logo/logolib/crossmap
-share/logo/logolib/combine
-share/logo/logolib/closeall
-share/logo/logolib/cascade.2
-share/logo/logolib/cascade
-share/logo/logolib/buryname
-share/logo/logolib/buryall
-share/logo/logolib/arraytolist
-share/logo/logolib/`
-share/logo/logolib/ycor
-@dirrm share/logo/logolib
-share/logo/helpfiles/HELPCONTENTS
-share/logo/helpfiles/xcor
-share/logo/helpfiles/writer
-share/logo/helpfiles/writepos
-share/logo/helpfiles/wrap
-share/logo/helpfiles/wordp
-share/logo/helpfiles/word
-share/logo/helpfiles/window
-share/logo/helpfiles/while
-share/logo/helpfiles/wait
-share/logo/helpfiles/uppercase
-share/logo/helpfiles/untrace
-share/logo/helpfiles/until
-share/logo/helpfiles/unstep
-share/logo/helpfiles/unburyname
-share/logo/helpfiles/unburyall
-share/logo/helpfiles/unbury
-share/logo/helpfiles/type
-share/logo/helpfiles/ts
-share/logo/helpfiles/transfer
-share/logo/helpfiles/trace
-share/logo/helpfiles/towards
-share/logo/helpfiles/to
-share/logo/helpfiles/throw
-share/logo/helpfiles/thing
-share/logo/helpfiles/textscreen
-share/logo/helpfiles/text
-share/logo/helpfiles/test
-share/logo/helpfiles/tag
-share/logo/helpfiles/sum
-share/logo/helpfiles/substringp
-share/logo/helpfiles/stop
-share/logo/helpfiles/step
-share/logo/helpfiles/startup
-share/logo/helpfiles/standout
-share/logo/helpfiles/st
-share/logo/helpfiles/ss
-share/logo/helpfiles/sqrt
-share/logo/helpfiles/splitscreen
-share/logo/helpfiles/sin
-share/logo/helpfiles/showturtle
-share/logo/helpfiles/shownp
-share/logo/helpfiles/show
-share/logo/helpfiles/shell
-share/logo/helpfiles/sety
-share/logo/helpfiles/setxy
-share/logo/helpfiles/setx
-share/logo/helpfiles/setwritepos
-share/logo/helpfiles/setwrite
-share/logo/helpfiles/settextcolor
-share/logo/helpfiles/settc
-share/logo/helpfiles/setscrunch
-share/logo/helpfiles/setreadpos
-share/logo/helpfiles/setread
-share/logo/helpfiles/setpos
-share/logo/helpfiles/setpensize
-share/logo/helpfiles/setpenpattern
-share/logo/helpfiles/setpencolor
-share/logo/helpfiles/setpen
-share/logo/helpfiles/setpc
-share/logo/helpfiles/setpalette
-share/logo/helpfiles/setmargins
-share/logo/helpfiles/setitem
-share/logo/helpfiles/setheading
-share/logo/helpfiles/seth
-share/logo/helpfiles/setcursor
-share/logo/helpfiles/setbg
-share/logo/helpfiles/setbackground
-share/logo/helpfiles/sentence
-share/logo/helpfiles/se
-share/logo/helpfiles/scrunch
-share/logo/helpfiles/savepict
-share/logo/helpfiles/savel
-share/logo/helpfiles/save
-share/logo/helpfiles/rw
-share/logo/helpfiles/runresult
-share/logo/helpfiles/runparse
-share/logo/helpfiles/run
-share/logo/helpfiles/rt
-share/logo/helpfiles/rseq
-share/logo/helpfiles/round
-share/logo/helpfiles/rl
-share/logo/helpfiles/right
-share/logo/helpfiles/reverse
-share/logo/helpfiles/rerandom
-share/logo/helpfiles/repeat
-share/logo/helpfiles/repcount
-share/logo/helpfiles/remprop
-share/logo/helpfiles/remove
-share/logo/helpfiles/remdup
-share/logo/helpfiles/remainder
-share/logo/helpfiles/refresh
-share/logo/helpfiles/reduce
-share/logo/helpfiles/redefp
-share/logo/helpfiles/readword
-share/logo/helpfiles/readpos
-share/logo/helpfiles/readlist
-share/logo/helpfiles/reader
-share/logo/helpfiles/readchars
-share/logo/helpfiles/readchar
-share/logo/helpfiles/rcs
-share/logo/helpfiles/rc
-share/logo/helpfiles/rawascii
-share/logo/helpfiles/random
-share/logo/helpfiles/radsin
-share/logo/helpfiles/radcos
-share/logo/helpfiles/radarctan
-share/logo/helpfiles/quotient
-share/logo/helpfiles/quoted
-share/logo/helpfiles/queue
-share/logo/helpfiles/px
-share/logo/helpfiles/push
-share/logo/helpfiles/pu
-share/logo/helpfiles/product
-share/logo/helpfiles/procedures
-share/logo/helpfiles/procedurep
-share/logo/helpfiles/printwidthlimit
-share/logo/helpfiles/print
-share/logo/helpfiles/printdepthlimit
-share/logo/helpfiles/primitivep
-share/logo/helpfiles/pr
-share/logo/helpfiles/ppt
-share/logo/helpfiles/pprop
-share/logo/helpfiles/power
-share/logo/helpfiles/pots
-share/logo/helpfiles/pot
-share/logo/helpfiles/pos
-share/logo/helpfiles/pops
-share/logo/helpfiles/popls
-share/logo/helpfiles/popl
-share/logo/helpfiles/pop
-share/logo/helpfiles/pons
-share/logo/helpfiles/pon
-share/logo/helpfiles/poall
-share/logo/helpfiles/po
-share/logo/helpfiles/pllist
-share/logo/helpfiles/plists
-share/logo/helpfiles/plist
-share/logo/helpfiles/pick
-share/logo/helpfiles/penup
-share/logo/helpfiles/pensize
-share/logo/helpfiles/penreverse
-share/logo/helpfiles/penpattern
-share/logo/helpfiles/penpaint
-share/logo/helpfiles/penmode
-share/logo/helpfiles/penerase
-share/logo/helpfiles/pendownp
-share/logo/helpfiles/pendown
-share/logo/helpfiles/pencolor
-share/logo/helpfiles/pen
-share/logo/helpfiles/pe
-share/logo/helpfiles/pd
-share/logo/helpfiles/pc
-share/logo/helpfiles/pause
-share/logo/helpfiles/parse
-share/logo/helpfiles/palette
-share/logo/helpfiles/output
-share/logo/helpfiles/or
-share/logo/helpfiles/openwrite
-share/logo/helpfiles/openupdate
-share/logo/helpfiles/openread
-share/logo/helpfiles/openappend
-share/logo/helpfiles/op
-share/logo/helpfiles/numberp
-share/logo/helpfiles/not
-share/logo/helpfiles/norefresh
-share/logo/helpfiles/nodribble
-share/logo/helpfiles/nodes
-share/logo/helpfiles/names
-share/logo/helpfiles/namep
-share/logo/helpfiles/namelist
-share/logo/helpfiles/name
-share/logo/helpfiles/modulo
-share/logo/helpfiles/minus
-share/logo/helpfiles/memberp
-share/logo/helpfiles/member
-share/logo/helpfiles/mdsetitem
-share/logo/helpfiles/mditem
-share/logo/helpfiles/mdarray
-share/logo/helpfiles/mapdse
-share/logo/helpfiles/map
-share/logo/helpfiles/make
-share/logo/helpfiles/macrop
-share/logo/helpfiles/macroexpand
-share/logo/helpfiles/lt
-share/logo/helpfiles/lshift
-share/logo/helpfiles/lput
-share/logo/helpfiles/lowercase
-share/logo/helpfiles/log10
-share/logo/helpfiles/localmake
-share/logo/helpfiles/local
-share/logo/helpfiles/loadpict
-share/logo/helpfiles/loadnoisily
-share/logo/helpfiles/load
-share/logo/helpfiles/ln
-share/logo/helpfiles/listtoarray
-share/logo/helpfiles/listp
-share/logo/helpfiles/list
-share/logo/helpfiles/lessp
-share/logo/helpfiles/left
-share/logo/helpfiles/last
-share/logo/helpfiles/label
-share/logo/helpfiles/keyp
-share/logo/helpfiles/item
-share/logo/helpfiles/iseq
-share/logo/helpfiles/invoke
-share/logo/helpfiles/int
-share/logo/helpfiles/ignore
-share/logo/helpfiles/iftrue
-share/logo/helpfiles/ift
-share/logo/helpfiles/iffalse
-share/logo/helpfiles/iff
-share/logo/helpfiles/if
-share/logo/helpfiles/ifelse
-share/logo/helpfiles/ht
-share/logo/helpfiles/home
-share/logo/helpfiles/hideturtle
-share/logo/helpfiles/help
-share/logo/helpfiles/heading
-share/logo/helpfiles/greaterp
-share/logo/helpfiles/gprop
-share/logo/helpfiles/goto
-share/logo/helpfiles/gensym
-share/logo/helpfiles/gc
-share/logo/helpfiles/fulltext
-share/logo/helpfiles/fullscreen
-share/logo/helpfiles/fs
-share/logo/helpfiles/fput
-share/logo/helpfiles/forward
-share/logo/helpfiles/form
-share/logo/helpfiles/foreach
-share/logo/helpfiles/for
-share/logo/helpfiles/firsts
-share/logo/helpfiles/first
-share/logo/helpfiles/find
-share/logo/helpfiles/filter
-share/logo/helpfiles/fill
-share/logo/helpfiles/filep
-share/logo/helpfiles/fence
-share/logo/helpfiles/fd
-share/logo/helpfiles/exp
-share/logo/helpfiles/error
-share/logo/helpfiles/erract
-share/logo/helpfiles/erps
-share/logo/helpfiles/erpls
-share/logo/helpfiles/erpl
-share/logo/helpfiles/erns
-share/logo/helpfiles/ern
-share/logo/helpfiles/erf
-share/logo/helpfiles/erasefile
-share/logo/helpfiles/erase
-share/logo/helpfiles/erall
-share/logo/helpfiles/er
-share/logo/helpfiles/equalp
-share/logo/helpfiles/epspict
-share/logo/helpfiles/eofp
-share/logo/helpfiles/emptyp
-share/logo/helpfiles/edps
-share/logo/helpfiles/edpls
-share/logo/helpfiles/edpl
-share/logo/helpfiles/edns
-share/logo/helpfiles/edn
-share/logo/helpfiles/editfile
-share/logo/helpfiles/edit
-share/logo/helpfiles/edall
-share/logo/helpfiles/ed
-share/logo/helpfiles/dsetitem
-share/logo/helpfiles/dsetfirst
-share/logo/helpfiles/dsetbf
-share/logo/helpfiles/dribble
-share/logo/helpfiles/dodwhile
-share/logo/helpfiles/doduntil
-share/logo/helpfiles/dmaybeoutput
-share/logo/helpfiles/dmacro
-share/logo/helpfiles/difference
-share/logo/helpfiles/dequeue
-share/logo/helpfiles/deq
-share/logo/helpfiles/definedp
-share/logo/helpfiles/define
-share/logo/helpfiles/ddefmacro
-share/logo/helpfiles/cursor
-share/logo/helpfiles/ct
-share/logo/helpfiles/cs
-share/logo/helpfiles/crossmap
-share/logo/helpfiles/count
-share/logo/helpfiles/cos
-share/logo/helpfiles/copydef
-share/logo/helpfiles/continue
-share/logo/helpfiles/contents
-share/logo/helpfiles/combine
-share/logo/helpfiles/co
-share/logo/helpfiles/closeall
-share/logo/helpfiles/close
-share/logo/helpfiles/cleartext
-share/logo/helpfiles/clearscreen
-share/logo/helpfiles/clean
-share/logo/helpfiles/char
-share/logo/helpfiles/catch
-share/logo/helpfiles/caseignoredp
-share/logo/helpfiles/cascaded2
-share/logo/helpfiles/cascade
-share/logo/helpfiles/bye
-share/logo/helpfiles/butlast
-share/logo/helpfiles/butfirsts
-share/logo/helpfiles/butfirst
-share/logo/helpfiles/buryname
-share/logo/helpfiles/buryall
-share/logo/helpfiles/bury
-share/logo/helpfiles/buried
-share/logo/helpfiles/bl
-share/logo/helpfiles/bk
-share/logo/helpfiles/bitxor
-share/logo/helpfiles/bitor
-share/logo/helpfiles/bitnot
-share/logo/helpfiles/bitand
-share/logo/helpfiles/bg
-share/logo/helpfiles/bfs
-share/logo/helpfiles/bf
-share/logo/helpfiles/beforep
-share/logo/helpfiles/backslashedp
-share/logo/helpfiles/background
-share/logo/helpfiles/back
-share/logo/helpfiles/ashift
-share/logo/helpfiles/ascii
-share/logo/helpfiles/arraytolist
-share/logo/helpfiles/arrayp
-share/logo/helpfiles/array
-share/logo/helpfiles/arctan
-share/logo/helpfiles/arc
-share/logo/helpfiles/apply
-share/logo/helpfiles/and
-share/logo/helpfiles/allopen
-share/logo/helpfiles/`
-share/logo/helpfiles/ycor
-@dirrm share/logo/helpfiles
-@dirrm share/logo/
+share/doc/ucblogo/html/usermanual.html
+share/doc/ucblogo/html/usermanual_1.html
+share/doc/ucblogo/html/usermanual_10.html
+share/doc/ucblogo/html/usermanual_11.html
+share/doc/ucblogo/html/usermanual_12.html
+share/doc/ucblogo/html/usermanual_13.html
+share/doc/ucblogo/html/usermanual_14.html
+share/doc/ucblogo/html/usermanual_15.html
+share/doc/ucblogo/html/usermanual_16.html
+share/doc/ucblogo/html/usermanual_2.html
+share/doc/ucblogo/html/usermanual_3.html
+share/doc/ucblogo/html/usermanual_4.html
+share/doc/ucblogo/html/usermanual_5.html
+share/doc/ucblogo/html/usermanual_6.html
+share/doc/ucblogo/html/usermanual_7.html
+share/doc/ucblogo/html/usermanual_8.html
+share/doc/ucblogo/html/usermanual_9.html
+share/doc/ucblogo/html/usermanual_abt.html
+share/doc/ucblogo/html/usermanual_fot.html
+share/doc/ucblogo/html/usermanual_ovr.html
+share/doc/ucblogo/html/usermanual_toc.html
+share/doc/ucblogo/usermanual.txt
+share/ucblogo/csls/algs
+share/ucblogo/csls/basic
+share/ucblogo/csls/cards
+share/ucblogo/csls/crypto
+share/ucblogo/csls/diff
+share/ucblogo/csls/doctor
+share/ucblogo/csls/format
+share/ucblogo/csls/fsm
+share/ucblogo/csls/match
+share/ucblogo/csls/math
+share/ucblogo/csls/multi
+share/ucblogo/csls/pascal
+share/ucblogo/csls/playfair
+share/ucblogo/csls/plot
+share/ucblogo/csls/poker
+share/ucblogo/csls/pour
+share/ucblogo/csls/psort
+share/ucblogo/csls/solitaire
+share/ucblogo/csls/student
+share/ucblogo/csls/tower
+share/ucblogo/csls/ttt
+share/ucblogo/helpfiles/HELPCONTENTS
+share/ucblogo/helpfiles/`
+share/ucblogo/helpfiles/allopen
+share/ucblogo/helpfiles/allowgetset
+share/ucblogo/helpfiles/and
+share/ucblogo/helpfiles/apply
+share/ucblogo/helpfiles/arc
+share/ucblogo/helpfiles/arctan
+share/ucblogo/helpfiles/arity
+share/ucblogo/helpfiles/array
+share/ucblogo/helpfiles/arrayp
+share/ucblogo/helpfiles/arraytolist
+share/ucblogo/helpfiles/ascii
+share/ucblogo/helpfiles/ashift
+share/ucblogo/helpfiles/back
+share/ucblogo/helpfiles/background
+share/ucblogo/helpfiles/backslashedp
+share/ucblogo/helpfiles/beforep
+share/ucblogo/helpfiles/bf
+share/ucblogo/helpfiles/bfs
+share/ucblogo/helpfiles/bg
+share/ucblogo/helpfiles/bitand
+share/ucblogo/helpfiles/bitnot
+share/ucblogo/helpfiles/bitor
+share/ucblogo/helpfiles/bitxor
+share/ucblogo/helpfiles/bk
+share/ucblogo/helpfiles/bl
+share/ucblogo/helpfiles/buried
+share/ucblogo/helpfiles/buriedp
+share/ucblogo/helpfiles/bury
+share/ucblogo/helpfiles/buryall
+share/ucblogo/helpfiles/buryname
+share/ucblogo/helpfiles/butfirst
+share/ucblogo/helpfiles/butfirsts
+share/ucblogo/helpfiles/butlast
+share/ucblogo/helpfiles/bye
+share/ucblogo/helpfiles/cascade
+share/ucblogo/helpfiles/case
+share/ucblogo/helpfiles/caseignoredp
+share/ucblogo/helpfiles/catch
+share/ucblogo/helpfiles/char
+share/ucblogo/helpfiles/clean
+share/ucblogo/helpfiles/clearscreen
+share/ucblogo/helpfiles/cleartext
+share/ucblogo/helpfiles/close
+share/ucblogo/helpfiles/closeall
+share/ucblogo/helpfiles/co
+share/ucblogo/helpfiles/combine
+share/ucblogo/helpfiles/cond
+share/ucblogo/helpfiles/contents
+share/ucblogo/helpfiles/continue
+share/ucblogo/helpfiles/copydef
+share/ucblogo/helpfiles/cos
+share/ucblogo/helpfiles/count
+share/ucblogo/helpfiles/crossmap
+share/ucblogo/helpfiles/cs
+share/ucblogo/helpfiles/ct
+share/ucblogo/helpfiles/cursor
+share/ucblogo/helpfiles/ddefmacro
+share/ucblogo/helpfiles/define
+share/ucblogo/helpfiles/definedp
+share/ucblogo/helpfiles/deq
+share/ucblogo/helpfiles/dequeue
+share/ucblogo/helpfiles/difference
+share/ucblogo/helpfiles/dmacro
+share/ucblogo/helpfiles/dmaybeoutput
+share/ucblogo/helpfiles/doduntil
+share/ucblogo/helpfiles/dodwhile
+share/ucblogo/helpfiles/dribble
+share/ucblogo/helpfiles/dsetbf
+share/ucblogo/helpfiles/dsetfirst
+share/ucblogo/helpfiles/dsetitem
+share/ucblogo/helpfiles/dsetsegmentsize
+share/ucblogo/helpfiles/ed
+share/ucblogo/helpfiles/edall
+share/ucblogo/helpfiles/edit
+share/ucblogo/helpfiles/editfile
+share/ucblogo/helpfiles/edn
+share/ucblogo/helpfiles/edns
+share/ucblogo/helpfiles/edpl
+share/ucblogo/helpfiles/edpls
+share/ucblogo/helpfiles/edps
+share/ucblogo/helpfiles/emptyp
+share/ucblogo/helpfiles/eofp
+share/ucblogo/helpfiles/epspict
+share/ucblogo/helpfiles/equalp
+share/ucblogo/helpfiles/er
+share/ucblogo/helpfiles/erall
+share/ucblogo/helpfiles/erase
+share/ucblogo/helpfiles/erasefile
+share/ucblogo/helpfiles/erf
+share/ucblogo/helpfiles/ern
+share/ucblogo/helpfiles/erns
+share/ucblogo/helpfiles/erpl
+share/ucblogo/helpfiles/erpls
+share/ucblogo/helpfiles/erps
+share/ucblogo/helpfiles/erract
+share/ucblogo/helpfiles/error
+share/ucblogo/helpfiles/exp
+share/ucblogo/helpfiles/fd
+share/ucblogo/helpfiles/fence
+share/ucblogo/helpfiles/filep
+share/ucblogo/helpfiles/fill
+share/ucblogo/helpfiles/filter
+share/ucblogo/helpfiles/find
+share/ucblogo/helpfiles/first
+share/ucblogo/helpfiles/firsts
+share/ucblogo/helpfiles/for
+share/ucblogo/helpfiles/foreach
+share/ucblogo/helpfiles/forever
+share/ucblogo/helpfiles/form
+share/ucblogo/helpfiles/forward
+share/ucblogo/helpfiles/fput
+share/ucblogo/helpfiles/fs
+share/ucblogo/helpfiles/fullprintp
+share/ucblogo/helpfiles/fullscreen
+share/ucblogo/helpfiles/fulltext
+share/ucblogo/helpfiles/gc
+share/ucblogo/helpfiles/gensym
+share/ucblogo/helpfiles/global
+share/ucblogo/helpfiles/goto
+share/ucblogo/helpfiles/gprop
+share/ucblogo/helpfiles/greaterp
+share/ucblogo/helpfiles/heading
+share/ucblogo/helpfiles/help
+share/ucblogo/helpfiles/hideturtle
+share/ucblogo/helpfiles/home
+share/ucblogo/helpfiles/ht
+share/ucblogo/helpfiles/if
+share/ucblogo/helpfiles/ifelse
+share/ucblogo/helpfiles/iff
+share/ucblogo/helpfiles/iffalse
+share/ucblogo/helpfiles/ift
+share/ucblogo/helpfiles/iftrue
+share/ucblogo/helpfiles/ignore
+share/ucblogo/helpfiles/int
+share/ucblogo/helpfiles/invoke
+share/ucblogo/helpfiles/iseq
+share/ucblogo/helpfiles/item
+share/ucblogo/helpfiles/keyp
+share/ucblogo/helpfiles/label
+share/ucblogo/helpfiles/last
+share/ucblogo/helpfiles/left
+share/ucblogo/helpfiles/lessp
+share/ucblogo/helpfiles/list
+share/ucblogo/helpfiles/listp
+share/ucblogo/helpfiles/listtoarray
+share/ucblogo/helpfiles/ln
+share/ucblogo/helpfiles/load
+share/ucblogo/helpfiles/loadnoisily
+share/ucblogo/helpfiles/loadpict
+share/ucblogo/helpfiles/local
+share/ucblogo/helpfiles/localmake
+share/ucblogo/helpfiles/log10
+share/ucblogo/helpfiles/lowercase
+share/ucblogo/helpfiles/lput
+share/ucblogo/helpfiles/lshift
+share/ucblogo/helpfiles/lt
+share/ucblogo/helpfiles/macroexpand
+share/ucblogo/helpfiles/macrop
+share/ucblogo/helpfiles/make
+share/ucblogo/helpfiles/map
+share/ucblogo/helpfiles/mapdse
+share/ucblogo/helpfiles/mdarray
+share/ucblogo/helpfiles/mditem
+share/ucblogo/helpfiles/mdsetitem
+share/ucblogo/helpfiles/member
+share/ucblogo/helpfiles/memberp
+share/ucblogo/helpfiles/minus
+share/ucblogo/helpfiles/modulo
+share/ucblogo/helpfiles/name
+share/ucblogo/helpfiles/namelist
+share/ucblogo/helpfiles/namep
+share/ucblogo/helpfiles/names
+share/ucblogo/helpfiles/nodes
+share/ucblogo/helpfiles/nodribble
+share/ucblogo/helpfiles/norefresh
+share/ucblogo/helpfiles/not
+share/ucblogo/helpfiles/numberp
+share/ucblogo/helpfiles/op
+share/ucblogo/helpfiles/openappend
+share/ucblogo/helpfiles/openread
+share/ucblogo/helpfiles/openupdate
+share/ucblogo/helpfiles/openwrite
+share/ucblogo/helpfiles/or
+share/ucblogo/helpfiles/output
+share/ucblogo/helpfiles/palette
+share/ucblogo/helpfiles/parse
+share/ucblogo/helpfiles/pause
+share/ucblogo/helpfiles/pc
+share/ucblogo/helpfiles/pd
+share/ucblogo/helpfiles/pe
+share/ucblogo/helpfiles/pen
+share/ucblogo/helpfiles/pencolor
+share/ucblogo/helpfiles/pendown
+share/ucblogo/helpfiles/pendownp
+share/ucblogo/helpfiles/penerase
+share/ucblogo/helpfiles/penmode
+share/ucblogo/helpfiles/penpaint
+share/ucblogo/helpfiles/penpattern
+share/ucblogo/helpfiles/penreverse
+share/ucblogo/helpfiles/pensize
+share/ucblogo/helpfiles/penup
+share/ucblogo/helpfiles/pick
+share/ucblogo/helpfiles/plist
+share/ucblogo/helpfiles/plistp
+share/ucblogo/helpfiles/plists
+share/ucblogo/helpfiles/pllist
+share/ucblogo/helpfiles/po
+share/ucblogo/helpfiles/poall
+share/ucblogo/helpfiles/pon
+share/ucblogo/helpfiles/pons
+share/ucblogo/helpfiles/pop
+share/ucblogo/helpfiles/popl
+share/ucblogo/helpfiles/popls
+share/ucblogo/helpfiles/pops
+share/ucblogo/helpfiles/pos
+share/ucblogo/helpfiles/pot
+share/ucblogo/helpfiles/pots
+share/ucblogo/helpfiles/power
+share/ucblogo/helpfiles/pprop
+share/ucblogo/helpfiles/ppt
+share/ucblogo/helpfiles/pr
+share/ucblogo/helpfiles/prefix
+share/ucblogo/helpfiles/primitivep
+share/ucblogo/helpfiles/print
+share/ucblogo/helpfiles/printdepthlimit
+share/ucblogo/helpfiles/printwidthlimit
+share/ucblogo/helpfiles/procedurep
+share/ucblogo/helpfiles/procedures
+share/ucblogo/helpfiles/product
+share/ucblogo/helpfiles/pu
+share/ucblogo/helpfiles/push
+share/ucblogo/helpfiles/px
+share/ucblogo/helpfiles/queue
+share/ucblogo/helpfiles/quoted
+share/ucblogo/helpfiles/quotient
+share/ucblogo/helpfiles/radarctan
+share/ucblogo/helpfiles/radcos
+share/ucblogo/helpfiles/radsin
+share/ucblogo/helpfiles/random
+share/ucblogo/helpfiles/rawascii
+share/ucblogo/helpfiles/rc
+share/ucblogo/helpfiles/rcs
+share/ucblogo/helpfiles/readchar
+share/ucblogo/helpfiles/readchars
+share/ucblogo/helpfiles/reader
+share/ucblogo/helpfiles/readlist
+share/ucblogo/helpfiles/readpos
+share/ucblogo/helpfiles/readrawline
+share/ucblogo/helpfiles/readword
+share/ucblogo/helpfiles/redefp
+share/ucblogo/helpfiles/reduce
+share/ucblogo/helpfiles/refresh
+share/ucblogo/helpfiles/remainder
+share/ucblogo/helpfiles/remdup
+share/ucblogo/helpfiles/remove
+share/ucblogo/helpfiles/remprop
+share/ucblogo/helpfiles/repcount
+share/ucblogo/helpfiles/repeat
+share/ucblogo/helpfiles/rerandom
+share/ucblogo/helpfiles/reverse
+share/ucblogo/helpfiles/right
+share/ucblogo/helpfiles/rl
+share/ucblogo/helpfiles/round
+share/ucblogo/helpfiles/rseq
+share/ucblogo/helpfiles/rt
+share/ucblogo/helpfiles/run
+share/ucblogo/helpfiles/runparse
+share/ucblogo/helpfiles/runresult
+share/ucblogo/helpfiles/rw
+share/ucblogo/helpfiles/save
+share/ucblogo/helpfiles/savel
+share/ucblogo/helpfiles/savepict
+share/ucblogo/helpfiles/screenmode
+share/ucblogo/helpfiles/scrunch
+share/ucblogo/helpfiles/se
+share/ucblogo/helpfiles/sentence
+share/ucblogo/helpfiles/setbackground
+share/ucblogo/helpfiles/setbg
+share/ucblogo/helpfiles/setcursor
+share/ucblogo/helpfiles/seteditor
+share/ucblogo/helpfiles/seth
+share/ucblogo/helpfiles/setheading
+share/ucblogo/helpfiles/sethelploc
+share/ucblogo/helpfiles/setitem
+share/ucblogo/helpfiles/setlibloc
+share/ucblogo/helpfiles/setmargins
+share/ucblogo/helpfiles/setpalette
+share/ucblogo/helpfiles/setpc
+share/ucblogo/helpfiles/setpen
+share/ucblogo/helpfiles/setpencolor
+share/ucblogo/helpfiles/setpenpattern
+share/ucblogo/helpfiles/setpensize
+share/ucblogo/helpfiles/setpos
+share/ucblogo/helpfiles/setprefix
+share/ucblogo/helpfiles/setread
+share/ucblogo/helpfiles/setreadpos
+share/ucblogo/helpfiles/setscrunch
+share/ucblogo/helpfiles/settc
+share/ucblogo/helpfiles/settemploc
+share/ucblogo/helpfiles/settextcolor
+share/ucblogo/helpfiles/setwrite
+share/ucblogo/helpfiles/setwritepos
+share/ucblogo/helpfiles/setx
+share/ucblogo/helpfiles/setxy
+share/ucblogo/helpfiles/sety
+share/ucblogo/helpfiles/shell
+share/ucblogo/helpfiles/show
+share/ucblogo/helpfiles/shownp
+share/ucblogo/helpfiles/showturtle
+share/ucblogo/helpfiles/sin
+share/ucblogo/helpfiles/splitscreen
+share/ucblogo/helpfiles/sqrt
+share/ucblogo/helpfiles/ss
+share/ucblogo/helpfiles/st
+share/ucblogo/helpfiles/standout
+share/ucblogo/helpfiles/startup
+share/ucblogo/helpfiles/step
+share/ucblogo/helpfiles/stepped
+share/ucblogo/helpfiles/steppedp
+share/ucblogo/helpfiles/stop
+share/ucblogo/helpfiles/substringp
+share/ucblogo/helpfiles/sum
+share/ucblogo/helpfiles/tag
+share/ucblogo/helpfiles/test
+share/ucblogo/helpfiles/text
+share/ucblogo/helpfiles/textscreen
+share/ucblogo/helpfiles/thing
+share/ucblogo/helpfiles/throw
+share/ucblogo/helpfiles/to
+share/ucblogo/helpfiles/towards
+share/ucblogo/helpfiles/trace
+share/ucblogo/helpfiles/traced
+share/ucblogo/helpfiles/tracedp
+share/ucblogo/helpfiles/transfer
+share/ucblogo/helpfiles/ts
+share/ucblogo/helpfiles/turtlemode
+share/ucblogo/helpfiles/type
+share/ucblogo/helpfiles/unbury
+share/ucblogo/helpfiles/unburyall
+share/ucblogo/helpfiles/unburyname
+share/ucblogo/helpfiles/unburyonedit
+share/ucblogo/helpfiles/unstep
+share/ucblogo/helpfiles/until
+share/ucblogo/helpfiles/untrace
+share/ucblogo/helpfiles/uppercase
+share/ucblogo/helpfiles/usealternatenames
+share/ucblogo/helpfiles/wait
+share/ucblogo/helpfiles/while
+share/ucblogo/helpfiles/window
+share/ucblogo/helpfiles/word
+share/ucblogo/helpfiles/wordp
+share/ucblogo/helpfiles/wrap
+share/ucblogo/helpfiles/writepos
+share/ucblogo/helpfiles/writer
+share/ucblogo/helpfiles/xcor
+share/ucblogo/helpfiles/ycor
+share/ucblogo/logolib/#
+share/ucblogo/logolib/?rest
+share/ucblogo/logolib/Messages
+share/ucblogo/logolib/Messages.fr
+share/ucblogo/logolib/Messages.sp
+share/ucblogo/logolib/`
+share/ucblogo/logolib/buryall
+share/ucblogo/logolib/buryname
+share/ucblogo/logolib/cascade
+share/ucblogo/logolib/cascade.2
+share/ucblogo/logolib/case
+share/ucblogo/logolib/closeall
+share/ucblogo/logolib/combine
+share/ucblogo/logolib/cond
+share/ucblogo/logolib/crossmap
+share/ucblogo/logolib/dequeue
+share/ucblogo/logolib/do.until
+share/ucblogo/logolib/do.while
+share/ucblogo/logolib/edall
+share/ucblogo/logolib/edn
+share/ucblogo/logolib/edns
+share/ucblogo/logolib/edpl
+share/ucblogo/logolib/edpls
+share/ucblogo/logolib/edps
+share/ucblogo/logolib/emacs.debug
+share/ucblogo/logolib/ern
+share/ucblogo/logolib/erpl
+share/ucblogo/logolib/file?
+share/ucblogo/logolib/filep
+share/ucblogo/logolib/filter
+share/ucblogo/logolib/find
+share/ucblogo/logolib/for
+share/ucblogo/logolib/foreach
+share/ucblogo/logolib/gensym
+share/ucblogo/logolib/ignore
+share/ucblogo/logolib/invoke
+share/ucblogo/logolib/iseq
+share/ucblogo/logolib/localmake
+share/ucblogo/logolib/macroexpand
+share/ucblogo/logolib/map
+share/ucblogo/logolib/map.se
+share/ucblogo/logolib/mdarray
+share/ucblogo/logolib/mditem
+share/ucblogo/logolib/mdsetitem
+share/ucblogo/logolib/name
+share/ucblogo/logolib/namelist
+share/ucblogo/logolib/pen
+share/ucblogo/logolib/pick
+share/ucblogo/logolib/pllist
+share/ucblogo/logolib/poall
+share/ucblogo/logolib/pon
+share/ucblogo/logolib/pons
+share/ucblogo/logolib/pop
+share/ucblogo/logolib/popl
+share/ucblogo/logolib/popls
+share/ucblogo/logolib/pops
+share/ucblogo/logolib/pots
+share/ucblogo/logolib/push
+share/ucblogo/logolib/queue
+share/ucblogo/logolib/quoted
+share/ucblogo/logolib/reduce
+share/ucblogo/logolib/remdup
+share/ucblogo/logolib/remove
+share/ucblogo/logolib/reverse
+share/ucblogo/logolib/rseq
+share/ucblogo/logolib/savel
+share/ucblogo/logolib/setpen
+share/ucblogo/logolib/transfer
+share/ucblogo/logolib/unburyall
+share/ucblogo/logolib/unburyname
+share/ucblogo/logolib/until
+share/ucblogo/logolib/while
+share/ucblogo/logolib/xcor
+share/ucblogo/logolib/ycor
+@dirrm share/ucblogo/logolib
+@dirrm share/ucblogo/helpfiles
+@dirrm share/ucblogo/csls
+@dirrm share/ucblogo
+@dirrm share/doc/ucblogo/html
+@dirrm share/doc/ucblogo
diff --git a/lang/ucblogo/distinfo b/lang/ucblogo/distinfo
index 1910f79c607..5c40629cb04 100644
--- a/lang/ucblogo/distinfo
+++ b/lang/ucblogo/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.3 2004/07/13 02:16:43 thorpej Exp $
+$NetBSD: distinfo,v 1.4 2004/07/23 00:31:23 reed Exp $
 
-SHA1 (ucblogo-4.6.tar.gz) = b702456377d683f194e58f8c3b1463baa79fe6cf
-Size (ucblogo-4.6.tar.gz) = 254646 bytes
-SHA1 (patch-aa) = 35e2c76c398cb7e6d4e9d86c100f1e44284510dd
-SHA1 (patch-ab) = 4b80115de9d0a006076666e43afef7b8be59c222
-SHA1 (patch-ac) = 742896f8185a0570bf2df081e0e1ef0bee772253
-SHA1 (patch-ad) = 0eede51c7c5b420d3d3cfea750970df33d3e3dc3
+SHA1 (ucblogo-5.3.tar.gz) = abe27b2a36cc5d8dc4208fba04569e82cc163719
+Size (ucblogo-5.3.tar.gz) = 1180188 bytes
+SHA1 (patch-aa) = 5392d5d0430830f40f468449f57905ec69151b33
diff --git a/lang/ucblogo/patches/patch-aa b/lang/ucblogo/patches/patch-aa
index ecd2bc7ed39..cedf833a48c 100644
--- a/lang/ucblogo/patches/patch-aa
+++ b/lang/ucblogo/patches/patch-aa
@@ -1,18 +1,57 @@
-$NetBSD: patch-aa,v 1.2 1999/04/04 17:05:42 proff Exp $
+$NetBSD: patch-aa,v 1.3 2004/07/23 00:31:23 reed Exp $
 
---- makefile.in.orig	Wed Jan  7 05:35:51 1998
-+++ makefile.in	Mon Mar  8 02:40:41 1999
-@@ -1,10 +1,11 @@
- CC	= @CC@
--CFLAGS	= @CFLAGS@ @CPPFLAGS@ @X_CFLAGS@ -O0
-+CFLAGS	= @CFLAGS@ @CPPFLAGS@ @X_CFLAGS@ -Dunix=1
+--- makefile.in.orig	Wed Sep 11 15:02:00 2002
++++ makefile.in
+@@ -3,8 +3,9 @@ CFLAGS	= @CFLAGS@ @CPPFLAGS@ @X_CFLAGS@ 
  LDFLAGS	= @LDFLAGS@
  LIBS  = @X_PRE_LIBS@ @X_LIBS@ @LIBS@ @X_EXTRA_LIBS@
  prefix = @prefix@
 +datadir = @datadir@
  BINDIR        = $(prefix)/bin
 -LIBLOC        = $(prefix)/lib/logo
-+LIBLOC        = $(datadir)/logo
++LIBLOC        = $(datadir)/ucblogo
  
  # LIBLOC      = `pwd`
  
+@@ -18,7 +19,7 @@ SRCS	= coms.c error.c eval.c files.c gra
+ 
+ HDRS	= globals.h logo.h xgraphics.h
+ 
+-all:	logo logolib helpfiles helpfiles/HELPCONTENTS logo-mode
++all:	logo logolib helpfiles helpfiles/HELPCONTENTS
+ 
+ mem.o:	mem.c
+ 	$(CC) $(CFLAGS) -O0 -c mem.c
+@@ -54,12 +55,12 @@ makehelp:	makehelp.c
+ 
+ clean:
+ 	rm -f *.o libloc.c
+-	cd emacs; gmake clean
++	cd emacs; $(MAKE) clean
+ 
+ ship:
+ 	rm -f config.h config.cache config.log config.status
+ 	rm -f makefile makehelp logo *.o libloc.c
+-	cd emacs; gmake ship
++	cd emacs; $(MAKE) ship
+ 
+ install: all
+ 	for d in $(BINDIR) $(LIBLOC) $(LIBLOC)/logolib $(LIBLOC)/helpfiles $(LIBLOC)/csls; do [ -d $$d ] || mkdir -p $$d || exit 1; done
+@@ -67,12 +68,12 @@ install: all
+ 	cp -f logolib/* $(LIBLOC)/logolib/.
+ 	cp -f helpfiles/* $(LIBLOC)/helpfiles/.
+ 	cp -f csls/* $(LIBLOC)/csls/.
+-	(cd emacs; prefix=$(prefix) LIBLOC=$(LIBLOC) BINDIR=$(BINDIR) gmake install)
+-#	prefix=$(prefix); LIBLOC=$(LIBLOC); BINDIR=$(BINDIR); export prefix LIBLOC BINDIR; cd emacs; gmake install
++#	(cd emacs; prefix=$(prefix) LIBLOC=$(LIBLOC) BINDIR=$(BINDIR) $(MAKE) install)
++#	prefix=$(prefix); LIBLOC=$(LIBLOC); BINDIR=$(BINDIR); export prefix LIBLOC BINDIR; cd emacs; $(MAKE) install
+ 
+ logo-mode: 
+-	(cd emacs; prefix=$(prefix) LIBLOC=$(LIBLOC) BINDIR=$(BINDIR) gmake)
+-#	@prefix=$(prefix); LIBLOC=$(LIBLOC); BINDIR=$(BINDIR); export prefix LIBLOC BINDIR; cd emacs; gmake
++	(cd emacs; prefix=$(prefix) LIBLOC=$(LIBLOC) BINDIR=$(BINDIR) $(MAKE))
++#	@prefix=$(prefix); LIBLOC=$(LIBLOC); BINDIR=$(BINDIR); export prefix LIBLOC BINDIR; cd emacs; $(MAKE)
+ 
+ docs:
+-	cd emacs; gmake docs
++	cd emacs; $(MAKE) docs
diff --git a/lang/ucblogo/patches/patch-ab b/lang/ucblogo/patches/patch-ab
deleted file mode 100644
index 610853c72f3..00000000000
--- a/lang/ucblogo/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2004/07/13 02:16:43 thorpej Exp $
-
---- globals.h.orig	Mon Jul 12 19:08:40 2004
-+++ globals.h	Mon Jul 12 19:08:57 2004
-@@ -138,7 +138,7 @@
- extern NODE *lradatan(NODE *);
- extern NODE *lsqrt(NODE *);
- extern NODE *linteg(NODE *);
--extern NODE *lround(NODE *);
-+extern NODE *xlround(NODE *);
- extern NODE *lexp(NODE *);
- extern NODE *llog10(NODE *);
- extern NODE *lln(NODE *);
diff --git a/lang/ucblogo/patches/patch-ac b/lang/ucblogo/patches/patch-ac
deleted file mode 100644
index 93845a758b3..00000000000
--- a/lang/ucblogo/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2004/07/13 02:16:43 thorpej Exp $
-
---- init.c.orig	Mon Jul 12 19:09:10 2004
-+++ init.c	Mon Jul 12 19:09:02 2004
-@@ -261,7 +261,7 @@
-     {"rerandom", 0, 0, 1, PREFIX_PRIORITY, lrerandom},
-     {"right", 1, 1, 1, PREFIX_PRIORITY, lright},
-     {"rl", 0, 0, 0, PREFIX_PRIORITY, lreadlist},
--    {"round", 1, 1, 1, PREFIX_PRIORITY, lround},
-+    {"round", 1, 1, 1, PREFIX_PRIORITY, xlround},
-     {"rt", 1, 1, 1, PREFIX_PRIORITY, lright},
-     {"run", 1, 1, 1, MACRO_PRIORITY, lrun},
-     {"runparse", 1, 1, 1, PREFIX_PRIORITY, lrunparse},
diff --git a/lang/ucblogo/patches/patch-ad b/lang/ucblogo/patches/patch-ad
deleted file mode 100644
index 0ce85d8bc10..00000000000
--- a/lang/ucblogo/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2004/07/13 02:16:43 thorpej Exp $
-
---- math.c.orig	Mon Jul 12 19:09:10 2004
-+++ math.c	Mon Jul 12 19:09:08 2004
-@@ -482,7 +482,7 @@
-     return(binary(args, 'i'));
- }
- 
--NODE *lround(NODE *args) {
-+NODE *xlround(NODE *args) {
-     return(binary(args, 'r'));
- }
-