This updates lang/io to the most recent GitHub commit. The last
official release was over 18 months ago, and git HEAD seems stable.
Passes the internal tests other than NaN being displayed as "-nan"
instead of "nan". Also passes the tests for the io library I wrote a
few years ago.
The amd64 coroutine patch was accepted upstream shortly after I wrote it
at p2k12. A minor patch is need for the libmemcached addon, and there
is a new cairo addon. cairo was already a dependency, so this is just
an io library for it.
Tested on amd64. Can anyone test on i386? OKs?
Thanks,
Jeremy
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/io/Makefile,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 Makefile
--- Makefile 7 Nov 2014 10:07:40 -0000 1.17
+++ Makefile 18 Jul 2015 17:45:36 -0000
@@ -5,9 +5,7 @@ ONLY_FOR_ARCHS =i386 amd64
COMMENT = embeddable prototype-based language
-DISTNAME = stevedekorte-io-2011.09.12-106-g02f9800
-PKGNAME = io-20110905
-REVISION = 11
+PKGNAME = io-20150629
CATEGORIES = lang
@@ -16,12 +14,14 @@ SHARED_LIBS = iovmall 0.0 \
coroutine 0.0 \
garbagecollector 0.0
-MASTER_SITES = http://spacehopper.org/mirrors/
-
HOMEPAGE = http://iolanguage.org/
MAINTAINER = Jeremy Evans <[email protected]>
+GH_ACCOUNT = stevedekorte
+GH_PROJECT = io
+GH_COMMIT = fb9098698e8e54e6d03dbfdd68b1d37ced7d1b20
+
# BSD
PERMIT_PACKAGE_CDROM= Yes
@@ -59,7 +59,6 @@ MODULES = devel/cmake \
devel/gettext \
lang/python
-WRKDIST = ${WRKDIR}/stevedekorte-io-02f9800
WRKBUILD = ${WRKSRC}/build
# Segfaults during the build otherwise
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/io/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo 17 Dec 2012 23:55:28 -0000 1.1.1.1
+++ distinfo 18 Jul 2015 17:31:06 -0000
@@ -1,2 +1,2 @@
-SHA256 (stevedekorte-io-2011.09.12-106-g02f9800.tar.gz) =
SvZVVnznOu/C+Rblkd4FAwOj6ysdPSc+D8R92ojJHvc=
-SIZE (stevedekorte-io-2011.09.12-106-g02f9800.tar.gz) = 9133963
+SHA256 (.tar.gz) = 2QwnopEQsfFlxuvjRvoSaiYT8FivxMo+KHiw0hvY9V4=
+SIZE (.tar.gz) = 9146861
Index: patches/patch-addons_Memcached_source_IoMemcached_c
===================================================================
RCS file: patches/patch-addons_Memcached_source_IoMemcached_c
diff -N patches/patch-addons_Memcached_source_IoMemcached_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-addons_Memcached_source_IoMemcached_c 18 Jul 2015 17:42:15
-0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Update to current libmemcached API.
+
+--- addons/Memcached/source/IoMemcached.c.orig Sat Jul 18 11:41:18 2015
++++ addons/Memcached/source/IoMemcached.c Sat Jul 18 11:41:50 2015
+@@ -476,7 +476,7 @@ IoObject *IoMemcached_stats(IoMemcached *self, IoObjec
+ int errors = 0;
+ uint32_t pos = 0;
+ while(pos < memcached_server_count(DATA(self)->mc)) {
+- const memcached_instance_st *server =
memcached_server_instance_by_position(DATA(self)->mc, pos);
++ const memcached_server_instance_st *server =
memcached_server_instance_by_position(DATA(self)->mc, pos);
+ if(server == NULL)
+ continue;
+
Index: patches/patch-libs_coroutine_source_Coro_c
===================================================================
RCS file: patches/patch-libs_coroutine_source_Coro_c
diff -N patches/patch-libs_coroutine_source_Coro_c
--- patches/patch-libs_coroutine_source_Coro_c 17 Dec 2012 23:55:28 -0000
1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-libs_coroutine_source_Coro_c,v 1.1.1.1 2012/12/17 23:55:28
jeremy Exp $
-
-On amd64, thread stacks must be 16-byte aligned, it's required by
-the ABI. Without this, a bus error occurs when formatting a
-number as a string, inside snprintf, since it uses the movaps
-instruction to move data from the xmm0 register to a non 16-byte
-aligned memory location.
-
---- libs/coroutine/source/Coro.c.orig Thu Oct 11 17:12:01 2012
-+++ libs/coroutine/source/Coro.c Thu Oct 11 17:20:45 2012
-@@ -599,7 +599,7 @@ end:
- if (64 > (- sav[i] + (uintptr_t)&i))
- break;
- assert(i < sz);
-- sav[i] = stackend - sizeof(uintptr_t) - 128;
-+ sav[i] = stackend - sizeof(uintptr_t)*2 - 128;
- }
- }
-
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/lang/io/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 PLIST
--- pkg/PLIST 10 Apr 2014 16:01:12 -0000 1.4
+++ pkg/PLIST 18 Jul 2015 17:50:29 -0000
@@ -218,6 +218,105 @@ lib/io/addons/CGI/tests/
lib/io/addons/CGI/tests/correctness/
lib/io/addons/CGI/tests/correctness/CGITest.io
lib/io/addons/CGI/tests/correctness/run.io
+lib/io/addons/Cairo/
+lib/io/addons/Cairo/CMakeLists.txt
+lib/io/addons/Cairo/_build/
+lib/io/addons/Cairo/_build/binaries/
+lib/io/addons/Cairo/_build/dll/
+lib/io/addons/Cairo/_build/dll/libIoCairo.so
+lib/io/addons/Cairo/_build/headers/
+lib/io/addons/Cairo/_build/lib/
+lib/io/addons/Cairo/_build/objs/
+lib/io/addons/Cairo/depends
+lib/io/addons/Cairo/io/
+lib/io/addons/Cairo/io/Cairo.io
+lib/io/addons/Cairo/io/Z_RemoveGlobalAccess.io
+lib/io/addons/Cairo/protos
+lib/io/addons/Cairo/samples/
+lib/io/addons/Cairo/samples/Sample.io
+lib/io/addons/Cairo/samples/arc.io
+lib/io/addons/Cairo/samples/arcNegative.io
+lib/io/addons/Cairo/samples/chart.io
+lib/io/addons/Cairo/samples/clip.io
+lib/io/addons/Cairo/samples/clipImage.io
+lib/io/addons/Cairo/samples/curveRectangle.io
+lib/io/addons/Cairo/samples/curveTo.io
+lib/io/addons/Cairo/samples/dash.io
+lib/io/addons/Cairo/samples/data/
+lib/io/addons/Cairo/samples/data/romedalen.png
+lib/io/addons/Cairo/samples/fillAndStroke.io
+lib/io/addons/Cairo/samples/fillAndStroke2.io
+lib/io/addons/Cairo/samples/fillAndStroke2.png
+lib/io/addons/Cairo/samples/gradient.io
+lib/io/addons/Cairo/samples/image.io
+lib/io/addons/Cairo/samples/imagePattern.io
+lib/io/addons/Cairo/samples/multiSegmentCaps.io
+lib/io/addons/Cairo/samples/path.io
+lib/io/addons/Cairo/samples/runAll.io
+lib/io/addons/Cairo/samples/setLineCap.io
+lib/io/addons/Cairo/samples/setLineJoin.io
+lib/io/addons/Cairo/samples/text.io
+lib/io/addons/Cairo/samples/textAlignCenter.io
+lib/io/addons/Cairo/samples/textExtents.io
+lib/io/addons/Cairo/source/
+lib/io/addons/Cairo/source/IoCairo.c
+lib/io/addons/Cairo/source/IoCairo.h
+lib/io/addons/Cairo/source/IoCairoContext.c
+lib/io/addons/Cairo/source/IoCairoContext.h
+lib/io/addons/Cairo/source/IoCairoExtents.c
+lib/io/addons/Cairo/source/IoCairoExtents.h
+lib/io/addons/Cairo/source/IoCairoFontExtents.c
+lib/io/addons/Cairo/source/IoCairoFontExtents.h
+lib/io/addons/Cairo/source/IoCairoFontFace.c
+lib/io/addons/Cairo/source/IoCairoFontFace.h
+lib/io/addons/Cairo/source/IoCairoFontOptions.c
+lib/io/addons/Cairo/source/IoCairoFontOptions.h
+lib/io/addons/Cairo/source/IoCairoGlyph.c
+lib/io/addons/Cairo/source/IoCairoGlyph.h
+lib/io/addons/Cairo/source/IoCairoGradient.c
+lib/io/addons/Cairo/source/IoCairoGradient.h
+lib/io/addons/Cairo/source/IoCairoImageSurface.c
+lib/io/addons/Cairo/source/IoCairoImageSurface.h
+lib/io/addons/Cairo/source/IoCairoInit.c
+lib/io/addons/Cairo/source/IoCairoLinearGradient.c
+lib/io/addons/Cairo/source/IoCairoLinearGradient.h
+lib/io/addons/Cairo/source/IoCairoMatrix.c
+lib/io/addons/Cairo/source/IoCairoMatrix.h
+lib/io/addons/Cairo/source/IoCairoPDFSurface.h
+lib/io/addons/Cairo/source/IoCairoPSSurface.h
+lib/io/addons/Cairo/source/IoCairoPath.c
+lib/io/addons/Cairo/source/IoCairoPath.h
+lib/io/addons/Cairo/source/IoCairoPathElement.c
+lib/io/addons/Cairo/source/IoCairoPathElement.h
+lib/io/addons/Cairo/source/IoCairoPattern.c
+lib/io/addons/Cairo/source/IoCairoPattern.h
+lib/io/addons/Cairo/source/IoCairoPattern_inline.h
+lib/io/addons/Cairo/source/IoCairoRadialGradient.c
+lib/io/addons/Cairo/source/IoCairoRadialGradient.h
+lib/io/addons/Cairo/source/IoCairoRectangle.c
+lib/io/addons/Cairo/source/IoCairoRectangle.h
+lib/io/addons/Cairo/source/IoCairoSVGSurface.h
+lib/io/addons/Cairo/source/IoCairoScaledFont.c
+lib/io/addons/Cairo/source/IoCairoScaledFont.h
+lib/io/addons/Cairo/source/IoCairoSolidPattern.c
+lib/io/addons/Cairo/source/IoCairoSolidPattern.h
+lib/io/addons/Cairo/source/IoCairoSurface.c
+lib/io/addons/Cairo/source/IoCairoSurface.h
+lib/io/addons/Cairo/source/IoCairoSurfacePattern.c
+lib/io/addons/Cairo/source/IoCairoSurfacePattern.h
+lib/io/addons/Cairo/source/IoCairoSurface_inline.h
+lib/io/addons/Cairo/source/IoCairoTextExtents.c
+lib/io/addons/Cairo/source/IoCairoTextExtents.h
+lib/io/addons/Cairo/source/IoCairo_fileSurfaces.c
+lib/io/addons/Cairo/source/_IoCairoPDFSurface.c
+lib/io/addons/Cairo/source/_IoCairoPSSurface.c
+lib/io/addons/Cairo/source/_IoCairoSVGSurface.c
+lib/io/addons/Cairo/source/tools.c
+lib/io/addons/Cairo/source/tools.h
+lib/io/addons/Cairo/tests/
+lib/io/addons/Cairo/tests/correctness/
+lib/io/addons/Cairo/tests/correctness/CairoTest.io
+lib/io/addons/Cairo/tests/correctness/run.io
lib/io/addons/Clutter/
lib/io/addons/Clutter/CMakeLists.txt
lib/io/addons/Clutter/_build/
