From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Aug 7 18:10:03 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2E828106566B for ; Fri, 7 Aug 2009 18:10:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 0D2838FC36 for ; Fri, 7 Aug 2009 18:10:03 +0000 (UTC) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n77IA23Q047496 for ; Fri, 7 Aug 2009 18:10:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n77IA2Ku047495; Fri, 7 Aug 2009 18:10:02 GMT (envelope-from gnats) Resent-Date: Fri, 7 Aug 2009 18:10:02 GMT Resent-Message-Id: <200908071810.n77IA2Ku047495@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DA956106571A for ; Fri, 7 Aug 2009 18:01:17 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from msa105lp.auone-net.jp (msa105lp.auone-net.jp [222.3.140.168]) by mx1.freebsd.org (Postfix) with ESMTP id 7E9928FC26 for ; Fri, 7 Aug 2009 18:01:17 +0000 (UTC) Received: from localhost.localdomain (ZT048219.ppp.dion.ne.jp [59.128.48.219]) by msa105lp.auone-net.jp (au one net msa) with ESMTP id D3E5D50031 for ; Sat, 8 Aug 2009 03:01:11 +0900 (JST) Message-Id: <20090808030020.102e4c1a.tkato432@yahoo.com> Date: Sat, 8 Aug 2009 03:00:20 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/137530: Update port: lang/scm to 5e6 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Aug 2009 18:10:03 -0000 >Number: 137530 >Category: ports >Synopsis: Update port: lang/scm to 5e6 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Aug 07 18:10:02 UTC 2009 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 7.2-RELEASE-p2 i386 >Organization: >Environment: >Description: - Update to version 5e6 >How-To-Repeat: >Fix: diff -urN /usr/ports/lang/scm/Makefile lang/scm/Makefile --- /usr/ports/lang/scm/Makefile 2008-04-20 10:16:33.000000000 +0900 +++ lang/scm/Makefile 2009-08-07 02:04:39.000000000 +0900 @@ -6,13 +6,13 @@ # PORTNAME= scm -PORTVERSION= 5e5 +PORTVERSION= 5e6 CATEGORIES= lang scheme -MASTER_SITES= http://swiss.csail.mit.edu/ftpdir/scm/%SUBDIR%/ \ +MASTER_SITES= http://groups.csail.mit.edu/mac/ftpdir/scm/%SUBDIR%/ \ ftp://ftp.informatik.uni-hamburg.de/ftpmnt/inf1/pub/soft/lang/scheme/ MASTER_SITE_SUBDIR= . OLD -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} slib-3b1.zip slib-psd1-3.tar.gz -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} slib-3b1.zip +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} slib-3b2.zip slib-psd1-3.tar.gz +EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} slib-3b2.zip MAINTAINER= ports@FreeBSD.org COMMENT= A scheme interpreter @@ -21,8 +21,9 @@ USE_ZIP= yes USE_GMAKE= yes -MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" -ALL_TARGET= scmlit +MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" IMPLPATH="${PREFIX}/lib/scm/" \ + SCMLIT="./scmlit" +ALL_TARGET= scmlit scm5 mydlls MAN1= scm.1 INFO= scm @@ -30,11 +31,15 @@ SUB_FILES= require.scm -SCM_DATA= COPYING Iedline.scm Init${PORTVERSION}.scm Link.scm \ - Macexp.scm Macro.scm Transcen.scm Tscript.scm mkimpcat.scm \ - r4rstest.scm -SCM_MODULES= byte.so crs.so edline.so gsubr.so ioext.so posix.so ramap.so \ - record.so rgx.so sc2.so socket.so unix.so +SCM_DATA= COPYING COPYING.LESSER Iedline.scm Idiffer.scm \ + Init${PORTVERSION}.scm Link.scm Macexp.scm Macro.scm \ + Transcen.scm Tscript.scm build build.scm compile.scm \ + hobbit.scm keysymdef.scm mkimpcat.scm patchlvl.h \ + r4rstest.scm rwb-isam.scm scmhob.h scmhob.scm wbtab.scm \ + x11.scm xatoms.scm xevent.scm +SCM_MODULES= byte.so bytenumb.so crs.so differ.so edline.so gsubr.so \ + ioext.so posix.so ramap.so record.so rgx.so sc2.so \ + socket.so unix.so .include @@ -42,6 +47,14 @@ BROKEN= Does not compile on ${ARCH} .endif +.if defined(WITH_X11) +USE_XORG= ice sm x11 xext +SCM_MODULES+= x.so +PLIST_SUB+= X11="" +.else +PLIST_SUB+= X11="@comment " +.endif + post-extract: @${TAR} -C ${WRKDIR} -zxf ${DISTDIR}/slib-psd1-3.tar.gz @@ -50,68 +63,21 @@ @${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g ; \ s|%%CFLAGS%%|${CFLAGS}|g ; \ s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/build.scm + @${REINPLACE_CMD} -e 's|gnuregex\.h|gnu/regex.h|g' ${WRKSRC}/rgx.c post-build: @cd ${WRKSRC} \ && SCMLIT="./scmlit" ${SH} ./build \ - -F arrays \ - -F bignums \ - -F cautious \ - -F engineering-notation \ - -F inexact \ - -F macro \ - -F dynamic-linking \ - -h system \ - -o scm \ - -s "${PREFIX}/lib/scm/" \ - && SCMLIT="./scmlit" ${SH} ./build \ - -F edit-line \ - -h system \ - -t dll \ - && SCMLIT="./scmlit" ${SH} ./build \ - -F curses \ - -h system \ - -t dll \ - && SCMLIT="./scmlit" ${SH} ./build \ - -c sc2.c \ - -h system \ - -t dll \ - && SCMLIT="./scmlit" ${SH} ./build \ - -c rgx.c \ - -h system \ - -t dll \ - && SCMLIT="./scmlit" ${SH} ./build \ - -c record.c \ - -h system \ - -t dll \ - && SCMLIT="./scmlit" ${SH} ./build \ - -c gsubr.c \ + -c differ.c \ -h system \ - -t dll \ - && SCMLIT="./scmlit" ${SH} ./build \ - -c ioext.c \ - -h system \ - -t dll \ - && SCMLIT="./scmlit" ${SH} ./build \ - -c posix.c \ - -h system \ - -t dll \ - && SCMLIT="./scmlit" ${SH} ./build \ - -c unix.c \ - -h system \ - -t dll \ - && SCMLIT="./scmlit" ${SH} ./build \ - -c socket.c \ - -h system \ - -t dll \ - && SCMLIT="./scmlit" ${SH} ./build \ - -c ramap.c \ - -h system \ - -t dll \ + -t dll +.if defined(WITH_X11) + @cd ${WRKSRC} \ && SCMLIT="./scmlit" ${SH} ./build \ - -c byte.c \ + -F x \ -h system \ -t dll +.endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/scm ${PREFIX}/bin diff -urN /usr/ports/lang/scm/distinfo lang/scm/distinfo --- /usr/ports/lang/scm/distinfo 2008-02-19 22:21:05.000000000 +0900 +++ lang/scm/distinfo 2009-08-06 05:01:04.000000000 +0900 @@ -1,9 +1,9 @@ -MD5 (scm-5e5.zip) = 50805547a0eb7e6eb3240cbcbe85598f -SHA256 (scm-5e5.zip) = 9df62d4495184d9241f316c60e15481e890cd50932d43c2747afcf557db0f537 -SIZE (scm-5e5.zip) = 910806 -MD5 (slib-3b1.zip) = 9622df4aba2fde24eeb4456d97c5add1 -SHA256 (slib-3b1.zip) = 8e3ec24d51be03ebb7357ad9a2f3554056b86dafbc9e48d1d491aeda1efa566f -SIZE (slib-3b1.zip) = 1063227 +MD5 (scm-5e6.zip) = 3a585664139d8ef4253b679526ad73a3 +SHA256 (scm-5e6.zip) = 97f1b284aacfca01ae44e936dd8468c1d68b0b323776ab5da1d6ec7cb737c1df +SIZE (scm-5e6.zip) = 912968 +MD5 (slib-3b2.zip) = 2f3a6ece49afb1e7db3bce7af039eaaa +SHA256 (slib-3b2.zip) = b1cb9c1b7c888e32918ebdd8fca80d9c875024b064bc6989e4700905873bcae8 +SIZE (slib-3b2.zip) = 1067021 MD5 (slib-psd1-3.tar.gz) = 81f5d0b2cb4cc1bf51ad4ed3e40b6769 SHA256 (slib-psd1-3.tar.gz) = 1665fc6cf572e6d8d99e81b4f6b1e65b04a095b69baebd85d0085ad552dc2955 SIZE (slib-psd1-3.tar.gz) = 62397 diff -urN /usr/ports/lang/scm/files/patch-build.scm lang/scm/files/patch-build.scm --- /usr/ports/lang/scm/files/patch-build.scm 2008-04-20 10:16:33.000000000 +0900 +++ lang/scm/files/patch-build.scm 2009-08-07 01:59:56.000000000 +0900 @@ -1,15 +1,23 @@ ---- build.scm.orig Mon Jan 10 00:23:55 2005 -+++ build.scm Wed Jun 29 02:32:25 2005 -@@ -1576,7 +1576,7 @@ +--- build.scm.orig 2009-08-04 03:35:57.000000000 +0900 ++++ build.scm 2009-08-07 01:59:30.000000000 +0900 +@@ -659,6 +659,7 @@ + (curses freebsd "" "-lncurses" "/usr/lib/libncurses.a" () ()) + (regex freebsd "-I/usr/include/gnu" "-lgnuregex" "" () ()) + (editline freebsd "" "-lreadline" "" () ()) ++ (graphics freebsd "-I%%LOCALBASE%%/include -DX11" "-L%%LOCALBASE%%/lib -lX 11" "%%LOCALBASE%%/lib/libX11.so" () ()) + (dlll freebsd "-DSUN_DL" "-export-dynamic" "" () ()) + (nostart freebsd "" "-e start -dc -dp -Bstatic -lgnumalloc" #f ("pre-crt0.c") ()) + (dump freebsd "" "/usr/lib/crt0.o" "" ("unexsunos4.c") ()) +@@ -1619,7 +1620,7 @@ parms ;;; gcc 3.4.2 for FreeBSD does not allow options other than default i.e. -O0 if NO -DGCC_SPARC_BUG - dai 2004-10-30 ;;"cc" "-O3 -pipe -DGCC_SPARC_BUG " "-c" - "cc" "-O3 -pipe " "-c" + "%%CC%%" "%%CFLAGS%%" "-c" + (include-spec "-I" parms) (c-includes parms) (c-flags parms) - files) -@@ -1586,7 +1586,7 @@ +@@ -1630,7 +1631,7 @@ (batch:rename-file parms oname (string-append oname "~")) (and (batch:try-command parms @@ -18,24 +26,29 @@ (must-be-first '("-nostartfiles" "pre-crt0.o" "crt0.o" -@@ -1596,14 +1596,14 @@ +@@ -1640,17 +1641,18 @@ (defcommand compile-dll-c-files freebsd (lambda (files parms) (and (batch:try-chopped-command - parms "cc" "-O3 -pipe " "-fPIC" "-c" + parms "%%CC%%" "%%CFLAGS%%" "-fPIC" "-c" - (c-includes parms) (c-flags parms) files) + (include-spec "-I" parms) + (c-includes parms) + (c-flags parms) + files) (let ((fnames (truncate-up-to (map c-> files) #\/))) (and (batch:try-command - parms "cc" "-shared" +- parms "cc" "-shared" ++ parms "%%CC%%" "-shared" (cond ((equal? (car fnames) "edline") "-lreadline") - ((equal? (car fnames) "x") "-L/usr/X11R6/lib -lSM -lICE -lXext -lX11 -lxpg4") -+ ((equal? (car fnames) "x") "-L%%LOCALBASE%%/lib -lSM -lICE -lXext -lX11 -lxpg4") ++ ((equal? (car fnames) "rgx") "-lgnuregex") ++ ((equal? (car fnames) "x") "-L%%LOCALBASE%%/lib -lSM -lICE -lXext -lX11") (else "")) "-o" (string-append (car fnames) ".so") (map (lambda (fname) (string-append fname ".o")) fnames)) -@@ -1616,7 +1616,7 @@ +@@ -1663,7 +1665,7 @@ (lambda (oname objects libs parms) (and (batch:try-command parms diff -urN /usr/ports/lang/scm/pkg-descr lang/scm/pkg-descr --- /usr/ports/lang/scm/pkg-descr 2008-02-19 22:21:05.000000000 +0900 +++ lang/scm/pkg-descr 2009-08-06 04:53:55.000000000 +0900 @@ -21,4 +21,4 @@ reason for this port. This means test.scm will fail on three tests in section 6.1. Where strict R4S compliance is important, recompile without the SICP flag. -WWW: http://swiss.csail.mit.edu/~jaffer/SCM +WWW: http://people.csail.mit.edu/jaffer/SCM diff -urN /usr/ports/lang/scm/pkg-plist lang/scm/pkg-plist --- /usr/ports/lang/scm/pkg-plist 2008-02-19 22:21:05.000000000 +0900 +++ lang/scm/pkg-plist 2008-02-28 03:27:15.000000000 +0900 @@ -1,6 +1,8 @@ bin/scm bin/scmlit lib/scm/COPYING +lib/scm/COPYING.LESSER +lib/scm/Idiffer.scm lib/scm/Iedline.scm lib/scm/Init%%VERSION%%.scm lib/scm/Link.scm @@ -8,20 +10,31 @@ lib/scm/Macro.scm lib/scm/Transcen.scm lib/scm/Tscript.scm +lib/scm/build +lib/scm/build.scm lib/scm/byte.so +lib/scm/bytenumb.so +lib/scm/compile.scm lib/scm/crs.so +lib/scm/differ.so lib/scm/edline.so lib/scm/gsubr.so +lib/scm/hobbit.scm lib/scm/implcat lib/scm/ioext.so +lib/scm/keysymdef.scm lib/scm/mkimpcat.scm +lib/scm/patchlvl.h lib/scm/posix.so lib/scm/r4rstest.scm lib/scm/ramap.so lib/scm/record.so lib/scm/require.scm lib/scm/rgx.so +lib/scm/rwb-isam.scm lib/scm/sc2.so +lib/scm/scmhob.h +lib/scm/scmhob.scm lib/scm/slib/Bev2slib.scm lib/scm/slib/Template.scm lib/scm/slib/alist.scm @@ -188,6 +201,11 @@ lib/scm/slibcat lib/scm/socket.so lib/scm/unix.so +lib/scm/wbtab.scm +%%X11%%lib/scm/x.so +lib/scm/x11.scm +lib/scm/xatoms.scm +lib/scm/xevent.scm @dirrm lib/scm/slib/psd @dirrm lib/scm/slib @dirrm lib/scm >Release-Note: >Audit-Trail: >Unformatted: