From owner-svn-ports-all@FreeBSD.ORG Wed Aug 15 09:08:59 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 15E421065675; Wed, 15 Aug 2012 09:08:59 +0000 (UTC) (envelope-from olgeni@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DB6EF8FC1D; Wed, 15 Aug 2012 09:08:58 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7F98w12030352; Wed, 15 Aug 2012 09:08:58 GMT (envelope-from olgeni@svn.freebsd.org) Received: (from olgeni@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7F98wYn030349; Wed, 15 Aug 2012 09:08:58 GMT (envelope-from olgeni@svn.freebsd.org) Message-Id: <201208150908.q7F98wYn030349@svn.freebsd.org> From: Jimmy Olgeni Date: Wed, 15 Aug 2012 09:08:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r302568 - in head/devel/esdl: . files X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Aug 2012 09:08:59 -0000 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;