10 files changed, 23 insertions, 72 deletions

diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile
index 62f873d31b4c..2cd28c07fc9b 100644
--- a/databases/postgresql80-server/Makefile
+++ b/databases/postgresql80-server/Makefile
@@ -76,10 +76,6 @@ CONFIGURE_ARGS+=--with-openssl
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "alpha" && ${OSVERSION} < 500000
-BROKEN=		Coredump during build on alpha 4.x
-.endif
-
 .if !defined(SLAVE_ONLY)
 # gnugetopt will always be used if already installed
 .  if ( ${OSVERSION} < 500041 ) && !exists(${LOCALBASE}/include/getopt.h)
diff --git a/devel/pecl-statgrab/Makefile b/devel/pecl-statgrab/Makefile
index 4dd1912ea114..db0576029225 100644
--- a/devel/pecl-statgrab/Makefile
+++ b/devel/pecl-statgrab/Makefile
@@ -29,10 +29,6 @@ CONFIGURE_ARGS=	--with-statgrab=${LOCALBASE}
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-EXTRA_LIBS=	-lkvm
-.endif
-
 .if ${PHP_VER} < 5
 post-patch:
 	@${PATCH} -d ${WRKSRC} -p0 < ${FILESDIR}/php_statgrab.h.patch
diff --git a/devel/valgrind-snapshot/Makefile b/devel/valgrind-snapshot/Makefile
index 35d05ab45509..6151aec05b6c 100644
--- a/devel/valgrind-snapshot/Makefile
+++ b/devel/valgrind-snapshot/Makefile
@@ -80,16 +80,6 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/coregrind/vg_unistd.h \
 		${PREFIX}/include/valgrind
 
-# Check if kernel is built with USER_LDT option (FreeBSD 4 only)
-.if ${OSVERSION} < 500000
-	@${PREFIX}/bin/valgrind --tool=memcheck true 2> ${WRKDIR}/ldt.test
-	@${GREP} i386_set_ldt ${WRKDIR}/ldt.test >/dev/null &&\
-	${ECHO_CMD} !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! && \
-	${ECHO_CMD} Please rebuild your kernel with ``options USER_LDT''! && \
-	${ECHO_CMD} Otherwise, valgrind will not be able to perform pointer analysis! && \
-	${ECHO_CMD} !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! || true
-.endif
-
 # Generate suppression files
 .ifndef (PACKAGE_BUILDING)
 	@yes | ${PREFIX}/bin/valgrind --tool=memcheck --gen-suppressions=yes true 2>&1 \
diff --git a/devel/valgrind/Makefile b/devel/valgrind/Makefile
index 091adbc89647..593c3ffd62d1 100644
--- a/devel/valgrind/Makefile
+++ b/devel/valgrind/Makefile
@@ -76,16 +76,6 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/coregrind/vg_unistd.h \
 		${PREFIX}/include/valgrind
 
-# Check if kernel is built with USER_LDT option (FreeBSD 4 only)
-.if ${OSVERSION} < 500000
-	@${PREFIX}/bin/valgrind --tool=memcheck true 2> ${WRKDIR}/ldt.test
-	@${GREP} i386_set_ldt ${WRKDIR}/ldt.test >/dev/null &&\
-	${ECHO_CMD} !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! && \
-	${ECHO_CMD} Please rebuild your kernel with ``options USER_LDT''! && \
-	${ECHO_CMD} Otherwise, valgrind will not be able to perform pointer analysis! && \
-	${ECHO_CMD} !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! || true
-.endif
-
 .ifndef (PACKAGE_BUILDING)
 	@yes | ${PREFIX}/bin/valgrind --tool=memcheck --gen-suppressions=yes true 2>&1 \
 		| ${SED} -e 's,.*{$$,{,'  \
diff --git a/emulators/vmware-guestd3/Makefile b/emulators/vmware-guestd3/Makefile
index 4c8880e8ee78..7cd7f1c42c5a 100644
--- a/emulators/vmware-guestd3/Makefile
+++ b/emulators/vmware-guestd3/Makefile
@@ -33,13 +33,7 @@ NO_PACKAGE=	${RESTRICTED}
 VMWARE_VER=	3.2.1
 BUILD_VER=	2237
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-MOUNT_DEV?=	/dev/acd0c
-.else
 MOUNT_DEV?=	/dev/acd0
-.endif
 MOUNT_PT?=	/mnt
 MOUNT=		/sbin/mount
 UMOUNT=		/sbin/umount
@@ -85,4 +79,4 @@ do-install:
 	fi
 	-${PREFIX}/sbin/vmware-guestd --cmd toolinstall.end
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/emulators/vmware-guestd4/Makefile b/emulators/vmware-guestd4/Makefile
index df80069e3fbe..07e06124eee9 100644
--- a/emulators/vmware-guestd4/Makefile
+++ b/emulators/vmware-guestd4/Makefile
@@ -41,13 +41,7 @@ NO_LATEST_LINK=	yes
 VMWARE_VER=	4.5.2
 BUILD_VER=	8848
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-MOUNT_DEV?=	/dev/acd0c
-.else
 MOUNT_DEV?=	/dev/acd0
-.endif
 MOUNT_PT?=	/mnt
 MOUNT=		/sbin/mount
 UMOUNT=		/sbin/umount
@@ -146,4 +140,4 @@ do-install:
 	${LN} -sfh /usr/bin/true ${PREFIX}/share/vmware-tools/suspend-vm-default
 	${LN} -sfh ${PREFIX}/share/vmware-tools /etc/vmware-tools
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/emulators/vmware-guestd6/Makefile b/emulators/vmware-guestd6/Makefile
index 4c4957f25201..beebd1a5fe00 100644
--- a/emulators/vmware-guestd6/Makefile
+++ b/emulators/vmware-guestd6/Makefile
@@ -102,7 +102,7 @@ PLIST_SUB+=	VMWARE_VMMEMCTL="@comment "
 .endif
 
 .if defined(WITH_VMWARE_VMXNET)
-.if (${OSVERSION} >= 500000) && (${OSVERSION} < 600000)
+.if (${OSVERSION} < 600000)
 PLIST_SUB+=	VMWARE_VMXNET=""
 .if ${BITS} == 32
 .if ${OSVERSION} < 530000
diff --git a/security/drweb/Makefile b/security/drweb/Makefile
index 653653929754..2174cff3dda7 100644
--- a/security/drweb/Makefile
+++ b/security/drweb/Makefile
@@ -39,13 +39,6 @@ WRKSRC=		${WRKDIR}/${DISTNAME}
 DRWEB_PREFIX=	${PREFIX}/${PORTNAME}
 DRWEB_VARPREFIX=/var/drweb
 
-pre-install:
-.if ${OSVERSION} < 500000
-PLIST_SUB=	RU="@comment "
-.else
-PLIST_SUB=	RU=""
-.endif
-
 do-install:
 	@${INSTALL} -dv -m 0750 ${DRWEB_PREFIX}
 	@${INSTALL} -dv -m 0750 ${PREFIX}/etc/drweb
diff --git a/security/drweb/pkg-plist b/security/drweb/pkg-plist
index 6dfffc7f24f9..50337ca8f1af 100644
--- a/security/drweb/pkg-plist
+++ b/security/drweb/pkg-plist
@@ -64,30 +64,30 @@ drweb/bases/drw43321.vdb
 drweb/bases/drw43322.vdb
 drweb/bases/drw43323.vdb
 drweb/bases/drw43324.vdb
-%%RU%%drweb/bases/drw43325.vdb
-%%RU%%drweb/bases/drw43326.vdb
-%%RU%%drweb/bases/drw43327.vdb
-%%RU%%drweb/bases/drw43328.vdb
-%%RU%%drweb/bases/drw43329.vdb
-%%RU%%drweb/bases/drw43330.vdb
-%%RU%%drweb/bases/drw43331.vdb
-%%RU%%drweb/bases/drw43332.vdb
-%%RU%%drweb/bases/drw43333.vdb
-%%RU%%drweb/bases/drw43334.vdb
-%%RU%%drweb/bases/drw43335.vdb
-%%RU%%drweb/bases/drw43336.vdb
-%%RU%%drweb/bases/drw43337.vdb
-%%RU%%drweb/bases/drw43338.vdb
-%%RU%%drweb/bases/drw43339.vdb
-%%RU%%drweb/bases/drw43340.vdb
-%%RU%%drweb/bases/drw43341.vdb
+drweb/bases/drw43325.vdb
+drweb/bases/drw43326.vdb
+drweb/bases/drw43327.vdb
+drweb/bases/drw43328.vdb
+drweb/bases/drw43329.vdb
+drweb/bases/drw43330.vdb
+drweb/bases/drw43331.vdb
+drweb/bases/drw43332.vdb
+drweb/bases/drw43333.vdb
+drweb/bases/drw43334.vdb
+drweb/bases/drw43335.vdb
+drweb/bases/drw43336.vdb
+drweb/bases/drw43337.vdb
+drweb/bases/drw43338.vdb
+drweb/bases/drw43339.vdb
+drweb/bases/drw43340.vdb
+drweb/bases/drw43341.vdb
 drweb/bases/drwebase.vdb
 drweb/bases/drwnasty.vdb
 drweb/bases/drwrisky.vdb
 drweb/bases/dwn43301.vdb
-%%RU%%drweb/bases/dwn43302.vdb
-%%RU%%drweb/bases/dwn43303.vdb
-%%RU%%drweb/bases/dwr43301.vdb
+drweb/bases/dwn43302.vdb
+drweb/bases/dwn43303.vdb
+drweb/bases/dwr43301.vdb
 drweb/bases/update.drl
 @dirrm drweb/bases
 @dirrm drweb/infected
diff --git a/www/mozilla/bsd.gecko.mk b/www/mozilla/bsd.gecko.mk
index b27dc306b473..3e9760cc16f2 100644
--- a/www/mozilla/bsd.gecko.mk
+++ b/www/mozilla/bsd.gecko.mk
@@ -67,11 +67,9 @@ Gecko_Pre_Include=			bsd.gecko.mk
 #		${WRKSRC}/configure
 #  .endif
 
-.if ${OSVERSION} >= 500000
 .if (${ARCH}!="sparc64" || ${OSVERSION} >= 601101) && ${ARCH}!="ia64"
 _GECKO_ALL=	firefox nvu seamonkey thunderbird xulrunner flock firefox15
 .endif
-.endif
 _GECKO_ALL+=	mozilla
 
 thunderbird_PORTSDIR=	mail