27 files changed, 66 insertions, 204 deletions

diff --git a/net/boinc-client/Makefile b/net/boinc-client/Makefile
index 3fd6f9aa322e..cc6f05986c06 100644
--- a/net/boinc-client/Makefile
+++ b/net/boinc-client/Makefile
@@ -62,10 +62,6 @@ PLIST_SUB+=	BOINC_GUI=""
 PLIST_SUB+=	BOINC_GUI="@comment "
 .endif
 
-.if ${OSVERSION} < 500000
-BROKEN=		Does not compile. Consider upgrading your FreeBSD to at least 5.X
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|gui_rpc_auth.cfg|${BOINC_HOME}/gui_rpc_auth.cfg|g' \
 		${WRKSRC}/client/file_names.h ${WRKSRC}/lib/boinc_cmd.C \
diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index 3f79c4ccc54a..ea5091b3fcab 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -96,12 +96,6 @@ CONFIGURE_ARGS+=--with-logdir=${LOGDIR} \
 		--without-rlm_sql_sybase \
 		--without-rlm_sql_unixodbc
 
-.if ${OSVERSION} < 500000 && ${OPENSSLBASE} == "/usr"
-PLIST_SUB+=	4SSL="@comment "
-.else
-PLIST_SUB+=	4SSL=""
-.endif
-
 .if ${ARCH} == amd64
 CONFIGURE_ARGS+=	--with-pic
 .endif
@@ -197,7 +191,7 @@ USE_PERL5=	yes
 .endif
 
 # rlm_perl does not build on 4.x
-.if ${OSVERSION} < 500000 || defined(WITH_NOPERL)
+.if defined(WITH_NOPERL)
 CONFIGURE_ARGS+=--without-rlm_perl
 PLIST_SUB+=	RLMPERL="@comment "
 .else
@@ -226,9 +220,6 @@ post-patch:
 		${REINPLACE_CMD} -e "s:\$$(R)\$$(raddbdir):${EXAMPLESDIR}/raddb:g" {} \;
 # Clean up after the last operation (so as not to get unwanted files when installing doc/)
 	@${FIND} -E ${WRKSRC} -regex '.*/Makefile(\.in)?\.(orig|bak)$$' -delete
-.if ${OSVERSION} < 500000
-	@${REINPLACE_CMD} -e 's/-DNO_OPENSSL//' ${WRKSRC}/configure.in
-.endif
 
 pre-configure:
 # Force the rebuild of some configures from configure.in, as we're patching
diff --git a/net/freeradius/pkg-plist b/net/freeradius/pkg-plist
index 1209522478e2..2a6f3e298ca2 100644
--- a/net/freeradius/pkg-plist
+++ b/net/freeradius/pkg-plist
@@ -156,26 +156,26 @@ lib/rlm_eap_mschapv2-%%PORTVERSION%%.so
 lib/rlm_eap_mschapv2.a
 lib/rlm_eap_mschapv2.la
 lib/rlm_eap_mschapv2.so
-%%4SSL%%lib/rlm_eap_peap-%%PORTVERSION%%.la
-%%4SSL%%lib/rlm_eap_peap-%%PORTVERSION%%.so
-%%4SSL%%lib/rlm_eap_peap.a
-%%4SSL%%lib/rlm_eap_peap.la
-%%4SSL%%lib/rlm_eap_peap.so
+lib/rlm_eap_peap-%%PORTVERSION%%.la
+lib/rlm_eap_peap-%%PORTVERSION%%.so
+lib/rlm_eap_peap.a
+lib/rlm_eap_peap.la
+lib/rlm_eap_peap.so
 lib/rlm_eap_sim-%%PORTVERSION%%.la
 lib/rlm_eap_sim-%%PORTVERSION%%.so
 lib/rlm_eap_sim.a
 lib/rlm_eap_sim.la
 lib/rlm_eap_sim.so
-%%4SSL%%lib/rlm_eap_tls-%%PORTVERSION%%.la
-%%4SSL%%lib/rlm_eap_tls-%%PORTVERSION%%.so
-%%4SSL%%lib/rlm_eap_tls.a
-%%4SSL%%lib/rlm_eap_tls.la
-%%4SSL%%lib/rlm_eap_tls.so
-%%4SSL%%lib/rlm_eap_ttls-%%PORTVERSION%%.la
-%%4SSL%%lib/rlm_eap_ttls-%%PORTVERSION%%.so
-%%4SSL%%lib/rlm_eap_ttls.a
-%%4SSL%%lib/rlm_eap_ttls.la
-%%4SSL%%lib/rlm_eap_ttls.so
+lib/rlm_eap_tls-%%PORTVERSION%%.la
+lib/rlm_eap_tls-%%PORTVERSION%%.so
+lib/rlm_eap_tls.a
+lib/rlm_eap_tls.la
+lib/rlm_eap_tls.so
+lib/rlm_eap_ttls-%%PORTVERSION%%.la
+lib/rlm_eap_ttls-%%PORTVERSION%%.so
+lib/rlm_eap_ttls.a
+lib/rlm_eap_ttls.la
+lib/rlm_eap_ttls.so
 %%EXPM%%lib/rlm_example-%%PORTVERSION%%.la
 %%EXPM%%lib/rlm_example-%%PORTVERSION%%.so
 %%EXPM%%lib/rlm_example.a
@@ -226,11 +226,11 @@ lib/rlm_ns_mta_md5-%%PORTVERSION%%.so
 lib/rlm_ns_mta_md5.a
 lib/rlm_ns_mta_md5.la
 lib/rlm_ns_mta_md5.so
-%%4SSL%%lib/rlm_otp-%%PORTVERSION%%.la
-%%4SSL%%lib/rlm_otp-%%PORTVERSION%%.so
-%%4SSL%%lib/rlm_otp.a
-%%4SSL%%lib/rlm_otp.la
-%%4SSL%%lib/rlm_otp.so
+lib/rlm_otp-%%PORTVERSION%%.la
+lib/rlm_otp-%%PORTVERSION%%.so
+lib/rlm_otp.a
+lib/rlm_otp.la
+lib/rlm_otp.so
 lib/rlm_pam-%%PORTVERSION%%.la
 lib/rlm_pam-%%PORTVERSION%%.so
 lib/rlm_pam.a
diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile
index 3f79c4ccc54a..ea5091b3fcab 100644
--- a/net/freeradius2/Makefile
+++ b/net/freeradius2/Makefile
@@ -96,12 +96,6 @@ CONFIGURE_ARGS+=--with-logdir=${LOGDIR} \
 		--without-rlm_sql_sybase \
 		--without-rlm_sql_unixodbc
 
-.if ${OSVERSION} < 500000 && ${OPENSSLBASE} == "/usr"
-PLIST_SUB+=	4SSL="@comment "
-.else
-PLIST_SUB+=	4SSL=""
-.endif
-
 .if ${ARCH} == amd64
 CONFIGURE_ARGS+=	--with-pic
 .endif
@@ -197,7 +191,7 @@ USE_PERL5=	yes
 .endif
 
 # rlm_perl does not build on 4.x
-.if ${OSVERSION} < 500000 || defined(WITH_NOPERL)
+.if defined(WITH_NOPERL)
 CONFIGURE_ARGS+=--without-rlm_perl
 PLIST_SUB+=	RLMPERL="@comment "
 .else
@@ -226,9 +220,6 @@ post-patch:
 		${REINPLACE_CMD} -e "s:\$$(R)\$$(raddbdir):${EXAMPLESDIR}/raddb:g" {} \;
 # Clean up after the last operation (so as not to get unwanted files when installing doc/)
 	@${FIND} -E ${WRKSRC} -regex '.*/Makefile(\.in)?\.(orig|bak)$$' -delete
-.if ${OSVERSION} < 500000
-	@${REINPLACE_CMD} -e 's/-DNO_OPENSSL//' ${WRKSRC}/configure.in
-.endif
 
 pre-configure:
 # Force the rebuild of some configures from configure.in, as we're patching
diff --git a/net/freeradius2/pkg-plist b/net/freeradius2/pkg-plist
index 1209522478e2..2a6f3e298ca2 100644
--- a/net/freeradius2/pkg-plist
+++ b/net/freeradius2/pkg-plist
@@ -156,26 +156,26 @@ lib/rlm_eap_mschapv2-%%PORTVERSION%%.so
 lib/rlm_eap_mschapv2.a
 lib/rlm_eap_mschapv2.la
 lib/rlm_eap_mschapv2.so
-%%4SSL%%lib/rlm_eap_peap-%%PORTVERSION%%.la
-%%4SSL%%lib/rlm_eap_peap-%%PORTVERSION%%.so
-%%4SSL%%lib/rlm_eap_peap.a
-%%4SSL%%lib/rlm_eap_peap.la
-%%4SSL%%lib/rlm_eap_peap.so
+lib/rlm_eap_peap-%%PORTVERSION%%.la
+lib/rlm_eap_peap-%%PORTVERSION%%.so
+lib/rlm_eap_peap.a
+lib/rlm_eap_peap.la
+lib/rlm_eap_peap.so
 lib/rlm_eap_sim-%%PORTVERSION%%.la
 lib/rlm_eap_sim-%%PORTVERSION%%.so
 lib/rlm_eap_sim.a
 lib/rlm_eap_sim.la
 lib/rlm_eap_sim.so
-%%4SSL%%lib/rlm_eap_tls-%%PORTVERSION%%.la
-%%4SSL%%lib/rlm_eap_tls-%%PORTVERSION%%.so
-%%4SSL%%lib/rlm_eap_tls.a
-%%4SSL%%lib/rlm_eap_tls.la
-%%4SSL%%lib/rlm_eap_tls.so
-%%4SSL%%lib/rlm_eap_ttls-%%PORTVERSION%%.la
-%%4SSL%%lib/rlm_eap_ttls-%%PORTVERSION%%.so
-%%4SSL%%lib/rlm_eap_ttls.a
-%%4SSL%%lib/rlm_eap_ttls.la
-%%4SSL%%lib/rlm_eap_ttls.so
+lib/rlm_eap_tls-%%PORTVERSION%%.la
+lib/rlm_eap_tls-%%PORTVERSION%%.so
+lib/rlm_eap_tls.a
+lib/rlm_eap_tls.la
+lib/rlm_eap_tls.so
+lib/rlm_eap_ttls-%%PORTVERSION%%.la
+lib/rlm_eap_ttls-%%PORTVERSION%%.so
+lib/rlm_eap_ttls.a
+lib/rlm_eap_ttls.la
+lib/rlm_eap_ttls.so
 %%EXPM%%lib/rlm_example-%%PORTVERSION%%.la
 %%EXPM%%lib/rlm_example-%%PORTVERSION%%.so
 %%EXPM%%lib/rlm_example.a
@@ -226,11 +226,11 @@ lib/rlm_ns_mta_md5-%%PORTVERSION%%.so
 lib/rlm_ns_mta_md5.a
 lib/rlm_ns_mta_md5.la
 lib/rlm_ns_mta_md5.so
-%%4SSL%%lib/rlm_otp-%%PORTVERSION%%.la
-%%4SSL%%lib/rlm_otp-%%PORTVERSION%%.so
-%%4SSL%%lib/rlm_otp.a
-%%4SSL%%lib/rlm_otp.la
-%%4SSL%%lib/rlm_otp.so
+lib/rlm_otp-%%PORTVERSION%%.la
+lib/rlm_otp-%%PORTVERSION%%.so
+lib/rlm_otp.a
+lib/rlm_otp.la
+lib/rlm_otp.so
 lib/rlm_pam-%%PORTVERSION%%.la
 lib/rlm_pam-%%PORTVERSION%%.so
 lib/rlm_pam.a
diff --git a/net/frickin/Makefile b/net/frickin/Makefile
index d700f81fdb61..650a4f9754da 100644
--- a/net/frickin/Makefile
+++ b/net/frickin/Makefile
@@ -35,9 +35,7 @@ do-install:
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-IGNORE=		FreeBSD 4.xx does not have pf support
-.elif ${OSVERSION} < 600000
+.if ${OSVERSION} < 600000
 IGNORE=		Does not compile with old version of pf
 .endif
 
diff --git a/net/gatekeeper/Makefile b/net/gatekeeper/Makefile
index 925b1d1058cd..04e3a68dfc50 100644
--- a/net/gatekeeper/Makefile
+++ b/net/gatekeeper/Makefile
@@ -41,9 +41,7 @@ EXAMPLESDIR=	${PREFIX}/share/examples/openh323
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-BROKEN=		does not build
-.elif ${ARCH} == sparc64 && ${OSVERSION} <= 700003
+.if ${ARCH} == sparc64 && ${OSVERSION} <= 700003
 BROKEN=	does not link due to missing symbol in default thread library
 .endif
 
@@ -51,12 +49,10 @@ BROKEN=	does not link due to missing symbol in default thread library
 CONFIGURE_ARGS+=	--with-large-fdset=${WITH_FDSET}
 .endif
 
-.if ${OSVERSION} >= 500000
-. if defined(WITH_RADIUS)
+.if defined(WITH_RADIUS)
 CONFIGURE_ARGS+=	--enable-radius
-. else
+.else
 CONFIGURE_ARGS+=	--disable-radius
-. endif
 .endif
 
 .if defined(WITH_MYSQL)
@@ -79,11 +75,9 @@ pre-everything::
 	@${ECHO_MSG} "Additional build options are:"
 	@${ECHO_MSG} ""
 .endif
-.if ${OSVERSION} >= 500000
-. ifndef(WITH_RADIUS)
+.ifndef(WITH_RADIUS)
 	@${ECHO_MSG} "WITH_RADIUS=yes - enable Radius support"
 	@${ECHO_MSG} ""
-. endif
 .endif
 .ifndef(WITH_MYSQL)
 	@${ECHO_MSG} "WITH_MYSQL=yes - enable the MySQL backend"
diff --git a/net/hawknl-devel/Makefile b/net/hawknl-devel/Makefile
index 96110fdf2925..a7b63c42ee79 100644
--- a/net/hawknl-devel/Makefile
+++ b/net/hawknl-devel/Makefile
@@ -35,9 +35,6 @@ OPTIONS=	OPTIMIZATION	"Enable optimization"	off
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == i386 && ${OSVERSION} < 500000
-BROKEN=		does not compile on i386-4
-.endif
 .if ${ARCH} == amd64 || ${ARCH} == ia64 
 BROKEN=		does not compile on ${ARCH}
 .endif
diff --git a/net/hawknl/Makefile b/net/hawknl/Makefile
index 0d8160a0b88b..dd94069bddd2 100644
--- a/net/hawknl/Makefile
+++ b/net/hawknl/Makefile
@@ -35,10 +35,6 @@ OPTIONS=	OPTIMIZATION	"Enable optimization"	off
 CFLAGS+=	-fPIC -DPIC
 .endif
 
-.if ${OSVERSION} < 500000
-BROKEN=	Doesn't build on < 5.x
-.endif
-
 .if defined(WITH_OPTIMIZATION)
 CFLAGS+=	-funroll-all-loops -ffast-math -fomit-frame-pointer -D_GNU_SOURCE -D_REENTRANT
 .endif
diff --git a/net/iaxmodem/Makefile b/net/iaxmodem/Makefile
index eeff092dd9b9..6bf61f915a11 100644
--- a/net/iaxmodem/Makefile
+++ b/net/iaxmodem/Makefile
@@ -50,10 +50,4 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-BROKEN=		does not compile
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/iscsi-target/Makefile b/net/iscsi-target/Makefile
index b68801dc56a0..cd773963452a 100644
--- a/net/iscsi-target/Makefile
+++ b/net/iscsi-target/Makefile
@@ -25,12 +25,6 @@ MAN8=		iscsi-target.8
 
 USE_RC_SUBR=	iscsi_target
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-IGNORE=		needs PRIu64 definition in <inttypes.h>
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|_LDFLAGS= -pthread|_LDFLAGS= ${PTHREAD_CFLAGS}|' ${WRKSRC}/Makefile.in
@@ -58,4 +52,4 @@ post-install:
 	fi
 .endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/kiax/Makefile b/net/kiax/Makefile
index 780977a4303e..10ed5ad92482 100644
--- a/net/kiax/Makefile
+++ b/net/kiax/Makefile
@@ -30,10 +30,4 @@ CONFIGURE_ENV+=	\
 MAKE_ARGS+=	QTDIR=${QT_PREFIX} \
       QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-BROKEN=		does not compile
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/libnetdude/Makefile b/net/libnetdude/Makefile
index 957d54e360f2..bcaebd55e270 100644
--- a/net/libnetdude/Makefile
+++ b/net/libnetdude/Makefile
@@ -24,17 +24,13 @@ USE_LDCONFIG=	yes
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
-.include <bsd.port.pre.mk>
-
 post-patch:
-.if ${OSVERSION} >= 500000
 	@${REINPLACE_CMD} -e "s|netinet/if_fddi.h|net/fddi.h|g" \
 	${WRKSRC}/protocols/fddi/libnd_fddi.h
-.endif
 	@${REINPLACE_CMD} -e 's|DOC_MODULE = libnetdude|DOC_MODULE =|' \
 	${WRKSRC}/docs/Makefile.in
 .if defined(NOPORTDOCS)
 	@${REINPLACE_CMD} -e 's|docs||' ${WRKSRC}/Makefile.in
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/mad_fcl/Makefile b/net/mad_fcl/Makefile
index 5b3a20f566ab..9fbf0fbf2617 100644
--- a/net/mad_fcl/Makefile
+++ b/net/mad_fcl/Makefile
@@ -29,10 +29,6 @@ PLIST_FILES=	bin/flute
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-BROKEN=		"does not compile"
-.endif
-
 .if ${OSVERSION} < 502120
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-alclib_defines.h
 .endif
diff --git a/net/nph/Makefile b/net/nph/Makefile
index 5fb79910913e..324a97e75430 100644
--- a/net/nph/Makefile
+++ b/net/nph/Makefile
@@ -62,12 +62,6 @@ MAN3=	ph_add.3 \
 		ph_whoami.3 \
 		ph_www_resolve.3
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-BROKEN=	doesn't compile on FreeBSD < 5.x
-.endif
-
 do-install:
 	@(cd ${BUILD_WRKSRC}; ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install-recurse)
 
@@ -78,4 +72,4 @@ do-install:
 post-clean:
 	@${RM} -f ${PREFIX}/etc/ph_server
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/ntp-devel/Makefile b/net/ntp-devel/Makefile
index ce6881d76b19..ab31649815e3 100644
--- a/net/ntp-devel/Makefile
+++ b/net/ntp-devel/Makefile
@@ -44,12 +44,6 @@ CONFIGURE_ARGS+=	--enable-ipv6
 
 MAN1=		ntp-keygen.1 ntpd.1 ntpdc.1 ntpq.1 sntp.1
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-BROKEN=		Will not build under 4.X.
-.endif
-
 post-install:
 	@${MKDIR} ${EXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/conf/* ${EXAMPLESDIR}
@@ -60,4 +54,4 @@ post-install:
 		${CPIO} -pdu -R ${SHAREOWN}:${SHAREGRP} --quiet ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/omnitty/Makefile b/net/omnitty/Makefile
index 8d479b67e3af..3230cc2e046d 100644
--- a/net/omnitty/Makefile
+++ b/net/omnitty/Makefile
@@ -25,12 +25,6 @@ MAN1=		${PORTNAME}.1
 
 PLIST_FILES=	bin/${PORTNAME}
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-IGNORE=		does not work on FreeBSD 4.x
-.endif
-
 post-patch:
 	${REINPLACE_CMD} 's|<alloca.h>|<stdlib.h>|' \
 		${WRKSRC}/machmgr.c
@@ -39,4 +33,4 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MAN1PREFIX}/man/man1
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/panoptis/Makefile b/net/panoptis/Makefile
index 5affd2611847..9aa1d2ceb875 100644
--- a/net/panoptis/Makefile
+++ b/net/panoptis/Makefile
@@ -22,16 +22,10 @@ CONFIGURE_ENV=	CPPFLAGS='${CPPFLAGS}' LDFLAGS='${LDFLAGS}'
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 PLIST_FILES=	bin/panoptis bin/mail.py bin/pview.py bin/speed.py
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-BROKEN=		Does not compile on 4.x
-.endif
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/panoptis/panoptis ${PREFIX}/bin/panoptis
 	${INSTALL_SCRIPT} ${WRKSRC}/panoptis/mail.py ${PREFIX}/bin/mail.py
 	${INSTALL_SCRIPT} ${WRKSRC}/panoptis/pview.py ${PREFIX}/bin/pview.py
 	${INSTALL_SCRIPT} ${WRKSRC}/panoptis/speed.py ${PREFIX}/bin/speed.py
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/paris-traceroute/Makefile b/net/paris-traceroute/Makefile
index 9fbed31b789d..eef04df24494 100644
--- a/net/paris-traceroute/Makefile
+++ b/net/paris-traceroute/Makefile
@@ -19,10 +19,4 @@ USE_GMAKE=	yes
 
 PLIST_FILES=	bin/paris-traceroute
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-BROKEN=	Does not compile on 4.x
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/passlogd/Makefile b/net/passlogd/Makefile
index cb4cb1656586..d894aa112b67 100644
--- a/net/passlogd/Makefile
+++ b/net/passlogd/Makefile
@@ -21,10 +21,4 @@ post-patch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/passlogd ${PREFIX}/sbin
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-BROKEN=		Does not compile on 4.x
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/pppd23/Makefile b/net/pppd23/Makefile
index 2145b0ec40cc..3a264e724fd1 100644
--- a/net/pppd23/Makefile
+++ b/net/pppd23/Makefile
@@ -14,14 +14,10 @@ DISTNAME=	ppp-${PORTVERSION}
 MAINTAINER=	netch@netch.kiev.ua
 COMMENT=	PPP daemon which uses ppp line discipline
 
+EXTRA_PATCHES=	${PATCHDIR}/extra-patch-no-logf
+
 GNU_CONFIGURE=	yes
 MAN8=		pppd.8 pppstats.8 chat.8
 MANCOMPRESSED=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500000
-EXTRA_PATCHES=	${PATCHDIR}/extra-patch-no-logf
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/quagga/Makefile b/net/quagga/Makefile
index acce60f1c4ba..5de81cca8309 100644
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@@ -132,7 +132,7 @@ CONFIGURE_ENV+=MAKEINFO=${LOCALBASE}/bin/makeinfo
 .endif
 
 USE_RC_SUBR=	watchquagga.sh
-.if ${OSVERSION} < 500000 || ${OSVERSION} >= 600101
+.if ${OSVERSION} >= 600101
 USE_RC_SUBR+=	quagga.sh
 .else
 USE_RCORDER=	quagga.sh
diff --git a/net/smb4k/Makefile b/net/smb4k/Makefile
index 207aa45824d0..1d251f0a6c6c 100644
--- a/net/smb4k/Makefile
+++ b/net/smb4k/Makefile
@@ -31,12 +31,6 @@ CONFIGURE_ARGS += 	--with-qt-dir=${QT_PREFIX} \
 DOCSDIR=		${PREFIX}/share/doc/HTML/en/${PORTNAME}
 PKGMESSAGE=		${WRKDIR}/pkg-message
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-BROKEN=		does not build on 4.x (missing sys/statvfs.h)
-.endif
-
 post-install:
 .for i in smb2awk smb2nsmbrc
 	${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin
@@ -46,4 +40,4 @@ post-install:
 	@${SED} -e "s,%%PREFIX%%,${PREFIX},g" pkg-message > ${PKGMESSAGE}
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/tcpxtract/Makefile b/net/tcpxtract/Makefile
index 2bd13fcc3c1b..bf9f76985e0f 100644
--- a/net/tcpxtract/Makefile
+++ b/net/tcpxtract/Makefile
@@ -20,11 +20,4 @@ MAN1=		tcpxtract.1
 
 PLIST_FILES=	bin/tcpxtract etc/tcpxtract.conf
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-EXTRA_PATCHES=	${PATCHDIR}/extra-patch-tcpxtract.c ${PATCHDIR}/extra-patch-sessionlist.c
-.endif
-
-.include <bsd.port.post.mk>
-
+.include <bsd.port.mk>
diff --git a/net/trafshow/Makefile b/net/trafshow/Makefile
index 538fabe017f9..79436fd7d043 100644
--- a/net/trafshow/Makefile
+++ b/net/trafshow/Makefile
@@ -21,12 +21,6 @@ ALL_TARGET=	trafshow
 
 MAN1=		trafshow.1
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-PKGMESSAGE=	${PKGDIR}/pkg-message.nodevfs
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|-D_THREAD_SAFE||' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|' \
@@ -39,8 +33,5 @@ do-install:
 	if [ ! -e ${PREFIX}/etc/trafshow ]; then \
 		${CP} -p ${PREFIX}/etc/trafshow.dist ${PREFIX}/etc/trafshow; \
 	fi
-.if ${OSVERSION} < 500000
-	@${CAT} ${PKGMESSAGE}
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/unfs3/Makefile b/net/unfs3/Makefile
index 93fb06d8cabb..392283bae4d0 100644
--- a/net/unfs3/Makefile
+++ b/net/unfs3/Makefile
@@ -26,10 +26,4 @@ PLIST_FILES=	sbin/unfsd
 CONFIGURE_ARGS+=	--enable-cluster
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-CFLAGS+=	-DHAVE_SYS_MOUNT_H=1
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/xboxproxy/Makefile b/net/xboxproxy/Makefile
index f85797679ec7..c742882005e2 100644
--- a/net/xboxproxy/Makefile
+++ b/net/xboxproxy/Makefile
@@ -23,17 +23,10 @@ PLIST_FILES=	bin/xboxproxy
 
 LIBNET_CONFIG?=	${LOCALBASE}/bin/libnet10-config
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-BUILD_DEPENDS+=		${LOCALBASE}/lib/libpcap.a:${PORTSDIR}/net/libpcap
-CONFIGURE_ARGS+=	--with-pcap=${LOCALBASE}
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|libnet-config|${LIBNET_CONFIG}|g; \
 		 s|-lnet|`${LIBNET_CONFIG} --libs`|' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>