Finally fix problems with libdir: install vmware3 files to correct location

(maintainer timeout).

3 files changed, 336 insertions, 337 deletions

diff --git a/emulators/vmware3/Makefile b/emulators/vmware3/Makefile
index 4bc8acb6dbe3..e5f489e16b47 100644
--- a/emulators/vmware3/Makefile
+++ b/emulators/vmware3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	vmware3
 PORTVERSION=	3.2.1.2242
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	emulators linux
 MASTER_SITES=	http://www4.vmware.com/software/ \
@@ -49,7 +50,7 @@ MODULES=	vmmon vmnet
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 480102 
+.if ${OSVERSION} < 480102
 BROKEN=		"Systems prior to FreeBSD 480102 currently out of support"
 .endif
 
@@ -61,10 +62,6 @@ BROKEN=		"This software absolutely requires Linux procfs support"
 BROKEN=		"Kernel source files required"
 .endif
 
-.if exists(${WRKDIRPREFIX}${.CURDIR}/work/Makefile.inc.net)
-.include "${WRKDIRPREFIX}${.CURDIR}/work/Makefile.inc.net"
-.endif
-
 .if ${OSVERSION} < 500023
 VMNET1_MINOR=	0x00010001
 .else
@@ -75,7 +72,7 @@ SCRIPTS_ENV+=	LINUXBASE="${LINUXBASE}" \
 		VMNET_HOST_IP="${VMNET_HOST_IP}" \
 		VMNET_NETMASK="${VMNET_NETMASK}" \
 		VMNET1_MINOR="${VMNET1_MINOR}"
-MAKE_ARGS=	KMODDIR="${VMDIR}/lib/modules"
+MAKE_ARGS=	KMODDIR="${VMDIR}/modules"
 PLIST_SUB=	LINUXBASE="${LINUXBASE}" VMNET1_MINOR="${VMNET1_MINOR}"
 
 .if ${OSVERSION} < 500000
@@ -109,8 +106,8 @@ pre-patch:
 	@${MKDIR} ${WRKSRC}/vmnet-only/netbsd
 	@${MKDIR} ${WRKSRC}/vmmon-only/freebsd
 	@${MKDIR} ${WRKSRC}/vmmon-only/netbsd
-	@cd ${WRKSRC}/vmmon-only && patch -p1 < ${WRKDIR}/vmmon-only.diff
-	@cd ${WRKSRC} && patch < ${WRKDIR}/vmnet-only.diff
+	@cd ${WRKSRC}/vmmon-only && ${PATCH} -p1 < ${WRKDIR}/vmmon-only.diff
+	@cd ${WRKSRC} && ${PATCH} < ${WRKDIR}/vmnet-only.diff
 
 .if exists(/sys/compat/linux/linux_ioctl.h)
 	${PERL} -i -pe 's,i386(/linux/linux_ioctl\.h),compat$$1,' \
@@ -132,7 +129,7 @@ post-patch:
 	${CP} ${FILESDIR}/Makefile.vmmon ${WRKSRC}/vmmon-only/Makefile
 	${CP} ${FILESDIR}/Makefile.vmnet ${WRKSRC}/vmnet-only/Makefile
 .if ${OSVERSION} < 500000
-	${CAT} ${FILESDIR}/freebsd4.patch | (cd ${WRKSRC} && patch) > /dev/null 2>&1
+	${CAT} ${FILESDIR}/freebsd4.patch | (cd ${WRKSRC} && ${PATCH}) > /dev/null 2>&1
 .endif
 
 setoptions:
@@ -154,7 +151,7 @@ setoptions:
 
 pre-install: setoptions
 	${INSTALL_MAN} ${WRKSRC}/man/man1/vmware.1 ${MANPREFIX}/man/man1
-	${MKDIR} ${VMDIR}/lib/modules
+	${MKDIR} ${VMDIR}/modules
 
 	${MKDIR} ${PREFIX}/etc/vmware
 	${INSTALL_DATA} ${WRKDIR}/config ${PREFIX}/etc/vmware
@@ -177,39 +174,38 @@ pre-install: setoptions
 		${INSTALL_SCRIPT} $${file} ${VMDIR}/bin; \
 	done
 
-	${MKDIR} ${VMDIR}/lib/configurator
+	${MKDIR} ${VMDIR}/configurator
 	for file in ${WRKSRC}/lib/configurator/* ; do \
-		${INSTALL_DATA} $${file} ${VMDIR}/lib/configurator; \
+		${INSTALL_DATA} $${file} ${VMDIR}/configurator; \
 	done
 
-	${MKDIR} ${VMDIR}/lib/isoimages
+	${MKDIR} ${VMDIR}/isoimages
 	for file in ${WRKSRC}/lib/isoimages/* ; do \
-		${INSTALL_DATA} $${file} ${VMDIR}/lib/isoimages; \
+		${INSTALL_DATA} $${file} ${VMDIR}/isoimages; \
 	done
 
-	${MKDIR} ${VMDIR}/lib/licenses/site
-	${MKDIR} ${VMDIR}/lib/licenses/user
+	${MKDIR} ${VMDIR}/licenses/site
+	${MKDIR} ${VMDIR}/licenses/user
 	${INSTALL_DATA} -m 4555 ${WRKSRC}/lib/licenses/user/license.ws.3.0 \
-		${VMDIR}/lib/licenses/user
+		${VMDIR}/licenses/user
 	${INSTALL_SCRIPT} -m 4555 ${WRKSRC}/bin/vmware ${VMDIR}/bin
 	${INSTALL_SCRIPT} ${WRKDIR}/vmware ${PREFIX}/bin
-	${MKDIR} ${VMDIR}/lib
-	${INSTALL_DATA} ${WRKSRC}/lib/config ${VMDIR}/lib
-	${MKDIR} ${VMDIR}/lib/help
-	${INSTALL_DATA} ${WRKSRC}/lib/help/* ${VMDIR}/lib/help
-
-	${MKDIR} ${VMDIR}/lib/xkeymap
-	${INSTALL_DATA} ${WRKSRC}/lib/xkeymap/* ${VMDIR}/lib/xkeymap
-
-	${MKDIR} ${VMDIR}/lib/smb/codepages
-	${INSTALL_DATA} ${WRKSRC}/lib/smb/codepages/* ${VMDIR}/lib/smb/codepages
-
-	${MKDIR} ${VMDIR}/lib/messages/chef
-	${INSTALL_DATA} ${WRKSRC}/lib/messages/chef/* ${VMDIR}/lib/messages/chef
-	${MKDIR} ${VMDIR}/lib/messages/ja
-	${INSTALL_DATA} ${WRKSRC}/lib/messages/ja/* ${VMDIR}/lib/messages/ja
-	${MKDIR} ${VMDIR}/lib/messages/jive
-	${INSTALL_DATA} ${WRKSRC}/lib/messages/jive/* ${VMDIR}/lib/messages/jive
+	${INSTALL_DATA} ${WRKSRC}/lib/config ${VMDIR}
+	${MKDIR} ${VMDIR}/help
+	${INSTALL_DATA} ${WRKSRC}/lib/help/* ${VMDIR}/help
+
+	${MKDIR} ${VMDIR}/xkeymap
+	${INSTALL_DATA} ${WRKSRC}/lib/xkeymap/* ${VMDIR}/xkeymap
+
+	${MKDIR} ${VMDIR}/smb/codepages
+	${INSTALL_DATA} ${WRKSRC}/lib/smb/codepages/* ${VMDIR}/smb/codepages
+
+	${MKDIR} ${VMDIR}/messages/chef
+	${INSTALL_DATA} ${WRKSRC}/lib/messages/chef/* ${VMDIR}/messages/chef
+	${MKDIR} ${VMDIR}/messages/ja
+	${INSTALL_DATA} ${WRKSRC}/lib/messages/ja/* ${VMDIR}/messages/ja
+	${MKDIR} ${VMDIR}/messages/jive
+	${INSTALL_DATA} ${WRKSRC}/lib/messages/jive/* ${VMDIR}/messages/jive
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/vmware
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/vmware
@@ -231,3 +227,7 @@ pre-clean:
 .endif
 
 .include <bsd.port.post.mk>
+
+.if exists(${WRKDIR}/Makefile.inc.net)
+.include "${WRKDIR}/Makefile.inc.net"
+.endif
diff --git a/emulators/vmware3/files/vmware.sh b/emulators/vmware3/files/vmware.sh
index 475cc340a309..34689d16b011 100644
--- a/emulators/vmware3/files/vmware.sh
+++ b/emulators/vmware3/files/vmware.sh
@@ -45,8 +45,8 @@ exec >/dev/null
 
 case $1 in
 start)
-    kldstat -v | grep vmmon >/dev/null || kldload ${vmware_libdir}/lib/modules/vmmon_${suffix}.ko
-    kldstat -v | grep vmnet >/dev/null || kldload ${vmware_libdir}/lib/modules/vmnet.ko
+    kldstat -v | grep vmmon >/dev/null || kldload ${vmware_libdir}/modules/vmmon_${suffix}.ko
+    kldstat -v | grep vmnet >/dev/null || kldload ${vmware_libdir}/modules/vmnet.ko
     if [ $networking -eq 1 ]; then
 	kldstat -v | grep if_tap >/dev/null || kldload if_tap.ko
 	if [ ! -e $dev_vmnet1 ]; then
diff --git a/emulators/vmware3/pkg-plist b/emulators/vmware3/pkg-plist
index 81c468d6fd55..bbe0ab33a397 100644
--- a/emulators/vmware3/pkg-plist
+++ b/emulators/vmware3/pkg-plist
@@ -1,282 +1,282 @@
 bin/vmware
 etc/rc.d/vmware.sh
 etc/vmware/config
-lib/vmware/lib/modules/vmmon_smp.ko
-%%FREEBSD5%%lib/vmware/lib/modules/linker.hints
-lib/vmware/lib/modules/vmmon_up.ko
-lib/vmware/lib/modules/vmnet.ko
-lib/vmware/lib/config
-lib/vmware/lib/configurator/vmnet-dhcpd.conf
-lib/vmware/lib/configurator/vmnet-nat.conf
-lib/vmware/lib/configurator/vmnet-smb.conf
-lib/vmware/lib/isoimages/freebsd.iso
-lib/vmware/lib/isoimages/linux.iso
-lib/vmware/lib/isoimages/windows.iso
-lib/vmware/lib/xkeymap/be101
-lib/vmware/lib/xkeymap/be104
-lib/vmware/lib/xkeymap/chde101
-lib/vmware/lib/xkeymap/chde104
-lib/vmware/lib/xkeymap/chfr101
-lib/vmware/lib/xkeymap/chfr104
-lib/vmware/lib/xkeymap/de101
-lib/vmware/lib/xkeymap/de104
-lib/vmware/lib/xkeymap/dk101
-lib/vmware/lib/xkeymap/dk104
-lib/vmware/lib/xkeymap/es101
-lib/vmware/lib/xkeymap/es104
-lib/vmware/lib/xkeymap/fi101
-lib/vmware/lib/xkeymap/fi104
-lib/vmware/lib/xkeymap/fr101
-lib/vmware/lib/xkeymap/fr104
-lib/vmware/lib/xkeymap/gb101
-lib/vmware/lib/xkeymap/gb104
-lib/vmware/lib/xkeymap/is101
-lib/vmware/lib/xkeymap/is104
-lib/vmware/lib/xkeymap/it101
-lib/vmware/lib/xkeymap/it104
-lib/vmware/lib/xkeymap/jp106
-lib/vmware/lib/xkeymap/jp109
-lib/vmware/lib/xkeymap/no101
-lib/vmware/lib/xkeymap/no104
-lib/vmware/lib/xkeymap/pt101
-lib/vmware/lib/xkeymap/pt104
-lib/vmware/lib/xkeymap/se101
-lib/vmware/lib/xkeymap/se104
-lib/vmware/lib/xkeymap/us101
-lib/vmware/lib/xkeymap/us104
-lib/vmware/lib/help/PowerOff.gif
-lib/vmware/lib/help/PowerOn.gif
-lib/vmware/lib/help/PowerReset.gif
-lib/vmware/lib/help/Resume.gif
-lib/vmware/lib/help/Suspend.gif
-lib/vmware/lib/help/Wizcd.htm
-lib/vmware/lib/help/Wizcongrats.htm
-lib/vmware/lib/help/Wizdisk.htm
-lib/vmware/lib/help/Wizdisk3.htm
-lib/vmware/lib/help/WizdiskType.htm
-lib/vmware/lib/help/Wizfloppy.htm
-lib/vmware/lib/help/Wizguestkit.htm
-lib/vmware/lib/help/Wiznetwork.htm
-lib/vmware/lib/help/Wizos.htm
-lib/vmware/lib/help/Wizpath.htm
-lib/vmware/lib/help/about_this_help.htm
-lib/vmware/lib/help/commandref_linux.htm
-lib/vmware/lib/help/config_editor.htm
-lib/vmware/lib/help/config_editor_newvm.htm
-lib/vmware/lib/help/configvm.htm
-lib/vmware/lib/help/configvm_adv.htm
-lib/vmware/lib/help/configvm_automation.htm
-lib/vmware/lib/help/configvm_debug.htm
-lib/vmware/lib/help/configvm_disableaccel.htm
-lib/vmware/lib/help/configvm_display-problems.htm
-lib/vmware/lib/help/configvm_displayname.htm
-lib/vmware/lib/help/configvm_guestos.htm
-lib/vmware/lib/help/configvm_logs.htm
-lib/vmware/lib/help/configvm_memory.htm
-lib/vmware/lib/help/configvm_options.htm
-lib/vmware/lib/help/configvm_state.htm
-lib/vmware/lib/help/configvm_virtualdisk.htm
-lib/vmware/lib/help/configvmware-disablemem.htm
-lib/vmware/lib/help/configvmware-inputgrab.htm
-lib/vmware/lib/help/configvmware-maxmemory.htm
-lib/vmware/lib/help/configvmware-shift.htm
-lib/vmware/lib/help/configvmware.htm
-lib/vmware/lib/help/configvmware_copy_paste.htm
-lib/vmware/lib/help/devices.htm
-lib/vmware/lib/help/devices_autostart.htm
-lib/vmware/lib/help/devices_cdrom-changeconnect.htm
-lib/vmware/lib/help/devices_cdrom-disable.htm
-lib/vmware/lib/help/devices_cdrom-issues-linux.htm
-lib/vmware/lib/help/devices_cdrom-issues.htm
-lib/vmware/lib/help/devices_cdrom-removable.htm
-lib/vmware/lib/help/devices_cdrom-remove.htm
-lib/vmware/lib/help/devices_cdrom.htm
-lib/vmware/lib/help/devices_floppy.htm
-lib/vmware/lib/help/devices_floppy_changeconnect.htm
-lib/vmware/lib/help/devices_genscsi.htm
-lib/vmware/lib/help/devices_genscsi_linux.htm
-lib/vmware/lib/help/devices_modem.htm
-lib/vmware/lib/help/devices_mouse.htm
-lib/vmware/lib/help/devices_netadapter.htm
-lib/vmware/lib/help/devices_parallel-info.htm
-lib/vmware/lib/help/devices_parallel-onguestos.htm
-lib/vmware/lib/help/devices_parallel.htm
-lib/vmware/lib/help/devices_parallel_changeconnect.htm
-lib/vmware/lib/help/devices_pcmcia.htm
-lib/vmware/lib/help/devices_plaindisk-info.htm
-lib/vmware/lib/help/devices_plaindisk.htm
-lib/vmware/lib/help/devices_printer.htm
-lib/vmware/lib/help/devices_rawdisk.htm
-lib/vmware/lib/help/devices_remove_netadapter.htm
-lib/vmware/lib/help/devices_scanner.htm
-lib/vmware/lib/help/devices_scsi-bios.htm
-lib/vmware/lib/help/devices_scsi-guestos.htm
-lib/vmware/lib/help/devices_scsi.htm
-lib/vmware/lib/help/devices_scsi_info.htm
-lib/vmware/lib/help/devices_scsi_vs-ide.htm
-lib/vmware/lib/help/devices_serial.htm
-lib/vmware/lib/help/devices_sound-issues.htm
-lib/vmware/lib/help/devices_sound.htm
-lib/vmware/lib/help/devices_sound_changeconn.htm
-lib/vmware/lib/help/devices_usb-info.htm
-lib/vmware/lib/help/devices_usb.htm
-lib/vmware/lib/help/devices_video-linux-res.htm
-lib/vmware/lib/help/devices_video-linux.htm
-lib/vmware/lib/help/glossary.htm
-lib/vmware/lib/help/devices_video-win2000.htm
-lib/vmware/lib/help/devices_video-win95.htm
-lib/vmware/lib/help/devices_video-win98.htm
-lib/vmware/lib/help/devices_virtualdrive-consolidate.htm
-lib/vmware/lib/help/devices_virtualdrive-diskmode.htm
-lib/vmware/lib/help/devices_virtualdrive-virtualdisk-physical.htm
-lib/vmware/lib/help/devices_virtualdrive-virtualdisk-reuse.htm
-lib/vmware/lib/help/devices_virtualdrive-virtualdisk.htm
-lib/vmware/lib/help/devices_virtualdrive.htm
-lib/vmware/lib/help/devices_zipdrive.htm
-lib/vmware/lib/help/grab.htm
-lib/vmware/lib/help/guestos-corellinux.htm
-lib/vmware/lib/help/guestos-dos.htm
-lib/vmware/lib/help/guestos.htm
-lib/vmware/lib/help/guestos-freebsd.htm
-lib/vmware/lib/help/guestos-kit.htm
-lib/vmware/lib/help/guestos-mandrake-linux.htm
-lib/vmware/lib/help/guestos-mandrake-linux8081.htm
-lib/vmware/lib/help/guestos-mandrake-linux82.htm
-lib/vmware/lib/help/guestos-novell-4.htm
-lib/vmware/lib/help/guestos-novell-5.htm
-lib/vmware/lib/help/guestos-novell-6.htm
-lib/vmware/lib/help/guestos-novell-zenwrks.htm
-lib/vmware/lib/help/guestos-openlinux.htm
-lib/vmware/lib/help/guestos-rawdisk.htm
-lib/vmware/lib/help/guestos-redhat-linux.htm
-lib/vmware/lib/help/guestos-redhat-linux6.x.htm
-lib/vmware/lib/help/guestos-redhat-linux7.0.htm
-lib/vmware/lib/help/guestos-redhat-linux7.1.htm
-lib/vmware/lib/help/guestos-redhat-linux7.3.htm
-lib/vmware/lib/help/guestos-solaris7.htm
-lib/vmware/lib/help/guestos-suse-linux-6.x.htm
-lib/vmware/lib/help/guestos-suse-linux-7.0.htm
-lib/vmware/lib/help/guestos-suse-linux-7.1.htm
-lib/vmware/lib/help/guestos-suse-linux-8.0.htm
-lib/vmware/lib/help/guestos-suse-linux.htm
-lib/vmware/lib/help/guestos-turbolinux-6.0.htm
-lib/vmware/lib/help/guestos-turbolinux-7.0.htm
-lib/vmware/lib/help/guestos-turbolinux.htm
-lib/vmware/lib/help/guestos-win2000.htm
-lib/vmware/lib/help/guestos-win95.htm
-lib/vmware/lib/help/guestos-win98.htm
-lib/vmware/lib/help/guestos-winNETSvr.htm
-lib/vmware/lib/help/guestos-winXP.htm
-lib/vmware/lib/help/hotkey.htm
-lib/vmware/lib/help/guestos-winme.htm
-lib/vmware/lib/help/guestos-winnt.htm
-lib/vmware/lib/help/image001.gif
-lib/vmware/lib/help/index.htm
-lib/vmware/lib/help/install_apps.htm
-lib/vmware/lib/help/introduction.htm
-lib/vmware/lib/help/keyboard_issus.htm
-lib/vmware/lib/help/lock_files.htm
-lib/vmware/lib/help/memory.htm
-lib/vmware/lib/help/migratevm-toupgrade.htm
-lib/vmware/lib/help/migratevm-uninstall.htm
-lib/vmware/lib/help/migratevm-upgrade.htm
-lib/vmware/lib/help/migratevm.htm
-lib/vmware/lib/help/migratevm_buildno.htm
-lib/vmware/lib/help/migratevm_pc.htm
-lib/vmware/lib/help/migrating.htm
-lib/vmware/lib/help/movefiles.htm
-lib/vmware/lib/help/networking-components.htm
-lib/vmware/lib/help/newvm.htm
-lib/vmware/lib/help/networking-onguestos.htm
-lib/vmware/lib/help/networking-onhost.htm
-lib/vmware/lib/help/networking-promiscuous.htm
-lib/vmware/lib/help/networking.htm
-lib/vmware/lib/help/networking_assignip.htm
-lib/vmware/lib/help/networking_bridged-onguestos.htm
-lib/vmware/lib/help/networking_bridged-second.htm
-lib/vmware/lib/help/networking_bridged.htm
-lib/vmware/lib/help/networking_changing.htm
-lib/vmware/lib/help/networking_custom.htm
-lib/vmware/lib/help/networking_host-onguestos.htm
-lib/vmware/lib/help/networking_host-twointerfaces.htm
-lib/vmware/lib/help/networking_host.htm
-lib/vmware/lib/help/networking_host_ipleaks.htm
-lib/vmware/lib/help/perform.htm
-lib/vmware/lib/help/networking_host_issues-linux.htm
-lib/vmware/lib/help/networking_host_routing.htm
-lib/vmware/lib/help/networking_host_samba.htm
-lib/vmware/lib/help/networking_ipmasqerade.htm
-lib/vmware/lib/help/networking_ipmasqerade_firewallrh.htm
-lib/vmware/lib/help/networking_ipmasqerade_fwconfig.htm
-lib/vmware/lib/help/networking_macaddr.htm
-lib/vmware/lib/help/networking_nat.htm
-lib/vmware/lib/help/networking_nat_intro.htm
-lib/vmware/lib/help/networking_proxy.htm
-lib/vmware/lib/help/networking_wireless.htm
-lib/vmware/lib/help/newvm-diskpartition.htm
-lib/vmware/lib/help/newvm-diskpartition_access.htm
-lib/vmware/lib/help/newvm-dualboot-hdwr.htm
-lib/vmware/lib/help/newvm-diskpartition_hide.htm
-lib/vmware/lib/help/newvm-dualboot-scsi.htm
-lib/vmware/lib/help/newvm-dualboot.htm
-lib/vmware/lib/help/newvm-virtualdisk.htm
-lib/vmware/lib/help/newvm_wizard.htm
-lib/vmware/lib/help/newvm_wizard_process_cdrom.htm
-lib/vmware/lib/help/newvm_wizard_process_directory.htm
-lib/vmware/lib/help/newvm_wizard_process_disksize.htm
-lib/vmware/lib/help/newvm_wizard_process_disktype.htm
-lib/vmware/lib/help/newvm_wizard_process_floppy.htm
-lib/vmware/lib/help/newvm_wizard_process_guestos.htm
-lib/vmware/lib/help/newvm_wizard_process_network.htm
-lib/vmware/lib/help/perform-guestos-linux.htm
-lib/vmware/lib/help/toc.htm
-lib/vmware/lib/help/perform-guestos-win2000.htm
-lib/vmware/lib/help/perform-guestos-win95-98.htm
-lib/vmware/lib/help/perform-linuxhost.htm
-lib/vmware/lib/help/screensavers.htm
-lib/vmware/lib/help/serialnumber.htm
-lib/vmware/lib/help/sharefiles_hos_gos.htm
-lib/vmware/lib/help/sharevm.htm
-lib/vmware/lib/help/sizewin.htm
-lib/vmware/lib/help/sizewin_fullscreen.htm
-lib/vmware/lib/help/startvm.htm
-lib/vmware/lib/help/startvmware.htm
-lib/vmware/lib/help/statevm.htm
-lib/vmware/lib/help/statevm_off.htm
-lib/vmware/lib/help/statevm_on.htm
-lib/vmware/lib/help/statevm_repeat_resume.htm
-lib/vmware/lib/help/statevm_reset.htm
-lib/vmware/lib/help/statevm_resume.htm
-lib/vmware/lib/help/statevm_suspend.htm
-lib/vmware/lib/help/support.htm
-lib/vmware/lib/help/switching.htm
-lib/vmware/lib/help/sysreqs.htm
-lib/vmware/lib/help/user-permissions-linux.htm
-lib/vmware/lib/help/vm_common.htm
-lib/vmware/lib/help/vmtools-copypaste.htm
-lib/vmware/lib/help/vmtools-defrag.htm
-lib/vmware/lib/help/vmtools-shrink.htm
-lib/vmware/lib/help/vmtools.htm
-lib/vmware/lib/help/vmtools_install.htm
-lib/vmware/lib/help/vmtools_install_freebsd.htm
-lib/vmware/lib/help/vmtools_install_linux.htm
-lib/vmware/lib/help/vmtools_install_win.htm
-lib/vmware/lib/help/vmtools_prefs.htm
-lib/vmware/lib/help/whatsnew.htm
-lib/vmware/lib/help/CUSTOM-NETWORK.gif
-lib/vmware/lib/help/ConfigWiz.htm
-lib/vmware/lib/help/FullScreen.gif
-lib/vmware/lib/help/Help.gif
+lib/vmware/modules/vmmon_smp.ko
+%%FREEBSD5%%lib/vmware/modules/linker.hints
+lib/vmware/modules/vmmon_up.ko
+lib/vmware/modules/vmnet.ko
+lib/vmware/config
+lib/vmware/configurator/vmnet-dhcpd.conf
+lib/vmware/configurator/vmnet-nat.conf
+lib/vmware/configurator/vmnet-smb.conf
+lib/vmware/isoimages/freebsd.iso
+lib/vmware/isoimages/linux.iso
+lib/vmware/isoimages/windows.iso
+lib/vmware/xkeymap/be101
+lib/vmware/xkeymap/be104
+lib/vmware/xkeymap/chde101
+lib/vmware/xkeymap/chde104
+lib/vmware/xkeymap/chfr101
+lib/vmware/xkeymap/chfr104
+lib/vmware/xkeymap/de101
+lib/vmware/xkeymap/de104
+lib/vmware/xkeymap/dk101
+lib/vmware/xkeymap/dk104
+lib/vmware/xkeymap/es101
+lib/vmware/xkeymap/es104
+lib/vmware/xkeymap/fi101
+lib/vmware/xkeymap/fi104
+lib/vmware/xkeymap/fr101
+lib/vmware/xkeymap/fr104
+lib/vmware/xkeymap/gb101
+lib/vmware/xkeymap/gb104
+lib/vmware/xkeymap/is101
+lib/vmware/xkeymap/is104
+lib/vmware/xkeymap/it101
+lib/vmware/xkeymap/it104
+lib/vmware/xkeymap/jp106
+lib/vmware/xkeymap/jp109
+lib/vmware/xkeymap/no101
+lib/vmware/xkeymap/no104
+lib/vmware/xkeymap/pt101
+lib/vmware/xkeymap/pt104
+lib/vmware/xkeymap/se101
+lib/vmware/xkeymap/se104
+lib/vmware/xkeymap/us101
+lib/vmware/xkeymap/us104
+lib/vmware/help/PowerOff.gif
+lib/vmware/help/PowerOn.gif
+lib/vmware/help/PowerReset.gif
+lib/vmware/help/Resume.gif
+lib/vmware/help/Suspend.gif
+lib/vmware/help/Wizcd.htm
+lib/vmware/help/Wizcongrats.htm
+lib/vmware/help/Wizdisk.htm
+lib/vmware/help/Wizdisk3.htm
+lib/vmware/help/WizdiskType.htm
+lib/vmware/help/Wizfloppy.htm
+lib/vmware/help/Wizguestkit.htm
+lib/vmware/help/Wiznetwork.htm
+lib/vmware/help/Wizos.htm
+lib/vmware/help/Wizpath.htm
+lib/vmware/help/about_this_help.htm
+lib/vmware/help/commandref_linux.htm
+lib/vmware/help/config_editor.htm
+lib/vmware/help/config_editor_newvm.htm
+lib/vmware/help/configvm.htm
+lib/vmware/help/configvm_adv.htm
+lib/vmware/help/configvm_automation.htm
+lib/vmware/help/configvm_debug.htm
+lib/vmware/help/configvm_disableaccel.htm
+lib/vmware/help/configvm_display-problems.htm
+lib/vmware/help/configvm_displayname.htm
+lib/vmware/help/configvm_guestos.htm
+lib/vmware/help/configvm_logs.htm
+lib/vmware/help/configvm_memory.htm
+lib/vmware/help/configvm_options.htm
+lib/vmware/help/configvm_state.htm
+lib/vmware/help/configvm_virtualdisk.htm
+lib/vmware/help/configvmware-disablemem.htm
+lib/vmware/help/configvmware-inputgrab.htm
+lib/vmware/help/configvmware-maxmemory.htm
+lib/vmware/help/configvmware-shift.htm
+lib/vmware/help/configvmware.htm
+lib/vmware/help/configvmware_copy_paste.htm
+lib/vmware/help/devices.htm
+lib/vmware/help/devices_autostart.htm
+lib/vmware/help/devices_cdrom-changeconnect.htm
+lib/vmware/help/devices_cdrom-disable.htm
+lib/vmware/help/devices_cdrom-issues-linux.htm
+lib/vmware/help/devices_cdrom-issues.htm
+lib/vmware/help/devices_cdrom-removable.htm
+lib/vmware/help/devices_cdrom-remove.htm
+lib/vmware/help/devices_cdrom.htm
+lib/vmware/help/devices_floppy.htm
+lib/vmware/help/devices_floppy_changeconnect.htm
+lib/vmware/help/devices_genscsi.htm
+lib/vmware/help/devices_genscsi_linux.htm
+lib/vmware/help/devices_modem.htm
+lib/vmware/help/devices_mouse.htm
+lib/vmware/help/devices_netadapter.htm
+lib/vmware/help/devices_parallel-info.htm
+lib/vmware/help/devices_parallel-onguestos.htm
+lib/vmware/help/devices_parallel.htm
+lib/vmware/help/devices_parallel_changeconnect.htm
+lib/vmware/help/devices_pcmcia.htm
+lib/vmware/help/devices_plaindisk-info.htm
+lib/vmware/help/devices_plaindisk.htm
+lib/vmware/help/devices_printer.htm
+lib/vmware/help/devices_rawdisk.htm
+lib/vmware/help/devices_remove_netadapter.htm
+lib/vmware/help/devices_scanner.htm
+lib/vmware/help/devices_scsi-bios.htm
+lib/vmware/help/devices_scsi-guestos.htm
+lib/vmware/help/devices_scsi.htm
+lib/vmware/help/devices_scsi_info.htm
+lib/vmware/help/devices_scsi_vs-ide.htm
+lib/vmware/help/devices_serial.htm
+lib/vmware/help/devices_sound-issues.htm
+lib/vmware/help/devices_sound.htm
+lib/vmware/help/devices_sound_changeconn.htm
+lib/vmware/help/devices_usb-info.htm
+lib/vmware/help/devices_usb.htm
+lib/vmware/help/devices_video-linux-res.htm
+lib/vmware/help/devices_video-linux.htm
+lib/vmware/help/glossary.htm
+lib/vmware/help/devices_video-win2000.htm
+lib/vmware/help/devices_video-win95.htm
+lib/vmware/help/devices_video-win98.htm
+lib/vmware/help/devices_virtualdrive-consolidate.htm
+lib/vmware/help/devices_virtualdrive-diskmode.htm
+lib/vmware/help/devices_virtualdrive-virtualdisk-physical.htm
+lib/vmware/help/devices_virtualdrive-virtualdisk-reuse.htm
+lib/vmware/help/devices_virtualdrive-virtualdisk.htm
+lib/vmware/help/devices_virtualdrive.htm
+lib/vmware/help/devices_zipdrive.htm
+lib/vmware/help/grab.htm
+lib/vmware/help/guestos-corellinux.htm
+lib/vmware/help/guestos-dos.htm
+lib/vmware/help/guestos.htm
+lib/vmware/help/guestos-freebsd.htm
+lib/vmware/help/guestos-kit.htm
+lib/vmware/help/guestos-mandrake-linux.htm
+lib/vmware/help/guestos-mandrake-linux8081.htm
+lib/vmware/help/guestos-mandrake-linux82.htm
+lib/vmware/help/guestos-novell-4.htm
+lib/vmware/help/guestos-novell-5.htm
+lib/vmware/help/guestos-novell-6.htm
+lib/vmware/help/guestos-novell-zenwrks.htm
+lib/vmware/help/guestos-openlinux.htm
+lib/vmware/help/guestos-rawdisk.htm
+lib/vmware/help/guestos-redhat-linux.htm
+lib/vmware/help/guestos-redhat-linux6.x.htm
+lib/vmware/help/guestos-redhat-linux7.0.htm
+lib/vmware/help/guestos-redhat-linux7.1.htm
+lib/vmware/help/guestos-redhat-linux7.3.htm
+lib/vmware/help/guestos-solaris7.htm
+lib/vmware/help/guestos-suse-linux-6.x.htm
+lib/vmware/help/guestos-suse-linux-7.0.htm
+lib/vmware/help/guestos-suse-linux-7.1.htm
+lib/vmware/help/guestos-suse-linux-8.0.htm
+lib/vmware/help/guestos-suse-linux.htm
+lib/vmware/help/guestos-turbolinux-6.0.htm
+lib/vmware/help/guestos-turbolinux-7.0.htm
+lib/vmware/help/guestos-turbolinux.htm
+lib/vmware/help/guestos-win2000.htm
+lib/vmware/help/guestos-win95.htm
+lib/vmware/help/guestos-win98.htm
+lib/vmware/help/guestos-winNETSvr.htm
+lib/vmware/help/guestos-winXP.htm
+lib/vmware/help/hotkey.htm
+lib/vmware/help/guestos-winme.htm
+lib/vmware/help/guestos-winnt.htm
+lib/vmware/help/image001.gif
+lib/vmware/help/index.htm
+lib/vmware/help/install_apps.htm
+lib/vmware/help/introduction.htm
+lib/vmware/help/keyboard_issus.htm
+lib/vmware/help/lock_files.htm
+lib/vmware/help/memory.htm
+lib/vmware/help/migratevm-toupgrade.htm
+lib/vmware/help/migratevm-uninstall.htm
+lib/vmware/help/migratevm-upgrade.htm
+lib/vmware/help/migratevm.htm
+lib/vmware/help/migratevm_buildno.htm
+lib/vmware/help/migratevm_pc.htm
+lib/vmware/help/migrating.htm
+lib/vmware/help/movefiles.htm
+lib/vmware/help/networking-components.htm
+lib/vmware/help/newvm.htm
+lib/vmware/help/networking-onguestos.htm
+lib/vmware/help/networking-onhost.htm
+lib/vmware/help/networking-promiscuous.htm
+lib/vmware/help/networking.htm
+lib/vmware/help/networking_assignip.htm
+lib/vmware/help/networking_bridged-onguestos.htm
+lib/vmware/help/networking_bridged-second.htm
+lib/vmware/help/networking_bridged.htm
+lib/vmware/help/networking_changing.htm
+lib/vmware/help/networking_custom.htm
+lib/vmware/help/networking_host-onguestos.htm
+lib/vmware/help/networking_host-twointerfaces.htm
+lib/vmware/help/networking_host.htm
+lib/vmware/help/networking_host_ipleaks.htm
+lib/vmware/help/perform.htm
+lib/vmware/help/networking_host_issues-linux.htm
+lib/vmware/help/networking_host_routing.htm
+lib/vmware/help/networking_host_samba.htm
+lib/vmware/help/networking_ipmasqerade.htm
+lib/vmware/help/networking_ipmasqerade_firewallrh.htm
+lib/vmware/help/networking_ipmasqerade_fwconfig.htm
+lib/vmware/help/networking_macaddr.htm
+lib/vmware/help/networking_nat.htm
+lib/vmware/help/networking_nat_intro.htm
+lib/vmware/help/networking_proxy.htm
+lib/vmware/help/networking_wireless.htm
+lib/vmware/help/newvm-diskpartition.htm
+lib/vmware/help/newvm-diskpartition_access.htm
+lib/vmware/help/newvm-dualboot-hdwr.htm
+lib/vmware/help/newvm-diskpartition_hide.htm
+lib/vmware/help/newvm-dualboot-scsi.htm
+lib/vmware/help/newvm-dualboot.htm
+lib/vmware/help/newvm-virtualdisk.htm
+lib/vmware/help/newvm_wizard.htm
+lib/vmware/help/newvm_wizard_process_cdrom.htm
+lib/vmware/help/newvm_wizard_process_directory.htm
+lib/vmware/help/newvm_wizard_process_disksize.htm
+lib/vmware/help/newvm_wizard_process_disktype.htm
+lib/vmware/help/newvm_wizard_process_floppy.htm
+lib/vmware/help/newvm_wizard_process_guestos.htm
+lib/vmware/help/newvm_wizard_process_network.htm
+lib/vmware/help/perform-guestos-linux.htm
+lib/vmware/help/toc.htm
+lib/vmware/help/perform-guestos-win2000.htm
+lib/vmware/help/perform-guestos-win95-98.htm
+lib/vmware/help/perform-linuxhost.htm
+lib/vmware/help/screensavers.htm
+lib/vmware/help/serialnumber.htm
+lib/vmware/help/sharefiles_hos_gos.htm
+lib/vmware/help/sharevm.htm
+lib/vmware/help/sizewin.htm
+lib/vmware/help/sizewin_fullscreen.htm
+lib/vmware/help/startvm.htm
+lib/vmware/help/startvmware.htm
+lib/vmware/help/statevm.htm
+lib/vmware/help/statevm_off.htm
+lib/vmware/help/statevm_on.htm
+lib/vmware/help/statevm_repeat_resume.htm
+lib/vmware/help/statevm_reset.htm
+lib/vmware/help/statevm_resume.htm
+lib/vmware/help/statevm_suspend.htm
+lib/vmware/help/support.htm
+lib/vmware/help/switching.htm
+lib/vmware/help/sysreqs.htm
+lib/vmware/help/user-permissions-linux.htm
+lib/vmware/help/vm_common.htm
+lib/vmware/help/vmtools-copypaste.htm
+lib/vmware/help/vmtools-defrag.htm
+lib/vmware/help/vmtools-shrink.htm
+lib/vmware/help/vmtools.htm
+lib/vmware/help/vmtools_install.htm
+lib/vmware/help/vmtools_install_freebsd.htm
+lib/vmware/help/vmtools_install_linux.htm
+lib/vmware/help/vmtools_install_win.htm
+lib/vmware/help/vmtools_prefs.htm
+lib/vmware/help/whatsnew.htm
+lib/vmware/help/CUSTOM-NETWORK.gif
+lib/vmware/help/ConfigWiz.htm
+lib/vmware/help/FullScreen.gif
+lib/vmware/help/Help.gif
 lib/vmware/bin/df
-lib/vmware/lib/messages/chef/vmware-mks.vmsg
-lib/vmware/lib/messages/chef/vmware-ui.vmsg
-lib/vmware/lib/messages/chef/vmware.vmsg
-lib/vmware/lib/messages/ja/vmware-mks.vmsg
-lib/vmware/lib/messages/ja/vmware-ui.vmsg
-lib/vmware/lib/messages/ja/vmware.vmsg
-lib/vmware/lib/messages/jive/vmware-mks.vmsg
-lib/vmware/lib/messages/jive/vmware-ui.vmsg
-lib/vmware/lib/messages/jive/vmware.vmsg
+lib/vmware/messages/chef/vmware-mks.vmsg
+lib/vmware/messages/chef/vmware-ui.vmsg
+lib/vmware/messages/chef/vmware.vmsg
+lib/vmware/messages/ja/vmware-mks.vmsg
+lib/vmware/messages/ja/vmware-ui.vmsg
+lib/vmware/messages/ja/vmware.vmsg
+lib/vmware/messages/jive/vmware-mks.vmsg
+lib/vmware/messages/jive/vmware-ui.vmsg
+lib/vmware/messages/jive/vmware.vmsg
 lib/vmware/bin/vmware-config.pl
 lib/vmware/bin/vmware-uninstall.pl
 lib/vmware/bin/vmnet-bridge
@@ -293,17 +293,17 @@ lib/vmware/bin/vmware-nmbd
 lib/vmware/bin/vmware-smbd
 lib/vmware/bin/vmware-smbpasswd
 lib/vmware/bin/vmware-smbpasswd.bin
-lib/vmware/lib/licenses/user/license.ws.3.0
-lib/vmware/lib/smb/codepages/codepage.437
-lib/vmware/lib/smb/codepages/codepage.737
-lib/vmware/lib/smb/codepages/codepage.850
-lib/vmware/lib/smb/codepages/codepage.852
-lib/vmware/lib/smb/codepages/codepage.861
-lib/vmware/lib/smb/codepages/codepage.866
-lib/vmware/lib/smb/codepages/codepage.932
-lib/vmware/lib/smb/codepages/codepage.936
-lib/vmware/lib/smb/codepages/codepage.949
-lib/vmware/lib/smb/codepages/codepage.950
+lib/vmware/licenses/user/license.ws.3.0
+lib/vmware/smb/codepages/codepage.437
+lib/vmware/smb/codepages/codepage.737
+lib/vmware/smb/codepages/codepage.850
+lib/vmware/smb/codepages/codepage.852
+lib/vmware/smb/codepages/codepage.861
+lib/vmware/smb/codepages/codepage.866
+lib/vmware/smb/codepages/codepage.932
+lib/vmware/smb/codepages/codepage.936
+lib/vmware/smb/codepages/codepage.949
+lib/vmware/smb/codepages/codepage.950
 share/doc/vmware/Hints.FreeBSD
 share/doc/vmware/README.FreeBSD
 share/doc/vmware/open_source_licenses.txt
@@ -323,20 +323,19 @@ share/doc/vmware/README
 @unexec rm -f %%LINUXBASE%%/etc/vmware %%LINUXBASE%%/dev/vmmon %%LINUXBASE%%/dev/vmnet1 %%LINUXBASE%%/bin/df %%LINUXBASE%%/dev/tty[0-9]* %%LINUXBASE%%/dev/hd? %%LINUXBASE%%/dev/null
 @dirrm etc/vmware
 @dirrm lib/vmware/bin
-@dirrm lib/vmware/lib/help
-@dirrm lib/vmware/lib/modules
-@dirrm lib/vmware/lib/xkeymap
-@dirrm lib/vmware/lib/configurator
-@dirrm lib/vmware/lib/isoimages
-@dirrm lib/vmware/lib/licenses/site
-@dirrm lib/vmware/lib/licenses/user
-@dirrm lib/vmware/lib/licenses
-@dirrm lib/vmware/lib/messages/chef
-@dirrm lib/vmware/lib/messages/jive
-@dirrm lib/vmware/lib/messages/ja
-@dirrm lib/vmware/lib/messages
-@dirrm lib/vmware/lib/smb/codepages
-@dirrm lib/vmware/lib/smb
-@dirrm lib/vmware/lib
+@dirrm lib/vmware/help
+@dirrm lib/vmware/modules
+@dirrm lib/vmware/xkeymap
+@dirrm lib/vmware/configurator
+@dirrm lib/vmware/isoimages
+@dirrm lib/vmware/licenses/site
+@dirrm lib/vmware/licenses/user
+@dirrm lib/vmware/licenses
+@dirrm lib/vmware/messages/chef
+@dirrm lib/vmware/messages/jive
+@dirrm lib/vmware/messages/ja
+@dirrm lib/vmware/messages
+@dirrm lib/vmware/smb/codepages
+@dirrm lib/vmware/smb
 @dirrm lib/vmware
 @dirrm share/doc/vmware