* Update dependencies as pf is now part of the base system. [1]

* Make portlint a little bit happier while I am here.

PR:		ports/63951 [1]
Submitted by:	maintainer [1]

3 files changed, 23 insertions, 15 deletions

diff --git a/mail/spamd/Makefile b/mail/spamd/Makefile
index bf56f4cf641..f2320dd0725 100644
--- a/mail/spamd/Makefile
+++ b/mail/spamd/Makefile
@@ -14,10 +14,8 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	max@love2party.net
 COMMENT=	Traps spammers with a very slow smtp-login and return 4xx error
 
-RUN_DEPENDS=	${LOCALBASE}/sbin/pfctl:${PORTSDIR}/security/pf
-
 .if !defined(BATCH) && !defined(PACKAGE_BUILDING)
-IS_INTERACTIVE= yes
+IS_INTERACTIVE=	yes
 .endif
 
 MAN5=		spamd.conf.5
@@ -25,7 +23,7 @@ MAN8=		spamd.8 spamd-setup.8
 
 MANCOMPRESSED=	maybe
 
-MAKE_ARGS=      MANDIR="${PREFIX}/man/man"
+MAKE_ARGS=	MANDIR="${PREFIX}/man/man"
 
 SAMPLE_SPAMD_CONF=	${PREFIX}/etc/spamd.conf.sample
 SAMPLE_SPAMD_RC=	${PREFIX}/etc/rc.d/spamd.sh
@@ -36,6 +34,10 @@ SAMPLE_SPAMD_RC=	${PREFIX}/etc/rc.d/spamd.sh
 IGNORE=		"Only for 5.0 and above"
 .endif
 
+.if ${OSVERSION} < 502106
+RUN_DEPENDS=	${LOCALBASE}/sbin/pfctl:${PORTSDIR}/security/pf
+.endif
+
 post-patch:
 	${SED} -e 's!%%LOCALBASE%%!${LOCALBASE}!'	\
 		${PATCHDIR}/local-patch.sed | ${PATCH} 	\
diff --git a/sysutils/pfstat/Makefile b/sysutils/pfstat/Makefile
index e0e01cecd9c..e428da6946b 100644
--- a/sysutils/pfstat/Makefile
+++ b/sysutils/pfstat/Makefile
@@ -14,8 +14,6 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}
 MAINTAINER=	max@love2party.net
 COMMENT=	Utility to render grafical statistics for pf
 
-BUILD_DEPENDS=	${LOCALBASE}/include/pf/net/pfvar.h:${PORTSDIR}/security/pf
-RUN_DEPENDS=	${LOCALBASE}/modules/pf.ko:${PORTSDIR}/security/pf
 .if defined(WITH_GD1)
 LIB_DEPENDS=	gd1.2:${PORTSDIR}/graphics/gd1
 CFLAGS+=	-I${LOCALBASE}/include/gd
@@ -32,14 +30,19 @@ MAN8=		pfstat.8
 MANCOMPRESSED=	no
 PLIST_FILES=	bin/pfstat
 
-CFLAGS+=	-I${LOCALBASE}/include/pf
-
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500000
 IGNORE=		"Only for 5.0 and above"
 .endif
 
+.if ${OSVERSION} < 502106
+BUILD_DEPENDS=	${LOCALBASE}/include/pf/net/pfvar.h:${PORTSDIR}/security/pf
+RUN_DEPENDS=	${LOCALBASE}/modules/pf.ko:${PORTSDIR}/security/pf
+
+CFLAGS+=	-I${LOCALBASE}/include/pf
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lgd|-l$${LD_GD}|; s| -lttf||' \
 		${WRKSRC}/Makefile
diff --git a/sysutils/pftop/Makefile b/sysutils/pftop/Makefile
index dd059a8effa..953bc3b43a4 100644
--- a/sysutils/pftop/Makefile
+++ b/sysutils/pftop/Makefile
@@ -14,17 +14,10 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}
 MAINTAINER=	max@love2party.net
 COMMENT=	Utility for real-time display of statistics for pf
 
-BUILD_DEPENDS=	${LOCALBASE}/include/pf/net/pfvar.h:${PORTSDIR}/security/pf
-.if defined(WITH_ALTQ) && (${WITH_ALTQ} == "yes")
-BUILD_DEPENDS+=${LOCALBASE}/include/pf/altq/altq.h:${PORTSDIR}/security/pf
-.endif
-RUN_DEPENDS=	${LOCALBASE}/modules/pf.ko:${PORTSDIR}/security/pf
-
 MAN8=		pftop.8
 
 MANCOMPRESSED=	no
 
-CFLAGS+=	-I${LOCALBASE}/include/pf
 MAKE_ARGS=	LOCALBASE="${PREFIX}" OSLEVEL=34
 .if defined(WITH_ALTQ) && (${WITH_ALTQ} == "yes")
 CFLAGS+=	-DHAVE_ALTQ=1
@@ -36,6 +29,16 @@ CFLAGS+=	-DHAVE_ALTQ=1
 IGNORE=		"Only for 5.0 and above"
 .endif
 
+.if ${OSVERSION} < 502106
+BUILD_DEPENDS=	${LOCALBASE}/include/pf/net/pfvar.h:${PORTSDIR}/security/pf
+.if defined(WITH_ALTQ) && (${WITH_ALTQ} == "yes")
+BUILD_DEPENDS+=${LOCALBASE}/include/pf/altq/altq.h:${PORTSDIR}/security/pf
+.endif
+RUN_DEPENDS=	${LOCALBASE}/modules/pf.ko:${PORTSDIR}/security/pf
+
+CFLAGS+=	-I${LOCALBASE}/include/pf
+.endif
+
 PLIST_FILES=	sbin/pftop
 
 do-install: