4 files changed, 159 insertions, 51 deletions

diff --git a/lang/gcl/Makefile b/lang/gcl/Makefile
index 32507da8806d..7468c631d91d 100644
--- a/lang/gcl/Makefile
+++ b/lang/gcl/Makefile
@@ -1,16 +1,15 @@
 # New ports collection makefile for:    gcl
-# Version required:     1.1
+# Version required:     2.0
 # Date created:         Wed Feb  8 01:49:11  1995
 # Whom:                 hsu
 #
-# $Id: Makefile,v 1.2 1995/04/01 12:46:51 jkh Exp $
+# $Id$
 #
 
-DISTNAME=       gcl-1.1
+DISTNAME=       gcl-2.0
 CATEGORIES+=	languages
 MASTER_SITES=   ftp://ftp.cli.com/pub/gcl/ ftp://math.utexas.edu/pub/gcl/
 EXTRACT_SUFX=	.tgz
-
 MAKEFILE=	makefile
 
 INSTALL_COOKIE=	${WRKDIR}/.install_done
diff --git a/lang/gcl/files/patch-ab b/lang/gcl/files/patch-ab
index 974868fb7a5a..d6ce950eb7ce 100644
--- a/lang/gcl/files/patch-ab
+++ b/lang/gcl/files/patch-ab
@@ -1,48 +1,157 @@
-*** makefile.orig	Wed Feb 15 18:46:18 1995
---- makefile	Wed Feb 15 18:46:51 1995
+*** makefile.0	Mon Apr 10 03:14:48 1995
+--- makefile	Mon Apr 10 23:12:23 1995
 ***************
-*** 101,108 ****
+*** 29,44 ****
   
+  LBINDIR=/usr/local/bin
   
-  command:
-! 	rm -f xbin/gcl ; echo "#!/bin/sh" > xbin/gcl; \
-! 	echo "${GCLDIR}/unixport/saved_gcl -dir ${GCLDIR}/unixport/ \$$@ " \
-  	>> xbin/gcl
-  	chmod 755 xbin/gcl
+! OFLAG	=  -O 
+! LIBS	= -lm 
+! ODIR_DEBUG= -O4 
   
---- 101,108 ----
+  # This CC string will be used for compilation of the system,
+  # and also in the compiler::*cc* variable for later compilation of
+  # lisp files.
+  # (the -pipe is just since our file system is slow..)
+! CC = gcc -pipe -fwritable-strings  -DVOL=volatile -I$(GCLDIR)/o 
+! LDCC=${CC} -static 
   
+  # Enable the fastloading mechanism which does not use ld -A
+  # requires c/rel_.. machine dependent code.
+--- 29,44 ----
   
-  command:
-! 	rm -f xbin/gcl ; echo "#!/bin/csh" > xbin/gcl; \
-! 	echo "${GCLDIR}/unixport/saved_gcl -dir ${GCLDIR}/unixport/ \$$* " \
-  	>> xbin/gcl
-  	chmod 755 xbin/gcl
+  LBINDIR=/usr/local/bin
   
+! OFLAG	=  -O
+! LIBS	= -lm
+! ODIR_DEBUG= -O4
+  
+  # This CC string will be used for compilation of the system,
+  # and also in the compiler::*cc* variable for later compilation of
+  # lisp files.
+  # (the -pipe is just since our file system is slow..)
+! CC = gcc -pipe -fwritable-strings  -DVOL=volatile -I$(GCLDIR)/o
+! LDCC=${CC} -static
+  
+  # Enable the fastloading mechanism which does not use ld -A
+  # requires c/rel_.. machine dependent code.
+***************
+*** 46,52 ****
+  RSYM	= rsym
+  SFASL	= $(ODIR)/sfasl.o
+  
+! #  Use the mp.s file on 68k machine 
+  
+  # new gcc doesn't make a good .s file using optimisations.
+  # so either use $(MPDIR)/mpi.o   $(MPDIR)/libmport.a
+--- 46,52 ----
+  RSYM	= rsym
+  SFASL	= $(ODIR)/sfasl.o
+  
+! #  Use the mp.s file on 68k machine
+  
+  # new gcc doesn't make a good .s file using optimisations.
+  # so either use $(MPDIR)/mpi.o   $(MPDIR)/libmport.a
 ***************
-*** 118,129 ****
-  	-if [ -d ${PREFIX_DIR}/lib ] ;then true; else mkdir ${PREFIX_DIR}/lib ; fi
-  	-if [ -d ${PREFIX_DIR}/bin ] ;then true; else mkdir ${PREFIX_DIR}/bin ; fi
-  	-if [ -d ${INSTALL_LIB_DIR} ] ; then true; else mkdir ${INSTALL_LIB_DIR} ;fi 
-! 	(echo      "#!/bin/sh" > ${PREFIX_DIR}/bin/gcl; \
-  	echo ${INSTALL_LIB_DIR}/unixport/saved_gcl -dir ${INSTALL_LIB_DIR}/unixport/ -libdir ${INSTALL_LIB_DIR}/ >> \
-  	${PREFIX_DIR}/bin/gcl)
+*** 66,72 ****
+  # the  make to use for saved_kcp the profiler.
+  KCP=kcp-bsd
+  
+! # dont add the .data 
+  CAT=true
+  # end makedefs
+  
+--- 66,72 ----
+  # the  make to use for saved_kcp the profiler.
+  KCP=kcp-bsd
+  
+! # dont add the .data
+  CAT=true
+  # end makedefs
+  
+***************
+*** 132,138 ****
+  	echo '#' other options: -load "/tmp/foo.o" -load "jo.lsp" -eval '"(joe 3)"' >> ${PREFIX_DIR}/bin/gcl
   	chmod a+x ${PREFIX_DIR}/bin/gcl
-! 	tar cvf - unixport/saved_gcl doc/DOC doc/*.el ${LISP_LIB} | \
-! 	  (cd ${INSTALL_LIB_DIR} ;tar xvf -)
-  	-(cd doc ; make install)
-  
-  
---- 118,129 ----
-  	-if [ -d ${PREFIX_DIR}/lib ] ;then true; else mkdir ${PREFIX_DIR}/lib ; fi
-  	-if [ -d ${PREFIX_DIR}/bin ] ;then true; else mkdir ${PREFIX_DIR}/bin ; fi
-  	-if [ -d ${INSTALL_LIB_DIR} ] ; then true; else mkdir ${INSTALL_LIB_DIR} ;fi 
-! 	(echo      "#!/bin/csh" > ${PREFIX_DIR}/bin/gcl; \
-  	echo ${INSTALL_LIB_DIR}/unixport/saved_gcl -dir ${INSTALL_LIB_DIR}/unixport/ -libdir ${INSTALL_LIB_DIR}/ >> \
-  	${PREFIX_DIR}/bin/gcl)
+  
+! install: 
+  	make install1 "INSTALL_LIB_DIR=${PREFIX_DIR}/lib/gcl-`cat majvers`.`cat minvers`" "PREFIX_DIR=${PREFIX_DIR}"
+  INSTALL_LIB_DIR=
+  install1:
+--- 132,138 ----
+  	echo '#' other options: -load "/tmp/foo.o" -load "jo.lsp" -eval '"(joe 3)"' >> ${PREFIX_DIR}/bin/gcl
   	chmod a+x ${PREFIX_DIR}/bin/gcl
-! 	tar cvf - unixport/saved_gcl doc/DOC doc/*.el ${LISP_LIB} \
-! 	  h/cmpinclude.h | (cd ${INSTALL_LIB_DIR} ;tar xvf -)
-  	-(cd doc ; make install)
   
+! install:
+  	make install1 "INSTALL_LIB_DIR=${PREFIX_DIR}/lib/gcl-`cat majvers`.`cat minvers`" "PREFIX_DIR=${PREFIX_DIR}"
+  INSTALL_LIB_DIR=
+  install1:
+***************
+*** 142,148 ****
+  	make install-command "INSTALL_LIB_DIR=${INSTALL_LIB_DIR}" "PREFIX_DIR=${PREFIX_DIR}"
+  	rm -f ${PREFIX_DIR}/bin/gcl.exe
+  	tar cvf - unixport/saved_gcl info/*info* doc/*.el ${LISP_LIB} \
+!     	gcl-tk/gcl.tcl gcl-tk/gcltkaux  |  (cd ${INSTALL_LIB_DIR} ;tar xvf -)
+  	ln ${SYMB} ${INSTALL_LIB_DIR}/unixport/saved_gcl \
+  	 ${PREFIX_DIR}/bin/gcl.exe
+  	cat gcl-tk/gcltksrv | \
+--- 142,149 ----
+  	make install-command "INSTALL_LIB_DIR=${INSTALL_LIB_DIR}" "PREFIX_DIR=${PREFIX_DIR}"
+  	rm -f ${PREFIX_DIR}/bin/gcl.exe
+  	tar cvf - unixport/saved_gcl info/*info* doc/*.el ${LISP_LIB} \
+! 		h/cmpinclude.h gcl-tk/gcl.tcl gcl-tk/gcltkaux  | \
+! 		(cd ${INSTALL_LIB_DIR} ;tar xvf -)
+  	ln ${SYMB} ${INSTALL_LIB_DIR}/unixport/saved_gcl \
+  	 ${PREFIX_DIR}/bin/gcl.exe
+  	cat gcl-tk/gcltksrv | \
+***************
+*** 161,167 ****
+  foo:
+  		cat gcl-tk/gcltksrv | \
+  	sed -e "s:#put correct dir:DIR=${INSTALL_LIB_DIR}/gcl-tk:g"  \
+! 	-e "s:TK_LIBRARY=.*:TK_LIBRARY=${TK_LIBRARY}:g" 
+  install-elisp-files:
+  	(cd doc ; make install)
+  
+--- 162,168 ----
+  foo:
+  		cat gcl-tk/gcltksrv | \
+  	sed -e "s:#put correct dir:DIR=${INSTALL_LIB_DIR}/gcl-tk:g"  \
+! 	-e "s:TK_LIBRARY=.*:TK_LIBRARY=${TK_LIBRARY}:g"
+  install-elisp-files:
+  	(cd doc ; make install)
+  
+***************
+*** 173,179 ****
+  	(cd $(CMPDIR); make clean)
+  	(cd $(PORTDIR); make clean)
+  	(cd gcl-tk ; make clean)
+! 	
+  
+  
+  CMPINCLUDE_FILES=${HDIR}cmpincl1.h ${HDIR}compbas.h ${HDIR}enum.h ${HDIR}object.h ${HDIR}vs.h \
+--- 174,180 ----
+  	(cd $(CMPDIR); make clean)
+  	(cd $(PORTDIR); make clean)
+  	(cd gcl-tk ; make clean)
+! 
+  
+  
+  CMPINCLUDE_FILES=${HDIR}cmpincl1.h ${HDIR}compbas.h ${HDIR}enum.h ${HDIR}object.h ${HDIR}vs.h \
+***************
+*** 181,187 ****
+  	${HDIR}lex.h ${HDIR}eval.h    ${HDIR}funlink.h \
+  	${HDIR}att_ext.h ${HDIR}compbas2.h ${HDIR}/compat.h ${HDIR}/cmponly.h
+  
+! OTHERS=${HDIR}notcomp.h ${HDIR}rgbc.h ${HDIR}stacks.h 
+  
+  ${HDIR}cmpinclude.h: ${CMPINCLUDE_FILES} ${HDIR}config.h
+  	cat ${HDIR}config.h | sed -e "1,/Begin for cmpincl/d" \
+--- 182,188 ----
+  	${HDIR}lex.h ${HDIR}eval.h    ${HDIR}funlink.h \
+  	${HDIR}att_ext.h ${HDIR}compbas2.h ${HDIR}/compat.h ${HDIR}/cmponly.h
+  
+! OTHERS=${HDIR}notcomp.h ${HDIR}rgbc.h ${HDIR}stacks.h
   
+  ${HDIR}cmpinclude.h: ${CMPINCLUDE_FILES} ${HDIR}config.h
+  	cat ${HDIR}config.h | sed -e "1,/Begin for cmpincl/d" \
diff --git a/lang/gcl/files/patch-ac b/lang/gcl/files/patch-ac
index e1eb307b7028..21121b8ee72f 100644
--- a/lang/gcl/files/patch-ac
+++ b/lang/gcl/files/patch-ac
@@ -1,19 +1,19 @@
-*** lsp/makefile.0	Wed Feb 15 20:41:21 1995
---- lsp/makefile	Wed Feb 15 23:36:39 1995
+*** lsp/makefile.0	Mon Apr 10 03:14:50 1995
+--- lsp/makefile	Mon Apr 10 23:31:48 1995
 ***************
-*** 12,18 ****
+*** 15,21 ****
   
-  
-  COMPILE_FILE=$(PORTDIR)/saved_gcl $(PORTDIR) -system-p -no-o -compile
-! CFLAGS	= -c -O -I../h
+  COMPILE_FILE=$(PORTDIR)/saved_gcl $(PORTDIR) -system-p -c-file -data-file \
+  	-o-file nil -h-file -compile
+! CFLAGS	= -c -O -I../h 
   
   .lsp.c: 
   	@ ../xbin/if-exists $(PORTDIR)/saved_gcl \
---- 12,18 ----
-  
+--- 15,21 ----
   
-  COMPILE_FILE=$(PORTDIR)/saved_gcl $(PORTDIR) -system-p -no-o -compile
-! CFLAGS	= -c -I../h
+  COMPILE_FILE=$(PORTDIR)/saved_gcl $(PORTDIR) -system-p -c-file -data-file \
+  	-o-file nil -h-file -compile
+! CFLAGS	= -c -I../h 
   
   .lsp.c: 
   	@ ../xbin/if-exists $(PORTDIR)/saved_gcl \
diff --git a/lang/gcl/pkg-plist b/lang/gcl/pkg-plist
index 39fabd354d71..129acb426706 100644
--- a/lang/gcl/pkg-plist
+++ b/lang/gcl/pkg-plist
@@ -1,3 +1,3 @@
 @cwd /usr/local
 bin/gcl
-lib/gcl-1.1
+lib/gcl-2.0