--- Makefile.orig	Tue Aug  8 17:28:57 2006
+++ Makefile	Tue Aug  8 18:05:04 2006
@@ -7,14 +7,14 @@
 
 PORTNAME=	zsnes
 PORTVERSION=	1.42
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	zsnes${PORTVERSION:S/.//}src
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd-ports@stsp.in-berlin.de
 COMMENT=	Intel x86 only Super Nintendo Entertainment System (SNES) Emulator
 
 # This must be >= 0.98!
@@ -26,9 +26,25 @@
 
 WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION:S/./_/}/src
 
+OPTIONS=	X11 "Enable X11 video driver" on
+OPTIONS+=	OPENGL "Enable OpenGL video driver" off
+
+.if defined(WITHOUT_X11)
+CONFIGURE_ARGS=	--without-x
+PKGNAMESUFFIX=	-nox11
+.else
 USE_X_PREFIX=	yes
-USE_SDL=	sdl
+CONFIGURE_ARGS=	--with-x
+.endif
+
+.if defined(WITH_OPENGL)
 USE_GL=		yes
+CONFIGURE_ARGS=	--enable-opengl
+.else
+CONFIGURE_ARGS=	--disable-opengl
+.endif
+
+USE_SDL=	sdl
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yyes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}