diff --git a/audio/solfege/Makefile b/audio/solfege/Makefile
index 71705bad8389..2567962282f2 100644
--- a/audio/solfege/Makefile
+++ b/audio/solfege/Makefile
@@ -27,6 +27,7 @@ CONFIGURE_ENV=	ac_cv_path_XML2PO=""
 CONFIGURE_ARGS=	--disable-oss-sound \
 		--enable-docbook-stylesheet=${STYLESHEET}
 MAKE_ARGS=	skipmanual=yes
+USE_DISPLAY=	yes
 
 MAN1=		lessonfile_editor.1 solfege.1
 
@@ -38,15 +39,6 @@ STYLESHEET=	${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl
 USE_GNOME+=	pygnomeextras
 .endif
 
-.if defined(PACKAGE_BUILDING)
-BUILD_DEPENDS+=	Xvfb:${X_VFBSERVER_PORT} \
-		${X11BASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT}
-.else
-.if !defined(DISPLAY) || ${DISPLAY} == ""
-IGNORE=		requires an active X session (and DISPLAY variable).  Please compile this while running X
-.endif
-.endif
-
 post-patch:
 	@${RM} ${WRKSRC}/lesson-files/bin/csound-play-harmonic-interval.sh.orig
 	@${GREP} -lR "/usr/bin/python" ${WRKSRC} | ${XARGS} \
diff --git a/devel/gaphor/Makefile b/devel/gaphor/Makefile
index 78f6db471175..de230cd02211 100644
--- a/devel/gaphor/Makefile
+++ b/devel/gaphor/Makefile
@@ -16,15 +16,12 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	UML modeling environment written in Python
 
-.if defined(PACKAGE_BUILDING)
-BUILD_DEPENDS+=	Xvfb:${X_VFBSERVER_PORT}
-.endif
-
 CONFLICTS=	zope-3*
 
 USE_GNOME=	pygnome2
 USE_PYTHON=	2.4+
 USE_PYDISTUTILS=	yes
 USE_GETTEXT=	yes
+USE_DISPLAY=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/diacanvas2/Makefile b/graphics/diacanvas2/Makefile
index 48bd91b4a2be..e8a7503f7596 100644
--- a/graphics/diacanvas2/Makefile
+++ b/graphics/diacanvas2/Makefile
@@ -23,10 +23,7 @@ USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 INSTALLS_SHLIB=	yes
-.if defined(PACKAGE_BUILDING)
-BUILD_DEPENDS+=	Xvfb:${X_VFBSERVER_PORT} \
-		${X11BASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT}
-.endif
+USE_DISPLAY=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git a/net/penguintv-devel/Makefile b/net/penguintv-devel/Makefile
index 8ad83888e875..66860162fa44 100644
--- a/net/penguintv-devel/Makefile
+++ b/net/penguintv-devel/Makefile
@@ -20,10 +20,6 @@ BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/pysqlite2/_sqlite.so:${PORTSDIR}/databases/p
 		${PYTHON_SITELIBDIR}/gst-0.10/gst/__init__.py:${PORTSDIR}/multimedia/py-gstreamer \
 		${PYXML} \
 		${PYTHON_SITELIBDIR}/Pyrex/__init__.py:${PORTSDIR}/devel/pyrex
-.if defined(PACKAGE_BUILDING)
-BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} \
-		${X11BASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT}
-.endif
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/PenguinTV-${PORTVERSION}
@@ -34,6 +30,7 @@ OPTIONS=	PYLUCENE "Use Lucene search engine" ON \
 USE_GNOME=	pygnomeextras pygnome2
 USE_PYTHON=	yes
 USE_GECKO=	firefox
+USE_DISPLAY=	yes
 
 CONFLICTS=	PenguinTV-[0-9]*
 
diff --git a/net/penguintv/Makefile b/net/penguintv/Makefile
index 842b07d0c9f9..5890cff23260 100644
--- a/net/penguintv/Makefile
+++ b/net/penguintv/Makefile
@@ -19,10 +19,6 @@ BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/pysqlite2/_sqlite.so:${PORTSDIR}/databases/p
 		${PYTHON_SITELIBDIR}/gst-0.10/gst/__init__.py:${PORTSDIR}/multimedia/py-gstreamer \
 		${PYXML} \
 		${PYTHON_SITELIBDIR}/Pyrex/__init__.py:${PORTSDIR}/devel/pyrex
-.if defined(PACKAGE_BUILDING)
-BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} \
-		${X11BASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT}
-.endif
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/PenguinTV-${PORTVERSION}
@@ -33,6 +29,7 @@ OPTIONS=	PYLUCENE "Use Lucene search engine" ON \
 USE_GNOME=	pygnomeextras pygnome2
 USE_PYTHON=	yes
 USE_GECKO=	firefox
+USE_DISPLAY=	yes
 
 CONFLICTS=	PenguinTV-devel-[0-9]*