Sun Apr 17 07:46:06 2011 UTC ()
Update VCSM to V4R2.
Changes are unknown (no information published), homepage is gone.


(asau)
diff -r1.17 -r1.18 pkgsrc/lang/vscm/Makefile
diff -r1.3 -r1.4 pkgsrc/lang/vscm/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/lang/vscm/patches/patch-aa
diff -r1.2 -r1.3 pkgsrc/lang/vscm/patches/patch-ab
diff -r0 -r1.1 pkgsrc/lang/vscm/patches/patch-ad
cvs diff -r1.17 -r1.18 pkgsrc/lang/vscm/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/vscm/Makefile 2009/06/30 00:07:18 1.17
+++ pkgsrc/lang/vscm/Makefile 2011/04/17 07:46:05 1.18
@@ -1,36 +1,31 @@ @@ -1,36 +1,31 @@
1# $NetBSD: Makefile,v 1.17 2009/06/30 00:07:18 joerg Exp $ 1# $NetBSD: Makefile,v 1.18 2011/04/17 07:46:05 asau Exp $
2 2
3DISTNAME= vscmV0r4 3DISTNAME= vscmV1R2
4PKGNAME= vscm-0.4 4PKGNAME= vscm-1.4
5PKGREVISION= 2 
6CATEGORIES= lang 5CATEGORIES= lang
7MASTER_SITES= ftp://ftp.cs.indiana.edu/pub/scheme-repository/imp/vscm/ 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vscm/} \
8 7 ftp://ftp.cs.indiana.edu/pub/scheme-repository/imp/vscm/
9PATCHFILES= bugfix.txt 
10PATCH_SITES= ${MASTER_SITES} 
11 8
12MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
13HOMEPAGE= http://www.cs.princeton.edu/~blume/vscm/ 10#HOMEPAGE= http://www.cs.princeton.edu/~blume/vscm/
14COMMENT= Portable scheme implementation 11COMMENT= Portable scheme implementation
15 12
16PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
17 14
18MAKE_JOBS_SAFE= no 15MAKE_JOBS_SAFE= no
19 16
20USE_TOOLS+= gmake 17USE_TOOLS+= gmake
21 18
22INSTALLATION_DIRS= bin 19INSTALLATION_DIRS= bin lib/vscm share/doc/vscm
23 20
24post-patch: 21post-patch:
25 ${SED} -e "s,@PREFIX@,${PREFIX}," ${FILESDIR}/path.h >${WRKSRC}/path.h 22 ${SED} -e "s,@PREFIX@,${PREFIX}," ${FILESDIR}/path.h >${WRKSRC}/path.h
26 23
27do-install: 24do-install:
28 ${INSTALL_PROGRAM} ${WRKSRC}/vscm ${DESTDIR}${PREFIX}/bin 25 ${INSTALL_PROGRAM} ${WRKSRC}/vscm ${DESTDIR}${PREFIX}/bin
29 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/vscm 
30 ${INSTALL_DATA} ${WRKSRC}/.scheme-boot \ 26 ${INSTALL_DATA} ${WRKSRC}/.scheme-boot \
31 ${DESTDIR}${PREFIX}/lib/vscm/vscm-boot 27 ${DESTDIR}${PREFIX}/lib/vscm/vscm-boot
32 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/vscm 
33 cd ${WRKSRC} && ${INSTALL_DATA} README INSTALL DESCRIPTION \ 28 cd ${WRKSRC} && ${INSTALL_DATA} README INSTALL DESCRIPTION \
34 ${DESTDIR}${PREFIX}/share/doc/vscm 29 ${DESTDIR}${PREFIX}/share/doc/vscm
35 30
36.include "../../mk/bsd.pkg.mk" 31.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/lang/vscm/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/vscm/distinfo 2005/02/24 09:03:12 1.3
+++ pkgsrc/lang/vscm/distinfo 2011/04/17 07:46:05 1.4
@@ -1,11 +1,9 @@ @@ -1,11 +1,9 @@
1$NetBSD: distinfo,v 1.3 2005/02/24 09:03:12 agc Exp $ 1$NetBSD: distinfo,v 1.4 2011/04/17 07:46:05 asau Exp $
2 2
3SHA1 (vscmV0r4.tar.gz) = 8a571a4f1dfe0dbd568fb13efd61f66caf189980 3SHA1 (vscmV1R2.tar.gz) = 5c9107d825370e2a3b0d02c008faee2ca9f35eba
4RMD160 (vscmV0r4.tar.gz) = 709de774f7e766f8113322841516d2fbe05782db 4RMD160 (vscmV1R2.tar.gz) = 3c405b384b4fb55594fd9a84c3aec6f10cda6bae
5Size (vscmV0r4.tar.gz) = 136981 bytes 5Size (vscmV1R2.tar.gz) = 229752 bytes
6SHA1 (bugfix.txt) = e0aea092fc71ab931ba4ca2eb495b171ec6921f5 6SHA1 (patch-aa) = 3c85e4519b8d17724672b093889016ec6bee5402
7RMD160 (bugfix.txt) = a1b0e40eff8c3fd8e66e88f4963371825cfe5c16 7SHA1 (patch-ab) = 8b4d68a93411af6dab109f058c0b189375e0b294
8Size (bugfix.txt) = 1184 bytes 
9SHA1 (patch-aa) = 5b98a6330ac897ea26beb838b28c97503f419e0d 
10SHA1 (patch-ab) = ccc424a8d0523b2570676a0a942d43605b35207a 
11SHA1 (patch-ac) = 73adae14da2fb236fb41277a17e0b936a75b9433 8SHA1 (patch-ac) = 73adae14da2fb236fb41277a17e0b936a75b9433
 9SHA1 (patch-ad) = 80ccfbe99d114cd6695faf09f4d27a22e68a31cb
cvs diff -r1.1.1.1 -r1.2 pkgsrc/lang/vscm/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/lang/vscm/patches/patch-aa 2000/11/02 11:01:53 1.1.1.1
+++ pkgsrc/lang/vscm/patches/patch-aa 2011/04/17 07:46:05 1.2
@@ -1,54 +1,54 @@ @@ -1,54 +1,54 @@
1$NetBSD: patch-aa,v 1.1.1.1 2000/11/02 11:01:53 itojun Exp $ 1$NetBSD: patch-aa,v 1.2 2011/04/17 07:46:05 asau Exp $
2 2
3--- Numeric.c- Thu Nov 2 19:38:25 2000 3--- Numeric.c.orig 1999-02-09 08:05:13.000000000 +0300
4+++ Numeric.c Thu Nov 2 19:38:38 2000 4+++ Numeric.c 2011-03-30 20:17:55.000000000 +0400
5@@ -504,7 +504,7 @@ 5@@ -591,7 +591,7 @@
 6 return len;
6 } 7 }
7  8
8 static bigdig 9-static bigdig qdiv (bigdig *a, bigreg b, bigdig *c, bigreg *r, int la)
9- qdiv (bigdig *a, bigreg b, bigdig *c, bigreg *r, int la) 10+static bigdig qdiv__ (bigdig *a, bigreg b, bigdig *c, bigreg *r, int la)
10+ qdiv__ (bigdig *a, bigreg b, bigdig *c, bigreg *r, int la) 
11 { 11 {
12 int i; 12 int i;
13 bigreg d; 13 bigreg d;
14@@ -937,11 +937,11 @@ 14@@ -1212,11 +1212,11 @@
15 (void) normalize (d, &ld, 0); 15 (void) normalize (d, &ld, 0);
16 } else if (gcd [0] != 1) { 16 } else if (gcd [0] != 1) {
17 tmp_n = provide_bignum (tmp_n, &tmp_ln, ln); 17 PROVIDE_BIGNUM (tmp_n, ln);
18- if (qdiv (n, gcd [0], tmp_n, &r, ln) == 0) 18- if (qdiv (n, gcd [0], tmp_n_dig, &r, ln) == 0)
19+ if (qdiv__ (n, gcd [0], tmp_n, &r, ln) == 0) 19+ if (qdiv__ (n, gcd [0], tmp_n_dig, &r, ln) == 0)
20 --ln; 20 --ln;
21 n = tmp_n; 21 n = tmp_n_dig;
22 tmp_d = provide_bignum (tmp_d, &tmp_ld, ld); 22 PROVIDE_BIGNUM (tmp_d, ld);
23- if (qdiv (d, gcd [0], tmp_d, &r, ld) == 0) 23- if (qdiv (d, gcd [0], tmp_d_dig, &r, ld) == 0)
24+ if (qdiv__ (d, gcd [0], tmp_d, &r, ld) == 0) 24+ if (qdiv__ (d, gcd [0], tmp_d_dig, &r, ld) == 0)
25 --ld; 25 --ld;
26 d = tmp_d; 26 d = tmp_d_dig;
27 } else { 27 } else {
28@@ -1428,7 +1428,7 @@ 28@@ -1939,7 +1939,7 @@
29 tmp1_dig = provide_bignum (tmp1_dig, &tmp1_len, a->nlength); 29 PROVIDE_BIGNUM (tmp1, a->nlength);
30 tmp2_dig = provide_bignum (tmp2_dig, &tmp2_len, 1); 30 PROVIDE_BIGNUM (tmp2, 1);
31 l1 = a->nlength; 31 l1 = a->nlength;
32- qdiv (a->dig, a->dig [a->nlength], tmp1_dig, &rr, a->nlength); 32- qdiv (a->dig, a->dig [a->nlength], tmp1_dig, &rr, a->nlength);
33+ qdiv__ (a->dig, a->dig [a->nlength], tmp1_dig, &rr, a->nlength); 33+ qdiv__ (a->dig, a->dig [a->nlength], tmp1_dig, &rr, a->nlength);
34 tmp2_dig [0] = rr; 34 tmp2_dig [0] = rr;
35 (void) normalize (tmp1_dig, &l1, 0); 35 (void) normalize (tmp1_dig, &l1, 0);
36 r = tmp2_dig; 36 r = tmp2_dig;
37@@ -1899,7 +1899,7 @@ 37@@ -2407,7 +2407,7 @@
38 bigdig_copy (a, tmp1_dig, la); 38 bigdig_copy (a, tmp1_dig, la);
39 s = strg; 39 s = strg;
40 while (la > 1 || tmp1_dig [0] > 0) { 40 while (la > 1 || tmp1_dig [0] > 0) {
41- if (qdiv (tmp1_dig, 10000, tmp1_dig, &r, la) == 0) 41- if (qdiv (tmp1_dig, 10000, tmp1_dig, &r, la) == 0)
42+ if (qdiv__ (tmp1_dig, 10000, tmp1_dig, &r, la) == 0) 42+ if (qdiv__ (tmp1_dig, 10000, tmp1_dig, &r, la) == 0)
43 --la; 43 --la;
44 sprintf (buf, "%04u", (unsigned) r); 44 sprintf (buf, "%04u", (unsigned) r);
45 for (i = 3; i >= 0; i--) 45 for (i = 3; i >= 0; i--)
46@@ -2729,7 +2729,7 @@ 46@@ -3312,7 +3312,7 @@
47 qq = ((ScmFixnum *) gcs3)->dig; 47 PROVIDE_BIGNUM (tmp1, lq);
48 } else 48 qq = tmp1_dig;
49 qq = tmp1_dig = provide_bignum (tmp1_dig, &tmp1_len, lq); 49 }
50- if (qdiv (a->dig, b->dig [0], qq, &rr, lq) == 0) 50- if (qdiv (a->dig, bb, qq, &rr, lq) == 0)
51+ if (qdiv__ (a->dig, b->dig [0], qq, &rr, lq) == 0) 51+ if (qdiv__ (a->dig, bb, qq, &rr, lq) == 0)
52 --lq; 52 --lq;
53 if (r != NULL) { 53 if (r != NULL)
54 int sign = a->sign; 54 *r = ScmLongToNumber (a->sign ? - (long) rr : rr);
cvs diff -r1.2 -r1.3 pkgsrc/lang/vscm/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/lang/vscm/patches/patch-ab 2001/04/12 20:21:59 1.2
+++ pkgsrc/lang/vscm/patches/patch-ab 2011/04/17 07:46:05 1.3
@@ -1,56 +1,33 @@ @@ -1,56 +1,33 @@
1$NetBSD: patch-ab,v 1.2 2001/04/12 20:21:59 jtb Exp $ 1$NetBSD: patch-ab,v 1.3 2011/04/17 07:46:05 asau Exp $
2 2
3--- Makefile.orig Fri Aug 5 15:31:07 1994 3--- Makefile.orig 1999-02-09 08:24:08.000000000 +0300
4+++ Makefile 4+++ Makefile 2011-03-30 20:15:36.000000000 +0400
5@@ -49,8 +49,8 @@ 5@@ -42,8 +42,8 @@
6 # this is what works for me on a DEC Alpha, running OSF/1: 6 # ``-DNDEBUG'' etc.
7 # (gcc version 2.5.7) 7
8  8
9- CC = gcc 9- CC = gcc
10- OPTFLAGS = -O2 -funroll-loops -fomit-frame-pointer 10- OPTFLAGS = -O2
11+# CC = gcc 11+# CC = gcc
12+ OPTFLAGS = -funroll-loops -fomit-frame-pointer 12+# OPTFLAGS = -O2
13 WARNFLAGS = -Wall -Wmissing-prototypes 13 WARNFLAGS = -Wall -Wmissing-prototypes
14 DEBUGFLAGS = 14 DEBUGFLAGS = -g
15 EXTRACFLAGS = 15 EXTRACFLAGS = -DADJUSTABLE_SFIXNUM_RANGE -DVSCM_POSIX
16@@ -208,7 +208,7 @@ 16@@ -183,7 +183,7 @@
17 .DEFAULT: 17 .DEFAULT:
18 @echo I hope, making $< is not necessary... 18 @echo I hope, making $< is not necessary...
19  19
20-CFLAGS = $(A_OPTFLAGS) $(A_WARNFLAGS) $(A_DEBUGFLAGS) $(A_EXTRACFLAGS) $(DDP) 20-CFLAGS = $(A_OPTFLAGS) $(A_WARNFLAGS) $(A_DEBUGFLAGS) $(A_EXTRACFLAGS) $(DDP)
21+CFLAGS += $(A_OPTFLAGS) $(A_WARNFLAGS) $(A_DEBUGFLAGS) $(A_EXTRACFLAGS) $(DDP) 21+CFLAGS += $(A_OPTFLAGS) $(A_WARNFLAGS) $(A_DEBUGFLAGS) $(A_EXTRACFLAGS) $(DDP)
22 LDFLAGS = $(A_OPTFLAGS) $(A_DEBUGFLAGS) $(A_EXTRALDFLAGS) 22 LDFLAGS = $(A_OPTFLAGS) $(A_DEBUGFLAGS) $(A_EXTRALDFLAGS)
23 CLFLAGS = $(CFLAGS) $(A_EXTRALDFLAGS) 23 CLFLAGS = $(CFLAGS) $(A_EXTRALDFLAGS)
24 LIBS = -lm $(A_EXTRALIBS) 24 LIBS = -lm $(A_EXTRALIBS)
25@@ -413,8 +413,8 @@ 25@@ -351,7 +351,7 @@
26 distclean: archclean 26 $(FORCEDELETE) $*.o
27 $(FORCEDELETE) compiler/repl.boot 
28  27
29-scheme: $(OBJECTS) $(TMPLIBS) 28 scheme: $(OBJECTS) $(TMPLIBS)
30- $(CC) -o scheme $(LDFLAGS) $(OBJECTS) $(LIBS) -lc $(TMPLIBS) 29- $(CC) -o scheme $(LDFLAGS) $(OBJECTS) $(LIBS) -lc $(TMPLIBS)
31+scheme: $(OBJECTS) non-ansi-lib $(TMPLIBS) 
32+ $(CC) -o vscm $(LDFLAGS) $(OBJECTS) $(LIBS) -lc $(TMPLIBS) 30+ $(CC) -o vscm $(LDFLAGS) $(OBJECTS) $(LIBS) -lc $(TMPLIBS)
33  31
34 .scheme-boot: compiler/repl.boot 32 .scheme-boot: compiler/O/repl.scb
35 cp compiler/repl.boot .scheme-boot 33 cp compiler/O/repl.scb .scheme-boot
36@@ -422,17 +422,17 @@ 
37 compiler/filt.boot: format.time compiler/vscmc.asm \ 
38 compiler/version.asm compiler/filt-ml.asm 
39 cat compiler/vscmc.asm compiler/version.asm compiler/filt-ml.asm | \ 
40- ./scheme -b - -a - -d compiler/filt.boot 
41+ ./vscm -b - -a - -d compiler/filt.boot 
42  
43 compiler/repl.boot: format.time compiler/vscmc.asm \ 
44 compiler/version.asm compiler/repl-ml.asm 
45 cat compiler/vscmc.asm compiler/version.asm compiler/repl-ml.asm | \ 
46- ./scheme -b - -a - -d compiler/repl.boot 
47+ ./vscm -b - -a - -d compiler/repl.boot 
48  
49 compiler/vscmc.asm: compiler/vscmc.scm 
50 -mv compiler/vscmc.asm compiler/vscmc.oasm >/dev/null 2>&1 
51 mv compiler/filt.boot compiler/filt.oboot 
52- ./scheme -b compiler/filt.oboot <compiler/vscmc.scm >compiler/vscmc.asm 
53+ ./vscm -b compiler/filt.oboot <compiler/vscmc.scm >compiler/vscmc.asm 
54  
55 compiler/vscmc.scm: compiler/s.vscmc.scm 
56 -(cd compiler; \ 
File Added: pkgsrc/lang/vscm/patches/patch-ad
$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