- Do not run the setup from PKGINSTALL, add instead a note in pkg-message,

  which is now processed with SUB_FILES.
- Add a note after deinstalling about possible remaining files (configs, etc).
- Fix pkg-plist.

3 files changed, 12 insertions, 12 deletions

diff --git a/emulators/win4bsd/Makefile b/emulators/win4bsd/Makefile
index d99ebe8625ae..922bf5338353 100644
--- a/emulators/win4bsd/Makefile
+++ b/emulators/win4bsd/Makefile
@@ -25,9 +25,10 @@ NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 RESTRICTED=	Redistribution is not allowed
 
-PKGINSTALL=	${WRKSRC}/+POST-INSTALL
 PKGDEINSTALL=	${WRKSRC}/+POST-DEINSTALL
 
+SUB_FILES=	pkg-message
+
 .include <bsd.port.pre.mk>
 
 .if !exists(/usr/src/sys/kern)
@@ -47,7 +48,6 @@ do-install:
 	${CP} -R ${WRKSRC}/usr/share/* ${PREFIX}/share
 
 post-install:
-	@${SH} ${PKGINSTALL}
 	@${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}
 
 .include <bsd.port.post.mk>
diff --git a/emulators/win4bsd/pkg-message b/emulators/win4bsd/files/pkg-message.in
index 7527af20a834..45562badbe33 100644
--- a/emulators/win4bsd/pkg-message
+++ b/emulators/win4bsd/files/pkg-message.in
@@ -8,4 +8,9 @@ For licensing information, please visit:
 
 To get started installing Windows, see the documentation at the web.
 
+For completing the installation, ensure "mergeprod" is not running,
+and run the following command for the initial setup:
+
+$ %%PREFIX%%/lib/win4bsd/bin/postinstall.sh
+
 =======================================================================
diff --git a/emulators/win4bsd/pkg-plist b/emulators/win4bsd/pkg-plist
index 7e0c556ad789..3a76dd4691ca 100644
--- a/emulators/win4bsd/pkg-plist
+++ b/emulators/win4bsd/pkg-plist
@@ -1,4 +1,3 @@
-@unexec killall mergeprod
 lib/win4bsd/bin/ask_license.sh
 lib/win4bsd/bin/build_kqemu.sh
 lib/win4bsd/bin/check_license
@@ -58,7 +57,6 @@ lib/win4bsd/bin/winpro-desktop.sh
 lib/win4bsd/docs/Changelog.html
 lib/win4bsd/docs/Changelog.txt
 lib/win4bsd/docs/Help-Center-en.html
-lib/win4bsd/docs/Help-Center.html
 lib/win4bsd/docs/Release-Notes.html
 lib/win4bsd/docs/Release-Notes.txt
 lib/win4bsd/docs/Users-Guide.html
@@ -271,10 +269,6 @@ share/pixmaps/mergepro-16x16.xpm
 share/pixmaps/mergepro-32x32.xpm
 share/pixmaps/mergepro-64x64.png
 share/pixmaps/mergepro-64x64.xpm
-win4bsd/images/BLANK.IMG
-win4bsd/images/INSTALL.IMG
-win4bsd/images/MERGEPRO.IMG
-win4bsd/run/mergeprod.pid
 @dirrm lib/win4bsd/win32
 @dirrm lib/win4bsd/lib/sys
 @dirrm lib/win4bsd/lib/codepages
@@ -284,8 +278,9 @@ win4bsd/run/mergeprod.pid
 @dirrm lib/win4bsd/etc/keymaps
 @dirrm lib/win4bsd/etc/jail
 @dirrm lib/win4bsd/etc
-@dirrm lib/win4bsd/docs
+@dirrmtry lib/win4bsd/docs
 @dirrm lib/win4bsd/bin
-@dirrm lib/win4bsd
-@cwd /
-boot/kernel/kqemu.ko
+@dirrmtry lib/win4bsd
+@dirrmtry share/applications/kde
+@dirrmtry share/applications
+@unexec echo "If you are permanently removing this port check the following files/dirs that could be left over (if the setup was executed): \"/boot/kernel/kqemu.ko\", \"%D/win4bsd\", \"%D/lib/win4bsd/docs\", \"/etc/default/mergepro\"." | fmt