Remove OSVERSION checks that do not make sense any more.

For example (${OSVERSION} >= 900000 && ${OSVERSION} < 900021) is always true,
as is (${OSVERSION} > 900002 || ${OSVERSION} < 900000 && ${OSVERSION} > 800107).

Regarding patches, when an EXTRA_PATCHES is no longer needed, I remove it, when
it is always needed, I renamed it, in one case, I merged two patches.

Differential Revision:	https://reviews.freebsd.org/D2209

11 files changed, 11 insertions, 62 deletions

diff --git a/sysutils/DTraceToolkit/Makefile b/sysutils/DTraceToolkit/Makefile
index cddab2525438..3adaea17076d 100644
--- a/sysutils/DTraceToolkit/Makefile
+++ b/sysutils/DTraceToolkit/Makefile
@@ -18,22 +18,13 @@ SHEBANG_LANG+=	sh
 SHEBANG_FILES=	hotkernel procsystime opensnoop Apps/shellsnoop
 NO_BUILD=	YES
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} <= 701000
-IGNORE=	needs to have dtrace enabled kernel
-.endif
-
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC}; ${TAR} --exclude '*.orig' -cf - . ) | \
 		(cd ${STAGEDIR}${DATADIR}/; ${TAR} xvf -)
-
-post-install:
 	${LN} -fs ${DATADIR}/hotkernel ${STAGEDIR}${PREFIX}/bin/hotkernel
 	${LN} -fs ${DATADIR}/procsystime ${STAGEDIR}${PREFIX}/bin/procsystime
 	${LN} -fs ${DATADIR}/opensnoop ${STAGEDIR}${PREFIX}/bin/opensnoop
 	${LN} -fs ${DATADIR}/Apps/shellsnoop ${STAGEDIR}${PREFIX}/bin/shellsnoop
-	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/arcconf/Makefile b/sysutils/arcconf/Makefile
index c46fe9f5fffd..5a4d2489798b 100644
--- a/sysutils/arcconf/Makefile
+++ b/sysutils/arcconf/Makefile
@@ -30,7 +30,7 @@ IGNORE=		installs incompatible binaries for FreeBSD
 
 .if ${OSVERSION} >= 900000
 DIST_OSVER=	9
-.elif ${OSVERSION} >= 800000
+.else
 DIST_OSVER=	8
 .endif
 
diff --git a/sysutils/coreutils/Makefile b/sysutils/coreutils/Makefile
index a2e7fc064ec0..5108d74caad1 100644
--- a/sysutils/coreutils/Makefile
+++ b/sysutils/coreutils/Makefile
@@ -39,12 +39,6 @@ NLS_CONFIGURE_ENABLE=	nls
 GMP_LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
 GMP_CONFIGURE_WITH=	gmp
 
-.include <bsd.port.options.mk>
-
-.if ${OSVERSION} >= 800039
-EXTRA_PATCHES=	${PATCHDIR}/extra-patch-stty.c
-.endif
-
 post-build:
 	@${REINPLACE_CMD} -e "s/ lib / /g" ${WRKSRC}/Makefile
 	@${TOUCH} ${WRKSRC}/doc/coreutils.info
diff --git a/sysutils/coreutils/files/extra-patch-stty.c b/sysutils/coreutils/files/patch-stty.c
index ba2723bb64c8..ba2723bb64c8 100644
--- a/sysutils/coreutils/files/extra-patch-stty.c
+++ b/sysutils/coreutils/files/patch-stty.c
diff --git a/sysutils/fusefs-kmod/Makefile b/sysutils/fusefs-kmod/Makefile
index e5e65521d9e1..248beedab219 100644
--- a/sysutils/fusefs-kmod/Makefile
+++ b/sysutils/fusefs-kmod/Makefile
@@ -27,7 +27,7 @@ SUB_FILES=	pkg-message
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 800000 && ${OSVERSION} < 900000
+.if ${OSVERSION} < 900000
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-8-fuse_vfsops.c
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-8-fuse_vnops.c
 .endif
diff --git a/sysutils/geomWatch/Makefile b/sysutils/geomWatch/Makefile
index 13f6b79ed9f5..a79626eeb3d9 100644
--- a/sysutils/geomWatch/Makefile
+++ b/sysutils/geomWatch/Makefile
@@ -18,19 +18,6 @@ SUB_FILES=	pkg-message
 
 USE_RC_SUBR=	${PORTNAME}
 
-.include <bsd.port.pre.mk>
+MAKE_ARGS=	WITH_ZFS=28
 
-.if ${OSVERSION} < 700036
-MAKE_ARGS+=	WITHOUT_ZFS=yes
-.elif ${OSVERSION} < 702102 || \
-	(${OSVERSION} >= 800000 && ${OSVERSION} < 800054)
-MAKE_ARGS+=	WITH_ZFS=6
-.elif (${OSVERSION} >= 702102 && ${OSVERSION} < 800000) || \
-	(${OSVERSION} >= 800054 && ${OSVERSION} < 802506) || \
-	(${OSVERSION} >= 900000 && ${OSVERSION} < 900033)
-MAKE_ARGS+=	WITH_ZFS=13
-.else
-MAKE_ARGS+=	WITH_ZFS=28
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile
index 84ca0a14523b..dae15d3a5864 100644
--- a/sysutils/hal/Makefile
+++ b/sysutils/hal/Makefile
@@ -74,12 +74,6 @@ FIXED_MOUNTPOINTS_EXTRA_PATCHES=	${FILESDIR}/extra-patch-tools_hal-storage-mount
 RUN_DEPENDS+=	dmidecode:${PORTSDIR}/sysutils/dmidecode
 .endif
 
-.if ${OSVERSION} >= 800063
-PLIST_SUB+=	USB2=""
-.else
-PLIST_SUB+=	USB2="@comment "
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's/==/=/g' ${WRKSRC}/tools/hal-luks*
 	@${REINPLACE_CMD} -e '/^scriptdir = /s|[(]libexecdir[)]/scripts|(libexecdir)/hal/scripts|' \
diff --git a/sysutils/hal/pkg-plist b/sysutils/hal/pkg-plist
index ae346da97ca8..ac70ee7c0fe6 100644
--- a/sysutils/hal/pkg-plist
+++ b/sysutils/hal/pkg-plist
@@ -66,9 +66,9 @@ libexec/hald-probe-mouse
 libexec/hald-probe-scsi
 libexec/hald-probe-smbios
 libexec/hald-probe-storage
-%%USB2%%libexec/hald-probe-usb2-device
-%%USB2%%libexec/hald-probe-usb2-interface
-%%USB2%%libexec/hald-probe-video4linux
+libexec/hald-probe-usb2-device
+libexec/hald-probe-usb2-interface
+libexec/hald-probe-video4linux
 libexec/hald-probe-volume
 libexec/hald-runner
 man/man1/hal-disable-polling.1.gz
diff --git a/sysutils/jaildaemon/Makefile b/sysutils/jaildaemon/Makefile
index 870bfb603c90..fc5d2f680532 100644
--- a/sysutils/jaildaemon/Makefile
+++ b/sysutils/jaildaemon/Makefile
@@ -17,10 +17,4 @@ PLIST_FILES=	bin/jaildaemon \
 
 MAKE_ENV=	DESTDIR=${STAGEDIR}
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 800000
-IGNORE=		requires jail_get function from FreeBSD 8
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/realsync/Makefile b/sysutils/realsync/Makefile
index 6ff80a890e6c..558a459ace1d 100644
--- a/sysutils/realsync/Makefile
+++ b/sysutils/realsync/Makefile
@@ -24,16 +24,10 @@ PLIST_FILES=	sbin/realsync \
 		etc/realsync.cfg.example \
 		man/man8/realsync.8.gz
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 804000
-IGNORE=	does not work on FreeBSD < 8.4
-.endif
-
 do-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/realsync ${STAGEDIR}${PREFIX}/sbin/realsync
 	${INSTALL_MAN} ${WRKSRC}/man8/realsync.8 ${STAGEDIR}${PREFIX}/man/man8/realsync.8
 	${INSTALL_SCRIPT} ${WRKSRC}/rc.d/realsync ${STAGEDIR}${PREFIX}/etc/rc.d/realsync
 	${INSTALL_DATA} ${WRKSRC}/config/${PORTNAME}.cfg.example ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.cfg.example
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/swapexd/Makefile b/sysutils/swapexd/Makefile
index 08dee419769b..9c6e28d695be 100644
--- a/sysutils/swapexd/Makefile
+++ b/sysutils/swapexd/Makefile
@@ -13,18 +13,13 @@ WRKSRC=	${WRKDIR}/${PORTNAME}
 
 PLIST_FILES=	sbin/${PORTNAME} etc/rc.d/swapexd "@sample etc/swapexd.conf.sample"
 
-.include <bsd.port.pre.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/rc.d/swapexd
 	@${REINPLACE_CMD} -e "s,/etc/,${PREFIX}/etc/,g" ${WRKSRC}/swapexd.h
-.if ${OSVERSION} < 800076
-	@${REINPLACE_CMD} -e "s,swapctl -s -m ,swapctl -s -h ,g" ${WRKSRC}/swapexd.c
-.endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin/
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
 	${INSTALL_SCRIPT} ${WRKSRC}/rc.d/swapexd ${STAGEDIR}${PREFIX}/etc/rc.d
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>