Update to 5.1

PR:		38127
Submitted by:	obraun@informatik.unibw-muenchen.de

3 files changed, 77 insertions, 19 deletions

diff --git a/lang/logo/files/patch-ac b/lang/logo/files/patch-ac
index a5be800..77af680 100644
--- a/lang/logo/files/patch-ac
+++ b/lang/logo/files/patch-ac
@@ -1,5 +1,5 @@
-*** makefile.in.orig	Tue Jan  6 20:35:51 1998
---- makefile.in	Mon Jun 21 15:43:33 1999
+*** 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
@@ -26,16 +26,37 @@
   # LIBLOC      = `pwd`
   
 ***************
-*** 56,62 ****
-  	rm makefile makehelp logo *.o libloc.c
+*** 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 logolib/* $(LIBLOC)/logolib/.
-! 	cp helpfiles/* $(LIBLOC)/helpfiles/.
---- 60,70 ----
-  	rm makefile makehelp logo *.o libloc.c
+! 	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
@@ -46,3 +67,12 @@
 ! .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
diff --git a/lang/logo/files/patch-ad b/lang/logo/files/patch-ad
deleted file mode 100644
index 059185d..0000000
--- a/lang/logo/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- init.c.orig	Sun Aug  6 21:20:35 2000
-+++ init.c	Sun Aug  6 21:20:50 2000
-@@ -363,7 +363,7 @@
- }
- 
- void init(void) {
--    extern long time();
-+    extern time_t time();
-     int i = 0;
-     NODE *proc = NIL, *pname = NIL, *cnd = NIL;
- 
diff --git a/lang/logo/files/patch-emacs::makefile b/lang/logo/files/patch-emacs::makefile
new file mode 100644
index 0000000..7a7eb7f
--- /dev/null
+++ b/lang/logo/files/patch-emacs::makefile
@@ -0,0 +1,39 @@
+--- emacs/makefile.orig	Wed Jul 25 00:54:03 2001
++++ emacs/makefile	Thu May 16 01:08:12 2002
+@@ -1,7 +1,7 @@
+ BUILDIR	      = `pwd`
+-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 @@
+ 	-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
+ 	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)/.
+-
+