--- Makefile	Fri May 14 15:54:17 2004
+++ Makefile.new	Sun May  9 10:00:56 2004
@@ -16,7 +16,7 @@
 COMMENT=	Lynx-like text WWW browser
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--enable-javascript --with-ssl --without-svgalib
+CONFIGURE_ARGS+=	--enable-javascript --with-ssl
 CONFIGURE_ENV+=	CPPFLAGS='-I${LOCALBASE}/include'
 LDFLAGS+=	-L${LOCALBASE}/lib
 
@@ -26,19 +26,34 @@
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_SVGALIB)
+LIB_DEPENDS+=	vga.1:${PORTSDIR}/graphics/svgalib \
+		png.5:${PORTSDIR}/graphics/png \
+		jpeg.9:${PORTSDIR}/graphics/jpeg \
+		tiff.4:${PORTSDIR}/graphics/tiff
+CONFIGURE_ARGS+=	--enable-graphics
+.else
+CONFIGURE_ARGS+=	--without-svgalib
+.endif
+
 .if !defined(WITHOUT_X11)
 LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		tiff.4:${PORTSDIR}/graphics/tiff
 USE_XLIB=	yes
 CONFIGURE_ARGS+=	--enable-graphics --with-x
+.else
+USE_XLIB=	no
+CONFIGURE_ARGS+=	--without-x
 .endif
 
 MAN1=		links.1
 PLIST_FILES=	bin/links
 
 pre-everything::
-		@${ECHO_MSG} "Define WITHOUT_X11 to disable graphics support."
+		@${ECHO_MSG} ${CONFIGURE_ARGS}
+		@${ECHO_MSG} "Use 'make -DWITH_SVGALIB' to enable svgalib (non-X11) graphics support."
+		@${ECHO_MSG} "Use 'make -DWITHOUT_X11' to disable X11 graphics support."
 
 post-patch:
 	@${REINPLACE_CMD} -e "s!/etc/!${PREFIX}/etc/!" ${WRKSRC}/default.c