From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Apr 28 23:00:35 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4A8CF16A40B for ; Fri, 28 Apr 2006 23:00:35 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 61AA243D5D for ; Fri, 28 Apr 2006 23:00:33 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k3SN0X8n086382 for ; Fri, 28 Apr 2006 23:00:33 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k3SN0Xsa086381; Fri, 28 Apr 2006 23:00:33 GMT (envelope-from gnats) Resent-Date: Fri, 28 Apr 2006 23:00:33 GMT Resent-Message-Id: <200604282300.k3SN0Xsa086381@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Edwin Groothuis Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 598AD16A405 for ; Fri, 28 Apr 2006 22:54:29 +0000 (UTC) (envelope-from edwin@mavetju.org) Received: from mail2out.barnet.com.au (mail2out.barnet.com.au [202.83.176.14]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6BC5043D46 for ; Fri, 28 Apr 2006 22:54:27 +0000 (GMT) (envelope-from edwin@mavetju.org) Received: by mail2out.barnet.com.au (Postfix, from userid 27) id B72747073FE; Sat, 29 Apr 2006 08:54:25 +1000 (EST) Received: from mail2-auth.barnet.com.au (mail2.barnet.com.au [202.83.176.13]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "*.barnet.com.au", Issuer "BarNet Root Certificate Authority" (verified OK)) by mail2.barnet.com.au (Postfix) with ESMTP id 2174A7073CC for ; Sat, 29 Apr 2006 08:54:25 +1000 (EST) Received: from k7.mavetju (edwin-3.int.barnet.com.au [10.10.12.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mail2-auth.barnet.com.au (Postfix) with ESMTP id EC1057073CB for ; Sat, 29 Apr 2006 08:54:22 +1000 (EST) Received: by k7.mavetju (Postfix, from userid 1001) id EB18843C; Sat, 29 Apr 2006 08:54:21 +1000 (EST) Message-Id: <20060428225421.EB18843C@k7.mavetju> Date: Sat, 29 Apr 2006 08:54:21 +1000 (EST) From: Edwin Groothuis To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/96491: [patch] emulators/vmware3 - further cleanup X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Edwin Groothuis List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Apr 2006 23:00:35 -0000 >Number: 96491 >Category: ports >Synopsis: [patch] emulators/vmware3 - further cleanup >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Apr 28 23:00:32 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Edwin Groothuis >Release: FreeBSD 6.0-RELEASE i386 >Organization: - >Environment: System: FreeBSD k7.mavetju 6.0-RELEASE FreeBSD 6.0-RELEASE #0: Thu Nov 3 09:36:13 UTC 2005 root@x64.samsco.home:/usr/obj/usr/src/sys/GENERIC i386 >Description: The emulators/vmware3 port has some old stuff in its Makefile, for example the use of Perl to do replacements, no SHA256 checksums and no use of SUB_FILES. >How-To-Repeat: >Fix: Added files: files/vmware.in, files/vmware-wizard.in, files/001.vmware.sh.in, files/config.in Deleted files: the above ones without .in Index: Makefile =================================================================== RCS file: /home/pcvs/ports/emulators/vmware3/Makefile,v retrieving revision 1.91 diff -u -r1.91 Makefile --- Makefile 28 Apr 2006 22:23:26 -0000 1.91 +++ Makefile 28 Apr 2006 22:50:38 -0000 @@ -37,6 +37,14 @@ VMDIR= ${PREFIX}/lib/vmware SRC_BASE?= /usr/src +SUB_FILES= vmware vmware-wizard pkg-message config 001.vmware.sh +SUB_LIST= BRIDGED="${VMNET_BRIDGED}" \ + BRIDGE_INTF="${VMNET_BRIDGED_INTERFACE}" \ + HOST_IP="${VMNET_HOST_IP}" \ + NETMASK="${VMNET_NETMASK}" \ + LINUXBASE="${LINUXBASE}" \ + NETWORKING="${VMNET_NETWORKING}" \ + VMNET1_MINOR="${VMNET1_MINOR}" ONLY_FOR_ARCHS= i386 USE_LINUX= yes USE_X_PREFIX= yes @@ -108,18 +116,17 @@ @cd ${WRKSRC}/vmnet-only && ${PATCH} -p1 < ${WRKDIR}/vmnet-only.diff .if exists(/sys/compat/linux/linux_ioctl.h) - ${PERL} -i -pe 's,i386(/linux/linux_ioctl\.h),compat$$1,' \ + ${REINPLACE_CMD} -i "" -e 's,i386(/linux/linux_ioctl\.h),compat$$1,' \ ${WRKSRC}/vmnet-only/freebsd/vmnet_linux.c .endif .if exists(/usr/include/sys/selinfo.h) - ${PERL} -i -pe 's,,,' \ + ${REINPLACE_CMD} -i "" -e 's,,,' \ ${WRKSRC}/vmmon-only/freebsd/*.c .endif cd ${WRKSRC}/vmmon-only/freebsd && ${TOUCH} bus_if.h device_if.h .if ${OSVERSION} >= 500019 - ${PERL} -i -pe 's,,,' \ - ${WRKSRC}/vmmon-only/freebsd/*.c \ - ${WRKSRC}/vmware-distrib/vmmon-only/freebsd/*.c + ${REINPLACE_CMD} -i "" -e 's,,,' \ + ${WRKSRC}/vmmon-only/freebsd/*.c .endif post-patch: @@ -127,39 +134,14 @@ ${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 + cd ${WRKSRC} && ${PATCH} < ${FILESDIR}/freebsd4.patch .endif .if ${OSVERSION} > 600000 - ${CAT} ${FILESDIR}/fbsd6-1.patch | (cd ${WRKSRC} && ${PATCH}) > /dev/null 2>&1 - ${CAT} ${FILESDIR}/fbsd6-2.patch | (cd ${WRKSRC} && ${PATCH}) > /dev/null 2>&1 + cd ${WRKSRC} && ${PATCH} < ${FILESDIR}/fbsd6-1.patch + cd ${WRKSRC} && ${PATCH} < ${FILESDIR}/fbsd6-2.patch .endif -setoptions: - ${SED} -e 's;@@PREFIX@@;${PREFIX};' \ - -e 's;@@BRIDGED@@;${VMNET_BRIDGED};' \ - -e 's;@@BRIDGE_INTF@@;${VMNET_BRIDGED_INTERFACE};' \ - -e 's;@@HOST_IP@@;${VMNET_HOST_IP};' \ - -e 's;@@NETMASK@@;${VMNET_NETMASK};' \ - ${FILESDIR}/config > ${WRKDIR}/config - - ${SED} -e 's;@@PREFIX@@;${PREFIX};' \ - -e 's;@@LINUXBASE@@;${LINUXBASE};' \ - -e 's;@@NETWORKING@@;${VMNET_NETWORKING};' \ - -e 's;@@VMNET1_MINOR@@;${VMNET1_MINOR};' \ - ${FILESDIR}/001.vmware.sh > ${WRKDIR}/001.vmware.sh - - ${SED} -e 's;@@PREFIX@@;${PREFIX};' \ - -e 's;@@LINUXBASE@@;${LINUXBASE};' \ - ${FILESDIR}/vmware > ${WRKDIR}/vmware - - ${SED} -e 's;@@PREFIX@@;${PREFIX};' \ - -e 's;@@LINUXBASE@@;${LINUXBASE};' \ - ${FILESDIR}/vmware-wizard > ${WRKDIR}/vmware-wizard - - ${SED} -e 's;@@PREFIX@@;${PREFIX};' \ - ${FILESDIR}/pkg-message.in > ${PKGMESSAGE} - -pre-install: setoptions +pre-install: ${INSTALL_MAN} ${WRKSRC}/man/man1/vmware.1 ${MANPREFIX}/man/man1 ${MKDIR} ${VMDIR}/modules Index: distinfo =================================================================== RCS file: /home/pcvs/ports/emulators/vmware3/distinfo,v retrieving revision 1.19 diff -u -r1.19 distinfo --- distinfo 4 Aug 2004 22:24:11 -0000 1.19 +++ distinfo 28 Apr 2006 22:50:39 -0000 @@ -1,6 +1,9 @@ MD5 (VMware-workstation-3.2.1-2242.tar.gz) = 56dccf022582a374cf2eac06796115cf +SHA256 (VMware-workstation-3.2.1-2242.tar.gz) = ec305ca65c2e513b5d809e59849176d15dcf6a8f88e3d9bc9ce8fdca59fc2dfc SIZE (VMware-workstation-3.2.1-2242.tar.gz) = 12577292 MD5 (vmmon-only-3.2.1-20040727.tar.gz) = 5de4405befdca3a5e3db09c6a1eaa928 +SHA256 (vmmon-only-3.2.1-20040727.tar.gz) = 6241a5e59a18f39aeec1f75f36d7bc346f9484131d2fb40413f93683ec26e50b SIZE (vmmon-only-3.2.1-20040727.tar.gz) = 52023 MD5 (vmnet-only-3.2.1-20040705.tar.gz) = a11022f353315b78ba5a782ce8c14e67 +SHA256 (vmnet-only-3.2.1-20040705.tar.gz) = 8d40e97be3d41867e11d61984401514d57be2b2195727652bb3f21189505d35f SIZE (vmnet-only-3.2.1-20040705.tar.gz) = 7480 Index: files/001.vmware.sh =================================================================== RCS file: files/001.vmware.sh diff -N files/001.vmware.sh --- files/001.vmware.sh 8 Jul 2004 08:26:34 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,151 +0,0 @@ -#!/bin/sh -# -# Start or stop vmware -# -# $FreeBSD: ports/emulators/vmware3/files/001.vmware.sh,v 1.2 2004/07/08 08:26:34 silby Exp $ - -vmware_config_file=@@PREFIX@@/etc/vmware/config - -if [ ! -e $vmware_config_file ]; then - echo "$vmware_config_file does not exist!" >&2 - exit 255 -fi - -vmware_config() { - cat $vmware_config_file | while read var eq value; do - if [ "$1" = "$var" ]; then - ret=`expr "$value" : '"\(.*\)"$'` - echo ${ret:-$value} - break - fi - done -} - -vmware=`vmware_config vmware.fullpath` -vmware_libdir=`vmware_config libdir` -networking=@@NETWORKING@@ -dev_vmnet1=/dev/vmnet1 -vmnet1_minor=@@VMNET1_MINOR@@ - -if [ ! -x $vmware ]; then - echo "$vmware does not exist!" >&2 - exit 255 -fi - -if [ `sysctl -n hw.ncpu` -eq 1 ]; then - suffix=up -else - suffix=smp -fi - -exec >/dev/null - -case $1 in -start) - 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 - echo "$dev_vmnet1 does not exist!" >&2 - echo "Your VMware installation seems broken. Please reinstall VMware port." >&2 - exit 255 - fi - case $vmnet1_minor in - 0x*) vmnet1_minor=`(echo ibase=16; - echo $vmnet1_minor | sed 's/^0x//' | tr a-f A-F) | bc` ;; - esac - vmnet_no=1 - bridge_no=1 - while true; do - vmnet=vmnet$vmnet_no - vmnet_no=`expr $vmnet_no + 1` - bridged=`vmware_config $vmnet.Bridged` - case $bridged in - '') break ;; - '""') continue ;; - esac - host_ip=`vmware_config $vmnet.HostOnlyAddress` - netmask=`vmware_config $vmnet.HostOnlyNetMask` - if [ ! -c /dev/$vmnet ]; then - rm -f /dev/$vmnet - minor=`echo $vmnet1_minor $vmnet_no | \ - awk '{ printf "0x%x", $1 - 1 + $2 - 1 }'` - mknod /dev/$vmnet c 149 $minor - fi - echo -n > /dev/$vmnet 2>&1 - ifconfig $vmnet $host_ip netmask $netmask - if [ X$bridged = XYES ]; then - if [ X$host_ip = X0.0.0.0 ]; then - # XXX Still need to configure + delete to make it RUNNING - ifconfig $vmnet delete $host_ip - fi - bridge_interface=`vmware_config $vmnet.BridgeInterface` - eval vmnet_bridge=\$vmnet_bridge_$bridge_interface - if [ X$vmnet_bridge = X ]; then - kldstat -v | grep netgraph >/dev/null || kldload netgraph.ko - kldstat -v | grep ng_ether >/dev/null || kldload ng_ether.ko - kldstat -v | grep ng_bridge >/dev/null || kldload ng_bridge.ko - vmnet_bridge=vmnet_bridge$bridge_no - bridge_no=`expr $bridge_no + 1` - eval vmnet_bridge_$bridge_interface=$vmnet_bridge - ngctl mkpeer ${bridge_interface}: bridge lower link0 - ngctl name ${bridge_interface}:lower ${vmnet_bridge} - ngctl connect ${vmnet_bridge}: ${bridge_interface}: link1 upper - ngctl msg ${bridge_interface}: setautosrc 0 - ngctl msg ${bridge_interface}: setpromisc 1 - eval ${vmnet_bridge}_linkno=2 - fi - eval linkno=\$${vmnet_bridge}_linkno - eval ${vmnet_bridge}_linkno=`expr $linkno + 1` - ngctl connect ${vmnet_bridge}: ${vmnet}: link$linkno lower - ngctl msg ${vmnet}: setautosrc 0 - ngctl msg ${vmnet}: setpromisc 1 - fi - done - fi - echo -n " VMware" >&2 - ;; - -stop) - kldunload vmmon_${suffix} - if [ $networking -eq 1 ]; then - vmnet_no=1 - bridge_no=1 - while true; do - vmnet=vmnet$vmnet_no - vmnet_no=`expr $vmnet_no + 1` - bridged=`vmware_config $vmnet.Bridged` - case $bridged in - '') break ;; - '""') continue ;; - esac - host_ip=`vmware_config $vmnet.HostOnlyAddress` - ifconfig $vmnet down - if [ X$bridged = XYES ]; then - if [ X$host_ip != X0.0.0.0 ]; then - ifconfig $vmnet delete $host_ip - fi - bridge_interface=`vmware_config $vmnet.BridgeInterface` - eval vmnet_bridge=\$vmnet_bridge_$bridge_interface - if [ X$vmnet_bridge = X ]; then - vmnet_bridge=vmnet_bridge$bridge_no - bridge_no=`expr $bridge_no + 1` - eval vmnet_bridge_$bridge_interface=$vmnet_bridge - ngctl msg ${bridge_interface}: setautosrc 1 - ngctl msg ${bridge_interface}: setpromisc 0 - ngctl shutdown ${vmnet_bridge}: - fi - else - ifconfig $vmnet delete $host_ip - fi - done - kldunload vmnet.ko - fi - ;; - -*) - echo "usage: `basename $0` {start|stop}" >&2 - exit 64 - ;; -esac Index: files/001.vmware.sh.in =================================================================== RCS file: files/001.vmware.sh.in diff -N files/001.vmware.sh.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/001.vmware.sh.in 28 Apr 2006 22:50:39 -0000 @@ -0,0 +1,151 @@ +#!/bin/sh +# +# Start or stop vmware +# +# $FreeBSD: ports/emulators/vmware3/files/001.vmware.sh,v 1.2 2004/07/08 08:26:34 silby Exp $ + +vmware_config_file=%%PREFIX%%/etc/vmware/config + +if [ ! -e $vmware_config_file ]; then + echo "$vmware_config_file does not exist!" >&2 + exit 255 +fi + +vmware_config() { + cat $vmware_config_file | while read var eq value; do + if [ "$1" = "$var" ]; then + ret=`expr "$value" : '"\(.*\)"$'` + echo ${ret:-$value} + break + fi + done +} + +vmware=`vmware_config vmware.fullpath` +vmware_libdir=`vmware_config libdir` +networking=%%NETWORKING%% +dev_vmnet1=/dev/vmnet1 +vmnet1_minor=%%VMNET1_MINOR%% + +if [ ! -x $vmware ]; then + echo "$vmware does not exist!" >&2 + exit 255 +fi + +if [ `sysctl -n hw.ncpu` -eq 1 ]; then + suffix=up +else + suffix=smp +fi + +exec >/dev/null + +case $1 in +start) + 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 + echo "$dev_vmnet1 does not exist!" >&2 + echo "Your VMware installation seems broken. Please reinstall VMware port." >&2 + exit 255 + fi + case $vmnet1_minor in + 0x*) vmnet1_minor=`(echo ibase=16; + echo $vmnet1_minor | sed 's/^0x//' | tr a-f A-F) | bc` ;; + esac + vmnet_no=1 + bridge_no=1 + while true; do + vmnet=vmnet$vmnet_no + vmnet_no=`expr $vmnet_no + 1` + bridged=`vmware_config $vmnet.Bridged` + case $bridged in + '') break ;; + '""') continue ;; + esac + host_ip=`vmware_config $vmnet.HostOnlyAddress` + netmask=`vmware_config $vmnet.HostOnlyNetMask` + if [ ! -c /dev/$vmnet ]; then + rm -f /dev/$vmnet + minor=`echo $vmnet1_minor $vmnet_no | \ + awk '{ printf "0x%x", $1 - 1 + $2 - 1 }'` + mknod /dev/$vmnet c 149 $minor + fi + echo -n > /dev/$vmnet 2>&1 + ifconfig $vmnet $host_ip netmask $netmask + if [ X$bridged = XYES ]; then + if [ X$host_ip = X0.0.0.0 ]; then + # XXX Still need to configure + delete to make it RUNNING + ifconfig $vmnet delete $host_ip + fi + bridge_interface=`vmware_config $vmnet.BridgeInterface` + eval vmnet_bridge=\$vmnet_bridge_$bridge_interface + if [ X$vmnet_bridge = X ]; then + kldstat -v | grep netgraph >/dev/null || kldload netgraph.ko + kldstat -v | grep ng_ether >/dev/null || kldload ng_ether.ko + kldstat -v | grep ng_bridge >/dev/null || kldload ng_bridge.ko + vmnet_bridge=vmnet_bridge$bridge_no + bridge_no=`expr $bridge_no + 1` + eval vmnet_bridge_$bridge_interface=$vmnet_bridge + ngctl mkpeer ${bridge_interface}: bridge lower link0 + ngctl name ${bridge_interface}:lower ${vmnet_bridge} + ngctl connect ${vmnet_bridge}: ${bridge_interface}: link1 upper + ngctl msg ${bridge_interface}: setautosrc 0 + ngctl msg ${bridge_interface}: setpromisc 1 + eval ${vmnet_bridge}_linkno=2 + fi + eval linkno=\$${vmnet_bridge}_linkno + eval ${vmnet_bridge}_linkno=`expr $linkno + 1` + ngctl connect ${vmnet_bridge}: ${vmnet}: link$linkno lower + ngctl msg ${vmnet}: setautosrc 0 + ngctl msg ${vmnet}: setpromisc 1 + fi + done + fi + echo -n " VMware" >&2 + ;; + +stop) + kldunload vmmon_${suffix} + if [ $networking -eq 1 ]; then + vmnet_no=1 + bridge_no=1 + while true; do + vmnet=vmnet$vmnet_no + vmnet_no=`expr $vmnet_no + 1` + bridged=`vmware_config $vmnet.Bridged` + case $bridged in + '') break ;; + '""') continue ;; + esac + host_ip=`vmware_config $vmnet.HostOnlyAddress` + ifconfig $vmnet down + if [ X$bridged = XYES ]; then + if [ X$host_ip != X0.0.0.0 ]; then + ifconfig $vmnet delete $host_ip + fi + bridge_interface=`vmware_config $vmnet.BridgeInterface` + eval vmnet_bridge=\$vmnet_bridge_$bridge_interface + if [ X$vmnet_bridge = X ]; then + vmnet_bridge=vmnet_bridge$bridge_no + bridge_no=`expr $bridge_no + 1` + eval vmnet_bridge_$bridge_interface=$vmnet_bridge + ngctl msg ${bridge_interface}: setautosrc 1 + ngctl msg ${bridge_interface}: setpromisc 0 + ngctl shutdown ${vmnet_bridge}: + fi + else + ifconfig $vmnet delete $host_ip + fi + done + kldunload vmnet.ko + fi + ;; + +*) + echo "usage: `basename $0` {start|stop}" >&2 + exit 64 + ;; +esac Index: files/config =================================================================== RCS file: files/config diff -N files/config --- files/config 8 Jul 2004 08:26:34 -0000 1.6 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,9 +0,0 @@ -vmware.fullpath = "@@PREFIX@@/lib/vmware/bin/vmware" -wizard.fullpath = "@@PREFIX@@/lib/vmware/bin/vmware-wizard" -dhcpd.fullpath = "@@PREFIX@@/lib/vmware/bin/vmnet-dhcpd" -loop.fullpath = "@@PREFIX@@/lib/vmware/bin/vmware-loop" -libdir = "@@PREFIX@@/lib/vmware" -vmnet1.Bridged = "@@BRIDGED@@" -vmnet1.BridgeInterface = "@@BRIDGE_INTF@@" -vmnet1.HostOnlyAddress = "@@HOST_IP@@" -vmnet1.HostOnlyNetMask = "@@NETMASK@@" Index: files/config.in =================================================================== RCS file: files/config.in diff -N files/config.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/config.in 28 Apr 2006 22:50:39 -0000 @@ -0,0 +1,9 @@ +vmware.fullpath = "%%PREFIX%%/lib/vmware/bin/vmware" +wizard.fullpath = "%%PREFIX%%/lib/vmware/bin/vmware-wizard" +dhcpd.fullpath = "%%PREFIX%%/lib/vmware/bin/vmnet-dhcpd" +loop.fullpath = "%%PREFIX%%/lib/vmware/bin/vmware-loop" +libdir = "%%PREFIX%%/lib/vmware" +vmnet1.Bridged = "%%BRIDGED%%" +vmnet1.BridgeInterface = "%%BRIDGE_INTF%%" +vmnet1.HostOnlyAddress = "%%HOST_IP%%" +vmnet1.HostOnlyNetMask = "%%NETMASK%%" Index: files/pkg-message.in =================================================================== RCS file: /home/pcvs/ports/emulators/vmware3/files/pkg-message.in,v retrieving revision 1.1 diff -u -r1.1 pkg-message.in --- files/pkg-message.in 28 Apr 2006 22:23:27 -0000 1.1 +++ files/pkg-message.in 28 Apr 2006 22:50:39 -0000 @@ -6,7 +6,7 @@ 2) Make sure the Linux Compatibility module is loaded (use 'kldstat' to check) or built into the kernel. -3) Run '@@PREFIX@@/etc/rc.d/001.vmware.sh start' +3) Run '%%PREFIX%%/etc/rc.d/001.vmware.sh start' to avoid rebooting. 4) Load the kernel module aio.ko or add it to the kernel @@ -37,6 +37,6 @@ If you'd like to learn more on how to configure vmnet interfaces for multiple instances of VMware, please read: - @@PREFIX@@/share/doc/vmware/MultipleInstances.FreeBSD + %%PREFIX%%/share/doc/vmware/MultipleInstances.FreeBSD ************************************************************ Index: files/vmware =================================================================== RCS file: files/vmware diff -N files/vmware --- files/vmware 22 Sep 2000 17:22:23 -0000 1.5 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,26 +0,0 @@ -#!/bin/sh -# -# Run vmware -# -# $FreeBSD: ports/emulators/vmware3/files/vmware,v 1.5 2000/09/22 17:22:23 knu Exp $ - -if [ ! -e @@LINUXBASE@@/proc/cpuinfo ]; then - echo "************************************************************" - echo "It seems Linux procfs is not mounted on @@LINUXBASE@@/proc." - echo "VMware does not work without Linux procfs mounted." - echo - echo "For details, see linprocfs(5) manpage." - echo "************************************************************" - exit 1 -fi - -LANG=C -PATH=/bin:$PATH - -if [ _$TMPDIR = _ ]; then - TMPDIR=/var/tmp - echo Setting TMPDIR="$TMPDIR". - export TMPDIR -fi - -exec @@PREFIX@@/lib/vmware/bin/vmware "$@" Index: files/vmware-wizard =================================================================== RCS file: files/vmware-wizard diff -N files/vmware-wizard --- files/vmware-wizard 28 Apr 2006 22:23:27 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,26 +0,0 @@ -#!/bin/sh -# -# Run vmware-wizard -# -# $FreeBSD: ports/emulators/vmware3/files/vmware-wizard,v 1.1 2006/04/28 22:23:27 edwin Exp $ - -if [ ! -e @@LINUXBASE@@/proc/cpuinfo ]; then - echo "************************************************************" - echo "It seems Linux procfs is not mounted on @@LINUXBASE@@/proc." - echo "VMware does not work without Linux procfs mounted." - echo - echo "For details, see linprocfs(5) manpage." - echo "************************************************************" - exit 1 -fi - -LANG=C -PATH=/bin:$PATH - -if [ _$TMPDIR = _ ]; then - TMPDIR=/var/tmp - echo Setting TMPDIR="$TMPDIR". - export TMPDIR -fi - -exec @@PREFIX@@/lib/vmware/bin/vmware-wizard "$@" Index: files/vmware-wizard.in =================================================================== RCS file: files/vmware-wizard.in diff -N files/vmware-wizard.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/vmware-wizard.in 28 Apr 2006 22:50:39 -0000 @@ -0,0 +1,26 @@ +#!/bin/sh +# +# Run vmware-wizard +# +# $FreeBSD: ports/emulators/vmware3/files/vmware-wizard,v 1.1 2006/04/28 22:23:27 edwin Exp $ + +if [ ! -e %%LINUXBASE%%/proc/cpuinfo ]; then + echo "************************************************************" + echo "It seems Linux procfs is not mounted on %%LINUXBASE%%/proc." + echo "VMware does not work without Linux procfs mounted." + echo + echo "For details, see linprocfs(5) manpage." + echo "************************************************************" + exit 1 +fi + +LANG=C +PATH=/bin:$PATH + +if [ _$TMPDIR = _ ]; then + TMPDIR=/var/tmp + echo Setting TMPDIR="$TMPDIR". + export TMPDIR +fi + +exec %%PREFIX%%/lib/vmware/bin/vmware-wizard "$@" Index: files/vmware.in =================================================================== RCS file: files/vmware.in diff -N files/vmware.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/vmware.in 28 Apr 2006 22:50:39 -0000 @@ -0,0 +1,26 @@ +#!/bin/sh +# +# Run vmware +# +# $FreeBSD: ports/emulators/vmware3/files/vmware,v 1.5 2000/09/22 17:22:23 knu Exp $ + +if [ ! -e %%LINUXBASE%%/proc/cpuinfo ]; then + echo "************************************************************" + echo "It seems Linux procfs is not mounted on %%LINUXBASE%%/proc." + echo "VMware does not work without Linux procfs mounted." + echo + echo "For details, see linprocfs(5) manpage." + echo "************************************************************" + exit 1 +fi + +LANG=C +PATH=/bin:$PATH + +if [ _$TMPDIR = _ ]; then + TMPDIR=/var/tmp + echo Setting TMPDIR="$TMPDIR". + export TMPDIR +fi + +exec %%PREFIX%%/lib/vmware/bin/vmware "$@" >Release-Note: >Audit-Trail: >Unformatted: