Update to 5.2 to work around a wrong WRKSRC usage submitted in:

PR:		45164
Submitted by:	Volker Stolz <vs@foldr.org>

4 files changed, 71 insertions, 84 deletions

diff --git a/lang/logo/Makefile b/lang/logo/Makefile
index d840a3e3d548..22729c75be33 100644
--- a/lang/logo/Makefile
+++ b/lang/logo/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	ucblogo
-PORTVERSION=	5.1
+PORTVERSION=	5.2
 CATEGORIES=	lang
 MASTER_SITES= 	${MASTER_SITE_GNU} \
 		ftp://ftp.cs.berkeley.edu/pub/ucblogo/
 MASTER_SITE_SUBDIR=non-gnu/ucblogo
 
-WRKSRC=		${WRKDIR}/ucblogo
+MAINTAINER=	ports@FreeBSD.org
 
 .if defined(EMACS_LOGO_MODE)
 BUILD_DEPENDS=  emacs:${PORTSDIR}/editors/emacs
@@ -23,14 +23,17 @@ BUILD_DEPENDS+= tex:${PORTSDIR}/print/teTeX \
 		ps2pdf:${PORTSDIR}/print/ghostscript-gnu
 .endif
 
-MAINTAINER=	ports@FreeBSD.org
-
 USE_XLIB=	yes
 MAKEFILE=	makefile
 HAS_CONFIGURE=	yes
 
 ALL_TARGET=	all
 
+.if defined(WITH_FULL_DOCS) || defined(EMACS_LOGO_MODE)
+USE_GMAKE=	yes
+MAKE_ENV+=	LIBLOC="${PREFIX}/lib/logo" BINDIR="${PREFIX}/bin"
+.endif
+
 .if defined(WITH_FULL_DOCS)
 ALL_TARGET+=	docs
 PLIST_SUB+=	WITH_FULL_DOCS=""
@@ -58,4 +61,22 @@ pre-fetch:
 	@${ECHO} ""
 .endif
 
+do-install:
+.for d in lib/logo lib/logo/logolib \
+	lib/logo/helpfiles share/examples/logo/csls share/doc/logo
+	${MKDIR} ${PREFIX}/$d
+.endfor
+	${INSTALL_PROGRAM} ${WRKSRC}/logo ${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/logolib/* ${PREFIX}/lib/logo/logolib/
+	${INSTALL_DATA} ${WRKSRC}/helpfiles/* ${PREFIX}/lib/logo/helpfiles/
+	${INSTALL_DATA} ${WRKSRC}/csls/* ${PREFIX}/share/examples/logo/csls/
+.if !defined(NOPORTSDOCS)
+	${INSTALL_DATA} ${WRKSRC}/usermanual $(PREFIX)/share/doc/logo
+.endif
+.if defined(WITH_FULL_DOCS)
+	cd ${WRKSRC}/emacs/ ;${SETENV} ${MAKE_ENV} ${GMAKE} install-docs
+.endif
+.ifdef defined(EMACS_LOGO_MODE)
+	cd ${WRKSRC}/emacs; ${SETENV} ${MAKE_ENV} ${GMAKE} install-emacs
+.endif
 .include <bsd.port.mk>
diff --git a/lang/logo/distinfo b/lang/logo/distinfo
index e7c675dc3c45..ba22ccf8a59b 100644
--- a/lang/logo/distinfo
+++ b/lang/logo/distinfo
@@ -1,2 +1 @@
-MD5 (ucblogo-5.1.tar.gz) = 374b78cc020530c9b8bb7d9190f69597
-MD5 (ucblogo-5.1.tar.gz) = 599e527a2746cabdd556daad7429a69b
+MD5 (ucblogo-5.2.tar.gz) = 53af869602ede043aaf4af31c2035d87
diff --git a/lang/logo/files/patch-ac b/lang/logo/files/patch-ac
index 77af680c66dc..cec7e1e5fe21 100644
--- a/lang/logo/files/patch-ac
+++ b/lang/logo/files/patch-ac
@@ -1,78 +1,25 @@
-*** makefile.in.orig	Wed Jul 25 19:29:35 2001
---- makefile.in	Thu May 16 00:56:26 2002
-***************
-*** 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
-  
-  # 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`
-  
-***************
-*** 18,24 ****
-  
-  HDRS	= globals.h logo.h xgraphics.h
-  
-! all:	logo logolib helpfiles helpfiles/HELPCONTENTS logo-mode
-  
-  mem.o:	mem.c
-  	$(CC) $(CFLAGS) -O0 -c mem.c
---- 22,28 ----
-  
-  HDRS	= globals.h logo.h xgraphics.h
-  
-! all:	logo logolib helpfiles helpfiles/HELPCONTENTS
-  
-  mem.o:	mem.c
-  	$(CC) $(CFLAGS) -O0 -c mem.c
-***************
-*** 62,72 ****
-  	cd emacs; gmake ship
-  
-  install: all
-! 	for d in $(BINDIR) $(LIBLOC) $(LIBLOC)/logolib $(LIBLOC)/helpfiles; do [ -d $$d ] || mkdir -p $$d || exit 1; done
-! 	cp logo $(BINDIR)/.
-! 	cp -f logolib/* $(LIBLOC)/logolib/.
-! 	cp -f helpfiles/* $(LIBLOC)/helpfiles/.
-! 	export prefix=$(prefix); export LIBLOC=$(LIBLOC); export BINDIR=$(BINDIR); cd emacs; gmake install
-  
-  logo-mode: 
-  	@export prefix=$(prefix); export LIBLOC=$(LIBLOC); export BINDIR=$(BINDIR); cd emacs; gmake
---- 66,85 ----
-  	cd emacs; gmake ship
-  
-  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
-! .ifdef WITH_FULL_DOCS
-! 	@export prefix=$(prefix); export LIBLOC=$(LIBLOC); export BINDIR=$(BINDIR); cd emacs; gmake install-docs
-! .endif
-! .ifdef EMACS_LOGO_MODE
-! 	export prefix=$(prefix); export LIBLOC=$(LIBLOC); export BINDIR=$(BINDIR); cd emacs; gmake install-emacs
-! .endif
-  
-  logo-mode: 
-  	@export prefix=$(prefix); export LIBLOC=$(LIBLOC); export BINDIR=$(BINDIR); cd emacs; gmake
+--- makefile.in.orig	Thu Sep 12 00:02:00 2002
++++ makefile.in	Sat Nov  9 20:48:38 2002
+@@ -2,9 +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
++
++BINDIR        = $(PREFIX)/bin
++LIBLOC        = $(PREFIX)/lib/logo
++XMPDIR        = $(PREFIX)/share/examples/logo
+ 
+ # LIBLOC      = `pwd`
+ 
+@@ -18,7 +22,7 @@
+ 
+ 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
diff --git a/lang/logo/pkg-plist b/lang/logo/pkg-plist
index 7265d29a013d..2e1612426a48 100644
--- a/lang/logo/pkg-plist
+++ b/lang/logo/pkg-plist
@@ -4,12 +4,16 @@ lib/logo/logolib/#
 lib/logo/logolib/`
 lib/logo/logolib/?rest
 lib/logo/logolib/Messages
+lib/logo/logolib/Messages.fr
+lib/logo/logolib/Messages.sp
 lib/logo/logolib/buryall
 lib/logo/logolib/buryname
+lib/logo/logolib/case
 lib/logo/logolib/cascade
 lib/logo/logolib/cascade.2
 lib/logo/logolib/closeall
 lib/logo/logolib/combine
+lib/logo/logolib/cond
 lib/logo/logolib/crossmap
 lib/logo/logolib/dequeue
 lib/logo/logolib/do.until
@@ -80,7 +84,9 @@ lib/logo/logolib/ycor
 %%EMACS_LOGO_MODE%%lib/logo/emacs/dot.loops
 %%EMACS_LOGO_MODE%%lib/logo/emacs/edfunc.el
 %%EMACS_LOGO_MODE%%lib/logo/emacs/letrec.el
+%%EMACS_LOGO_MODE%%lib/logo/emacs/letrec.elc
 %%EMACS_LOGO_MODE%%lib/logo/emacs/logo.el
+%%EMACS_LOGO_MODE%%lib/logo/emacs/logo.elc
 %%EMACS_LOGO_MODE%%lib/logo/emacs/tutor1.lg
 %%EMACS_LOGO_MODE%%lib/logo/emacs/tutorial.lg
 lib/logo/helpfiles/HELPCONTENTS
@@ -91,6 +97,7 @@ lib/logo/helpfiles/and
 lib/logo/helpfiles/apply
 lib/logo/helpfiles/arc
 lib/logo/helpfiles/arctan
+lib/logo/helpfiles/arity
 lib/logo/helpfiles/array
 lib/logo/helpfiles/arrayp
 lib/logo/helpfiles/arraytolist
@@ -119,6 +126,7 @@ lib/logo/helpfiles/butfirsts
 lib/logo/helpfiles/butlast
 lib/logo/helpfiles/bye
 lib/logo/helpfiles/cascade
+lib/logo/helpfiles/case
 lib/logo/helpfiles/caseignoredp
 lib/logo/helpfiles/catch
 lib/logo/helpfiles/char
@@ -129,6 +137,7 @@ lib/logo/helpfiles/close
 lib/logo/helpfiles/closeall
 lib/logo/helpfiles/co
 lib/logo/helpfiles/combine
+lib/logo/helpfiles/cond
 lib/logo/helpfiles/contents
 lib/logo/helpfiles/continue
 lib/logo/helpfiles/copydef
@@ -152,6 +161,7 @@ lib/logo/helpfiles/dribble
 lib/logo/helpfiles/dsetbf
 lib/logo/helpfiles/dsetfirst
 lib/logo/helpfiles/dsetitem
+lib/logo/helpfiles/dsetsegmentsize
 lib/logo/helpfiles/ed
 lib/logo/helpfiles/edall
 lib/logo/helpfiles/edit
@@ -198,6 +208,7 @@ lib/logo/helpfiles/fullscreen
 lib/logo/helpfiles/fulltext
 lib/logo/helpfiles/gc
 lib/logo/helpfiles/gensym
+lib/logo/helpfiles/global
 lib/logo/helpfiles/goto
 lib/logo/helpfiles/gprop
 lib/logo/helpfiles/greaterp
@@ -352,15 +363,19 @@ lib/logo/helpfiles/rw
 lib/logo/helpfiles/save
 lib/logo/helpfiles/savel
 lib/logo/helpfiles/savepict
+lib/logo/helpfiles/screenmode
 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/seteditor
 lib/logo/helpfiles/seth
 lib/logo/helpfiles/setheading
+lib/logo/helpfiles/sethelploc
 lib/logo/helpfiles/setitem
+lib/logo/helpfiles/setlibloc
 lib/logo/helpfiles/setmargins
 lib/logo/helpfiles/setpalette
 lib/logo/helpfiles/setpc
@@ -374,6 +389,7 @@ lib/logo/helpfiles/setread
 lib/logo/helpfiles/setreadpos
 lib/logo/helpfiles/setscrunch
 lib/logo/helpfiles/settc
+lib/logo/helpfiles/settemploc
 lib/logo/helpfiles/settextcolor
 lib/logo/helpfiles/setwrite
 lib/logo/helpfiles/setwritepos
@@ -410,6 +426,7 @@ lib/logo/helpfiles/traced
 lib/logo/helpfiles/tracedp
 lib/logo/helpfiles/transfer
 lib/logo/helpfiles/ts
+lib/logo/helpfiles/turtlemode
 lib/logo/helpfiles/type
 lib/logo/helpfiles/unbury
 lib/logo/helpfiles/unburyall
@@ -419,6 +436,7 @@ lib/logo/helpfiles/unstep
 lib/logo/helpfiles/until
 lib/logo/helpfiles/untrace
 lib/logo/helpfiles/uppercase
+lib/logo/helpfiles/usealternatenames
 lib/logo/helpfiles/wait
 lib/logo/helpfiles/while
 lib/logo/helpfiles/window
@@ -435,6 +453,7 @@ lib/logo/helpfiles/ycor
 %%WITH_FULL_DOCS%%info/ucblogo.info-2
 %%WITH_FULL_DOCS%%info/ucblogo.info-3
 %%WITH_FULL_DOCS%%info/ucblogo.info-4
+%%WITH_FULL_DOCS%%info/ucblogo.info-5
 %%WITH_FULL_DOCS%%info/loops.info.gz
 %%WITH_FULL_DOCS%%info/loops.info-1.gz
 %%WITH_FULL_DOCS%%info/loops.info-2.gz
@@ -449,6 +468,7 @@ lib/logo/helpfiles/ycor
 %%WITH_FULL_DOCS%%share/doc/logo/html/usermanual_13.html
 %%WITH_FULL_DOCS%%share/doc/logo/html/usermanual_14.html
 %%WITH_FULL_DOCS%%share/doc/logo/html/usermanual_15.html
+%%WITH_FULL_DOCS%%share/doc/logo/html/usermanual_16.html
 %%WITH_FULL_DOCS%%share/doc/logo/html/usermanual_2.html
 %%WITH_FULL_DOCS%%share/doc/logo/html/usermanual_3.html
 %%WITH_FULL_DOCS%%share/doc/logo/html/usermanual_4.html