Make this thing acutally portlint(1) and come close our Ports Collection

coding style.

[billf contributed to the Makefile cleanup]

Forgotten by:	initial committer

7 files changed, 46 insertions, 57 deletions

diff --git a/emulators/vmware/Makefile b/emulators/vmware/Makefile
index 824f06788f13..be23c9f10ffc 100644
--- a/emulators/vmware/Makefile
+++ b/emulators/vmware/Makefile
@@ -3,26 +3,13 @@
 # Date created:         Fri 26 Nov 19:16:47 EST 1999
 # Whom:                 vns@delta.odessa.ua
 #
-# $FreeBSD$
 # $vmFreeBSD: vmware/vmmon-only/freebsd/port/Makefile,v 1.8 1999/12/17 00:38:27 vsilyaev Exp $
+# $FreeBSD$
 #
 
-VERSION=	1.1.2
-BUILD=		364
-VMMON_FREEBSD_VERSION = 0.94
-VMNET_FREEBSD_VERSION = 0.10
-LINUX_DIR=	/compat/linux
-
+DISTNAME=       VMware-1.1.2-364
+PKGNAME=        vmware-1.1.2
 CATEGORIES=	emulators
-MAINTAINER=	vns@delta.odessa.ua
-ONLY_FOR_ARCHS= i386
-RUN_DEPENDS=    ${LINUX_DIR}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
-USE_XLIB=	yes
-VMWARE_BINMODE=	4555
-
-
-DISTNAME=       VMware-${VERSION}-${BUILD}
-PKGNAME=        vmware-${VERSION}
 MASTER_SITES=	http://www4.vmware.com/software/ \
 		http://vmware-svca.www.conxion.com/software/ \
 		http://vmware-chil.www.conxion.com/software/ \
@@ -31,15 +18,23 @@ MASTER_SITES=	http://www4.vmware.com/software/ \
 		http://mirror.aarnet.edu.au/pub/vmware/software/ \
 		ftp://mirror.aarnet.edu.au/pub/vmware/software/
 
-WRKSRC=		${WRKDIR}/vmware-distrib 
-
-VMMON_PATCH=	vmmon-freebsd-${VMMON_FREEBSD_VERSION}.tar.gz \
-		vmnet-freebsd-${VMNET_FREEBSD_VERSION}.tar.gz
 PATCH_SITES=	http://www.mindspring.com/~vsilyaev/vmware/files/ \
 		ftp://mirror.aarnet.edu.au/pub/vmware/freebsd/ \
 		http://mirror.aarnet.edu.au/pub/vmware/freebsd/
-		
-PATCHFILES=	${VMMON_PATCH}
+PATCHFILES=	vmmon-freebsd-0.94.tar.gz \
+		vmnet-freebsd-0.10.tar.gz
+
+MAINTAINER=	vns@delta.odessa.ua
+
+RUN_DEPENDS=    ${LINUX_DIR}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
+
+IS_INTERACTIVE=	yes	# vmnet-freebsd-* querries user for network settings
+
+ONLY_FOR_ARCHS= i386
+USE_XLIB=	yes
+WRKSRC=		${WRKDIR}/vmware-distrib
+LINUX_DIR=	/compat/linux
+MAN1=		vmware.1
 
 .include <bsd.port.pre.mk>
 
@@ -55,59 +50,55 @@ BROKEN=	YES
 .include "${MASTERDIR}/Makefile.inc.linproc"
 .endif
 
-VMSUBDIR=lib/vmware
-VMDIR=${PREFIX}/${VMSUBDIR}
-SCRIPTS_ENV+=LINUX_DIR=${LINUX_DIR} \
+VMSUBDIR=	lib/vmware
+VMDIR=		${PREFIX}/${VMSUBDIR}
+SCRIPTS_ENV+=	LINUX_DIR=${LINUX_DIR} \
 		VMNET_HOST_IP=${VMNET_HOST_IP} \
 		VMNET_NETMASK=${VMNET_NETMASK}
 
-MAKE_ARGS="KMODDIR=${VMDIR}/lib/modules"
+MAKE_ARGS=	"KMODDIR=${VMDIR}/lib/modules"
 
-#
 # Small hack for alternate processing patchfiles
-#
-GZCAT=${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/extract 
-
-MAN1= vmware.1
+GZCAT=		${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/extract
 
 post-patch:
 	@${CP} ${FILESDIR}/Makefile ${WRKSRC}
-	
+
 setoptions:
 	${SED} -e 's;@@PREFIX@@;${PREFIX};' ${FILESDIR}/vmware > ${WRKDIR}/vmware
-	${SED} -e 's;@@PREFIX@@;${PREFIX};' \
-	-e 's;@@HOST_IP@@;${VMNET_HOST_IP};' \
-	-e 's;@@NETMASK@@;${VMNET_NETMASK};' \
+	${SED}  -e 's;@@PREFIX@@;${PREFIX};' \
+		-e 's;@@HOST_IP@@;${VMNET_HOST_IP};' \
+		-e 's;@@NETMASK@@;${VMNET_NETMASK};' \
 	${FILESDIR}/config > ${WRKDIR}/config
 
-	${SED} -e 's;@@PREFIX@@;${PREFIX};' \
-	-e 's;@@NETWORKING@@;${VMNET_NETWORKING};' \
-	-e 's;@@HOST_IP@@;${VMNET_HOST_IP};' \
-	-e 's;@@NETMASK@@;${VMNET_NETMASK};' \
-	${FILESDIR}/vmware.sh> ${WRKDIR}/vmware.sh
-	
+	${SED}  -e 's;@@PREFIX@@;${PREFIX};' \
+		-e 's;@@NETWORKING@@;${VMNET_NETWORKING};' \
+		-e 's;@@HOST_IP@@;${VMNET_HOST_IP};' \
+		-e 's;@@NETMASK@@;${VMNET_NETMASK};' \
+		${FILESDIR}/vmware.sh > ${WRKDIR}/vmware.sh
+
 pre-install: setoptions
 	${INSTALL_MAN} ${WRKSRC}/man/man1/vmware.1 ${MANPREFIX}/man/man1
 	${MKDIR} ${VMDIR}/lib/modules
-	
+
 	${MKDIR} ${PREFIX}/etc/vmware
 	${INSTALL_DATA} ${WRKDIR}/config ${PREFIX}/etc/vmware
-	
+
 	${INSTALL_SCRIPT} ${WRKDIR}/vmware.sh ${PREFIX}/etc/rc.d
 
 	${MKDIR} ${VMDIR}/bin
 	${INSTALL_SCRIPT} ${FILESDIR}/fakeprocfs.sh ${VMDIR}/bin
-	${INSTALL_SCRIPT} ${FILESDIR}/df ${VMDIR}/bin 
+	${INSTALL_SCRIPT} ${FILESDIR}/df ${VMDIR}/bin
 	[ -f ${LINUX_DIR}/bin/df ] || ${LN} -s ${VMDIR}/bin/df ${LINUX_DIR}/bin/
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/*.pl ${VMDIR}/bin
 	for i in \
 		 vmnet-bridge vmnet-dhcpd vmnet-sniffer \
 		 vmware-loop vmware-ping vmware-wizard \
 		 ; do \
-	 ${INSTALL_SCRIPT} ${WRKSRC}/bin/$${i} ${VMDIR}/bin; \
+	    ${INSTALL_SCRIPT} ${WRKSRC}/bin/$${i} ${VMDIR}/bin; \
 	done
 .if defined(USE_LINPROC)
-	${INSTALL_SCRIPT} -m ${VMWARE_BINMODE} ${WRKSRC}/bin/vmware ${VMDIR}/bin
+	${INSTALL_SCRIPT} -m 4555 ${WRKSRC}/bin/vmware ${VMDIR}/bin
 	${LN} -s ${VMDIR}/bin/vmware ${PREFIX}/bin/
 .else
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/vmware ${VMDIR}/bin
@@ -124,9 +115,8 @@ pre-install: setoptions
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/vmware
 	${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${PREFIX}/share/doc/vmware
 .endif
-	
+
 post-install:
 	${LN} -s ${PREFIX}/etc/vmware /etc/vmware
 
 .include <bsd.port.post.mk>
-
diff --git a/emulators/vmware/files/Makefile b/emulators/vmware/files/Makefile
index 600b81821441..24156b4e18e7 100644
--- a/emulators/vmware/files/Makefile
+++ b/emulators/vmware/files/Makefile
@@ -1,4 +1,3 @@
 SUBDIR= vmmon-only vmnet-only/freebsd
 
 .include <bsd.subdir.mk>
-
diff --git a/emulators/vmware/files/README.FreeBSD b/emulators/vmware/files/README.FreeBSD
index 66e673bb0488..cccfca7a024b 100644
--- a/emulators/vmware/files/README.FreeBSD
+++ b/emulators/vmware/files/README.FreeBSD
@@ -81,4 +81,3 @@ Author.
 
 	Vladimir N. Silyaev. 
 	E-Mail: vsilyaev@mindspring.com
-
diff --git a/emulators/vmware/files/config b/emulators/vmware/files/config
index bb1a52d02cc0..66c1a93c6b33 100644
--- a/emulators/vmware/files/config
+++ b/emulators/vmware/files/config
@@ -5,4 +5,3 @@ loop.fullpath = ""@@PREFIX@@/lib/vmware/bin/vmware-loop"
 libdir = "@@PREFIX@@/lib/vmware/lib"
 vmnet1.HostOnlyAddress = "@@HOST_IP@@"
 vmnet1.HostOnlyNetMask = "@@NETMASK@@"
-
diff --git a/emulators/vmware/files/vmware.sh b/emulators/vmware/files/vmware.sh
index b3fa8424c1c6..e9173c8fc87a 100644
--- a/emulators/vmware/files/vmware.sh
+++ b/emulators/vmware/files/vmware.sh
@@ -9,7 +9,7 @@ host_ip=@@HOST_IP@@
 netmask=@@NETMASK@@
 
 [ -x $vmware_dir/bin/vmware ] || exit
-exec >/dev/null 
+exec >/dev/null
 
 case $1 in
 	start)
@@ -28,11 +28,11 @@ case $1 in
 			ifconfig vmnet1 down
 			ifconfig vmnet1 delete $host_ip
         		kldunload vmnet
-		fi	
+		fi
 		;;
 
 	*)
-		echo "usage: `basename $0` {start|stop}" >&2 
+		echo "usage: `basename $0` {start|stop}" >&2
 		exit 64
 		;;
 esac
diff --git a/emulators/vmware/pkg-comment b/emulators/vmware/pkg-comment
index 71c5894d8f2b..3338b47dd9e0 100644
--- a/emulators/vmware/pkg-comment
+++ b/emulators/vmware/pkg-comment
@@ -1 +1 @@
-Linux version VMware
+VMware virtual machine emulator
diff --git a/emulators/vmware/pkg-descr b/emulators/vmware/pkg-descr
index 3977bc55a9ab..0d5e28f6c9d7 100644
--- a/emulators/vmware/pkg-descr
+++ b/emulators/vmware/pkg-descr
@@ -1,2 +1,4 @@
-VMware
-
+This is the Linux version of the VMware virtual machine emulator made to
+run on FreeBSD using the Linux compatibility mode.  VMware can be used to
+run IBM's OS/2, Microsoft Windows 95/98, Microsoft NT, Linux, or any other
+operating system that runs on the i486.