Update to 20020901.

* Fix menu size calculation.
* Introduce peace-setup script.
* The source archive is ready for anonymous CVS.

5 files changed, 16 insertions, 50 deletions

diff --git a/emulators/peace/INSTALL b/emulators/peace/INSTALL
deleted file mode 100644
index c2a4e312323..00000000000
--- a/emulators/peace/INSTALL
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: INSTALL,v 1.1.1.1 2002/08/21 15:17:46 kent Exp $
-# $PEACE: INSTALL,v 1.2 2002/08/21 03:54:08 kent Exp $
-
-PKGNAME=$1
-STAGE=$2
-
-LN=/bin/ln
-MKDIR=/bin/mkdir
-MODLOAD=/sbin/modload
-PECOFF=${PKG_PREFIX}/emul/pecoff
-PEACEREG=/var/db/peace/reg
-DLLPATH=${PECOFF}/usr/lib; export DLLPATH
-PEACE_LOCALE=en_US; export PEACE_LOCALE
-
-case ${STAGE} in
-PRE-INSTALL)
-	;;
-POST-INSTALL)
-	${MKDIR} /emul
-	${LN} -sf ${PKG_PREFIX}/emul/pecoff /emul/pecoff
-	${MODLOAD} /usr/lkm/compat_pecoff.o
-	${MODLOAD} /usr/lkm/exec_pecoff.o
-	${MKDIR} -p ${PEACEREG}/config
-	${MKDIR} -p ${PEACEREG}/machine
-	${MKDIR} -p ${PEACEREG}/root
-	${PECOFF}/usr/bin/regcomserver ${PECOFF}/usr/lib/dsound.dll
-	${PECOFF}/usr/bin/regcomserver ${PECOFF}/usr/lib/ddraw.dll
-	;;
-*)
-	echo "Unexpected argument: ${STAGE}"
-	exit 1
-	;;
-esac
-exit 0
diff --git a/emulators/peace/MESSAGE b/emulators/peace/MESSAGE
index 4428731fc70..67e5d31e68f 100644
--- a/emulators/peace/MESSAGE
+++ b/emulators/peace/MESSAGE
@@ -1,12 +1,17 @@
 ================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2002/08/21 15:17:46 kent Exp $
+$NetBSD: MESSAGE,v 1.2 2002/09/01 15:13:52 kent Exp $
 
 To enable the kernel part of PEACE, run the following:
 	# modload /usr/lkm/compat_pecoff.o
 	# modload /usr/lkm/exec_pecoff.o
+or enable COMPAT_PECOFF in your kernel configuration.
+Then, run ${LOCALBASE}/emul/pecoff/usr/bin/peace-setup to
+initialize PEACE runtime.
 
-This version of PEACE requires TrueType fonts.
-At least you have to set the following environment variables:
+This version of PEACE requires TrueType fonts for GUI
+applications, and supports only TrueColor X server.
+
+You have to set the following environment variables:
 	$DLLPATH $PEACE_FONTPATH $PEACE_LOCALE
 See http://chiharu.hauN.org/peace/install.html `Settings'
 
diff --git a/emulators/peace/Makefile b/emulators/peace/Makefile
index 4f5ebbbcc4f..2705eabe26d 100644
--- a/emulators/peace/Makefile
+++ b/emulators/peace/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/08/21 15:17:46 kent Exp $
-# $PEACE: Makefile,v 1.9 2002/08/21 14:29:13 kent Exp $
+# $NetBSD: Makefile,v 1.2 2002/09/01 15:13:52 kent Exp $
 #
-PEACE_VERSION=	20020821
+PEACE_VERSION=	20020901
 DISTNAME=	peace-0.0.${PEACE_VERSION}
-SITES_peace-20020821.tar.gz=http://cvs.kshosen.ac.jp/src/
+SITES_peace-20020901.tar.gz=http://cvs.kshosen.ac.jp/src/
 CATEGORIES=	emulators
 
 MAINTAINER=	peace-sacrifice@hauN.org
@@ -61,8 +60,5 @@ do-install:
 	${INSTALL_DATA} ${WRKDIR}/etc/icudll/convrtrs.txt ${PECOFFDIR}/usr/pkg/etc/icudll
 	${INSTALL_DATA} ${WRKDIR}/share/icudll/${ICU_VER}/icudt${ICU_SHORT_VER}l.dat \
 		${PECOFFDIR}/usr/pkg/share/icudll/${ICU_VER}
-post-install:
-	PKG_PREFIX=${LOCALBASE} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
-
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/peace/PLIST b/emulators/peace/PLIST
index 259b4181c0f..055b26ca451 100644
--- a/emulators/peace/PLIST
+++ b/emulators/peace/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/08/21 15:17:46 kent Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/09/01 15:13:52 kent Exp $
 emul/pecoff/usr/bin/ldd.pe
+emul/pecoff/usr/bin/peace-setup
 emul/pecoff/usr/bin/regcomserver
 emul/pecoff/usr/bin/regimport
 emul/pecoff/usr/bin/regutil
diff --git a/emulators/peace/distinfo b/emulators/peace/distinfo
index dade79e62a7..005eb2e9f98 100644
--- a/emulators/peace/distinfo
+++ b/emulators/peace/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/08/21 15:17:46 kent Exp $
+$NetBSD: distinfo,v 1.2 2002/09/01 15:13:52 kent Exp $
 
 SHA1 (freetype-dll-2.0.1nb1.tgz) = b9d54962eab12857a2a697b87bdf19e955ace845
 Size (freetype-dll-2.0.1nb1.tgz) = 244477 bytes
@@ -12,5 +12,5 @@ SHA1 (peace-i386-implib-20020124.tar.gz) = 0b5d2991da323accb38bf68cf756136fd468d
 Size (peace-i386-implib-20020124.tar.gz) = 486879 bytes
 SHA1 (i386-netbsdpe-stl-3.3.tgz) = ac7f597dee4b33d2794eb90959c756d263a3a8ca
 Size (i386-netbsdpe-stl-3.3.tgz) = 173766 bytes
-SHA1 (peace-20020821.tar.gz) = 125b480bb38425d948782ceb1ea3a199fc48eb11
-Size (peace-20020821.tar.gz) = 1202746 bytes
+SHA1 (peace-20020901.tar.gz) = fd32e56e40a661bb4d3ea7d1de4969be6f446740
+Size (peace-20020901.tar.gz) = 615397 bytes