Received: by mail.netbsd.org (Postfix, from userid 605) id D8B5284E2C; Mon, 28 Oct 2019 08:43:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 60D2584E27 for ; Mon, 28 Oct 2019 08:43:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id fCU5bSRiDcOB for ; Mon, 28 Oct 2019 08:43:33 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id BFE1F84E09 for ; Mon, 28 Oct 2019 08:43:33 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id B45A4FA8D; Mon, 28 Oct 2019 08:43:33 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1572252213294220" MIME-Version: 1.0 Date: Mon, 28 Oct 2019 08:43:33 +0000 From: "Kamil Rytarowski" Subject: CVS commit: pkgsrc/graphics/graphviz To: pkgsrc-changes@NetBSD.org Reply-To: kamil@netbsd.org X-Mailer: log_accum Message-Id: <20191028084333.B45A4FA8D@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1572252213294220 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: kamil Date: Mon Oct 28 08:43:33 UTC 2019 Modified Files: pkgsrc/graphics/graphviz: Makefile PLIST options.mk Log Message: graphviz: Drop the qt (qt4) option (it was disabled by default) To generate a diff of this commit: cvs rdiff -u -r1.205 -r1.206 pkgsrc/graphics/graphviz/Makefile cvs rdiff -u -r1.49 -r1.50 pkgsrc/graphics/graphviz/PLIST cvs rdiff -u -r1.25 -r1.26 pkgsrc/graphics/graphviz/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1572252213294220 Content-Disposition: inline Content-Length: 3785 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/graphics/graphviz/Makefile diff -u pkgsrc/graphics/graphviz/Makefile:1.205 pkgsrc/graphics/graphviz/Makefile:1.206 --- pkgsrc/graphics/graphviz/Makefile:1.205 Sat Oct 19 12:46:05 2019 +++ pkgsrc/graphics/graphviz/Makefile Mon Oct 28 08:43:33 2019 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.205 2019/10/19 12:46:05 nia Exp $ +# $NetBSD: Makefile,v 1.206 2019/10/28 08:43:33 kamil Exp $ DISTNAME= graphviz-2.40.1 -PKGREVISION= 40 +PKGREVISION= 41 CATEGORIES= graphics MASTER_SITES= http://www.graphviz.org/pub/graphviz/stable/SOURCES/ @@ -24,6 +24,7 @@ CONFIGURE_ARGS+= --disable-python CONFIGURE_ARGS+= --disable-ruby CONFIGURE_ARGS+= --disable-sharp CONFIGURE_ARGS+= --disable-r +CONFIGURE_ARGS+= --without-qt # build fails when PHP and/or Ruby are also installed CONFIGURE_ENV+= ac_cv_prog_PHP= CONFIGURE_ENV+= ac_cv_prog_RUBY= Index: pkgsrc/graphics/graphviz/PLIST diff -u pkgsrc/graphics/graphviz/PLIST:1.49 pkgsrc/graphics/graphviz/PLIST:1.50 --- pkgsrc/graphics/graphviz/PLIST:1.49 Mon May 22 11:19:20 2017 +++ pkgsrc/graphics/graphviz/PLIST Mon Oct 28 08:43:33 2019 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.49 2017/05/22 11:19:20 adam Exp $ +@comment $NetBSD: PLIST,v 1.50 2019/10/28 08:43:33 kamil Exp $ bin/acyclic bin/bcomps bin/ccomps @@ -18,7 +18,6 @@ bin/graphml2gv bin/gv2gml bin/gv2gxl bin/gvcolor -${PLIST.qt}bin/gvedit bin/gvgen bin/gvmap bin/gvmap.sh @@ -139,7 +138,6 @@ man/man1/graphml2gv.1 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 @@ -413,7 +411,6 @@ share/graphviz/doc/pdf/edgepaint.1.pdf 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 @@ -518,7 +515,6 @@ share/graphviz/graphs/undirected/Heawood 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 Index: pkgsrc/graphics/graphviz/options.mk diff -u pkgsrc/graphics/graphviz/options.mk:1.25 pkgsrc/graphics/graphviz/options.mk:1.26 --- pkgsrc/graphics/graphviz/options.mk:1.25 Sat Mar 24 17:15:39 2018 +++ pkgsrc/graphics/graphviz/options.mk Mon Oct 28 08:43:33 2019 @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.25 2018/03/24 17:15:39 schmonz Exp $ +# $NetBSD: options.mk,v 1.26 2019/10/28 08:43:33 kamil Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.graphviz -PKG_SUPPORTED_OPTIONS= gd ghostscript gtk gts lua ocaml poppler qt svg tcl x11 perl # guile does not build with guile20 +PKG_SUPPORTED_OPTIONS= gd ghostscript gtk gts lua ocaml poppler svg tcl x11 perl # guile does not build with guile20 .if exists(/System/Library/Frameworks/Quartz.framework) PKG_SUPPORTED_OPTIONS+= quartz .endif @@ -19,7 +19,7 @@ PKG_SUGGESTED_OPTIONS= gd gtk lua perl t .include "../../mk/bsd.options.mk" -PLIST_VARS+= gd ghostscript gtk guile lua ocaml perl poppler qt quartz svg tcl x11 +PLIST_VARS+= gd ghostscript gtk guile lua ocaml perl poppler quartz svg tcl x11 .if !empty(PKG_OPTIONS:Mgd) . include "../../graphics/gd/buildlink3.mk" @@ -52,14 +52,6 @@ PLIST.poppler= yes CONFIGURE_ARGS+= --without-poppler .endif -.if !empty(PKG_OPTIONS:Mqt) -. include "../../x11/qt4-libs/buildlink3.mk" -. include "../../x11/qt4-tools/buildlink3.mk" -PLIST.qt= yes -.else -CONFIGURE_ARGS+= --without-qt -.endif - .if !empty(PKG_OPTIONS:Mquartz) PLIST.quartz= yes CONFIGURE_ARGS+= --with-quartz --_----------=_1572252213294220--