diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2002-11-05 22:28:11 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2002-11-05 22:28:11 +0000 |
| commit | 4d0a09d7af804943c3623159e334be235e5b85ba (patch) | |
| tree | 10fd1921eccbca94fecb279b1e02bff94d23f157 /math/gnuplot | |
| parent | Use PORTCOMMENT variable instead of pkg-comment file. (diff) | |
. Respect WITHOUT_X11 setting.
Change is essentially as per the PRs but with an added necessary package
list tweak.
PR: 35177, 44834
Submitted by: Stijn Hoop <stijn@win.tue.nl>,
Aurélien Nephtali <aurelien.nephtali@wanadoo.fr>
Approved by: maintainer timeout
Notes
Notes:
svn path=/head/; revision=69552
Diffstat (limited to 'math/gnuplot')
| -rw-r--r-- | math/gnuplot/Makefile | 13 | ||||
| -rw-r--r-- | math/gnuplot/pkg-plist | 2 |
2 files changed, 13 insertions, 2 deletions
diff --git a/math/gnuplot/Makefile b/math/gnuplot/Makefile index 57cf2896f4c2..c76ced06e935 100644 --- a/math/gnuplot/Makefile +++ b/math/gnuplot/Makefile @@ -16,16 +16,27 @@ MAINTAINER= chuckr@FreeBSD.org LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ gd.2:${PORTSDIR}/graphics/gd +.if !defined(WITHOUT_X11) USE_XLIB= yes +.endif + GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/gd" CONFIGURE_ARGS= --exec-prefix=${PREFIX} \ --includedir=${LOCALBASE}/include/ \ --libdir=${LOCALBASE}/lib \ - --with-x --without-linux-vga \ + --without-linux-vga \ --with-gd=${LOCALBASE}/lib \ --with-readline=gnu --with-lasergnu --with-png +.if defined(WITHOUT_X11) +CONFIGURE_ARGS+= --without-x +PLIST_SUB+= X11:="@comment " +.else +CONFIGURE_ARGS+= --with-x +PLIST_SUB+= X11:="" +.endif + post-install: ${MKDIR} ${PREFIX}/share/doc/gnuplot (cd ${WRKSRC}/demo;for EXAMPLES in ${WRKSRC}/demo/*; do ${INSTALL_DATA} $${EXAMPLES} ${PREFIX}/share/doc/gnuplot;done) diff --git a/math/gnuplot/pkg-plist b/math/gnuplot/pkg-plist index a0b047cc6f23..c65d0b1450d8 100644 --- a/math/gnuplot/pkg-plist +++ b/math/gnuplot/pkg-plist @@ -1,6 +1,6 @@ bin/lasergnu bin/gnuplot -bin/gnuplot_x11 +%%X11:%%bin/gnuplot_x11 share/gnuplot.gih share/doc/gnuplot/1.dat share/doc/gnuplot/2.dat |