Date: Fri, 23 Sep 2016 14:36:09 +0000 (UTC) From: Jimmy Olgeni <olgeni@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r422679 - in head/graphics/wings: . files Message-ID: <201609231436.u8NEa9Gt096154@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: olgeni Date: Fri Sep 23 14:36:09 2016 New Revision: 422679 URL: https://svnweb.freebsd.org/changeset/ports/422679 Log: Unbreak graphics/wings on Erlang 19: FUNCTION_NAME is now a predefined macro. Added: head/graphics/wings/files/patch-intl__tools_tools.erl (contents, props changed) Modified: head/graphics/wings/Makefile Modified: head/graphics/wings/Makefile ============================================================================== --- head/graphics/wings/Makefile Fri Sep 23 14:16:08 2016 (r422678) +++ head/graphics/wings/Makefile Fri Sep 23 14:36:09 2016 (r422679) @@ -3,7 +3,7 @@ PORTNAME= wings PORTVERSION= 1.4.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= SF DIST_SUBDIR= erlang @@ -16,8 +16,6 @@ LICENSE_NAME= Wings 3D License # similar LICENSE_FILE= ${WRKSRC}/license.terms LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -BROKEN= fails to build - BUILD_DEPENDS= erl:lang/erlang \ erlang-esdl>0:devel/erlang-esdl RUN_DEPENDS:= ${BUILD_DEPENDS} Added: head/graphics/wings/files/patch-intl__tools_tools.erl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/wings/files/patch-intl__tools_tools.erl Fri Sep 23 14:36:09 2016 (r422679) @@ -0,0 +1,26 @@ +--- intl_tools/tools.erl.orig 2016-09-23 14:29:04 UTC ++++ intl_tools/tools.erl +@@ -244,7 +244,7 @@ get_en_template_1([_|T]) -> + %%% + + -define(STRINGS, wings_lang_transform_strings). +--define(FUNCTION_NAME, wings_lang_transform_function_name). ++-define(WINGS_FUNCTION_NAME, wings_lang_transform_function_name). + -define(ERRORS, wings_lang_transform_errors). + -define(FILENAME, wings_lang_transform_filename). + +@@ -269,12 +269,12 @@ transform({attribute,_,file,{Filename,_} + put(?FILENAME, Filename), + Form; + transform({function,L,Name,Arity,Cs}) -> +- put(?FUNCTION_NAME, Name), ++ put(?WINGS_FUNCTION_NAME, Name), + {function,L,Name,Arity,transform(Cs)}; + transform({call,L,{remote,_,{atom,_,wings_lang},{atom,_,str}}=Rem, + [{tuple,_,[{atom,_,M}=Mod,Key]}, + {string,_,S}=Str]}) -> +- FunName = get(?FUNCTION_NAME), ++ FunName = get(?WINGS_FUNCTION_NAME), + K = literal_key(Key), + add_string({{M,FunName,K},{S,L}}), + {call,L,Rem,[{tuple,L,[Mod,{atom,L,FunName},Key]},Str]};
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609231436.u8NEa9Gt096154>