git: ae9ec3576cee - main - devel/sd-mux-ctrl: Rename to match upstream

Sofian Brabez sbz at FreeBSD.org
Tue Apr 13 18:59:15 UTC 2021 

The branch main has been updated by sbz:

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

commit ae9ec3576ceecffb16590fb47dd63e6b2e7ee900
Author:     Sofian Brabez <sbz at FreeBSD.org>
AuthorDate: 2021-04-08 14:20:30 +0000
Commit:     Sofian Brabez <sbz at FreeBSD.org>
CommitDate: 2021-04-13 18:58:05 +0000

    devel/sd-mux-ctrl: Rename to match upstream
    
    Rename devel/sd-mux to devel/sd-mux-ctrl and remove dupplicate port
    sysutils/sd-mux-ctrl added recently. As the port names were different
    `addport -y` didn't catch the duplicate when looking at the catalog tree
    INDEX. Also add entries into MOVED.
    
    Approved by:    swills
    Differential Revision: https://reviews.freebsd.org/D29732
---
 MOVED                                               |  2 ++
 devel/Makefile                                      |  2 +-
 {sysutils => devel}/sd-mux-ctrl/Makefile            | 10 +++++++---
 {sysutils => devel}/sd-mux-ctrl/distinfo            |  2 +-
 .../files/patch-src_CMakeLists.txt                  |  0
 {sysutils => devel}/sd-mux-ctrl/pkg-descr           |  1 +
 devel/sd-mux/Makefile                               | 21 ---------------------
 devel/sd-mux/distinfo                               |  3 ---
 devel/sd-mux/pkg-descr                              |  4 ----
 sysutils/Makefile                                   |  1 -
 10 files changed, 12 insertions(+), 34 deletions(-)

diff --git a/MOVED b/MOVED
index 16d07aeda3fd..6f9ace4b0755 100644
--- a/MOVED
+++ b/MOVED
@@ -16283,3 +16283,5 @@ dns/credns||2021-04-12|Broken 12+, unmaintained upstream
 www/youtube_dlc|www/yt-dlp|2021-04-12|Upstream have made a complete transition to new project name
 security/netpgp||2021-04-12|Broken 12+, unmaintained upstream
 net/freenet6||2021-04-12|Broken 12+, service discontinued
+devel/sd-mux|devel/sd-mux-ctrl|2021-04-13|Renamed to match upstream naming
+sysutils/sd-mux-ctrl|devel/sd-mux-ctrl|2021-04-13|Remove duplicate port
diff --git a/devel/Makefile b/devel/Makefile
index 50cf8f59b9f7..026c4b2247a0 100644
--- a/devel/Makefile
+++ b/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
diff --git a/sysutils/sd-mux-ctrl/Makefile b/devel/sd-mux-ctrl/Makefile
similarity index 74%
rename from sysutils/sd-mux-ctrl/Makefile
rename to devel/sd-mux-ctrl/Makefile
index b7e70e70664f..9964df60ba6d 100644
--- a/sysutils/sd-mux-ctrl/Makefile
+++ b/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 at FreeBSD.org
+MAINTAINER=	swills at FreeBSD.org
 COMMENT=	Control utility for Tizen SD card multiplexer
 
 LICENSE=	APACHE20
@@ -19,6 +19,10 @@ USES=		cmake pkgconfig tar:bz2
 
 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>
diff --git a/sysutils/sd-mux-ctrl/distinfo b/devel/sd-mux-ctrl/distinfo
similarity index 93%
rename from sysutils/sd-mux-ctrl/distinfo
rename to devel/sd-mux-ctrl/distinfo
index a78f1748a52a..6a6e5b949606 100644
--- a/sysutils/sd-mux-ctrl/distinfo
+++ b/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
diff --git a/devel/sd-mux/files/patch-src_CMakeLists.txt b/devel/sd-mux-ctrl/files/patch-src_CMakeLists.txt
similarity index 100%
rename from devel/sd-mux/files/patch-src_CMakeLists.txt
rename to devel/sd-mux-ctrl/files/patch-src_CMakeLists.txt
diff --git a/sysutils/sd-mux-ctrl/pkg-descr b/devel/sd-mux-ctrl/pkg-descr
similarity index 80%
rename from sysutils/sd-mux-ctrl/pkg-descr
rename to devel/sd-mux-ctrl/pkg-descr
index 8ce458cdf407..eaa4c5aa35fc 100644
--- a/sysutils/sd-mux-ctrl/pkg-descr
+++ b/devel/sd-mux-ctrl/pkg-descr
@@ -2,3 +2,4 @@ sd-mux-ctrl is a control program for the Tizen Secure Digital (SD) card
 multiplexer.
 
 WWW: https://git.tizen.org/cgit/tools/testlab/sd-mux/
+www: https://wiki.tizen.org/SDWire
diff --git a/devel/sd-mux/Makefile b/devel/sd-mux/Makefile
deleted file mode 100644
index 6236c88761a5..000000000000
--- a/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 at 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>
diff --git a/devel/sd-mux/distinfo b/devel/sd-mux/distinfo
deleted file mode 100644
index 7807eae47703..000000000000
--- a/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
diff --git a/devel/sd-mux/pkg-descr b/devel/sd-mux/pkg-descr
deleted file mode 100644
index 317847c76d4d..000000000000
--- a/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/
diff --git a/sysutils/Makefile b/sysutils/Makefile
index 6149cb501645..ce6a02974acc 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -1234,7 +1234,6 @@
     SUBDIR += screenie
     SUBDIR += scterc
     SUBDIR += sd-agent
-    SUBDIR += sd-mux-ctrl
     SUBDIR += sdparm
     SUBDIR += seatd
     SUBDIR += seatools

More information about the dev-commits-ports-all mailing list