diff --git a/devel/etcd35/Makefile b/devel/etcd35/Makefile
deleted file mode 100644
index 16ef233..0000000
--- a/devel/etcd35/Makefile
+++ /dev/null
@@ -1,68 +0,0 @@
-PORTNAME=	etcd
-DISTVERSIONPREFIX=	v
-DISTVERSION=	3.5.25
-CATEGORIES=	devel
-MASTER_SITES=	https://raw.githubusercontent.com/etcd-io/${PORTNAME}/${DISTVERSIONFULL}/:gomod
-PKGNAMEPREFIX=	coreos-
-PKGNAMESUFFIX=	35
-DISTFILES=	go.mod:gomod \
-		api/go.mod:gomod \
-		pkg/go.mod:gomod \
-		client/pkg/go.mod:gomod \
-		client/v2/go.mod:gomod \
-		client/v3/go.mod:gomod \
-		etcdctl/go.mod:gomod \
-		etcdutl/go.mod:gomod \
-		raft/go.mod:gomod \
-		server/go.mod:gomod \
-		tests/go.mod:gomod
-
-MAINTAINER=	kiwi@FreeBSD.org
-COMMENT=	Highly-available key value store and service discovery
-WWW=		https://github.com/coreos/etcd
-
-LICENSE=	APACHE20
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-USES=		cpe go:modules
-USE_GITHUB=	yes
-GH_ACCOUNT=	etcd-io
-GO_MODULE=	go.etcd.io/etcd/v3
-GO_MOD_DIST=	github
-GO_TARGET=	./etcdctl ./etcdutl ./server
-
-CONFLICTS_INSTALL=	coreos-etcd[0-9][0-9]
-
-PLIST_FILES=	bin/etcd \
-		bin/etcdctl \
-		bin/etcdutl
-
-# This target is based on the post-extract target from Uses/go.mk
-post-extract:
-.for gt in ${GO_TARGET:T}
-	@${ECHO_MSG} "===> Tidying ${GO_MODNAME} dependencies";
-	@(cd ${GO_WRKSRC}/${gt}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=${GO_MODCACHE} ${GO_CMD} mod tidy -e)
-	@${ECHO_MSG} "===> Vendoring ${GO_MODNAME} dependencies";
-	@(cd ${GO_WRKSRC}/${gt}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=${GO_MODCACHE} ${GO_CMD} mod vendor -e)
-.endfor
-
-# This target is based on the do-build target from Uses/go.mk.
-do-build:
-.for gt in ${GO_TARGET:T}
-	(cd ${GO_WRKSRC}/${gt}; \
-	for t in ${gt}; do \
-		out=$$(${BASENAME} $$(${ECHO_CMD} $${t} | \
-			${SED} -Ee 's/^[^:]*:([^:]+).*$$/\1/' -e 's/^\.$$/${PORTNAME}/')); \
-		pkg=$$(${ECHO_CMD} $${t} | \
-			${SED} -Ee 's/^([^:]*).*$$/\1/' -e 's/^${PORTNAME}$$/./'); \
-		${ECHO_MSG} "===>  Building $${out} from $${pkg}"; \
-		${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${GO_ENV} GOMAXPROCS=${MAKE_JOBS_NUMBER} GOPROXY=off ${GO_CMD} build ${GO_BUILDFLAGS} \
-			-o ${GO_WRKDIR_BIN}/$${out} \
-			.; \
-	done)
-.endfor
-
-post-install:
-	${MV} ${STAGEDIR}${PREFIX}/bin/server ${STAGEDIR}${PREFIX}/bin/etcd
-
-.include <bsd.port.mk>
diff --git a/devel/etcd35/distinfo b/devel/etcd35/distinfo
deleted file mode 100644
index d5e085b..0000000
--- a/devel/etcd35/distinfo
+++ /dev/null
@@ -1,25 +0,0 @@
-TIMESTAMP = 1765426950
-SHA256 (go/devel_etcd35/etcd-io-etcd-v3.5.25_GH0/go.mod) = 2228e342b6cb05e40327ffc7ff188bedb57b39e9b52d12a9c6f6e6a9f0d34bb4
-SIZE (go/devel_etcd35/etcd-io-etcd-v3.5.25_GH0/go.mod) = 4287
-SHA256 (go/devel_etcd35/etcd-io-etcd-v3.5.25_GH0/api/go.mod) = 9cce3efb3e779cb2b78365d55fc6414ee5574c3ed2432865ad0460d1b06c08b1
-SIZE (go/devel_etcd35/etcd-io-etcd-v3.5.25_GH0/api/go.mod) = 1071
-SHA256 (go/devel_etcd35/etcd-io-etcd-v3.5.25_GH0/pkg/go.mod) = 8bf468f780567da05fe2ffcc7290751311046cd44e298b9ac3391e69c7463056
-SIZE (go/devel_etcd35/etcd-io-etcd-v3.5.25_GH0/pkg/go.mod) = 1126
-SHA256 (go/devel_etcd35/etcd-io-etcd-v3.5.25_GH0/client/pkg/go.mod) = cd3e0ddfe7e4100fbc1218e705d813ac4fbc5add809f92d7188a281cc880da20
-SIZE (go/devel_etcd35/etcd-io-etcd-v3.5.25_GH0/client/pkg/go.mod) = 437
-SHA256 (go/devel_etcd35/etcd-io-etcd-v3.5.25_GH0/client/v2/go.mod) = 0e26025ed63cfbb06ae53b5aeb71883f0d3f560c4975f9458ed333405438b933
-SIZE (go/devel_etcd35/etcd-io-etcd-v3.5.25_GH0/client/v2/go.mod) = 762
-SHA256 (go/devel_etcd35/etcd-io-etcd-v3.5.25_GH0/client/v3/go.mod) = cba2ff19b870b0eef9f34ddcec5875b677d737b7148cb1442e5a5e5d1c688653
-SIZE (go/devel_etcd35/etcd-io-etcd-v3.5.25_GH0/client/v3/go.mod) = 1742
-SHA256 (go/devel_etcd35/etcd-io-etcd-v3.5.25_GH0/etcdctl/go.mod) = 43a4bb916ce21c828119b03274c36862ad1fc86d0eb2e2f3f0b5872453c178d0
-SIZE (go/devel_etcd35/etcd-io-etcd-v3.5.25_GH0/etcdctl/go.mod) = 3519
-SHA256 (go/devel_etcd35/etcd-io-etcd-v3.5.25_GH0/etcdutl/go.mod) = d0b28fdd5c46815efbbd359e2ec4b41dac2bb0e47434d56cc67232e1b2970ced
-SIZE (go/devel_etcd35/etcd-io-etcd-v3.5.25_GH0/etcdutl/go.mod) = 3182
-SHA256 (go/devel_etcd35/etcd-io-etcd-v3.5.25_GH0/raft/go.mod) = 9ad56371ff220cccc51673f8bfc0fabaeee9fbb5e01f748a5292fe0ac977c5c6
-SIZE (go/devel_etcd35/etcd-io-etcd-v3.5.25_GH0/raft/go.mod) = 644
-SHA256 (go/devel_etcd35/etcd-io-etcd-v3.5.25_GH0/server/go.mod) = ebd0c75dc17f8770ee053eca3578a42d0c4f3200345f00527ae29b8891f2f4cb
-SIZE (go/devel_etcd35/etcd-io-etcd-v3.5.25_GH0/server/go.mod) = 3875
-SHA256 (go/devel_etcd35/etcd-io-etcd-v3.5.25_GH0/tests/go.mod) = ed03ba0741a6782a6ef00927d8d758dd5aee9b0484f339c1ebdf791bc7dd681a
-SIZE (go/devel_etcd35/etcd-io-etcd-v3.5.25_GH0/tests/go.mod) = 4033
-SHA256 (go/devel_etcd35/etcd-io-etcd-v3.5.25_GH0/etcd-io-etcd-v3.5.25_GH0.tar.gz) = 5aeac713e743f478f2b10f3bcbf4160202ce832d5d0e4dcd9fac01a382df5a9f
-SIZE (go/devel_etcd35/etcd-io-etcd-v3.5.25_GH0/etcd-io-etcd-v3.5.25_GH0.tar.gz) = 4142182
diff --git a/devel/etcd35/pkg-descr b/devel/etcd35/pkg-descr
deleted file mode 100644
index ea402f1..0000000
--- a/devel/etcd35/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-A highly-available key value store for shared
-configuration and service discovery. etcd is
-inspired by zookeeper and doozer, with a focus on:
-
-* Simple: curl'able user facing API (HTTP+JSON)
-* Secure: optional SSL client cert authentication
-* Fast: benchmarked 1000s of writes/s per instance
-* Reliable: Properly distributed using Raft
-
-Etcd is written in Go and uses the raft consensus
-algorithm to manage a highly-available replicated log.