Rearrange a fair amount. Supply patches for compiling on macppc. Bump to nb1

version

6 files changed, 92 insertions, 6 deletions

diff --git a/lang/RScheme/Makefile b/lang/RScheme/Makefile
index 63c33b1ecb9..59ace53a903 100644
--- a/lang/RScheme/Makefile
+++ b/lang/RScheme/Makefile
@@ -1,30 +1,40 @@
-# $NetBSD: Makefile,v 1.5 2001/04/21 01:13:41 jtb Exp $
+# $NetBSD: Makefile,v 1.6 2002/03/05 08:45:33 jmc Exp $
 
 DISTNAME=		rs-0.7.3.1
 PKGNAME=		RScheme-0.7.3.1
 CATEGORIES=		lang
 MASTER_SITES=		ftp://ftp.rscheme.org/pub/rscheme/
 
+PKGREVISION=		1
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.rscheme.org
 COMMENT=		Scheme implementation
 
-WRKSRC=			${WRKDIR}/${DISTNAME}/src
 HAS_CONFIGURE=		#defined
 CONFIGURE_ARGS+=	--prefix=${PREFIX}/lib/RScheme
 ALL_TARGET=		base
 
+#
+# Can't define WRKSRC as the src subdir since it doesn't appear until after
+# the configure stage and patches need to be applied before then.
+#
 pre-configure:
-	cd ${WRKDIR}/${DISTNAME} && ${MAKE} stage1
+	cd ${WRKSRC} && ${MAKE} stage1
+
+do-configure:
+	cd ${WRKSRC}/src && ./configure ${CONFIGURE_ARGS}
+
+do-build:
+	cd ${WRKSRC}/src && ${MAKE} ${ALL_TARGET}
 
 do-install:
-	cd ${WRKSRC} && ${MAKE} install-base && ${MAKE} shell && \
+	cd ${WRKSRC}/src && ${MAKE} install-base && ${MAKE} shell && \
 	${MAKE} install-shell && ${MAKE} packages
 
 post-install:
 	${LN} -fs ${PREFIX}/lib/RScheme/bin/rs ${PREFIX}/bin/RScheme
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/RScheme
-	${INSTALL_DATA} ${WRKSRC}/../COPYING ${WRKSRC}/../README \
+	${INSTALL_DATA} ${WRKSRC}/COPYING ${WRKSRC}/README \
 	${PREFIX}/share/doc/RScheme
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/RScheme/distinfo b/lang/RScheme/distinfo
index 14bdb884ba1..6f53858a367 100644
--- a/lang/RScheme/distinfo
+++ b/lang/RScheme/distinfo
@@ -1,4 +1,8 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 15:00:47 agc Exp $
+$NetBSD: distinfo,v 1.3 2002/03/05 08:45:33 jmc Exp $
 
 SHA1 (rs-0.7.3.1.tar.gz) = 31f8b515e394e3e467e0f445335a3fdf22fcdb63
 Size (rs-0.7.3.1.tar.gz) = 1872020 bytes
+SHA1 (patch-aa) = c7021af105513a71b3ddbeddd15865c1e197b1a4
+SHA1 (patch-ab) = 29f4eb38c21631dc92bb5ff086fecc56d35ed366
+SHA1 (patch-ac) = 3b4924d62afa5fc7c4a4973fe48eead719e1d7a4
+SHA1 (patch-ad) = b4387026fb26f2a75af49eed113708ff218ae04a
diff --git a/lang/RScheme/patches/patch-aa b/lang/RScheme/patches/patch-aa
new file mode 100644
index 00000000000..0d5eab09ab5
--- /dev/null
+++ b/lang/RScheme/patches/patch-aa
@@ -0,0 +1,14 @@
+$NetBSD: patch-aa,v 1.1 2002/03/05 08:45:34 jmc Exp $
+
+--- stage0/config.guess.orig	Tue Mar  5 05:12:43 2002
++++ stage0/config.guess	Tue Mar  5 05:13:01 2002
+@@ -135,6 +135,9 @@
+     mac68k:OpenBSD:*:*)
+ 	echo m68k-apple-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
++    macppc:NetBSD:*:*)
++	echo macppc-unknown-netbsd${UNAME_RELEASE}
++	exit 0 ;;
+     powerpc:machten:*:*)
+ 	echo powerpc-apple-machten${UNAME_RELEASE}
+ 	exit 0 ;;
diff --git a/lang/RScheme/patches/patch-ab b/lang/RScheme/patches/patch-ab
new file mode 100644
index 00000000000..2e01ef7300b
--- /dev/null
+++ b/lang/RScheme/patches/patch-ab
@@ -0,0 +1,14 @@
+$NetBSD: patch-ab,v 1.1 2002/03/05 08:45:34 jmc Exp $
+
+--- handc/config.guess.orig	Tue Mar  5 05:46:32 2002
++++ handc/config.guess	Tue Mar  5 05:46:34 2002
+@@ -135,6 +135,9 @@
+     mac68k:OpenBSD:*:*)
+ 	echo m68k-apple-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
++    macppc:NetBSD:*:*)
++	echo macppc-unknown-netbsd${UNAME_RELEASE}
++	exit 0 ;;
+     powerpc:machten:*:*)
+ 	echo powerpc-apple-machten${UNAME_RELEASE}
+ 	exit 0 ;;
diff --git a/lang/RScheme/patches/patch-ac b/lang/RScheme/patches/patch-ac
new file mode 100644
index 00000000000..3e54adc3561
--- /dev/null
+++ b/lang/RScheme/patches/patch-ac
@@ -0,0 +1,22 @@
+$NetBSD: patch-ac,v 1.1 2002/03/05 08:45:34 jmc Exp $
+
+--- handc/config.sub.orig	Tue Mar  5 07:53:10 2002
++++ handc/config.sub	Tue Mar  5 07:58:38 2002
+@@ -155,7 +155,7 @@
+ 		| alpha | we32k | ns16k | clipper | i370 | sh \
+ 		| powerpc | powerpcle | 1750a | dsp16xx | mips64 | mipsel \
+ 		| pdp11 | mips64el | mips64orion | mips64orionel \
+-		| sparc | sparclet | sparclite | sparc64)
++		| sparc | sparclet | sparclite | sparc64 | macppc)
+ 		basic_machine=$basic_machine-unknown
+ 		;;
+ 	# We use `pc' rather than `unknown'
+@@ -177,7 +177,7 @@
+ 	      | hppa-* | hppa1.0-* | hppa1.1-* | alpha-* | we32k-* | cydra-* | ns16k-* \
+ 	      | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \
+ 	      | pdp11-* | sh-* | powerpc-* | powerpcle-* | sparc64-* | mips64-* | mipsel-* \
+-	      | mips64el-* | mips64orion-* | mips64orionel-* | f301-*)
++	      | mips64el-* | mips64orion-* | mips64orionel-* | f301-* | macppc-* )
+ 		;;
+ 	# Recognize the various machine names and aliases which stand
+ 	# for a CPU type and a company and sometimes even an OS.
diff --git a/lang/RScheme/patches/patch-ad b/lang/RScheme/patches/patch-ad
new file mode 100644
index 00000000000..62a6a30c9b3
--- /dev/null
+++ b/lang/RScheme/patches/patch-ad
@@ -0,0 +1,22 @@
+$NetBSD: patch-ad,v 1.1 2002/03/05 08:45:35 jmc Exp $
+
+--- stage0/config.sub.orig	Tue Mar  5 07:53:10 2002
++++ stage0/config.sub	Tue Mar  5 07:58:38 2002
+@@ -155,7 +155,7 @@
+ 		| alpha | we32k | ns16k | clipper | i370 | sh \
+ 		| powerpc | powerpcle | 1750a | dsp16xx | mips64 | mipsel \
+ 		| pdp11 | mips64el | mips64orion | mips64orionel \
+-		| sparc | sparclet | sparclite | sparc64)
++		| sparc | sparclet | sparclite | sparc64 | macppc)
+ 		basic_machine=$basic_machine-unknown
+ 		;;
+ 	# We use `pc' rather than `unknown'
+@@ -177,7 +177,7 @@
+ 	      | hppa-* | hppa1.0-* | hppa1.1-* | alpha-* | we32k-* | cydra-* | ns16k-* \
+ 	      | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \
+ 	      | pdp11-* | sh-* | powerpc-* | powerpcle-* | sparc64-* | mips64-* | mipsel-* \
+-	      | mips64el-* | mips64orion-* | mips64orionel-* | f301-*)
++	      | mips64el-* | mips64orion-* | mips64orionel-* | f301-* | macppc-* )
+ 		;;
+ 	# Recognize the various machine names and aliases which stand
+ 	# for a CPU type and a company and sometimes even an OS.