Attachment #233795 for bug #263849

Lines 74-79 Link Here

(-)b/cad/Makefile (+1 lines)
74	SUBDIR += librecad	74	SUBDIR += librecad
75	SUBDIR += libredwg	75	SUBDIR += libredwg
76	SUBDIR += librepcb	76	SUBDIR += librepcb
		77	SUBDIR += librnd
77	SUBDIR += linux-eagle5	78	SUBDIR += linux-eagle5
78	SUBDIR += logisim	79	SUBDIR += logisim
79	SUBDIR += magic	80	SUBDIR += magic




PORTNAME=	librnd
DISTVERSION=	3.1.1
CATEGORIES=	cad
MASTER_SITES=	http://repo.hu/projects/${PORTNAME}/releases/

MAINTAINER=	fuz@fuz.su
COMMENT=	Flexible, modular two-dimensional CAD engine

LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/COPYING

LIB_DEPENDS=	libfungw.so:devel/fungw

USES=		gmake pkgconfig tar:bz2
USE_LDCONFIG=	yes

HAS_CONFIGURE=	yes
CONFIGURE_ARGS=	--all=plugin --plugin-hid_remote
TEST_TARGET=	test
BINARY_ALIAS=	make=${MAKE_CMD}

OPTIONS_DEFINE=	DOCS GD MOTIF GTK2 GTK2GL GTK4 STROKE WGET
OPTIONS_DEFAULT=	GD GTK4 STROKE WGET
OPTIONS_SUB=	yes
GTK2GL_DESC=	GTK+ 2 GUI with OpenGL support
GTK4_DESC=	GTK+ 4 GUI toolkit support
WGET_DESC=	Wget support

GD_LIB_DEPENDS=	libgd.so:graphics/gd
GD_CONFIGURE_OFF=	--disable-gd

GTK2GL_IMPLIES=	GTK2
GTK2GL_LIB_DEPENDS=	libgtkglext-x11-1.0.so:x11-toolkits/gtkglext
GTK2GL_USES=	gl
GTK2GL_USE=	gl=gl,glu gnome=pangox-compat xorg=x11
GTK2GL_CONFIGURE_OFF=	--disable-hid_gtk2_gl

GTK2_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
			libfreetype.so:print/freetype2 \
			libharfbuzz.so:print/harfbuzz
GTK2_USES=	gnome
GTK2_USE=	gnome=cairo,gdkpixbuf2,gtk20
GTK2_CONFIGURE_OFF=	--disable-hid_gtk2_gdk

GTK4_LIB_DEPENDS=	libepoxy.so:graphics/libepoxy \
			libgraphene-1.0.so:graphics/graphene \
			libharfbuzz.so:print/harfbuzz \
			libvulkan.so:graphics/vulkan-loader
GTK4_USES=	gl gnome
GTK4_USE=	gl=gl,glu gnome=cairo,gdkpixbuf2,gtk40
GTK4_CONFIGURE_OFF=	--disable-hid_gtk4_gl

MOTIF_USES=	motif
MOTIF_USE=	xorg=xt,x11,xinerama,xrender
MOTIF_CONFIGURE_OFF=	--disable-hid_lesstif

STROKE_LIB_DEPENDS=	libstroke.so:devel/libstroke
STROKE_CONFIGURE_OFF=	--disable-stroke

WGET_RUN_DEPENDS=	wget:ftp/wget
WGET_CONFIGURE_OFF=	--disable-lib_wget

.include <bsd.port.pre.mk>

.if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGTK4} || ${PORT_OPTIONS:MMOTIF}
PLIST_SUB+=	GUI=""
.else
PLIST_SUB+=	GUI="@comment "
.endif

pre-configure:
	${REINPLACE_CMD} \
	    -e 's,%%LOCALBASE%%,${LOCALBASE},' \
	    -e 's,%%MOTIFLIB%%,${MOTIFLIB},' \
	    ${WRKSRC}/scconfig/src/gui/find_gl.c \
	    ${WRKSRC}/scconfig/src/gui/find_lesstif2.c \
	    ${WRKSRC}/scconfig/src/gui/find_misc.c \
	    ${WRKSRC}/scconfig/src/gui/find_x.c

.include <bsd.port.post.mk>

Added Link Here

(-)b/cad/librnd/distinfo (+3 lines)
1	TIMESTAMP = 1651840856
2	SHA256 (librnd-3.1.1.tar.bz2) = fbdb3d73146a51eff4fbd4a0bee9d30999a82aee997a9b9655fdd6d8cc829de9
3	SIZE (librnd-3.1.1.tar.bz2) = 1238024




--- scconfig/src/gui/find_lesstif2.c.orig	2022-05-06 17:10:54 UTC
+++ scconfig/src/gui/find_lesstif2.c
@@ -45,8 +45,8 @@ int find_lesstif2(const char *name, int logdepth, int 
 		NL;
 
 	const char *node = "libs/gui/lesstif2";
-	char **cflags,  *cflags_arr[]  = {"", "-I/opt/X11/include", NULL};
-	char **ldflags, *ldflags_arr[] = {"-lXm -lX11", "-lXm -lXt", "-L/opt/X11/lib -lXm -lXt  -lX11", NULL}; /* note: -lXt must be after -lXm else lesstif fails to init with runtime error */
+	char **cflags,  *cflags_arr[]  = {"-I%%LOCALBASE%%/include", "", "-I/opt/X11/include", NULL};
+	char **ldflags, *ldflags_arr[] = {"%%MOTIFLIB%% -lXt -lX11", "-lXm -lX11", "-lXm -lXt", "-L/opt/X11/lib -lXm -lXt  -lX11", NULL}; /* note: -lXt must be after -lXm else lesstif fails to init with runtime error */
 
 	if (require("cc/cc", logdepth, fatal))
 		return 1;




--- scconfig/src/gui/find_misc.c.orig	2022-05-06 18:29:16 UTC
+++ scconfig/src/gui/find_misc.c
@@ -45,8 +45,8 @@ int find_libstroke(const char *name, int logdepth, int
 		NL;
 
 	const char *node = "libs/gui/libstroke";
-	char **cflags,  *cflags_arr[]  = {"", NULL};
-	char **ldflags, *ldflags_arr[] = {"-lstroke", NULL};
+	char **cflags,  *cflags_arr[]  = {"-I%%LOCALBASE%%/include", NULL};
+	char **ldflags, *ldflags_arr[] = {"-L%%LOCALBASE%%/lib -lstroke", NULL};
 
 	if (require("cc/cc", logdepth, fatal))
 		return 1;




--- scconfig/src/gui/find_x.c.orig	2018-12-09 09:02:02 UTC
+++ scconfig/src/gui/find_x.c
@@ -41,9 +41,9 @@ int find_xopendisplay(const char *name, int logdepth, 
 		NL;
 
 	const char *node = "libs/gui/xopendisplay";
-	char **cflags,  *cflags_arr[]  = {"", "-I/opt/X11/include", "-I/usr/X11R6/include", NULL};
-	char **ldflags, *ldflags_arr[] = {"-lX11", "-L/opt/X11/lib -lX11", "-L/usr/X11R6/lib -lX11", NULL};
-	char **Lflags, *Lflags_arr[] =   {"",      "-L/opt/X11/lib",       "-L/usr/X11R6/lib", NULL};
+	char **cflags,  *cflags_arr[]  = {"-I%%LOCALBASE%%/include", "-I/opt/X11/include", "-I/usr/X11R6/include", NULL};
+	char **ldflags, *ldflags_arr[] = {"-L%%LOCALBASE%%/lib -lX11", "-L/opt/X11/lib -lX11", "-L/usr/X11R6/lib -lX11", NULL};
+	char **Lflags, *Lflags_arr[] =   {"-L%%LOCALBASE%%/lib",      "-L/opt/X11/lib",       "-L/usr/X11R6/lib", NULL};
 
 	if (require("cc/cc", logdepth, fatal))
 		return 1;

Added Link Here

(-)b/cad/librnd/pkg-descr (+8 lines)
1	librnd is a free/open source, flexible, modular two-dimensional CAD engine
2
3	- with transparent multiple GUI toolkit support,
4	- flexible, dynamic menu system
5	- flexible, dynamic configuration system
6	- support for user scripting in a dozen languages
7
8	WWW: http://www.repo.hu/projects/librnd/




include/librnd/config.h
include/librnd/core/actions.h
include/librnd/core/anyload.h
include/librnd/core/base64.h
include/librnd/core/box.h
include/librnd/core/box_isc.h
include/librnd/core/buildin.hidlib.h
include/librnd/core/color.h
include/librnd/core/color_cache.h
include/librnd/core/compat_fs.h
include/librnd/core/compat_inc.h
include/librnd/core/compat_lrealpath.h
include/librnd/core/compat_misc.h
include/librnd/core/conf.h
include/librnd/core/conf_hid.h
include/librnd/core/config.h
include/librnd/core/error.h
include/librnd/core/event.h
include/librnd/core/file_loaded.h
include/librnd/core/fptr_cast.h
include/librnd/core/funchash.h
include/librnd/core/funchash_core.h
include/librnd/core/funchash_core_list.h
include/librnd/core/global_typedefs.h
include/librnd/core/globalconst.h
include/librnd/core/grid.h
include/librnd/core/heap.h
include/librnd/core/hid.h
include/librnd/core/hid_attrib.h
include/librnd/core/hid_cfg.h
include/librnd/core/hid_cfg_action.h
include/librnd/core/hid_cfg_input.h
include/librnd/core/hid_dad.h
include/librnd/core/hid_dad_spin.h
include/librnd/core/hid_dad_tree.h
include/librnd/core/hid_dad_unit.h
include/librnd/core/hid_init.h
include/librnd/core/hid_inlines.h
include/librnd/core/hid_menu.h
include/librnd/core/hid_nogui.h
include/librnd/core/hidlib.h
include/librnd/core/hidlib_conf.h
include/librnd/core/list_conf.h
include/librnd/core/math_helper.h
include/librnd/core/misc_util.h
include/librnd/core/paths.h
include/librnd/core/pixmap.h
include/librnd/core/plugins.h
include/librnd/core/rnd_bool.h
include/librnd/core/rnd_printf.h
include/librnd/core/rotate.h
include/librnd/core/safe_fs.h
include/librnd/core/safe_fs_dir.h
include/librnd/core/tool.h
include/librnd/core/unit.h
include/librnd/core/vtc0.h
include/librnd/plugins/lib_hid_common/dialogs_conf.h
include/librnd/plugins/lib_hid_common/dlg_comm_m.h
include/librnd/plugins/lib_hid_common/dlg_pref.h
include/librnd/plugins/lib_hid_common/place.h
include/librnd/plugins/lib_hid_common/toolbar.h
include/librnd/plugins/lib_hid_common/xpm.h
include/librnd/plugins/lib_hid_common/zoompan.h
include/librnd/plugins/lib_wget/lib_wget.h
include/librnd/poly/offset.h
include/librnd/poly/polyarea.h
include/librnd/poly/polygon1_gen.h
include/librnd/poly/rtree.h
include/librnd/poly/rtree2_compat.h
include/librnd/poly/self_isc.h
include/librnd/scconfig/hooks_common.h
include/librnd/scconfig/plugin_3state.h
include/librnd/scconfig/rnd_hook_detect.h
include/librnd/src_3rd/genht/hash.h
include/librnd/src_3rd/genht/ht.c
include/librnd/src_3rd/genht/ht.h
include/librnd/src_3rd/genht/ht_inlines.h
include/librnd/src_3rd/genht/ht_utils.h
include/librnd/src_3rd/genht/htip.h
include/librnd/src_3rd/genht/htpi.h
include/librnd/src_3rd/genht/htpp.h
include/librnd/src_3rd/genht/htsi.h
include/librnd/src_3rd/genht/htsp.h
include/librnd/src_3rd/genht/htss.h
include/librnd/src_3rd/genht/siphash24.h
include/librnd/src_3rd/genht/version.h
include/librnd/src_3rd/genlist/genadlist.h
include/librnd/src_3rd/genlist/gendlist.h
include/librnd/src_3rd/genlist/genlistalloc.h
include/librnd/src_3rd/genlist/gentdlist_impl.c
include/librnd/src_3rd/genlist/gentdlist_impl.h
include/librnd/src_3rd/genlist/gentdlist_undef.h
include/librnd/src_3rd/genregex/regex.h
include/librnd/src_3rd/genregex/regex_se.h
include/librnd/src_3rd/genregex/regex_sei.h
include/librnd/src_3rd/genregex/regex_templ.h
include/librnd/src_3rd/genrtree/genrtree_api.h
include/librnd/src_3rd/genrtree/genrtree_debug.h
include/librnd/src_3rd/genrtree/genrtree_delete.h
include/librnd/src_3rd/genrtree/genrtree_impl.h
include/librnd/src_3rd/genrtree/genrtree_search.h
include/librnd/src_3rd/gensexpr/gensexpr_impl.h
include/librnd/src_3rd/gensexpr/gsx_parse.h
include/librnd/src_3rd/gensexpr/gsxl.h
include/librnd/src_3rd/gensexpr/gsxnl.h
include/librnd/src_3rd/genvector/gds_char.h
include/librnd/src_3rd/genvector/genvector_impl.c
include/librnd/src_3rd/genvector/genvector_impl.h
include/librnd/src_3rd/genvector/genvector_undef.h
include/librnd/src_3rd/genvector/vtd0.h
include/librnd/src_3rd/genvector/vti0.h
include/librnd/src_3rd/genvector/vtl0.h
include/librnd/src_3rd/genvector/vtp0.h
include/librnd/src_3rd/genvector/vts0.h
include/librnd/src_3rd/libfungw/fungw.h
include/librnd/src_3rd/libfungw/fungw_conv.h
include/librnd/src_3rd/libfungw/scconfig_hooks.h
include/librnd/src_3rd/liblhtpers/lhtpers.h
include/librnd/src_3rd/liblihata/dom.h
include/librnd/src_3rd/liblihata/hash_str.h
include/librnd/src_3rd/liblihata/lihata.h
include/librnd/src_3rd/liblihata/parser.h
include/librnd/src_3rd/liblihata/tree.h
include/librnd/src_3rd/libulzw/libulzw.h
include/librnd/src_3rd/puplug/config.h
include/librnd/src_3rd/puplug/error.h
include/librnd/src_3rd/puplug/libs.h
include/librnd/src_3rd/puplug/libs_dep_parse.h
include/librnd/src_3rd/puplug/os_dep.h
include/librnd/src_3rd/puplug/os_dep_fs.h
include/librnd/src_3rd/puplug/puplug.h
include/librnd/src_3rd/puplug/scconfig_hooks.h
include/librnd/src_3rd/puplug/util.h
include/librnd/src_3rd/ureglex/exec.h
lib/librnd-3rd.a
lib/librnd-3rd.so
lib/librnd-3rd.so.3
lib/librnd-3rd.so.3.1.1
lib/librnd-hid.a
lib/librnd-hid.so
lib/librnd-hid.so.3
lib/librnd-hid.so.3.1.1
lib/librnd-poly.a
lib/librnd-poly.so
lib/librnd-poly.so.3
lib/librnd-poly.so.3.1.1
lib/librnd3/plugins/diag_rnd.pup
lib/librnd3/plugins/diag_rnd.so
lib/librnd3/plugins/hid_batch.pup
lib/librnd3/plugins/hid_batch.so
%%GTK2%%lib/librnd3/plugins/hid_gtk2_gdk.pup
%%GTK2%%lib/librnd3/plugins/hid_gtk2_gdk.so
%%GTK2GL%%lib/librnd3/plugins/hid_gtk2_gl.pup
%%GTK2GL%%lib/librnd3/plugins/hid_gtk2_gl.so
%%GTK4%%lib/librnd3/plugins/hid_gtk4_gl.pup
%%GTK4%%lib/librnd3/plugins/hid_gtk4_gl.so
%%MOTIF%%lib/librnd3/plugins/hid_lesstif.pup
%%MOTIF%%lib/librnd3/plugins/hid_lesstif.so
lib/librnd3/plugins/hid_remote.pup
lib/librnd3/plugins/hid_remote.so
lib/librnd3/plugins/irc.pup
lib/librnd3/plugins/irc.so
lib/librnd3/plugins/lib_gensexpr.pup
lib/librnd3/plugins/lib_gensexpr.so
%%GTK2%%lib/librnd3/plugins/lib_gtk2_common.pup
%%GTK2%%lib/librnd3/plugins/lib_gtk2_common.so
%%GTK4%%lib/librnd3/plugins/lib_gtk4_common.pup
%%GTK4%%lib/librnd3/plugins/lib_gtk4_common.so
%%GUI%%lib/librnd3/plugins/lib_hid_common.pup
%%GUI%%lib/librnd3/plugins/lib_hid_common.so
%%GTK2GL%%lib/librnd3/plugins/lib_hid_gl.pup
%%GTK2GL%%lib/librnd3/plugins/lib_hid_gl.so
lib/librnd3/plugins/lib_portynet.pup
lib/librnd3/plugins/lib_portynet.so
%%WGET%%lib/librnd3/plugins/lib_wget.pup
%%WGET%%lib/librnd3/plugins/lib_wget.so
lib/librnd3/plugins/loghid.pup
lib/librnd3/plugins/loghid.so
lib/librnd3/plugins/map_plugins.sh
lib/librnd3/plugins/script.pup
lib/librnd3/plugins/script.so
%%STROKE%%lib/librnd3/plugins/stroke.pup
%%STROKE%%lib/librnd3/plugins/stroke.so
lib/librnd3/puplug
lib/librnd3/scconfig/cquote
lib/librnd3/scconfig/gen_conf.sh
lib/librnd3/scconfig/sccbox
lib/librnd3/scconfig/template/cdep.tmpasm
lib/librnd3/scconfig/template/comp_var.tmpasm
lib/librnd3/scconfig/template/compile.tmpasm
lib/librnd3/scconfig/template/debug.tmpasm
lib/librnd3/scconfig/template/plugin_conf.tmpasm
lib/librnd3/scconfig/template/plugin_intconf.tmpasm
lib/librnd3/scconfig/template/plugin_intmenu.tmpasm
lib/librnd3/scconfig/template/plugin_sphash.tmpasm
lib/librnd3/sphash
%%PORTDOCS%%%%DOCSDIR%%3/Autostyle.html
%%PORTDOCS%%%%DOCSDIR%%3/TODO
%%PORTDOCS%%%%DOCSDIR%%3/UNIX.txt
%%PORTDOCS%%%%DOCSDIR%%3/conf/groups.html
%%PORTDOCS%%%%DOCSDIR%%3/conf/history.html
%%PORTDOCS%%%%DOCSDIR%%3/conf/index.html
%%PORTDOCS%%%%DOCSDIR%%3/conf/index_prog.html
%%PORTDOCS%%%%DOCSDIR%%3/conf/index_user.html
%%PORTDOCS%%%%DOCSDIR%%3/conf/lists.html
%%PORTDOCS%%%%DOCSDIR%%3/conf/merging.png
%%PORTDOCS%%%%DOCSDIR%%3/conf/noextend.html
%%PORTDOCS%%%%DOCSDIR%%3/conf/plugin_chk.html
%%PORTDOCS%%%%DOCSDIR%%3/conf/prio.html
%%PORTDOCS%%%%DOCSDIR%%3/conf/scalars.html
%%PORTDOCS%%%%DOCSDIR%%3/conf/sources.html
%%PORTDOCS%%%%DOCSDIR%%3/conf/syntax.html
%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/CFN_BOOLEAN.html
%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/CFN_COLOR.html
%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/CFN_COORD.html
%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/CFN_INCREMENTS.html
%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/CFN_INTEGER.html
%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/CFN_LIST.html
%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/CFN_REAL.html
%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/CFN_STRING.html
%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/CFN_UNIT.html
%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/appearance.html
%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/appearance_color.html
%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/appearance_loglevels.html
%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/appearance_messages.html
%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/appearance_misc.html
%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/appearance_padstack.html
%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/appearance_subc.html
%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/design.html
%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/design_drc.html
%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/design_drc_disable.html
%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/design_thermal.html
%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/editor.html
%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/editor_selection.html
%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/editor_view.html
%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/import_footprint_placement.html
%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/import_footprint_removal.html
%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/rc.html
%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/rc_path.html
%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/temp.html
%%PORTDOCS%%%%DOCSDIR%%3/contact.html
%%PORTDOCS%%%%DOCSDIR%%3/contrib.html
%%PORTDOCS%%%%DOCSDIR%%3/developer/hid_remote/proto_high.html
%%PORTDOCS%%%%DOCSDIR%%3/developer/hid_remote/proto_low.html
%%PORTDOCS%%%%DOCSDIR%%3/developer/hid_remote/proto_parse.html
%%PORTDOCS%%%%DOCSDIR%%3/developer/hid_remote/proto_parse.svg
%%PORTDOCS%%%%DOCSDIR%%3/index.html
%%PORTDOCS%%%%DOCSDIR%%3/irc.html
%%PORTDOCS%%%%DOCSDIR%%3/license.html
%%PORTDOCS%%%%DOCSDIR%%3/mac.txt
%%PORTDOCS%%%%DOCSDIR%%3/news.html
%%PORTDOCS%%%%DOCSDIR%%3/windows.html
%%DATADIR%%3/librnd.mak
%%DATADIR%%3/librnd_packages.sh
%%DATADIR%%3/plugin.state
@dir include/librnd/src_3rd/libfungwbind/c

Return to bug 263849

Added Link Here

(-)b/cad/librnd/Makefile (+80 lines)
1	PORTNAME= librnd
2	DISTVERSION= 3.1.1
3	CATEGORIES= cad
4	MASTER_SITES= http://repo.hu/projects/${PORTNAME}/releases/
5
6	MAINTAINER= fuz@fuz.su
7	COMMENT= Flexible, modular two-dimensional CAD engine
8
9	LICENSE= GPLv2
10	LICENSE_FILE= ${WRKSRC}/COPYING
11
12	LIB_DEPENDS= libfungw.so:devel/fungw
13
14	USES= gmake pkgconfig tar:bz2
15	USE_LDCONFIG= yes
16
17	HAS_CONFIGURE= yes
18	CONFIGURE_ARGS= --all=plugin --plugin-hid_remote
19	TEST_TARGET= test
20	BINARY_ALIAS= make=${MAKE_CMD}
21
22	OPTIONS_DEFINE= DOCS GD MOTIF GTK2 GTK2GL GTK4 STROKE WGET
23	OPTIONS_DEFAULT= GD GTK4 STROKE WGET
24	OPTIONS_SUB= yes
25	GTK2GL_DESC= GTK+ 2 GUI with OpenGL support
26	GTK4_DESC= GTK+ 4 GUI toolkit support
27	WGET_DESC= Wget support
28
29	GD_LIB_DEPENDS= libgd.so:graphics/gd
30	GD_CONFIGURE_OFF= --disable-gd
31
32	GTK2GL_IMPLIES= GTK2
33	GTK2GL_LIB_DEPENDS= libgtkglext-x11-1.0.so:x11-toolkits/gtkglext
34	GTK2GL_USES= gl
35	GTK2GL_USE= gl=gl,glu gnome=pangox-compat xorg=x11
36	GTK2GL_CONFIGURE_OFF= --disable-hid_gtk2_gl
37
38	GTK2_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
39	libfreetype.so:print/freetype2 \
40	libharfbuzz.so:print/harfbuzz
41	GTK2_USES= gnome
42	GTK2_USE= gnome=cairo,gdkpixbuf2,gtk20
43	GTK2_CONFIGURE_OFF= --disable-hid_gtk2_gdk
44
45	GTK4_LIB_DEPENDS= libepoxy.so:graphics/libepoxy \
46	libgraphene-1.0.so:graphics/graphene \
47	libharfbuzz.so:print/harfbuzz \
48	libvulkan.so:graphics/vulkan-loader
49	GTK4_USES= gl gnome
50	GTK4_USE= gl=gl,glu gnome=cairo,gdkpixbuf2,gtk40
51	GTK4_CONFIGURE_OFF= --disable-hid_gtk4_gl
52
53	MOTIF_USES= motif
54	MOTIF_USE= xorg=xt,x11,xinerama,xrender
55	MOTIF_CONFIGURE_OFF= --disable-hid_lesstif
56
57	STROKE_LIB_DEPENDS= libstroke.so:devel/libstroke
58	STROKE_CONFIGURE_OFF= --disable-stroke
59
60	WGET_RUN_DEPENDS= wget:ftp/wget
61	WGET_CONFIGURE_OFF= --disable-lib_wget
62
63	.include <bsd.port.pre.mk>
64
65	.if ${PORT_OPTIONS:MGTK2} \|\| ${PORT_OPTIONS:MGTK4} \|\| ${PORT_OPTIONS:MMOTIF}
66	PLIST_SUB+= GUI=""
67	.else
68	PLIST_SUB+= GUI="@comment "
69	.endif
70
71	pre-configure:
72	${REINPLACE_CMD} \
73	-e 's,%%LOCALBASE%%,${LOCALBASE},' \
74	-e 's,%%MOTIFLIB%%,${MOTIFLIB},' \
75	${WRKSRC}/scconfig/src/gui/find_gl.c \
76	${WRKSRC}/scconfig/src/gui/find_lesstif2.c \
77	${WRKSRC}/scconfig/src/gui/find_misc.c \
78	${WRKSRC}/scconfig/src/gui/find_x.c
79
80	.include <bsd.port.post.mk>

Added Link Here

(-)b/cad/librnd/files/patch-scconfig_src_gui_find__lesstif2.c (+13 lines)
1	--- scconfig/src/gui/find_lesstif2.c.orig 2022-05-06 17:10:54 UTC
2	+++ scconfig/src/gui/find_lesstif2.c
3	@@ -45,8 +45,8 @@ int find_lesstif2(const char *name, int logdepth, int
4	NL;
5
6	const char *node = "libs/gui/lesstif2";
7	- char *cflags, cflags_arr[] = {"", "-I/opt/X11/include", NULL};
8	- char *ldflags, ldflags_arr[] = {"-lXm -lX11", "-lXm -lXt", "-L/opt/X11/lib -lXm -lXt -lX11", NULL}; /* note: -lXt must be after -lXm else lesstif fails to init with runtime error */
9	+ char *cflags, cflags_arr[] = {"-I%%LOCALBASE%%/include", "", "-I/opt/X11/include", NULL};
10	+ char *ldflags, ldflags_arr[] = {"%%MOTIFLIB%% -lXt -lX11", "-lXm -lX11", "-lXm -lXt", "-L/opt/X11/lib -lXm -lXt -lX11", NULL}; /* note: -lXt must be after -lXm else lesstif fails to init with runtime error */
11
12	if (require("cc/cc", logdepth, fatal))
13	return 1;

Added Link Here

(-)b/cad/librnd/files/patch-scconfig_src_gui_find__misc.c (+13 lines)
1	--- scconfig/src/gui/find_misc.c.orig 2022-05-06 18:29:16 UTC
2	+++ scconfig/src/gui/find_misc.c
3	@@ -45,8 +45,8 @@ int find_libstroke(const char *name, int logdepth, int
4	NL;
5
6	const char *node = "libs/gui/libstroke";
7	- char *cflags, cflags_arr[] = {"", NULL};
8	- char *ldflags, ldflags_arr[] = {"-lstroke", NULL};
9	+ char *cflags, cflags_arr[] = {"-I%%LOCALBASE%%/include", NULL};
10	+ char *ldflags, ldflags_arr[] = {"-L%%LOCALBASE%%/lib -lstroke", NULL};
11
12	if (require("cc/cc", logdepth, fatal))
13	return 1;

Added Link Here

(-)b/cad/librnd/files/patch-scconfig_src_gui_find__x.c (+15 lines)
1	--- scconfig/src/gui/find_x.c.orig 2018-12-09 09:02:02 UTC
2	+++ scconfig/src/gui/find_x.c
3	@@ -41,9 +41,9 @@ int find_xopendisplay(const char *name, int logdepth,
4	NL;
5
6	const char *node = "libs/gui/xopendisplay";
7	- char *cflags, cflags_arr[] = {"", "-I/opt/X11/include", "-I/usr/X11R6/include", NULL};
8	- char *ldflags, ldflags_arr[] = {"-lX11", "-L/opt/X11/lib -lX11", "-L/usr/X11R6/lib -lX11", NULL};
9	- char *Lflags, Lflags_arr[] = {"", "-L/opt/X11/lib", "-L/usr/X11R6/lib", NULL};
10	+ char *cflags, cflags_arr[] = {"-I%%LOCALBASE%%/include", "-I/opt/X11/include", "-I/usr/X11R6/include", NULL};
11	+ char *ldflags, ldflags_arr[] = {"-L%%LOCALBASE%%/lib -lX11", "-L/opt/X11/lib -lX11", "-L/usr/X11R6/lib -lX11", NULL};
12	+ char *Lflags, Lflags_arr[] = {"-L%%LOCALBASE%%/lib", "-L/opt/X11/lib", "-L/usr/X11R6/lib", NULL};
13
14	if (require("cc/cc", logdepth, fatal))
15	return 1;

Added Link Here

(-)b/cad/librnd/pkg-plist (-1 / +256 lines)
0	-	1	include/librnd/config.h
		2	include/librnd/core/actions.h
		3	include/librnd/core/anyload.h
		4	include/librnd/core/base64.h
		5	include/librnd/core/box.h
		6	include/librnd/core/box_isc.h
		7	include/librnd/core/buildin.hidlib.h
		8	include/librnd/core/color.h
		9	include/librnd/core/color_cache.h
		10	include/librnd/core/compat_fs.h
		11	include/librnd/core/compat_inc.h
		12	include/librnd/core/compat_lrealpath.h
		13	include/librnd/core/compat_misc.h
		14	include/librnd/core/conf.h
		15	include/librnd/core/conf_hid.h
		16	include/librnd/core/config.h
		17	include/librnd/core/error.h
		18	include/librnd/core/event.h
		19	include/librnd/core/file_loaded.h
		20	include/librnd/core/fptr_cast.h
		21	include/librnd/core/funchash.h
		22	include/librnd/core/funchash_core.h
		23	include/librnd/core/funchash_core_list.h
		24	include/librnd/core/global_typedefs.h
		25	include/librnd/core/globalconst.h
		26	include/librnd/core/grid.h
		27	include/librnd/core/heap.h
		28	include/librnd/core/hid.h
		29	include/librnd/core/hid_attrib.h
		30	include/librnd/core/hid_cfg.h
		31	include/librnd/core/hid_cfg_action.h
		32	include/librnd/core/hid_cfg_input.h
		33	include/librnd/core/hid_dad.h
		34	include/librnd/core/hid_dad_spin.h
		35	include/librnd/core/hid_dad_tree.h
		36	include/librnd/core/hid_dad_unit.h
		37	include/librnd/core/hid_init.h
		38	include/librnd/core/hid_inlines.h
		39	include/librnd/core/hid_menu.h
		40	include/librnd/core/hid_nogui.h
		41	include/librnd/core/hidlib.h
		42	include/librnd/core/hidlib_conf.h
		43	include/librnd/core/list_conf.h
		44	include/librnd/core/math_helper.h
		45	include/librnd/core/misc_util.h
		46	include/librnd/core/paths.h
		47	include/librnd/core/pixmap.h
		48	include/librnd/core/plugins.h
		49	include/librnd/core/rnd_bool.h
		50	include/librnd/core/rnd_printf.h
		51	include/librnd/core/rotate.h
		52	include/librnd/core/safe_fs.h
		53	include/librnd/core/safe_fs_dir.h
		54	include/librnd/core/tool.h
		55	include/librnd/core/unit.h
		56	include/librnd/core/vtc0.h
		57	include/librnd/plugins/lib_hid_common/dialogs_conf.h
		58	include/librnd/plugins/lib_hid_common/dlg_comm_m.h
		59	include/librnd/plugins/lib_hid_common/dlg_pref.h
		60	include/librnd/plugins/lib_hid_common/place.h
		61	include/librnd/plugins/lib_hid_common/toolbar.h
		62	include/librnd/plugins/lib_hid_common/xpm.h
		63	include/librnd/plugins/lib_hid_common/zoompan.h
		64	include/librnd/plugins/lib_wget/lib_wget.h
		65	include/librnd/poly/offset.h
66	include/librnd/poly/polyarea.h
67	include/librnd/poly/polygon1_gen.h
68	include/librnd/poly/rtree.h
69	include/librnd/poly/rtree2_compat.h
70	include/librnd/poly/self_isc.h
71	include/librnd/scconfig/hooks_common.h
72	include/librnd/scconfig/plugin_3state.h
73	include/librnd/scconfig/rnd_hook_detect.h
74	include/librnd/src_3rd/genht/hash.h
75	include/librnd/src_3rd/genht/ht.c
76	include/librnd/src_3rd/genht/ht.h
77	include/librnd/src_3rd/genht/ht_inlines.h
78	include/librnd/src_3rd/genht/ht_utils.h
79	include/librnd/src_3rd/genht/htip.h
80	include/librnd/src_3rd/genht/htpi.h
81	include/librnd/src_3rd/genht/htpp.h
82	include/librnd/src_3rd/genht/htsi.h
83	include/librnd/src_3rd/genht/htsp.h
84	include/librnd/src_3rd/genht/htss.h
85	include/librnd/src_3rd/genht/siphash24.h
86	include/librnd/src_3rd/genht/version.h
87	include/librnd/src_3rd/genlist/genadlist.h
88	include/librnd/src_3rd/genlist/gendlist.h
89	include/librnd/src_3rd/genlist/genlistalloc.h
90	include/librnd/src_3rd/genlist/gentdlist_impl.c
91	include/librnd/src_3rd/genlist/gentdlist_impl.h
92	include/librnd/src_3rd/genlist/gentdlist_undef.h
93	include/librnd/src_3rd/genregex/regex.h
94	include/librnd/src_3rd/genregex/regex_se.h
95	include/librnd/src_3rd/genregex/regex_sei.h
96	include/librnd/src_3rd/genregex/regex_templ.h
97	include/librnd/src_3rd/genrtree/genrtree_api.h
98	include/librnd/src_3rd/genrtree/genrtree_debug.h
99	include/librnd/src_3rd/genrtree/genrtree_delete.h
100	include/librnd/src_3rd/genrtree/genrtree_impl.h
101	include/librnd/src_3rd/genrtree/genrtree_search.h
102	include/librnd/src_3rd/gensexpr/gensexpr_impl.h
103	include/librnd/src_3rd/gensexpr/gsx_parse.h
104	include/librnd/src_3rd/gensexpr/gsxl.h
105	include/librnd/src_3rd/gensexpr/gsxnl.h
106	include/librnd/src_3rd/genvector/gds_char.h
107	include/librnd/src_3rd/genvector/genvector_impl.c
108	include/librnd/src_3rd/genvector/genvector_impl.h
109	include/librnd/src_3rd/genvector/genvector_undef.h
110	include/librnd/src_3rd/genvector/vtd0.h
111	include/librnd/src_3rd/genvector/vti0.h
112	include/librnd/src_3rd/genvector/vtl0.h
113	include/librnd/src_3rd/genvector/vtp0.h
114	include/librnd/src_3rd/genvector/vts0.h
115	include/librnd/src_3rd/libfungw/fungw.h
116	include/librnd/src_3rd/libfungw/fungw_conv.h
117	include/librnd/src_3rd/libfungw/scconfig_hooks.h
118	include/librnd/src_3rd/liblhtpers/lhtpers.h
119	include/librnd/src_3rd/liblihata/dom.h
120	include/librnd/src_3rd/liblihata/hash_str.h
121	include/librnd/src_3rd/liblihata/lihata.h
122	include/librnd/src_3rd/liblihata/parser.h
123	include/librnd/src_3rd/liblihata/tree.h
124	include/librnd/src_3rd/libulzw/libulzw.h
125	include/librnd/src_3rd/puplug/config.h
126	include/librnd/src_3rd/puplug/error.h
127	include/librnd/src_3rd/puplug/libs.h
128	include/librnd/src_3rd/puplug/libs_dep_parse.h
129	include/librnd/src_3rd/puplug/os_dep.h
130	include/librnd/src_3rd/puplug/os_dep_fs.h
131	include/librnd/src_3rd/puplug/puplug.h
132	include/librnd/src_3rd/puplug/scconfig_hooks.h
133	include/librnd/src_3rd/puplug/util.h
134	include/librnd/src_3rd/ureglex/exec.h
135	lib/librnd-3rd.a
136	lib/librnd-3rd.so
137	lib/librnd-3rd.so.3
138	lib/librnd-3rd.so.3.1.1
139	lib/librnd-hid.a
140	lib/librnd-hid.so
141	lib/librnd-hid.so.3
142	lib/librnd-hid.so.3.1.1
143	lib/librnd-poly.a
144	lib/librnd-poly.so
145	lib/librnd-poly.so.3
146	lib/librnd-poly.so.3.1.1
147	lib/librnd3/plugins/diag_rnd.pup
148	lib/librnd3/plugins/diag_rnd.so
149	lib/librnd3/plugins/hid_batch.pup
150	lib/librnd3/plugins/hid_batch.so
151	%%GTK2%%lib/librnd3/plugins/hid_gtk2_gdk.pup
152	%%GTK2%%lib/librnd3/plugins/hid_gtk2_gdk.so
153	%%GTK2GL%%lib/librnd3/plugins/hid_gtk2_gl.pup
154	%%GTK2GL%%lib/librnd3/plugins/hid_gtk2_gl.so
155	%%GTK4%%lib/librnd3/plugins/hid_gtk4_gl.pup
156	%%GTK4%%lib/librnd3/plugins/hid_gtk4_gl.so
157	%%MOTIF%%lib/librnd3/plugins/hid_lesstif.pup
158	%%MOTIF%%lib/librnd3/plugins/hid_lesstif.so
159	lib/librnd3/plugins/hid_remote.pup
160	lib/librnd3/plugins/hid_remote.so
161	lib/librnd3/plugins/irc.pup
162	lib/librnd3/plugins/irc.so
163	lib/librnd3/plugins/lib_gensexpr.pup
164	lib/librnd3/plugins/lib_gensexpr.so
165	%%GTK2%%lib/librnd3/plugins/lib_gtk2_common.pup
166	%%GTK2%%lib/librnd3/plugins/lib_gtk2_common.so
167	%%GTK4%%lib/librnd3/plugins/lib_gtk4_common.pup
168	%%GTK4%%lib/librnd3/plugins/lib_gtk4_common.so
169	%%GUI%%lib/librnd3/plugins/lib_hid_common.pup
170	%%GUI%%lib/librnd3/plugins/lib_hid_common.so
171	%%GTK2GL%%lib/librnd3/plugins/lib_hid_gl.pup
172	%%GTK2GL%%lib/librnd3/plugins/lib_hid_gl.so
173	lib/librnd3/plugins/lib_portynet.pup
174	lib/librnd3/plugins/lib_portynet.so
175	%%WGET%%lib/librnd3/plugins/lib_wget.pup
176	%%WGET%%lib/librnd3/plugins/lib_wget.so
177	lib/librnd3/plugins/loghid.pup
178	lib/librnd3/plugins/loghid.so
179	lib/librnd3/plugins/map_plugins.sh
180	lib/librnd3/plugins/script.pup
181	lib/librnd3/plugins/script.so
182	%%STROKE%%lib/librnd3/plugins/stroke.pup
183	%%STROKE%%lib/librnd3/plugins/stroke.so
184	lib/librnd3/puplug
185	lib/librnd3/scconfig/cquote
186	lib/librnd3/scconfig/gen_conf.sh
187	lib/librnd3/scconfig/sccbox
188	lib/librnd3/scconfig/template/cdep.tmpasm
189	lib/librnd3/scconfig/template/comp_var.tmpasm
190	lib/librnd3/scconfig/template/compile.tmpasm
191	lib/librnd3/scconfig/template/debug.tmpasm
192	lib/librnd3/scconfig/template/plugin_conf.tmpasm
193	lib/librnd3/scconfig/template/plugin_intconf.tmpasm
194	lib/librnd3/scconfig/template/plugin_intmenu.tmpasm
195	lib/librnd3/scconfig/template/plugin_sphash.tmpasm
196	lib/librnd3/sphash
197	%%PORTDOCS%%%%DOCSDIR%%3/Autostyle.html
198	%%PORTDOCS%%%%DOCSDIR%%3/TODO
199	%%PORTDOCS%%%%DOCSDIR%%3/UNIX.txt
200	%%PORTDOCS%%%%DOCSDIR%%3/conf/groups.html
201	%%PORTDOCS%%%%DOCSDIR%%3/conf/history.html
202	%%PORTDOCS%%%%DOCSDIR%%3/conf/index.html
203	%%PORTDOCS%%%%DOCSDIR%%3/conf/index_prog.html
204	%%PORTDOCS%%%%DOCSDIR%%3/conf/index_user.html
205	%%PORTDOCS%%%%DOCSDIR%%3/conf/lists.html
206	%%PORTDOCS%%%%DOCSDIR%%3/conf/merging.png
207	%%PORTDOCS%%%%DOCSDIR%%3/conf/noextend.html
208	%%PORTDOCS%%%%DOCSDIR%%3/conf/plugin_chk.html
209	%%PORTDOCS%%%%DOCSDIR%%3/conf/prio.html
210	%%PORTDOCS%%%%DOCSDIR%%3/conf/scalars.html
211	%%PORTDOCS%%%%DOCSDIR%%3/conf/sources.html
212	%%PORTDOCS%%%%DOCSDIR%%3/conf/syntax.html
213	%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/CFN_BOOLEAN.html
214	%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/CFN_COLOR.html
215	%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/CFN_COORD.html
216	%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/CFN_INCREMENTS.html
217	%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/CFN_INTEGER.html
218	%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/CFN_LIST.html
219	%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/CFN_REAL.html
220	%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/CFN_STRING.html
221	%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/CFN_UNIT.html
222	%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/appearance.html
223	%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/appearance_color.html
224	%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/appearance_loglevels.html
225	%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/appearance_messages.html
226	%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/appearance_misc.html
227	%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/appearance_padstack.html
228	%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/appearance_subc.html
229	%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/design.html
230	%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/design_drc.html
231	%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/design_drc_disable.html
232	%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/design_thermal.html
233	%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/editor.html
234	%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/editor_selection.html
235	%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/editor_view.html
236	%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/import_footprint_placement.html
237	%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/import_footprint_removal.html
238	%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/rc.html
239	%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/rc_path.html
240	%%PORTDOCS%%%%DOCSDIR%%3/conf/tree/temp.html
241	%%PORTDOCS%%%%DOCSDIR%%3/contact.html
242	%%PORTDOCS%%%%DOCSDIR%%3/contrib.html
243	%%PORTDOCS%%%%DOCSDIR%%3/developer/hid_remote/proto_high.html
244	%%PORTDOCS%%%%DOCSDIR%%3/developer/hid_remote/proto_low.html
245	%%PORTDOCS%%%%DOCSDIR%%3/developer/hid_remote/proto_parse.html
246	%%PORTDOCS%%%%DOCSDIR%%3/developer/hid_remote/proto_parse.svg
247	%%PORTDOCS%%%%DOCSDIR%%3/index.html
248	%%PORTDOCS%%%%DOCSDIR%%3/irc.html
249	%%PORTDOCS%%%%DOCSDIR%%3/license.html
250	%%PORTDOCS%%%%DOCSDIR%%3/mac.txt
251	%%PORTDOCS%%%%DOCSDIR%%3/news.html
252	%%PORTDOCS%%%%DOCSDIR%%3/windows.html
253	%%DATADIR%%3/librnd.mak
254	%%DATADIR%%3/librnd_packages.sh
255	%%DATADIR%%3/plugin.state
256	@dir include/librnd/src_3rd/libfungwbind/c