Install ${PREFIX}/bin/vmware as a shell script which sets some

environment variables properly to run VMware, instead of installing it
as a symbolic link to ${PREFIX}/lib/vmware/bin/vmware.

Suggested by:	Frank Mayhar <frank@exit.com>

Add $FreeBSD$ on the top of the Hints.FreeBSD file.

Add a link to the official VMware Product FAQ page.

6 files changed, 38 insertions, 4 deletions

diff --git a/emulators/vmware2/Makefile b/emulators/vmware2/Makefile
index deb68861d206..ee9f2c7e8912 100644
--- a/emulators/vmware2/Makefile
+++ b/emulators/vmware2/Makefile
@@ -75,6 +75,9 @@ setoptions:
 		-e 's;@@NETMASK@@;${VMNET_NETMASK};' \
 		${FILESDIR}/vmware.sh > ${WRKDIR}/vmware.sh
 
+	${SED} 	-e 's;@@PREFIX@@;${PREFIX};' \
+		${FILESDIR}/vmware > ${WRKDIR}/vmware
+
 pre-install: setoptions
 	${INSTALL_MAN} ${WRKSRC}/man/man1/vmware.1 ${MANPREFIX}/man/man1
 	${MKDIR} ${VMDIR}/lib/modules
@@ -95,7 +98,7 @@ pre-install: setoptions
 		${INSTALL_SCRIPT} ${WRKSRC}/bin/$${i} ${VMDIR}/bin; \
 	done
 	${INSTALL_SCRIPT} -m 4555 ${WRKSRC}/bin/vmware ${VMDIR}/bin
-	${LN} -s ${VMDIR}/bin/vmware ${PREFIX}/bin/
+	${INSTALL_SCRIPT} ${WRKDIR}/vmware ${PREFIX}/bin
 	${MKDIR} ${VMDIR}/lib
 	${INSTALL_DATA} ${WRKSRC}/lib/config ${VMDIR}/lib
 	${MKDIR} ${VMDIR}/lib/floppies
diff --git a/emulators/vmware2/files/Hints.FreeBSD b/emulators/vmware2/files/Hints.FreeBSD
index fabfa0241c7b..63617d56341f 100644
--- a/emulators/vmware2/files/Hints.FreeBSD
+++ b/emulators/vmware2/files/Hints.FreeBSD
@@ -1,3 +1,5 @@
+$FreeBSD$
+
 Here is a list of some useful hints on using VMware on FreeBSD.
 
 - Full screen text mode does not work.  Don't ever do it!
@@ -87,6 +89,8 @@ MFS can lead to deadlocks.
 
 - Don't miss the VMware FAQ available on the official site.
 
+	http://www.vmware.com/products/productfaq.html
+
 -- 
 Akinori -Aki- MUSHA <knu@idaemons.org>
-Nick Sayer <nsayer@freebsd.org>
+Nick Sayer <nsayer@FreeBSD.org>
diff --git a/emulators/vmware2/files/vmware b/emulators/vmware2/files/vmware
new file mode 100644
index 000000000000..3316e44eaa0c
--- /dev/null
+++ b/emulators/vmware2/files/vmware
@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+# Run vmware
+#
+# $FreeBSD$
+
+LANG=C
+PATH=/bin:$PATH
+
+@@PREFIX@@/lib/vmware/bin/vmware
diff --git a/emulators/vmware3/Makefile b/emulators/vmware3/Makefile
index deb68861d206..ee9f2c7e8912 100644
--- a/emulators/vmware3/Makefile
+++ b/emulators/vmware3/Makefile
@@ -75,6 +75,9 @@ setoptions:
 		-e 's;@@NETMASK@@;${VMNET_NETMASK};' \
 		${FILESDIR}/vmware.sh > ${WRKDIR}/vmware.sh
 
+	${SED} 	-e 's;@@PREFIX@@;${PREFIX};' \
+		${FILESDIR}/vmware > ${WRKDIR}/vmware
+
 pre-install: setoptions
 	${INSTALL_MAN} ${WRKSRC}/man/man1/vmware.1 ${MANPREFIX}/man/man1
 	${MKDIR} ${VMDIR}/lib/modules
@@ -95,7 +98,7 @@ pre-install: setoptions
 		${INSTALL_SCRIPT} ${WRKSRC}/bin/$${i} ${VMDIR}/bin; \
 	done
 	${INSTALL_SCRIPT} -m 4555 ${WRKSRC}/bin/vmware ${VMDIR}/bin
-	${LN} -s ${VMDIR}/bin/vmware ${PREFIX}/bin/
+	${INSTALL_SCRIPT} ${WRKDIR}/vmware ${PREFIX}/bin
 	${MKDIR} ${VMDIR}/lib
 	${INSTALL_DATA} ${WRKSRC}/lib/config ${VMDIR}/lib
 	${MKDIR} ${VMDIR}/lib/floppies
diff --git a/emulators/vmware3/files/Hints.FreeBSD b/emulators/vmware3/files/Hints.FreeBSD
index fabfa0241c7b..63617d56341f 100644
--- a/emulators/vmware3/files/Hints.FreeBSD
+++ b/emulators/vmware3/files/Hints.FreeBSD
@@ -1,3 +1,5 @@
+$FreeBSD$
+
 Here is a list of some useful hints on using VMware on FreeBSD.
 
 - Full screen text mode does not work.  Don't ever do it!
@@ -87,6 +89,8 @@ MFS can lead to deadlocks.
 
 - Don't miss the VMware FAQ available on the official site.
 
+	http://www.vmware.com/products/productfaq.html
+
 -- 
 Akinori -Aki- MUSHA <knu@idaemons.org>
-Nick Sayer <nsayer@freebsd.org>
+Nick Sayer <nsayer@FreeBSD.org>
diff --git a/emulators/vmware3/files/vmware b/emulators/vmware3/files/vmware
new file mode 100644
index 000000000000..3316e44eaa0c
--- /dev/null
+++ b/emulators/vmware3/files/vmware
@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+# Run vmware
+#
+# $FreeBSD$
+
+LANG=C
+PATH=/bin:$PATH
+
+@@PREFIX@@/lib/vmware/bin/vmware