git: 51cb92c46a23 - main - sysutils/py-psutil121/: Remove expired port:

The branch main has been updated by rene:

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

commit 51cb92c46a23a267b842fbf6bd4637af192fe1df
Author:     Rene Ladan <rene@FreeBSD.org>
AuthorDate: 2023-04-30 09:20:41 +0000
Commit:     Rene Ladan <rene@FreeBSD.org>
CommitDate: 2023-04-30 09:20:41 +0000

    sysutils/py-psutil121/: Remove expired port:
    
    2023-04-30 sysutils/py-psutil121: Use sysutils/py-psutil instead
---
 MOVED                                           |  1 +
 sysutils/Makefile                               |  1 -
 sysutils/py-psutil121/Makefile                  | 25 -------------
 sysutils/py-psutil121/distinfo                  |  2 -
 sysutils/py-psutil121/files/patch-_psutil_bsd.c | 50 -------------------------
 sysutils/py-psutil121/pkg-descr                 |  4 --
 6 files changed, 1 insertion(+), 82 deletions(-)

diff --git a/MOVED b/MOVED
index c0af11587aec..97616f81b9c1 100644
--- a/MOVED
+++ b/MOVED
@@ -17912,3 +17912,4 @@ devel/datovka|mail/datovka|2023-04-25|Move port to proper category
 benchmarks/super-smack||2023-04-30|Has expired: Unfetchable
 www/moodle39||2023-04-30|Has expired: Requires php74 which has been removed from the tree
 sysutils/u-boot-utilite||2023-04-30|Has expired: This port depends on the long time unsupported upstream devel/arm-none-eabi-gcc492
+sysutils/py-psutil121|sysutils/py-psutil|2023-04-30|Has expired: Use sysutils/py-psutil instead
diff --git a/sysutils/Makefile b/sysutils/Makefile
index feba6178c154..99cd9edd1339 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -1119,7 +1119,6 @@
     SUBDIR += py-power
     SUBDIR += py-prometheus-zfs
     SUBDIR += py-psutil
-    SUBDIR += py-psutil121
     SUBDIR += py-ptyprocess
     SUBDIR += py-puremagic
     SUBDIR += py-py-cpuinfo
diff --git a/sysutils/py-psutil121/Makefile b/sysutils/py-psutil121/Makefile
deleted file mode 100644
index 081c81d58c9a..000000000000
--- a/sysutils/py-psutil121/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-PORTNAME=	psutil
-PORTVERSION=	1.2.1
-PORTREVISION=	2
-CATEGORIES=	sysutils python
-MASTER_SITES=	PYPI
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-PKGNAMESUFFIX=	121
-
-MAINTAINER=	bofh@FreeBSD.org
-COMMENT=	Process utilities module for Python
-WWW=		https://pypi.org/project/psutil/
-
-LICENSE=	BSD3CLAUSE
-
-DEPRECATED=	Use sysutils/py-psutil instead
-EXPIRATION_DATE=2023-04-30
-
-CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}psutil
-
-PORTSCOUT=	limit:^1\.2\.
-
-USES=		python:3.6+
-USE_PYTHON=	distutils autoplist
-
-.include <bsd.port.mk>
diff --git a/sysutils/py-psutil121/distinfo b/sysutils/py-psutil121/distinfo
deleted file mode 100644
index fe98f49a52db..000000000000
--- a/sysutils/py-psutil121/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (psutil-1.2.1.tar.gz) = 508e4a44c8253a386a0f86d9c9bd4a1b4cbb2f94e88d49a19c1513653ca66c45
-SIZE (psutil-1.2.1.tar.gz) = 167397
diff --git a/sysutils/py-psutil121/files/patch-_psutil_bsd.c b/sysutils/py-psutil121/files/patch-_psutil_bsd.c
deleted file mode 100644
index 7ecc305d6f03..000000000000
--- a/sysutils/py-psutil121/files/patch-_psutil_bsd.c
+++ /dev/null
@@ -1,50 +0,0 @@
---- psutil/_psutil_bsd.c.orig	2017-03-21 00:39:17.505652000 -0700
-+++ psutil/_psutil_bsd.c	2017-03-21 00:41:20.821739000 -0700
-@@ -917,11 +917,19 @@
-         psutil_sockaddr_addrlen(family)) == 0);
- }
- 
-+#if __FreeBSD_version >= 1200026
-+static struct xtcpcb *
-+psutil_search_tcplist(char *buf, struct kinfo_file *kif)
-+{
-+    struct xtcpcb *tp;
-+    struct xinpcb *inp;
-+#else
- static struct tcpcb *
- psutil_search_tcplist(char *buf, struct kinfo_file *kif)
- {
-     struct tcpcb *tp;
-     struct inpcb *inp;
-+#endif
-     struct xinpgen *xig, *oxig;
-     struct xsocket *so;
- 
-@@ -929,9 +937,15 @@
-     for (xig = (struct xinpgen *)((char *)xig + xig->xig_len);
-          xig->xig_len > sizeof(struct xinpgen);
-          xig = (struct xinpgen *)((char *)xig + xig->xig_len)) {
-+#if __FreeBSD_version >= 1200026
-+	tp = (struct xtcpcb *)xig;
-+	inp = &tp->xt_inp;
-+	so = &inp->xi_socket;
-+#else
-         tp = &((struct xtcpcb *)xig)->xt_tp;
-         inp = &((struct xtcpcb *)xig)->xt_inp;
-         so = &((struct xtcpcb *)xig)->xt_socket;
-+#endif
- 
-         if (so->so_type != kif->kf_sock_type ||
-             so->xso_family != kif->kf_sock_domain ||
-@@ -976,7 +990,11 @@
-     struct kinfo_file *kif;
-     struct kinfo_proc kipp;
-     char *tcplist = NULL;
-+#if __FreeBSD_version >= 1200026
-+    struct xtcpcb *tcp;
-+#else
-     struct tcpcb *tcp;
-+#endif
- 
-     PyObject *retList = PyList_New(0);
-     PyObject *tuple = NULL;
diff --git a/sysutils/py-psutil121/pkg-descr b/sysutils/py-psutil121/pkg-descr
deleted file mode 100644
index 8ac55c868838..000000000000
--- a/sysutils/py-psutil121/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-psutil is a module providing an interface for retrieving information
-on running processes and system utilization (CPU, memory) in a portable
-way by using Python, implementing many functionalities offered by tools
-like ps, top and Windows task manager.