diff --git a/net-mgmt/netmagis-common/Makefile b/net-mgmt/netmagis-common/Makefile
index f685cf038738..7c5683f248e3 100644
--- a/net-mgmt/netmagis-common/Makefile
+++ b/net-mgmt/netmagis-common/Makefile
@@ -1,52 +1,52 @@
 PORTNAME?=	netmagis
-PORTVERSION?=	2.3.4
-PORTREVISION=	2
+PORTVERSION?=	2.3.6
+PORTREVISION=	1
 CATEGORIES?=	net-mgmt
 MASTER_SITES=	http://netmagis.org/files/
 PKGNAMESUFFIX?=	-common
 
 MAINTAINER?=	pdagog@gmail.com
 COMMENT?=	Netmagis common infrastructure
 WWW=		http://www.netmagis.org/
 
 LICENSE=	CECILL-B
 LICENSE_NAME=	CeCILL-B Free Software License Agreement
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 RUN_DEPENDS+=	dtplite:devel/tcllib
 
 NO_ARCH?=	yes
 USES+=		pgsql:11+ tcl
 WANT_PGSQL+=	pgtcl
 
 SLAVEDIRS=	net-mgmt/netmagis-common \
 	net-mgmt/netmagis-database \
 	net-mgmt/netmagis-detecteq \
 	net-mgmt/netmagis-metro \
 	net-mgmt/netmagis-servers \
 	net-mgmt/netmagis-topo \
 	net-mgmt/netmagis-utils \
 	net-mgmt/netmagis-www
 
 # Variables used in netmagis Makefiles
 MAKE_ARGS+=	DESTDIR=${STAGEDIR}${DESTDIR} PREFIX=${PREFIX}
 MAKE_ARGS+=	TCLSH=${TCLSH} TCLCONF=${TCL_LIBDIR}/tclConfig.sh
 
 .if ${PKGNAMESUFFIX} == -topo || ${PKGNAMESUFFIX} == -www
 ALL_TARGET=build${PKGNAMESUFFIX?=}
 .else
 ALL_TARGET=nothing
 .endif
 
 INSTALL_TARGET=	install${PKGNAMESUFFIX}
 
 # Change "cd foo; make" into "$(MAKE) -C foo" to unbreak parallel builds
 post-patch:
 	@${FIND} ${WRKSRC} -type f -name Makefile -print0 | ${XARGS} -0 \
 		${REINPLACE_CMD} -E 's,cd(.+) (;|&&) make,$$(MAKE) -C\1,'
 	@${REINPLACE_CMD} -E 's,cd (.+) ; (ln -s en ),\2\1/,' \
 		${WRKSRC}/www/Makefile
 	${REINPLACE_CMD} '/NMVARDIR/s/$$(PREFIX)//' ${WRKSRC}/Makefile
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/netmagis-common/distinfo b/net-mgmt/netmagis-common/distinfo
index 9a942ce257a4..ac0b03703560 100644
--- a/net-mgmt/netmagis-common/distinfo
+++ b/net-mgmt/netmagis-common/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1520103662
-SHA256 (netmagis-2.3.4.tar.gz) = 041c8de59e8dfa03f2fb02da2dea2e72aa19972a638d0226c36c45312ad132da
-SIZE (netmagis-2.3.4.tar.gz) = 670861
+TIMESTAMP = 1682493815
+SHA256 (netmagis-2.3.6.tar.gz) = 88f8cea812bd6c2e042e6bed696b316def1e063bd8c8f1259e737cad453b2fc6
+SIZE (netmagis-2.3.6.tar.gz) = 694577
diff --git a/net-mgmt/netmagis-common/files/patch-topo_src_dumpgraph.c b/net-mgmt/netmagis-common/files/patch-topo_src_dumpgraph.c
new file mode 100644
index 000000000000..8a0e928b6eca
--- /dev/null
+++ b/net-mgmt/netmagis-common/files/patch-topo_src_dumpgraph.c
@@ -0,0 +1,11 @@
+--- topo/src/dumpgraph.c.orig	2023-04-26 07:46:02 UTC
++++ topo/src/dumpgraph.c
+@@ -3,8 +3,6 @@
+ 
+ #include "graph.h"
+ 
+-MOBJ *mobjlist [NB_MOBJ] ;
+-
+ void usage (char *progname)
+ {
+     fprintf (stderr, "Usage : %s [-a|-n cidr|-v vlan|-e regexp|-E regexp|-t|-m]* [-o obj]\n", progname) ;
diff --git a/net-mgmt/netmagis-common/files/patch-topo_src_extractcoll.c b/net-mgmt/netmagis-common/files/patch-topo_src_extractcoll.c
new file mode 100644
index 000000000000..6181289dba9c
--- /dev/null
+++ b/net-mgmt/netmagis-common/files/patch-topo_src_extractcoll.c
@@ -0,0 +1,11 @@
+--- topo/src/extractcoll.c.orig	2023-04-26 07:46:42 UTC
++++ topo/src/extractcoll.c
+@@ -233,8 +233,6 @@ void usage (char *progname)
+     exit (1) ;
+ }
+ 
+-MOBJ *mobjlist [NB_MOBJ] ;
+-
+ int main (int argc, char *argv [])
+ {
+     char *prog, *errstr ;
diff --git a/net-mgmt/netmagis-common/files/patch-topo_src_extracteq.c b/net-mgmt/netmagis-common/files/patch-topo_src_extracteq.c
new file mode 100644
index 000000000000..2a3bc5174bc0
--- /dev/null
+++ b/net-mgmt/netmagis-common/files/patch-topo_src_extracteq.c
@@ -0,0 +1,11 @@
+--- topo/src/extracteq.c.orig	2023-04-26 07:47:44 UTC
++++ topo/src/extracteq.c
+@@ -205,8 +205,6 @@ void output_vlan (FILE *fp, vlan_t v, struct vlan *vob
+ Main function
+ ******************************************************************************/
+ 
+-MOBJ *mobjlist [NB_MOBJ] ;
+-
+ void usage (char *progname)
+ {
+     fprintf (stderr, "Usage : %s [-a|-n cidr|-v vlan|-e regexp|-E regexp|-t|-m]* eq [iface]\n", progname) ;
diff --git a/net-mgmt/netmagis-common/files/patch-topo_src_extractl1.c b/net-mgmt/netmagis-common/files/patch-topo_src_extractl1.c
new file mode 100644
index 000000000000..cf3c1ce8df07
--- /dev/null
+++ b/net-mgmt/netmagis-common/files/patch-topo_src_extractl1.c
@@ -0,0 +1,11 @@
+--- topo/src/extractl1.c.orig	2023-04-26 07:45:08 UTC
++++ topo/src/extractl1.c
+@@ -82,8 +82,6 @@ void mark_ifaces (int termif)
+ Main function
+ ******************************************************************************/
+ 
+-MOBJ *mobjlist [NB_MOBJ] ;
+-
+ void usage (char *progname)
+ {
+     fprintf (stderr, "Usage : %s [-a|-n cidr|-v vlan|-e regexp|-E regexp|-t|-m]* [-b|-B]\n", progname) ;
diff --git a/net-mgmt/netmagis-common/files/patch-topo_src_extractl2.c b/net-mgmt/netmagis-common/files/patch-topo_src_extractl2.c
new file mode 100644
index 000000000000..6df51db791ad
--- /dev/null
+++ b/net-mgmt/netmagis-common/files/patch-topo_src_extractl2.c
@@ -0,0 +1,11 @@
+--- topo/src/extractl2.c.orig	2023-04-26 07:47:11 UTC
++++ topo/src/extractl2.c
+@@ -184,8 +184,6 @@ void output_vlans (FILE *fp, vlanset_t vs)
+ Main function
+ ******************************************************************************/
+ 
+-MOBJ *mobjlist [NB_MOBJ] ;
+-
+ void usage (char *progname)
+ {
+     fprintf (stderr, "Usage : %s [-a|-n cidr|-v vlan|-e regexp|-E regexp|-t|-m]* [eq [iface]] vlanid\n", progname) ;
diff --git a/net-mgmt/netmagis-common/files/patch-topo_src_extractl3.c b/net-mgmt/netmagis-common/files/patch-topo_src_extractl3.c
new file mode 100644
index 000000000000..285eab49f39f
--- /dev/null
+++ b/net-mgmt/netmagis-common/files/patch-topo_src_extractl3.c
@@ -0,0 +1,11 @@
+--- topo/src/extractl3.c.orig	2023-04-26 07:45:37 UTC
++++ topo/src/extractl3.c
+@@ -543,8 +543,6 @@ void walkl3 (FILE *fp, struct node *n)
+ Main function
+ ******************************************************************************/
+ 
+-MOBJ *mobjlist [NB_MOBJ] ;
+-
+ void usage (char *progname)
+ {
+     fprintf (stderr, "Usage : %s [-a|-n cidr|-v vlan|-e regexp|-E regexp|-t|-m]* cidr ... cidr\n", progname) ;
diff --git a/net-mgmt/netmagis-common/pkg-plist b/net-mgmt/netmagis-common/pkg-plist
index 36a48c8cfb79..a31cc3e9abcd 100644
--- a/net-mgmt/netmagis-common/pkg-plist
+++ b/net-mgmt/netmagis-common/pkg-plist
@@ -1,13 +1,14 @@
 bin/netmagis-config
 etc/netmagis.conf.sample
 lib/netmagis/libnetmagis.tcl
 lib/netmagis/msgs/C.msg
 lib/netmagis/msgs/en.msg
 lib/netmagis/msgs/fr.msg
 lib/netmagis/pkgtcl/arrgen.n
 lib/netmagis/pkgtcl/arrgen.tcl
+lib/netmagis/pkgtcl/ldap-bug-fix.192
 lib/netmagis/pkgtcl/pgsql.n
 lib/netmagis/pkgtcl/pgsql.tcl
 lib/netmagis/pkgtcl/pkgIndex.tcl
 lib/netmagis/pkgtcl/webapp.n
 lib/netmagis/pkgtcl/webapp.tcl
diff --git a/net-mgmt/netmagis-topo/Makefile b/net-mgmt/netmagis-topo/Makefile
index e1c365384450..c1c172448f48 100644
--- a/net-mgmt/netmagis-topo/Makefile
+++ b/net-mgmt/netmagis-topo/Makefile
@@ -1,33 +1,30 @@
 PORTNAME=	netmagis
 PORTREVISION=	1
 PKGNAMESUFFIX=	-topo
 
 COMMENT=	Netmagis topology module
 
 LICENSE=	CECILL-B
 
-BROKEN_FreeBSD_13=	ld: error: duplicate symbol: mobjlist
-BROKEN_FreeBSD_14=	ld: error: duplicate symbol: mobjlist
-
 RUN_DEPENDS=	netmagis-config:net-mgmt/netmagis-common \
 		rancid-run:net-mgmt/rancid3 \
 		fping:net/fping
 
 NO_ARCH=	# no
 USE_RC_SUBR=	topographd toposendd
 SUB_LIST=	TCLSH=${TCLSH}
 
 MASTERDIR=	${.CURDIR}/../netmagis-common
 
 FILESDIR=	${.CURDIR}/files
 PKGMESSAGE=	${.CURDIR}/pkg-message
 PLIST=		${.CURDIR}/pkg-plist
 
 ALL_TARGET=build${PKGNAMESUFFIX?=}
 
 OPTIONS_DEFINE=	EXAMPLES
 
 post-install:
 	@${MKDIR} ${STAGEDIR}/var/netmagis/eqgen ${STAGEDIR}/var/netmagis/eqvirt
 
 .include "${MASTERDIR}/Makefile"
diff --git a/net-mgmt/netmagis-www/Makefile b/net-mgmt/netmagis-www/Makefile
index ce4506679d3d..7453a8f5cab0 100644
--- a/net-mgmt/netmagis-www/Makefile
+++ b/net-mgmt/netmagis-www/Makefile
@@ -1,33 +1,30 @@
 PORTNAME=	netmagis
 PORTREVISION=	2
 PKGNAMESUFFIX=	-www
 
 COMMENT=	Netmagis web module
 
 LICENSE=	CECILL-B
 
-BROKEN_FreeBSD_13=	ld: error: duplicate symbol: mobjlist
-BROKEN_FreeBSD_14=	ld: error: duplicate symbol: mobjlist
-
 RUN_DEPENDS=	netmagis-config:net-mgmt/netmagis-common \
 		dot:graphics/graphviz \
 		pwgen:sysutils/pwgen \
 		tcltls>=1.4.1:devel/tcltls \
 		tDOM>=0.8.0:www/tdom \
 		${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
 NO_ARCH=	# no
 USES=	tex
 #USE_TEX=	full
 
 MASTERDIR=	${.CURDIR}/../netmagis-common
 
 PKGMESSAGE=	${.CURDIR}/pkg-message
 PLIST=		${.CURDIR}/pkg-plist
 
 OPTIONS_DEFINE=	EXAMPLES
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/htgtcl
 
 .include "${MASTERDIR}/Makefile"