Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 13 Dec 2017 07:11:07 +0000 (UTC)
From:      Greg Lewis <glewis@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r456192 - head/math/gnuplot
Message-ID:  <201712130711.vBD7B7fT019427@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: glewis
Date: Wed Dec 13 07:11:07 2017
New Revision: 456192
URL: https://svnweb.freebsd.org/changeset/ports/456192

Log:
  Prepare for gnuplot-lite by splitting up the configure options, the
  dependencies and adding some packing list substitution and hiding some
  of it based on the definition of "LITE".

Modified:
  head/math/gnuplot/Makefile
  head/math/gnuplot/pkg-plist

Modified: head/math/gnuplot/Makefile
==============================================================================
--- head/math/gnuplot/Makefile	Wed Dec 13 07:09:09 2017	(r456191)
+++ head/math/gnuplot/Makefile	Wed Dec 13 07:11:07 2017	(r456192)
@@ -6,14 +6,43 @@ 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
@@ -23,23 +52,19 @@ LIB_DEPENDS+=	libfontconfig.so:x11-fonts/fontconfig \
 		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=	*

Modified: head/math/gnuplot/pkg-plist
==============================================================================
--- head/math/gnuplot/pkg-plist	Wed Dec 13 07:09:09 2017	(r456191)
+++ head/math/gnuplot/pkg-plist	Wed Dec 13 07:11:07 2017	(r456192)
@@ -1,4 +1,4 @@
-bin/gnuplot
+%%X11%%bin/gnuplot
 libexec/gnuplot/5.2/gnuplot_x11
 man/man1/gnuplot-ja.1.gz
 man/man1/gnuplot.1.gz
@@ -17,7 +17,7 @@ man/man1/gnuplot.1.gz
 %%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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712130711.vBD7B7fT019427>