3 files changed, 41 insertions, 7 deletions

diff --git a/lang/ezm3/Makefile b/lang/ezm3/Makefile
index cd98d0a3e162..3495c08fafa3 100644
--- a/lang/ezm3/Makefile
+++ b/lang/ezm3/Makefile
@@ -8,10 +8,20 @@
 PORTNAME=	ezm3
 PORTVERSION=	1.2
 CATEGORIES=	lang
-MASTER_SITES=	${MASTER_SITE_FREEBSD_ORG}
-MASTER_SITE_SUBDIR=development/CVSup/ezm3
-DISTFILES=	ezm3-${PORTVERSION}-${TARGET}-boot.tar.bz2 \
-		ezm3-${PORTVERSION}-src.tar.bz2
+
+MASTER_SITES=	ftp://ftp.FreeBSD.org/pub/FreeBSD/development/CVSup/ezm3/:src \
+		http://people.freebsd.org/~peter/ezm3-amd64/:amdb \
+		ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/pav/:amdp
+DISTFILES=	ezm3-${PORTVERSION}-src.tar.bz2:src
+
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "amd64"
+DISTFILES+=	ezm3-${PORTVERSION}-${TARGET}-boot.tar.bz2:amdb \
+		ezm3-amd64-patchset.tar.bz2:amdp
+.else
+DISTFILES+=	ezm3-${PORTVERSION}-${TARGET}-boot.tar.bz2:src
+.endif
 
 MAINTAINER=	jdp@FreeBSD.org
 COMMENT=	Easier, more portable Modula-3 distribution for building CVSup
@@ -32,9 +42,7 @@ PROGS=		bin/m3build \
 		bin/m3ship \
 		lib/m3/${TARGET}/m3cgc1
 
-.include <bsd.port.pre.mk>
-
-ONLY_FOR_ARCHS=	alpha i386 sparc64
+ONLY_FOR_ARCHS=	alpha amd64 i386 sparc64
 
 .if ${OSVERSION} < 410000
 BROKEN=		Not supported on versions earlier than 4.1-RELEASE
@@ -44,14 +52,26 @@ BROKEN=		Not supported on versions earlier than 4.1-RELEASE
 TARGET=		FBSD_ALPHA
 WORDSIZE=	64
 ENDIANESS=	le
+PLIST_SUB+=	AMD64="@comment "
+.elif ${ARCH} == "amd64"
+MAINTAINER=	bzeeb+freebsdports@zabbadoz.net
+PORTVERSION=	1.1
+AMD64_PATCHES=	p-amd64-common p-amd64-gcc p-amd64-gcc-321-322 p-amd64-gcchacks \
+		p-amd64-gccstatic p-amd64-m3 p-amd64-m3-except-sort p-amd64-newfiles
+TARGET=		FBSD_AMD64
+WORDSIZE=	64
+ENDIANESS=	le
+PLIST_SUB+=	AMD64=""
 .elif ${ARCH} == "i386"
 TARGET=		FreeBSD4
 WORDSIZE=	32
 ENDIANESS=	le
+PLIST_SUB+=	AMD64="@comment "
 .elif ${ARCH} == "sparc64"
 TARGET=		FBSD_SPARC64
 WORDSIZE=	64
 ENDIANESS=	be
+PLIST_SUB+=	AMD64="@comment "
 .endif
 
 # The build fails for -O2 or greater.  Override it with plain -O.
@@ -59,6 +79,13 @@ ENDIANESS=	be
 CFLAGS+=	-O
 .endif
 
+pre-patch:
+.if ${ARCH} == "amd64"
+.for f in ${AMD64_PATCHES}
+	@cd ${WRKSRC} && ${PATCH} ${PATCH_ARGS} < ${WRKDIR}/${f}
+.endfor
+.endif
+
 post-patch:
 .if ${ARCH} == "sparc64" && ${OSVERSION} < 502107
 	@${REINPLACE_CMD} -E -e 's|(^.*time_t.*=.*)int64_t;|\1int32_t;|' \
diff --git a/lang/ezm3/distinfo b/lang/ezm3/distinfo
index becf6ab36d00..0cf5dd92a574 100644
--- a/lang/ezm3/distinfo
+++ b/lang/ezm3/distinfo
@@ -6,3 +6,9 @@ MD5 (ezm3/ezm3-1.2-FreeBSD4-boot.tar.bz2) = bf7b23c5f8859f33f460eb0d230b13c5
 SIZE (ezm3/ezm3-1.2-FreeBSD4-boot.tar.bz2) = 1366495
 MD5 (ezm3/ezm3-1.2-src.tar.bz2) = 41ac38cc9a57d7498b2ce7705792e2d8
 SIZE (ezm3/ezm3-1.2-src.tar.bz2) = 10727649
+MD5 (ezm3/ezm3-1.1-src.tar.bz2) = 0cb8d2af3784142144c01ffac4c0ffff
+SIZE (ezm3/ezm3-1.1-src.tar.bz2) = 10705295
+MD5 (ezm3/ezm3-1.1-FBSD_AMD64-boot.tar.bz2) = 9a035001f85ebe063ad24f5993d787aa
+SIZE (ezm3/ezm3-1.1-FBSD_AMD64-boot.tar.bz2) = 1533175
+MD5 (ezm3/ezm3-amd64-patchset.tar.bz2) = e7f6bacd1fda51c1aeee8273fed9158f
+SIZE (ezm3/ezm3-amd64-patchset.tar.bz2) = 294958
diff --git a/lang/ezm3/pkg-plist b/lang/ezm3/pkg-plist
index 69739836818b..77a74cb4163d 100644
--- a/lang/ezm3/pkg-plist
+++ b/lang/ezm3/pkg-plist
@@ -382,6 +382,7 @@ 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
+%%AMD64%%lib/m3/pkg/m3core/src/unix/freebsd-4.%%ARCH%%/Uucontext.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