From owner-freebsd-ports Fri Jun 21 01:36:44 1996 Return-Path: owner-ports Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id BAA02139 for ports-outgoing; Fri, 21 Jun 1996 01:36:44 -0700 (PDT) Received: from seagull.rtd.com (root@seagull.rtd.com [198.102.68.2]) by freefall.freebsd.org (8.7.5/8.7.3) with ESMTP id BAA02128 for ; Fri, 21 Jun 1996 01:36:40 -0700 (PDT) Received: (from dgy@localhost) by seagull.rtd.com (8.7.5/1.2) id BAA00870 for freebsd-ports@freefall.cdrom.com; Fri, 21 Jun 1996 01:36:38 -0700 (MST) From: Don Yuniskis Message-Id: <199606210836.BAA00870@seagull.rtd.com> Subject: scm touchup... To: freebsd-ports@freefall.FreeBSD.org (FreeBSD ports) Date: Fri, 21 Jun 1996 01:36:38 -0700 (MST) X-Mailer: ELM [version 2.4 PL24] MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: owner-ports@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk Greetings! The following patches to the 2.1R port of scm add support for the "tick_*", "regex" and "curses" related primitives. The SICP hack has been *disabled* to build a strictly conforming R4RS implementation. This ensures that the entire test suite passes. It also allows the r4rs info files to serve as a thorough documentation guide for the package. (to reenable this, add ``-DSICP'' to the top level Makefile). I also install *all* of the info files distributed with the code and copies of MANUAL and QUICKREF (into the scm directory for want of a better place!). Lastly, the packing list for the package is updated to reflect these changes. Could someone please commit them? Thx, --don -------------------8<-------------------8<---------------------- # New ports collection makefile for: scm # Version required: 4e1 # Date created: Sat Nov 5 17:11:01 PST 1994 # Whom: hsu # # Makefile,v 1.8 1995/04/24 23:07:29 asami Exp # DISTNAME= scm PKGNAME= scm-4e1 CATEGORIES+= languages MASTER_SITES= ftp://swiss-ftp.ai.mit.edu/pub/scm/ DISTFILES= scm4e1.tar.gz \ slib.info.tar.gz slib2a2.tar.gz slib-psd1-3.tar.gz \ scmconfig4e1.tar.gz GNU_CONFIGURE= yes USE_GMAKE= MAKE_FLAGS= CFLAGS=-O2 LDFLAGS=-s -f pre-install: cp -rp ${WRKDIR}/slib ${PREFIX}/lib install -c -m 444 ${WRKDIR}/info/* ${PREFIX}/info (cd ${WRKDIR}/scm; \ install -c -m 444 MANUAL QUICKREF ${PREFIX}/lib/scm; \ install -c -m 444 example.scm pi.scm split.scm test.scm ${PREFIX}/lib/scm) .include -------------------8<-------------------8<---------------------- diff -r --context work/scm/Makefile.in work.new/scm/Makefile.in *** work/scm/Makefile.in Wed Mar 9 10:29:34 1994 --- work.new/scm/Makefile.in Thu Jun 20 19:35:55 1996 *************** *** 65,71 **** # almost certainly don't want this). # See also `scmconfig.h' and `scmfig.h'. defines = @DEFS@ \ ! -DFLOATS -DIO_EXTENSIONS -DMEMOIZE_LOCALS -DGC_FREE_SEGMENTS # If you are using user extension files, change INITS and FINALS # below. INITS makes up the initialization calls for user extension --- 65,72 ---- # almost certainly don't want this). # See also `scmconfig.h' and `scmfig.h'. defines = @DEFS@ \ ! -DIO_EXTENSIONS -DMEMOIZE_LOCALS -DGC_FREE_SEGMENTS -DTICKS ! FFLAGS = -DFLOATS # If you are using user extension files, change INITS and FINALS # below. INITS makes up the initialization calls for user extension *************** *** 78,87 **** # substring-move-right!, # substring-fill!, append!, last-pair # rgx.c init_rgx\(\) regcomp, regexec (POSIX) ! # crs.c init_curses\(\) lendwin\(\) ... lots ... ! INITS = -DINITS=init_sc2\(\)\; ! FINALS = -DFINALS=\; # If you are using rgx.c, set the next line to point to the include # directory where your POSIX regexp include files live (if you are using --- 79,88 ---- # substring-move-right!, # substring-fill!, append!, last-pair # rgx.c init_rgx\(\) regcomp, regexec (POSIX) ! # crs.c init_crs\(\) lendwin\(\) ... lots ... ! INITS = -DINITS=init_sc2\(\)\;init_rgx\(\)\;init_crs\(\) ! FINALS = -DFINALS=lendwin\(\)\; # If you are using rgx.c, set the next line to point to the include # directory where your POSIX regexp include files live (if you are using *************** *** 94,103 **** # -lncurses For curses on Linux (curses has bugs). # -lterm{cap,lib} May be required for curses support. # -lregex For POSIX regexp support (rgx.c). ! LOADLIBES = @LIBS@ -lm # Any extra object files your system needs. ! extras = @LIBOBJS@ # Common prefix for machine-independent installed files. prefix = /usr/local --- 95,104 ---- # -lncurses For curses on Linux (curses has bugs). # -lterm{cap,lib} May be required for curses support. # -lregex For POSIX regexp support (rgx.c). ! LOADLIBES = @LIBS@ -lm -lncurses # Any extra object files your system needs. ! extras = @LIBOBJS@ crs.o rgx.o # Common prefix for machine-independent installed files. prefix = /usr/local *************** *** 146,154 **** nunix = $(srcdir) # examples = examples examples = $(srcdir) ! ffiles = time.o repl.o fscl.o sys.o feval.o subr.o sc2.o funif.o #rgx.o ! fifiles = time.o repl.o iscm.o fscl.o sys.o feval.o subr.o sc2.o funif.o #rgx.o ! efiles = time.o repl.o escl.o sys.o eeval.o subr.o sc2.o eunif.o #rgx.o cfiles = $(srcdir)/scm.c $(srcdir)/time.c $(srcdir)/repl.c \ $(srcdir)/scl.c $(srcdir)/sys.c $(srcdir)/eval.c \ $(srcdir)/subr.c $(srcdir)/sc2.c $(srcdir)/unif.c \ --- 147,155 ---- nunix = $(srcdir) # examples = examples examples = $(srcdir) ! ffiles = time.o repl.o fscl.o sys.o feval.o subr.o sc2.o funif.o $(extras) #rgx.o ! fifiles = time.o repl.o iscm.o fscl.o sys.o feval.o subr.o sc2.o funif.o $(extras) #rgx.o ! efiles = time.o repl.o escl.o sys.o eeval.o subr.o sc2.o eunif.o $(extras) #rgx.o cfiles = $(srcdir)/scm.c $(srcdir)/time.c $(srcdir)/repl.c \ $(srcdir)/scl.c $(srcdir)/sys.c $(srcdir)/eval.c \ $(srcdir)/subr.c $(srcdir)/sc2.c $(srcdir)/unif.c \ *************** *** 200,209 **** $(CC) $(CFLAGS) -DDLD -DRTL -c $(srcdir)/dynl.c instscm: $(fifiles) ! $(CC) -o instscm $(fifiles) $(LOADLIBES) $(extras) scm: $(ffiles) fscm.o ! $(CC) -o scm $(ffiles) fscm.o $(LOADLIBES) $(extras) fscm.o: $(srcdir)/scm.c $(srcdir)/scm.h $(srcdir)/scmfig.h \ scmconfig.h $(srcdir)/patchlvl.h $(CC) $(CFLAGS) $(TDFLAG) $(defines) -c $(FFLAGS) $(INITS) \ --- 201,210 ---- $(CC) $(CFLAGS) -DDLD -DRTL -c $(srcdir)/dynl.c instscm: $(fifiles) ! $(CC) -o instscm $(fifiles) $(LOADLIBES) scm: $(ffiles) fscm.o ! $(CC) -o scm $(ffiles) fscm.o $(LOADLIBES) fscm.o: $(srcdir)/scm.c $(srcdir)/scm.h $(srcdir)/scmfig.h \ scmconfig.h $(srcdir)/patchlvl.h $(CC) $(CFLAGS) $(TDFLAG) $(defines) -c $(FFLAGS) $(INITS) \ Only in work.new/scm: config.status diff -r --context work/scm/crs.c work.new/scm/crs.c *** work/scm/crs.c Sun Mar 6 22:34:02 1994 --- work.new/scm/crs.c Thu Jun 20 15:17:58 1996 *************** *** 2,8 **** Copyright (C) 1992, 1993, 1994 Aubrey Jaffer. */ #include "scm.h" ! #include #ifdef MWC #include --- 2,8 ---- Copyright (C) 1992, 1993, 1994 Aubrey Jaffer. */ #include "scm.h" ! #include #ifdef MWC #include -------------------8<-------------------8<---------------------- *** PLIST Mon Apr 24 01:08:06 1995 --- PLIST.new Thu Jun 20 23:59:45 1996 *************** *** 3,10 **** man/man1/scm.1 lib/scm lib/slib ! info/slib.info ! info/slib.info-1 ! info/slib.info-2 ! info/slib.info-3 ! info/slib.info-4 --- 3,25 ---- man/man1/scm.1 lib/scm lib/slib ! info/jacal ! info/r4rs ! info/r4rs1 ! info/r4rs2 ! info/r4rs3 ! info/r4rs4 ! info/r4rs5 ! info/r4rs6 ! info/scm ! info/scm1 ! info/scm2 ! info/scm3 ! info/scm4 ! info/slib ! info/slib1 ! info/slib2 ! info/slib3 ! info/slib4 ! info/slib5 ! info/slib6 -------------------8<-------------------8<----------------------