- Remove conditional checks for FreeBSD 5.x and older

17 files changed, 11 insertions, 109 deletions

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>