--- Makefile.orig	2008-05-17 19:32:13.000000000 -0400
+++ Makefile	2010-03-30 08:56:14.000000000 -0400
@@ -7,7 +7,7 @@
 
 PORTNAME=	cvsup
 PORTVERSION=	16.1h
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net devel
 MASTER_SITES=	${MASTER_SITE_FREEBSD_ORG}
 MASTER_SITE_SUBDIR=development/CVSup/snapshots
@@ -44,7 +44,7 @@
 TARGET=		FBSD_SPARC64
 .endif
 
-.if defined(WITHOUT_X11) || ${ARCH} == "amd64"
+.if defined(WITHOUT_X11)
 M3FLAGS+=	-DNOGUI
 BUILD_DEPENDS=	${PREFIX}/lib/m3/pkg/tcp/${TARGET}/libm3tcp.a:${PORTSDIR}/lang/ezm3
 PKGNAMESUFFIX=	-without-gui
@@ -69,8 +69,11 @@
 .if !defined(WITHOUT_X11) && ${ARCH} == "amd64"
 	@${ECHO_MSG} "*****************************************************"
 	@${ECHO_MSG} "* CVSup with X11 is not yet supported on amd64.     *"
-	@${ECHO_MSG} "* I will build cvsup without X11 support now.       *"
+	@${ECHO_MSG} "* Please install net/cvsup-without-gui instead,     *"
+	@${ECHO_MSG} "* or do a 'make rmconfig' and then 'make config'    *"
+	@${ECHO_MSG} "* and uncheck the 'Build with X11 support' option.  *"
 	@${ECHO_MSG} "*****************************************************"
+	@exit 1;
 .endif
 
 pre-patch: