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>

1 files changed, 42 insertions, 28 deletions

diff --git a/lang/logo/files/patch-ac b/lang/logo/files/patch-ac
index 7aa9b92..a5be800 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