Update to 2.0.4.1142.

Use mdconfig on 5-CURRENT.

PR:		ports/27585
Submitted by:	Makoto MATSUSHITA <matusita@jp.FreeBSD.org>,
		knu (vn/md compatibility part)

10 files changed, 70 insertions, 35 deletions

diff --git a/emulators/linux-vmware-toolbox/Makefile b/emulators/linux-vmware-toolbox/Makefile
index 11dba73..0700d94 100644
--- a/emulators/linux-vmware-toolbox/Makefile
+++ b/emulators/linux-vmware-toolbox/Makefile
@@ -26,16 +26,23 @@ RESTRICTED=	"Not sure if we can redistribute this."
 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 @@ do-fetch:
 	-@${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
 
diff --git a/emulators/linux-vmware-toolbox/distinfo b/emulators/linux-vmware-toolbox/distinfo
index 8c6ba85..560e5da 100644
--- a/emulators/linux-vmware-toolbox/distinfo
+++ b/emulators/linux-vmware-toolbox/distinfo
@@ -1 +1 @@
-MD5 (vmware-linux-tools.tar.gz) = 65c4d975383fbcdbb6f92cbec6d59728
+MD5 (vmware-linux-tools.tar.gz) = f8b5dc7df50b19ea4a26c1c3e8b1f676
diff --git a/emulators/linux-vmware-toolbox2/Makefile b/emulators/linux-vmware-toolbox2/Makefile
index 11dba73..0700d94 100644
--- a/emulators/linux-vmware-toolbox2/Makefile
+++ b/emulators/linux-vmware-toolbox2/Makefile
@@ -26,16 +26,23 @@ RESTRICTED=	"Not sure if we can redistribute this."
 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 @@ do-fetch:
 	-@${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
 
diff --git a/emulators/linux-vmware-toolbox2/distinfo b/emulators/linux-vmware-toolbox2/distinfo
index 8c6ba85..560e5da 100644
--- a/emulators/linux-vmware-toolbox2/distinfo
+++ b/emulators/linux-vmware-toolbox2/distinfo
@@ -1 +1 @@
-MD5 (vmware-linux-tools.tar.gz) = 65c4d975383fbcdbb6f92cbec6d59728
+MD5 (vmware-linux-tools.tar.gz) = f8b5dc7df50b19ea4a26c1c3e8b1f676
diff --git a/emulators/linux-vmware-toolbox4/Makefile b/emulators/linux-vmware-toolbox4/Makefile
index 11dba73..0700d94 100644
--- a/emulators/linux-vmware-toolbox4/Makefile
+++ b/emulators/linux-vmware-toolbox4/Makefile
@@ -26,16 +26,23 @@ RESTRICTED=	"Not sure if we can redistribute this."
 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 @@ do-fetch:
 	-@${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
 
diff --git a/emulators/linux-vmware-toolbox4/distinfo b/emulators/linux-vmware-toolbox4/distinfo
index 8c6ba85..560e5da 100644
--- a/emulators/linux-vmware-toolbox4/distinfo
+++ b/emulators/linux-vmware-toolbox4/distinfo
@@ -1 +1 @@
-MD5 (vmware-linux-tools.tar.gz) = 65c4d975383fbcdbb6f92cbec6d59728
+MD5 (vmware-linux-tools.tar.gz) = f8b5dc7df50b19ea4a26c1c3e8b1f676
diff --git a/emulators/linux-vmware-toolbox5/Makefile b/emulators/linux-vmware-toolbox5/Makefile
index 11dba73..0700d94 100644
--- a/emulators/linux-vmware-toolbox5/Makefile
+++ b/emulators/linux-vmware-toolbox5/Makefile
@@ -26,16 +26,23 @@ RESTRICTED=	"Not sure if we can redistribute this."
 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 @@ do-fetch:
 	-@${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
 
diff --git a/emulators/linux-vmware-toolbox5/distinfo b/emulators/linux-vmware-toolbox5/distinfo
index 8c6ba85..560e5da 100644
--- a/emulators/linux-vmware-toolbox5/distinfo
+++ b/emulators/linux-vmware-toolbox5/distinfo
@@ -1 +1 @@
-MD5 (vmware-linux-tools.tar.gz) = 65c4d975383fbcdbb6f92cbec6d59728
+MD5 (vmware-linux-tools.tar.gz) = f8b5dc7df50b19ea4a26c1c3e8b1f676
diff --git a/emulators/linux-vmware-toolbox6/Makefile b/emulators/linux-vmware-toolbox6/Makefile
index 11dba73..0700d94 100644
--- a/emulators/linux-vmware-toolbox6/Makefile
+++ b/emulators/linux-vmware-toolbox6/Makefile
@@ -26,16 +26,23 @@ RESTRICTED=	"Not sure if we can redistribute this."
 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 @@ do-fetch:
 	-@${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
 
diff --git a/emulators/linux-vmware-toolbox6/distinfo b/emulators/linux-vmware-toolbox6/distinfo
index 8c6ba85..560e5da 100644
--- a/emulators/linux-vmware-toolbox6/distinfo
+++ b/emulators/linux-vmware-toolbox6/distinfo
@@ -1 +1 @@
-MD5 (vmware-linux-tools.tar.gz) = 65c4d975383fbcdbb6f92cbec6d59728
+MD5 (vmware-linux-tools.tar.gz) = f8b5dc7df50b19ea4a26c1c3e8b1f676