6 files changed, 30 insertions, 21 deletions

diff --git a/lang/logo/Makefile b/lang/logo/Makefile
index 8fab9028921e..d3c7bbe0a984 100644
--- a/lang/logo/Makefile
+++ b/lang/logo/Makefile
@@ -6,17 +6,14 @@
 #
 
 PORTNAME=	ucblogo
-PORTVERSION=	5.4
+PORTVERSION=	5.5
 CATEGORIES=	lang
-MASTER_SITES=	ftp://ftp.cs.berkeley.edu/pub/ucblogo/
+MASTER_SITES=	http://www.cs.berkeley.edu/~bh/downloads/
+DISTNAME=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Brian Harvey's logo language interpreter
 
-BROKEN=		"5.4 fails to fetch, latest version is 5.5"
-DEPRECATED=	${BROKEN}
-EXPIRATION_DATE=	2005-12-09
-
 .if defined(EMACS_LOGO_MODE)
 BUILD_DEPENDS=	emacs:${PORTSDIR}/editors/emacs
 .endif
@@ -27,6 +24,7 @@ BUILD_DEPENDS+=	tex:${PORTSDIR}/print/teTeX \
 		ps2pdf:${PORTSDIR}/${GHOSTSCRIPT_PORT}
 .endif
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_XLIB=	yes
 MAKEFILE=	makefile
 HAS_CONFIGURE=	yes
diff --git a/lang/logo/distinfo b/lang/logo/distinfo
index 3bef7b1bb0f7..bf911d3bb079 100644
--- a/lang/logo/distinfo
+++ b/lang/logo/distinfo
@@ -1,2 +1,2 @@
-MD5 (ucblogo-5.4.tar.gz) = d0617473e165ad19d3157d9e867e2f8d
-SIZE (ucblogo-5.4.tar.gz) = 1262512
+MD5 (ucblogo.tar.gz) = caf68577630645718492fd7d10fd4927
+SIZE (ucblogo.tar.gz) = 1290273
diff --git a/lang/logo/files/patch-docs::makefile b/lang/logo/files/patch-docs-makefile
index 900704d1c0f5..f84b2048d758 100644
--- a/lang/logo/files/patch-docs::makefile
+++ b/lang/logo/files/patch-docs-makefile
@@ -1,5 +1,5 @@
---- docs/makefile.orig	Thu Feb 24 16:37:18 2005
-+++ docs/makefile	Thu Feb 24 16:37:30 2005
+--- docs/makefile.orig	Tue Nov 30 16:57:46 2004
++++ docs/makefile	Mon Oct 10 18:12:01 2005
 @@ -1,6 +1,4 @@
  BUILDIR	      = `pwd`
 -INFODIR	      = $(prefix)/info
diff --git a/lang/logo/files/patch-emacs::makefile b/lang/logo/files/patch-emacs-makefile
index f44d5cb3a06e..d66375e99664 100644
--- a/lang/logo/files/patch-emacs::makefile
+++ b/lang/logo/files/patch-emacs-makefile
@@ -1,10 +1,10 @@
---- emacs/makefile.orig	Sun Nov 28 16:09:22 2004
-+++ emacs/makefile	Sat Feb 12 14:45:12 2005
+--- emacs/makefile.orig	Sun Nov 28 22:09:22 2004
++++ emacs/makefile	Mon Oct 10 18:15:03 2005
 @@ -1,6 +1,6 @@
  BUILDIR	      = `pwd`
  EMACSDIR      = $(LIBLOC)/emacs
 -INFODIR	      = $(prefix)/info
-+INFODIR	      = $(PREFIX)/info
++INFODIR       = $(PREFIX)/info
  LOADPATH      = $(subst X,$(EMACSDIR),(setq load-path (cons "\"X\"" load-path)))
  LOGOBIN	      = $(subst X,$(BINDIR),(setq logo-binary-name \"X/logo\"))
  INFOPATH      = $(subst X,$(INFODIR),(setq logo-info-file \"X/ucblogo.info\"))
diff --git a/lang/logo/files/patch-ac b/lang/logo/files/patch-makefile.in
index e9dbd4a90229..0b5f21ab9236 100644
--- a/lang/logo/files/patch-ac
+++ b/lang/logo/files/patch-makefile.in
@@ -1,20 +1,19 @@
---- makefile.in.orig	Tue Nov 30 11:11:07 2004
-+++ makefile.in	Sat Feb 12 13:04:54 2005
-@@ -2,9 +2,10 @@
+--- makefile.in.orig	Tue Nov 30 17:11:07 2004
++++ makefile.in	Mon Oct 10 18:20:37 2005
+@@ -2,9 +2,9 @@
  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
-+
-+BINDIR        = $(PREFIX)/bin
-+LIBLOC        = $(PREFIX)/lib/logo
-+XMPDIR        = $(PREFIX)/share/examples/logo
++BINDIR = $(PREFIX)/bin
++LIBLOC = $(PREFIX)/lib/logo
++XMPDIR = $(PREFIX)/share/examples/logo
  MAKE = @MAKE@
  
  # LIBLOC      = `pwd`
-@@ -19,7 +20,7 @@
+@@ -19,7 +19,7 @@
  
  HDRS	= globals.h logo.h xgraphics.h
  
diff --git a/lang/logo/pkg-plist b/lang/logo/pkg-plist
index d770a42bd5c1..5b42ca862730 100644
--- a/lang/logo/pkg-plist
+++ b/lang/logo/pkg-plist
@@ -36,6 +36,8 @@ lib/logo/helpfiles/buryname
 lib/logo/helpfiles/butfirst
 lib/logo/helpfiles/butfirsts
 lib/logo/helpfiles/butlast
+lib/logo/helpfiles/button
+lib/logo/helpfiles/buttonp
 lib/logo/helpfiles/bye
 lib/logo/helpfiles/cascade
 lib/logo/helpfiles/case
@@ -158,6 +160,8 @@ lib/logo/helpfiles/loadpict
 lib/logo/helpfiles/local
 lib/logo/helpfiles/localmake
 lib/logo/helpfiles/log10
+lib/logo/helpfiles/logoplatform
+lib/logo/helpfiles/logoversion
 lib/logo/helpfiles/lowercase
 lib/logo/helpfiles/lput
 lib/logo/helpfiles/lshift
@@ -174,6 +178,7 @@ lib/logo/helpfiles/member
 lib/logo/helpfiles/memberp
 lib/logo/helpfiles/minus
 lib/logo/helpfiles/modulo
+lib/logo/helpfiles/mousepos
 lib/logo/helpfiles/name
 lib/logo/helpfiles/namelist
 lib/logo/helpfiles/namep
@@ -233,6 +238,7 @@ lib/logo/helpfiles/primitivep
 lib/logo/helpfiles/primitives
 lib/logo/helpfiles/print
 lib/logo/helpfiles/printdepthlimit
+lib/logo/helpfiles/printout
 lib/logo/helpfiles/printwidthlimit
 lib/logo/helpfiles/procedurep
 lib/logo/helpfiles/procedures
@@ -405,6 +411,7 @@ lib/logo/logolib/ignore
 lib/logo/logolib/invoke
 lib/logo/logolib/iseq
 lib/logo/logolib/localmake
+lib/logo/logolib/logo-logo
 lib/logo/logolib/macroexpand
 lib/logo/logolib/map
 lib/logo/logolib/map.se
@@ -443,14 +450,18 @@ lib/logo/logolib/xcor
 lib/logo/logolib/ycor
 %%EXAMPLESDIR%%/csls/algs
 %%EXAMPLESDIR%%/csls/basic
+%%EXAMPLESDIR%%/csls/buttons
 %%EXAMPLESDIR%%/csls/cards
 %%EXAMPLESDIR%%/csls/crypto
 %%EXAMPLESDIR%%/csls/diff
 %%EXAMPLESDIR%%/csls/doctor
+%%EXAMPLESDIR%%/csls/dotgame
 %%EXAMPLESDIR%%/csls/format
 %%EXAMPLESDIR%%/csls/fsm
+%%EXAMPLESDIR%%/csls/master
 %%EXAMPLESDIR%%/csls/match
 %%EXAMPLESDIR%%/csls/math
+%%EXAMPLESDIR%%/csls/mines
 %%EXAMPLESDIR%%/csls/multi
 %%EXAMPLESDIR%%/csls/pascal
 %%EXAMPLESDIR%%/csls/playfair
@@ -459,6 +470,7 @@ lib/logo/logolib/ycor
 %%EXAMPLESDIR%%/csls/pour
 %%EXAMPLESDIR%%/csls/psort
 %%EXAMPLESDIR%%/csls/solitaire
+%%EXAMPLESDIR%%/csls/streams
 %%EXAMPLESDIR%%/csls/student
 %%EXAMPLESDIR%%/csls/tower
 %%EXAMPLESDIR%%/csls/ttt