mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-29 10:18:30 +00:00
Code Issues Releases Activity

Upgrade to GCL 2.6.3.

Browse Source
This commit is contained in:
Mark Murray 2004-07-19 15:52:08 +00:00
parent 18287d78eb
commit 1558c2a9c7
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=114223
17 changed files with 184 additions and 418 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lang/gcl/Makefile
View File

@ -6,8 +6,7 @@
#
PORTNAME= gcl
PORTVERSION= 2.5.3
PORTREVISION= 1
PORTVERSION= 2.6.3
CATEGORIES= lang tcl84 tk84
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= gcl
@ -20,12 +19,11 @@ LIB_DEPENDS= tk84.1:${PORTSDIR}/x11-toolkits/tk84
ONLY_FOR_ARCHS= i386 sparc64
GNU_CONFIGURE= yes
USE_AUTOCONF_VER= 213
USE_AUTOCONF_VER= 259
USE_GMAKE= yes
USE_XLIB= yes
CONFIGURE_ARGS=--prefix=${PREFIX} \
--enable-machine=FreeBSD \
--enable-ansi \
--infodir=${PREFIX}/info \
--enable-info=${PREFIX}/info \
--enable-tkconfig=${LOCALBASE}/lib/tk8.4 \
@ -46,12 +44,11 @@ PLIST_SUB= GCL_VER=${PORTVERSION}
.include <bsd.port.pre.mk>
.if ${ARCH} == "sparc64"
BROKEN= "Does not compile on sparc64"
.endif
pre-configure:
${RM} -f ${WRKSRC}/configure
${SED} -i '.PRE-SED' -e 's|@@CFLAGS@@|${CFLAGS}|' ${WRKSRC}/h/FreeBSD.defs
${SED} -i '' \
-e 's|@@CFLAGS@@|${CFLAGS} -I${LOCALBASE}/include|' \
-e 's|@@LOCALLIBS@@|-L${LOCALBASE}/lib -lm -lreadline|' \
${WRKSRC}/h/FreeBSD.defs
.include <bsd.port.post.mk>

4
lang/gcl/distinfo
View File

@ -1,2 +1,2 @@
MD5 (gcl-2.5.3.tar.gz) = 42c24f9a8d4f823c7c411cbf77edb36f
SIZE (gcl-2.5.3.tar.gz) = 9846811
MD5 (gcl-2.6.3.tar.gz) = 951a6a3ab4431ccf39c068c2201e21e2
SIZE (gcl-2.6.3.tar.gz) = 8175908

53
lang/gcl/files/patch-configure.in
View File

@ -1,52 +1,27 @@
--- ./configure.in.orig Sun Mar 2 15:23:17 2003
+++ ./configure.in Sat Sep 13 23:52:23 2003
@@ -361,8 +361,8 @@
# for subconfigurations
CFLAGS=-g
else
- TO3FLAGS="-O6 -fomit-frame-pointer"
- TO2FLAGS="-O"
+ TO3FLAGS="-fomit-frame-pointer"
+ TO2FLAGS=""
fi
AC_CHECK_PROGS(AWK,gawk nawk awk,"")
@@ -1266,30 +1266,30 @@
if test -d ${TK_CONFIG_PREFIX}/tk${TK_VERSION} ; then
TK_LIBRARY=${TK_CONFIG_PREFIX}/tk${TK_VERSION}
- else
+else
if test -d ${TK_CONFIG_PREFIX}/../tk${TK_VERSION} ; then
TK_LIBRARY=${TK_CONFIG_PREFIX}/../tk${TK_VERSION}
fi
fi
if test -d ${TK_CONFIG_PREFIX}/tcl${TCL_VERSION} ; then
TCL_LIBRARY=${TK_CONFIG_PREFIX}/tcl${TCL_VERSION}
- else
+else
if test -d ${TK_CONFIG_PREFIX}/../tcl${TCL_VERSION} ; then
TCL_LIBRARY=${TK_CONFIG_PREFIX}/../tcl${TCL_VERSION}
fi
fi
Index: configure.in
===================================================================
RCS file: /cvsroot/gcl/gcl/configure.in,v
retrieving revision 1.112.4.1.2.2.2.47.2.3.2.1
diff -u -d -b -B -r1.112.4.1.2.2.2.47.2.3.2.1 configure.in
--- configure.in 15 Jul 2004 16:27:09 -0000 1.112.4.1.2.2.2.47.2.3.2.1
+++ configure.in 19 Jul 2004 13:19:10 -0000
@@ -1637,15 +1637,15 @@
if test -f ${TK_CONFIG_PREFIX}/../include/tk.h ; then
TK_INCLUDE=-I${TK_CONFIG_PREFIX}/../include
- else
else
- if test -f /usr/include/tcl${TCL_VERSION}/tk.h ; then
- TK_INCLUDE=-I/usr/include/tcl${TCL_VERSION}
+else
+ if test -f ${TK_CONFIG_PREFIX}/../../include/tk${TK_VERSION}/tk.h ; then
+ TK_INCLUDE=-I${TK_CONFIG_PREFIX}/../../include/tk${TK_VERSION}
+ if test -f ${TK_CONFIG_PREFIX}/../../include/tk${TCL_VERSION}/tk.h ; then
+ TK_INCLUDE=-I${TK_CONFIG_PREFIX}/../../include/tk${TCL_VERSION}
fi
fi
if test -f ${TCL_CONFIG_PREFIX}/../include/tcl.h ; then
TCL_INCLUDE=-I${TCL_CONFIG_PREFIX}/../include
- else
else
- if test -f /usr/include/tcl${TCL_VERSION}/tcl.h ; then
- TCL_INCLUDE=-I/usr/include/tcl${TCL_VERSION}
+else
+ if test -f ${TCL_CONFIG_PREFIX}/../../include/tcl${TCL_VERSION}/tcl.h ; then
+ TCL_INCLUDE=-I${TCL_CONFIG_PREFIX}/../../include/tcl${TCL_VERSION}
+ if test -f ${TK_CONFIG_PREFIX}/../../include/tcl${TCL_VERSION}/tcl.h ; then
+ TCL_INCLUDE=-I${TK_CONFIG_PREFIX}/../../include/tcl${TCL_VERSION}
fi
fi
AC_CHECK_LIB(lieee,main,have_ieee=1,have_ieee=0)

41
lang/gcl/files/patch-h_FreeBSD.defs
View File

@ -1,6 +1,11 @@
--- ./h/FreeBSD.defs.orig Fri Nov 1 04:09:34 2002
+++ ./h/FreeBSD.defs Sun Sep 14 01:49:46 2003
@@ -1,26 +1,16 @@
Index: h/FreeBSD.defs
===================================================================
RCS file: /cvsroot/gcl/gcl/h/FreeBSD.defs,v
retrieving revision 1.2.6.1.4.1
diff -u -d -b -B -r1.2.6.1.4.1 FreeBSD.defs
--- h/FreeBSD.defs 15 Jul 2004 16:28:43 -0000 1.2.6.1.4.1
+++ h/FreeBSD.defs 19 Jul 2004 13:19:30 -0000
@@ -1,12 +1,16 @@
-# Machine dependent makefile definitions for intel 386,486 running 386bsd
+# Machine dependent makefile definitions for 386bsd
# Ported to FreeBSD 2.0 by Jeffrey Hsu (hsu@freebsd.org).
@ -8,26 +13,16 @@
+# Hacked September-2003 by Juergen Weiss, Mark Murray for FreeBSD-5 CURRENT
-LBINDIR=/usr/local/bin
-
-OFLAG = -pipe -O2
-CFLAGS = -fwritable-strings -fomit-frame-pointer -DVOL=volatile -I$(GCLDIR)/o -I/usr/local/lib/gcl-2.0/h -fsigned-char -I/usr/local/lib
-LIBS = -lm -L/usr/local/lib
-ODIR_DEBUG=
-NULLFILE=../h/twelve_null
+LBINDIR=${prefix}/bin
# This CC string will be used for compilation of the system,
# and also in the compiler::*cc* variable for later compilation of
# lisp files.
-
-CC = gcc
+CC = gcc @@CFLAGS@@
#OFLAG = -pipe -O2
-#CFLAGS = -fwritable-strings -fomit-frame-pointer -DVOL=volatile -I$(GCLDIR)/o -I/usr/local/lib/gcl-2.0/h -fsigned-char -I/usr/local/lib
-#LIBS = -lm -L/usr/local/lib
+#CFLAGS = @@.CFLAGS@@
+CFLAGS = @@CFLAGS@@
+CFLAGS += -fwritable-strings -fomit-frame-pointer -fsigned-char -DVOL=volatile -I$(GCLDIR)/o -I${prefix}/include
+#LIBS = @@.LOCALLIBS@@
+LIBS = @@LOCALLIBS@@
#ODIR_DEBUG=
NULLFILE=../h/twelve_null
LDCC = $(CC) -static
-
-# Use the mp.s file on 68k machine
-MPFILES= $(MPDIR)/mpi-386.o $(MPDIR)/libmport.a
-GNULIB1=/usr/lib/libgcc.a
# Enable the fastloading mechanism which does not use ld -A
# requires c/rel_.. machine dependent code.

90
lang/gcl/files/patch-h_FreeBSD.h
View File

@ -1,90 +0,0 @@
--- ./h/FreeBSD.h.orig Fri Nov 1 04:09:34 2002
+++ ./h/FreeBSD.h Sun Sep 14 01:51:55 2003
@@ -1,5 +1,5 @@
/*
- * FreeBSD.h for gcl 1.1
+ * FreeBSD.h for gcl
*
* Ported by Jeffrey Hsu (hsu@freebsd.org).
* Looked at previous versions by Hsu, Werkowsksi, Tobin, and Mogart.
@@ -8,6 +8,50 @@
#include "bsd.h"
+#ifndef __ELF__
+#error FreeBSD systems use ELF
+#endif
+
+#undef HAVE_AOUT
+#define HAVE_AOUT <elf.h>
+#define HAVE_ELF
+
+#if defined(__i386__)
+#define __ELF_NATIVE_CLASS 32
+#endif
+#if defined(__alpha__) || defined(__sparc64__) || defined(__ia64__)
+#define __ELF_NATIVE_CLASS 64
+#endif
+#define mjoin(a,b) a ## b
+#define Mjoin(a,b) mjoin(a,b)
+#if !defined(ElfW)
+#define ElfW(a) Mjoin(Elf,Mjoin(__ELF_NATIVE_CLASS,Mjoin(_,a)))
+#endif
+#define ELFW(a) Mjoin(ELF,Mjoin(__ELF_NATIVE_CLASS,Mjoin(_,a)))
+
+/* Seeking to the end of ELF data is a little messy... */
+#include <link.h>
+#define SEEK_TO_END_OFILE(fp)\
+ do { \
+ long offset = 0, endofelf; int j; \
+ ElfW(Ehdr) eheader; ElfW(Shdr) shdr; \
+ fseek(fp, 0, SEEK_SET); \
+ fread(&eheader, sizeof(eheader), 1, fp); \
+ /* in case the headers themselves come AFTER the actual sections */ \
+ endofelf=offset = eheader.e_shoff+ eheader.e_shentsize *eheader.e_shnum;\
+ fseek(fp, eheader.e_shoff, SEEK_SET); \
+ if ( eheader.e_shentsize != sizeof(ElfW(Shdr)) ) \
+ { FEerror("Bad ELF section header size",0); } \
+ for ( j = 0; j < eheader.e_shnum; j++ ) \
+ { fread(&shdr,eheader.e_shentsize,1,fp); \
+ if ( (shdr.sh_offset > offset) && (shdr.sh_type != SHT_NOBITS) ) \
+ { offset = shdr.sh_offset; endofelf = offset+shdr.sh_size; } \
+ } \
+ if ( fseek(fp, endofelf, SEEK_SET) ) \
+ FEerror("Bad ELF file",0); \
+ } while(0)
+
+
#undef LD_COMMAND
#define LD_COMMAND(command,main,start,input,ldarg,output) \
sprintf(command, "ld -dc -N -x -A %s -T %x %s %s -o %s", \
@@ -39,17 +83,9 @@
#endif
#define DATA_BEGIN (char *) N_DATADDR(header);
-#define A_TEXT_OFFSET(x) (sizeof (struct exec))
-#define A_TEXT_SEEK(hdr) (N_TXTOFF(hdr) + A_TEXT_OFFSET(hdr))
-#define start_of_data() &etext
-#define start_of_text() ((char *)(sizeof(struct exec) + getpagesize()))
-#define UNIXSAVE "unexec.c"
-#ifdef UNIXSAVE
- extern char etext;
-#endif
-
-#define RELOC_FILE "rel_sun3.c" /* for SFASL - enabled in bsd.h */
+/*#define UNEXEC_USE_MAP_PRIVATE*/
+#define UNIXSAVE "unexelf.c"
#ifdef CLOCKS_PER_SEC
#define HZ CLOCKS_PER_SEC
@@ -67,7 +103,8 @@
#define SETUP_SIG_STACK \
{ \
static struct sigaltstack estack; \
- if ((estack.ss_sp = malloc(SIGSTKSZ)) == NULL) \
+ if (estack.ss_sp == NULL && \
+ (estack.ss_sp = malloc(SIGSTKSZ)) == NULL) \
perror("malloc"); \
estack.ss_size = SIGSTKSZ; \
estack.ss_flags = 0; \

17
lang/gcl/files/patch-h_gclincl.h.in
View File

@ -1,17 +0,0 @@
--- h/gclincl.h.in.orig Wed Feb 26 15:26:41 2003
+++ h/gclincl.h.in Mon Sep 15 17:18:53 2003
@@ -119,7 +119,14 @@
#include <ieeefp.h>
#define ISNORMAL(a) (fpclass(a)>=FP_NZERO)
#else
+#define HAVE_FLOAT_H 1
+#ifdef HAVE_FLOAT_H
+#include <float.h>
+#define ISNORMAL(a) \
+ ((DBL_MIN<=(a) && (a)<=DBL_MAX) || (DBL_MIN<=(-a) && (-a)<=DBL_MAX))
+#else
#error "No isnormal found"
+#endif
#endif
#endif
#endif

16
lang/gcl/files/patch-h_linux.h Normal file
View File

@ -0,0 +1,16 @@
Index: h/linux.h
===================================================================
RCS file: /cvsroot/gcl/gcl/h/linux.h,v
retrieving revision 1.7.6.4
diff -u -d -b -B -r1.7.6.4 linux.h
--- h/linux.h 3 May 2004 21:35:58 -0000 1.7.6.4
+++ h/linux.h 19 Jul 2004 13:19:34 -0000
@@ -138,8 +138,6 @@
sprintf(command, "ld -d -S -N -x -A %s -T %x %s %s -o %s", \
main,start,input,ldarg,output)
-#define SET_SESSION_ID() (setpgrp() ? -1 : 0)
-
#define CLEANUP_CODE \
setbuf(stdin,0); \
setbuf(stdout,0);

29
lang/gcl/files/patch-h_notcomp.h Normal file
View File

@ -0,0 +1,29 @@
Index: h/notcomp.h
===================================================================
RCS file: /cvsroot/gcl/gcl/h/notcomp.h,v
retrieving revision 1.15.6.3
diff -u -d -b -B -r1.15.6.3 notcomp.h
--- h/notcomp.h 12 Feb 2004 05:23:13 -0000 1.15.6.3
+++ h/notcomp.h 19 Jul 2004 13:19:38 -0000
@@ -81,9 +81,21 @@
pack == LISP ? LISP_makefun(string,fname,argd) : \
error("Bad pack variable in MAKEFUN\n"))
+#if defined(__i386__)
+#define __ELF_NATIVE_CLASS 32
+#endif
+#if defined(__alpha__) || defined(__sparc64__) || defined(__ia64__)
+#define __ELF_NATIVE_CLASS 64
+#endif
+
#define mjoin(a_,b_) a_ ## b_
#define Mjoin(a_,b_) mjoin(a_,b_)
+#if !defined(ElfW)
+#define ElfW(a) Mjoin(Elf,Mjoin(__ELF_NATIVE_CLASS,Mjoin(_,a)))
+#endif
+#define ELFW(a) Mjoin(ELF,Mjoin(__ELF_NATIVE_CLASS,Mjoin(_,a)))
+
#define SI 0
#define LISP 1

9
lang/gcl/files/patch-info_gcl-si.texi
View File

@ -1,5 +1,10 @@
--- info/gcl-si.texi.orig Sun Sep 14 12:13:24 2003
+++ info/gcl-si.texi Sun Sep 14 12:14:28 2003
Index: info/gcl-si.texi
===================================================================
RCS file: /cvsroot/gcl/gcl/info/gcl-si.texi,v
retrieving revision 1.3
diff -u -d -b -B -r1.3 gcl-si.texi
--- info/gcl-si.texi 19 Feb 2002 19:21:19 -0000 1.3
+++ info/gcl-si.texi 19 Jul 2004 13:19:50 -0000
@@ -19,6 +19,10 @@
@setchapternewpage odd

81
lang/gcl/files/patch-info_makefile
View File

@ -1,71 +1,82 @@
--- info/makefile.orig Fri Jan 24 18:55:23 2003
+++ info/makefile Sun Sep 14 14:30:50 2003
@@ -1,19 +1,18 @@
.SUFFIXES:
.SUFFIXES: .info .dvi .texi
-INFO_DIR=/usr/local/lib/info
+INFO_DIR=${prefix}/info/
GCL_DVI=gcl-tk.dvi gcl-si.dvi gcl.dvi
GCL_HTML=gcl-si_toc.html gcl-tk_toc.html gcl_toc.html
Index: info/makefile
===================================================================
RCS file: /cvsroot/gcl/gcl/info/makefile,v
retrieving revision 1.23.6.4.2.1
diff -u -d -b -B -r1.23.6.4.2.1 makefile
--- info/makefile 25 Jun 2004 22:40:25 -0000 1.23.6.4.2.1
+++ info/makefile 19 Jul 2004 13:19:54 -0000
@@ -11,12 +11,12 @@
-include ../makedefs
-all: gcl-tk.info gcl-si.info gcl.info $(GCL_DVI) $(GCL_HTML)
+all: gcl-tk.info gcl-si.info gcl.info
-all: gcl-tk.info gcl-si.info $(GCL_DVI) $(GCL_HTML) #gcl.info
+all: gcl-tk.info gcl-si.info
.texi.info:
rm -f $*.*gz
- rm -f $*.*gz
- -$(MAKEINFO) $*.texi
- - gzip $*.info-*
+ rm -f $*gz
+ rm -f $*.info
+ -$(MAKEINFO) --no-split $*.texi
GCL_SI= number.texi sequence.texi character.texi list.texi io.texi \
form.texi compile.texi symbol.texi system.texi structure.texi \
@@ -31,19 +30,19 @@
@@ -34,19 +34,16 @@
TEXINPUTS=.:$$TEXINPUTS tex --interaction nonstopmode gcl-si.texi || true
gcl-si.info:
gcl-si.info: ${GCL_SI} gcl-si.texi
- -$(MAKEINFO) gcl-si.texi
+ -$(MAKEINFO) --no-split gcl-si.texi
gcl-tk.dvi: ${GCL_TK} gcl-tk.texi
TEXINPUTS=.:$$TEXINPUTS tex --interaction nonstopmode gcl-tk.texi || true
gcl-tk.info: ${GCL_TK} gcl-tk.texi
- -$(MAKEINFO) gcl-tk.texi
+ -$(MAKEINFO) --no-split gcl-tk.texi
gcl.dvi: ${GCL_MAN} gcl.texi
TEXINPUTS=.:$$TEXINPUTS tex --interaction nonstopmode gcl.texi || true
gcl.info: ${GCL_MAN} gcl.texi
- -$(MAKEINFO) gcl.texi
+ -$(MAKEINFO) --no-split gcl.texi
gcl-si_toc.html:
texi2html -split_chapter gcl-si.texi
@@ -58,22 +57,7 @@
#gcl-si_toc.html: ${GCL_SI} gcl-si.texi
# $(HTML_CMD) gcl-si.texi
@@ -69,15 +66,15 @@
install-html: gcl-tk_toc.html gcl-si_toc.html gcl_toc.html
cp *.html /d/www/gcl
install:
- mkdir -p $(DESTDIR)${INFO_DIR}
-install: $(GCL_DVI) $(GCL_HTML)
+install:
mkdir -p $(DESTDIR)${INFO_DIR}
- [ -f $(DESTDIR)$(INFO_DIR)dir ] || touch $(DESTDIR)$(INFO_DIR)dir
- ! grep -q gcl-si $(DESTDIR)${INFO_DIR}dir || \
- grep gcl-si $(DESTDIR)${INFO_DIR}dir >/dev/null 2>&1 || \
- echo "* GCL Doc: (gcl-si.info). GNU Common Lisp specific Documentation." >> $(DESTDIR)${INFO_DIR}dir
- ! grep -q gcl-tk $(DESTDIR)${INFO_DIR}dir || \
- grep gcl-tk $(DESTDIR)${INFO_DIR}dir >/dev/null 2>&1 || \
- echo "* GCL TK Doc: (gcl-tk.info). TK window GCL interface." >> $(DESTDIR)${INFO_DIR}dir
- ! grep -q gcl.info $(DESTDIR)${INFO_DIR}dir || \
- grep gcl.info $(DESTDIR)${INFO_DIR}dir >/dev/null 2>&1 || \
- echo "* GCL Ansi Doc: (gcl.info). Ansi Common Lisp Specification." >> $(DESTDIR)${INFO_DIR}dir
cp *.info* $(DESTDIR)${INFO_DIR}
- mkdir -p $(DESTDIR)$(INFO_DIR)../doc/gcl-doc/gcl.html
- mkdir -p $(DESTDIR)$(INFO_DIR)../doc/gcl-doc/gcl-si.html
- mkdir -p $(DESTDIR)$(INFO_DIR)../doc/gcl-doc/gcl-tk.html
- cp gcl_*html $(DESTDIR)$(INFO_DIR)../doc/gcl-doc/gcl.html
- cp gcl-si_*html $(DESTDIR)$(INFO_DIR)../doc/gcl-doc/gcl-si.html
- cp gcl-tk_*html $(DESTDIR)$(INFO_DIR)../doc/gcl-doc/gcl-tk.html
- cp *dvi $(DESTDIR)$(INFO_DIR)../doc/gcl-doc
+ [ -f $(DESTDIR)$(INFO_DIR)/dir ] || touch $(DESTDIR)$(INFO_DIR)/dir
+ grep gcl-si $(DESTDIR)${INFO_DIR}/dir >/dev/null 2>&1 || \
+ echo "* GCL Doc: (gcl-si.info). GNU Common Lisp specific Documentation." >> $(DESTDIR)${INFO_DIR}/dir
+ grep gcl-tk $(DESTDIR)${INFO_DIR}/dir >/dev/null 2>&1 || \
+ echo "* GCL TK Doc: (gcl-tk.info). TK window GCL interface." >> $(DESTDIR)${INFO_DIR}/dir
+ grep gcl.info $(DESTDIR)${INFO_DIR}/dir >/dev/null 2>&1 || \
+ echo "* GCL Ansi Doc: (gcl.info). Ansi Common Lisp Specification." >> $(DESTDIR)${INFO_DIR}/dir
-cp *.info* $(DESTDIR)${INFO_DIR}
# -mkdir -p $(DESTDIR)$(INFO_DIR)../doc/gcl-doc/gcl.html
# -mkdir -p $(DESTDIR)$(INFO_DIR)../doc/gcl-doc/gcl-si.html
@@ -88,10 +85,10 @@
# -cp gcl/* $(DESTDIR)$(INFO_DIR)../doc/gcl-doc/gcl.html
# -cp gcl-si/* $(DESTDIR)$(INFO_DIR)../doc/gcl-doc/gcl-si.html
# -cp gcl-tk/* $(DESTDIR)$(INFO_DIR)../doc/gcl-doc/gcl-tk.html
- -mkdir -p $(DESTDIR)$(INFO_DIR)../doc
+# -mkdir -p $(DESTDIR)$(INFO_DIR)../doc
# -cp -r gcl-si gcl gcl-tk $(DESTDIR)$(INFO_DIR)../doc
- -cp -r gcl-si gcl-tk $(DESTDIR)$(INFO_DIR)../doc
- -cp *dvi $(DESTDIR)$(INFO_DIR)../doc
+# -cp -r gcl-si gcl-tk $(DESTDIR)$(INFO_DIR)../doc
+# -cp *dvi $(DESTDIR)$(INFO_DIR)../doc
FILE=gcl-si.texi
srcs:

9
lang/gcl/files/patch-makedefc.in
View File

@ -1,5 +1,10 @@
--- makedefc.in.orig Sun Sep 14 12:02:18 2003
+++ makedefc.in Sun Sep 14 12:10:34 2003
Index: makedefc.in
===================================================================
RCS file: /cvsroot/gcl/gcl/makedefc.in,v
retrieving revision 1.15.6.3
diff -u -d -b -B -r1.15.6.3 makedefc.in
--- makedefc.in 10 Mar 2004 22:51:36 -0000 1.15.6.3
+++ makedefc.in 19 Jul 2004 13:19:14 -0000
@@ -16,13 +16,18 @@
prefix=@prefix@

15
lang/gcl/files/patch-makefile
View File

@ -1,6 +1,11 @@
--- makefile.orig Sun Sep 14 13:48:53 2003
+++ makefile Sun Sep 14 13:50:15 2003
@@ -162,10 +162,11 @@
Index: makefile
===================================================================
RCS file: /cvsroot/gcl/gcl/makefile,v
retrieving revision 1.73.4.2.2.21
diff -u -d -b -B -r1.73.4.2.2.21 makefile
--- makefile 26 May 2004 02:22:25 -0000 1.73.4.2.2.21
+++ makefile 19 Jul 2004 13:19:18 -0000
@@ -165,10 +165,11 @@
mkdir -p $(DESTDIR)$(prefix)/lib
mkdir -p $(DESTDIR)$(prefix)/bin
mkdir -p $(DESTDIR)$(INSTALL_LIB_DIR)
@ -11,5 +16,5 @@
- tar cf - $(PORTDIR)/$(FLISP)$(EXE) info/*.info* $(LISP_LIB) \
+ tar cf - $(PORTDIR)/$(FLISP)$(EXE) $(LISP_LIB) \
$(TCL_EXES) | (cd $(DESTDIR)$(INSTALL_LIB_DIR) ;tar xf -)
if [ -e "unixport/rsym$(EXE)" ] ; then cp unixport/rsym$(EXE) $(DESTDIR)$(INSTALL_LIB_DIR)/unixport/ ; fi
# ln $(SYMB) $(INSTALL_LIB_DIR)/$(PORTDIR)/$(FLISP)$(EXE) \
if gcc --version | grep -i mingw >/dev/null 2>&1 ; then if grep -i oncrpc makedefs >/dev/null 2>&1 ; then cp /mingw/bin/oncrpc.dll $(DESTDIR)$(INSTALL_LIB_DIR)/$(PORTDIR); fi ; fi
cd $(DESTDIR)$(INSTALL_LIB_DIR)/$(PORTDIR) && \

11
lang/gcl/files/patch-o_readline.d
View File

@ -1,11 +0,0 @@
--- ./o/readline.d.orig Sat Jul 20 08:10:56 2002
+++ ./o/readline.d Sat Sep 13 23:52:24 2003
@@ -94,7 +94,7 @@
the word to complete. We can use the entire contents of rl_line_buffer
in case we want to do some simple parsing. Return the array of matches,
or NULL if there aren't any. */
-extern char **completion_matches(char *,char *(*)(char *,int));
+/*extern char **completion_matches(char *,char *(*)(char *,int));*/
static char **rl_completion(char *text, int start, int end) {
return completion_matches(text, rl_completion_words);
}

136
lang/gcl/files/patch-o_sfaslelf.c
View File

@ -1,136 +0,0 @@
--- ./o/sfaslelf.c.orig Wed Jul 24 20:05:53 2002
+++ ./o/sfaslelf.c Sat Sep 13 23:52:25 2003
@@ -23,7 +23,7 @@
*/
-#ifndef __linux__
+#if !defined(__linux__) && !defined(__FreeBSD__)
#define ELF_TARGET_SPARC 1
#endif
@@ -83,7 +83,7 @@
if (!(symin=fopen(symfile,"r")))
{perror(symfile);exit(1);};
if(!fread((char *)&tab,sizeof(tab),1,symin))
- FEerror("No header",0,0);
+ FEerror("No header",0);
symbols=malloc(tab.tot_leng);
c_table.alloc_length=( (PTABLE_EXTRA+ tab.n_symbols));
(c_table.ptable) = (TABL *) malloc(sizeof(struct node) * c_table.alloc_length);
@@ -196,7 +196,7 @@
file = fileno(fp);
if (fstat (file, &stat_buf) == -1)
- FEerror ("Can't fstat(~a): errno %d\n", 1,faslfile);
+ FEerror ("Can't fstat(~a): errno %d\n", 2,faslfile,0);
if (use_mmap) {
@@ -303,7 +303,7 @@
relocate_symbols(symbol_table,nsyms,file_h->e_shnum,&init_address);
if (init_address < 0)
- { FEerror(0,"Init address not found ");
+ { FEerror("Init address not found ",0);
}
{
@@ -317,7 +317,7 @@
{
int index_to_relocate = shp->sh_info;
if (symtab_index != shp->sh_link)
- FEerror("unexpected symbol table used");
+ FEerror("unexpected symbol table used",0);
the_start = start_address + section[index_to_relocate].start;
}
/* else if (shp->sh_type == SHT_REL */
@@ -332,7 +332,7 @@
else if ( (shp->sh_type == SHT_REL) || (shp->sh_type == SHT_RELA) )
{ if (get_section_number(".rel.stab") == j)
continue;
- FEerror("unknown rel type");
+ FEerror("unknown rel type",0);
}
else
continue;
@@ -520,7 +520,7 @@
else if (sh_type == SHT_REL)
a = 0;
else {
- FEerror("relocate() error: unknown sh_type in ELF object");
+ FEerror("relocate() error: unknown sh_type in ELF object",0);
a=0;
}
b = (unsigned int) the_start;
@@ -540,9 +540,9 @@
/* do_bfd_reloc(ELF32_R_TYPE(reloc_info->r_info),s+a,(unsigned int *)where); */
/* #else */
switch(ELF32_R_TYPE(reloc_info->r_info)){
-#if (defined(__svr4__) || defined(__linux__)) && defined(__i386__)
+#if (defined(__svr4__) || defined(__linux__) || defined(__FreeBSD__)) && defined(__i386__)
case R_386_NONE:
- FEerror("Unsupported ELF type R_386_NONE");
+ FEerror("Unsupported ELF type R_386_NONE",0);
break;
case R_386_32:
@@ -556,40 +556,40 @@
break;
case R_386_GOT32:
- FEerror("Unsupported ELF type R_386_GOY32");
+ FEerror("Unsupported ELF type R_386_GOY32",0);
break;
case R_386_PLT32:
- FEerror("Unsupported ELF type R_386_PLT32");
+ FEerror("Unsupported ELF type R_386_PLT32",0);
break;
case R_386_COPY:
- FEerror("Unsupported ELF type R_386_COPY");
+ FEerror("Unsupported ELF type R_386_COPY",0);
break;
case R_386_GLOB_DAT:
- FEerror("Unsupported ELF type R_386_GLOB_DAT");
+ FEerror("Unsupported ELF type R_386_GLOB_DAT",0);
break;
case R_386_JMP_SLOT:
- FEerror("Unsupported ELF type R_386_JMP_SLOT");
+ FEerror("Unsupported ELF type R_386_JMP_SLOT",0);
break;
case R_386_RELATIVE:
- FEerror("Unsupported ELF type R_386_RELATIVE");
+ FEerror("Unsupported ELF type R_386_RELATIVE",0);
break;
case R_386_GOTOFF:
- FEerror("Unsupported ELF type R_386_GOTOFF");
+ FEerror("Unsupported ELF type R_386_GOTOFF",0);
break;
case R_386_GOTPC:
- FEerror("Unsupported ELF type R_386_GOTPC");
+ FEerror("Unsupported ELF type R_386_GOTPC",0);
break;
#ifdef R_386_NUM
case R_386_NUM:
- FEerror("Unsupported ELF type R_386_NUM");
+ FEerror("Unsupported ELF type R_386_NUM",0);
break;
#endif
@@ -657,7 +657,7 @@
fflush(stdout);
}
}
- else{FEerror("symbol table not loaded",0,0);}
+ else{FEerror("symbol table not loaded",0);}
}
static void

11
lang/gcl/files/patch-o_unixfasl.c
View File

@ -1,11 +0,0 @@
--- ./o/unixfasl.c.orig Sat Feb 15 00:38:28 2003
+++ ./o/unixfasl.c Sat Sep 13 23:52:25 2003
@@ -282,7 +282,7 @@
static int
faslink(object faslfile, object ldargstring)
{
-#if defined(__linux__) && defined(__ELF__)
+#if (defined(__linux__) || defined(__FreeBSD__)) && defined(__ELF__)
FEerror("faslink() not supported for ELF yet",0);
return 0;
#else

20
lang/gcl/files/patch-unixport_rsym_elf.c
View File

@ -1,20 +0,0 @@
--- ./unixport/rsym_elf.c.orig Thu Jul 25 22:49:47 2002
+++ ./unixport/rsym_elf.c Sat Sep 13 23:52:25 2003
@@ -34,9 +34,6 @@
int text_index,data_index,bss_index,sbss_index;
#undef SYM_NAME
#undef EXT_and_TEXT_BSS_DAT
-#define mjoin(a,b) a ## b
-#define Mjoin(a,b) mjoin(a,b)
-#define ELFW(a) Mjoin(ELF,Mjoin(__ELF_NATIVE_CLASS,Mjoin(_,a)))
int nsyms;
char *my_string_table;
@@ -136,7 +133,6 @@
unsigned int i;
FILE *fp;
int symsize;
- extern char *malloc();
fp = fopen(filename, RDONLY);

45
lang/gcl/pkg-plist
View File

@ -1,8 +1,11 @@
bin/gcl
lib/gcl-%%GCL_VER%%/cmpnew/cmpmain.lsp
lib/gcl-%%GCL_VER%%/cmpnew/cmpopt.lsp
lib/gcl-%%GCL_VER%%/cmpnew/collectfn.o
lib/gcl-%%GCL_VER%%/cmpnew/lfun_list.lsp
lib/gcl-%%GCL_VER%%/clcs/sys-proclaim.lisp
lib/gcl-%%GCL_VER%%/cmpnew/gcl_cmpmain.lsp
lib/gcl-%%GCL_VER%%/cmpnew/gcl_cmpopt.lsp
lib/gcl-%%GCL_VER%%/cmpnew/gcl_collectfn.lsp
lib/gcl-%%GCL_VER%%/cmpnew/gcl_collectfn.o
lib/gcl-%%GCL_VER%%/cmpnew/gcl_lfun_list.lsp
lib/gcl-%%GCL_VER%%/cmpnew/sys-proclaim.lisp
lib/gcl-%%GCL_VER%%/gcl-tk/decode.tcl
lib/gcl-%%GCL_VER%%/gcl-tk/demos/gc-monitor.lisp
lib/gcl-%%GCL_VER%%/gcl-tk/demos/gc-monitor.o
@ -34,24 +37,34 @@ lib/gcl-%%GCL_VER%%/gcl-tk/tinfo.o
lib/gcl-%%GCL_VER%%/gcl-tk/tk-package.lsp
lib/gcl-%%GCL_VER%%/gcl-tk/tkl.o
lib/gcl-%%GCL_VER%%/h/cmpinclude.h
lib/gcl-%%GCL_VER%%/lsp/auto_new.lsp
lib/gcl-%%GCL_VER%%/lsp/autoload.lsp
lib/gcl-%%GCL_VER%%/lsp/export.lsp
lib/gcl-%%GCL_VER%%/lsp/gprof.lsp
lib/gcl-%%GCL_VER%%/lsp/info.o
lib/gcl-%%GCL_VER%%/lsp/profile.lsp
lib/gcl-%%GCL_VER%%/lsp/readline.o
lib/gcl-%%GCL_VER%%/unixport/init_ansi_gcl.lsp
lib/gcl-%%GCL_VER%%/unixport/libansi_gcl.a
lib/gcl-%%GCL_VER%%/lsp/gcl_auto_new.lsp
lib/gcl-%%GCL_VER%%/lsp/gcl_autoload.lsp
lib/gcl-%%GCL_VER%%/lsp/gcl_export.lsp
lib/gcl-%%GCL_VER%%/lsp/gcl_gprof.lsp
lib/gcl-%%GCL_VER%%/lsp/gcl_info.o
lib/gcl-%%GCL_VER%%/lsp/gcl_profile.lsp
lib/gcl-%%GCL_VER%%/lsp/sys-proclaim.lisp
lib/gcl-%%GCL_VER%%/pcl/sys-proclaim.lisp
lib/gcl-%%GCL_VER%%/unixport/init_gcl.lsp
lib/gcl-%%GCL_VER%%/unixport/libgcl.a
lib/gcl-%%GCL_VER%%/unixport/libgclp.a
lib/gcl-%%GCL_VER%%/unixport/rsym
lib/gcl-%%GCL_VER%%/unixport/saved_ansi_gcl
lib/gcl-%%GCL_VER%%/unixport/saved_gcl
share/emacs/site-lisp/add-default.el
share/emacs/site-lisp/ansi-doc.el
share/emacs/site-lisp/dbl.el
share/emacs/site-lisp/default.el
share/emacs/site-lisp/doc-to-texi.el
share/emacs/site-lisp/gcl.el
share/emacs/site-lisp/man1-to-texi.el
share/emacs/site-lisp/smart-complete.el
share/emacs/site-lisp/sshell.el
@dirrm lib/gcl-%%GCL_VER%%/clcs
@dirrm lib/gcl-%%GCL_VER%%/cmpnew
@dirrm lib/gcl-%%GCL_VER%%/gcl-tk/demos
@dirrm lib/gcl-%%GCL_VER%%/gcl-tk
@dirrm lib/gcl-%%GCL_VER%%/h
@dirrm lib/gcl-%%GCL_VER%%/lsp
@dirrm lib/gcl-%%GCL_VER%%/pcl
@dirrm lib/gcl-%%GCL_VER%%/unixport
@dirrm lib/gcl-%%GCL_VER%%
share/nls/POSIX
share/nls/en_US.US-ASCII