From bafae82ff9408e7d578f01b6499e44f1d08a2115 Mon Sep 17 00:00:00 2001 From: Christoph Moench-Tegeder Date: Mon, 4 May 2020 20:46:54 +0000 Subject: [PATCH] graphics/wings: update to 2.2.5 and grab MAINTAINER. http://www.wings3d.com/?page_id=76 --- graphics/wings/Makefile | 12 ++++-------- graphics/wings/distinfo | 6 +++--- graphics/wings/files/patch-plugins__src_Makefile | 6 +++--- .../wings/files/patch-plugins__src_autouv_Makefile | 6 +++--- .../wings/files/patch-plugins__src_commands_Makefile | 6 +++--- .../files/patch-plugins__src_primitives_Makefile | 6 +++--- graphics/wings/pkg-plist | 8 +++++--- 7 files changed, 24 insertions(+), 26 deletions(-) diff --git a/graphics/wings/Makefile b/graphics/wings/Makefile index a9b520807a27..5f98e5df930d 100644 --- a/graphics/wings/Makefile +++ b/graphics/wings/Makefile @@ -2,12 +2,12 @@ # $FreeBSD$ PORTNAME= wings -PORTVERSION= 2.2.4 +PORTVERSION= 2.2.5 CATEGORIES= graphics MASTER_SITES= SF DIST_SUBDIR= erlang -MAINTAINER= ports@FreeBSD.org +MAINTAINER= cmt@FreeBSD.org COMMENT= Polygon mesh modeler written in Erlang LICENSE= Wings3D @@ -40,8 +40,6 @@ DESKTOP_ENTRIES="Wings" \ "" post-patch: - @${REINPLACE_CMD} -e 's|$$(GCC)|${CC} -I${LOCALBASE}/include -L${LOCALBASE}/lib|g' \ - ${WRKSRC}/plugins_src/accel/Makefile @${REINPLACE_CMD} -e 's,include_lib("wings/,include_lib(",g' \ ${WRKSRC}/src/*.erl \ ${WRKSRC}/plugins_src/*.erl \ @@ -51,18 +49,16 @@ post-patch: ${WRKSRC}/plugins_src/commands/*.hrl \ ${WRKSRC}/plugins_src/autouv/*.erl \ ${WRKSRC}/icons/*.erl -# @${FIND} ${WRKSRC} -name "*.orig" -delete do-install: cd ${WRKSRC} && ${COPYTREE_SHARE} "ebin icons plugins textures shaders patches" \ ${STAGEDIR}${PREFIX}/lib/erlang/lib/${DISTNAME} cd ${WRKSRC} && ${COPYTREE_SHARE} "src" \ ${STAGEDIR}${PREFIX}/lib/erlang/lib/${DISTNAME} "-name *\.erl" + cd ${WRKSRC} && ${COPYTREE_SHARE} "priv" \ + ${STAGEDIR}${PREFIX}/lib/erlang/lib/${DISTNAME} "-name *\.so" ${LN} -sf ${DISTNAME} ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME} ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${INSTALL_DATA} ${WRKSRC}/src/${PORTNAME}.icon ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.ico - ${CHMOD} u+w ${STAGEDIR}${PREFIX}/lib/erlang/lib/${DISTNAME}/plugins/accel/*.so - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/erlang/lib/${DISTNAME}/plugins/accel/*.so - ${CHMOD} u-w ${STAGEDIR}${PREFIX}/lib/erlang/lib/${DISTNAME}/plugins/accel/*.so .include diff --git a/graphics/wings/distinfo b/graphics/wings/distinfo index c2036993b2f0..c72403b160f4 100644 --- a/graphics/wings/distinfo +++ b/graphics/wings/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1558985164 -SHA256 (erlang/wings-2.2.4.tar.bz2) = 4325a4c58df77a2b109cbd0046b427e2d3f151d5526f8c2f0848e04db48b95f5 -SIZE (erlang/wings-2.2.4.tar.bz2) = 3027811 +TIMESTAMP = 1588606017 +SHA256 (erlang/wings-2.2.5.tar.bz2) = 95ecf84a8f49bc00b983643e7ccd807f64a3b8b88253037a8ccefbe7a3bedff8 +SIZE (erlang/wings-2.2.5.tar.bz2) = 3211359 diff --git a/graphics/wings/files/patch-plugins__src_Makefile b/graphics/wings/files/patch-plugins__src_Makefile index 69b8a2cbd2c3..3d1b74630e4b 100644 --- a/graphics/wings/files/patch-plugins__src_Makefile +++ b/graphics/wings/files/patch-plugins__src_Makefile @@ -1,9 +1,9 @@ ---- plugins_src/Makefile.orig 2019-05-28 09:45:19 UTC +--- plugins_src/Makefile.orig 2020-05-04 17:00:55 UTC +++ plugins_src/Makefile -@@ -18,7 +18,7 @@ ESRC=. +@@ -19,7 +19,7 @@ include ../erl.mk + ESRC=. WINGS_INTL=../intl_tools EBIN=../plugins/default - ERLC=erlc -WINGS_TOP=../.. +WINGS_TOP=.. diff --git a/graphics/wings/files/patch-plugins__src_autouv_Makefile b/graphics/wings/files/patch-plugins__src_autouv_Makefile index 87467c8f4a23..c786bfed7cce 100644 --- a/graphics/wings/files/patch-plugins__src_autouv_Makefile +++ b/graphics/wings/files/patch-plugins__src_autouv_Makefile @@ -1,9 +1,9 @@ ---- plugins_src/autouv/Makefile.orig 2019-05-28 10:07:25 UTC +--- plugins_src/autouv/Makefile.orig 2020-05-04 17:01:46 UTC +++ plugins_src/autouv/Makefile -@@ -18,7 +18,7 @@ ESRC=. +@@ -19,7 +19,7 @@ include ../../erl.mk + ESRC=. WINGS_INTL=../../intl_tools EBIN=../../plugins/autouv - ERLC=erlc -WINGS_TOP=../../.. +WINGS_TOP=../.. diff --git a/graphics/wings/files/patch-plugins__src_commands_Makefile b/graphics/wings/files/patch-plugins__src_commands_Makefile index 20795cde4ce3..f84d16fcbf55 100644 --- a/graphics/wings/files/patch-plugins__src_commands_Makefile +++ b/graphics/wings/files/patch-plugins__src_commands_Makefile @@ -1,9 +1,9 @@ ---- plugins_src/commands/Makefile.orig 2019-05-28 10:00:46 UTC +--- plugins_src/commands/Makefile.orig 2020-05-04 17:02:14 UTC +++ plugins_src/commands/Makefile -@@ -18,7 +18,7 @@ ESRC=. +@@ -18,7 +18,7 @@ include ../../erl.mk + ESRC=. WINGS_INTL=../../intl_tools EBIN=../../plugins/commands - ERLC=erlc -WINGS_TOP=../../.. +WINGS_TOP=../.. WINGS_E3D=../../e3d diff --git a/graphics/wings/files/patch-plugins__src_primitives_Makefile b/graphics/wings/files/patch-plugins__src_primitives_Makefile index 5373168a77fe..77ddfacd24a2 100644 --- a/graphics/wings/files/patch-plugins__src_primitives_Makefile +++ b/graphics/wings/files/patch-plugins__src_primitives_Makefile @@ -1,9 +1,9 @@ ---- plugins_src/primitives/Makefile.orig 2019-05-28 09:57:30 UTC +--- plugins_src/primitives/Makefile.orig 2020-05-04 17:02:40 UTC +++ plugins_src/primitives/Makefile -@@ -18,7 +18,7 @@ ESRC=. +@@ -18,7 +18,7 @@ include ../../erl.mk + ESRC=. WINGS_INTL=../../intl_tools EBIN=../../plugins/primitives - ERLC=erlc -WINGS_TOP=../../.. +WINGS_TOP=../.. WINGS_E3D=../../e3d diff --git a/graphics/wings/pkg-plist b/graphics/wings/pkg-plist index dfbe417e3223..5a7bccc230da 100644 --- a/graphics/wings/pkg-plist +++ b/graphics/wings/pkg-plist @@ -88,6 +88,7 @@ lib/erlang/lib/wings-%%VERSION%%/ebin/wings_outliner.beam lib/erlang/lib/wings-%%VERSION%%/ebin/wings_palette.beam lib/erlang/lib/wings-%%VERSION%%/ebin/wings_pb.beam lib/erlang/lib/wings-%%VERSION%%/ebin/wings_pick.beam +lib/erlang/lib/wings-%%VERSION%%/ebin/wings_pick_nif.beam lib/erlang/lib/wings-%%VERSION%%/ebin/wings_plugin.beam lib/erlang/lib/wings-%%VERSION%%/ebin/wings_pref.beam lib/erlang/lib/wings-%%VERSION%%/ebin/wings_pref_dlg.beam @@ -260,8 +261,6 @@ lib/erlang/lib/wings-%%VERSION%%/icons/wings_icon_256x256.png lib/erlang/lib/wings-%%VERSION%%/icons/wings_icon_379x379.png lib/erlang/lib/wings-%%VERSION%%/icons/wings_icon_48x48.png lib/erlang/lib/wings-%%VERSION%%/patches/README -lib/erlang/lib/wings-%%VERSION%%/plugins/accel/wings_pick_drv.so -lib/erlang/lib/wings-%%VERSION%%/plugins/accel/wpc_pick.beam lib/erlang/lib/wings-%%VERSION%%/plugins/autouv/README lib/erlang/lib/wings-%%VERSION%%/plugins/autouv/README-shaders.txt lib/erlang/lib/wings-%%VERSION%%/plugins/autouv/auv_mapping.beam @@ -345,6 +344,7 @@ lib/erlang/lib/wings-%%VERSION%%/plugins/import_export/wpc_bzw.beam lib/erlang/lib/wings-%%VERSION%%/plugins/import_export/wpc_collada.beam lib/erlang/lib/wings-%%VERSION%%/plugins/import_export/wpc_gltf.beam lib/erlang/lib/wings-%%VERSION%%/plugins/import_export/wpc_hlines.beam +lib/erlang/lib/wings-%%VERSION%%/plugins/import_export/wpc_jscad.beam lib/erlang/lib/wings-%%VERSION%%/plugins/import_export/wpc_kerky.beam lib/erlang/lib/wings-%%VERSION%%/plugins/import_export/wpc_lwo.beam lib/erlang/lib/wings-%%VERSION%%/plugins/import_export/wpc_obj.beam @@ -368,6 +368,7 @@ lib/erlang/lib/wings-%%VERSION%%/plugins/primitives/wpc_plane.beam lib/erlang/lib/wings-%%VERSION%%/plugins/primitives/wpc_spiral.beam lib/erlang/lib/wings-%%VERSION%%/plugins/primitives/wpc_torus.beam lib/erlang/lib/wings-%%VERSION%%/plugins/primitives/wpc_tt.beam +lib/erlang/lib/wings-%%VERSION%%/priv/wings_pick_nif.so lib/erlang/lib/wings-%%VERSION%%/shaders/alpha_test.fs lib/erlang/lib/wings-%%VERSION%%/shaders/ambient_light.fs lib/erlang/lib/wings-%%VERSION%%/shaders/area_light.fs @@ -446,6 +447,7 @@ lib/erlang/lib/wings-%%VERSION%%/src/wings_outliner.erl lib/erlang/lib/wings-%%VERSION%%/src/wings_palette.erl lib/erlang/lib/wings-%%VERSION%%/src/wings_pb.erl lib/erlang/lib/wings-%%VERSION%%/src/wings_pick.erl +lib/erlang/lib/wings-%%VERSION%%/src/wings_pick_nif.erl lib/erlang/lib/wings-%%VERSION%%/src/wings_plugin.erl lib/erlang/lib/wings-%%VERSION%%/src/wings_pref.erl lib/erlang/lib/wings-%%VERSION%%/src/wings_pref_dlg.erl @@ -485,8 +487,8 @@ lib/erlang/lib/wings-%%VERSION%%/src/wings_wm.erl lib/erlang/lib/wings-%%VERSION%%/src/wpa.erl lib/erlang/lib/wings-%%VERSION%%/src/ww_color_ctrl.erl lib/erlang/lib/wings-%%VERSION%%/src/ww_color_slider.erl +lib/erlang/lib/wings-%%VERSION%%/textures/about_wings_art.png lib/erlang/lib/wings-%%VERSION%%/textures/areal_ltcmat.bin -lib/erlang/lib/wings-%%VERSION%%/textures/brand.png lib/erlang/lib/wings-%%VERSION%%/textures/brdf_tab.bin lib/erlang/lib/wings-%%VERSION%%/textures/grandcanyon.png lib/erlang/lib/wings-%%VERSION%%/textures/ip_helper.png