Update VCSM to V4R2.

Changes are unknown (no information published), homepage is gone.

5 files changed, 73 insertions, 89 deletions

diff --git a/lang/vscm/Makefile b/lang/vscm/Makefile
index 4ac2f3601a7..de4c0d0f198 100644
--- a/lang/vscm/Makefile
+++ b/lang/vscm/Makefile
@@ -1,16 +1,13 @@
-# $NetBSD: Makefile,v 1.17 2009/06/30 00:07:18 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2011/04/17 07:46:05 asau Exp $
 
-DISTNAME=	vscmV0r4
-PKGNAME=	vscm-0.4
-PKGREVISION=	2
+DISTNAME=	vscmV1R2
+PKGNAME=	vscm-1.4
 CATEGORIES=	lang
-MASTER_SITES=	ftp://ftp.cs.indiana.edu/pub/scheme-repository/imp/vscm/
-
-PATCHFILES=	bugfix.txt
-PATCH_SITES=	${MASTER_SITES}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=vscm/} \
+	ftp://ftp.cs.indiana.edu/pub/scheme-repository/imp/vscm/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.cs.princeton.edu/~blume/vscm/
+#HOMEPAGE=	http://www.cs.princeton.edu/~blume/vscm/
 COMMENT=	Portable scheme implementation
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -19,17 +16,15 @@ MAKE_JOBS_SAFE=		no
 
 USE_TOOLS+=	gmake
 
-INSTALLATION_DIRS=	bin
+INSTALLATION_DIRS=	bin lib/vscm share/doc/vscm
 
 post-patch:
 	${SED} -e "s,@PREFIX@,${PREFIX}," ${FILESDIR}/path.h >${WRKSRC}/path.h
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/vscm ${DESTDIR}${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/vscm
 	${INSTALL_DATA} ${WRKSRC}/.scheme-boot				\
 		${DESTDIR}${PREFIX}/lib/vscm/vscm-boot
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/vscm
 	cd ${WRKSRC} && ${INSTALL_DATA} README INSTALL DESCRIPTION	\
 		${DESTDIR}${PREFIX}/share/doc/vscm
 
diff --git a/lang/vscm/distinfo b/lang/vscm/distinfo
index 03f4d1ed88c..c155bfcc21e 100644
--- a/lang/vscm/distinfo
+++ b/lang/vscm/distinfo
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 09:03:12 agc Exp $
+$NetBSD: distinfo,v 1.4 2011/04/17 07:46:05 asau Exp $
 
-SHA1 (vscmV0r4.tar.gz) = 8a571a4f1dfe0dbd568fb13efd61f66caf189980
-RMD160 (vscmV0r4.tar.gz) = 709de774f7e766f8113322841516d2fbe05782db
-Size (vscmV0r4.tar.gz) = 136981 bytes
-SHA1 (bugfix.txt) = e0aea092fc71ab931ba4ca2eb495b171ec6921f5
-RMD160 (bugfix.txt) = a1b0e40eff8c3fd8e66e88f4963371825cfe5c16
-Size (bugfix.txt) = 1184 bytes
-SHA1 (patch-aa) = 5b98a6330ac897ea26beb838b28c97503f419e0d
-SHA1 (patch-ab) = ccc424a8d0523b2570676a0a942d43605b35207a
+SHA1 (vscmV1R2.tar.gz) = 5c9107d825370e2a3b0d02c008faee2ca9f35eba
+RMD160 (vscmV1R2.tar.gz) = 3c405b384b4fb55594fd9a84c3aec6f10cda6bae
+Size (vscmV1R2.tar.gz) = 229752 bytes
+SHA1 (patch-aa) = 3c85e4519b8d17724672b093889016ec6bee5402
+SHA1 (patch-ab) = 8b4d68a93411af6dab109f058c0b189375e0b294
 SHA1 (patch-ac) = 73adae14da2fb236fb41277a17e0b936a75b9433
+SHA1 (patch-ad) = 80ccfbe99d114cd6695faf09f4d27a22e68a31cb
diff --git a/lang/vscm/patches/patch-aa b/lang/vscm/patches/patch-aa
index cf57a49376c..fb8d5b672f9 100644
--- a/lang/vscm/patches/patch-aa
+++ b/lang/vscm/patches/patch-aa
@@ -1,40 +1,40 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/11/02 11:01:53 itojun Exp $
+$NetBSD: patch-aa,v 1.2 2011/04/17 07:46:05 asau Exp $
 
---- Numeric.c-	Thu Nov  2 19:38:25 2000
-+++ Numeric.c	Thu Nov  2 19:38:38 2000
-@@ -504,7 +504,7 @@
+--- Numeric.c.orig	1999-02-09 08:05:13.000000000 +0300
++++ Numeric.c	2011-03-30 20:17:55.000000000 +0400
+@@ -591,7 +591,7 @@
+   return len;
  }
  
- static bigdig
--  qdiv (bigdig *a, bigreg b, bigdig *c, bigreg *r, int la)
-+  qdiv__ (bigdig *a, bigreg b, bigdig *c, bigreg *r, int la)
+-static bigdig qdiv (bigdig *a, bigreg b, bigdig *c, bigreg *r, int la)
++static bigdig qdiv__ (bigdig *a, bigreg b, bigdig *c, bigreg *r, int la)
  {
    int i;
    bigreg d;
-@@ -937,11 +937,11 @@
+@@ -1212,11 +1212,11 @@
      (void) normalize (d, &ld, 0);
    } else if (gcd [0] != 1) {
-     tmp_n = provide_bignum (tmp_n, &tmp_ln, ln);
--    if (qdiv (n, gcd [0], tmp_n, &r, ln) == 0)
-+    if (qdiv__ (n, gcd [0], tmp_n, &r, ln) == 0)
+     PROVIDE_BIGNUM (tmp_n, ln);
+-    if (qdiv (n, gcd [0], tmp_n_dig, &r, ln) == 0)
++    if (qdiv__ (n, gcd [0], tmp_n_dig, &r, ln) == 0)
        --ln;
-     n = tmp_n;
-     tmp_d = provide_bignum (tmp_d, &tmp_ld, ld);
--    if (qdiv (d, gcd [0], tmp_d, &r, ld) == 0)
-+    if (qdiv__ (d, gcd [0], tmp_d, &r, ld) == 0)
+     n = tmp_n_dig;
+     PROVIDE_BIGNUM (tmp_d, ld);
+-    if (qdiv (d, gcd [0], tmp_d_dig, &r, ld) == 0)
++    if (qdiv__ (d, gcd [0], tmp_d_dig, &r, ld) == 0)
        --ld;
-     d = tmp_d;
+     d = tmp_d_dig;
    } else {
-@@ -1428,7 +1428,7 @@
-     tmp1_dig = provide_bignum (tmp1_dig, &tmp1_len, a->nlength);
-     tmp2_dig = provide_bignum (tmp2_dig, &tmp2_len, 1);
+@@ -1939,7 +1939,7 @@
+     PROVIDE_BIGNUM (tmp1, a->nlength);
+     PROVIDE_BIGNUM (tmp2, 1);
      l1 = a->nlength;
 -    qdiv (a->dig, a->dig [a->nlength], tmp1_dig, &rr, a->nlength);
 +    qdiv__ (a->dig, a->dig [a->nlength], tmp1_dig, &rr, a->nlength);
      tmp2_dig [0] = rr;
      (void) normalize (tmp1_dig, &l1, 0);
      r = tmp2_dig;
-@@ -1899,7 +1899,7 @@
+@@ -2407,7 +2407,7 @@
    bigdig_copy (a, tmp1_dig, la);
    s = strg;
    while (la > 1 || tmp1_dig [0] > 0) {
@@ -43,12 +43,12 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/11/02 11:01:53 itojun Exp $
        --la;
      sprintf (buf, "%04u", (unsigned) r);
      for (i = 3; i >= 0; i--)
-@@ -2729,7 +2729,7 @@
- 	  qq = ((ScmFixnum *) gcs3)->dig;
- 	} else
- 	  qq = tmp1_dig = provide_bignum (tmp1_dig, &tmp1_len, lq);
--	if (qdiv (a->dig, b->dig [0], qq, &rr, lq) == 0)
-+	if (qdiv__ (a->dig, b->dig [0], qq, &rr, lq) == 0)
- 	  --lq;
- 	if (r != NULL) {
- 	  int sign = a->sign;
+@@ -3312,7 +3312,7 @@
+       PROVIDE_BIGNUM (tmp1, lq);
+       qq = tmp1_dig;
+     }
+-    if (qdiv (a->dig, bb, qq, &rr, lq) == 0)
++    if (qdiv__ (a->dig, bb, qq, &rr, lq) == 0)
+       --lq;
+     if (r != NULL)
+       *r = ScmLongToNumber (a->sign ? - (long) rr : rr);
diff --git a/lang/vscm/patches/patch-ab b/lang/vscm/patches/patch-ab
index dae7b48d6b2..d0c4a8977fe 100644
--- a/lang/vscm/patches/patch-ab
+++ b/lang/vscm/patches/patch-ab
@@ -1,19 +1,19 @@
-$NetBSD: patch-ab,v 1.2 2001/04/12 20:21:59 jtb Exp $
+$NetBSD: patch-ab,v 1.3 2011/04/17 07:46:05 asau Exp $
 
---- Makefile.orig	Fri Aug  5 15:31:07 1994
-+++ Makefile
-@@ -49,8 +49,8 @@
- # this is what works for me on a DEC Alpha, running OSF/1:
- # (gcc version 2.5.7)
+--- Makefile.orig	1999-02-09 08:24:08.000000000 +0300
++++ Makefile	2011-03-30 20:15:36.000000000 +0400
+@@ -42,8 +42,8 @@
+ # ``-DNDEBUG'' etc.
+ 
  
 -                           CC = gcc
--                     OPTFLAGS = -O2 -funroll-loops -fomit-frame-pointer
+-                     OPTFLAGS = -O2
 +#                           CC = gcc
-+                     OPTFLAGS = -funroll-loops -fomit-frame-pointer
++#                     OPTFLAGS = -O2
                      WARNFLAGS = -Wall -Wmissing-prototypes
-                    DEBUGFLAGS =
-                   EXTRACFLAGS =
-@@ -208,7 +208,7 @@
+                    DEBUGFLAGS = -g
+                   EXTRACFLAGS = -DADJUSTABLE_SFIXNUM_RANGE -DVSCM_POSIX
+@@ -183,7 +183,7 @@
  .DEFAULT:
  	@echo I hope, making $< is not necessary...
  
@@ -22,35 +22,12 @@ $NetBSD: patch-ab,v 1.2 2001/04/12 20:21:59 jtb Exp $
  LDFLAGS = $(A_OPTFLAGS) $(A_DEBUGFLAGS) $(A_EXTRALDFLAGS)
  CLFLAGS = $(CFLAGS) $(A_EXTRALDFLAGS)
  LIBS    = -lm $(A_EXTRALIBS)
-@@ -413,8 +413,8 @@
- distclean: archclean
- 	$(FORCEDELETE) compiler/repl.boot
+@@ -351,7 +351,7 @@
+ 	$(FORCEDELETE) $*.o
  
--scheme:	$(OBJECTS) $(TMPLIBS)
+ scheme:	$(OBJECTS) $(TMPLIBS)
 -	$(CC) -o scheme $(LDFLAGS) $(OBJECTS) $(LIBS) -lc $(TMPLIBS)
-+scheme:	$(OBJECTS) non-ansi-lib $(TMPLIBS)
 +	$(CC) -o vscm $(LDFLAGS) $(OBJECTS) $(LIBS) -lc $(TMPLIBS)
  
- .scheme-boot: compiler/repl.boot
- 	cp compiler/repl.boot .scheme-boot
-@@ -422,17 +422,17 @@
- compiler/filt.boot:	format.time compiler/vscmc.asm \
- 		compiler/version.asm compiler/filt-ml.asm
- 	cat compiler/vscmc.asm compiler/version.asm compiler/filt-ml.asm | \
--		./scheme -b - -a - -d compiler/filt.boot
-+		./vscm -b - -a - -d compiler/filt.boot
- 
- compiler/repl.boot:	format.time compiler/vscmc.asm \
- 		compiler/version.asm compiler/repl-ml.asm
- 	cat compiler/vscmc.asm compiler/version.asm compiler/repl-ml.asm | \
--		./scheme -b - -a - -d compiler/repl.boot
-+		./vscm -b - -a - -d compiler/repl.boot
- 
- compiler/vscmc.asm:	compiler/vscmc.scm
- 	-mv compiler/vscmc.asm compiler/vscmc.oasm >/dev/null 2>&1
- 	mv compiler/filt.boot compiler/filt.oboot
--	./scheme -b compiler/filt.oboot <compiler/vscmc.scm >compiler/vscmc.asm
-+	./vscm -b compiler/filt.oboot <compiler/vscmc.scm >compiler/vscmc.asm
- 
- compiler/vscmc.scm:	compiler/s.vscmc.scm
- 	-(cd compiler; \
+ .scheme-boot: compiler/O/repl.scb
+ 	cp compiler/O/repl.scb .scheme-boot
diff --git a/lang/vscm/patches/patch-ad b/lang/vscm/patches/patch-ad
new file mode 100644
index 00000000000..d2ee2449302
--- /dev/null
+++ b/lang/vscm/patches/patch-ad
@@ -0,0 +1,14 @@
+$NetBSD: patch-ad,v 1.1 2011/04/17 07:46:05 asau Exp $
+
+--- compiler/Makefile.orig	1999-02-09 08:05:04.000000000 +0300
++++ compiler/Makefile	2011-03-30 20:19:31.000000000 +0400
+@@ -1,7 +1,7 @@
+ SHELL =	/bin/sh
+ 
+-OSYS = ../scheme
+-NSYS = ../scheme
++OSYS = ../vscm
++NSYS = ../vscm
+ OOBJ = O
+ NOBJ = O
+