git: 8c23375c8311 - main - cad/librnd: update 4.0.1 → 4.3.1

From: Vladimir Druzenko <vvd_at_FreeBSD.org>
Date: Fri, 07 Feb 2025 10:20:40 UTC
The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=8c23375c83113f5b2d333d6d39b158594a432d9d

commit 8c23375c83113f5b2d333d6d39b158594a432d9d
Author:     Älven <alster@vinterdalen.se>
AuthorDate: 2025-02-07 10:09:40 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-02-07 10:09:40 +0000

    cad/librnd: update 4.0.1 → 4.3.1
    
    * Fix MASTER_SITES
    * Mark MOTIF_BROKEN as it fails to build (as before this update)
    * Mark TESTING_UNSAFE as ./librnd_test --gui batch fails to run
    * Strip shared libraries
    * Use SOVERSION instead of DISTVERSION to refer to libraries versions
    
    News:
    http://www.repo.hu/projects/librnd/news.html
    
    Release notes:
    http://www.repo.hu/projects/librnd/releases/relnotes-4.0.2.txt
    http://www.repo.hu/projects/librnd/releases/relnotes-4.0.3.txt
    http://www.repo.hu/projects/librnd/releases/relnotes-4.0.4.txt
    http://www.repo.hu/projects/librnd/releases/relnotes-4.1.0.txt
    http://www.repo.hu/projects/librnd/releases/relnotes-4.1.1.txt
    http://www.repo.hu/projects/librnd/releases/relnotes-4.2.0.txt
    http://www.repo.hu/projects/librnd/releases/relnotes-4.3.0.txt
    http://www.repo.hu/projects/librnd/releases/relnotes-4.3.1.txt
    
    Changelogs:
    http://www.repo.hu/projects/librnd/releases/changelog-4.3.1.txt
    
    PR:             284170
    Approved by:    hasdalcodes@gmail.com (maintainer, timeout > 2 weeks)
---
 cad/librnd/Makefile                                | 14 +++++--
 cad/librnd/distinfo                                |  6 +--
 .../patch-src_librnd_plugins_hid__remote_remote.c  | 11 ------
 cad/librnd/files/patch-tests_librnd_librnd__test.c | 20 ----------
 cad/librnd/pkg-plist                               | 44 +++++++++++++++++++---
 5 files changed, 53 insertions(+), 42 deletions(-)

diff --git a/cad/librnd/Makefile b/cad/librnd/Makefile
index 0754ebf37db9..2cd533acf9a6 100644
--- a/cad/librnd/Makefile
+++ b/cad/librnd/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	librnd
-DISTVERSION=	4.0.1
+DISTVERSION=	4.3.1
 CATEGORIES=	cad
-MASTER_SITES=	http://repo.hu/projects/${PORTNAME}/releases/
+MASTER_SITES=	http://www.repo.hu/projects/${PORTNAME}/releases/
 
 MAINTAINER=	hasdalcodes@gmail.com
 COMMENT=	Flexible, modular two-dimensional CAD engine
@@ -25,7 +25,7 @@ CONFIGURE_ARGS=	--all=plugin --plugin-hid_remote \
 
 TEST_TARGET=	test
 BINARY_ALIAS=	make=${MAKE_CMD}
-PLIST_SUB=	DISTVERSION=${DISTVERSION}
+PLIST_SUB=	SOVERSION=${DISTVERSION}
 
 OPTIONS_DEFINE=	DOCS GD MOTIF GTK2 GTK2GL GTK4 STROKE WGET
 OPTIONS_DEFAULT=	GD GTK2 GTK2GL STROKE WGET
@@ -58,6 +58,7 @@ GTK4_USES=	gl gnome
 GTK4_USE=	gl=gl,glu gnome=cairo,gdkpixbuf2,gtk40
 GTK4_CONFIGURE_OFF=	--disable-hid_gtk4_gl
 
+MOTIF_BROKEN=	Fails to build
 MOTIF_USES=	motif
 MOTIF_USE=	xorg=xt,x11,xinerama,xrender
 MOTIF_CONFIGURE_OFF=	--disable-hid_lesstif
@@ -68,6 +69,13 @@ STROKE_CONFIGURE_OFF=	--disable-stroke
 WGET_RUN_DEPENDS=	wget:ftp/wget
 WGET_CONFIGURE_OFF=	--disable-lib_wget
 
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/librnd4/plugins/*.so
+.for l in puplug sphash scconfig/cquote scconfig/sccbox
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/librnd4/${l}
+.endfor
+
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGTK4} || ${PORT_OPTIONS:MMOTIF}
diff --git a/cad/librnd/distinfo b/cad/librnd/distinfo
index 46965c0c2dee..1980586c6280 100644
--- a/cad/librnd/distinfo
+++ b/cad/librnd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1684923216
-SHA256 (librnd-4.0.1.tar.bz2) = 3b20dfd91543e83b86d131f135610b4d40ff3902ab7af01545394087bb073e30
-SIZE (librnd-4.0.1.tar.bz2) = 1451866
+TIMESTAMP = 1738920791
+SHA256 (librnd-4.3.1.tar.bz2) = 72ab73d644cc1b9d32d93f553ad8e8cae0a0a4e44c6b8bb7fa8dc2a2de1c4f78
+SIZE (librnd-4.3.1.tar.bz2) = 1615335
diff --git a/cad/librnd/files/patch-src_librnd_plugins_hid__remote_remote.c b/cad/librnd/files/patch-src_librnd_plugins_hid__remote_remote.c
deleted file mode 100644
index 6490bc42a3ab..000000000000
--- a/cad/librnd/files/patch-src_librnd_plugins_hid__remote_remote.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/librnd/plugins/hid_remote/remote.c.orig	2022-12-04 07:06:55 UTC
-+++ src/librnd/plugins/hid_remote/remote.c
-@@ -392,7 +392,7 @@ int pplg_init_hid_remote(void)
- 
- 	rnd_hid_register_hid(&remote_hid);
- 
--	rnd_event_bind(RND_EVENT_SET_CURRENT, ev_board_changed, NULL, remote_cookie);
-+	rnd_event_bind(RND_EVENT_DESIGN_SET_CURRENT, ev_board_changed, NULL, remote_cookie);
- 
- 	return 0;
- }
diff --git a/cad/librnd/files/patch-tests_librnd_librnd__test.c b/cad/librnd/files/patch-tests_librnd_librnd__test.c
deleted file mode 100644
index b200117b866c..000000000000
--- a/cad/librnd/files/patch-tests_librnd_librnd__test.c
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: tests/librnd/librnd_test.c
-===================================================================
---- tests/librnd/librnd_test.c.orig	2022-05-11 07:25:34 UTC
-+++ tests/librnd/librnd_test.c
-@@ -15,6 +15,15 @@
- 
- /*** init test ***/
- 
-+/* workaround for symbols missing out because of the static linking done with
-+   the test app. Won't ever happen to real apps as they don't static link */
-+#include <librnd/core/pixmap.h>
-+static void (*workaround_fn)();
-+static void librnd_test_symbol_workaround(void)
-+{
-+	workaround_fn = rnd_pixmap_reg_import;
-+}
-+
- static void poly_test()
- {
- 	rnd_polyarea_t pa;
diff --git a/cad/librnd/pkg-plist b/cad/librnd/pkg-plist
index 473b88bd0497..7c9f18c500f8 100644
--- a/cad/librnd/pkg-plist
+++ b/cad/librnd/pkg-plist
@@ -7,6 +7,7 @@ include/librnd4/librnd/core/box_isc.h
 include/librnd4/librnd/core/color.h
 include/librnd4/librnd/core/color_cache.h
 include/librnd4/librnd/core/compat_fs.h
+include/librnd4/librnd/core/compat_fs_dir.h
 include/librnd4/librnd/core/compat_inc.h
 include/librnd4/librnd/core/compat_lrealpath.h
 include/librnd4/librnd/core/compat_misc.h
@@ -41,11 +42,17 @@ include/librnd4/librnd/core/safe_fs.h
 include/librnd4/librnd/core/safe_fs_dir.h
 include/librnd4/librnd/core/unit.h
 include/librnd4/librnd/core/vtc0.h
+include/librnd4/librnd/core/xform_mx.h
 include/librnd4/librnd/font/font.h
 include/librnd4/librnd/font/font_lht.h
 include/librnd4/librnd/font/glyph.h
 include/librnd4/librnd/font/vtgla.h
 include/librnd4/librnd/font/xform_mx.h
+include/librnd4/librnd/font2/font.h
+include/librnd4/librnd/font2/font_lht.h
+include/librnd4/librnd/font2/glyph.h
+include/librnd4/librnd/font2/htkc.h
+include/librnd4/librnd/font2/vtgla.h
 include/librnd4/librnd/hid/buildin.hidlib.h
 include/librnd4/librnd/hid/grid.h
 include/librnd4/librnd/hid/hid.h
@@ -55,6 +62,7 @@ include/librnd4/librnd/hid/hid_dad.h
 include/librnd4/librnd/hid/hid_dad_spin.h
 include/librnd4/librnd/hid/hid_dad_tree.h
 include/librnd4/librnd/hid/hid_dad_unit.h
+include/librnd4/librnd/hid/hid_export.h
 include/librnd4/librnd/hid/hid_init.h
 include/librnd4/librnd/hid/hid_inlines.h
 include/librnd4/librnd/hid/hid_menu.h
@@ -72,6 +80,7 @@ include/librnd4/librnd/plugins/lib_hid_common/dlg_comm_m.h
 include/librnd4/librnd/plugins/lib_hid_common/dlg_export.h
 include/librnd4/librnd/plugins/lib_hid_common/dlg_pref.h
 include/librnd4/librnd/plugins/lib_hid_common/place.h
+include/librnd4/librnd/plugins/lib_hid_common/timed_chg.h
 include/librnd4/librnd/plugins/lib_hid_common/toolbar.h
 include/librnd4/librnd/plugins/lib_hid_common/xpm.h
 include/librnd4/librnd/plugins/lib_hid_common/zoompan.h
@@ -82,6 +91,18 @@ include/librnd4/librnd/poly/polygon1_gen.h
 include/librnd4/librnd/poly/rtree.h
 include/librnd4/librnd/poly/rtree2_compat.h
 include/librnd4/librnd/poly/self_isc.h
+include/librnd4/librnd/polybool/big_coord.h
+include/librnd4/librnd/polybool/offset.h
+include/librnd4/librnd/polybool/pa_dicer.h
+include/librnd4/librnd/polybool/polyarea.h
+include/librnd4/librnd/polybool/polygon1_gen.h
+include/librnd4/librnd/polybool/rtree.h
+include/librnd4/librnd/polybool/self_isc.h
+include/librnd4/librnd/polybool2/offset.h
+include/librnd4/librnd/polybool2/pa_dicer.h
+include/librnd4/librnd/polybool2/polyarea.h
+include/librnd4/librnd/polybool2/polygon1_gen.h
+include/librnd4/librnd/polybool2/rtree.h
 include/librnd4/librnd/scconfig/hooks_common.h
 include/librnd4/librnd/scconfig/plugin_3state.h
 include/librnd4/librnd/scconfig/rnd_hook_detect.h
@@ -166,23 +187,35 @@ include/librnd4/librnd/src_3rd/ureglex/exec.h
 lib/librnd-3rd.a
 lib/librnd-3rd.so
 lib/librnd-3rd.so.4
-lib/librnd-3rd.so.%%DISTVERSION%%
+lib/librnd-3rd.so.%%SOVERSION%%
 lib/librnd-core.a
 lib/librnd-core.so
 lib/librnd-core.so.4
-lib/librnd-core.so.%%DISTVERSION%%
+lib/librnd-core.so.%%SOVERSION%%
 lib/librnd-font.a
 lib/librnd-font.so
 lib/librnd-font.so.4
-lib/librnd-font.so.%%DISTVERSION%%
+lib/librnd-font.so.%%SOVERSION%%
+lib/librnd-font2.a
+lib/librnd-font2.so
+lib/librnd-font2.so.4
+lib/librnd-font2.so.%%SOVERSION%%
 lib/librnd-hid.a
 lib/librnd-hid.so
 lib/librnd-hid.so.4
-lib/librnd-hid.so.%%DISTVERSION%%
+lib/librnd-hid.so.%%SOVERSION%%
 lib/librnd-poly.a
 lib/librnd-poly.so
 lib/librnd-poly.so.4
-lib/librnd-poly.so.%%DISTVERSION%%
+lib/librnd-poly.so.%%SOVERSION%%
+lib/librnd-polybool.a
+lib/librnd-polybool.so
+lib/librnd-polybool.so.4
+lib/librnd-polybool.so.%%SOVERSION%%
+lib/librnd-polybool2.a
+lib/librnd-polybool2.so
+lib/librnd-polybool2.so.4
+lib/librnd-polybool2.so.%%SOVERSION%%
 lib/librnd4/action_compiler.sh
 lib/librnd4/build_ps.sh
 lib/librnd4/devhelpers/awk_on_formats.sh
@@ -295,6 +328,7 @@ lib/librnd4/sphash
 %%PORTDOCS%%%%DOCSDIR%%4/license.html
 %%PORTDOCS%%%%DOCSDIR%%4/mac.txt
 %%PORTDOCS%%%%DOCSDIR%%4/news.html
+%%PORTDOCS%%%%DOCSDIR%%4/support.html
 %%PORTDOCS%%%%DOCSDIR%%4/windows.html
 %%DATADIR%%4/librnd.mak
 %%DATADIR%%4/librnd_packages.sh