37 files changed, 24 insertions, 194 deletions

diff --git a/mail/bsmtp/Makefile b/mail/bsmtp/Makefile
index f504d5ec6aa9..3b7cac4cdf79 100644
--- a/mail/bsmtp/Makefile
+++ b/mail/bsmtp/Makefile
@@ -23,12 +23,8 @@ CONFIGURE_ARGS=	--redo
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500024
-UUPREFIX=	/usr
-.else
 RUN_DEPENDS=	${LOCALBASE}/bin/uux:${PORTSDIR}/net/freebsd-uucp
 UUPREFIX=	${LOCALBASE}
-.endif
 
 post-patch:
 	@${CP} ${WRKSRC}/bsmtp.m4.8.9.in ${WRKSRC}/bsmtp.m4.8.10.in
diff --git a/mail/cone/Makefile b/mail/cone/Makefile
index f4aad55f6e60..55d036509e07 100644
--- a/mail/cone/Makefile
+++ b/mail/cone/Makefile
@@ -41,10 +41,6 @@ INSTALL_TARGET=	install-strip
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 502010
-IGNORE=		not supported on FreeBSD versions before 5.2.1-RELEASE
-.endif
-
 .if ${OSVERSION} > 700032 || (${OSVERSION} < 700000 && ${OSVERSION} > 602106)
 CPPFLAGS+=	-D_XOPEN_SOURCE_EXTENDED
 .elif exists(${LOCALBASE}/include/ncurses/ncurses.h) || defined(WITH_NCURSESW)
diff --git a/mail/courier/files/pkg-install.in b/mail/courier/files/pkg-install.in
index 8a8adec92bf6..4edbdd45361c 100644
--- a/mail/courier/files/pkg-install.in
+++ b/mail/courier/files/pkg-install.in
@@ -52,12 +52,6 @@ replace() {
 }
 
 if [ ":$2" = ":POST-INSTALL" ]; then
-    if [ -x /sbin/sysctl ]; then
-        OSVERSION=`/sbin/sysctl -n kern.osreldate`
-    else
-        OSVERSION=`/usr/sbin/sysctl -n kern.osreldate`
-    fi
-    if [ ${OSVERSION} -ge 400014 ]; then
         if yesno "Would you like to activate Courier in /etc/mail/mailer.conf" n; then
             mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old
             echo "#"						>  /etc/mail/mailer.conf
@@ -70,12 +64,4 @@ if [ ":$2" = ":POST-INSTALL" ]; then
             echo "newaliases	${PKG_PREFIX}/sbin/makealiases"	>> /etc/mail/mailer.conf
             echo "Done."
         fi
-    else
-        if yesno "Would you like to replace {sendmail,mailq,newaliases} with Courier versions" n; then
-            replace /usr/sbin/sendmail	${PKG_PREFIX}/bin/sendmail
-            replace /usr/bin/mailq	${PKG_PREFIX}/bin/mailq
-            replace /usr/bin/newaliases	${PKG_PREFIX}/sbin/makealiases
-            echo "Done."
-        fi
-    fi
 fi
diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
index b58ed112b25b..fa266221d229 100644
--- a/mail/cyrus-imapd22/Makefile
+++ b/mail/cyrus-imapd22/Makefile
@@ -133,8 +133,7 @@ PLIST_SUB+=	LDAP_PTLOADER="@comment "
 EXTRA_PATCHES+=	${FILESDIR}/pass8bit.diff
 .endif
 
-.if (!defined(MAKE_KERBEROS5) && ${OSVERSION} <= 500105) || \
-	!exists(/usr/lib/libkrb5.a)
+.if !exists(/usr/lib/libkrb5.a)
 CONFIGURE_ARGS+=--disable-gssapi
 .endif
 
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index e0484030fb72..a4ba6a51cc26 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -149,8 +149,7 @@ PLIST_SUB+=	LDAP_PTLOADER=""
 PLIST_SUB+=	LDAP_PTLOADER="@comment "
 .endif
 
-.if (!defined(MAKE_KERBEROS5) && ${OSVERSION} <= 500105) || \
-	!exists(/usr/lib/libkrb5.a)
+.if !exists(/usr/lib/libkrb5.a)
 CONFIGURE_ARGS+=--disable-gssapi
 .endif
 
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index e0484030fb72..a4ba6a51cc26 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -149,8 +149,7 @@ PLIST_SUB+=	LDAP_PTLOADER=""
 PLIST_SUB+=	LDAP_PTLOADER="@comment "
 .endif
 
-.if (!defined(MAKE_KERBEROS5) && ${OSVERSION} <= 500105) || \
-	!exists(/usr/lib/libkrb5.a)
+.if !exists(/usr/lib/libkrb5.a)
 CONFIGURE_ARGS+=--disable-gssapi
 .endif
 
diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index 847f14064ef3..af4f78b0d380 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -46,10 +46,6 @@ LIB_DEPENDS+=	pcre.0:${PORTSDIR}/devel/pcre
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} <= 502010
-USE_GMAKE	=yes
-.endif
-
 .if defined(WITH_GDBM)
 LIB_DEPENDS+=		gdbm.3:${PORTSDIR}/databases/gdbm
 CONFIGURE_ARGS+=	--with-db=gdbm
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 8c2889bd69d5..d8807e2719a7 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -398,7 +398,7 @@ CONFIGURE_ARGS+=	--disable-gpgme
 .if exists(${LOCALBASE}/bin/krb5-config)
 LIB_DEPENDS+=		gssapi_krb5:${PORTSDIR}/security/krb5
 CONFIGURE_ARGS+=	--with-gss=${LOCALBASE}
-.elif (defined(MAKE_KERBEROS5) && ${OSVERSION} > 500105) || exists(/usr/lib/libkrb5.a)
+.elif (defined(MAKE_KERBEROS5)) || exists(/usr/lib/libkrb5.a)
 CONFIGURE_ARGS+=	--with-gss
 USE_KRB5_SYS=YES
 .endif
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 6ba71a187921..376d9b851d19 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -121,7 +121,7 @@ CFLAGS+=	-I${PREFIX}/include/ncurses -I${PREFIX}/include
 .if exists(${LOCALBASE}/bin/gss-client)
 LIB_DEPENDS+=		gssapi_krb5:${PORTSDIR}/security/krb5
 CONFIGURE_ARGS+=	--with-gss=${LOCALBASE}
-.elif (defined(MAKE_KERBEROS5) && (${OSVERSION} > 500105)) || exists(/usr/lib/libkrb5.a)
+.elif (defined(MAKE_KERBEROS5)) || exists(/usr/lib/libkrb5.a)
 CONFIGURE_ARGS+=	--with-gss
 USE_KRB5_SYS=YES
 .endif
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile
index 6ba71a187921..376d9b851d19 100644
--- a/mail/mutt14/Makefile
+++ b/mail/mutt14/Makefile
@@ -121,7 +121,7 @@ CFLAGS+=	-I${PREFIX}/include/ncurses -I${PREFIX}/include
 .if exists(${LOCALBASE}/bin/gss-client)
 LIB_DEPENDS+=		gssapi_krb5:${PORTSDIR}/security/krb5
 CONFIGURE_ARGS+=	--with-gss=${LOCALBASE}
-.elif (defined(MAKE_KERBEROS5) && (${OSVERSION} > 500105)) || exists(/usr/lib/libkrb5.a)
+.elif (defined(MAKE_KERBEROS5)) || exists(/usr/lib/libkrb5.a)
 CONFIGURE_ARGS+=	--with-gss
 USE_KRB5_SYS=YES
 .endif
diff --git a/mail/spamd/Makefile b/mail/spamd/Makefile
index 1dd212439d18..d37fd1ace1c0 100644
--- a/mail/spamd/Makefile
+++ b/mail/spamd/Makefile
@@ -17,11 +17,7 @@ COMMENT=	Traps spammers with a very slow smtp-login and return 4xx error
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 502117
-BROKEN=		OpenBSD 3.5 pf/pfctl is necessary for this port to function properly.
-.else
 LOCAL_PFCTL=	/sbin/pfctl
-.endif
 
 USE_RC_SUBR?=	obspamd obspamlogd
 
diff --git a/mail/xc-mail/Makefile b/mail/xc-mail/Makefile
index e57be030ee5c..848461a816a6 100644
--- a/mail/xc-mail/Makefile
+++ b/mail/xc-mail/Makefile
@@ -30,16 +30,12 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		LIBS="-L${LOCALBASE}/lib"
 
-.include <bsd.port.pre.mk>
-
 post-patch:
-.if ${OSVERSION} > 502014
 	@${REINPLACE_CMD} -e "s|expr $1|expr -- $1|g" ${WRKSRC}/plugins/linkshared.in
 	@${REINPLACE_CMD} -e "s|expr $1|expr -- $1|g" ${WRKSRC}/src/linktool
-.endif
 
 post-install:
 		chown ${BINOWN}:mail ${PREFIX}/bin/xc-mail
 		chmod g+s ${PREFIX}/bin/xc-mail
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/math/algae/Makefile b/math/algae/Makefile
index 39a785aaa61a..2008b4a81965 100644
--- a/math/algae/Makefile
+++ b/math/algae/Makefile
@@ -42,8 +42,8 @@ pre-configure:
 
 .include <bsd.port.pre.mk>
 
-.if ( ${ARCH} == "alpha" && ${OSVERSION} > 502102 ) || ${ARCH} == "sparc64"
-BROKEN=		Configure fails on alpha 5.x and sparc64
+.if ${ARCH} == "alpha" || ${ARCH} == "sparc64"
+BROKEN=		Configure fails on alpha and sparc64
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/math/cxsc/Makefile b/math/cxsc/Makefile
index d29db569f11d..c684456a4375 100644
--- a/math/cxsc/Makefile
+++ b/math/cxsc/Makefile
@@ -18,11 +18,6 @@ COMMENT=	C++ class library for eXtended Scientific Computing
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_GMAKE=	yes
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 502126
 USE_GCC=	3.3
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/math/digitizer/Makefile b/math/digitizer/Makefile
index c1094b60fd8f..9b0bb326b47f 100644
--- a/math/digitizer/Makefile
+++ b/math/digitizer/Makefile
@@ -37,12 +37,6 @@ DESKTOP_ENTRIES=	"Engauge Digitizer" \
 DOCS=		README
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500035
-BROKEN=		Does not compile with gcc-2.95
-.endif
-
 pre-configure:
 .if !defined(WITH_DEBUG)
 	${REINPLACE_CMD} -e '/^CONFIG/s/debug/release/' ${WRKSRC}/digitizer.pro
@@ -70,4 +64,4 @@ do-install:
 	@${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}."
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/math/gretl/Makefile b/math/gretl/Makefile
index fd863f2ff857..600864e54641 100644
--- a/math/gretl/Makefile
+++ b/math/gretl/Makefile
@@ -66,14 +66,8 @@ BLAS=		-lblas
 LAPACK=		-llapack
 .endif
 
-.if ${OSVERSION} > 502010
-GNU_REGEX_H=	gnu/regex.h
-.else
-GNU_REGEX_H=	gnuregex.h
-.endif
-
 post-patch:
-	@${REINPLACE_CMD} -e 's|<regex.h>|<${GNU_REGEX_H}>|g' \
+	@${REINPLACE_CMD} -e 's|<regex.h>|<gnu/regex.h>|g' \
 		${WRKSRC}/gui2/gtksourceview/gtksourceregex.c
 
 pre-configure:
diff --git a/math/ndiff/Makefile b/math/ndiff/Makefile
index 0194d62e7dff..d3827dd719d8 100644
--- a/math/ndiff/Makefile
+++ b/math/ndiff/Makefile
@@ -18,11 +18,9 @@ COMMENT=	Compare putatively similar files, ignoring small numeric differences
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_GMP)
-.if ${OSVERSION} > 500023
 LIB_DEPENDS=	gmp.7:${PORTSDIR}/math/libgmp4
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-.endif
 CONFIGURE_ARGS=	--with-gmp
 CONFIGURE_ENV=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 .else
diff --git a/math/octave-devel/Makefile b/math/octave-devel/Makefile
index 98ad731c9ad9..bb334dfa5264 100644
--- a/math/octave-devel/Makefile
+++ b/math/octave-devel/Makefile
@@ -42,11 +42,6 @@ MAN1=		octave.1 octave-bug.1 mkoctfile.1 octave-config.1
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 600000
-BUILD_DEPENDS+=	info:${PORTSDIR}/print/texinfo
-BROKEN=		Fails to install
-.endif
-
 USE_BLAS?=	reference
 
 .if exists(${LOCALBASE}/lib/libgoto.so)
diff --git a/math/octave/Makefile b/math/octave/Makefile
index ff875975c3db..f5edb7725ff8 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -39,11 +39,6 @@ MAN1=		octave.1 octave-bug.1 mkoctfile.1 octave-config.1
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 600000
-BUILD_DEPENDS+=	info:${PORTSDIR}/print/texinfo
-BROKEN=		Fails to install
-.endif
-
 USE_BLAS?=	reference
 
 .if exists(${LOCALBASE}/lib/libgoto.so)
diff --git a/math/ump/Makefile b/math/ump/Makefile
index b15457a2a586..dfba576c3852 100644
--- a/math/ump/Makefile
+++ b/math/ump/Makefile
@@ -30,12 +30,6 @@ MAKE_ENV+=	DATADIR="${DATADIR}"
 FIND_DIRS=	-type d
 FIND_DATA=	-type f
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 503000
-IGNORE=		requires trunc(3) and round(3)
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/src/main.cpp
 
@@ -45,4 +39,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/ump.conf ${PREFIX}/etc
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile
index e707f6eaee5b..81ebe69bf2be 100644
--- a/misc/amanda-server/Makefile
+++ b/misc/amanda-server/Makefile
@@ -154,16 +154,6 @@ RUN_DEPENDS+=	aespipe:${PORTSDIR}/security/aespipe
 CONFIGURE_ARGS+=	--with-tape-device=${AMANDA_TAPE}
 .endif
 
-#
-# Before 4.0, pre-CAM scsiio.h existed
-.if ${ARCH} == "amd64"
-PLIST_SUB+=	SCSICHG='@comment '
-.elif ${OSVERSION} >= 502000
-PLIST_SUB+=	SCSICHG='@comment '
-.else
-PLIST_SUB+=	SCSICHG=''
-.endif
-
 # amanda-client part
 .else
 
diff --git a/misc/amanda-server/pkg-plist b/misc/amanda-server/pkg-plist
index b946a403aa01..9fc973ba3414 100644
--- a/misc/amanda-server/pkg-plist
+++ b/misc/amanda-server/pkg-plist
@@ -53,7 +53,6 @@ libexec/amanda/chg-multi
 libexec/amanda/chg-null
 libexec/amanda/chg-rait
 libexec/amanda/chg-rth
-%%SCSICHG%%libexec/amanda/chg-scsi
 libexec/amanda/chg-zd-mtx
 libexec/amanda/chunker
 libexec/amanda/amidxtaped
diff --git a/misc/amanda25-server/Makefile b/misc/amanda25-server/Makefile
index 5141d509ca3f..29457d3729a9 100644
--- a/misc/amanda25-server/Makefile
+++ b/misc/amanda25-server/Makefile
@@ -158,16 +158,6 @@ RUN_DEPENDS+=	aespipe:${PORTSDIR}/security/aespipe
 CONFIGURE_ARGS+=	--with-tape-device=${AMANDA_TAPE}
 .endif
 
-#
-# Before 4.0, pre-CAM scsiio.h existed
-.if ${ARCH} == "amd64"
-PLIST_SUB+=	SCSICHG='@comment '
-.elif ${OSVERSION} >= 502000
-PLIST_SUB+=	SCSICHG='@comment '
-.else
-PLIST_SUB+=	SCSICHG=''
-.endif
-
 # amanda-client part
 .else
 
diff --git a/misc/amanda25-server/pkg-plist b/misc/amanda25-server/pkg-plist
index 807ba8730fc9..f0e8b737655d 100644
--- a/misc/amanda25-server/pkg-plist
+++ b/misc/amanda25-server/pkg-plist
@@ -31,7 +31,6 @@ libexec/amanda/chg-multi
 libexec/amanda/chg-null
 libexec/amanda/chg-rait
 libexec/amanda/chg-rth
-%%SCSICHG%%libexec/amanda/chg-scsi
 libexec/amanda/chg-zd-mtx
 libexec/amanda/chunker
 libexec/amanda/amidxtaped
diff --git a/misc/amanda26-server/Makefile b/misc/amanda26-server/Makefile
index e707f6eaee5b..81ebe69bf2be 100644
--- a/misc/amanda26-server/Makefile
+++ b/misc/amanda26-server/Makefile
@@ -154,16 +154,6 @@ RUN_DEPENDS+=	aespipe:${PORTSDIR}/security/aespipe
 CONFIGURE_ARGS+=	--with-tape-device=${AMANDA_TAPE}
 .endif
 
-#
-# Before 4.0, pre-CAM scsiio.h existed
-.if ${ARCH} == "amd64"
-PLIST_SUB+=	SCSICHG='@comment '
-.elif ${OSVERSION} >= 502000
-PLIST_SUB+=	SCSICHG='@comment '
-.else
-PLIST_SUB+=	SCSICHG=''
-.endif
-
 # amanda-client part
 .else
 
diff --git a/misc/amanda26-server/pkg-plist b/misc/amanda26-server/pkg-plist
index b946a403aa01..9fc973ba3414 100644
--- a/misc/amanda26-server/pkg-plist
+++ b/misc/amanda26-server/pkg-plist
@@ -53,7 +53,6 @@ libexec/amanda/chg-multi
 libexec/amanda/chg-null
 libexec/amanda/chg-rait
 libexec/amanda/chg-rth
-%%SCSICHG%%libexec/amanda/chg-scsi
 libexec/amanda/chg-zd-mtx
 libexec/amanda/chunker
 libexec/amanda/amidxtaped
diff --git a/misc/amanda32-server/Makefile b/misc/amanda32-server/Makefile
index e707f6eaee5b..81ebe69bf2be 100644
--- a/misc/amanda32-server/Makefile
+++ b/misc/amanda32-server/Makefile
@@ -154,16 +154,6 @@ RUN_DEPENDS+=	aespipe:${PORTSDIR}/security/aespipe
 CONFIGURE_ARGS+=	--with-tape-device=${AMANDA_TAPE}
 .endif
 
-#
-# Before 4.0, pre-CAM scsiio.h existed
-.if ${ARCH} == "amd64"
-PLIST_SUB+=	SCSICHG='@comment '
-.elif ${OSVERSION} >= 502000
-PLIST_SUB+=	SCSICHG='@comment '
-.else
-PLIST_SUB+=	SCSICHG=''
-.endif
-
 # amanda-client part
 .else
 
diff --git a/misc/amanda32-server/pkg-plist b/misc/amanda32-server/pkg-plist
index b946a403aa01..9fc973ba3414 100644
--- a/misc/amanda32-server/pkg-plist
+++ b/misc/amanda32-server/pkg-plist
@@ -53,7 +53,6 @@ libexec/amanda/chg-multi
 libexec/amanda/chg-null
 libexec/amanda/chg-rait
 libexec/amanda/chg-rth
-%%SCSICHG%%libexec/amanda/chg-scsi
 libexec/amanda/chg-zd-mtx
 libexec/amanda/chunker
 libexec/amanda/amidxtaped
diff --git a/misc/compat3x/pkg-descr b/misc/compat3x/pkg-descr
index 544c9fd1ab45..e9fecf5361ab 100644
--- a/misc/compat3x/pkg-descr
+++ b/misc/compat3x/pkg-descr
@@ -1,11 +1,2 @@
 This package allows you to install the compat3x libraries on your
 system, so you can use legacy binaries that depend on them.
-
-Usage example:
-
-	.include <bsd.port.pre.mk>
-
-	.if ${OSVERSION} >= 400000
-	LIB_DEPENDS+=       c.3:${PORTSDIR}/misc/compat3x
-	.endif
-
diff --git a/misc/compat4x/Makefile b/misc/compat4x/Makefile
index 7709b7ffd255..8ebba6459b5f 100644
--- a/misc/compat4x/Makefile
+++ b/misc/compat4x/Makefile
@@ -18,6 +18,8 @@ DIST_SUBDIR=	${COMPAT4X_ARCH}/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A convenience package to install the compat4x libraries
 
+RUN_DEPENDS=	${LOCALBASE}/share/compat/locale/UTF-8/LC_CTYPE:${PORTSDIR}/misc/localedata
+
 WRKSRC=		${WRKDIR}/usr/lib/compat
 
 NO_BUILD=	yes
@@ -31,11 +33,6 @@ USE_LDCONFIG=	${TARGET_DIR}
 .include <bsd.port.pre.mk>
 
 COMPAT4X_ARCH=	${ARCH}
-
-.if ${OSVERSION} >= 600016
-RUN_DEPENDS+=		${LOCALBASE}/share/compat/locale/UTF-8/LC_CTYPE:${PORTSDIR}/misc/localedata
-.endif
-
 COMPAT4X_OSVERSION=	5.3
 PLIST=			${.CURDIR}/pkg-plist.freebsd5
 .if ${ARCH} == i386
diff --git a/misc/compat5x/Makefile b/misc/compat5x/Makefile
index f01eb6865889..c44647d98bde 100644
--- a/misc/compat5x/Makefile
+++ b/misc/compat5x/Makefile
@@ -21,6 +21,8 @@ DISTNAME=	${PORTNAME}-${ARCH}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A convenience package to install the compat5x libraries
 
+RUN_DEPENDS=	${LOCALBASE}/share/compat/locale/UTF-8/LC_CTYPE:${PORTSDIR}/misc/localedata
+
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_BZIP2=	yes
@@ -36,14 +38,6 @@ EXTRACT_PRESERVE_OWNERSHIP=	yes	# Files in archive have scfg-flag set
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 600000
-IGNORE=		is for FreeBSD 6.x and newer
-.endif
-
-.if ${OSVERSION} >= 600016
-RUN_DEPENDS+=	${LOCALBASE}/share/compat/locale/UTF-8/LC_CTYPE:${PORTSDIR}/misc/localedata
-.endif
-
 .if ${ARCH} == alpha
 PLIST_SUB+=	ALPHA=""
 .else
diff --git a/misc/dnetc/Makefile b/misc/dnetc/Makefile
index 1ce6b6697586..20bd7d72e719 100644
--- a/misc/dnetc/Makefile
+++ b/misc/dnetc/Makefile
@@ -50,27 +50,16 @@ SUB_LIST=	BINDIR="${BINDIR}" \
 
 .if ${ARCH} == i386
 REVISION=	0
-.if ${OSVERSION} >= 600034
 VERSION=	2.9015.503
 DISTNAME=	dnetc${PORTVERSION:E}-freebsd6-${ARCH:S/i386/x86/}-elf
 WRKSRC=		${WRKDIR}/dnetc${PORTVERSION:E}-freebsd6-${ARCH:S/i386/x86/}-elf
-.elif ${OSVERSION} >= 503001
-VERSION=	2.9013.498
-DISTNAME=	dnetc${PORTVERSION:E}-freebsd5-${ARCH:S/i386/x86/}-elf
-WRKSRC=		${WRKDIR}/dnetc${PORTVERSION:E}-freebsd5-${ARCH:S/i386/x86/}-elf
-.endif
 .endif
 
 .if ${ARCH} == amd64
 REVISION=	3
-.if ${OSVERSION} >= 600034
 VERSION=	2.9012.497
 DISTNAME=	dnetc${PORTVERSION:E}-freebsd6-${ARCH:S/i386/x86/}-elf
 WRKSRC=		${WRKDIR}/dnetc${PORTVERSION:E}-freebsd6-${ARCH:S/i386/x86/}-elf
-.elif ${OSVERSION} >= 503001
-VERSION=	2.9011.496
-#DISTNAME=	dnetc${PORTVERSION:E}-freebsd5-${ARCH:S/i386/x86/}-elf
-.endif
 .endif
 
 .if ${ARCH} == sparc64 || ${ARCH} == alpha
diff --git a/misc/dnetc/distinfo.amd64 b/misc/dnetc/distinfo.amd64
index 3295ea694da7..0b42d2f7814c 100644
--- a/misc/dnetc/distinfo.amd64
+++ b/misc/dnetc/distinfo.amd64
@@ -1,6 +1,3 @@
-MD5 (dnetc496-freebsd-amd64-elf.tar.gz) = b548a9c49fd3c89787f3fc01db613163
-SHA256 (dnetc496-freebsd-amd64-elf.tar.gz) = aafc616f1c17ebded4bc98666834b69fc5b7035b876799eadd4a518f4bc08c8d
-SIZE (dnetc496-freebsd-amd64-elf.tar.gz) = 455421
 MD5 (dnetc497-freebsd6-amd64-elf.tar.gz) = f2327cec16ecc89d9f0da249a92a2813
 SHA256 (dnetc497-freebsd6-amd64-elf.tar.gz) = c572a9071715d44ccadc830d42be78edc5ce45b7f36aed1941c0e28fbc90427d
 SIZE (dnetc497-freebsd6-amd64-elf.tar.gz) = 473337
diff --git a/misc/dnetc/distinfo.i386 b/misc/dnetc/distinfo.i386
index 9df7a4bb0a46..6253ff39fc5c 100644
--- a/misc/dnetc/distinfo.i386
+++ b/misc/dnetc/distinfo.i386
@@ -1,6 +1,3 @@
-MD5 (dnetc498-freebsd5-x86-elf.tar.gz) = 596ff5b5a16510059b05e599427769ee
-SHA256 (dnetc498-freebsd5-x86-elf.tar.gz) = dcf634718c4dcb106e6223189d402f28155f7041961ba1a136f80c58930563d3
-SIZE (dnetc498-freebsd5-x86-elf.tar.gz) = 428902
 MD5 (dnetc503-freebsd6-x86-elf.tar.gz) = 50c77873dbd8112d1889eed251819305
 SHA256 (dnetc503-freebsd6-x86-elf.tar.gz) = 2ea0aaed6e13b6c40398a3460cd0b100326a69809c536100a90b6424d7350e1c
 SIZE (dnetc503-freebsd6-x86-elf.tar.gz) = 479842
diff --git a/misc/kdeedu3/Makefile b/misc/kdeedu3/Makefile
index 9d5125a8c915..65c648d7541d 100644
--- a/misc/kdeedu3/Makefile
+++ b/misc/kdeedu3/Makefile
@@ -15,7 +15,8 @@ DIST_SUBDIR=	KDE
 MAINTAINER?=	kde@FreeBSD.org
 COMMENT=	Collection of entertaining, educational programs for KDE
 
-LIB_DEPENDS=	usb-0.1:${PORTSDIR}/devel/libusb
+LIB_DEPENDS=	usb-0.1:${PORTSDIR}/devel/libusb \
+		boost_python:${PORTSDIR}/devel/boost-python
 
 CONFLICTS+=	kwordquiz-[0-9]* kgeography-[0-9]*
 
@@ -34,19 +35,10 @@ USE_LDCONFIG=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} > 500035
-LIB_DEPENDS+=	boost_python:${PORTSDIR}/devel/boost-python
-PLIST_SUB+=	BOOST_PYTHON=""
-.else
-CONFIGURE_ARGS+=--disable-kig-python-scripting
-PLIST_SUB+=	BOOST_PYTHON="@comment "
-.endif
 
 pre-configure:
 	${REINPLACE_CMD} \
 	-e 's|pylibdir in.*|pylibdir in "${LOCALBASE}/lib" \\|g' \
 	${WRKSRC}/configure
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index ea718ae2ec7a..52314e3d57f3 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -17,7 +17,8 @@ COMMENT=	Utilities for the KDE integrated X11 desktop
 
 LIB_DEPENDS=	gmp.7:${PORTSDIR}/math/libgmp4 \
 		netsnmp:${PORTSDIR}/net-mgmt/net-snmp
-RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
+RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg \
+		gtar:${PORTSDIR}/archivers/gtar
 
 CONFLICTS=	kgpg-[0-9]* superkaramba-[0-9]*
 
@@ -37,14 +38,8 @@ USE_LDCONFIG=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
-.include <bsd.port.pre.mk>
 
-.if ${OSVERSION} > 501102
-.	if ${OSVERSION} > 600021
-RUN_DEPENDS+=   gtar:${PORTSDIR}/archivers/gtar
-.	endif
 post-patch:
 	${REINPLACE_CMD} -e 's|>tar<|>gtar<|g' ${WRKSRC}/ark/ark.kcfg
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/localedata/Makefile b/misc/localedata/Makefile
index b3284b4d2529..a423b7c4cc63 100644
--- a/misc/localedata/Makefile
+++ b/misc/localedata/Makefile
@@ -21,12 +21,6 @@ ONLY_FOR_ARCHS=	amd64 alpha ia64 i386 pc98 sparc64
 
 TARGET_DIR=	${PREFIX}/share/compat
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 600016
-IGNORE=		is not required for your OS
-.endif
-
 WRKSRC=		${WRKDIR}/${ARCH}
 
 post-extract:
@@ -36,4 +30,4 @@ do-install:
 	${MKDIR} ${TARGET_DIR}
 	${PAX} -rw -s
${WRKSRC}

 ${WRKSRC}/locale ${TARGET_DIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>