- Remove conditional checks for FreeBSD 5.x and older

4 files changed, 41 insertions, 49 deletions

diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile
index 81ffe77b9335..e17eb585998d 100644
--- a/emulators/open-vm-tools/Makefile
+++ b/emulators/open-vm-tools/Makefile
@@ -55,15 +55,9 @@ USE_RC_SUBR=		vmware-guestd.sh vmware-kmod.sh
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 600000
-NOTON5=		""
-.else
-NOTON5=		"@comment "
-.endif
+PLIST_SUB+=	LIB32DIR=${LIB32DIR}
 
-PLIST_SUB+=	NOTON5=${NOTON5} LIB32DIR=${LIB32DIR}
-
-SUB_LIST+=	NOTON5=${NOTON5} LIB32DIR=${LIB32DIR}
+SUB_LIST+=	LIB32DIR=${LIB32DIR}
 
 post-patch:
 .if defined(WITHOUT_X11)
@@ -78,10 +72,8 @@ post-install:
 	${MKDIR} ${PREFIX}/${LIB32DIR}/vmware-tools/modules/input
 	${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmmemctl.ko ${PREFIX}/${LIB32DIR}/vmware-tools/modules/drivers/vmmemctl.ko
 	${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmxnet.ko ${PREFIX}/${LIB32DIR}/vmware-tools/modules/drivers/vmxnet.ko
-.if ${OSVERSION} >= 600000
 	${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmhgfs.ko ${PREFIX}/${LIB32DIR}/vmware-tools/modules/drivers/vmhgfs.ko
 	${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmblock.ko ${PREFIX}/${LIB32DIR}/vmware-tools/modules/drivers/vmblock.ko
-.endif
 	@-kldxref ${PREFIX}/${LIB32DIR}/vmware-tools/modules/drivers 2>/dev/null
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/emulators/open-vm-tools/files/pkg-message.in b/emulators/open-vm-tools/files/pkg-message.in
index cb7ceb70878c..ab2bf34dafe4 100644
--- a/emulators/open-vm-tools/files/pkg-message.in
+++ b/emulators/open-vm-tools/files/pkg-message.in
@@ -2,8 +2,8 @@
 To run the Open Virtual Machine tools at startup, add the following
 settings to your /etc/rc.conf
 
-%%NOTON5%%vmware_guest_vmblock_enable="YES"
-%%NOTON5%%vmware_guest_vmhgfs_enable="YES"
+vmware_guest_vmblock_enable="YES"
+vmware_guest_vmhgfs_enable="YES"
 vmware_guest_vmmemctl_enable="YES"
 vmware_guest_vmxnet_enable="YES"
 vmware_guestd_enable="YES"
diff --git a/emulators/open-vm-tools/files/vmware-kmod.sh.in b/emulators/open-vm-tools/files/vmware-kmod.sh.in
index 6839a023b547..567910cb2ab6 100644
--- a/emulators/open-vm-tools/files/vmware-kmod.sh.in
+++ b/emulators/open-vm-tools/files/vmware-kmod.sh.in
@@ -23,16 +23,16 @@ vmware_guest_vmxnet_start()
 	echo 'Loading vmxnet kernel module.'
 	kldload %%PREFIX%%/%%LIB32DIR%%/vmware-tools/modules/drivers/vmxnet.ko >/dev/null 2>&1
 }
-%%NOTON5%%vmware_guest_vmblock_start()
-%%NOTON5%%{
-%%NOTON5%%	echo 'Loading vmblock kernel module.'
-%%NOTON5%%	kldload %%PREFIX%%/%%LIB32DIR%%/vmware-tools/modules/drivers/vmblock.ko >/dev/null 2>&1
-%%NOTON5%%}
-%%NOTON5%%vmware_guest_vmhgfs_start()
-%%NOTON5%%{
-%%NOTON5%%	echo 'Loading vmhgfs kernel module.'
-%%NOTON5%%	kldload %%PREFIX%%/%%LIB32DIR%%/vmware-tools/modules/drivers/vmhgfs.ko >/dev/null 2>&1
-%%NOTON5%%}
+vmware_guest_vmblock_start()
+{
+	echo 'Loading vmblock kernel module.'
+	kldload %%PREFIX%%/%%LIB32DIR%%/vmware-tools/modules/drivers/vmblock.ko >/dev/null 2>&1
+}
+vmware_guest_vmhgfs_start()
+{
+	echo 'Loading vmhgfs kernel module.'
+	kldload %%PREFIX%%/%%LIB32DIR%%/vmware-tools/modules/drivers/vmhgfs.ko >/dev/null 2>&1
+}
 
 # VMware kernel module: vmmemctl
 name="vmware_guest_vmmemctl"
@@ -58,27 +58,27 @@ stop_cmd=":"
 load_rc_config $name
 [ -z "$vmware_guest_vmxnet_enable" ] && vmware_guest_vmxnet_enable="NO"
 run_rc_command "$1"
-%%NOTON5%%
-%%NOTON5%%# VMware kernel module: vmblock
-%%NOTON5%%name="vmware_guest_vmblock"
-%%NOTON5%%rcvar=`set_rcvar`
-%%NOTON5%%start_precmd="${checkvm_cmd}"
-%%NOTON5%%start_cmd="vmware_guest_vmblock_start"
-%%NOTON5%%stop_precmd="${checkvm_cmd}"
-%%NOTON5%%stop_cmd=":"
-%%NOTON5%%
-%%NOTON5%%load_rc_config $name
-%%NOTON5%%[ -z "$vmware_guest_vmblock_enable" ] && vmware_guest_vmblock_enable="NO"
-%%NOTON5%%run_rc_command "$1"
-%%NOTON5%%
-%%NOTON5%%# VMware kernel module: vmhgfs
-%%NOTON5%%name="vmware_guest_vmhgfs"
-%%NOTON5%%rcvar=`set_rcvar`
-%%NOTON5%%start_precmd="${checkvm_cmd}"
-%%NOTON5%%start_cmd="vmware_guest_vmhgfs_start"
-%%NOTON5%%stop_precmd="${checkvm_cmd}"
-%%NOTON5%%stop_cmd=":"
-%%NOTON5%%
-%%NOTON5%%load_rc_config $name
-%%NOTON5%%[ -z "$vmware_guest_vmhgfs_enable" ] && vmware_guest_vmhgfs_enable="NO"
-%%NOTON5%%run_rc_command "$1"
+
+# VMware kernel module: vmblock
+name="vmware_guest_vmblock"
+rcvar=`set_rcvar`
+start_precmd="${checkvm_cmd}"
+start_cmd="vmware_guest_vmblock_start"
+stop_precmd="${checkvm_cmd}"
+stop_cmd=":"
+
+load_rc_config $name
+[ -z "$vmware_guest_vmblock_enable" ] && vmware_guest_vmblock_enable="NO"
+run_rc_command "$1"
+
+# VMware kernel module: vmhgfs
+name="vmware_guest_vmhgfs"
+rcvar=`set_rcvar`
+start_precmd="${checkvm_cmd}"
+start_cmd="vmware_guest_vmhgfs_start"
+stop_precmd="${checkvm_cmd}"
+stop_cmd=":"
+
+load_rc_config $name
+[ -z "$vmware_guest_vmhgfs_enable" ] && vmware_guest_vmhgfs_enable="NO"
+run_rc_command "$1"
diff --git a/emulators/open-vm-tools/pkg-plist b/emulators/open-vm-tools/pkg-plist
index 0e6a277f5fa3..46516fa87b73 100644
--- a/emulators/open-vm-tools/pkg-plist
+++ b/emulators/open-vm-tools/pkg-plist
@@ -7,11 +7,11 @@ etc/vmware-tools/tools.conf
 %%LIB32DIR%%/libguestlib.so
 %%LIB32DIR%%/libguestlib.so.0
 %%LIB32DIR%%/vmware-tools/modules/drivers/linker.hints
-%%NOTON5%%%%LIB32DIR%%/vmware-tools/modules/drivers/vmblock.ko
-%%NOTON5%%%%LIB32DIR%%/vmware-tools/modules/drivers/vmhgfs.ko
+%%LIB32DIR%%/vmware-tools/modules/drivers/vmblock.ko
+%%LIB32DIR%%/vmware-tools/modules/drivers/vmhgfs.ko
 %%LIB32DIR%%/vmware-tools/modules/drivers/vmmemctl.ko
 %%LIB32DIR%%/vmware-tools/modules/drivers/vmxnet.ko
-%%NOTON5%%sbin/mount_vmhgfs
+sbin/mount_vmhgfs
 sbin/vmware-guestd
 %%X11%%bin/vmware-toolbox
 %%X11%%bin/vmware-user