- Clean up and minor fixes

  - Make portlint satisfy
  - Avoid creating files out of WRKDIR
  - Remove the void directory "patch" (What ever was this?)
  - Adjust whitespace
  - Fix some ungrammatical wordings
  - Modify COMMENT and DESCR
- Drop fakeprocfs support due to the import of Linux procfs to the base system
- Show MESSAGE after installation
- Change maintainer to the -emulation list because:
  - Vladimir seems too busy or unreachable these days
  - This port depends very much on Linux compatibility stuff
- Get it to check if the system has Linux procfs module and stop if not

PR:		ports/16960 (add WWW to DESCR)
No response by:	maintainer

1 files changed, 34 insertions, 51 deletions

diff --git a/emulators/vmware2/Makefile b/emulators/vmware2/Makefile
index aaecd7facef1..cd353f4c5cbf 100644
--- a/emulators/vmware2/Makefile
+++ b/emulators/vmware2/Makefile
@@ -1,14 +1,14 @@
-# ports collection makefile for:    VMware For Linux
-# Version required:     1.1.1
-# Date created:         Fri 26 Nov 19:16:47 EST 1999
-# Whom:                 vns@delta.odessa.ua
+# ports collection makefile for:	VMware 1.1.2 for Linux
+# Version required:	1.1.2
+# Date created:		Fri 26 Nov 19:16:47 EST 1999
+# Whom:			vns@delta.odessa.ua
 #
-# $vmFreeBSD: vmware/vmmon-only/freebsd/port/Makefile,v 1.8 1999/12/17 00:38:27 vsilyaev Exp $
 # $FreeBSD$
+# $vmFreeBSD: vmware/vmmon-only/freebsd/port/Makefile,v 1.8 1999/12/17 00:38:27 vsilyaev Exp $
 #
 
-DISTNAME=       VMware-1.1.2-364
-PKGNAME=        vmware-1.1.2
+DISTNAME=	VMware-1.1.2-364
+PKGNAME=	vmware-1.1.2.364
 CATEGORIES=	emulators linux
 MASTER_SITES=	http://www4.vmware.com/software/ \
 		http://vmware-svca.www.conxion.com/software/ \
@@ -24,54 +24,54 @@ PATCH_SITES=	http://www.mindspring.com/~vsilyaev/vmware/files/ \
 PATCHFILES=	vmmon-freebsd-0.94.tar.gz \
 		vmnet-freebsd-0.10.tar.gz
 
-MAINTAINER=	vns@delta.odessa.ua
+MAINTAINER=	freebsd-emulation@FreeBSD.org
+
+RUN_DEPENDS=	${LINUX_DIR}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
 
-RUN_DEPENDS=    ${LINUX_DIR}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
+RESTRICTED=	"Not sure if we can redistribute it"
 
-IS_INTERACTIVE=	yes	# vmnet-freebsd-* querries user for network settings
+LINUX_DIR=	/compat/linux
+VMDIR=		${PREFIX}/lib/vmware
 
-ONLY_FOR_ARCHS= i386
+ONLY_FOR_ARCHS=	i386
 USE_XLIB=	yes
 WRKSRC=		${WRKDIR}/vmware-distrib
-LINUX_DIR=	/compat/linux
+GZCAT=		${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/extract
 MAN1=		vmware.1
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 400013
-BROKEN=	YES
+BROKEN=		"Systems prior to 400013 is out of support"
 .endif
 
-.if exists(${MASTERDIR}/Makefile.inc.net)
-.include "${MASTERDIR}/Makefile.inc.net"
+.if exists(/modules/linprocfs.ko) || exists(${PREFIX}/modules/linprocfs.ko)
+HAVE_LINPROCFS=	yes
 .endif
 
-.if exists(${MASTERDIR}/Makefile.inc.linproc)
-.include "${MASTERDIR}/Makefile.inc.linproc"
+.if !defined(HAVE_LINPROCFS)
+BROKEN=		"You need Linux procfs to run this software"
 .endif
 
-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"
+.if exists(${WRKDIRPREFIX}${.CURDIR}/work/Makefile.inc.net)
+.include "${WRKDIRPREFIX}${.CURDIR}/work/Makefile.inc.net"
+.endif
 
-# Small hack for alternate processing patchfiles
-GZCAT=		${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/extract
+SCRIPTS_ENV+=	LINUX_DIR="${LINUX_DIR}" \
+		VMNET_HOST_IP="${VMNET_HOST_IP}" \
+		VMNET_NETMASK="${VMNET_NETMASK}"
+MAKE_ARGS=	KMODDIR="${VMDIR}/lib/modules"
 
 post-patch:
-	@${CP} ${FILESDIR}/Makefile ${WRKSRC}
+	${CP} ${FILESDIR}/Makefile ${WRKSRC}
 
 setoptions:
-	${SED} -e 's;@@PREFIX@@;${PREFIX};' ${FILESDIR}/vmware > ${WRKDIR}/vmware
-	${SED}  -e 's;@@PREFIX@@;${PREFIX};' \
+	${SED} 	-e 's;@@PREFIX@@;${PREFIX};' \
 		-e 's;@@HOST_IP@@;${VMNET_HOST_IP};' \
 		-e 's;@@NETMASK@@;${VMNET_NETMASK};' \
-	${FILESDIR}/config > ${WRKDIR}/config
+		${FILESDIR}/config > ${WRKDIR}/config
 
-	${SED}  -e 's;@@PREFIX@@;${PREFIX};' \
+	${SED} 	-e 's;@@PREFIX@@;${PREFIX};' \
 		-e 's;@@NETWORKING@@;${VMNET_NETWORKING};' \
 		-e 's;@@HOST_IP@@;${VMNET_HOST_IP};' \
 		-e 's;@@NETMASK@@;${VMNET_NETMASK};' \
@@ -87,7 +87,6 @@ pre-install: setoptions
 	${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
 	[ -f ${LINUX_DIR}/bin/df ] || ${LN} -s ${VMDIR}/bin/df ${LINUX_DIR}/bin/
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/*.pl ${VMDIR}/bin
@@ -95,15 +94,10 @@ pre-install: setoptions
 		 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 4555 ${WRKSRC}/bin/vmware ${VMDIR}/bin
 	${LN} -s ${VMDIR}/bin/vmware ${PREFIX}/bin/
-.else
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/vmware ${VMDIR}/bin
-	${INSTALL_SCRIPT} ${WRKDIR}/vmware ${PREFIX}/bin
-.endif
 	${MKDIR} ${VMDIR}/lib
 	${INSTALL_DATA} ${WRKSRC}/lib/config ${VMDIR}/lib
 	${MKDIR} ${VMDIR}/lib/help
@@ -117,18 +111,7 @@ pre-install: setoptions
 .endif
 
 post-install:
-	@${LN} -s ${PREFIX}/etc/vmware /etc/vmware
-.if !defined(BATCH)
-	@${ECHO} "-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-" 
-	@${ECHO} "Before launch vmware, execute the next command"
-	@${ECHO} ${PREFIX}/etc/rc.d/vmware.sh start
-	@${ECHO} 
-	@${ECHO} "to load required kernel modules"
-	@${ECHO} "-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-" 
-.endif
-
-pre-clean:
-	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc.linproc \
-		  ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc.net
+	${LN} -s ${PREFIX}/etc/vmware /etc/vmware
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>