- Update to Release of 2005/12/11

- Fix build on 4-STABLE [1]

Submitted by:	vs [1]

6 files changed, 32 insertions, 28 deletions

diff --git a/lang/io/Makefile b/lang/io/Makefile
index 88c92632c258..6484e0fd9d43 100644
--- a/lang/io/Makefile
+++ b/lang/io/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	io
-PORTVERSION=	0.0.2005.12.05
-PORTREVISION=	1
+PORTVERSION=	0.0.2005.12.11
 CATEGORIES=	lang
 MASTER_SITES=	http://io.urbanape.com/release/ \
 		http://www.sigusr1.org/~steve/
@@ -26,6 +25,12 @@ WRKSRC=		${WRKDIR}/release/${DISTNAME}/
 MAKE_ENV=	INCS="-I${LOCALBASE}/include" LIBLOCAL="-L${LOCALBASE}/lib"
 BINDINGS_DEACTIVATE=	Font Image ObjcBridge OpenGL SGML SQLite SQLite3
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500000
+USE_GCC=	3.4+
+.endif
+
 pre-patch:
 	${FIND} ${WRKSRC} -name '.DS_Store*' -delete
 
@@ -39,7 +44,7 @@ pre-patch:
 
 	for mkf in `${FIND} ${WRKSRC} -iname Makefile`; do \
 		${REINPLACE_CMD} \
-			-e 's,^CFLAGS.*$$,CFLAGS+=$${INCS} $${INCLUDE},g' \
+			-e 's,^CFLAGS.*$$,CFLAGS+=-g $${INCS} $${INCLUDE},g' \
 			-e 's,^\(LFLAGS.*\)$$,\1 $${LIBLOCAL},g' \
 			-e 's,^CC=\(.*\)$$,CC?=\1,g' \
 			$$mkf; \
@@ -52,6 +57,10 @@ pre-patch:
 
 post-patch:
 	${FIND} ${WRKSRC} -name '*.orig' -delete
+.if ${OSVERSION} < 500000
+	@cd ${WRKSRC} && ${REINPLACE_CMD} -e 's/<stdint.h>/<inttypes.h>/' vm/base/_new/Array/Array.h vm/base/_new/Data.h vm/base/Common.h vm/base/NEW_stdint.h
+.endif
+
 
 do-install:
 .for fname in vm/io2c vm/io binaries/ioDesktop binaries/ioServer
@@ -77,4 +86,4 @@ do-install:
 .endfor
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/lang/io/distinfo b/lang/io/distinfo
index 1322481037e4..ded2cc95ed4b 100644
--- a/lang/io/distinfo
+++ b/lang/io/distinfo
@@ -1,3 +1,3 @@
-MD5 (IoFull-2005-12-05.tar.gz) = b089a1f16a36a158cd01c8f4463d84c5
-SHA256 (IoFull-2005-12-05.tar.gz) = 1b98490465074db8217fb27a1fe893357771bcbb26df09c4d0a8a88403ced4e3
-SIZE (IoFull-2005-12-05.tar.gz) = 19576494
+MD5 (IoFull-2005-12-11.tar.gz) = 040e12a759898e6ee72e2e104be10bd7
+SHA256 (IoFull-2005-12-11.tar.gz) = 8784cae2ed4c00f6c996e7d1ff36bf094dd60c258b8bccb9f2169c2a51225496
+SIZE (IoFull-2005-12-11.tar.gz) = 19328864
diff --git a/lang/io/files/patch-_build.io b/lang/io/files/patch-_build.io
deleted file mode 100644
index bfecc7cd9452..000000000000
--- a/lang/io/files/patch-_build.io
+++ /dev/null
@@ -1,11 +0,0 @@
---- _build.io.orig	Wed Dec  7 10:28:39 2005
-+++ _build.io	Wed Dec  7 10:30:02 2005
-@@ -74,7 +74,7 @@
-     )
-     
-     systemCall := method(s,
--		if(trySystemCall(s) == 256, System exit)    
-+		if(trySystemCall(s) == 256, System exit(1))    
-     )
- 
-     trySystemCall := method(s,
diff --git a/lang/io/files/patch-vm::_ioCode::Z_CLI.io b/lang/io/files/patch-vm::_ioCode::Z_CLI.io
deleted file mode 100644
index 9fb66c491c91..000000000000
--- a/lang/io/files/patch-vm::_ioCode::Z_CLI.io
+++ /dev/null
@@ -1,10 +0,0 @@
---- vm/_ioCode/Z_CLI.io	2005-12-04 23:12:32.000000000 +1300
-+++ vm/_ioCode/Z_CLI.io	2005-12-05 21:00:35.000000000 +1300
-@@ -35,6 +35,7 @@
- 			write(inPrompt)
- 			line := stdin readLine
- 			result := nil
-+			line ifNil(Lobby exit)
- 			e := try(result = Lobby doString(line))
- 			if (e, e showStack)
- 			writeln(outPrompt, result)
diff --git a/lang/io/files/patch-vm::base::Coro.c b/lang/io/files/patch-vm::base::Coro.c
new file mode 100644
index 000000000000..90c3624c83a8
--- /dev/null
+++ b/lang/io/files/patch-vm::base::Coro.c
@@ -0,0 +1,11 @@
+--- vm/base/Coro.c.orig	Sat Dec 17 12:04:01 2005
++++ vm/base/Coro.c	Sat Dec 17 12:04:11 2005
+@@ -9,7 +9,7 @@
+ {
+ 	Coro *self = (Coro *)calloc(1, sizeof(Coro));
+ 	self->stackSize = CSTACK_STACKSIZE;
+-	self->stack = calloc(1, self->stackSize);
++	self->stack = calloc(1, self->stackSize+1);
+ 	Coro_loop(self);
+ 	Coro_label_(self, "");
+ 	return self;
diff --git a/lang/io/pkg-plist b/lang/io/pkg-plist
index 768f14ffd60c..98a3a6547deb 100644
--- a/lang/io/pkg-plist
+++ b/lang/io/pkg-plist
@@ -91,6 +91,7 @@ include/io/base/NEW_stdint.h
 include/io/base/PHash.h
 include/io/base/PHash_inline.h
 include/io/base/PortableGettimeofday.h
+include/io/base/PortableStrlcpy.h
 include/io/base/PortableStrptime.h
 include/io/base/PortableTruncate.h
 include/io/base/PortableUsleep.h
@@ -110,10 +111,12 @@ lib/libIoFnmatch.a
 lib/libIoMD5.a
 lib/libIoRegex.a
 lib/libIoSHA1.a
+lib/libIoSkipDB.a
 lib/libIoSockets.a
 lib/libIoSyslog.a
 lib/libIoUser.a
 lib/libIoVM.a
+%%DOCSDIR%%/_darcsboring.txt
 %%DOCSDIR%%/docs.html
 %%DOCSDIR%%/embedding.html
 %%DOCSDIR%%/guide.html
@@ -126,6 +129,7 @@ lib/libIoVM.a
 %%EXAMPLESDIR%%/ioCode/A2_Exception.io
 %%EXAMPLESDIR%%/ioCode/Actor.io
 %%EXAMPLESDIR%%/ioCode/B_Sequence.io
+%%EXAMPLESDIR%%/ioCode/Block.io
 %%EXAMPLESDIR%%/ioCode/Date.io
 %%EXAMPLESDIR%%/ioCode/Directory.io
 %%EXAMPLESDIR%%/ioCode/File.io
@@ -184,6 +188,7 @@ lib/libIoVM.a
 %%EXAMPLESDIR%%/sampleCode/Hanoi.io
 %%EXAMPLESDIR%%/sampleCode/HelloWorld.io
 %%EXAMPLESDIR%%/sampleCode/Inheritance.io
+%%EXAMPLESDIR%%/sampleCode/Jer.io
 %%EXAMPLESDIR%%/sampleCode/LaunchPath.io
 %%EXAMPLESDIR%%/sampleCode/Ping.io
 %%EXAMPLESDIR%%/sampleCode/Ping.io copy