Update to Gambit C 4.6.5

Changes since version 4.6.3 include various build system fixes,
iOS REPL improvements, addition of Xlib examples.

6 files changed, 56 insertions, 15 deletions

diff --git a/lang/gambc/PLIST b/lang/gambc/PLIST
index 1542a028fd7..0669b6c948e 100644
--- a/lang/gambc/PLIST
+++ b/lang/gambc/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.4 2010/11/23 21:22:11 asau Exp $
-bin/gambc-cc.bat
-bin/gambc-doc.bat
+@comment $NetBSD: PLIST,v 1.5 2012/04/16 10:19:34 asau Exp $
+bin/gambc-cc
+bin/gambc-doc
 bin/gsc
 bin/gsc-script
 bin/gsi
@@ -14,6 +14,9 @@ bin/six-script
 include/gambit-not.h
 include/gambit.h
 info/gambit-c.info
+lib/_asm#.scm
+lib/_assert#.scm
+lib/_codegen#.scm
 lib/_eval#.scm
 lib/_gambc.c
 lib/_gambcgsc.c
@@ -27,6 +30,7 @@ lib/_repl#.scm
 lib/_std#.scm
 lib/_system#.scm
 lib/_thread#.scm
+lib/_x86#.scm
 lib/digest#.scm
 lib/digest.scm
 lib/gambit#.scm
diff --git a/lang/gambc/distinfo b/lang/gambc/distinfo
index 1133ac60da3..059d16fdbc5 100644
--- a/lang/gambc/distinfo
+++ b/lang/gambc/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.4 2010/11/23 21:22:11 asau Exp $
+$NetBSD: distinfo,v 1.5 2012/04/16 10:19:34 asau Exp $
 
-SHA1 (gambc-v4_6_0.tgz) = c95dd64aa917ea5b07403c3a77536b07413f38d9
-RMD160 (gambc-v4_6_0.tgz) = 90d73552123b3c9380afbbe3e6c8f1496ba60103
-Size (gambc-v4_6_0.tgz) = 8196859 bytes
+SHA1 (gambc-v4_6_5.tgz) = 16a73446440714aa1985c861aa225d0238528544
+RMD160 (gambc-v4_6_5.tgz) = 2ab84686483c541b1a2e182520740bf8293d266c
+Size (gambc-v4_6_5.tgz) = 10699787 bytes
 SHA1 (patch-aa) = 0c87076ccab2483865d269a6a3542e83b76563c5
-SHA1 (patch-ab) = d49f8dc9d33648536bc34f0efec88f2e6ee8c2c8
+SHA1 (patch-ab) = fb2adfbe600706d291876b858a4144be50c7c6e0
+SHA1 (patch-examples_iOS_build-gambit-iOS) = 73afbc3aeb7a10c844403ae526539498e9730148
+SHA1 (patch-examples_iOS_make-keys) = d556004fe8f87d66c3522a603ee6592047de992a
diff --git a/lang/gambc/patches/patch-ab b/lang/gambc/patches/patch-ab
index eb41517f85b..eb8dbd9d78f 100644
--- a/lang/gambc/patches/patch-ab
+++ b/lang/gambc/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2009/07/20 18:18:11 hasso Exp $
+$NetBSD: patch-ab,v 1.2 2012/04/16 10:19:34 asau Exp $
 
---- lib/os.h.orig	2009-07-20 19:29:42 +0300
-+++ lib/os.h	2009-07-20 19:30:15 +0300
-@@ -847,6 +847,8 @@ ___END_C_LINKAGE
+--- lib/os.h.orig	2012-02-07 20:27:30.000000000 +0000
++++ lib/os.h
+@@ -934,6 +934,8 @@ ___END_C_LINKAGE
  #define INCLUDE_pty_h
  #undef INCLUDE_util_h
  #define INCLUDE_util_h
@@ -10,4 +10,4 @@ $NetBSD: patch-ab,v 1.1 2009/07/20 18:18:11 hasso Exp $
 +#define INCLUDE_libutil_h
  #endif
  
- #ifdef USE_tcgetattr
+ #ifdef USE_getpt
diff --git a/lang/gambc/patches/patch-examples_iOS_build-gambit-iOS b/lang/gambc/patches/patch-examples_iOS_build-gambit-iOS
new file mode 100644
index 00000000000..00e303b1c39
--- /dev/null
+++ b/lang/gambc/patches/patch-examples_iOS_build-gambit-iOS
@@ -0,0 +1,22 @@
+$NetBSD: patch-examples_iOS_build-gambit-iOS,v 1.1 2012/04/16 10:19:34 asau Exp $
+
+--- examples/iOS/build-gambit-iOS.orig	2012-02-21 15:03:22.000000000 +0000
++++ examples/iOS/build-gambit-iOS
+@@ -111,7 +111,7 @@ get_gambit_dist_tgz()
+   rootfromhere="`grep \"^rootfromhere = *\" makefile 2> /dev/null | sed -e \"s/rootfromhere = //\"`"
+   gambit_dist="`grep \"^PACKAGE_TARNAME = *\" makefile 2> /dev/null | sed -e \"s/PACKAGE_TARNAME = *//\"`"
+ 
+-  if [ "$gambit_dist" == "" ]; then
++  if [ "$gambit_dist" = "" ]; then
+ 
+     download_gambit_dist_tgz
+ 
+@@ -151,7 +151,7 @@ make_gambit()
+   cd "$dir"
+   make clean
+   make -j 2
+-  if [ "$update_with_latest_changes" == "yes" ]; then
++  if [ "$update_with_latest_changes" = "yes" ]; then
+     make update
+     make -j 2
+   fi
diff --git a/lang/gambc/patches/patch-examples_iOS_make-keys b/lang/gambc/patches/patch-examples_iOS_make-keys
new file mode 100644
index 00000000000..b9dd81faff9
--- /dev/null
+++ b/lang/gambc/patches/patch-examples_iOS_make-keys
@@ -0,0 +1,13 @@
+$NetBSD: patch-examples_iOS_make-keys,v 1.1 2012/04/16 10:19:34 asau Exp $
+
+--- examples/iOS/make-keys.orig	2011-07-25 18:21:39.000000000 +0000
++++ examples/iOS/make-keys
+@@ -33,7 +33,7 @@ make_key_with_wh()
+ 
+   FONT_SIZE=`expr \( ${KEY_HEIGHT} \* 1000 \) / 1625`
+ 
+-  if [ "${IMAGE}" == "" ]; then
++  if [ "${IMAGE}" = "" ]; then
+ 
+     DRAW_IMAGE=""
+ 
diff --git a/lang/gambc/version.mk b/lang/gambc/version.mk
index 3729ea3eb3b..986d41cbadb 100644
--- a/lang/gambc/version.mk
+++ b/lang/gambc/version.mk
@@ -1,10 +1,10 @@
-# $NetBSD: version.mk,v 1.3 2010/11/23 21:22:11 asau Exp $
+# $NetBSD: version.mk,v 1.4 2012/04/16 10:19:34 asau Exp $
 ###
 .if !defined(GAMBC_VERSION_MK)
 GAMBC_VERSION_MK=	# empty
 ###
 ### The package version sets the distribution version.
 ###
-GAMBC_VERSION=		4.6.0
+GAMBC_VERSION=		4.6.5
 GAMBC_DIST_VERSION=	${GAMBC_VERSION:C|^.*|v&|:S|.|_|g}
 .endif