Index: head/math/gnuplot/Makefile
===================================================================
--- head/math/gnuplot/Makefile	(revision 456191)
+++ head/math/gnuplot/Makefile	(revision 456192)
@@ -1,78 +1,103 @@
 # $FreeBSD$
 
 PORTNAME=	gnuplot
 PORTVERSION=	5.2.2
 CATEGORIES=	math graphics
 MASTER_SITES=	SF
 
 MAINTAINER=	glewis@FreeBSD.org
-COMMENT=	Command-line driven graphing utility
+COMMENT?=	Command-line driven graphing utility
 
 LICENSE=	Gnuplot
 LICENSE_NAME=	Gnuplot license
 LICENSE_FILE=	${WRKSRC}/Copyright
 LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
 
-USES+=		groff iconv jpeg lua:53 pkgconfig readline
+CONFLICTS_INSTALL?=	gnuplot-lite-[0-9]*
+
+USES+=		groff iconv pkgconfig readline
+GNU_CONFIGURE=	yes
+LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
+CONFIGURE_ARGS+=--with-readline=gnu \
+		--without-linux-vga \
+		--without-lisp-files \
+		--without-tutorial \
+		--with-qt=no
+
+.if defined(LITE)
+CONFIGURE_ARGS+=--disable-x11-mbfonts \
+		--disable-x11-external \
+		--disable-wxwidgets \
+		--without-x \
+		--without-ggi \
+		--without-gd \
+		--without-caca \
+		--without-wx \
+		--without-bitmap-terminals \
+		--without-gpic \
+		--without-mif \
+		--without-cairo \
+		--without-lua \
+		--without-latex \
+		--without-kpsexpand
+PLIST_SUB+=	X11="@comment "
+.else
+USES+=		jpeg lua:53
 USE_TEX=	kpathsea
 USE_GNOME+=	atk cairo gtk20 gdkpixbuf2
 USE_WX=		2.8
 USE_XORG+=	x11
 LIB_DEPENDS+=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libgd.so:graphics/gd \
 		libpng.so:graphics/png \
 		libtiff.so:graphics/tiff
-GNU_CONFIGURE=	yes
-LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
-CONFIGURE_ARGS+=--with-readline=gnu \
-		--with-kpsexpand \
-		--without-linux-vga \
-		--without-lisp-files \
-		--without-tutorial \
-		--with-bitmap-terminals \
+CONFIGURE_ARGS+=--with-bitmap-terminals \
 		--with-gd=${LOCALBASE} \
 		--with-gpic \
 		--with-mif \
+		--with-kpsexpand \
 		--with-latex \
-		--with-qt=no \
 		ac_cv_prog_KPSEXPAND=${LOCALBASE}/bin/kpsexpand \
 		ac_cv_prog_PLAINTEX=${LOCALBASE}/bin/tex \
 		ac_cv_prog_LATEX=${LOCALBASE}/bin/latex \
 		ac_cv_prog_PDFLATEX=${LOCALBASE}/bin/pdflatex
+PLIST_SUB+=	X11=""
+.endif
+
 TEST_TARGET=	check
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	DOCS EXAMPLES GRIDBOX
 GRIDBOX_DESC=		Use the gridbox optimization for hidden3d
 
 GRIDBOX_CONFIGURE_OFF=	--disable-h3d-quadtree --enable-h3d-gridbox
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/^install:/s/install-am//' ${WRKSRC}/share/LaTeX/Makefile.in
 	@${REINPLACE_CMD} -e \
 		's|)/@PACKAGE@/@PKG_MAJOR@|)|g' ${WRKSRC}/src/Makefile.in
 	@${REINPLACE_CMD} -e \
 		's|luaL_checkint(|(int)luaL_checkinteger(|' ${WRKSRC}/term/lua.trm
 
 post-build-DOCS-on:
 	@cd ${WRKSRC}/docs && ${MAKE} groff
 
 pre-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}/5.2 ; \
 		${INSTALL_DATA} ${WRKSRC}/share/gnuplotrc \
 		${STAGEDIR}${DATADIR}/5.2/gnuplotrc.sample
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/demo && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/psdoc
 	cd ${WRKSRC}/docs && ${INSTALL_DATA} gnuplot.txt gnuplot.dvi \
 		gnuplot.ps ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/docs/psdoc && ${INSTALL_DATA} README ps_* ${STAGEDIR}${DOCSDIR}/psdoc
 
 .include <bsd.port.mk>
Index: head/math/gnuplot/pkg-plist
===================================================================
--- head/math/gnuplot/pkg-plist	(revision 456191)
+++ head/math/gnuplot/pkg-plist	(revision 456192)
@@ -1,40 +1,40 @@
-bin/gnuplot
+%%X11%%bin/gnuplot
 libexec/gnuplot/5.2/gnuplot_x11
 man/man1/gnuplot-ja.1.gz
 man/man1/gnuplot.1.gz
 %%DATADIR%%/5.2/PostScript/8859-1.ps
 %%DATADIR%%/5.2/PostScript/8859-15.ps
 %%DATADIR%%/5.2/PostScript/8859-2.ps
 %%DATADIR%%/5.2/PostScript/8859-9.ps
 %%DATADIR%%/5.2/PostScript/aglfn.txt
 %%DATADIR%%/5.2/PostScript/cp1250.ps
 %%DATADIR%%/5.2/PostScript/cp1251.ps
 %%DATADIR%%/5.2/PostScript/cp1252.ps
 %%DATADIR%%/5.2/PostScript/cp437.ps
 %%DATADIR%%/5.2/PostScript/cp850.ps
 %%DATADIR%%/5.2/PostScript/cp852.ps
 %%DATADIR%%/5.2/PostScript/koi8r.ps
 %%DATADIR%%/5.2/PostScript/koi8u.ps
 %%DATADIR%%/5.2/PostScript/prologue.ps
 %%DATADIR%%/5.2/PostScript/utf-8.ps
-%%DATADIR%%/5.2/app-defaults/Gnuplot
+%%X11%%%%DATADIR%%/5.2/app-defaults/Gnuplot
 %%DATADIR%%/5.2/colors_default.gp
 %%DATADIR%%/5.2/colors_mono.gp
 %%DATADIR%%/5.2/colors_podo.gp
 %%DATADIR%%/5.2/gnuplot.gih
 @sample %%DATADIR%%/5.2/gnuplotrc.sample
 %%DATADIR%%/5.2/js/README
 %%DATADIR%%/5.2/js/canvasmath.js
 %%DATADIR%%/5.2/js/canvastext.js
 %%DATADIR%%/5.2/js/gnuplot_common.js
 %%DATADIR%%/5.2/js/gnuplot_dashedlines.js
 %%DATADIR%%/5.2/js/gnuplot_mouse.css
 %%DATADIR%%/5.2/js/gnuplot_mouse.js
 %%DATADIR%%/5.2/js/gnuplot_svg.js
 %%DATADIR%%/5.2/js/grid.png
 %%DATADIR%%/5.2/js/help.png
 %%DATADIR%%/5.2/js/nextzoom.png
 %%DATADIR%%/5.2/js/previouszoom.png
 %%DATADIR%%/5.2/js/return.png
 %%DATADIR%%/5.2/js/textzoom.png
 %%DATADIR%%/5.2/lua/gnuplot-tikz.lua