svn commit: r302568 - in head/devel/esdl: . files

[Jimmy Olgeni]

Author: olgeni
Date: Wed Aug 15 09:08:58 2012
New Revision: 302568
URL: http://svn.freebsd.org/changeset/ports/302568

Log:
  Add compatibility fixes for Erlang R15.

Added:
  head/devel/esdl/files/patch-c__src_esdl__driver.c   (contents, props changed)
Modified:
  head/devel/esdl/Makefile   (contents, props changed)

Modified: head/devel/esdl/Makefile
==============================================================================
--- head/devel/esdl/Makefile	Wed Aug 15 07:26:24 2012	(r302567)
+++ head/devel/esdl/Makefile	Wed Aug 15 09:08:58 2012	(r302568)
@@ -7,7 +7,7 @@
 
 PORTNAME=	esdl
 PORTVERSION=	1.0.1
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src

Added: head/devel/esdl/files/patch-c__src_esdl__driver.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/esdl/files/patch-c__src_esdl__driver.c	Wed Aug 15 09:08:58 2012	(r302568)
@@ -0,0 +1,54 @@
+
+$FreeBSD$
+
+--- c_src/esdl_driver.c.orig
++++ c_src/esdl_driver.c
+@@ -34,11 +34,16 @@
+ 
+ #define TEMP_BINARY_SIZE 512
+ 
++#if ERL_DRV_EXTENDED_MAJOR_VERSION < 2
++typedef int ErlDrvSizeT;
++typedef int ErlDrvSSizeT;
++#endif
++
+ static ErlDrvData sdl_driver_start(ErlDrvPort port, char *buff);
+ static void sdl_driver_stop(ErlDrvData handle);
+ static void sdl_driver_finish(void);
+-static int sdl_driver_control(ErlDrvData handle, unsigned int command, 
+-			      char* buf, int count, char** res, int res_size);
++static ErlDrvSSizeT sdl_driver_control(ErlDrvData handle, unsigned int command, 
++			      char* buf, ErlDrvSizeT count, char** res, ErlDrvSizeT res_size);
+ static void standard_outputv(ErlDrvData drv_data, ErlIOVec *ev);
+ 
+ /*
+@@ -59,6 +64,17 @@
+     sdl_driver_control,    /* F_PTR control, port_control callback */
+     NULL,                  /* F_PTR timeout, reserved */
+     standard_outputv,	   /* F_PTR outputv, reserved */
++    NULL,
++    NULL,
++    NULL,
++    NULL,
++    ERL_DRV_EXTENDED_MARKER,
++    ERL_DRV_EXTENDED_MAJOR_VERSION,
++    ERL_DRV_EXTENDED_MINOR_VERSION,
++    0,
++    NULL,
++    NULL,
++    NULL
+ };
+ 
+ DRIVER_INIT(sdl_driver)
+@@ -148,9 +164,9 @@
+ {
+ }
+ 
+-static int
++static ErlDrvSSizeT
+ sdl_driver_control(ErlDrvData handle, unsigned op,
+-		   char* buf, int count, char** res, int res_size)
++		   char* buf, ErlDrvSizeT count, char** res, ErlDrvSizeT res_size)
+ {
+   sdl_data* sd = (sdl_data *) handle;
+   sdl_fun func;