Update to 20030828 snaphot, which runs with not NetBSD 1.6 but -current.

Major change:
 * Support for runtime link with ELF libraries.

3 files changed, 16 insertions, 70 deletions

diff --git a/emulators/peace/Makefile b/emulators/peace/Makefile
index 63cab3c2232..168a31f3522 100644
--- a/emulators/peace/Makefile
+++ b/emulators/peace/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/05/11 08:51:48 jmc Exp $
+# $NetBSD: Makefile,v 1.6 2003/08/28 15:23:57 kent Exp $
 #
-BROKEN=		work in progress for updating to the latest
-PEACE_VERSION=	20020901
+PEACE_VERSION=	20030828
 DISTNAME=	peace-0.0.${PEACE_VERSION}
-SITES_peace-20020901.tar.gz=http://cvs.kshosen.ac.jp/src/
+SITES_peace-20030828.tar.gz=http://cvs.kshosen.ac.jp/PEACE/src/
 WRKSRC=		${WRKDIR}/peace
 CATEGORIES=	emulators
 
@@ -11,55 +10,33 @@ MAINTAINER=	peace-sacrifice@hauN.org
 HOMEPAGE=	http://chiharu.hauN.org/peace/
 COMMENT=	Enable to run Win32 executables
 
-ICU_VER=	1.8.1
-ICU_SHORT_VER=	18
-DISTFILES+=	freetype-dll-2.0.1nb1.tgz \
-		icu-dll-${ICU_VER}nb3.tgz \
-		icu-data-${ICU_VER}nb1.tgz \
-		peace-i386-sysdll-20020715.tgz \
-		peace-i386-implib-20020124.tar.gz \
-		i386-netbsdpe-stl-3.3.tgz \
+DISTFILES+=	i386-netbsdpe-stl-3.3.tgz \
 		peace-${PEACE_VERSION}.tar.gz
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=peace/}
+ONLY_FOR_PLATFORM=      NetBSD-1.6[Q-Z]*-* NetBSD-[2-9]*-*
 # bin/showstack requires perl5
 # DEPENDS+=	perl5:../../lang/perl5
-ONLY_FOR_PLATFORM=      NetBSD-1.6[Q-Z]*-* NetBSD-[2-9]*-*
+DEPENDS+=	icu>=2.4nb1:../../textproc/icu
 
 BUILD_DEPENDS=	cross-i386-netbsdpe>=1.3:../../cross/i386-netbsdpe
-BUILD_DEPENDS+=	w32api>=1.5nb1:../../devel/w32api
-CFLAGS+=	-I${WRKDIR}/cross/i386-netbsdpe/include \
+BUILD_DEPENDS+=	w32api>=1.5nb2:../../devel/w32api
+BUILD_DEPENDS+= x11-links-*:../../x11-links
+CPPFLAGS+=	-I${WRKDIR}/cross/i386-netbsdpe/include \
 		-I${WRKDIR}/cross/i386-netbsdpe/include/c++
-LDFLAGS=	-L. -L${WRKSRC}/lib
+LDFLAGS=	-L${WRKSRC}/lib
 PECOFFDIR=	${PREFIX}/emul/pecoff
 MAKE_FLAGS+=	PECOFFDIR=${PECOFFDIR} \
+		LOCALBASE=${LOCALBASE} \
 		CROSSBASE=${CROSSBASE} \
+		X11BASE=${X11BASE} \
 		CHECK_DEPENDENTS=NO
 MAKE_COMMAND=	${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS}
 
-do-configure:
-# import libraries in peace-i386-implib
-	${CP} ${WRKDIR}/lib/*.a ${WRKSRC}/lib
-# import libraries in icu and freetype
-	${CP} ${WRKDIR}/cross/i386-netbsdpe/lib/*.a ${WRKSRC}/lib
-# static libc
-	${CP} ${WRKDIR}/linklib/NetBSD-libc/obj/libc.a ${WRKSRC}/linklib/NetBSD-libc/
-
-do-build:
-	${_PKG_SILENT}cd ${WRKSRC}/libexec/ld.pe_so && ${MAKE_COMMAND}
-	${_PKG_SILENT}cd ${WRKSRC}/dll && ${MAKE_COMMAND}
-	${_PKG_SILENT}cd ${WRKSRC}/bin && ${MAKE_COMMAND}
-
 do-install:
 	${INSTALL_PROGRAM_DIR} ${PECOFFDIR}/usr/libexec
 	cd ${WRKSRC}/libexec/ld.pe_so && ${MAKE_COMMAND} install
 	${INSTALL_DATA_DIR} ${PECOFFDIR}/usr/lib
 	${_PKG_SILENT}cd ${WRKSRC}/dll && ${MAKE_COMMAND} install
 	${_PKG_SILENT}cd ${WRKSRC}/bin && ${MAKE_COMMAND} install
-	${INSTALL_DATA} ${WRKDIR}/lib/*.dll ${WRKDIR}/*.dll ${PECOFFDIR}/usr/lib
-	${INSTALL_DATA_DIR} ${PECOFFDIR}/usr/pkg/etc/icudll
-	${INSTALL_DATA_DIR} ${PECOFFDIR}/usr/pkg/share/icudll/${ICU_VER}
-	${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}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/peace/PLIST b/emulators/peace/PLIST
index 055b26ca451..59a9ec5484e 100644
--- a/emulators/peace/PLIST
+++ b/emulators/peace/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/09/01 15:13:52 kent Exp $
-emul/pecoff/usr/bin/ldd.pe
+@comment $NetBSD: PLIST,v 1.3 2003/08/28 15:23:57 kent Exp $
 emul/pecoff/usr/bin/peace-setup
 emul/pecoff/usr/bin/regcomserver
 emul/pecoff/usr/bin/regimport
@@ -15,16 +14,6 @@ emul/pecoff/usr/lib/dsound.dll
 emul/pecoff/usr/lib/gdi32.dll
 emul/pecoff/usr/lib/imm32.dll
 emul/pecoff/usr/lib/kernel32.dll
-emul/pecoff/usr/lib/libX11.dll
-emul/pecoff/usr/lib/libXext.dll
-emul/pecoff/usr/lib/libc.dll
-emul/pecoff/usr/lib/libfreetype.dll
-emul/pecoff/usr/lib/libicui18n18.dll
-emul/pecoff/usr/lib/libicuuc18.dll
-emul/pecoff/usr/lib/libustdio18.dll
-emul/pecoff/usr/lib/libm.dll
-emul/pecoff/usr/lib/libpthread.dll
-emul/pecoff/usr/lib/libz.dll
 emul/pecoff/usr/lib/lz32.dll
 emul/pecoff/usr/lib/mpr.dll
 emul/pecoff/usr/lib/msacm32.dll
@@ -38,16 +27,6 @@ emul/pecoff/usr/lib/winmm.dll
 emul/pecoff/usr/lib/winspool.drv
 emul/pecoff/usr/lib/wsock32.dll
 emul/pecoff/usr/libexec/ld.so.dll
-emul/pecoff/usr/share/man/man1/ldd.pe.1
-emul/pecoff/usr/share/man/cat1/ldd.pe.0
-emul/pecoff/usr/pkg/etc/icudll/convrtrs.txt
-emul/pecoff/usr/pkg/share/icudll/1.8.1/icudt18l.dat
-@dirrm emul/pecoff/usr/pkg/etc/icudll
-@dirrm emul/pecoff/usr/pkg/etc
-@dirrm emul/pecoff/usr/pkg/share/icudll/1.8.1
-@dirrm emul/pecoff/usr/pkg/share/icudll
-@dirrm emul/pecoff/usr/pkg/share/
-@dirrm emul/pecoff/usr/pkg
 @dirrm emul/pecoff/usr/share/man/cat1
 @dirrm emul/pecoff/usr/share/man/man1
 @dirrm emul/pecoff/usr/share/man
diff --git a/emulators/peace/distinfo b/emulators/peace/distinfo
index 005eb2e9f98..0068e4588d0 100644
--- a/emulators/peace/distinfo
+++ b/emulators/peace/distinfo
@@ -1,16 +1,6 @@
-$NetBSD: distinfo,v 1.2 2002/09/01 15:13:52 kent Exp $
+$NetBSD: distinfo,v 1.3 2003/08/28 15:23:57 kent Exp $
 
-SHA1 (freetype-dll-2.0.1nb1.tgz) = b9d54962eab12857a2a697b87bdf19e955ace845
-Size (freetype-dll-2.0.1nb1.tgz) = 244477 bytes
-SHA1 (icu-dll-1.8.1nb3.tgz) = b9f6ea25c06109eedc2e4e4188a636556e90499f
-Size (icu-dll-1.8.1nb3.tgz) = 1573220 bytes
-SHA1 (icu-data-1.8.1nb1.tgz) = 9512d7fb39df1151b87091ed44f729835b4890b3
-Size (icu-data-1.8.1nb1.tgz) = 3266011 bytes
-SHA1 (peace-i386-sysdll-20020715.tgz) = 66d5595691a4ec55c0f001938d94b20893ab5fd6
-Size (peace-i386-sysdll-20020715.tgz) = 728280 bytes
-SHA1 (peace-i386-implib-20020124.tar.gz) = 0b5d2991da323accb38bf68cf756136fd468d254
-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-20020901.tar.gz) = fd32e56e40a661bb4d3ea7d1de4969be6f446740
-Size (peace-20020901.tar.gz) = 615397 bytes
+SHA1 (peace-20030828.tar.gz) = 6aae8b4532d421c20c935d104ad44caf841b3229
+Size (peace-20030828.tar.gz) = 574390 bytes