CVS commit: pkgsrc/graphics/gnuplot

["Rin Okuyama" <rin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rin
Date:           Tue Mar 17 13:40:04 UTC 2020

Modified Files:
        pkgsrc/graphics/gnuplot: Makefile

Log Message:
PR pkg/55078
Let users choose editline or readline by READLINE_DEFAULT.
Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.139 -r1.140 pkgsrc/graphics/gnuplot/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/gnuplot/Makefile
diff -u pkgsrc/graphics/gnuplot/Makefile:1.139 pkgsrc/graphics/gnuplot/Makefile:1.140
--- pkgsrc/graphics/gnuplot/Makefile:1.139      Tue Mar 10 22:10:07 2020
+++ pkgsrc/graphics/gnuplot/Makefile    Tue Mar 17 13:40:04 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.139 2020/03/10 22:10:07 wiz Exp $
+# $NetBSD: Makefile,v 1.140 2020/03/17 13:40:04 rin Exp $
 
 DISTNAME=      gnuplot-5.2.8
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES+=   graphics
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=gnuplot/}
 
@@ -17,7 +17,6 @@ CONFLICTS+=           gnuplot-nox11-[0-9]*
 USE_LANGUAGES=         c
 USE_TOOLS+=            makeinfo pkg-config gmake
 GNU_CONFIGURE=         yes
-CONFIGURE_ARGS+=       --with-readline=bsd
 CONFIGURE_ARGS+=       --without-latex
 CONFIGURE_ARGS+=       --without-tutorial
 CONFIGURE_ARGS+=       ac_cv_prog_EMACS=
@@ -36,7 +35,13 @@ SUBST_SED.fontpath=  -e 's,@PKGSRC_PREFIX
 
 .include "options.mk"
 
+.include "../../mk/readline.buildlink3.mk"
+.if   ${READLINE_TYPE} == "editline"
+CONFIGURE_ARGS+=       --with-readline=bsd
+.elif ${READLINE_TYPE} == "readline"
+CONFIGURE_ARGS+=       --with-readline=gnu
+.endif
+
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
-.include "../../mk/readline.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"