Update 3.3 -> 4.6 and add a master site. Patches differ slightly from

those submitted.

PR:	10699
Submitted by:	Jose Marques <jose@nobody.org>

4 files changed, 480 insertions, 34 deletions

diff --git a/lang/logo/Makefile b/lang/logo/Makefile
index ba39f3cb4d87..da9b90f67a8f 100644
--- a/lang/logo/Makefile
+++ b/lang/logo/Makefile
@@ -1,21 +1,21 @@
 # New ports collection makefile for:	logo
-# Version required:	3.3
+# Version required:	4.6
 # Date created:		22 October 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.12 1998/11/28 05:39:01 asami Exp $
+# $Id: Makefile,v 1.13 1999/01/27 07:41:21 fenner Exp $
 #
 
-DISTNAME=	ucblogo-3.3
+DISTNAME=	ucblogo-4.6
 CATEGORIES=	lang
-MASTER_SITES=	${MASTER_SITE_GNU}
+MASTER_SITES=	${MASTER_SITE_GNU} \
+		ftp://anarres.cs.berkeley.edu/pub/ucblogo/
 MASTER_SITE_SUBDIR=	ucblogo
 
 MAINTAINER=	jmacd@FreeBSD.ORG
 
 USE_XLIB=	yes
 MAKEFILE=	makefile
-MAKE_FLAGS+=	"LIBLOC = ${PREFIX}/lib/logo"
 HAS_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/lang/logo/distinfo b/lang/logo/distinfo
index 034b77ef34ee..fc66b8ecedb7 100644
--- a/lang/logo/distinfo
+++ b/lang/logo/distinfo
@@ -1 +1 @@
-MD5 (ucblogo-3.3.tar.gz) = 69ef25c77c876f5c1caeb352c0739ccd
+MD5 (ucblogo-4.6.tar.gz) = d327af6a037e1ec0b8d06064b728e3f5
diff --git a/lang/logo/files/patch-ac b/lang/logo/files/patch-ac
index 7aa9b9210a2f..a5be800b0bb3 100644
--- a/lang/logo/files/patch-ac
+++ b/lang/logo/files/patch-ac
@@ -1,34 +1,48 @@
-*** makefile.in.old	Sun Dec 25 08:43:59 1994
---- makefile.in	Sat Apr 15 15:21:08 1995
+*** makefile.in.orig	Tue Jan  6 20:35:51 1998
+--- makefile.in	Mon Jun 21 15:43:33 1999
 ***************
-*** 1,7 ****
-  CC	= @CC@
-  CFLAGS	= @CFLAGS@ @CPPFLAGS@ @X_CFLAGS@
-  LIBS	= @X_LIBS@ @LIBS@
-! LIBLOC	= `pwd`
+*** 2,10 ****
+  CFLAGS	= @CFLAGS@ @CPPFLAGS@ @X_CFLAGS@ -O0
+  LDFLAGS	= @LDFLAGS@
+  LIBS  = @X_PRE_LIBS@ @X_LIBS@ @LIBS@ @X_EXTRA_LIBS@
+! prefix = @prefix@
+! BINDIR        = $(prefix)/bin
+! LIBLOC        = $(prefix)/lib/logo
   
-  OBJS 	= coms.o error.o eval.o files.o graphics.o init.o intern.o \
-  	  libloc.o lists.o logodata.o main.o math.o mem.o paren.o parse.o \
---- 1,7 ----
-  CC	= @CC@
-  CFLAGS	= @CFLAGS@ @CPPFLAGS@ @X_CFLAGS@
-  LIBS	= @X_LIBS@ @LIBS@
-! LIBLOC	?= `pwd`
+  # LIBLOC      = `pwd`
+  
+--- 2,14 ----
+  CFLAGS	= @CFLAGS@ @CPPFLAGS@ @X_CFLAGS@ -O0
+  LDFLAGS	= @LDFLAGS@
+  LIBS  = @X_PRE_LIBS@ @X_LIBS@ @LIBS@ @X_EXTRA_LIBS@
+! 
+! BINDIR        = $(PREFIX)/bin
+! LIBLOC        = $(PREFIX)/lib/logo
+! XMPDIR        = $(PREFIX)/share/examples/logo
+! .ifndef NOPORTDOCS
+! DOCDIR        = $(PREFIX)/share/doc/logo
+! .endif
+  
+  # LIBLOC      = `pwd`
   
-  OBJS 	= coms.o error.o eval.o files.o graphics.o init.o intern.o \
-  	  libloc.o lists.o logodata.o main.o math.o mem.o paren.o parse.o \
 ***************
-*** 35,40 ****
---- 35,46 ----
+*** 56,62 ****
+  	rm makefile makehelp logo *.o libloc.c
   
-  makehelp:	makehelp.c
-  	$(CC) -o makehelp makehelp.c
-+ 
-+ install:
-+ 	install -c logo ${PREFIX}/bin
-+ 	mkdir -p ${LIBLOC}
-+ 	cp -rp logolib ${LIBLOC}
-+ 	cp -rp helpfiles ${LIBLOC}
+  install: all
+! 	for d in $(BINDIR) $(LIBLOC) $(LIBLOC)/logolib $(LIBLOC)/helpfiles; do [ -d $$d ] || mkdir -p $$d || exit 1; done
+! 	cp logo $(BINDIR)/.
+! 	cp logolib/* $(LIBLOC)/logolib/.
+! 	cp helpfiles/* $(LIBLOC)/helpfiles/.
+--- 60,70 ----
+  	rm makefile makehelp logo *.o libloc.c
   
-  clean:
-  	rm *.o libloc.c
+  install: all
+! 	for d in $(BINDIR) $(LIBLOC) $(LIBLOC)/logolib $(LIBLOC)/helpfiles $(XMPDIR)/csls $(DOCDIR); do [ -d $$d ] || mkdir -p $$d || exit 1; done
+! 	install -c -s -o bin -g bin -m 555 logo $(BINDIR)/
+! 	install -c -o bin -g bin -m 444 logolib/* $(LIBLOC)/logolib/
+! 	install -c -o bin -g bin -m 444 helpfiles/* $(LIBLOC)/helpfiles/
+! 	install -c -o bin -g bin -m 444 csls/* $(XMPDIR)/csls/
+! .ifndef NOPORTDOCS
+! 	install -c -o bin -g bin -m 444 usermanual $(DOCDIR)/
+! .endif
diff --git a/lang/logo/pkg-plist b/lang/logo/pkg-plist
index 46b8658ca2c1..4db0090c0bc9 100644
--- a/lang/logo/pkg-plist
+++ b/lang/logo/pkg-plist
@@ -1 +1,433 @@
 bin/logo
+lib/logo/logolib/#
+lib/logo/logolib/`
+lib/logo/logolib/arraytolist
+lib/logo/logolib/buryall
+lib/logo/logolib/buryname
+lib/logo/logolib/cascade
+lib/logo/logolib/cascade.2
+lib/logo/logolib/closeall
+lib/logo/logolib/combine
+lib/logo/logolib/crossmap
+lib/logo/logolib/dequeue
+lib/logo/logolib/do.until
+lib/logo/logolib/do.while
+lib/logo/logolib/edall
+lib/logo/logolib/edn
+lib/logo/logolib/edns
+lib/logo/logolib/edpl
+lib/logo/logolib/edpls
+lib/logo/logolib/edps
+lib/logo/logolib/emacs.debug
+lib/logo/logolib/ern
+lib/logo/logolib/erpl
+lib/logo/logolib/file?
+lib/logo/logolib/filep
+lib/logo/logolib/filter
+lib/logo/logolib/find
+lib/logo/logolib/for
+lib/logo/logolib/foreach
+lib/logo/logolib/gensym
+lib/logo/logolib/map
+lib/logo/logolib/ignore
+lib/logo/logolib/invoke
+lib/logo/logolib/iseq
+lib/logo/logolib/listtoarray
+lib/logo/logolib/localmake
+lib/logo/logolib/macroexpand
+lib/logo/logolib/map.se
+lib/logo/logolib/mdarray
+lib/logo/logolib/mditem
+lib/logo/logolib/mdsetitem
+lib/logo/logolib/name
+lib/logo/logolib/namelist
+lib/logo/logolib/pen
+lib/logo/logolib/pick
+lib/logo/logolib/pllist
+lib/logo/logolib/poall
+lib/logo/logolib/pon
+lib/logo/logolib/pons
+lib/logo/logolib/pop
+lib/logo/logolib/popl
+lib/logo/logolib/popls
+lib/logo/logolib/pops
+lib/logo/logolib/pots
+lib/logo/logolib/push
+lib/logo/logolib/queue
+lib/logo/logolib/quoted
+lib/logo/logolib/reduce
+lib/logo/logolib/remdup
+lib/logo/logolib/remove
+lib/logo/logolib/reverse
+lib/logo/logolib/rseq
+lib/logo/logolib/savel
+lib/logo/logolib/setpen
+lib/logo/logolib/transfer
+lib/logo/logolib/unburyall
+lib/logo/logolib/unburyname
+lib/logo/logolib/until
+lib/logo/logolib/while
+lib/logo/logolib/xcor
+lib/logo/logolib/ycor
+lib/logo/helpfiles/HELPCONTENTS
+lib/logo/helpfiles/`
+lib/logo/helpfiles/allopen
+lib/logo/helpfiles/and
+lib/logo/helpfiles/apply
+lib/logo/helpfiles/arc
+lib/logo/helpfiles/arctan
+lib/logo/helpfiles/array
+lib/logo/helpfiles/arrayp
+lib/logo/helpfiles/arraytolist
+lib/logo/helpfiles/ascii
+lib/logo/helpfiles/ashift
+lib/logo/helpfiles/back
+lib/logo/helpfiles/background
+lib/logo/helpfiles/backslashedp
+lib/logo/helpfiles/beforep
+lib/logo/helpfiles/bf
+lib/logo/helpfiles/bfs
+lib/logo/helpfiles/bg
+lib/logo/helpfiles/bitand
+lib/logo/helpfiles/bitnot
+lib/logo/helpfiles/bitor
+lib/logo/helpfiles/bitxor
+lib/logo/helpfiles/bk
+lib/logo/helpfiles/bl
+lib/logo/helpfiles/buried
+lib/logo/helpfiles/bury
+lib/logo/helpfiles/buryall
+lib/logo/helpfiles/buryname
+lib/logo/helpfiles/butfirst
+lib/logo/helpfiles/butfirsts
+lib/logo/helpfiles/butlast
+lib/logo/helpfiles/bye
+lib/logo/helpfiles/cascade
+lib/logo/helpfiles/cascaded2
+lib/logo/helpfiles/caseignoredp
+lib/logo/helpfiles/catch
+lib/logo/helpfiles/char
+lib/logo/helpfiles/clean
+lib/logo/helpfiles/clearscreen
+lib/logo/helpfiles/cleartext
+lib/logo/helpfiles/close
+lib/logo/helpfiles/closeall
+lib/logo/helpfiles/co
+lib/logo/helpfiles/combine
+lib/logo/helpfiles/contents
+lib/logo/helpfiles/continue
+lib/logo/helpfiles/copydef
+lib/logo/helpfiles/cos
+lib/logo/helpfiles/count
+lib/logo/helpfiles/crossmap
+lib/logo/helpfiles/cs
+lib/logo/helpfiles/ct
+lib/logo/helpfiles/cursor
+lib/logo/helpfiles/ddefmacro
+lib/logo/helpfiles/define
+lib/logo/helpfiles/definedp
+lib/logo/helpfiles/deq
+lib/logo/helpfiles/dequeue
+lib/logo/helpfiles/difference
+lib/logo/helpfiles/dmacro
+lib/logo/helpfiles/dmaybeoutput
+lib/logo/helpfiles/doduntil
+lib/logo/helpfiles/dodwhile
+lib/logo/helpfiles/dribble
+lib/logo/helpfiles/dsetbf
+lib/logo/helpfiles/dsetfirst
+lib/logo/helpfiles/dsetitem
+lib/logo/helpfiles/ed
+lib/logo/helpfiles/edall
+lib/logo/helpfiles/edit
+lib/logo/helpfiles/editfile
+lib/logo/helpfiles/edn
+lib/logo/helpfiles/edns
+lib/logo/helpfiles/edpl
+lib/logo/helpfiles/edpls
+lib/logo/helpfiles/edps
+lib/logo/helpfiles/emptyp
+lib/logo/helpfiles/eofp
+lib/logo/helpfiles/epspict
+lib/logo/helpfiles/equalp
+lib/logo/helpfiles/er
+lib/logo/helpfiles/erall
+lib/logo/helpfiles/erase
+lib/logo/helpfiles/erasefile
+lib/logo/helpfiles/erf
+lib/logo/helpfiles/ern
+lib/logo/helpfiles/erns
+lib/logo/helpfiles/erpl
+lib/logo/helpfiles/erpls
+lib/logo/helpfiles/erps
+lib/logo/helpfiles/erract
+lib/logo/helpfiles/error
+lib/logo/helpfiles/exp
+lib/logo/helpfiles/fd
+lib/logo/helpfiles/fence
+lib/logo/helpfiles/filep
+lib/logo/helpfiles/fill
+lib/logo/helpfiles/filter
+lib/logo/helpfiles/find
+lib/logo/helpfiles/first
+lib/logo/helpfiles/firsts
+lib/logo/helpfiles/for
+lib/logo/helpfiles/foreach
+lib/logo/helpfiles/form
+lib/logo/helpfiles/forward
+lib/logo/helpfiles/fput
+lib/logo/helpfiles/fs
+lib/logo/helpfiles/fullscreen
+lib/logo/helpfiles/fulltext
+lib/logo/helpfiles/gc
+lib/logo/helpfiles/gensym
+lib/logo/helpfiles/goto
+lib/logo/helpfiles/gprop
+lib/logo/helpfiles/greaterp
+lib/logo/helpfiles/heading
+lib/logo/helpfiles/help
+lib/logo/helpfiles/hideturtle
+lib/logo/helpfiles/home
+lib/logo/helpfiles/ht
+lib/logo/helpfiles/if
+lib/logo/helpfiles/ifelse
+lib/logo/helpfiles/iff
+lib/logo/helpfiles/iffalse
+lib/logo/helpfiles/ift
+lib/logo/helpfiles/iftrue
+lib/logo/helpfiles/ignore
+lib/logo/helpfiles/int
+lib/logo/helpfiles/invoke
+lib/logo/helpfiles/iseq
+lib/logo/helpfiles/item
+lib/logo/helpfiles/keyp
+lib/logo/helpfiles/label
+lib/logo/helpfiles/last
+lib/logo/helpfiles/left
+lib/logo/helpfiles/lessp
+lib/logo/helpfiles/list
+lib/logo/helpfiles/listp
+lib/logo/helpfiles/listtoarray
+lib/logo/helpfiles/ln
+lib/logo/helpfiles/load
+lib/logo/helpfiles/loadnoisily
+lib/logo/helpfiles/loadpict
+lib/logo/helpfiles/local
+lib/logo/helpfiles/localmake
+lib/logo/helpfiles/log10
+lib/logo/helpfiles/lowercase
+lib/logo/helpfiles/lput
+lib/logo/helpfiles/lshift
+lib/logo/helpfiles/lt
+lib/logo/helpfiles/macroexpand
+lib/logo/helpfiles/macrop
+lib/logo/helpfiles/make
+lib/logo/helpfiles/map
+lib/logo/helpfiles/mapdse
+lib/logo/helpfiles/not
+lib/logo/helpfiles/mdarray
+lib/logo/helpfiles/mditem
+lib/logo/helpfiles/mdsetitem
+lib/logo/helpfiles/member
+lib/logo/helpfiles/memberp
+lib/logo/helpfiles/minus
+lib/logo/helpfiles/modulo
+lib/logo/helpfiles/name
+lib/logo/helpfiles/namelist
+lib/logo/helpfiles/namep
+lib/logo/helpfiles/names
+lib/logo/helpfiles/nodes
+lib/logo/helpfiles/nodribble
+lib/logo/helpfiles/norefresh
+lib/logo/helpfiles/numberp
+lib/logo/helpfiles/op
+lib/logo/helpfiles/openappend
+lib/logo/helpfiles/openread
+lib/logo/helpfiles/openupdate
+lib/logo/helpfiles/openwrite
+lib/logo/helpfiles/or
+lib/logo/helpfiles/output
+lib/logo/helpfiles/palette
+lib/logo/helpfiles/parse
+lib/logo/helpfiles/pause
+lib/logo/helpfiles/pc
+lib/logo/helpfiles/pd
+lib/logo/helpfiles/pe
+lib/logo/helpfiles/pen
+lib/logo/helpfiles/pencolor
+lib/logo/helpfiles/pendown
+lib/logo/helpfiles/pendownp
+lib/logo/helpfiles/penerase
+lib/logo/helpfiles/penmode
+lib/logo/helpfiles/penpaint
+lib/logo/helpfiles/penpattern
+lib/logo/helpfiles/penreverse
+lib/logo/helpfiles/pensize
+lib/logo/helpfiles/penup
+lib/logo/helpfiles/pick
+lib/logo/helpfiles/plist
+lib/logo/helpfiles/plists
+lib/logo/helpfiles/pllist
+lib/logo/helpfiles/po
+lib/logo/helpfiles/poall
+lib/logo/helpfiles/pon
+lib/logo/helpfiles/pons
+lib/logo/helpfiles/pop
+lib/logo/helpfiles/popl
+lib/logo/helpfiles/popls
+lib/logo/helpfiles/pops
+lib/logo/helpfiles/pos
+lib/logo/helpfiles/pot
+lib/logo/helpfiles/pots
+lib/logo/helpfiles/power
+lib/logo/helpfiles/pprop
+lib/logo/helpfiles/ppt
+lib/logo/helpfiles/pr
+lib/logo/helpfiles/primitivep
+lib/logo/helpfiles/print
+lib/logo/helpfiles/printdepthlimit
+lib/logo/helpfiles/printwidthlimit
+lib/logo/helpfiles/procedurep
+lib/logo/helpfiles/procedures
+lib/logo/helpfiles/product
+lib/logo/helpfiles/pu
+lib/logo/helpfiles/push
+lib/logo/helpfiles/px
+lib/logo/helpfiles/queue
+lib/logo/helpfiles/quoted
+lib/logo/helpfiles/quotient
+lib/logo/helpfiles/radarctan
+lib/logo/helpfiles/radcos
+lib/logo/helpfiles/radsin
+lib/logo/helpfiles/random
+lib/logo/helpfiles/rawascii
+lib/logo/helpfiles/rc
+lib/logo/helpfiles/rcs
+lib/logo/helpfiles/readchar
+lib/logo/helpfiles/readchars
+lib/logo/helpfiles/reader
+lib/logo/helpfiles/readlist
+lib/logo/helpfiles/readpos
+lib/logo/helpfiles/readword
+lib/logo/helpfiles/redefp
+lib/logo/helpfiles/reduce
+lib/logo/helpfiles/refresh
+lib/logo/helpfiles/remainder
+lib/logo/helpfiles/remdup
+lib/logo/helpfiles/remove
+lib/logo/helpfiles/remprop
+lib/logo/helpfiles/repcount
+lib/logo/helpfiles/repeat
+lib/logo/helpfiles/rerandom
+lib/logo/helpfiles/reverse
+lib/logo/helpfiles/right
+lib/logo/helpfiles/rl
+lib/logo/helpfiles/round
+lib/logo/helpfiles/rseq
+lib/logo/helpfiles/rt
+lib/logo/helpfiles/run
+lib/logo/helpfiles/runparse
+lib/logo/helpfiles/runresult
+lib/logo/helpfiles/rw
+lib/logo/helpfiles/save
+lib/logo/helpfiles/savel
+lib/logo/helpfiles/savepict
+lib/logo/helpfiles/scrunch
+lib/logo/helpfiles/se
+lib/logo/helpfiles/sentence
+lib/logo/helpfiles/setbackground
+lib/logo/helpfiles/setbg
+lib/logo/helpfiles/setcursor
+lib/logo/helpfiles/seth
+lib/logo/helpfiles/setheading
+lib/logo/helpfiles/setitem
+lib/logo/helpfiles/setmargins
+lib/logo/helpfiles/setpalette
+lib/logo/helpfiles/setpc
+lib/logo/helpfiles/setpen
+lib/logo/helpfiles/setpencolor
+lib/logo/helpfiles/setpensize
+lib/logo/helpfiles/setpenpattern
+lib/logo/helpfiles/setpos
+lib/logo/helpfiles/setread
+lib/logo/helpfiles/setreadpos
+lib/logo/helpfiles/setscrunch
+lib/logo/helpfiles/settc
+lib/logo/helpfiles/settextcolor
+lib/logo/helpfiles/setwrite
+lib/logo/helpfiles/setwritepos
+lib/logo/helpfiles/setx
+lib/logo/helpfiles/setxy
+lib/logo/helpfiles/sety
+lib/logo/helpfiles/shell
+lib/logo/helpfiles/show
+lib/logo/helpfiles/shownp
+lib/logo/helpfiles/showturtle
+lib/logo/helpfiles/sin
+lib/logo/helpfiles/splitscreen
+lib/logo/helpfiles/sqrt
+lib/logo/helpfiles/ss
+lib/logo/helpfiles/st
+lib/logo/helpfiles/standout
+lib/logo/helpfiles/startup
+lib/logo/helpfiles/step
+lib/logo/helpfiles/stop
+lib/logo/helpfiles/substringp
+lib/logo/helpfiles/sum
+lib/logo/helpfiles/tag
+lib/logo/helpfiles/test
+lib/logo/helpfiles/text
+lib/logo/helpfiles/textscreen
+lib/logo/helpfiles/thing
+lib/logo/helpfiles/throw
+lib/logo/helpfiles/to
+lib/logo/helpfiles/towards
+lib/logo/helpfiles/trace
+lib/logo/helpfiles/transfer
+lib/logo/helpfiles/ts
+lib/logo/helpfiles/type
+lib/logo/helpfiles/unbury
+lib/logo/helpfiles/unburyall
+lib/logo/helpfiles/unburyname
+lib/logo/helpfiles/unstep
+lib/logo/helpfiles/until
+lib/logo/helpfiles/untrace
+lib/logo/helpfiles/uppercase
+lib/logo/helpfiles/wait
+lib/logo/helpfiles/while
+lib/logo/helpfiles/window
+lib/logo/helpfiles/word
+lib/logo/helpfiles/wordp
+lib/logo/helpfiles/wrap
+lib/logo/helpfiles/writepos
+lib/logo/helpfiles/writer
+lib/logo/helpfiles/xcor
+lib/logo/helpfiles/ycor
+share/doc/logo/usermanual
+share/examples/logo/csls/algs
+share/examples/logo/csls/basic
+share/examples/logo/csls/cards
+share/examples/logo/csls/crypto
+share/examples/logo/csls/diff
+share/examples/logo/csls/doctor
+share/examples/logo/csls/format
+share/examples/logo/csls/fsm
+share/examples/logo/csls/match
+share/examples/logo/csls/math
+share/examples/logo/csls/multi
+share/examples/logo/csls/pascal
+share/examples/logo/csls/playfair
+share/examples/logo/csls/plot
+share/examples/logo/csls/poker
+share/examples/logo/csls/pour
+share/examples/logo/csls/psort
+share/examples/logo/csls/solitaire
+share/examples/logo/csls/student
+share/examples/logo/csls/tower
+share/examples/logo/csls/ttt
+@dirrm lib/logo/helpfiles
+@dirrm lib/logo/logolib
+@dirrm lib/logo
+@dirrm share/examples/logo/csls
+@dirrm share/examples/logo
+@dirrm share/doc/logo