mail/py-pymilter: update to 1.0.6, add options, rename

Take maintainership.

Move port from mail/py-milter to mail/py-pymilter to match the name of
the PyPI package being ported.

Update to version 1.0.6

Use ${PORTSDIR}/mail/sendmail/bsd.milter.mk for consistency with most
other milter ports.

Add options to force selection between the mail/libmilter port and the
libmilter.so bundled with the base FreeBSD-sendmail package.  Prefer
the mail/libmilter port on general principles: given that all major
MTA software supports the milter interface, it should be possible to
install milters from pkg(8) without forcing the FreeBSD-sendmail to be
installed.

Changes:        https://github.com/sdgathman/pymilter/compare/pymilter-1.0.5...pymilter-1.0.6
Approved by:	Gerhard Schmidt (former maintainer)
PR:	 	286630

7 files changed, 46 insertions, 34 deletions

diff --git a/MOVED b/MOVED
index 87dffc8892b3..82f1c8371052 100644
--- a/MOVED
+++ b/MOVED
@@ -4396,3 +4396,4 @@ science/gtamsanalyzer||2025-05-05|Has expired: Upstream unmaintained as last rel
 www/dot-http||2025-05-05|Remove broken, unmaintained upstream port
 security/linux-rl9-libxcrypt|emulators/linux_base-rl9|2025-05-06|Integrated into linux_base-rl9
 graphics/quat-gui||2025-05-06|Has expired: Last upstream release was in 2003
+mail/py-milter|mail/py-pymilter|2025-05-08|Renamed to match upstream PyPI package name
diff --git a/mail/Makefile b/mail/Makefile
index fc5773b5abf5..c0347ccfe408 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -529,7 +529,6 @@
     SUBDIR += py-mailnag
     SUBDIR += py-mailsuite
     SUBDIR += py-managesieve3
-    SUBDIR += py-milter
     SUBDIR += py-notmuch
     SUBDIR += py-notmuch2
     SUBDIR += py-offlineimap3
@@ -537,6 +536,7 @@
     SUBDIR += py-premailer
     SUBDIR += py-pyisemail
     SUBDIR += py-pymailq
+    SUBDIR += py-pymilter
     SUBDIR += py-pysasl
     SUBDIR += py-pyspf
     SUBDIR += py-python-slimta
diff --git a/mail/py-milter/Makefile b/mail/py-milter/Makefile
deleted file mode 100644
index 9c8737bf219d..000000000000
--- a/mail/py-milter/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-PORTNAME=	milter
-PORTVERSION=	1.0.5
-PORTREVISION=	1
-DISTVERSIONPREFIX=	${GH_PROJECT}-
-CATEGORIES=	mail python
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-
-MAINTAINER=	estartu@augusta.de
-COMMENT=	Python interface to Sendmail milter API
-WWW=		https://pythonhosted.org/milter/
-
-LICENSE=	GPLv2+
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-.if !exists(/usr/lib/libmilter.so)
-LIB_DEPENDS=	libmilter.so:mail/libmilter
-CFLAGS+=	-I${LOCALBASE}/include
-.endif
-
-USES=	python
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	sdgathman
-GH_PROJECT=	py${PORTNAME}
-USE_PYTHON=	distutils autoplist flavors
-
-post-install:
-	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/milter*.so
-
-.include <bsd.port.mk>
diff --git a/mail/py-milter/distinfo b/mail/py-milter/distinfo
deleted file mode 100644
index b2b4275d7f87..000000000000
--- a/mail/py-milter/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1662401352
-SHA256 (sdgathman-pymilter-pymilter-1.0.5_GH0.tar.gz) = 8093032829ddd53261dbe2991959514156767f3785dfb095ed9b17f3fba965e1
-SIZE (sdgathman-pymilter-pymilter-1.0.5_GH0.tar.gz) = 1030610
diff --git a/mail/py-pymilter/Makefile b/mail/py-pymilter/Makefile
new file mode 100644
index 000000000000..9678f0a167d5
--- /dev/null
+++ b/mail/py-pymilter/Makefile
@@ -0,0 +1,41 @@
+PORTNAME=	pymilter
+DISTVERSION=	1.0.6
+DISTVERSIONPREFIX=	${GH_PROJECT}-
+CATEGORIES=	mail python
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	matthew@FreeBSD.org
+COMMENT=	Python interface to Sendmail milter API
+WWW=		https://www.pymilter.org/ \
+		https://github.com/sdgathman/pymilter
+
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+USES=	python
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	sdgathman
+
+USE_PYTHON=	distutils autoplist flavors
+
+OPTIONS_SINGLE=	MILTER
+OPTIONS_SINGLE_MILTER=	LIBMILTER BASE
+OPTIONS_DEFAULT=	LIBMILTER
+
+LIBMILTER_DESC=	Link against libmilter from mail/libmilter
+LIBMILTER_VARS=	WITH_MILTER_PORT=yes
+LIBMILTER_VARS_OFF=	WITH_MILTER_BASE=
+
+BASE_DESC=	Link against libmilter from base Sendmail
+BASE_VARS=	WITH_MILTER_BASE=yes
+BASE_VARS_OFF=	WITH_MILTER_PORT=
+
+.include <bsd.port.pre.mk>
+
+.include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/milter*.so
+
+.include <bsd.port.post.mk>
diff --git a/mail/py-pymilter/distinfo b/mail/py-pymilter/distinfo
new file mode 100644
index 000000000000..127ae5af92a5
--- /dev/null
+++ b/mail/py-pymilter/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1746522427
+SHA256 (sdgathman-pymilter-pymilter-1.0.6_GH0.tar.gz) = 1c30abcf4b229e0e0f526a4e61eb7a7e9d88e14c6101001353b8219719325fcb
+SIZE (sdgathman-pymilter-pymilter-1.0.6_GH0.tar.gz) = 1030816
diff --git a/mail/py-milter/pkg-descr b/mail/py-pymilter/pkg-descr
index 62fc2fbad4c7..62fc2fbad4c7 100644
--- a/mail/py-milter/pkg-descr
+++ b/mail/py-pymilter/pkg-descr