Update TinyScheme to version 1.40.

Changes are unknown (ChangeLog doesn't say anything since version 1.38).

3 files changed, 33 insertions, 40 deletions

diff --git a/lang/tinyscheme/Makefile b/lang/tinyscheme/Makefile
index b8c75c6688b..e424c3736b3 100644
--- a/lang/tinyscheme/Makefile
+++ b/lang/tinyscheme/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2010/08/12 10:22:40 asau Exp $
+# $NetBSD: Makefile,v 1.13 2011/04/16 16:10:59 asau Exp $
 
-DISTNAME=	tinyscheme1.39
-PKGNAME=	tinyscheme-1.39
+DISTNAME=	tinyscheme-1.40
 CATEGORIES=	lang
 MASTER_SITES=	$(MASTER_SITE_SOURCEFORGE:=tinyscheme/)
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://tinyscheme.sourceforge.net/home.html
diff --git a/lang/tinyscheme/distinfo b/lang/tinyscheme/distinfo
index 701daf1d342..5467a7c48ab 100644
--- a/lang/tinyscheme/distinfo
+++ b/lang/tinyscheme/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2010/08/12 10:22:40 asau Exp $
+$NetBSD: distinfo,v 1.11 2011/04/16 16:10:59 asau Exp $
 
-SHA1 (tinyscheme1.39.zip) = d759bff93683399ee7abbfd1a822d000adb22a0c
-RMD160 (tinyscheme1.39.zip) = d8d365ccceb9482ffd457fd6d4f97c1651e131e9
-Size (tinyscheme1.39.zip) = 58751 bytes
-SHA1 (patch-aa) = 94cac80297b4e89e2fe2ff8a575c616354aa122d
+SHA1 (tinyscheme-1.40.tar.gz) = e03f7ac41f0517bb35eced2772c79eb9db42ea82
+RMD160 (tinyscheme-1.40.tar.gz) = 1eac087a90c2c2e8ca5f4cefbc5660b96491e4b3
+Size (tinyscheme-1.40.tar.gz) = 60160 bytes
+SHA1 (patch-aa) = 47462044ec20f3c4f9cc551e22e69007c4bf85d8
diff --git a/lang/tinyscheme/patches/patch-aa b/lang/tinyscheme/patches/patch-aa
index cd732c7a12d..54a051113cb 100644
--- a/lang/tinyscheme/patches/patch-aa
+++ b/lang/tinyscheme/patches/patch-aa
@@ -1,58 +1,53 @@
-$NetBSD: patch-aa,v 1.7 2010/08/12 10:22:41 asau Exp $
+$NetBSD: patch-aa,v 1.8 2011/04/16 16:10:59 asau Exp $
 
---- makefile.orig	2006-12-07 13:29:24.000000000 +0300
-+++ makefile	2010-08-12 14:14:07.000000000 +0400
+--- makefile.orig	2011-01-16 10:51:17.000000000 +0300
++++ makefile	2011-03-30 20:38:01.000000000 +0400
 @@ -18,7 +18,7 @@
  #AR= echo
  
- # Unix, generally 
--CC = gcc -fpic 
-+#CC = gcc -fpic 
- DEBUG=-g -Wall -Wno-char-subscripts -O 
- Osuf=o 
- SOsuf=so 
-@@ -28,16 +28,17 @@
- OUT = -o $@ 
+ # Unix, generally
+-CC = gcc -fpic
++#CC = gcc -fpic
+ DEBUG=-g -Wall -Wno-char-subscripts -O
+ Osuf=o
+ SOsuf=so
+@@ -28,12 +28,13 @@
+ OUT = -o $@
  RM= -rm -f
  AR= ar crs
 +SYS_LIBS= -lm
-  
- # Linux 
- LD = gcc 
- LDFLAGS = -shared 
+ 
+ # Linux
+ LD = gcc
+ LDFLAGS = -shared
  DEBUG=-g -Wno-char-subscripts -O
 -SYS_LIBS= -ldl
 +#SYS_LIBS= -ldl
  PLATFORM_FEATURES= -DSUN_DL=1
  
  # Cygwin
--PLATFORM_FEATURES = -DUSE_STRLWR=0
-+#PLATFORM_FEATURES = -DUSE_STRLWR=0
- 
-  
- # Solaris 
 @@ -57,19 +58,23 @@
- LIBTARGET = $(LIBPREFIX)tinyscheme.$(SOsuf) 
+ LIBTARGET = $(LIBPREFIX)tinyscheme.$(SOsuf)
  STATICLIBTARGET = $(LIBPREFIX)tinyscheme.$(LIBsuf)
  
 -all: $(LIBTARGET) $(STATICLIBTARGET) scheme$(EXE_EXT)
 +all: $(STATICLIBTARGET) scheme$(EXE_EXT)
  
--%.$(Osuf): %.c 
--	$(CC) -I. -c $(DEBUG) $(FEATURES) $(DL_FLAGS) $< 
+-%.$(Osuf): %.c
+-	$(CC) -I. -c $(DEBUG) $(FEATURES) $(DL_FLAGS) $<
 -
--$(LIBTARGET): $(OBJS) 
--	$(LD) $(LDFLAGS) $(OUT) $(OBJS) $(SYS_LIBS) 
+-$(LIBTARGET): $(OBJS)
+-	$(LD) $(LDFLAGS) $(OUT) $(OBJS) $(SYS_LIBS)
 +.c.$(Osuf):
-+	$(LIBTOOL) --mode=compile $(CC) -I. -c $(DEBUG) $(FEATURES) $(DL_FLAGS) $< 
++	$(LIBTOOL) --mode=compile $(CC) -I. -c $(DEBUG) $(FEATURES) $(DL_FLAGS) $<
  
- scheme$(EXE_EXT): $(OBJS) 
--	$(CC) -o $@ $(DEBUG) $(OBJS) $(SYS_LIBS) 
-+	$(LIBTOOL) --mode=link $(CC) -o $@ $(DEBUG) $(OBJS) $(LIBS:.a=.la) $(SYS_LIBS) 
+ scheme$(EXE_EXT): $(OBJS)
+-	$(CC) -o $@ $(DEBUG) $(OBJS) $(SYS_LIBS)
++	$(LIBTOOL) --mode=link $(CC) -o $@ $(DEBUG) $(OBJS) $(LIBS:.a=.la) $(SYS_LIBS)
  
  $(STATICLIBTARGET): $(OBJS)
 -	$(AR) $@ $(OBJS)
-+	$(LIBTOOL) --mode=link $(CC) -o $(.TARGET:.a=.la) $(OBJS:.o=.lo) -rpath $(PREFIX)/lib -version-info 1:39
++	$(LIBTOOL) --mode=link $(CC) -o $(.TARGET:.a=.la) $(OBJS:.o=.lo) -rpath $(PREFIX)/lib -version-info 1:40
 +
 +install: all
 +	$(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) $(STATICLIBTARGET:.a=.la) $(DESTDIR)$(PREFIX)/lib
@@ -62,4 +57,4 @@ $NetBSD: patch-aa,v 1.7 2010/08/12 10:22:41 asau Exp $
 +	$(BSD_INSTALL_DATA) scheme.h $(DESTDIR)$(PREFIX)/include/tinyscheme.h
  
  $(OBJS): scheme.h scheme-private.h opdefines.h
- dynload.$(Osuf): dynload.h 
+ dynload.$(Osuf): dynload.h