Update DrScheme to 103p1. Changes include performance enhancements, minor

tweeks, and a new autoconf build system.

The package now conflicts with any installed version of mzscheme as it
builds with, and installs its own.

2 files changed, 48 insertions, 51 deletions

diff --git a/lang/drscheme/Makefile b/lang/drscheme/Makefile
index d8ca50fb713..97abd5e1980 100644
--- a/lang/drscheme/Makefile
+++ b/lang/drscheme/Makefile
@@ -1,47 +1,50 @@
-# $NetBSD: Makefile,v 1.3 2001/02/17 09:07:03 agc Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/05 21:30:36 groo Exp $
 #
 
 DISTNAME=		plt.src.x
-PKGNAME=		drscheme-101
+PKGNAME=		drscheme-103p1
 CATEGORIES=		lang
-MASTER_SITES=		http://www.cs.rice.edu/CS/PLT/packages/download/101/plt/
+MASTER_SITES=		http://www.cs.rice.edu/CS/PLT/packages/download/103p1/plt/
 
 MAINTAINER=		groo@netbsd.org
 HOMEPAGE=		http://www.cs.rice.edu/CS/PLT/packages/drscheme/
 COMMENT=		R4RS-compilant and nearly R5RS-compliant scheme tailored for teaching
 
-DEPENDS+=               mzscheme-101:../mzscheme
+CONFLICTS+=		mzscheme-*:../mzscheme
 
 USE_GMAKE=		yes
 USE_PERL5=		yes
+GNU_CONFIGURE=		yes
+LDFLAGS=		-L${LOCALBASE}/lib
+CFLAGS=			-I${LOCALBASE}/include
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
-# Note: WRKSRC set to ease import of patches
-# from lang/mzscheme. [groo]
-
-WRKSRC=                 ${WRKDIR}/plt/src/mzscheme
+WRKSRC=                 ${WRKDIR}/plt/src
 
 post-patch:
 	@for patchee in ${WRKDIR}/plt/man/man1/mzscheme.1 \
 	${WRKDIR}/plt/man/man1/drscheme.1 ${WRKDIR}/plt/man/man1/mred.1 \
 	${WRKDIR}/plt/man/man1/drscheme-jr.1 \
-	${WRKSRC}/cmdline.inc ${WRKDIR}/plt/collects/mzlib/restartr.ss \
+	${WRKSRC}/mzscheme/cmdline.inc \
+	${WRKDIR}/plt/collects/mzlib/restartr.ss \
 	${WRKDIR}/plt/collects/slibinit/init.ss \
-	${WRKSRC}/src/makeexn ${WRKDIR}/plt/collects/launcher/launcherr.ss; do \
+	${WRKSRC}/mzscheme/src/makeexn \
+	${WRKSRC}/../bin/drscheme \
+	${WRKSRC}/../bin/drscheme-jr \
+	${WRKSRC}/../bin/help-desk \
+	${WRKSRC}/../bin/mred \
+	${WRKSRC}/../bin/mzc \
+	${WRKSRC}/../bin/mzscheme \
+	${WRKDIR}/plt/collects/launcher/launcherr.ss; do \
 		${MV} -f $$patchee ${WRKSRC}/foo ; \
 		${SED} -e 's@XXXPREFIXXXX@${PREFIX}@g' <${WRKSRC}/foo \
 			> $$patchee ; \
 	done
 	@${RM} -f ${WRKSRC}/foo
 
-do-build:
-	@(cd ${WRKSRC} ; ./mzmake)
-	@(cd ${WRKSRC}/../mred ; ${GMAKE})
-
 post-build:
 	@(cd ${WRKSRC} ; ${MAKE} install)
-	@(cd ${WRKDIR}/plt ; ${ECHO} y | ./install)
 
 do-install:
 	@${INSTALL_SCRIPT} ${WRKDIR}/plt/bin/drscheme ${PREFIX}/bin
@@ -57,11 +60,8 @@ do-install:
 		${PREFIX}/man/man1
 	@${INSTALL_MAN} ${WRKDIR}/plt/man/man1/mred.1 \
 		${PREFIX}/man/man1
-	@for i in userspce stepper mred icons htdp hierlist \
-		help graphics games framework drscheme-jr drscheme \
-		doc cogen browser afm; do \
-		${CP} -R ${WRKDIR}/plt/collects/$$i ${PREFIX}/lib/plt/collects; \
-	done
-	@${CP} -R ${WRKDIR}/plt/teachpack ${PREFIX}/lib/plt
+	${INSTALL_DATA_DIR} ${PREFIX}/lib/plt/collects
+	${CP} -R ${WRKDIR}/plt/collects/* ${PREFIX}/lib/plt/collects
+	${CP} -R ${WRKDIR}/plt/teachpack ${PREFIX}/lib/plt
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/drscheme/distinfo b/lang/drscheme/distinfo
index d113d41e312..c61604211f9 100644
--- a/lang/drscheme/distinfo
+++ b/lang/drscheme/distinfo
@@ -1,31 +1,28 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 15:00:49 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/09/05 21:30:36 groo Exp $
 
-SHA1 (plt.src.x.tar.gz) = 68d319ffa573a7118ff5634745414d1347333473
-Size (plt.src.x.tar.gz) = 3911859 bytes
-SHA1 (patch-aa) = 32ebcb96412755aad7e2d3f487a0a2e59a734144
-SHA1 (patch-ab) = deaa3024e4fa4a0a920b9a7ae8c784b47fd4375a
-SHA1 (patch-ac) = 7f7fe69ce0a8143809be70e756ad4153c4ec5a0f
-SHA1 (patch-ad) = eec84434908baa79fad8f8c1a91c28c9bfa924fc
-SHA1 (patch-ae) = 2172ca721a5488fe489fa67e6885a8c2ef9e47fe
-SHA1 (patch-af) = 786c602cbea34bcf67bae4da16cb4b332a9ea1d7
-SHA1 (patch-ag) = 570a1b7708c9049b725d0e587f5a854295b9e32d
-SHA1 (patch-ah) = e9740dc8dba17ee7981fff6f7c255740da0f5c1f
-SHA1 (patch-ai) = 31b6fe07fab20101fa8aeb9030b671853981146b
-SHA1 (patch-aj) = a5a860bb64603bcfe9e77d08ffc0ba1d48406990
-SHA1 (patch-ak) = 0b192ac44b84df85a32a12e84f8f44c430e0d6bb
-SHA1 (patch-al) = 47b9979270ef0fde3737a899b3693af0d2f81d0b
-SHA1 (patch-ba) = b2e0e4a43b186eca9a45b15ee39cb7a9c891638a
-SHA1 (patch-bb) = d61149f2a4bc4258c3636ad00545e2f7c447a61e
-SHA1 (patch-bc) = e305b3c5ea0faf7e15efe4e7be904a71fe09c847
-SHA1 (patch-bd) = 0cce6d6e1037d9dbdea91d25e28e4585c5c688c3
-SHA1 (patch-be) = b68c3deb3ef0b64ba72e85bf871dcc0dd5235658
-SHA1 (patch-bf) = e2970bd1debeb7ecaec0ee669d8d08aec1d8c2b3
-SHA1 (patch-bg) = 9f46aee57c2b641ecd8584d5ba5d28f18a024a0a
-SHA1 (patch-da) = 5b9fafbfae56c9ecb97ef26b5ed6e17b79f05873
-SHA1 (patch-db) = 2bd0f588f147cabbbd0a634a83a72d37a0df1502
-SHA1 (patch-dc) = a5d8121dfdce7af20c602b7d943c9ebbb4b6a1b5
-SHA1 (patch-dd) = 957acb4212fd97b1fdf215911cd3a05e724fd808
-SHA1 (patch-de) = 194c903ce62df5c06893f05097137cfa08a19fe9
-SHA1 (patch-df) = 54da80b3105b15b9c3faf164c959cb1a915a2d0e
-SHA1 (patch-dg) = b0bdfe40f4c0931115f72fa97bb4e89e66e62b1c
-SHA1 (patch-dh) = 3d55ff9ee79dd3ef8518be22c9a1f269328ba300
+SHA1 (plt.src.x.tar.gz) = 3b05035d5dc77f5b9ca0f4e2157eb7bb69458396
+Size (plt.src.x.tar.gz) = 4744453 bytes
+SHA1 (patch-aa) = 3964a50f7aae3c9b1ea551307b1892da3afd2b7c
+SHA1 (patch-ac) = eb690d4ff07e5e2cf336e7b05de9b027dfce5531
+SHA1 (patch-ae) = 14847f1fc4f9168381ae66eb529add4fd94fd362
+SHA1 (patch-af) = 774587cbfa93a621f479205897f8feeeb1f6f6d3
+SHA1 (patch-ag) = 05d53ec66ad149dff24da5a819cb1352f59cce2a
+SHA1 (patch-ah) = b3e8205757855168f9386e60fdefc792f56697a0
+SHA1 (patch-ai) = 7a175823c85d5b59ba9324bbaddfab3e1ddc8652
+SHA1 (patch-aj) = 40d903db271e1c35de81166a1664ef6b656c7267
+SHA1 (patch-ak) = 93f930bb95d8792342285321f142d00755626160
+SHA1 (patch-al) = 77e7de0252f5c2c670b7118e84de1c8f29d2732f
+SHA1 (patch-bb) = 9e976ca180f698386c6d16765f62759e46240ab5
+SHA1 (patch-bc) = ef29dfaf19d98c5cc34d40e23e335a0b73efbb5f
+SHA1 (patch-bd) = 88b2ea363849d3b8860d65f6c76001864df253c2
+SHA1 (patch-be) = 3bfe1bfa026926b1a54a5f9d470f76d99fda2307
+SHA1 (patch-bf) = 1f535969b3377470bf802d946748fbb26994e516
+SHA1 (patch-bg) = e457475e82bb5ceb1977f62e6c52a16827c8092c
+SHA1 (patch-da) = 44da69b6cb977adf89f716a22608e6f9a0bc3315
+SHA1 (patch-db) = 7d6627d24986548f061bc5cf58ab78dde1e37a20
+SHA1 (patch-dc) = f32b9040fae0b305d7d28a8b61151308508b4301
+SHA1 (patch-dd) = b2c9fe855142cefa85d83d885f809e675106ab05
+SHA1 (patch-de) = fcfc431cf54efc911d400a34c327e53975e3a95a
+SHA1 (patch-df) = 2b2434a9e354dbd10c83a38b2d6abbab3797c00a
+SHA1 (patch-dg) = c75a0fb4c1248158aa12aca303ff7dfa03c464e4
+SHA1 (patch-dh) = f26b0953f40d448615c92818d9d49e7ea7d163b0