ports/78539: emulators/vmware-* ports use the wrong CD-ROM devices

[Scot Hetzel]

>Number:         78539
>Category:       ports
>Synopsis:       emulators/vmware-* ports use the wrong CD-ROM devices
>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:   Mon Mar 07 16:10:03 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Scot W. Hetzel
>Release:        FreeBSD 5.4-PRERELEASE i386
>Organization:
Ye Old Home Computers
>Environment:
System: FreeBSD bsd5x.hetzel.org 5.4-PRERELEASE FreeBSD 5.4-PRERELEASE
#0: Sun Mar 6 00:26:06 CST 2005
root at bsd5x.hetzel.org:/usr/obj/usr/src/5x/sys/GENERIC i386

>Description:
While trying to install the emulators/vmware-guestd4 port on FreeBSD 4, the port
tries to mount the CD-ROM with /dev/acd0.  There is no /dev/acd0 on FreeBSD 4.
Instead you need to use /dev/acd0c.

This problem exists with emulators/vmware-[guestd3,tools3] ports, except they
affect installation on FreeBSD 5+, because FreeBSD 5+ no longer has a /dev/acd0c
device, only a /dev/acd0 device.

My research shows this change was made when the RELENG_5_0_BP tag was put on
the src tree.

>How-To-Repeat:
Install FreeBSD 4.x in VMware 4 Workstation, then try to install
emulators/vmware-guestd4.

>Fix:

The following patch fixes the problem for these 3 ports:

    vmware-guestd3
    vmware-guestd4
    vmware-tools3

Index: vmware-guestd3/Makefile
===================================================================
RCS file: /home/ncvs/ports/emulators/vmware-guestd3/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- vmware-guestd3/Makefile	6 Feb 2004 18:06:46 -0000	1.12
+++ vmware-guestd3/Makefile	7 Mar 2005 01:30:41 -0000
@@ -33,7 +33,13 @@
 VMWARE_VER=	3.2.1
 BUILD_VER=	2237
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500000
 MOUNT_DEV?=	/dev/acd0c
+.else
+MOUNT_DEV?=	/dev/acd0
+.endif
 MOUNT_PT?=	/mnt
 MOUNT=		/sbin/mount
 UMOUNT=		/sbin/umount
@@ -79,4 +85,4 @@
 	fi
 	-${PREFIX}/sbin/vmware-guestd --cmd toolinstall.end
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: vmware-guestd4/Makefile
===================================================================
RCS file: /home/ncvs/ports/emulators/vmware-guestd4/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- vmware-guestd4/Makefile	6 Feb 2005 14:04:37 -0000	1.20
+++ vmware-guestd4/Makefile	7 Mar 2005 01:02:25 -0000
@@ -43,13 +43,17 @@
 VMWARE_VER=	4.5.2
 BUILD_VER=	8848
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500000
+MOUNT_DEV?=	/dev/acd0c
+.else
 MOUNT_DEV?=	/dev/acd0
+.endif
 MOUNT_PT?=	/mnt
 MOUNT=		/sbin/mount
 UMOUNT=		/sbin/umount
 
-.include <bsd.port.pre.mk>
-
 .if defined(VMWARE_X_PORTS)
 
 .if ${X_WINDOW_SYSTEM:L} == xfree86-3
Index: vmware-tools3/Makefile
===================================================================
RCS file: /home/ncvs/ports/emulators/vmware-tools3/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- vmware-tools3/Makefile	23 Jul 2004 19:10:09 -0000	1.14
+++ vmware-tools3/Makefile	7 Mar 2005 01:30:05 -0000
@@ -35,7 +35,13 @@
 VMWARE_VER=	3.2.1
 BUILD_VER=	2237
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500000
 MOUNT_DEV?=	/dev/acd0c
+.else
+MOUNT_DEV?=	/dev/acd0
+.endif
 MOUNT_PT?=	/mnt
 MOUNT=		/sbin/mount
 UMOUNT=		/sbin/umount

------=_Part_1808_29701913.1110211283627
Content-Type: application/x-gzip-compressed; name="vmware-patch.gz"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="vmware-patch.gz"

H4sICBWvK0IAA3Ztd2FyZS1wYXRjaADdlEtvm0AQx8/wKeaQQyu8sMBiMAqt28aRqOKHjF89WbZZ
UhQeEQ8nUuTv3l3juH7g9pBKkbqHXTHDf3fmr5/GTXz6bMM6flpkFN2XNC98XekuHmgQRlR03r7E
4TcP+GU2KD/TmCrJap0rj2lW5AqNy2hRpFmuXCigsRYzWmQhXYfJPWTsyMM0AVVWNdEPgwBQCSjj
n7CvGSF0qR+hCbd0CRrGBFTLxk2bNAFhtoTtlZIkXZSa7IWMSw3Aqq1jm6iVVGy3Ael6wwSJ7aoO
7bYIk+70y7Azn3SGjqDLmqyK8HXs3t1UEU3TTRFESQ6TVVT6FK6XuS9zT+THjMrxwydR4tkArl76
HpN4br+3gWsw8PZF6PbHvdH8pjP57AiKT9fKYuXjFZPQKKeiVJvm2YSZ9qoejHg2TopdwBEEJV+G
iRKnJQ+Oj6NlFebNmq0GAcky2M57FYKQbejqZTDs3LqzTfX/kY+A0Cr2oUjTKEzyYhFFvBZmAaqx
YNt+nTVpXiXdGmjJe0NL/g6tho+g1fAfoCU10BqgEhsTWzf30LIrz6All6DFmq0ZB9CSLa4SP8wz
aolsyNoRtZZFrLdQW4/lntp6qP8NtfWgvVaNROBV+8yzhPofdi7M5oP+cOR9ZGKomprNp27vpj+d
ez+8Uadr323AceA5yCi1mkg/4ZLDnr/jLD15//IoJcejlNRSeXKboOnwvYx2o7Rlq9jGrd+jlBxS
eSo9m6T4EErd2E5S47+fpL8AW1cmFHsHAAA=
------=_Part_1808_29701913.1110211283627--
>Release-Note:
>Audit-Trail:
>Unformatted:
 ------=_Part_1808_29701913.1110211283627
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline