Update to version 1.2:

 This new release includes an updated code generator (based on gcc 3.2.3)
 which is a big step toward supporting amd64 platforms. (Sorry, they're not
 supported quite yet in this release.)
 A few bugs have been fixed, of course. It should be easier now to build
 Ezm3 on the newer Linux distributions.
 You must use CVSup 16.1h or later with this version of Ezm3. Earlier
 versions of CVSup will not build properly with Ezm3 1.2.

pkgsrc changes:
- Add untested OpenBSD support
- Make the PLIST files more uniform, so it would be easier to merge a few
  of the PLIST.OPSYS entries into PLIST.common
- buildlink3.mk was not changed, because we use CVSup 16.1h since two years

No answer from the 'maintainer' when i send him the patch two weeks ago
and this release is now over 18 month old.

8 files changed, 159 insertions, 167 deletions

diff --git a/lang/ezm3/Makefile b/lang/ezm3/Makefile
index 2d5cf226532..7ece87b85b4 100644
--- a/lang/ezm3/Makefile
+++ b/lang/ezm3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:25 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2006/01/02 23:19:41 veego Exp $
 
-DISTNAME=	ezm3-1.1
-PKGREVISION=	1
+DISTNAME=	ezm3-1.2
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.FreeBSD.org/pub/FreeBSD/development/CVSup/ezm3/
 DISTFILES=	${DISTNAME}-src.tar.bz2 ${BOOTSTRAP}
@@ -25,16 +24,21 @@ EZM3ROOT=		${PREFIX}/ezm3
 BUILDLINK_PASSTHRU_DIRS+=	${EZM3ROOT}
 
 # XXX: This may well work for some others.
-ONLY_FOR_PLATFORM=      FreeBSD-*-i386 NetBSD-*-i386 Linux-*-i386 DragonFly-*-i386
+ONLY_FOR_PLATFORM=      FreeBSD-*-i386 NetBSD-*-i386 OpenBSD-*-i386 \
+			Linux-*-i386 DragonFly-*-i386
 
 .if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
 BOOTSTRAP=	${DISTNAME}-FreeBSD4-boot.tar.bz2
 TARGET=		FreeBSD4
-TARGETDIR=	freebsd-1
+TARGETDIR=	freebsd-4
 .elif ${OPSYS} == "NetBSD"
 BOOTSTRAP=      ${DISTNAME}-NetBSDi386-boot.tar.bz2
 TARGET=         NetBSDi386
 TARGETDIR=      netbsd-1
+.elif ${OPSYS} == "OpenBSD"
+BOOTSTRAP=      ${DISTNAME}-OpenBSD_386-boot.tar.bz2
+TARGET=         OpenBSD_386
+TARGETDIR=      openbsd-2
 .elif ${OPSYS} == "Linux"
 BOOTSTRAP=	${DISTNAME}-LINUXLIBC6-boot.tar.bz2
 TARGET=		LINUXLIBC6
diff --git a/lang/ezm3/PLIST.DragonFly b/lang/ezm3/PLIST.DragonFly
index 7290fc9def4..0524f167c15 100644
--- a/lang/ezm3/PLIST.DragonFly
+++ b/lang/ezm3/PLIST.DragonFly
@@ -1,27 +1,27 @@
-@comment $NetBSD: PLIST.DragonFly,v 1.1 2005/06/05 09:47:16 jmmv Exp $
-ezm3/lib/m3/pkg/m3core/src/unix/freebsd-4.generic/Udir.i3
-ezm3/lib/m3/pkg/m3core/src/unix/freebsd-4.generic/Uerror.i3
-ezm3/lib/m3/pkg/m3core/src/unix/freebsd-4.generic/Uexec.i3
-ezm3/lib/m3/pkg/m3core/src/unix/freebsd-4.generic/Ugrp.i3
-ezm3/lib/m3/pkg/m3core/src/unix/freebsd-4.generic/Uin.i3
-ezm3/lib/m3/pkg/m3core/src/unix/freebsd-4.generic/Ui${LOWER_VENDOR}.i3
-ezm3/lib/m3/pkg/m3core/src/unix/freebsd-4.generic/Umsg.i3
-ezm3/lib/m3/pkg/m3core/src/unix/freebsd-4.generic/Unetdb.i3
-ezm3/lib/m3/pkg/m3core/src/unix/freebsd-4.generic/Uprocess.i3
-ezm3/lib/m3/pkg/m3core/src/unix/freebsd-4.generic/Upwd.i3
-ezm3/lib/m3/pkg/m3core/src/unix/freebsd-4.generic/Uresource.i3
-ezm3/lib/m3/pkg/m3core/src/unix/freebsd-4.generic/Usem.i3
-ezm3/lib/m3/pkg/m3core/src/unix/freebsd-4.generic/Ushm.i3
-ezm3/lib/m3/pkg/m3core/src/unix/freebsd-4.generic/Usocket.i3
-ezm3/lib/m3/pkg/m3core/src/unix/freebsd-4.generic/Usyslog.i3
-ezm3/lib/m3/pkg/m3core/src/unix/freebsd-4.generic/Utime.i3
-ezm3/lib/m3/pkg/m3core/src/unix/freebsd-4.generic/Uugid.i3
-ezm3/lib/m3/pkg/m3core/src/unix/freebsd-4.generic/Uuio.i3
-ezm3/lib/m3/pkg/m3core/src/unix/freebsd-4.generic/Uutmp.i3
-ezm3/lib/m3/pkg/m3core/src/unix/freebsd-4.${MACHINE_ARCH}/Umman.i3
-ezm3/lib/m3/pkg/m3core/src/unix/freebsd-4.${MACHINE_ARCH}/Unix.i3
-ezm3/lib/m3/pkg/m3core/src/unix/freebsd-4.${MACHINE_ARCH}/Usignal.i3
-ezm3/lib/m3/pkg/m3core/src/unix/freebsd-4.${MACHINE_ARCH}/Ustat.i3
-ezm3/lib/m3/pkg/m3core/src/unix/freebsd-4.${MACHINE_ARCH}/Utypes.i3
-@dirrm ezm3/lib/m3/pkg/m3core/src/unix/freebsd-4.${MACHINE_ARCH}
-@dirrm ezm3/lib/m3/pkg/m3core/src/unix/freebsd-4.generic
+@comment $NetBSD: PLIST.DragonFly,v 1.2 2006/01/02 23:19:41 veego Exp $
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.generic/Udir.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.generic/Uerror.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.generic/Uexec.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.generic/Ugrp.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.generic/Uin.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.generic/Uipc.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.generic/Umsg.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.generic/Unetdb.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.generic/Uprocess.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.generic/Upwd.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.generic/Uresource.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.generic/Usem.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.generic/Ushm.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.generic/Usocket.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.generic/Usyslog.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.generic/Utime.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.generic/Uugid.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.generic/Uuio.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.generic/Uutmp.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.${MACHINE_ARCH}/Umman.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.${MACHINE_ARCH}/Unix.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.${MACHINE_ARCH}/Usignal.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.${MACHINE_ARCH}/Ustat.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.${MACHINE_ARCH}/Utypes.i3
+@dirrm ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.${MACHINE_ARCH}
+@dirrm ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.generic
diff --git a/lang/ezm3/PLIST.FreeBSD b/lang/ezm3/PLIST.FreeBSD
index fb27a48c8fe..59e0166a239 100644
--- a/lang/ezm3/PLIST.FreeBSD
+++ b/lang/ezm3/PLIST.FreeBSD
@@ -1,27 +1,27 @@
-@comment $NetBSD: PLIST.FreeBSD,v 1.1 2004/01/06 06:35:47 xtraeme Exp $
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-4.generic/Udir.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-4.generic/Uerror.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-4.generic/Uexec.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-4.generic/Ugrp.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-4.generic/Uin.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-4.generic/Ui${LOWER_VENDOR}.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-4.generic/Umsg.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-4.generic/Unetdb.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-4.generic/Uprocess.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-4.generic/Upwd.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-4.generic/Uresource.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-4.generic/Usem.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-4.generic/Ushm.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-4.generic/Usocket.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-4.generic/Usyslog.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-4.generic/Utime.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-4.generic/Uugid.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-4.generic/Uuio.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-4.generic/Uutmp.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-4.${MACHINE_ARCH}/Umman.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-4.${MACHINE_ARCH}/Unix.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-4.${MACHINE_ARCH}/Usignal.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-4.${MACHINE_ARCH}/Ustat.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-4.${MACHINE_ARCH}/Utypes.i3
-@dirrm ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-4.${MACHINE_ARCH}
-@dirrm ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-4.generic
+@comment $NetBSD: PLIST.FreeBSD,v 1.2 2006/01/02 23:19:41 veego Exp $
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.generic/Udir.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.generic/Uerror.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.generic/Uexec.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.generic/Ugrp.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.generic/Uin.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.generic/Uipc.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.generic/Umsg.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.generic/Unetdb.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.generic/Uprocess.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.generic/Upwd.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.generic/Uresource.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.generic/Usem.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.generic/Ushm.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.generic/Usocket.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.generic/Usyslog.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.generic/Utime.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.generic/Uugid.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.generic/Uuio.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.generic/Uutmp.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.${MACHINE_ARCH}/Umman.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.${MACHINE_ARCH}/Unix.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.${MACHINE_ARCH}/Usignal.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.${MACHINE_ARCH}/Ustat.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.${MACHINE_ARCH}/Utypes.i3
+@dirrm ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.${MACHINE_ARCH}
+@dirrm ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}.generic
diff --git a/lang/ezm3/PLIST.Linux b/lang/ezm3/PLIST.Linux
index 007aaf8445d..4e65c41eb9f 100644
--- a/lang/ezm3/PLIST.Linux
+++ b/lang/ezm3/PLIST.Linux
@@ -1,28 +1,28 @@
-@comment $NetBSD: PLIST.Linux,v 1.1 2004/06/04 17:34:36 jschauma Exp $
-ezm3/lib/m3/pkg/m3core/src/runtime/LINUXLIBC6/socketcall.h
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-libc6/Uresource.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-libc6/Uexec.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-libc6/Utime.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-libc6/Unetdb.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-libc6/Usignal.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-libc6/Uugid.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-libc6/Uprocess.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-libc6/Udir.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-libc6/Usocket.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-libc6/Umsg.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-libc6/Upaths.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-libc6/Usem.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-libc6/Ugrp.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-libc6/Utypes.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-libc6/Uipc.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-libc6/Uuio.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-libc6/Upwd.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-libc6/Uerror.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-libc6/Usyslog.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-libc6/Ushm.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-libc6/Uin.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-libc6/Unix.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-libc6/Ustat.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-libc6/Umman.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-libc6/Uutmp.i3
-@dirrm ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-libc6
+@comment $NetBSD: PLIST.Linux,v 1.2 2006/01/02 23:19:41 veego Exp $
+ezm3/lib/m3/pkg/m3core/src/runtime/${TARGET}/socketcall.h
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Udir.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Uerror.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Uexec.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Ugrp.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Uin.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Uipc.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Umman.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Umsg.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Unetdb.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Unix.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Upaths.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Uprocess.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Upwd.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Uresource.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Usem.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Ushm.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Usignal.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Usocket.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Ustat.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Usyslog.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Utime.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Utypes.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Uugid.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Uuio.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Uutmp.i3
+@dirrm ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}
diff --git a/lang/ezm3/PLIST.NetBSD b/lang/ezm3/PLIST.NetBSD
index 5dc84ae8810..0726b60a285 100644
--- a/lang/ezm3/PLIST.NetBSD
+++ b/lang/ezm3/PLIST.NetBSD
@@ -1,26 +1,26 @@
-@comment $NetBSD: PLIST.NetBSD,v 1.1 2004/01/06 06:35:47 xtraeme Exp $
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-1/Udir.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-1/Uerror.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-1/Uexec.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-1/Ugrp.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-1/Uin.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-1/Uipc.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-1/Umman.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-1/Umsg.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-1/Unetdb.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-1/Unix.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-1/Uprocess.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-1/Upwd.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-1/Uresource.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-1/Usem.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-1/Ushm.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-1/Usignal.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-1/Usocket.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-1/Ustat.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-1/Usyslog.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-1/Utime.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-1/Utypes.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-1/Uugid.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-1/Uuio.i3
-ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-1/Uutmp.i3
-@dirrm ezm3/lib/m3/pkg/m3core/src/unix/${LOWER_OPSYS}-1
+@comment $NetBSD: PLIST.NetBSD,v 1.2 2006/01/02 23:19:41 veego Exp $
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Udir.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Uerror.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Uexec.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Ugrp.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Uin.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Uipc.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Umman.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Umsg.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Unetdb.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Unix.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Uprocess.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Upwd.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Uresource.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Usem.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Ushm.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Usignal.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Usocket.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Ustat.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Usyslog.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Utime.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Utypes.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Uugid.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Uuio.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Uutmp.i3
+@dirrm ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}
diff --git a/lang/ezm3/PLIST.OpenBSD b/lang/ezm3/PLIST.OpenBSD
new file mode 100644
index 00000000000..0b0b7e79744
--- /dev/null
+++ b/lang/ezm3/PLIST.OpenBSD
@@ -0,0 +1,26 @@
+@comment $NetBSD: PLIST.OpenBSD,v 1.1 2006/01/02 23:19:41 veego Exp $
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Udir.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Uerror.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Uexec.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Ugrp.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Uin.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Uipc.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Umman.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Umsg.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Unetdb.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Unix.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Uprocess.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Upwd.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Uresource.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Usem.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Ushm.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Usignal.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Usocket.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Ustat.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Usyslog.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Utime.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Utypes.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Uugid.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Uuio.i3
+ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}/Uutmp.i3
+@dirrm ezm3/lib/m3/pkg/m3core/src/unix/${TARGETDIR}
diff --git a/lang/ezm3/distinfo b/lang/ezm3/distinfo
index 2af4c24215b..4959b4a5d04 100644
--- a/lang/ezm3/distinfo
+++ b/lang/ezm3/distinfo
@@ -1,16 +1,18 @@
-$NetBSD: distinfo,v 1.5 2005/06/05 09:47:16 jmmv Exp $
+$NetBSD: distinfo,v 1.6 2006/01/02 23:19:41 veego Exp $
 
-SHA1 (ezm3/ezm3-1.1-src.tar.bz2) = fbca999ef121c7893d3bb7480b538a54f72fad0e
-RMD160 (ezm3/ezm3-1.1-src.tar.bz2) = 07f07169e2b09aeef4b1d25e2fb515e952b48de4
-Size (ezm3/ezm3-1.1-src.tar.bz2) = 10705295 bytes
-SHA1 (ezm3/ezm3-1.1-NetBSDi386-boot.tar.bz2) = 1a8c10544fadc618012bd0efd7d9267f7b210ccc
-RMD160 (ezm3/ezm3-1.1-NetBSDi386-boot.tar.bz2) = b25508a74a813d4e8f49a172834bbdd19ec3b36e
-Size (ezm3/ezm3-1.1-NetBSDi386-boot.tar.bz2) = 1375659 bytes
-SHA1 (ezm3/ezm3-1.1-FreeBSD4-boot.tar.bz2) = db12938fb76f6e8187b30c9c9db6ccf029100238
-RMD160 (ezm3/ezm3-1.1-FreeBSD4-boot.tar.bz2) = dd1648ef5b115cb7869d9af93c7447cb33d7c814
-Size (ezm3/ezm3-1.1-FreeBSD4-boot.tar.bz2) = 1365809 bytes
-SHA1 (ezm3/ezm3-1.1-LINUXLIBC6-boot.tar.bz2) = 602d37277e8c94743fa9a6ac79e4e7a46f9c9234
-RMD160 (ezm3/ezm3-1.1-LINUXLIBC6-boot.tar.bz2) = 3b4d8382cefac10458200226297f7c3cdc1e9c6c
-Size (ezm3/ezm3-1.1-LINUXLIBC6-boot.tar.bz2) = 1444815 bytes
-SHA1 (patch-aa) = fac6afee90c6d5518ccaf4a02e4846917a24136e
+SHA1 (ezm3/ezm3-1.2-src.tar.bz2) = 2a284baac3be18a17e1fa49ab3b0b346f1a5dd68
+RMD160 (ezm3/ezm3-1.2-src.tar.bz2) = a94b86a5f177e4f3ed242d93e21b079ee37c4454
+Size (ezm3/ezm3-1.2-src.tar.bz2) = 10727649 bytes
+SHA1 (ezm3/ezm3-1.2-FreeBSD4-boot.tar.bz2) = d2e5322d0c356e4e151763f7dc377ac76c226646
+RMD160 (ezm3/ezm3-1.2-FreeBSD4-boot.tar.bz2) = c1c9272e7dd918cbd47c2d972831591aa2354535
+Size (ezm3/ezm3-1.2-FreeBSD4-boot.tar.bz2) = 1366495 bytes
+SHA1 (ezm3/ezm3-1.2-NetBSDi386-boot.tar.bz2) = fcbcbc1156b185101656dd7014a89fd6c5a8a901
+RMD160 (ezm3/ezm3-1.2-NetBSDi386-boot.tar.bz2) = ee23323ef758e841f86577134f5817ee1c1a12fc
+Size (ezm3/ezm3-1.2-NetBSDi386-boot.tar.bz2) = 1375781 bytes
+SHA1 (ezm3/ezm3-1.2-OpenBSD_386-boot.tar.bz2) = 51f3119a97a79f120666460bbef6294d8360fd9f
+RMD160 (ezm3/ezm3-1.2-OpenBSD_386-boot.tar.bz2) = f768b86b987b0990c719c4d486357f5c41e8b007
+Size (ezm3/ezm3-1.2-OpenBSD_386-boot.tar.bz2) = 1345247 bytes
+SHA1 (ezm3/ezm3-1.2-LINUXLIBC6-boot.tar.bz2) = de6080f0e3e2bf6c2ac8a26f975b1cfe6789f483
+RMD160 (ezm3/ezm3-1.2-LINUXLIBC6-boot.tar.bz2) = bc3f240dce4c49df40d351d52f4edaf6be858a9b
+Size (ezm3/ezm3-1.2-LINUXLIBC6-boot.tar.bz2) = 1445569 bytes
 SHA1 (patch-ab) = d7ca4b997caacdd9a6eb16d13530dc1e9343ea1a
diff --git a/lang/ezm3/patches/patch-aa b/lang/ezm3/patches/patch-aa
deleted file mode 100644
index adecc81b3fb..00000000000
--- a/lang/ezm3/patches/patch-aa
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/01/05 23:54:27 xtraeme Exp $
-
---- language/modula3/m3compiler/m3ship/src/Main.m3.orig	Mon Jun  7 10:11:49 1999
-+++ language/modula3/m3compiler/m3ship/src/Main.m3	Sat Sep  8 14:46:14 2001
-@@ -303,9 +303,10 @@
-     m3_template := Env.Get("M3_TEMPLATE_DIR");
-     path        : TEXT;
-     subpath     : TEXT;
--    nextsep     : INTEGER := 0;
--    prevsep     : INTEGER := 0;
-+    nextsep     : INTEGER;
-+    prevsep     : INTEGER := -1;
-     sep         : CHAR;
-+    filename    : TEXT;
-   BEGIN
-     IF m3_template # NIL THEN
-       template_dir := m3_template;
-@@ -322,13 +323,17 @@
-       REPEAT
-         nextsep := Text.FindChar(path, sep, prevsep + 1);
-         IF nextsep # -1 THEN
--          subpath := Text.Sub(path, prevsep, nextsep - prevsep - 1);
-+          subpath := Text.Sub(path, prevsep + 1, nextsep - prevsep - 1);
-         ELSE
--          subpath := Text.Sub(path, prevsep);
-+          subpath := Text.Sub(path, prevsep + 1);
-         END;
--        IF M3File.IsReadable(subpath & template) THEN
--          template_dir := subpath;
--          RETURN;
-+        IF Text.Length(subpath) > 0 THEN
-+          filename := subpath & SL & template;
-+          IF M3File.IsReadable(filename) AND
-+            NOT M3File.IsDirectory(filename) THEN
-+            template_dir := subpath;
-+            RETURN;
-+          END;
-         END;
-         prevsep := nextsep;
-       UNTIL prevsep = -1;