Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 24 May 2013 02:52:39 +0900
From:      KATO Tsuguru <tkato432@yahoo.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/178869: lang/scm: Update to version 5f1
Message-ID:  <20130524025239.a7f9e8c954cab42f48938a87@yahoo.com>
Resent-Message-ID: <201305231810.r4NIA1ao083355@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         178869
>Category:       ports
>Synopsis:       lang/scm: Update to version 5f1
>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:   Thu May 23 18:10:01 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 8.4-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 5f1

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/lang/scm/Makefile lang/scm/Makefile
--- /usr/ports/lang/scm/Makefile	2012-11-08 08:24:26.000000000 +0900
+++ lang/scm/Makefile	2013-05-24 00:00:06.000000000 +0900
@@ -1,36 +1,37 @@
-# New ports collection makefile for:	scm
-# Date created:		Sat Nov  5 17:11:01 PST 1994
-# Whom:			hsu
-#
+# Created by: hsu
 # $FreeBSD: head/lang/scm/Makefile 300896 2012-07-14 13:54:48Z beat $
-#
 
 PORTNAME=	scm
-PORTVERSION=	5e7
+PORTVERSION=	5f1
 CATEGORIES=	lang scheme
-MASTER_SITES=	http://groups.csail.mit.edu/mac/ftpdir/scm/%SUBDIR%/ \
-		ftp://ftp.informatik.uni-hamburg.de/ftpmnt/inf1/pub/soft/lang/scheme/
+MASTER_SITES=	http://groups.csail.mit.edu/mac/ftpdir/scm/%SUBDIR%/
 MASTER_SITE_SUBDIR=	. OLD
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} slib-3b3.zip slib-psd1-3.tar.gz
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} slib-3b3.zip
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} slib-3b4.zip slib-psd1-3.tar.gz
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} slib-3b4.zip
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A scheme interpreter
+COMMENT=	Scheme interpreter
+
+LICENSE=	LGPL21
+
+OPTIONS_DEFINE=	X11
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_ZIP=	yes
+USE_GCC=	any
 USE_GMAKE=	yes
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" IMPLPATH="${PREFIX}/lib/scm/" \
 		SCMLIT="./scmlit"
 ALL_TARGET=	scmlit scm5 mydlls
-MAN1=		scm.1
-INFO=		scm
 MAKE_JOBS_UNSAFE=	yes
 
+SUB_FILES=	require.scm
+
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
-SUB_FILES=	require.scm
+MAN1=		scm.1
+INFO=		scm
 
 SCM_DATA=	COPYING COPYING.LESSER Iedline.scm Idiffer.scm \
 		Init${PORTVERSION}.scm Link.scm Macexp.scm Macro.scm \
@@ -42,13 +43,9 @@
 		ioext.so posix.so ramap.so record.so rgx.so sc2.so \
 		socket.so unix.so
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
-BROKEN=		Does not compile on ia64, powerpc, or sparc64
-.endif
-
-.if defined(WITH_X11)
+.if ${PORT_OPTIONS:MX11}
 USE_XORG=	ice sm x11 xext
 SCM_MODULES+=	x.so
 PLIST_SUB+=	X11=""
@@ -56,6 +53,12 @@
 PLIST_SUB+=	X11="@comment "
 .endif
 
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
+BROKEN=		Does not compile on ia64, powerpc, or sparc64
+.endif
+
 post-extract:
 	@${TAR} -C ${WRKDIR} -zxf ${DISTDIR}/slib-psd1-3.tar.gz
 
@@ -72,7 +75,7 @@
 		 -c differ.c \
 		 -h system \
 		 -t dll
-.if defined(WITH_X11)
+.if ${PORT_OPTIONS:MX11}
 	@cd ${WRKSRC} \
 		&& SCMLIT="./scmlit" ${SH} ./build \
 		 -F x \
@@ -81,19 +84,21 @@
 .endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/scm ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/scmlit ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/scm.1 ${MANPREFIX}/man/man1
+.for i in scm scmlit
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${i} ${PREFIX}/bin)
+.endfor
+	(cd ${WRKSRC} && ${INSTALL_MAN} scm.1 ${MANPREFIX}/man/man1)
 	@${MKDIR} ${PREFIX}/lib/scm
-	${INSTALL_DATA} ${WRKDIR}/require.scm ${PREFIX}/lib/scm
-.for file in ${SCM_DATA} ${SCM_MODULES}
-	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/lib/scm
+	(cd ${WRKDIR} && ${INSTALL_DATA} require.scm ${PREFIX}/lib/scm)
+.for i in ${SCM_DATA} ${SCM_MODULES}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${PREFIX}/lib/scm)
 .endfor
 	@${MKDIR} ${PREFIX}/lib/scm/slib
-	${INSTALL_DATA} ${WRKDIR}/slib/*.scm ${PREFIX}/lib/scm/slib
+	(cd ${WRKDIR}/slib && ${INSTALL_DATA} *.scm ${PREFIX}/lib/scm/slib)
 	@${MKDIR} ${PREFIX}/lib/scm/slib/psd
-	${INSTALL_DATA} ${WRKDIR}/slib/psd/*.scm ${PREFIX}/lib/scm/slib/psd
-	${INSTALL_DATA} ${WRKDIR}/scm/scm.info ${PREFIX}/${INFO_PATH}
-	cd ${PREFIX}/lib/scm && ${PREFIX}/bin/scm -lmkimpcat.scm
+	(cd ${WRKDIR}/slib/psd && ${INSTALL_DATA} *.scm \
+		${PREFIX}/lib/scm/slib/psd)
+	(cd ${WRKDIR}/scm && ${INSTALL_DATA} scm.info ${PREFIX}/${INFO_PATH})
+	(cd ${PREFIX}/lib/scm && ${PREFIX}/bin/scm -lmkimpcat.scm)
 
 .include <bsd.port.post.mk>
diff -urN /usr/ports/lang/scm/distinfo lang/scm/distinfo
--- /usr/ports/lang/scm/distinfo	2012-11-08 08:24:26.000000000 +0900
+++ lang/scm/distinfo	2013-05-24 00:00:06.000000000 +0900
@@ -1,6 +1,6 @@
-SHA256 (scm-5e7.zip) = f4869c7925574c8a167249adb0bc0e4bbd0415cd1e3d02c8daf98fbe0d710f51
-SIZE (scm-5e7.zip) = 919897
-SHA256 (slib-3b3.zip) = 1861aad6e80b2afaf14789a8778c1f0c00ff8fd6051f7cffcd2aa945880b443e
-SIZE (slib-3b3.zip) = 1085062
+SHA256 (scm-5f1.zip) = f469e08e03fef5e2fa54349faaff630e63e88fc39f5fc98a6a55a6aa865a57c0
+SIZE (scm-5f1.zip) = 952965
+SHA256 (slib-3b4.zip) = ddfa66c61db1dec44147cad98e46cb9ec151f62dfaa10aa2508fbd26d46272a7
+SIZE (slib-3b4.zip) = 1099910
 SHA256 (slib-psd1-3.tar.gz) = 1665fc6cf572e6d8d99e81b4f6b1e65b04a095b69baebd85d0085ad552dc2955
 SIZE (slib-psd1-3.tar.gz) = 62397
diff -urN /usr/ports/lang/scm/pkg-plist lang/scm/pkg-plist
--- /usr/ports/lang/scm/pkg-plist	2012-11-08 08:24:27.000000000 +0900
+++ lang/scm/pkg-plist	2013-05-24 00:00:06.000000000 +0900
@@ -78,6 +78,7 @@
 lib/scm/slib/dynwind.scm
 lib/scm/slib/eval.scm
 lib/scm/slib/factor.scm
+lib/scm/slib/fluid-let.scm
 lib/scm/slib/fluidlet.scm
 lib/scm/slib/format.scm
 lib/scm/slib/formatst.scm
@@ -195,7 +196,7 @@
 lib/scm/slib/values.scm
 lib/scm/slib/vet.scm
 lib/scm/slib/withfile.scm
-lib/scm/slib/wttest.scm
+lib/scm/slib/wttree-test.scm
 lib/scm/slib/wttree.scm
 lib/scm/slib/xml-parse.scm
 lib/scm/slib/yasyn.scm
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130524025239.a7f9e8c954cab42f48938a87>