Upgrade to ezm3 1.1. This adds support for FreeBSD/sparc64.

Because of an unavoidable API change in this release, CVSup versions
prior to 16.1h probably won't build using this version of ezm3.

3 files changed, 43 insertions, 54 deletions

diff --git a/lang/ezm3/Makefile b/lang/ezm3/Makefile
index 73130625d022..31f9cb32b2ce 100644
--- a/lang/ezm3/Makefile
+++ b/lang/ezm3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ezm3
-PORTVERSION=	1.0
+PORTVERSION=	1.1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_FREEBSD_ORG}
 MASTER_SITE_SUBDIR=development/CVSup/ezm3
@@ -20,7 +20,7 @@ DIST_SUBDIR=	ezm3
 INSTALL_TARGET=	all
 MAKE_ARGS+=	M3OPTIONS="-DBUILD_ALL -DSHIP_ALL"
 MAN1=		m3bundle.1
-PLIST_SUB+=	TARGET=${TARGET} TARGETDIR=${TARGETDIR} WORDSIZE=${WORDSIZE}
+PLIST_SUB+=	ARCH=${ARCH} TARGET=${TARGET} WORDSIZE=${WORDSIZE}
 SCRIPTS_ENV+=	TARGET=${TARGET}
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -33,34 +33,23 @@ BOOTSTRAP=	ezm3-${PORTVERSION}-${TARGET}-boot.tar.bz2
 
 .include <bsd.port.pre.mk>
 
-.if ${PORTOBJFORMAT} == "aout"
-TARGET=		FreeBSD2
-TARGETDIR=	freebsd-2
-WORDSIZE=	32
+ONLY_FOR_ARCHS=	alpha i386 sparc64
+
+.if ${OSVERSION} < 410000
+BROKEN=		Not supported on versions earlier than 4.1-RELEASE
+.endif
+
+.if ${ARCH} == "alpha"
+TARGET=		FBSD_ALPHA
+WORDSIZE=	64
 .elif ${ARCH} == "i386"
-.if ${OSVERSION} < 400011
-TARGET=		FreeBSD3
-TARGETDIR=	freebsd-3
-.else
 TARGET=		FreeBSD4
-TARGETDIR=	freebsd-4
-.endif
 WORDSIZE=	32
-.elif ${ARCH} == "alpha"
-.if ${OSVERSION} < 400011
-BROKEN=		Not supported on older versions of FreeBSD/Alpha
-.endif
-TARGET=		FBSD_ALPHA
-TARGETDIR=	fbsd-alpha
+.elif ${ARCH} == "sparc64"
+TARGET=		FBSD_SPARC64
 WORDSIZE=	64
 .endif
 
-.if !defined(TARGET)
-pre-fetch:
-	@${ECHO_MSG} "Cannot determine M3 target for this architecture"
-	@${FALSE}
-.endif
-
 do-build:
 	@${ECHO_MSG} "This port does everything in the install step."
 	@${ECHO_MSG} "The build step is a no-op."
diff --git a/lang/ezm3/distinfo b/lang/ezm3/distinfo
index b89409a25caa..f7274dc70158 100644
--- a/lang/ezm3/distinfo
+++ b/lang/ezm3/distinfo
@@ -1,5 +1,4 @@
-MD5 (ezm3/ezm3-1.0-FBSD_ALPHA-boot.tar.bz2) = ad8ae879904a02cf7823908792437476
-MD5 (ezm3/ezm3-1.0-FreeBSD2-boot.tar.bz2) = 695f1afea6cb6f6c5b36048d30de31ee
-MD5 (ezm3/ezm3-1.0-FreeBSD3-boot.tar.bz2) = 6346625515e34c76c7211306b9adbbc2
-MD5 (ezm3/ezm3-1.0-FreeBSD4-boot.tar.bz2) = d8924f0dad6d880f724802affc3e458f
-MD5 (ezm3/ezm3-1.0-src.tar.bz2) = 7f85f69e420b00a51481dad92f7eb749
+MD5 (ezm3/ezm3-1.1-FBSD_ALPHA-boot.tar.bz2) = bc94ea3333dfb8216e523deafcf93116
+MD5 (ezm3/ezm3-1.1-FBSD_SPARC64-boot.tar.bz2) = 1dce08c7b56b48f1597fe3dff6ac2ef7
+MD5 (ezm3/ezm3-1.1-FreeBSD4-boot.tar.bz2) = e04522a09a2ed8b11c36b9b0dcebf2e1
+MD5 (ezm3/ezm3-1.1-src.tar.bz2) = 0cb8d2af3784142144c01ffac4c0ffff
diff --git a/lang/ezm3/pkg-plist b/lang/ezm3/pkg-plist
index d0dd32e7a56b..73c640313ed8 100644
--- a/lang/ezm3/pkg-plist
+++ b/lang/ezm3/pkg-plist
@@ -361,30 +361,30 @@ lib/m3/pkg/m3core/src/time/Common/FmtTime.i3
 lib/m3/pkg/m3core/src/time/Common/Tick.i3
 lib/m3/pkg/m3core/src/time/Common/Time.i3
 lib/m3/pkg/m3core/src/time/POSIX/TimePosix.i3
-lib/m3/pkg/m3core/src/unix/%%TARGETDIR%%/Udir.i3
-lib/m3/pkg/m3core/src/unix/%%TARGETDIR%%/Uerror.i3
-lib/m3/pkg/m3core/src/unix/%%TARGETDIR%%/Uexec.i3
-lib/m3/pkg/m3core/src/unix/%%TARGETDIR%%/Ugrp.i3
-lib/m3/pkg/m3core/src/unix/%%TARGETDIR%%/Uin.i3
-lib/m3/pkg/m3core/src/unix/%%TARGETDIR%%/Uipc.i3
-lib/m3/pkg/m3core/src/unix/%%TARGETDIR%%/Umman.i3
-lib/m3/pkg/m3core/src/unix/%%TARGETDIR%%/Umsg.i3
-lib/m3/pkg/m3core/src/unix/%%TARGETDIR%%/Unetdb.i3
-lib/m3/pkg/m3core/src/unix/%%TARGETDIR%%/Unix.i3
-lib/m3/pkg/m3core/src/unix/%%TARGETDIR%%/Uprocess.i3
-lib/m3/pkg/m3core/src/unix/%%TARGETDIR%%/Upwd.i3
-lib/m3/pkg/m3core/src/unix/%%TARGETDIR%%/Uresource.i3
-lib/m3/pkg/m3core/src/unix/%%TARGETDIR%%/Usem.i3
-lib/m3/pkg/m3core/src/unix/%%TARGETDIR%%/Ushm.i3
-lib/m3/pkg/m3core/src/unix/%%TARGETDIR%%/Usignal.i3
-lib/m3/pkg/m3core/src/unix/%%TARGETDIR%%/Usocket.i3
-lib/m3/pkg/m3core/src/unix/%%TARGETDIR%%/Ustat.i3
-lib/m3/pkg/m3core/src/unix/%%TARGETDIR%%/Usyslog.i3
-lib/m3/pkg/m3core/src/unix/%%TARGETDIR%%/Utime.i3
-lib/m3/pkg/m3core/src/unix/%%TARGETDIR%%/Utypes.i3
-lib/m3/pkg/m3core/src/unix/%%TARGETDIR%%/Uugid.i3
-lib/m3/pkg/m3core/src/unix/%%TARGETDIR%%/Uuio.i3
-lib/m3/pkg/m3core/src/unix/%%TARGETDIR%%/Uutmp.i3
+lib/m3/pkg/m3core/src/unix/freebsd-4.generic/Udir.i3
+lib/m3/pkg/m3core/src/unix/freebsd-4.generic/Uerror.i3
+lib/m3/pkg/m3core/src/unix/freebsd-4.generic/Uexec.i3
+lib/m3/pkg/m3core/src/unix/freebsd-4.generic/Ugrp.i3
+lib/m3/pkg/m3core/src/unix/freebsd-4.generic/Uin.i3
+lib/m3/pkg/m3core/src/unix/freebsd-4.generic/Uipc.i3
+lib/m3/pkg/m3core/src/unix/freebsd-4.%%ARCH%%/Umman.i3
+lib/m3/pkg/m3core/src/unix/freebsd-4.generic/Umsg.i3
+lib/m3/pkg/m3core/src/unix/freebsd-4.generic/Unetdb.i3
+lib/m3/pkg/m3core/src/unix/freebsd-4.%%ARCH%%/Unix.i3
+lib/m3/pkg/m3core/src/unix/freebsd-4.generic/Uprocess.i3
+lib/m3/pkg/m3core/src/unix/freebsd-4.generic/Upwd.i3
+lib/m3/pkg/m3core/src/unix/freebsd-4.generic/Uresource.i3
+lib/m3/pkg/m3core/src/unix/freebsd-4.generic/Usem.i3
+lib/m3/pkg/m3core/src/unix/freebsd-4.generic/Ushm.i3
+lib/m3/pkg/m3core/src/unix/freebsd-4.%%ARCH%%/Usignal.i3
+lib/m3/pkg/m3core/src/unix/freebsd-4.generic/Usocket.i3
+lib/m3/pkg/m3core/src/unix/freebsd-4.%%ARCH%%/Ustat.i3
+lib/m3/pkg/m3core/src/unix/freebsd-4.generic/Usyslog.i3
+lib/m3/pkg/m3core/src/unix/freebsd-4.generic/Utime.i3
+lib/m3/pkg/m3core/src/unix/freebsd-4.%%ARCH%%/Utypes.i3
+lib/m3/pkg/m3core/src/unix/freebsd-4.generic/Uugid.i3
+lib/m3/pkg/m3core/src/unix/freebsd-4.generic/Uuio.i3
+lib/m3/pkg/m3core/src/unix/freebsd-4.generic/Uutmp.i3
 lib/m3/pkg/m3core/src/weakref/WeakRef.i3
 lib/m3/pkg/m3core/src/word/Word.i3
 lib/m3/pkg/m3doc/%%TARGET%%/.M3EXPORTS
@@ -954,7 +954,8 @@ share/ezm3/COPYRIGHT
 @dirrm lib/m3/pkg/m3core/src/time/POSIX
 @dirrm lib/m3/pkg/m3core/src/time
 @dirrm lib/m3/pkg/m3core/src/weakref
-@dirrm lib/m3/pkg/m3core/src/unix/%%TARGETDIR%%
+@dirrm lib/m3/pkg/m3core/src/unix/freebsd-4.generic
+@dirrm lib/m3/pkg/m3core/src/unix/freebsd-4.%%ARCH%%
 @dirrm lib/m3/pkg/m3core/src/unix
 @dirrm lib/m3/pkg/m3core/src/fingerprint
 @dirrm lib/m3/pkg/m3core/src/thread/Common