12 files changed, 21 insertions, 51 deletions

diff --git a/net-mgmt/net-snmp-devel/Makefile b/net-mgmt/net-snmp-devel/Makefile
index c39d26fc9890..b73f652c10cc 100644
--- a/net-mgmt/net-snmp-devel/Makefile
+++ b/net-mgmt/net-snmp-devel/Makefile
@@ -73,7 +73,7 @@ LIB_DEPEND+=	dmalloc:${PORTSDIR}/devel/dmalloc
 CONFIGURE_ARGS+=--with-dmalloc=${LOCALBASE}
 .endif
 
-.if ${OSVERSION} >= 400014 && !defined(WITHOUT_IPV6)
+.if !defined(WITHOUT_IPV6)
 CONFIGURE_ARGS+=--enable-ipv6
 # --with-transport="UDPIPv6 TCPIPv6" --with-modules=mibII/ipv6"
 PLIST_SUB+=	WITH_IPV6=""
diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
index c39d26fc9890..b73f652c10cc 100644
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -73,7 +73,7 @@ LIB_DEPEND+=	dmalloc:${PORTSDIR}/devel/dmalloc
 CONFIGURE_ARGS+=--with-dmalloc=${LOCALBASE}
 .endif
 
-.if ${OSVERSION} >= 400014 && !defined(WITHOUT_IPV6)
+.if !defined(WITHOUT_IPV6)
 CONFIGURE_ARGS+=--enable-ipv6
 # --with-transport="UDPIPv6 TCPIPv6" --with-modules=mibII/ipv6"
 PLIST_SUB+=	WITH_IPV6=""
diff --git a/net-mgmt/net-snmp53/Makefile b/net-mgmt/net-snmp53/Makefile
index c39d26fc9890..b73f652c10cc 100644
--- a/net-mgmt/net-snmp53/Makefile
+++ b/net-mgmt/net-snmp53/Makefile
@@ -73,7 +73,7 @@ LIB_DEPEND+=	dmalloc:${PORTSDIR}/devel/dmalloc
 CONFIGURE_ARGS+=--with-dmalloc=${LOCALBASE}
 .endif
 
-.if ${OSVERSION} >= 400014 && !defined(WITHOUT_IPV6)
+.if !defined(WITHOUT_IPV6)
 CONFIGURE_ARGS+=--enable-ipv6
 # --with-transport="UDPIPv6 TCPIPv6" --with-modules=mibII/ipv6"
 PLIST_SUB+=	WITH_IPV6=""
diff --git a/net/AquaGatekeeper/Makefile b/net/AquaGatekeeper/Makefile
index 3135b6e61683..cb1ca3b6a999 100644
--- a/net/AquaGatekeeper/Makefile
+++ b/net/AquaGatekeeper/Makefile
@@ -50,9 +50,7 @@ post-install:
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 400000
-BROKEN=		Supported only on 4.x systems and later
-.elif ${OSVERSION} >= 500000 && ${ARCH} == "i386"
+.if ${ARCH} == "i386"
 LIB_DEPENDS=	c.4:${PORTSDIR}/misc/compat4x
 .elif ${OSVERSION} >= 600000 && ${ARCH} == "amd64"
 LIB_DEPENDS=	c.5:${PORTSDIR}/misc/compat5x
diff --git a/net/AquaGatekeeper2/Makefile b/net/AquaGatekeeper2/Makefile
index fef1366ac81c..b6b8e9a26771 100644
--- a/net/AquaGatekeeper2/Makefile
+++ b/net/AquaGatekeeper2/Makefile
@@ -52,9 +52,7 @@ post-install:
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 400000
-BROKEN=		Supported only on 4.x systems and later
-.elif ${OSVERSION} >= 500000 && ${ARCH} == "i386"
+.if ${ARCH} == "i386"
 LIB_DEPENDS=	c.4:${PORTSDIR}/misc/compat4x
 .elif ${OSVERSION} >= 600000 && ${ARCH} == "amd64"
 LIB_DEPENDS=	c.5:${PORTSDIR}/misc/compat5x
diff --git a/net/cvsup/Makefile b/net/cvsup/Makefile
index e40c91ac31fa..9cd6204d81be 100644
--- a/net/cvsup/Makefile
+++ b/net/cvsup/Makefile
@@ -21,10 +21,6 @@ ONLY_FOR_ARCHS=	alpha amd64 i386 sparc64
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 410000
-BROKEN=		Not supported on versions earlier than 4.1-RELEASE
-.endif
-
 .if ${ARCH} == "alpha"
 TARGET=		FBSD_ALPHA
 .elif ${ARCH} == "amd64"
diff --git a/net/freenet6/Makefile b/net/freenet6/Makefile
index fe0c86e5c94f..e3fc5e10a561 100644
--- a/net/freenet6/Makefile
+++ b/net/freenet6/Makefile
@@ -24,16 +24,7 @@ MAN5=		tspc.conf.5
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 SUB_FILES=	freenet6.sh pkg-message
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 400000
-IGNORE=		This program might not be working on FreeBSD version below 4.0
-.endif
-.if ${OSVERSION} > 500000
 EXTRA_PATCHES=	${FILESDIR}/patch5-template::freebsd.sh
-.endif
-
 MAKE_ARGS=	target=freebsd installdir=${PREFIX}
 
 do-install:
@@ -62,4 +53,4 @@ post-patch:
 		-e "s|template=linux|template=tspc-freebsd|g" \
 		${WRKSRC}/man/man5/tspc.conf.5
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/ipa_ipfw/Makefile b/net/ipa_ipfw/Makefile
index 0a59ec32fcb6..57873826319d 100644
--- a/net/ipa_ipfw/Makefile
+++ b/net/ipa_ipfw/Makefile
@@ -29,7 +29,7 @@ MAKE_ENV+=	WITH_PTHREAD=yes
 CFLAGS+=	${PTHREAD_CFLAGS}
 .endif
 
-.if ${OSVERSION} >= 460100 && ${OSVERSION} < 500038
+.if ${OSVERSION} < 500038
 . if (defined(IPFW2) && !defined(WITH_IPFW2)) || defined(WITH_IPFW2)
 MAKE_ENV+=	IPFW2=yes
 . endif
diff --git a/net/py-pcap/Makefile b/net/py-pcap/Makefile
index 0a7646515f2b..f87a3ebca46e 100644
--- a/net/py-pcap/Makefile
+++ b/net/py-pcap/Makefile
@@ -29,8 +29,7 @@ WRKSRC=		${WRKDIR}/pylibpcap-${PORTVERSION}
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 460001 || \
-	( ${OSVERSION} >= 500000 && ${OSVERSION} < 500038 )
+.if ( ${OSVERSION} < 500038 )
 IGNORE=		"needs libpcap 0.7 or higher"
 .endif
 
diff --git a/net/samba3/Makefile b/net/samba3/Makefile
index 96110a5fea1c..df02c0b095b1 100644
--- a/net/samba3/Makefile
+++ b/net/samba3/Makefile
@@ -255,15 +255,6 @@ CONFIGURE_ARGS+=	--with-included-popt
 ###
 ### Common part for port and it's subports
 ###
-# For 4.8 - 4.11 combination of Kerberos and OpenLDAP is broken
-# due the conflict between system and OpenSSL port libcrypto libraries
-.if ${OSVERSION} > 470103 && ${OSVERSION} < 500000
-.	if defined(WITH_ADS)
-IGNORE=			broken dependency between OpenSSL, OpenLDAP and Heimdal for FreeBSD 4.x. Disable ADS support
-.	endif
-.	undef		WITH_ADS
-WITHOUT_ADS=		on
-.endif
 
 .if defined(WITH_ADS)
 SAMBA_WANT_LDAP=	yes
diff --git a/net/silc-server/Makefile b/net/silc-server/Makefile
index dd8047e7d2cf..bef547ca03e5 100644
--- a/net/silc-server/Makefile
+++ b/net/silc-server/Makefile
@@ -34,7 +34,8 @@ CONFIGURE_ARGS=	--with-silcd-config-file=${PREFIX}/etc/${PORTNAME}/silcd.conf \
 		--with-etcdir=${PREFIX}/etc/${PORTNAME} \
 		--with-helpdir=share/${PORTNAME}/help \
 		--with-logsdir=/var/log/${PORTNAME} \
-		--with-silcd-pid-file=/var/run/silcd.pid
+		--with-silcd-pid-file=/var/run/silcd.pid \
+		--enable-ipv6
 
 PLIST_SUB=	INSTALL_DIR="${INSTALL_DIR}"
 PKGDEINSTALL=	${PKGINSTALL}
@@ -44,6 +45,16 @@ INSTALL_DIR?=	${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755
 MAN5=	silcd.conf.5
 MAN8=	silcd.8
 
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} != "i386"
+WITHOUT_OPTIMIZED_ASM=	yes
+.endif
+
+.ifdef(WITHOUT_OPTIMIZED_ASM)
+CONFIGURE_ARGS+=	--disable-asm
+.endif
+
 .ifndef(WITH_PTHREADS)
 CONFIGURE_ARGS+=	--without-pthreads
 .else
@@ -81,18 +92,4 @@ post-install:
 		${INSTALL_SCRIPT} ${WRKSRC}/silcd.sh ${PREFIX}/etc/rc.d/silcd.sh; \
 	fi
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} != "i386"
-WITHOUT_OPTIMIZED_ASM=	yes
-.endif
-
-.if ${OSVERSION} >= 400014
-CONFIGURE_ARGS+=	--enable-ipv6
-.endif
-
-.ifdef(WITHOUT_OPTIMIZED_ASM)
-CONFIGURE_ARGS+=	--disable-asm
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/news/cnews/Makefile b/news/cnews/Makefile
index 41329d90032d..e9be3bd45a49 100644
--- a/news/cnews/Makefile
+++ b/news/cnews/Makefile
@@ -71,7 +71,7 @@ PGPVERIFY?=	pgpverify-1.12
 
 .include <bsd.port.pre.mk>
 
-.if make(makesum) || defined(FETCH_ALL) || ${OSVERSION} < 470000 
+.if make(makesum) || defined(FETCH_ALL)
 PATCHFILES+=	c-news-patch-gawk3
 .endif