Index: Makefile
===================================================================
--- Makefile	(revision 422285)
+++ Makefile	(working copy)
@@ -1,15 +1,15 @@
 # Created by: phoffman@proper.com
 # $FreeBSD$
 
-PKGNAMESUFFIX=	-nox11
+PKGNAMESUFFIX=		-nox11
 
-CONFLICTS_INSTALL=	emacs[0-9]*
+CONFLICTS_INSTALL=	emacs-[0-9]* emacs-devel-[0-9]*
 
-OPTIONS_EXCLUDE=GCONF GIF JPEG OTF M17N PNG SVG TIFF SYNC_INPUT GTK2 GTK3 \
-		SCROLLBARS XFT XIM XPM MAGICK GSETTINGS X11 CANNA \
-		XAW XAW3D MOTIF
-OPTIONS_DEFAULT?=SOURCES GNUTLS XML
+OPTIONS_EXCLUDE=	CAIRO GCONF GIF GSETTINGS GTK2 GTK3 JPEG M17N MAGICK    \
+			MOTIF OTF PNG SCROLLBARS SVG TIFF X11 XAW XAW3D XFT XIM \
+			XPM XWIDGETS
+OPTIONS_DEFAULT=	GNUTLS MODULES SOURCES XML
 
-MASTERDIR=	${.CURDIR}/../emacs
+MASTERDIR=		${.CURDIR}/../emacs
 
 .include "${MASTERDIR}/Makefile"