diff options
| author | Jimmy Olgeni <olgeni@FreeBSD.org> | 2016-09-23 14:36:09 +0000 |
|---|---|---|
| committer | Jimmy Olgeni <olgeni@FreeBSD.org> | 2016-09-23 14:36:09 +0000 |
| commit | f56cee82df34081c65e7c2909db3b6401b86ce80 (patch) | |
| tree | 582601525441c4a0ca0b4f13fa3d089fa6eead76 | |
| parent | devel/onscripter: update to 20160922 (diff) | |
Unbreak graphics/wings on Erlang 19: FUNCTION_NAME is now a predefined macro.
| -rw-r--r-- | graphics/wings/Makefile | 4 | ||||
| -rw-r--r-- | graphics/wings/files/patch-intl__tools_tools.erl | 26 |
2 files changed, 27 insertions, 3 deletions
diff --git a/graphics/wings/Makefile b/graphics/wings/Makefile index 9839976e8c6a..425ded475b74 100644 --- a/graphics/wings/Makefile +++ b/graphics/wings/Makefile @@ -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 to TclTk license 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} diff --git a/graphics/wings/files/patch-intl__tools_tools.erl b/graphics/wings/files/patch-intl__tools_tools.erl new file mode 100644 index 000000000000..87b449386ed3 --- /dev/null +++ b/graphics/wings/files/patch-intl__tools_tools.erl @@ -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]}; |