Drop use of INSTALL_SRC and DEINSTALL_SRC and instead set the proper

variables so that the default INSTALL/DEINSTALL scripts from the
pkginstall framework do the right thing.  Where possible, move some
post-install directions for package setup into MESSAGE files so that
they may be re-inspected by querying the installed package using
"pkg_info -D ...".

6 files changed, 48 insertions, 72 deletions

diff --git a/emulators/vmware-module/INSTALL b/emulators/vmware-module/INSTALL
deleted file mode 100644
index 46df29df750..00000000000
--- a/emulators/vmware-module/INSTALL
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: INSTALL,v 1.3 2003/08/30 20:22:51 jlam Exp $
-
-case $2 in
-POST-INSTALL)
-	/bin/cat << EOF
-===========================================================================
-Copy the following files from ${PKG_PREFIX}/etc/rc.d to /etc/rc.d:
-
-linuxrtc vmmon vmnet vmnetif
-
-and append the content of ${PKG_PREFIX}/etc/rc.conf.d/vmware to /etc/rc.conf:
-
-vmware_prefix=${PKG_PREFIX}
-vmmon=YES
-vmnet=YES
-linuxrtc=NO
-# XXX should cater for multiple interfaces
-vmnetif=YES
-vmnetifname=vmnet1
-vmnetdev=/dev/vmnet1
-vmnetifconfig="inet 172.16.212.1 netmask 0xffffff00"
-vmnetif_use_dhcpd=NO
-
-Then, reboot your system.
-===========================================================================
-EOF
-	;;
-esac
diff --git a/emulators/vmware-module/MESSAGE b/emulators/vmware-module/MESSAGE
new file mode 100644
index 00000000000..9ec3c4155f5
--- /dev/null
+++ b/emulators/vmware-module/MESSAGE
@@ -0,0 +1,23 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2006/07/05 06:53:12 jlam Exp $
+
+To use ${PKGNAME}, you will need to copy the following files from
+${PREFIX}/etc/rc.d to /etc/rc.d:
+
+	linuxrtc vmmon vmnet vmnetif
+
+and append the following content to /etc/rc.conf:
+
+	vmware_prefix="${PREFIX}"
+	vmmon=YES
+	vmnet=YES
+	linuxrtc=NO
+	# XXX should cater for multiple interfaces
+	vmnetif=YES
+	vmnetifname=vmnet1
+	vmnetdev=/dev/vmnet1
+	vmnetifconfig="inet 172.16.212.1 netmask 0xffffff00"
+	vmnetif_use_dhcpd=NO
+
+Then, reboot your system.
+===========================================================================
diff --git a/emulators/vmware-module/Makefile b/emulators/vmware-module/Makefile
index 98c6f2632e7..5d46fccd353 100644
--- a/emulators/vmware-module/Makefile
+++ b/emulators/vmware-module/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/05/18 20:29:58 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2006/07/05 06:53:12 jlam Exp $
 
 DISTNAME=	vmware-netbsd-1.2
 PKGNAME=	vmware-module-1.2
@@ -18,8 +18,6 @@ ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
 WRKSRC=		${WRKDIR}
 NO_CONFIGURE=	yes
-DEINSTALL_SRC=	# empty
-INSTALL_SRC=	${PKGDIR}/INSTALL
 
 NO_SRC_ON_FTP=		already there
 
@@ -69,9 +67,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/rc.conf.d/vmware.patched \
 		${PREFIX}/etc/rc.conf.d/vmware
 
-post-install:
-	PKG_PREFIX="${PREFIX}" ${SH} ${INSTALL_FILE} - POST-INSTALL
-
 .include "../../mk/bsd.pkg.mk"
 
 LDFLAGS=	# empty since we use BSD-style makefiles
diff --git a/emulators/vmware-module3/INSTALL b/emulators/vmware-module3/INSTALL
deleted file mode 100644
index 73929740cce..00000000000
--- a/emulators/vmware-module3/INSTALL
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: INSTALL,v 1.2 2003/08/30 20:22:52 jlam Exp $
-
-case $2 in
-POST-INSTALL)
-	/bin/cat << EOF
-===========================================================================
-Copy the following files from ${PKG_PREFIX}/etc/rc.d to /etc/rc.d:
-
-linuxrtc vmmon vmnet vmnetif
-
-and append the content of ${PKG_PREFIX}/etc/rc.conf.d/vmware to /etc/rc.conf:
-
-vmware_prefix=${PKG_PREFIX}
-vmmon=YES
-vmnet=YES
-linuxrtc=NO
-# XXX should cater for multiple interfaces
-vmnetif=YES
-vmnetifname=vmnet1
-vmnetdev=/dev/vmnet1
-vmnetifconfig="inet 172.16.212.1 netmask 0xffffff00"
-vmnetif_use_dhcpd=NO
-
-Then, reboot your system.
-===========================================================================
-EOF
-	;;
-esac
diff --git a/emulators/vmware-module3/MESSAGE b/emulators/vmware-module3/MESSAGE
new file mode 100644
index 00000000000..9ec3c4155f5
--- /dev/null
+++ b/emulators/vmware-module3/MESSAGE
@@ -0,0 +1,23 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2006/07/05 06:53:12 jlam Exp $
+
+To use ${PKGNAME}, you will need to copy the following files from
+${PREFIX}/etc/rc.d to /etc/rc.d:
+
+	linuxrtc vmmon vmnet vmnetif
+
+and append the following content to /etc/rc.conf:
+
+	vmware_prefix="${PREFIX}"
+	vmmon=YES
+	vmnet=YES
+	linuxrtc=NO
+	# XXX should cater for multiple interfaces
+	vmnetif=YES
+	vmnetifname=vmnet1
+	vmnetdev=/dev/vmnet1
+	vmnetifconfig="inet 172.16.212.1 netmask 0xffffff00"
+	vmnetif_use_dhcpd=NO
+
+Then, reboot your system.
+===========================================================================
diff --git a/emulators/vmware-module3/Makefile b/emulators/vmware-module3/Makefile
index 2e017316dda..0bf97f16bed 100644
--- a/emulators/vmware-module3/Makefile
+++ b/emulators/vmware-module3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/03/26 21:34:51 veego Exp $
+# $NetBSD: Makefile,v 1.21 2006/07/05 06:53:12 jlam Exp $
 
 DISTNAME=	vmware-netbsd-3.2.1.8
 PKGNAME=	vmware-module-3.2.1.8
@@ -15,8 +15,6 @@ CONFLICTS=	vmware-module-1.*
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
 NO_CONFIGURE=	yes
-DEINSTALL_SRC=	# empty
-INSTALL_SRC=	${PKGDIR}/INSTALL
 
 NO_SRC_ON_FTP=		already there
 
@@ -63,9 +61,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/rc.conf.d/vmware.patched \
 		${PREFIX}/etc/rc.conf.d/vmware
 
-post-install:
-	PKG_PREFIX="${PREFIX}" ${SH} ${INSTALL_FILE} - POST-INSTALL
-
 .include "../../mk/bsd.pkg.mk"
 
 LDFLAGS=	# empty since we use BSD-style makefiles