Wed Jun 7 10:09:47 2023 UTC ()
gnuplot: switch (default-off) wxwidgets option to wxGTK32


(wiz)
diff -r1.174 -r1.175 pkgsrc/graphics/gnuplot/Makefile
diff -r1.22 -r1.23 pkgsrc/graphics/gnuplot/options.mk
cvs diff -r1.174 -r1.175 pkgsrc/graphics/gnuplot/Makefile (switch to unified diff)

--- pkgsrc/graphics/gnuplot/Makefile 2023/05/22 21:00:31 1.174
+++ pkgsrc/graphics/gnuplot/Makefile 2023/06/07 10:09:46 1.175
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: Makefile,v 1.174 2023/05/22 21:00:31 wiz Exp $ 1# $NetBSD: Makefile,v 1.175 2023/06/07 10:09:46 wiz Exp $
2 2
3DISTNAME= gnuplot-5.4.6 3DISTNAME= gnuplot-5.4.6
4PKGREVISION= 7 4PKGREVISION= 8
5CATEGORIES+= graphics 5CATEGORIES+= graphics
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gnuplot/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gnuplot/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://gnuplot.info/ 9HOMEPAGE= http://gnuplot.info/
10COMMENT= Portable interactive, function plotting utility 10COMMENT= Portable interactive, function plotting utility
11#LICENSE= gnuplot + BSD 11#LICENSE= gnuplot + BSD
12 12
13API_VERSION= ${PKGVERSION_NOREV:C/([0-9])\.([0-9])\.([0-9])/\1.\2/} 13API_VERSION= ${PKGVERSION_NOREV:C/([0-9])\.([0-9])\.([0-9])/\1.\2/}
14 14
15CONFLICTS+= gnuplot-nox11-[0-9]* 15CONFLICTS+= gnuplot-nox11-[0-9]*
16 16
17USE_LANGUAGES= c 17USE_LANGUAGES= c
18USE_TOOLS+= makeinfo pkg-config gmake 18USE_TOOLS+= makeinfo pkg-config gmake
19GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
20CONFIGURE_ARGS+= --without-latex 20CONFIGURE_ARGS+= --without-latex
21CONFIGURE_ARGS+= ac_cv_prog_EMACS= 21CONFIGURE_ARGS+= ac_cv_prog_EMACS=
22INFO_FILES= yes 22INFO_FILES= yes
23TEST_TARGET= check 23TEST_TARGET= check
24 24
25PLIST_SUBST+= API_VERSION=${API_VERSION} 25PLIST_SUBST+= API_VERSION=${API_VERSION}
26 26
27.include "options.mk" 27.include "options.mk"
28 28
29.include "../../mk/readline.buildlink3.mk" 29.include "../../mk/readline.buildlink3.mk"
30.if ${READLINE_TYPE} == "editline" 30.if ${READLINE_TYPE} == "editline"
31CONFIGURE_ARGS+= --with-readline=bsd 31CONFIGURE_ARGS+= --with-readline=bsd
32.elif ${READLINE_TYPE} == "readline" 32.elif ${READLINE_TYPE} == "readline"
33CONFIGURE_ARGS+= --with-readline=gnu 33CONFIGURE_ARGS+= --with-readline=gnu
34.endif 34.endif
35 35
36.include "../../converters/libiconv/buildlink3.mk" 36.include "../../converters/libiconv/buildlink3.mk"
37.include "../../mk/curses.buildlink3.mk" 37.include "../../mk/curses.buildlink3.mk"
38.include "../../mk/bsd.pkg.mk" 38.include "../../mk/bsd.pkg.mk"
cvs diff -r1.22 -r1.23 pkgsrc/graphics/gnuplot/options.mk (switch to unified diff)

--- pkgsrc/graphics/gnuplot/options.mk 2023/06/06 12:41:32 1.22
+++ pkgsrc/graphics/gnuplot/options.mk 2023/06/07 10:09:46 1.23
@@ -1,88 +1,86 @@ @@ -1,88 +1,86 @@
1# $NetBSD: options.mk,v 1.22 2023/06/06 12:41:32 riastradh Exp $ 1# $NetBSD: options.mk,v 1.23 2023/06/07 10:09:46 wiz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.gnuplot 3PKG_OPTIONS_VAR= PKG_OPTIONS.gnuplot
4PKG_SUPPORTED_OPTIONS= cairo cerf gd gnuplot-pdf-doc lua qt5 wxwidgets x11 4PKG_SUPPORTED_OPTIONS= cairo cerf gd gnuplot-pdf-doc lua qt5 wxwidgets x11
5PKG_SUGGESTED_OPTIONS= cairo cerf gd x11 5PKG_SUGGESTED_OPTIONS= cairo cerf gd x11
6 6
7# remove after pkgsrc-2020Q3 
8PKG_OPTIONS_LEGACY_OPTS+= pdf:cairo 
9.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
10 8
11PLIST_VARS+= gnuplot-pdf-doc lua qt x11 9PLIST_VARS+= gnuplot-pdf-doc lua qt x11
12 10
13.if !empty(PKG_OPTIONS:Mcairo) 11.if !empty(PKG_OPTIONS:Mcairo)
14.include "../../devel/pango/buildlink3.mk" 12.include "../../devel/pango/buildlink3.mk"
15.include "../../graphics/cairo/buildlink3.mk" 13.include "../../graphics/cairo/buildlink3.mk"
16.else 14.else
17CONFIGURE_ARGS+= --without-cairo 15CONFIGURE_ARGS+= --without-cairo
18.endif 16.endif
19 17
20.if !empty(PKG_OPTIONS:Mcerf) 18.if !empty(PKG_OPTIONS:Mcerf)
21.include "../../devel/libcerf/buildlink3.mk" 19.include "../../devel/libcerf/buildlink3.mk"
22.endif 20.endif
23 21
24.if !empty(PKG_OPTIONS:Mgd) 22.if !empty(PKG_OPTIONS:Mgd)
25.include "../../graphics/gd/buildlink3.mk" 23.include "../../graphics/gd/buildlink3.mk"
26.endif 24.endif
27 25
28.if !empty(PKG_OPTIONS:Mlua) 26.if !empty(PKG_OPTIONS:Mlua)
29PLIST.lua= yes 27PLIST.lua= yes
30CONFIGURE_ARGS+= --with-lua 28CONFIGURE_ARGS+= --with-lua
31 29
32INSTALLATION_DIRS+= share/texmf-dist/tex/context/gnuplot 30INSTALLATION_DIRS+= share/texmf-dist/tex/context/gnuplot
33INSTALLATION_DIRS+= share/texmf-dist/tex/generic/gnuplot 31INSTALLATION_DIRS+= share/texmf-dist/tex/generic/gnuplot
34INSTALLATION_DIRS+= share/texmf-dist/tex/latex/gnuplot 32INSTALLATION_DIRS+= share/texmf-dist/tex/latex/gnuplot
35 33
36post-install: 34post-install:
37 ${INSTALL_DATA} ${WRKSRC}/share/LaTeX/t-gnuplot-lua-tikz.tex \ 35 ${INSTALL_DATA} ${WRKSRC}/share/LaTeX/t-gnuplot-lua-tikz.tex \
38 ${DESTDIR}${PREFIX}/share/texmf-dist/tex/context/gnuplot 36 ${DESTDIR}${PREFIX}/share/texmf-dist/tex/context/gnuplot
39 ${INSTALL_DATA} ${WRKSRC}/share/LaTeX/gnuplot-lua-tikz.tex\ 37 ${INSTALL_DATA} ${WRKSRC}/share/LaTeX/gnuplot-lua-tikz.tex\
40 ${DESTDIR}${PREFIX}/share/texmf-dist/tex/generic/gnuplot 38 ${DESTDIR}${PREFIX}/share/texmf-dist/tex/generic/gnuplot
41 ${INSTALL_DATA} ${WRKSRC}/share/LaTeX/gnuplot-lua-tikz-common.tex\ 39 ${INSTALL_DATA} ${WRKSRC}/share/LaTeX/gnuplot-lua-tikz-common.tex\
42 ${DESTDIR}${PREFIX}/share/texmf-dist/tex/generic/gnuplot 40 ${DESTDIR}${PREFIX}/share/texmf-dist/tex/generic/gnuplot
43 ${INSTALL_DATA} ${WRKSRC}/share/LaTeX/gnuplot-lua-tikz.sty\ 41 ${INSTALL_DATA} ${WRKSRC}/share/LaTeX/gnuplot-lua-tikz.sty\
44 ${DESTDIR}${PREFIX}/share/texmf-dist/tex/latex/gnuplot 42 ${DESTDIR}${PREFIX}/share/texmf-dist/tex/latex/gnuplot
45 43
46.include "../../lang/lua/buildlink3.mk" 44.include "../../lang/lua/buildlink3.mk"
47.include "../../print/kpathsea/texmf.mk" 45.include "../../print/kpathsea/texmf.mk"
48.else 46.else
49CONFIGURE_ARGS+= --without-lua 47CONFIGURE_ARGS+= --without-lua
50.endif 48.endif
51 49
52# to build doc/gnuplot.pdf 50# to build doc/gnuplot.pdf
53.if !empty(PKG_OPTIONS:Mgnuplot-pdf-doc) 51.if !empty(PKG_OPTIONS:Mgnuplot-pdf-doc)
54PLIST.gnuplot-pdf-doc= yes 52PLIST.gnuplot-pdf-doc= yes
55TOOL_DEPENDS+= tex-latex-bin-[0-9]*:../../print/tex-latex-bin 53TOOL_DEPENDS+= tex-latex-bin-[0-9]*:../../print/tex-latex-bin
56TOOL_DEPENDS+= tex-ucs-[0-9]*:../../print/tex-ucs 54TOOL_DEPENDS+= tex-ucs-[0-9]*:../../print/tex-ucs
57post-build: 55post-build:
58 cd ${WRKSRC}/docs && ${GMAKE} gnuplot.pdf 56 cd ${WRKSRC}/docs && ${GMAKE} gnuplot.pdf
59post-install: 57post-install:
60 cd ${WRKSRC}/docs && \ 58 cd ${WRKSRC}/docs && \
61 ${INSTALL_DATA} gnuplot.pdf ${DESTDIR}${PREFIX}/share/gnuplot/${API_VERSION} 59 ${INSTALL_DATA} gnuplot.pdf ${DESTDIR}${PREFIX}/share/gnuplot/${API_VERSION}
62.endif 60.endif
63 61
64.if !empty(PKG_OPTIONS:Mqt5) 62.if !empty(PKG_OPTIONS:Mqt5)
65USE_LANGUAGES+= c++11 63USE_LANGUAGES+= c++11
66CONFIGURE_ARGS+= --with-qt=qt5 64CONFIGURE_ARGS+= --with-qt=qt5
67PLIST.qt= yes 65PLIST.qt= yes
68.include "../../x11/qt5-qtbase/buildlink3.mk" 66.include "../../x11/qt5-qtbase/buildlink3.mk"
69.include "../../x11/qt5-qtsvg/buildlink3.mk" 67.include "../../x11/qt5-qtsvg/buildlink3.mk"
70.include "../../x11/qt5-qttools/buildlink3.mk" 68.include "../../x11/qt5-qttools/buildlink3.mk"
71.else 69.else
72CONFIGURE_ARGS+= --with-qt=no 70CONFIGURE_ARGS+= --with-qt=no
73.endif 71.endif
74 72
75.if !empty(PKG_OPTIONS:Mwxwidgets) 73.if !empty(PKG_OPTIONS:Mwxwidgets)
76USE_LANGUAGES+= c++ 74USE_LANGUAGES+= c++
77CONFIGURE_ARGS+= --enable-wxwidgets 75CONFIGURE_ARGS+= --enable-wxwidgets
78.include "../../x11/wxGTK31/buildlink3.mk" 76.include "../../x11/wxGTK32/buildlink3.mk"
79.else 77.else
80CONFIGURE_ARGS+= --disable-wxwidgets 78CONFIGURE_ARGS+= --disable-wxwidgets
81.endif 79.endif
82 80
83.if !empty(PKG_OPTIONS:Mx11) 81.if !empty(PKG_OPTIONS:Mx11)
84PLIST.x11= yes 82PLIST.x11= yes
85.include "../../x11/xorgproto/buildlink3.mk" 83.include "../../x11/xorgproto/buildlink3.mk"
86.else 84.else
87CONFIGURE_ARGS+= --without-x 85CONFIGURE_ARGS+= --without-x
88.endif 86.endif