Index: MOVED
===================================================================
--- MOVED
+++ MOVED
@@ -16278,3 +16278,5 @@
 databases/percona55-server||2021-04-11|EOL upstream
 databases/percona55-client||2021-04-11|EOL upstream
 graphics/ilmbase|math/Imath|2021-04-10|Ilmbase was split out into Imath and OpenEXR.
+devel/sd-mux|devel/sd-mux-ctrl|2021-04-12|Renamed to match upstream naming
+sysutils/sd-mux-ctrl|devel/sd-mux-ctrl|2021-04-12|Remove duplicate port
Index: devel/Makefile
===================================================================
--- devel/Makefile
+++ devel/Makefile
@@ -6755,7 +6755,7 @@
     SUBDIR += scandoc
     SUBDIR += sccache
     SUBDIR += scons
-    SUBDIR += sd-mux
+    SUBDIR += sd-mux-ctrl
     SUBDIR += sdl12
     SUBDIR += sdl20
     SUBDIR += sdl2pp
Index: devel/sd-mux-ctrl/Makefile
===================================================================
--- devel/sd-mux-ctrl/Makefile
+++ devel/sd-mux-ctrl/Makefile
@@ -1,12 +1,12 @@
 PORTNAME=	sd-mux-ctrl
 DISTVERSION=	g20200217
-CATEGORIES=	sysutils
+CATEGORIES=	devel
 MASTER_SITES=	https://git.tizen.org/cgit/tools/testlab/sd-mux/snapshot/sd-mux-9dd189d973da64e033a0c5c2adb3d94b23153d94.tar.bz2?/
 
 PATCH_SITES=	https://github.com/emaste/sd-mux/commit/
 PATCHFILES=	83f2783ac56bbf42f9bb877c5937cd1f17bb2999.patch:-p1
 
-MAINTAINER=	emaste@FreeBSD.org
+MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Control utility for Tizen SD card multiplexer
 
 LICENSE=	APACHE20
@@ -19,6 +19,10 @@
 
 WRKSRC=		${WRKDIR}/sd-mux-9dd189d973da64e033a0c5c2adb3d94b23153d94
 
-PLIST_FILES=	bin/sd-mux-ctrl
+PLIST_FILES=	bin/sd-mux-ctrl \
+		man/man1/sd-mux-ctrl.1.gz
+
+post-install:
+		${INSTALL_MAN} ${WRKSRC}/doc/man/sd-mux-ctrl.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 
 .include <bsd.port.mk>
Index: devel/sd-mux-ctrl/distinfo
===================================================================
--- devel/sd-mux-ctrl/distinfo
+++ devel/sd-mux-ctrl/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1616967956
+TIMESTAMP = 1617890469
 SHA256 (sd-mux-ctrl-g20200217.tar.bz2) = 3b8dd1a7f1cf52a271d4e543d859d88132b92749977efdca79c79c5d9fefda5e
 SIZE (sd-mux-ctrl-g20200217.tar.bz2) = 744534
 SHA256 (83f2783ac56bbf42f9bb877c5937cd1f17bb2999.patch) = 5c53a70eeef566a4e595bc420f7bf307137ebade8bcd9a65b9407267805dfea0
Index: devel/sd-mux-ctrl/pkg-descr
===================================================================
--- devel/sd-mux-ctrl/pkg-descr
+++ devel/sd-mux-ctrl/pkg-descr
@@ -2,3 +2,4 @@
 multiplexer.
 
 WWW: https://git.tizen.org/cgit/tools/testlab/sd-mux/
+www: https://wiki.tizen.org/SDWire
Index: devel/sd-mux/Makefile
===================================================================
--- devel/sd-mux/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-PORTNAME=	sd-mux
-PORTVERSION=	g20201028
-CATEGORIES=	devel
-MASTER_SITES=	LOCAL/swills
-DISTNAME=	sd-mux-20201028
-
-MAINTAINER=	swills@FreeBSD.org
-COMMENT=	Utility for controlling sd-mux and sd-wire
-
-LIB_DEPENDS=	libftdi1.so:devel/libftdi1 \
-		libpopt.so:devel/popt
-
-USES=		cmake pkgconfig
-
-PLIST_FILES=	bin/sd-mux-ctrl \
-		man/man1/sd-mux-ctrl.1.gz
-
-post-install:
-	${INSTALL_MAN} ${WRKSRC}/doc/man/sd-mux-ctrl.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
-
-.include <bsd.port.mk>
Index: devel/sd-mux/distinfo
===================================================================
--- devel/sd-mux/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1603909993
-SHA256 (sd-mux-20201028.tar.gz) = 87210ff15bb8f31df78b78061f2842c184dba4498f6bbb88db8522aff684b92c
-SIZE (sd-mux-20201028.tar.gz) = 753375
Index: devel/sd-mux/files/patch-src_CMakeLists.txt
===================================================================
--- /dev/null
+++ devel/sd-mux/files/patch-src_CMakeLists.txt
@@ -1,12 +0,0 @@
---- src/CMakeLists.txt.orig	2020-02-17 16:20:18 UTC
-+++ src/CMakeLists.txt
-@@ -37,6 +37,9 @@ INCLUDE_DIRECTORIES(
-     ${FTD2XX_PATH}
-     )
- 
-+SET(CMAKE_CXX_FLAGS      "${CMAKE_CXX_FLAGS} -I${SDMUX_DEP_popt_INCLUDEDIR}")
-+SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L${SDMUX_DEP_popt_LIBDIR}")
-+
- ADD_EXECUTABLE(${TARGET_SDMUXCTRL} ${SDMUXCTRL_SOURCES})
- 
- TARGET_LINK_LIBRARIES(${TARGET_SDMUXCTRL}
Index: devel/sd-mux/pkg-descr
===================================================================
--- devel/sd-mux/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Utility for controlling sd-mux and sd-wire
-
-WWW: https://wiki.tizen.org/SDWire
-WWW: https://git.tizen.org/cgit/tools/testlab/sd-mux/
Index: sysutils/Makefile
===================================================================
--- sysutils/Makefile
+++ sysutils/Makefile
@@ -1234,7 +1234,6 @@
     SUBDIR += screenie
     SUBDIR += scterc
     SUBDIR += sd-agent
-    SUBDIR += sd-mux-ctrl
     SUBDIR += sdparm
     SUBDIR += seatd
     SUBDIR += seatools