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 (expand / 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,17 +1,17 @@ @@ -1,17 +1,17 @@
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
cvs diff -r1.22 -r1.23 pkgsrc/graphics/gnuplot/options.mk (expand / 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,21 +1,19 @@ @@ -1,21 +1,19 @@
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"
@@ -65,24 +63,24 @@ post-install: @@ -65,24 +63,24 @@ post-install:
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