From 87ffb3b8814db6fbc7f5029431c57f53c3c643c7 Mon Sep 17 00:00:00 2001 From: Ying-Chieh Liao Date: Thu, 2 Jan 2003 17:46:48 +0000 Subject: upgrade to 5d7 PR: 45855 Submitted by: Ports Fury --- lang/scm/Makefile | 12 +++--- lang/scm/distinfo | 4 +- lang/scm/files/patch-ac | 10 ++--- lang/scm/files/patch-build.scm | 91 +++++++++++++----------------------------- lang/scm/pkg-plist | 7 +++- 5 files changed, 45 insertions(+), 79 deletions(-) (limited to 'lang/scm') diff --git a/lang/scm/Makefile b/lang/scm/Makefile index 29b033f0bc5c..6144ef6d1385 100644 --- a/lang/scm/Makefile +++ b/lang/scm/Makefile @@ -6,19 +6,18 @@ # PORTNAME= scm -PORTVERSION= 5d6 -PORTREVISION= 1 +PORTVERSION= 5d7 CATEGORIES= lang MASTER_SITES= http://swissnet.ai.mit.edu/ftpdir/scm/ -DISTFILES= scm5d6.zip slib2d4.zip slib-psd1-3.tar.gz -EXTRACT_ONLY= scm5d6.zip slib2d4.zip +DISTFILES= scm5d7.zip slib2d5.zip slib-psd1-3.tar.gz +EXTRACT_ONLY= scm5d7.zip slib2d5.zip MAINTAINER= ports@FreeBSD.org WRKSRC= ${WRKDIR}/${PORTNAME} -USE_REINPLACE= yes USE_ZIP= yes +USE_REINPLACE= yes USE_GMAKE= yes MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" ALL_TARGET= scmlit @@ -39,7 +38,8 @@ post-extract: post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKDIR}/require.scm @${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g ; \ - s|%%CFLAGS%%|${CFLAGS}|g' ${WRKSRC}/build.scm + s|%%CFLAGS%%|${CFLAGS}|g ; \ + s|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/build.scm post-build: @cd ${WRKSRC} \ diff --git a/lang/scm/distinfo b/lang/scm/distinfo index 0da0fa239c95..dba30e243d13 100644 --- a/lang/scm/distinfo +++ b/lang/scm/distinfo @@ -1,3 +1,3 @@ -MD5 (scm5d6.zip) = 0494ab4e589a58d38bac8d4453d43b75 -MD5 (slib2d4.zip) = eadfd88aab550e80944d0d3d6b5603ce +MD5 (scm5d7.zip) = 27d5c4812764e4ef99d8773e28e7cfdc +MD5 (slib2d5.zip) = 3ce65ec613fce6389e4d185afc92460e MD5 (slib-psd1-3.tar.gz) = 81f5d0b2cb4cc1bf51ad4ed3e40b6769 diff --git a/lang/scm/files/patch-ac b/lang/scm/files/patch-ac index d0abc95a15fa..b0e9aff737ef 100644 --- a/lang/scm/files/patch-ac +++ b/lang/scm/files/patch-ac @@ -1,9 +1,9 @@ ---- build.orig Mon Feb 7 06:05:12 2000 -+++ build Tue Aug 15 05:17:25 2000 +--- build.orig Tue Nov 26 04:04:53 2002 ++++ build Sat Nov 30 13:11:28 2002 @@ -1,5 +1,5 @@ - #!/bin/sh --:;exec scmlit -f $0 -e"(bi)" build $* -+:;exec $SCMLIT -f $0 -e"(bi)" build $* + #! /bin/sh +-:;exec ./scmlit -no-init-file -f $0 -e"(bi)" build $* ++:;exec $SCMLIT -no-init-file -f $0 -e"(bi)" build $* (require (in-vicinity (program-vicinity) "build.scm")) (require 'getopt) diff --git a/lang/scm/files/patch-build.scm b/lang/scm/files/patch-build.scm index daaeafa59852..83a70298e81e 100644 --- a/lang/scm/files/patch-build.scm +++ b/lang/scm/files/patch-build.scm @@ -1,78 +1,41 @@ ---- build.scm.orig Fri Jan 25 10:19:37 2002 -+++ build.scm Sun Apr 7 17:20:38 2002 -@@ -585,6 +585,7 @@ - (curses darwin "" "" #f () ()) - (regex darwin "" "" #f () ()) - -+ (c freebsd "" "" #f () ()) - (m freebsd "" "-lm" #f () ()) - (curses freebsd "" "-lncurses" "/usr/lib/libncurses.a" () ()) - (regex freebsd "" "-lgnuregex" "" () ()) -@@ -1362,7 +1363,7 @@ +--- build.scm.orig Wed Nov 27 10:44:43 2002 ++++ build.scm Sat Nov 30 13:16:28 2002 +@@ -1438,7 +1438,7 @@ (lambda (files parms) (and (batch:try-chopped-command parms -- "cc" "-O" "-c" +- "cc" "-O3 -pipe " "-c" + "%%CC%%" "%%CFLAGS%%" "-c" (c-includes parms) (c-flags parms) files) -@@ -1372,7 +1373,7 @@ - (batch:rename-file parms - oname (string-append oname "~")) - (and (batch:try-command parms -- "cc" "-o" oname -+ "%%CC%%" "-o" oname "-export-dynamic" - (must-be-first - '("-nostartfiles" - "pre-crt0.o" "crt0.o" -@@ -1381,29 +1382,31 @@ - oname))) - (defcommand compile-dll-c-files freebsd +@@ -1459,7 +1459,7 @@ (lambda (files parms) -- (and (batch:try-chopped-command -- parms -- "cc" "-O" "-fpic" "-c" -- (string-append -- "-I" (parameter-list-ref parms 'scm-srcdir)) -- (c-includes parms) -- (c-flags parms) -- files) -- (let ((objs (map c->o files))) -- (every -- (lambda (f) -- (and (batch:try-command -- parms "ld" "-Bshareable" f) -- (batch:try-command -- parms "mv" "a.out" f))) -- objs) -- objs)))) -- -+ (and -+ (batch:try-chopped-command -+ parms -+ "%%CC%%" "%%CFLAGS%%" -+ "-fPIC" "-c" (c-includes parms) -+ (c-flags parms) -+ files) -+ (let* ((results -+ (map -+ (lambda (fname) -+ (and (batch:try-command -+ parms -+ "%%CC%%" "-shared" "-o" -+ (string-append fname ".so") -+ (string-append fname ".o")) -+ (batch:delete-file -+ parms (string-append fname ".o")) -+ (string-append fname ".so"))) -+ (truncate-up-to (map c-> files) #\/)))) -+ (and (apply and? results) results))))) - (defcommand make-dll-archive freebsd + (and (batch:try-chopped-command + parms +- "cc" "-O3 -pipe " ++ "%%CC%%" "%%CFLAGS%%" + "-fPIC" "-c" (c-includes parms) + (c-flags parms) + files) +@@ -1468,10 +1468,10 @@ + (lambda (fname) + (and (batch:try-command + parms +- "cc" "-shared" ++ "%%CC%%" "-shared" + (cond + ((equal? fname "edline") "-lreadline") +- ((equal? fname "x") "-L/usr/X11R6/lib -lSM -lICE -lXext -lX11 -lxpg4") ++ ((equal? fname "x") "-L%%X11BASE%%/lib -lSM -lICE -lXext -lX11") + (else "")) + "-o" + (string-append fname ".so") +@@ -1485,7 +1485,7 @@ (lambda (oname objects libs parms) (and (batch:try-command parms -- "ld" "-Bshareable" "-o" +- "cc" "-shared" "-o" + "%%CC%%" "-shared" "-o" (string-append (car (parameter-list-ref parms 'implvic)) diff --git a/lang/scm/pkg-plist b/lang/scm/pkg-plist index 246ea28a9647..4f87b4cbf20a 100644 --- a/lang/scm/pkg-plist +++ b/lang/scm/pkg-plist @@ -46,17 +46,20 @@ lib/scm/slib/colornam.scm lib/scm/slib/colorspc.scm lib/scm/slib/comlist.scm lib/scm/slib/comparse.scm +lib/scm/slib/crc.scm lib/scm/slib/cring.scm lib/scm/slib/cvs.scm lib/scm/slib/daylight.scm lib/scm/slib/db2html.scm lib/scm/slib/dbcom.scm lib/scm/slib/dbrowse.scm +lib/scm/slib/dbsyn.scm lib/scm/slib/dbutil.scm lib/scm/slib/debug.scm lib/scm/slib/defmacex.scm lib/scm/slib/determ.scm lib/scm/slib/differ.scm +lib/scm/slib/dirs.scm lib/scm/slib/dwindtst.scm lib/scm/slib/dynamic.scm lib/scm/slib/dynwind.scm @@ -72,13 +75,13 @@ lib/scm/slib/getparam.scm lib/scm/slib/glob.scm lib/scm/slib/hash.scm lib/scm/slib/hashtab.scm +lib/scm/slib/html4each.scm lib/scm/slib/htmlform.scm lib/scm/slib/http-cgi.scm lib/scm/slib/lineio.scm lib/scm/slib/logical.scm lib/scm/slib/macrotst.scm lib/scm/slib/macwork.scm -lib/scm/slib/makcrc.scm lib/scm/slib/matfile.scm lib/scm/slib/mbe.scm lib/scm/slib/minimize.scm @@ -89,7 +92,6 @@ lib/scm/slib/mularg.scm lib/scm/slib/mwdenote.scm lib/scm/slib/mwexpand.scm lib/scm/slib/mwsynrul.scm -lib/scm/slib/nclients.scm lib/scm/slib/null.scm lib/scm/slib/obj2str.scm lib/scm/slib/object.scm @@ -154,6 +156,7 @@ lib/scm/slib/synclo.scm lib/scm/slib/synrul.scm lib/scm/slib/timezone.scm lib/scm/slib/trace.scm +lib/scm/slib/transact.scm lib/scm/slib/tree.scm lib/scm/slib/trnscrpt.scm lib/scm/slib/tsort.scm -- cgit v1.2.3