From fbe86c4decb6d132edec88a6e8483376bd4337c6 Mon Sep 17 00:00:00 2001 From: Jose Luis Duran Date: Thu, 7 May 2026 13:05:14 +0000 Subject: [PATCH] ftp/freebsd-ftpd: Use blocklist Starting from FreeBSD version 1500000, prefer the new blocklist nomenclature. Once older versions are no longer supported, we should use blocklist exclusively. While here, move USES higher to appease portlint (USE_* seen before USES). PR: 295080 Reviewed by: cy --- ftp/freebsd-ftpd/Makefile | 21 +++++++++++++++------ ftp/freebsd-ftpd/distinfo | 6 +++--- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/ftp/freebsd-ftpd/Makefile b/ftp/freebsd-ftpd/Makefile index 0aefa27362f4..8c309c2e3d88 100644 --- a/ftp/freebsd-ftpd/Makefile +++ b/ftp/freebsd-ftpd/Makefile @@ -1,6 +1,6 @@ PORTNAME= freebsd-ftpd DISTVERSIONPREFIX= v -DISTVERSION= 20250929 +DISTVERSION= 20260507 PORTREVISION= 1 CATEGORIES= ftp @@ -10,10 +10,11 @@ WWW= https://github.com/cschuber/freebsd-ftpd LICENSE= BSD3CLAUSE +USES= uidfix + USE_GITHUB= yes GH_ACCOUNT= cschuber -USES= uidfix USE_RC_SUBR= ftpd MAKE_ARGS+= BINOWN=${BINOWN} BINMODE=${BINMODE} @@ -22,10 +23,18 @@ MAKE_ENV+= MAKESYSPATH=/usr/src/share/mk \ MANDIR=${PREFIX}/share/man/man \ MK_WERROR=no -OPTIONS_DEFINE= IPV6 LIBBLACKLIST -OPTIONS_DEFAULT= IPV6 LIBBLACKLIST +OPTIONS_DEFINE= IPV6 LIBBLOCKLIST +OPTIONS_DEFAULT= IPV6 LIBBLOCKLIST -LIBBLACKLIST_DESC= libblacklist(3) support for rlogind(8) and rshd(8) -LIBBLACKLIST_MAKE_ARGS= USE_LIBBLACKLIST=yes +LIBBLOCKLIST_DESC= libblocklist(3) support for rlogind(8) and rshd(8) +LIBBLOCKLIST_MAKE_ARGS= USE_LIBBLOCKLIST=yes + +.include + +.if ${PORT_OPTIONS:MLIBBLOCKLIST} +. if ${OPSYS} == FreeBSD && ${OSVERSION} < 1500000 +LIBBLOCKLIST_MAKE_ARGS= USE_LIBBLACKLIST=yes +. endif +.endif .include diff --git a/ftp/freebsd-ftpd/distinfo b/ftp/freebsd-ftpd/distinfo index e3d6a9a68de8..17d741ee98d1 100644 --- a/ftp/freebsd-ftpd/distinfo +++ b/ftp/freebsd-ftpd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1759186092 -SHA256 (cschuber-freebsd-ftpd-v20250929_GH0.tar.gz) = 29d63dea3ba762ee39e5b75efff8a3c926c6420b4d0d80658d445e101c3e03a8 -SIZE (cschuber-freebsd-ftpd-v20250929_GH0.tar.gz) = 48009 +TIMESTAMP = 1778164397 +SHA256 (cschuber-freebsd-ftpd-v20260507_GH0.tar.gz) = 06e5723946f48e26d4138b71806f305a8f9367a57f36a0d18c7149d770224c1e +SIZE (cschuber-freebsd-ftpd-v20260507_GH0.tar.gz) = 48009