6 files changed, 181 insertions, 191 deletions
diff --git a/lang/logo/Makefile b/lang/logo/Makefile
index 4302b26..bab3541 100644
--- a/lang/logo/Makefile
+++ b/lang/logo/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ucblogo
-PORTVERSION=	5.2
+PORTVERSION=	5.4
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU} \
 		ftp://ftp.cs.berkeley.edu/pub/ucblogo/
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Brian Harvey's logo language interpreter
 
 .if defined(EMACS_LOGO_MODE)
-BUILD_DEPENDS=	emacs:${PORTSDIR}/editors/emacs19
+BUILD_DEPENDS=	emacs:${PORTSDIR}/editors/emacs
 .endif
 .if defined(WITH_FULL_DOCS)
 .undef NOPORTDOCS
@@ -33,10 +33,11 @@ ALL_TARGET=	all
 
 .if defined(WITH_FULL_DOCS) || defined(EMACS_LOGO_MODE)
 USE_GMAKE=	yes
-MAKE_ENV+=	LIBLOC="${PREFIX}/lib/logo" BINDIR="${PREFIX}/bin"
+MAKE_ENV+=	LIBLOC="${PREFIX}/lib/logo" BINDIR="${PREFIX}/bin" DOCSDIR="${DOCSDIR}" INFODIR="${PREFIX}/${INFO_PATH}"
 .endif
 
 .if defined(WITH_FULL_DOCS)
+INFO=		ucblogo loops
 ALL_TARGET+=	docs
 PLIST_SUB+=	WITH_FULL_DOCS=""
 .else
@@ -69,19 +70,20 @@ pre-everything::
 
 do-install:
 .for d in lib/logo lib/logo/logolib \
-	lib/logo/helpfiles share/examples/logo/csls
+	lib/logo/helpfiles
 	${MKDIR} ${PREFIX}/$d
 .endfor
+	${MKDIR} ${EXAMPLESDIR}/csls
 	${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/
+	${INSTALL_DATA} ${WRKSRC}/csls/* ${EXAMPLESDIR}/csls/
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/usermanual ${DOCSDIR}
 .endif
 .if defined(WITH_FULL_DOCS)
-	cd ${WRKSRC}/emacs/ ;${SETENV} ${MAKE_ENV} ${GMAKE} install-docs
+	cd ${WRKSRC}/docs/ ;${SETENV} ${MAKE_ENV} ${GMAKE} install
 .endif
 .ifdef defined(EMACS_LOGO_MODE)
 	cd ${WRKSRC}/emacs; ${SETENV} ${MAKE_ENV} ${GMAKE} install-emacs
diff --git a/lang/logo/distinfo b/lang/logo/distinfo
index cfeeb9e..3bef7b1 100644
--- a/lang/logo/distinfo
+++ b/lang/logo/distinfo
@@ -1,2 +1,2 @@
-MD5 (ucblogo-5.2.tar.gz) = 53af869602ede043aaf4af31c2035d87
-SIZE (ucblogo-5.2.tar.gz) = 1180105
+MD5 (ucblogo-5.4.tar.gz) = d0617473e165ad19d3157d9e867e2f8d
+SIZE (ucblogo-5.4.tar.gz) = 1262512
diff --git a/lang/logo/files/patch-ac b/lang/logo/files/patch-ac
index cec7e1e..e9dbd4a 100644
--- a/lang/logo/files/patch-ac
+++ b/lang/logo/files/patch-ac
@@ -1,5 +1,5 @@
---- makefile.in.orig	Thu Sep 12 00:02:00 2002
-+++ makefile.in	Sat Nov  9 20:48:38 2002
+--- makefile.in.orig	Tue Nov 30 11:11:07 2004
++++ makefile.in	Sat Feb 12 13:04:54 2005
 @@ -2,9 +2,10 @@
  CFLAGS	= @CFLAGS@ @CPPFLAGS@ @X_CFLAGS@ -O0
  LDFLAGS	= @LDFLAGS@
@@ -11,15 +11,15 @@
 +BINDIR        = $(PREFIX)/bin
 +LIBLOC        = $(PREFIX)/lib/logo
 +XMPDIR        = $(PREFIX)/share/examples/logo
+ MAKE = @MAKE@
  
  # LIBLOC      = `pwd`
- 
-@@ -18,7 +22,7 @@
+@@ -19,7 +20,7 @@
  
  HDRS	= globals.h logo.h xgraphics.h
  
--all:	logo logolib helpfiles helpfiles/HELPCONTENTS logo-mode
-+all:	logo logolib helpfiles helpfiles/HELPCONTENTS
+-all:	logo logolib/Messages helpfiles helpfiles/HELPCONTENTS logo-mode make-docs
++all:	logo logolib/Messages helpfiles helpfiles/HELPCONTENTS
  
  mem.o:	mem.c
  	$(CC) $(CFLAGS) -O0 -c mem.c
diff --git a/lang/logo/files/patch-docs::makefile b/lang/logo/files/patch-docs::makefile
new file mode 100644
index 0000000..900704d
--- /dev/null
+++ b/lang/logo/files/patch-docs::makefile
@@ -0,0 +1,9 @@
+--- docs/makefile.orig	Thu Feb 24 16:37:18 2005
++++ docs/makefile	Thu Feb 24 16:37:30 2005
+@@ -1,6 +1,4 @@
+ BUILDIR	      = `pwd`
+-INFODIR	      = $(prefix)/info
+-DOCSDIR	      = $(LIBLOC)/docs
+ HTMLDIR	      = $(DOCSDIR)/html
+ 
+ all: usermanual.ps usermanual.pdf html/usermanual_1.html ucblogo.info
diff --git a/lang/logo/files/patch-emacs::makefile b/lang/logo/files/patch-emacs::makefile
index 7a7eb7f..f44d5cb 100644
--- a/lang/logo/files/patch-emacs::makefile
+++ b/lang/logo/files/patch-emacs::makefile
@@ -1,39 +1,19 @@
---- emacs/makefile.orig	Wed Jul 25 00:54:03 2001
-+++ emacs/makefile	Thu May 16 01:08:12 2002
-@@ -1,7 +1,7 @@
+--- emacs/makefile.orig	Sun Nov 28 16:09:22 2004
++++ emacs/makefile	Sat Feb 12 14:45:12 2005
+@@ -1,6 +1,6 @@
  BUILDIR	      = `pwd`
+ EMACSDIR      = $(LIBLOC)/emacs
 -INFODIR	      = $(prefix)/info
 +INFODIR	      = $(PREFIX)/info
- EMACSDIR      = $(LIBLOC)/emacs
--DOCSDIR	      = $(LIBLOC)/docs
-+DOCSDIR	      = $(PREFIX)/share/doc/logo
- HTMLDIR	      = $(DOCSDIR)/html
  LOADPATH      = $(subst X,$(EMACSDIR),(setq load-path (cons "\"X\"" load-path)))
  LOGOBIN	      = $(subst X,$(BINDIR),(setq logo-binary-name \"X/logo\"))
-@@ -63,9 +63,8 @@
+ INFOPATH      = $(subst X,$(INFODIR),(setq logo-info-file \"X/ucblogo.info\"))
+@@ -39,7 +39,7 @@
+ 	-rm -f e.*
  	-rm -f add.user install-logo-mode dot.emacs dot.loops *.elc
- 	-rm -f docs/*.{aux,cp,cps,dvi,fn,ky,log,pg,toc,tp,vr}
  
 -install: all
--	for d in $(INFODIR) $(EMACSDIR) $(DOCSDIR) $(HTMLDIR); do [ -d $$d ] || mkdir -p $$d || exit 1; done
--	cp -f info/* $(INFODIR)/.
-+install-emacs:
-+	for d in $(EMACSDIR); do [ -d $$d ] || mkdir -p $$d || exit 1; done
++install-emacs: all
+ 	for d in $(EMACSDIR); do [ -d $$d ] || mkdir -p $$d || exit 1; done
  	cp -f logo.* $(EMACSDIR)/.
  	cp -f letrec.* $(EMACSDIR)/.
- 	cp -f comint*.* $(EMACSDIR)/.
-@@ -78,10 +77,13 @@
- 	cp -p install-logo-mode $(BINDIR)/.
- 	cp -f edfunc.el $(EMACSDIR)/.
- 	cp -f check.lg $(EMACSDIR)/.
-+
-+install-docs:
-+	for d in $(INFODIR) $(DOCSDIR) $(HTMLDIR); do [ -d $$d ] || mkdir -p $$d || exit 1; done
-+	cp -f info/* $(INFODIR)/.
- 	-cp -f docs/*.info* $(INFODIR)/.
- 	-cp -f docs/*.html $(HTMLDIR)/.
- 	-cp -f docs/usermanual.ps $(DOCSDIR)/.
- 	-cp -f docs/usermanual.pdf $(DOCSDIR)/.
- 	-cp -f docs/usermanual.texi $(DOCSDIR)/.
--
- 
diff --git a/lang/logo/pkg-plist b/lang/logo/pkg-plist
index 4e84e94..d770a42 100644
--- a/lang/logo/pkg-plist
+++ b/lang/logo/pkg-plist
@@ -1,94 +1,6 @@
 bin/logo
 %%EMACS_LOGO_MODE%%bin/install-logo-mode
-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
-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/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
-%%EMACS_LOGO_MODE%%lib/logo/emacs/.LOOPS
-%%EMACS_LOGO_MODE%%lib/logo/emacs/.logo
-%%EMACS_LOGO_MODE%%lib/logo/emacs/README
-%%EMACS_LOGO_MODE%%lib/logo/emacs/check.lg
-%%EMACS_LOGO_MODE%%lib/logo/emacs/comint-logo.el
-%%EMACS_LOGO_MODE%%lib/logo/emacs/comint-logo.elc
-%%EMACS_LOGO_MODE%%lib/logo/emacs/dot.emacs
-%%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/ALL_NAMES
 lib/logo/helpfiles/HELPCONTENTS
 lib/logo/helpfiles/`
 lib/logo/helpfiles/allopen
@@ -145,6 +57,7 @@ lib/logo/helpfiles/cos
 lib/logo/helpfiles/count
 lib/logo/helpfiles/crossmap
 lib/logo/helpfiles/cs
+lib/logo/helpfiles/cslsload
 lib/logo/helpfiles/ct
 lib/logo/helpfiles/cursor
 lib/logo/helpfiles/ddefmacro
@@ -211,6 +124,7 @@ lib/logo/helpfiles/gensym
 lib/logo/helpfiles/global
 lib/logo/helpfiles/goto
 lib/logo/helpfiles/gprop
+lib/logo/helpfiles/greaterequalp
 lib/logo/helpfiles/greaterp
 lib/logo/helpfiles/heading
 lib/logo/helpfiles/help
@@ -232,6 +146,7 @@ lib/logo/helpfiles/keyp
 lib/logo/helpfiles/label
 lib/logo/helpfiles/last
 lib/logo/helpfiles/left
+lib/logo/helpfiles/lessequalp
 lib/logo/helpfiles/lessp
 lib/logo/helpfiles/list
 lib/logo/helpfiles/listp
@@ -267,6 +182,7 @@ lib/logo/helpfiles/nodes
 lib/logo/helpfiles/nodribble
 lib/logo/helpfiles/norefresh
 lib/logo/helpfiles/not
+lib/logo/helpfiles/notequalp
 lib/logo/helpfiles/numberp
 lib/logo/helpfiles/op
 lib/logo/helpfiles/openappend
@@ -314,6 +230,7 @@ lib/logo/helpfiles/ppt
 lib/logo/helpfiles/pr
 lib/logo/helpfiles/prefix
 lib/logo/helpfiles/primitivep
+lib/logo/helpfiles/primitives
 lib/logo/helpfiles/print
 lib/logo/helpfiles/printdepthlimit
 lib/logo/helpfiles/printwidthlimit
@@ -369,6 +286,7 @@ lib/logo/helpfiles/se
 lib/logo/helpfiles/sentence
 lib/logo/helpfiles/setbackground
 lib/logo/helpfiles/setbg
+lib/logo/helpfiles/setcslsloc
 lib/logo/helpfiles/setcursor
 lib/logo/helpfiles/seteditor
 lib/logo/helpfiles/seth
@@ -447,69 +365,150 @@ lib/logo/helpfiles/writepos
 lib/logo/helpfiles/writer
 lib/logo/helpfiles/xcor
 lib/logo/helpfiles/ycor
+lib/logo/logolib/#
+lib/logo/logolib/?rest
+lib/logo/logolib/Messages
+lib/logo/logolib/Messages.fr
+lib/logo/logolib/Messages.sp
+lib/logo/logolib/`
+lib/logo/logolib/buryall
+lib/logo/logolib/buryname
+lib/logo/logolib/cascade
+lib/logo/logolib/cascade.2
+lib/logo/logolib/case
+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
+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/extract
+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/havemake
+lib/logo/logolib/ignore
+lib/logo/logolib/invoke
+lib/logo/logolib/iseq
+lib/logo/logolib/localmake
+lib/logo/logolib/macroexpand
+lib/logo/logolib/map
+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
+%%EXAMPLESDIR%%/csls/algs
+%%EXAMPLESDIR%%/csls/basic
+%%EXAMPLESDIR%%/csls/cards
+%%EXAMPLESDIR%%/csls/crypto
+%%EXAMPLESDIR%%/csls/diff
+%%EXAMPLESDIR%%/csls/doctor
+%%EXAMPLESDIR%%/csls/format
+%%EXAMPLESDIR%%/csls/fsm
+%%EXAMPLESDIR%%/csls/match
+%%EXAMPLESDIR%%/csls/math
+%%EXAMPLESDIR%%/csls/multi
+%%EXAMPLESDIR%%/csls/pascal
+%%EXAMPLESDIR%%/csls/playfair
+%%EXAMPLESDIR%%/csls/plot
+%%EXAMPLESDIR%%/csls/poker
+%%EXAMPLESDIR%%/csls/pour
+%%EXAMPLESDIR%%/csls/psort
+%%EXAMPLESDIR%%/csls/solitaire
+%%EXAMPLESDIR%%/csls/student
+%%EXAMPLESDIR%%/csls/tower
+%%EXAMPLESDIR%%/csls/ttt
+share/nls/POSIX
+share/nls/en_US.US-ASCII
 %%PORTDOCS%%%%DOCSDIR%%/usermanual
-%%WITH_FULL_DOCS%%info/ucblogo.info
-%%WITH_FULL_DOCS%%info/ucblogo.info-1
-%%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
-%%WITH_FULL_DOCS%%info/loops.info-3.gz
-%%WITH_FULL_DOCS%%info/loops.info-4.gz
-%%WITH_FULL_DOCS%%info/loops.info-5.gz
-%%WITH_FULL_DOCS%%share/doc/logo/html/usermanual.html
-%%WITH_FULL_DOCS%%share/doc/logo/html/usermanual_1.html
-%%WITH_FULL_DOCS%%share/doc/logo/html/usermanual_10.html
-%%WITH_FULL_DOCS%%share/doc/logo/html/usermanual_11.html
-%%WITH_FULL_DOCS%%share/doc/logo/html/usermanual_12.html
-%%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
-%%WITH_FULL_DOCS%%share/doc/logo/html/usermanual_5.html
-%%WITH_FULL_DOCS%%share/doc/logo/html/usermanual_6.html
-%%WITH_FULL_DOCS%%share/doc/logo/html/usermanual_7.html
-%%WITH_FULL_DOCS%%share/doc/logo/html/usermanual_8.html
-%%WITH_FULL_DOCS%%share/doc/logo/html/usermanual_9.html
-%%WITH_FULL_DOCS%%share/doc/logo/html/usermanual_abt.html
-%%WITH_FULL_DOCS%%share/doc/logo/html/usermanual_fot.html
-%%WITH_FULL_DOCS%%share/doc/logo/html/usermanual_ovr.html
-%%WITH_FULL_DOCS%%share/doc/logo/html/usermanual_toc.html
-%%WITH_FULL_DOCS%%share/doc/logo/usermanual.pdf
-%%WITH_FULL_DOCS%%share/doc/logo/usermanual.ps
-%%WITH_FULL_DOCS%%share/doc/logo/usermanual.texi
-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
+%%WITH_FULL_DOCS%%share/doc/ucblogo/html/usermanual.html
+%%WITH_FULL_DOCS%%share/doc/ucblogo/html/usermanual_1.html
+%%WITH_FULL_DOCS%%share/doc/ucblogo/html/usermanual_10.html
+%%WITH_FULL_DOCS%%share/doc/ucblogo/html/usermanual_11.html
+%%WITH_FULL_DOCS%%share/doc/ucblogo/html/usermanual_12.html
+%%WITH_FULL_DOCS%%share/doc/ucblogo/html/usermanual_13.html
+%%WITH_FULL_DOCS%%share/doc/ucblogo/html/usermanual_14.html
+%%WITH_FULL_DOCS%%share/doc/ucblogo/html/usermanual_15.html
+%%WITH_FULL_DOCS%%share/doc/ucblogo/html/usermanual_16.html
+%%WITH_FULL_DOCS%%share/doc/ucblogo/html/usermanual_2.html
+%%WITH_FULL_DOCS%%share/doc/ucblogo/html/usermanual_3.html
+%%WITH_FULL_DOCS%%share/doc/ucblogo/html/usermanual_4.html
+%%WITH_FULL_DOCS%%share/doc/ucblogo/html/usermanual_5.html
+%%WITH_FULL_DOCS%%share/doc/ucblogo/html/usermanual_6.html
+%%WITH_FULL_DOCS%%share/doc/ucblogo/html/usermanual_7.html
+%%WITH_FULL_DOCS%%share/doc/ucblogo/html/usermanual_8.html
+%%WITH_FULL_DOCS%%share/doc/ucblogo/html/usermanual_9.html
+%%WITH_FULL_DOCS%%share/doc/ucblogo/html/usermanual_abt.html
+%%WITH_FULL_DOCS%%share/doc/ucblogo/html/usermanual_fot.html
+%%WITH_FULL_DOCS%%share/doc/ucblogo/html/usermanual_ovr.html
+%%WITH_FULL_DOCS%%share/doc/ucblogo/html/usermanual_toc.html
+%%WITH_FULL_DOCS%%share/doc/ucblogo/usermanual.pdf
+%%WITH_FULL_DOCS%%share/doc/ucblogo/usermanual.ps
+%%WITH_FULL_DOCS%%share/doc/ucblogo/usermanual.texi
+%%EMACS_LOGO_MODE%%lib/logo/emacs/.LOOPS
+%%EMACS_LOGO_MODE%%lib/logo/emacs/.logo
+%%EMACS_LOGO_MODE%%lib/logo/emacs/README
+%%EMACS_LOGO_MODE%%lib/logo/emacs/check.lg
+%%EMACS_LOGO_MODE%%lib/logo/emacs/comint-logo.el
+%%EMACS_LOGO_MODE%%lib/logo/emacs/comint-logo.elc
+%%EMACS_LOGO_MODE%%lib/logo/emacs/dot.emacs
+%%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
 @dirrm lib/logo/helpfiles
 @dirrm lib/logo/logolib
 %%EMACS_LOGO_MODE%%@dirrm lib/logo/emacs
 @dirrm lib/logo
-@dirrm share/examples/logo/csls
-@dirrm share/examples/logo
+@dirrm %%EXAMPLESDIR%%/csls
+@dirrm %%EXAMPLESDIR%%
 %%WITH_FULL_DOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%