From owner-freebsd-ports  Wed May 23  8:50:28 2001
Delivered-To: freebsd-ports@hub.freebsd.org
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 7462437B424
	for <freebsd-ports@hub.freebsd.org>; Wed, 23 May 2001 08:50:03 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.11.1/8.11.1) id f4NFo3O23441;
	Wed, 23 May 2001 08:50:03 -0700 (PDT)
	(envelope-from gnats)
Received: from updraft.jp.freebsd.org (updraft.jp.FreeBSD.ORG [210.157.158.42])
	by hub.freebsd.org (Postfix) with ESMTP id 6ACCD37B422
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 23 May 2001 08:48:18 -0700 (PDT)
	(envelope-from matusita@jp.FreeBSD.org)
Received: from localhost (localhost [127.0.0.1])
	by updraft.jp.freebsd.org (8.11.3+3.4W/8.11.3) with ESMTP/inet id f4NFmE877248
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 24 May 2001 00:48:14 +0900 (JST)
	(envelope-from matusita@jp.FreeBSD.org)
Message-Id: <20010524004756Q.matusita@jp.FreeBSD.org>
Date: Thu, 24 May 2001 00:47:56 +0900
From: Makoto MATSUSHITA <matusita@jp.FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
X-Send-Pr-Version: 3.2
Subject: ports/27585: [MAINTAINER][PATCH] update ports/emulators/linux-vmware-toolbox to
 2.0.4
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-ports.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo?subject=subscribe%20freebsd-ports>
List-Unsubscribe: <mailto:majordomo?subject=unsubscribe%20freebsd-ports>
X-Loop: FreeBSD.org


>Number:         27585
>Category:       ports
>Synopsis:       update ports/emulators/linux-vmware-toolbox to 2.0.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed May 23 08:50:02 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     Makoto MATSUSHITA
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
Japan FreeBSD Users' Group
>Environment:

	Any 4-stable/5-current

>Description:

	Current ports doesn't work under 5-current box, since this
	port uses 'vnconfig' to extract files from a floppy image.
	Using 'mdconfig' if under 5-current will fix this problem.

	VMware is updated to 2.0.4; regenerate MD5 checksum.

>How-To-Repeat:

	(not relevant to this PR)

>Fix:

	Apply a patch below.

Index: Makefile
===================================================================
RCS file: /pub/cvsup/FreeBSD.cvs/ports/emulators/linux-vmware-toolbox/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile	2001/01/06 18:28:47	1.4
+++ Makefile	2001/05/23 15:34:53
@@ -26,16 +26,23 @@
 LINUX_FLP?=	${DISTDIR}/linux.flp
 MOUNT_PT?=	${WRKDIR}/mnt
 .if exists(${LINUX_FLP})
+.if ${OSVERSION} >= 500018
+DEV_ATTACH=	/usr/sbin/mdconfig -a -t vnode -f ${LINUX_FLP} -u ${MOUNT_DEV}
+DEV_DETACH=	/usr/sbin/mdconfig -d -u ${MOUNT_DEV}
+MOUNT_DEV?=	md0
+.else
+DEV_ATTACH=	/usr/sbin/vnconfig -c ${MOUNT_DEV} ${LINUX_FLP}
+DEV_DETACH=	/usr/sbin/vnconfig -u ${MOUNT_DEV}
 MOUNT_DEV?=	vn0
+.endif
 .else
 MOUNT_DEV?=	fd0
 .endif
-VMWARE_VER=	2.0.3
-BUILD_VER=	799
+VMWARE_VER=	2.0.4
+BUILD_VER=	1142
 
 MOUNT=		/sbin/mount
 UMOUNT=		/sbin/umount
-VNCONFIG=	/usr/sbin/vnconfig
 
 pre-fetch:
 	@${ECHO} "========================================================================"
@@ -57,14 +64,14 @@
 	-@${UMOUNT} ${MOUNT_PT} 2>&1 >/dev/null
 	-@${UMOUNT} /dev/${MOUNT_DEV} 2>&1 >/dev/null
 .if exists(${LINUX_FLP})
-	-@${VNCONFIG} -u /dev/r${MOUNT_DEV} 2>&1 >/dev/null
-	${VNCONFIG} -c /dev/r${MOUNT_DEV} ${LINUX_FLP}
+	-@${DEV_DETACH} 2>&1 >/dev/null
+	${DEV_ATTACH}
 .endif
 	${MOUNT} -t msdos -r /dev/${MOUNT_DEV} ${MOUNT_PT}
 	${CP} ${MOUNT_PT}/${DISTFILES} ${DISTDIR}
 	${UMOUNT} /dev/${MOUNT_DEV}
 .if exists(${LINUX_FLP})
-	${VNCONFIG} -u /dev/r${MOUNT_DEV}
+	${DEV_DETACH}
 .endif
 .endif
 
Index: distinfo
===================================================================
RCS file: /pub/cvsup/FreeBSD.cvs/ports/emulators/linux-vmware-toolbox/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo	2001/01/06 18:28:47	1.2
+++ distinfo	2001/05/23 14:29:31
@@ -1 +1 @@
-MD5 (vmware-linux-tools.tar.gz) = 65c4d975383fbcdbb6f92cbec6d59728
+MD5 (vmware-linux-tools.tar.gz) = f8b5dc7df50b19ea4a26c1c3e8b1f676
>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message