pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics/graphviz PkgSrc changes:
details: https://anonhg.NetBSD.org/pkgsrc/rev/83a37d66df1f
branches: trunk
changeset: 362685:83a37d66df1f
user: adam <adam%pkgsrc.org@localhost>
date: Mon May 22 11:19:20 2017 +0000
description:
PkgSrc changes:
* recommended dependencies (from http://www.graphviz.org/Download_source.php)
are now non-optional: that includes Pango, Cairo and GTS
* enabled Quartz support on macOS
* added Poppler and QT as options
* options are not nested in X11 any more; that allows building on Darwin
* PLIST has been sorted correctly
diffstat:
graphics/graphviz/Makefile | 18 +-
graphics/graphviz/PLIST | 20 +-
graphics/graphviz/buildlink3.mk | 4 +-
graphics/graphviz/distinfo | 3 +-
graphics/graphviz/options.mk | 155 +++++--------
graphics/graphviz/patches/patch-plugin_quartz_Makefile.in | 33 ++
6 files changed, 121 insertions(+), 112 deletions(-)
diffs (truncated from 429 to 300 lines):
diff -r 1bc2db02e6ea -r 83a37d66df1f graphics/graphviz/Makefile
--- a/graphics/graphviz/Makefile Mon May 22 09:14:59 2017 +0000
+++ b/graphics/graphviz/Makefile Mon May 22 11:19:20 2017 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.165 2017/03/08 14:51:56 wiz Exp $
+# $NetBSD: Makefile,v 1.166 2017/05/22 11:19:20 adam Exp $
DISTNAME= graphviz-2.40.1
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.graphviz.org/pub/graphviz/stable/SOURCES/
@@ -23,9 +24,6 @@
CONFIGURE_ARGS+= --disable-ruby
CONFIGURE_ARGS+= --disable-sharp
CONFIGURE_ARGS+= --disable-r
-CONFIGURE_ARGS+= --with-poppler=no
-CONFIGURE_ARGS+= --with-gts=no
-CONFIGURE_ARGS+= --with-qt=no
# build fails when PHP and/or Ruby are also installed
CONFIGURE_ENV+= ac_cv_prog_PHP=
CONFIGURE_ENV+= ac_cv_prog_RUBY=
@@ -58,6 +56,13 @@
.include "../../mk/bsd.prefs.mk"
+PLIST_VARS+= quartz
+
+.if ${OPSYS} == "Darwin"
+CONFIGURE_ARGS+= --with-quartz
+PLIST.quartz= yes
+.endif
+
.include "../../mk/compiler.mk"
.if !empty(CC_VERSION:Mgcc-2*)
BUILDLINK_TRANSFORM+= rm:-Wno-unused-parameter
@@ -81,9 +86,10 @@
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libltdl/buildlink3.mk"
#.include "../../devel/libltdl/convenience.mk"
+.include "../../devel/pango/buildlink3.mk"
.include "../../fonts/fontconfig/buildlink3.mk"
-#.include "../../mk/jpeg.buildlink3.mk"
-#.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/cairo/buildlink3.mk"
+.include "../../graphics/gts/buildlink3.mk"
.include "../../textproc/expat/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 1bc2db02e6ea -r 83a37d66df1f graphics/graphviz/PLIST
--- a/graphics/graphviz/PLIST Mon May 22 09:14:59 2017 +0000
+++ b/graphics/graphviz/PLIST Mon May 22 11:19:20 2017 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.48 2017/03/08 14:51:56 wiz Exp $
+@comment $NetBSD: PLIST,v 1.49 2017/05/22 11:19:20 adam Exp $
bin/acyclic
bin/bcomps
bin/ccomps
@@ -7,8 +7,8 @@
${PLIST.gd}bin/diffimg
bin/dijkstra
bin/dot
+bin/dot2gxl
bin/dot_builtins
-bin/dot2gxl
${PLIST.x11}bin/dotty
bin/edgepaint
bin/fdp
@@ -18,6 +18,7 @@
bin/gv2gml
bin/gv2gxl
bin/gvcolor
+${PLIST.qt}bin/gvedit
bin/gvgen
bin/gvmap
bin/gvmap.sh
@@ -38,7 +39,7 @@
bin/tred
bin/twopi
bin/unflatten
-${PLIST.pangocairo}bin/vimdot
+${PLIST.x11}bin/vimdot
include/graphviz/arith.h
include/graphviz/cdt.h
include/graphviz/cgraph.h
@@ -71,12 +72,14 @@
lib/graphviz/libgvplugin_dot_layout.la
${PLIST.gd}lib/graphviz/libgvplugin_gd.la
${PLIST.gtk}lib/graphviz/libgvplugin_gdk.la
+${PLIST.ghostscript}lib/graphviz/libgvplugin_gs.la
${PLIST.gtk}lib/graphviz/libgvplugin_gtk.la
-${PLIST.ghostscript}lib/graphviz/libgvplugin_gs.la
lib/graphviz/libgvplugin_neato_layout.la
-${PLIST.pangocairo}lib/graphviz/libgvplugin_pango.la
+lib/graphviz/libgvplugin_pango.la
+${PLIST.poppler}lib/graphviz/libgvplugin_poppler.la
+${PLIST.quartz}lib/graphviz/libgvplugin_quartz.la
${PLIST.svg}lib/graphviz/libgvplugin_rsvg.la
-${PLIST.pangocairo}lib/graphviz/libgvplugin_xlib.la
+${PLIST.x11}lib/graphviz/libgvplugin_xlib.la
${PLIST.lua}lib/graphviz/lua/libgv_lua.la
${PLIST.ocaml}lib/graphviz/ocaml/META.gv
${PLIST.ocaml}lib/graphviz/ocaml/gv.a
@@ -136,6 +139,7 @@
man/man1/gv2gml.1
man/man1/gv2gxl.1
man/man1/gvcolor.1
+${PLIST.qt}man/man1/gvedit.1
man/man1/gvgen.1
man/man1/gvmap.1
man/man1/gvmap.sh.1
@@ -409,6 +413,7 @@
share/graphviz/doc/pdf/expr.3.pdf
share/graphviz/doc/pdf/fdp.1.pdf
share/graphviz/doc/pdf/gc.1.pdf
+${PLIST.qt}share/graphviz/doc/pdf/gvedit.1.pdf
${PLIST.tcl}${PLIST.gd}share/graphviz/doc/pdf/gdtclft.3tcl.pdf
share/graphviz/doc/pdf/gml2gv.1.pdf
share/graphviz/doc/pdf/graphml2gv.1.pdf
@@ -445,8 +450,8 @@
share/graphviz/doc/pdf/prune.pdf
share/graphviz/doc/pdf/sccmap.1.pdf
share/graphviz/doc/pdf/sfdp.1.pdf
+share/graphviz/doc/pdf/smyrna.1.pdf
share/graphviz/doc/pdf/smyrna.pdf
-share/graphviz/doc/pdf/smyrna.1.pdf
${PLIST.tcl}share/graphviz/doc/pdf/tcldot.3tcl.pdf
share/graphviz/doc/pdf/tred.1.pdf
share/graphviz/doc/pdf/twopi.1.pdf
@@ -513,6 +518,7 @@
share/graphviz/graphs/undirected/Petersen.gv
share/graphviz/graphs/undirected/ngk10_4.gv
share/graphviz/graphs/undirected/process.gv
+${PLIST.qt}share/graphviz/gvedit/attrs.txt
share/graphviz/gvpr/addedges
share/graphviz/gvpr/addranks
share/graphviz/gvpr/addrings
diff -r 1bc2db02e6ea -r 83a37d66df1f graphics/graphviz/buildlink3.mk
--- a/graphics/graphviz/buildlink3.mk Mon May 22 09:14:59 2017 +0000
+++ b/graphics/graphviz/buildlink3.mk Mon May 22 11:19:20 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.23 2013/06/04 22:16:19 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.24 2017/05/22 11:19:20 adam Exp $
BUILDLINK_TREE+= graphviz
@@ -7,7 +7,7 @@
BUILDLINK_API_DEPENDS.graphviz+= graphviz>=2.26.3
BUILDLINK_ABI_DEPENDS.graphviz+= graphviz>=2.26.3nb26
-BUILDLINK_PKGSRCDIR.graphviz?= ../../graphics/graphviz
+BUILDLINK_PKGSRCDIR.graphviz?= ../../graphics/graphviz
# doxygen PLIST varies with pangocairo of PKG_OPTIONS
pkgbase := graphviz
diff -r 1bc2db02e6ea -r 83a37d66df1f graphics/graphviz/distinfo
--- a/graphics/graphviz/distinfo Mon May 22 09:14:59 2017 +0000
+++ b/graphics/graphviz/distinfo Mon May 22 11:19:20 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.57 2017/03/08 14:51:56 wiz Exp $
+$NetBSD: distinfo,v 1.58 2017/05/22 11:19:20 adam Exp $
SHA1 (graphviz-2.40.1.tar.gz) = 8a44d19bcdb50df1bd8e649de472ebf868468888
RMD160 (graphviz-2.40.1.tar.gz) = 8fc103fc519e07e9db522ec2f748838571c71acf
@@ -10,4 +10,5 @@
SHA1 (patch-configure.ac) = c02e7e2ab65cb5df8bcf15c1bbed0e673480bd3f
SHA1 (patch-lib_gvc_Makefile.in) = f469c2dc53cf9af5b1e86f5da04bf9575685bd41
SHA1 (patch-plugin_gs_gvloadimage__gs.c) = b5b46a1e7dc52f163526c5b8b7e1b893d5500e3c
+SHA1 (patch-plugin_quartz_Makefile.in) = 1712a43849137c23e94f3eeb2ae9b86938bd4980
SHA1 (patch-plugin_xlib_gvdevice__xlib.c) = 932c337dcf9cb53d52f24c6c20818038ed169cd0
diff -r 1bc2db02e6ea -r 83a37d66df1f graphics/graphviz/options.mk
--- a/graphics/graphviz/options.mk Mon May 22 09:14:59 2017 +0000
+++ b/graphics/graphviz/options.mk Mon May 22 11:19:20 2017 +0000
@@ -1,13 +1,12 @@
-# $NetBSD: options.mk,v 1.23 2017/03/08 14:51:56 wiz Exp $
+# $NetBSD: options.mk,v 1.24 2017/05/22 11:19:20 adam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.graphviz
-PKG_SUPPORTED_OPTIONS= gd ghostscript gtk lua ocaml pangocairo svg tcl x11 perl # guile does not build with guile20
-PKG_SUGGESTED_OPTIONS= gd gtk lua pangocairo perl tcl x11
+PKG_SUPPORTED_OPTIONS= gd ghostscript gtk gts lua ocaml poppler qt svg tcl x11 perl # guile does not build with guile20
+PKG_SUGGESTED_OPTIONS= gd gtk lua perl tcl x11
# Explanation of consequence of options, to help those trying to slim down:
# guile ocaml lua tcl perl: extension language support
# x11: Omits all linking with x11, which means x11 graphics supports as
# well as x11 frontend support.
-# pangocairo: basic ps/pdf support.
# gtk: basic graphic format support (in addition to gd, which isn't
# maintained anymore)
# svg: Omitting loses svg support. librsvg has large dependencies
@@ -17,104 +16,68 @@
.include "../../mk/bsd.options.mk"
-PLIST_VARS+= gd ghostscript gtk guile lua ocaml pangocairo perl svg tcl x11
-
-.if !empty(PKG_OPTIONS:Mx11)
-.include "../../mk/xaw.buildlink3.mk"
-CONFIGURE_ENV+= X11BASE=${X11BASE}
-PLIST.x11= yes
-
-. if !empty(PKG_OPTIONS:Mpangocairo)
-. include "../../devel/pango/buildlink3.mk"
-. include "../../graphics/cairo/buildlink3.mk"
-PLIST.pangocairo= yes
-
-. if !empty(PKG_OPTIONS:Mghostscript)
-. include "../../print/ghostscript/buildlink3.mk"
-PLIST.ghostscript= yes
-. else
-CONFIGURE_ARGS+= --without-ghostscript
-. endif
-
-. if !empty(PKG_OPTIONS:Mgtk)
-. include "../../x11/gtk2/buildlink3.mk"
-PLIST.gtk= yes
-. else
-CONFIGURE_ARGS+= --without-gdk-pixbuf
-CONFIGURE_ARGS+= --without-gtk
-CONFIGURE_ARGS+= --without-gnomeui
-. endif
-
-. if !empty(PKG_OPTIONS:Msvg)
-. include "../../graphics/librsvg/buildlink3.mk"
-PLIST.svg= yes
-. else
-CONFIGURE_ARGS+= --without-rsvg
-. endif
-
-. else
-# + x11, -pangocairo
-CONFIGURE_ARGS+= --without-pangocairo
-
-. if !empty(PKG_OPTIONS:Mghostscript)
-PKG_FAIL_REASON+= "option ghostscript needs option pangocairo"
-. endif
-CONFIGURE_ARGS+= --without-ghostscript
-
-. if !empty(PKG_OPTIONS:Mgtk)
-PKG_FAIL_REASON+= "option gtk needs option pangocairo"
-. endif
-CONFIGURE_ARGS+= --without-gdk-pixbuf
-CONFIGURE_ARGS+= --without-gtk
-CONFIGURE_ARGS+= --without-gnomeui
-
-. if !empty(PKG_OPTIONS:Msvg)
-PKG_FAIL_REASON+= "option svg needs option pangocairo"
-. endif
-CONFIGURE_ARGS+= --without-rsvg
-. endif
-
-.else
-# - x11
-CONFIGURE_ARGS+= --without-x
-
-. if !empty(PKG_OPTIONS:Mpangocairo)
-PKG_FAIL_REASON+= "option pangocairo needs option x11"
-. endif
-CONFIGURE_ARGS+= --without-pangocairo
-
-. if !empty(PKG_OPTIONS:Mghostscript)
-PKG_FAIL_REASON+= "option ghostscript needs option pangocairo and x11"
-. endif
-CONFIGURE_ARGS+= --without-ghostscript
-
-. if !empty(PKG_OPTIONS:Mgtk)
-PKG_FAIL_REASON+= "option gtk needs option pangocairo and x11"
-. endif
-CONFIGURE_ARGS+= --without-gdk-pixbuf
-CONFIGURE_ARGS+= --without-gtk
-CONFIGURE_ARGS+= --without-gnomeui
-
-. if !empty(PKG_OPTIONS:Msvg)
-PKG_FAIL_REASON+= "option svg needs option pangocairo and x11"
-. endif
-CONFIGURE_ARGS+= --without-rsvg
-.endif
+PLIST_VARS+= gd ghostscript gtk guile lua ocaml perl poppler qt svg tcl x11
.if !empty(PKG_OPTIONS:Mgd)
-.include "../../graphics/gd/buildlink3.mk"
+. include "../../graphics/gd/buildlink3.mk"
PLIST.gd= yes
.else
CONFIGURE_ARGS+= --without-libgd
CONFIGURE_ARGS+= --without-mylibgd
.endif
+.if !empty(PKG_OPTIONS:Mghostscript)
+. include "../../print/ghostscript/buildlink3.mk"
+PLIST.ghostscript= yes
+.else
+CONFIGURE_ARGS+= --without-ghostscript
+.endif
+
+.if !empty(PKG_OPTIONS:Mgtk)
+. include "../../x11/gtk2/buildlink3.mk"
+PLIST.gtk= yes
+.else
+CONFIGURE_ARGS+= --without-gdk-pixbuf
Home |
Main Index |
Thread Index |
Old Index