[pkgsrc/trunk]: pkgsrc/graphics/dia dia: Disable GNOME 2 integration

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/graphics/dia dia: Disable GNOME 2 integration
From: nia <nia%pkgsrc.org@localhost>
Date: Sat, 25 Apr 2020 11:39:24 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/f83337afb4f9
branches:  trunk
changeset: 428120:f83337afb4f9
user:      nia <nia%pkgsrc.org@localhost>
date:      Sat Apr 25 10:51:42 2020 +0000

description:
dia: Disable GNOME 2 integration

diffstat:

 graphics/dia/Makefile   |    4 +-
 graphics/dia/PLIST      |  166 +-----------------------------------------------
 graphics/dia/options.mk |   19 +----
 3 files changed, 7 insertions(+), 182 deletions(-)

diffs (227 lines):

diff -r d0a288f3dcd6 -r f83337afb4f9 graphics/dia/Makefile
--- a/graphics/dia/Makefile     Sat Apr 25 10:18:09 2020 +0000
+++ b/graphics/dia/Makefile     Sat Apr 25 10:51:42 2020 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.106 2020/03/10 22:10:04 wiz Exp $
+# $NetBSD: Makefile,v 1.107 2020/04/25 10:51:42 nia Exp $
 
-PKGREVISION= 15
+PKGREVISION= 16
 .include "Makefile.common"
 
 .include "options.mk"
diff -r d0a288f3dcd6 -r f83337afb4f9 graphics/dia/PLIST
--- a/graphics/dia/PLIST        Sat Apr 25 10:18:09 2020 +0000
+++ b/graphics/dia/PLIST        Sat Apr 25 10:51:42 2020 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2015/06/09 08:55:22 wiz Exp $
+@comment $NetBSD: PLIST,v 1.22 2020/04/25 10:51:42 nia Exp $
 bin/dia
 lib/dia/libaadl_objects.la
 lib/dia/libart_filter.la
@@ -1679,164 +1679,6 @@
 share/doc/dia/pl/examples/diagram.dtd
 share/doc/dia/pl/examples/shape.dtd
 share/doc/dia/pl/examples/sheet.dtd
-${PLIST.gnome}${DIA_HELPDIR}/C
-${PLIST.gnome}${DIA_HELPDIR}/en/authors.xml
-${PLIST.gnome}${DIA_HELPDIR}/en/custom-shapes.xml
-${PLIST.gnome}${DIA_HELPDIR}/en/dia-1.xml
-${PLIST.gnome}${DIA_HELPDIR}/en/dia-cmdline.xml
-${PLIST.gnome}${DIA_HELPDIR}/en/dia.xml
-${PLIST.gnome}${DIA_HELPDIR}/en/entities.xml
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/adjacent.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/after-hor-spread.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/after-vert-spread.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/align-bottom.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/align-center.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/align-left.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/align-menu.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/align-middle.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/align-right.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/align-top.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/arrow-style.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/assorted-shapes.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/before-hor-spread.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/before-left.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/before-top.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/before-vert-spread.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/bezierline-rightclick.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/canvas-zoom.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/cisco-computer-shapes.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/cisco-misc-shapes.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/cisco-network-shapes.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/cisco-switch-shapes.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/cisco-telephony-shapes.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/color-dropdown.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/color-selector1.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/color_selector.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/connect-fixed.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/connect-middle.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/default-colors.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/defaults-box.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/defaults-text.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/dia-startup.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/diagram-properties-grid.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/diagram-properties.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/diagram-tree-sort.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/diagram-tree.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/edit-text.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/file-preferences-diagram.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/file-preferences-favorites.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/file-preferences-tree.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/file-preferences-ui.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/file-preferences-view.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/flowchart-shapes.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/greendots.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/home_network.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/line-arrows.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/line-buttons.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/line-colors.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/line-connect.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/line-handles.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/line-styles.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/line-width.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/line_icon.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/line_props.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/misc-shapes.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/network-shapes.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/object-group.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/polyline-rightclick.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/preferences-gridlines.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/preferences_fig.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/properties-uml-class1.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/reverse-colors.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/ruler-arrows.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/sample-flowchart.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/select-area.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/select-menu.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/selected-object.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/sheets-objects.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/snaptogrid-button.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/stacked.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/standard-line-properties.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/toolbox-basic.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/toolbox-image.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/toolbox-lower.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/toolbox-magnify.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/toolbox-modify.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/toolbox-scroll.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/toolbox-special.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/toolbox-textedit.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/toolbox.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/uml-shapes.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/view-menu.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/view-zoom.png
-${PLIST.gnome}${DIA_HELPDIR}/en/graphics/zigzagline-rightclick.png
-${PLIST.gnome}${DIA_HELPDIR}/en/intro.xml
-${PLIST.gnome}${DIA_HELPDIR}/en/license.xml
-${PLIST.gnome}${DIA_HELPDIR}/en/usage-canvas.xml
-${PLIST.gnome}${DIA_HELPDIR}/en/usage-customization.xml
-${PLIST.gnome}${DIA_HELPDIR}/en/usage-layers.xml
-${PLIST.gnome}${DIA_HELPDIR}/en/usage-loadsave.xml
-${PLIST.gnome}${DIA_HELPDIR}/en/usage-objects-basic.xml
-${PLIST.gnome}${DIA_HELPDIR}/en/usage-objects-selecting.xml
-${PLIST.gnome}${DIA_HELPDIR}/en/usage-objects-special.xml
-${PLIST.gnome}${DIA_HELPDIR}/en/usage-objects.xml
-${PLIST.gnome}${DIA_HELPDIR}/en/usage-quickstart.xml
-${PLIST.gnome}${DIA_HELPDIR}/eu/authors.xml
-${PLIST.gnome}${DIA_HELPDIR}/eu/dia.xml
-${PLIST.gnome}${DIA_HELPDIR}/eu/entities.xml
-${PLIST.gnome}${DIA_HELPDIR}/eu/graphics/greendots.png
-${PLIST.gnome}${DIA_HELPDIR}/eu/graphics/home_network.png
-${PLIST.gnome}${DIA_HELPDIR}/eu/graphics/line_icon.png
-${PLIST.gnome}${DIA_HELPDIR}/eu/graphics/line_props.png
-${PLIST.gnome}${DIA_HELPDIR}/eu/intro.xml
-${PLIST.gnome}${DIA_HELPDIR}/eu/license.xml
-${PLIST.gnome}${DIA_HELPDIR}/eu/usage-canvas.xml
-${PLIST.gnome}${DIA_HELPDIR}/eu/usage-customization.xml
-${PLIST.gnome}${DIA_HELPDIR}/eu/usage-layers.xml
-${PLIST.gnome}${DIA_HELPDIR}/eu/usage-loadsave.xml
-${PLIST.gnome}${DIA_HELPDIR}/eu/usage-objects-basic.xml
-${PLIST.gnome}${DIA_HELPDIR}/eu/usage-objects-selecting.xml
-${PLIST.gnome}${DIA_HELPDIR}/eu/usage-objects-special.xml
-${PLIST.gnome}${DIA_HELPDIR}/eu/usage-objects.xml
-${PLIST.gnome}${DIA_HELPDIR}/eu/usage-quickstart.xml
-${PLIST.gnome}${DIA_HELPDIR}/fr/authors.xml
-${PLIST.gnome}${DIA_HELPDIR}/fr/custom-shapes.xml
-${PLIST.gnome}${DIA_HELPDIR}/fr/dia-1.xml
-${PLIST.gnome}${DIA_HELPDIR}/fr/dia-cmdline.xml
-${PLIST.gnome}${DIA_HELPDIR}/fr/dia.xml
-${PLIST.gnome}${DIA_HELPDIR}/fr/entities.xml
-${PLIST.gnome}${DIA_HELPDIR}/fr/graphics/color_selector.png
-${PLIST.gnome}${DIA_HELPDIR}/fr/graphics/greendots.png
-${PLIST.gnome}${DIA_HELPDIR}/fr/graphics/home_network.png
-${PLIST.gnome}${DIA_HELPDIR}/fr/graphics/line_icon.png
-${PLIST.gnome}${DIA_HELPDIR}/fr/graphics/line_props.png
-${PLIST.gnome}${DIA_HELPDIR}/fr/graphics/preferences_fig.png
-${PLIST.gnome}${DIA_HELPDIR}/fr/intro.xml
-${PLIST.gnome}${DIA_HELPDIR}/fr/license.xml
-${PLIST.gnome}${DIA_HELPDIR}/fr/usage-canvas.xml
-${PLIST.gnome}${DIA_HELPDIR}/fr/usage-customization.xml
-${PLIST.gnome}${DIA_HELPDIR}/fr/usage-layers.xml
-${PLIST.gnome}${DIA_HELPDIR}/fr/usage-loadsave.xml
-${PLIST.gnome}${DIA_HELPDIR}/fr/usage-objects-basic.xml
-${PLIST.gnome}${DIA_HELPDIR}/fr/usage-objects-selecting.xml
-${PLIST.gnome}${DIA_HELPDIR}/fr/usage-objects-special.xml
-${PLIST.gnome}${DIA_HELPDIR}/fr/usage-objects.xml
-${PLIST.gnome}${DIA_HELPDIR}/fr/usage-quickstart.xml
-${PLIST.gnome}${DIA_HELPDIR}/pl/authors.xml
-${PLIST.gnome}${DIA_HELPDIR}/pl/dia.xml
-${PLIST.gnome}${DIA_HELPDIR}/pl/graphics/greendots.png
-${PLIST.gnome}${DIA_HELPDIR}/pl/graphics/home_network.png
-${PLIST.gnome}${DIA_HELPDIR}/pl/graphics/line_props.png
-${PLIST.gnome}${DIA_HELPDIR}/pl/intro.xml
-${PLIST.gnome}${DIA_HELPDIR}/pl/license.xml
-${PLIST.gnome}${DIA_HELPDIR}/pl/usage-canvas.xml
-${PLIST.gnome}${DIA_HELPDIR}/pl/usage-customization.xml
-${PLIST.gnome}${DIA_HELPDIR}/pl/usage-layers.xml
-${PLIST.gnome}${DIA_HELPDIR}/pl/usage-loadsave.xml
-${PLIST.gnome}${DIA_HELPDIR}/pl/usage-objects-selecting.xml
-${PLIST.gnome}${DIA_HELPDIR}/pl/usage-objects-special.xml
-${PLIST.gnome}${DIA_HELPDIR}/pl/usage-objects.xml
-${PLIST.gnome}${DIA_HELPDIR}/pl/usage-quickstart.xml
 share/icons/hicolor/16x16/apps/dia.png
 share/icons/hicolor/22x22/apps/dia.png
 share/icons/hicolor/24x24/apps/dia.png
@@ -1912,9 +1754,3 @@
 share/locale/zh_TW/LC_MESSAGES/dia.mo
 share/mime-info/dia.keys
 share/mime-info/dia.mime
-${PLIST.gnome}share/omf/dia/dia-C.omf
-${PLIST.gnome}share/omf/dia/dia-eu.omf
-${PLIST.gnome}share/omf/dia/dia-fr.omf
-${PLIST.gnome}share/omf/dia/dia-pl.omf
-@pkgdir share/oaf
-@pkgdir share/dia/sheets/SISSI
diff -r d0a288f3dcd6 -r f83337afb4f9 graphics/dia/options.mk
--- a/graphics/dia/options.mk   Sat Apr 25 10:18:09 2020 +0000
+++ b/graphics/dia/options.mk   Sat Apr 25 10:51:42 2020 +0000
@@ -1,23 +1,12 @@
-# $NetBSD: options.mk,v 1.8 2009/12/09 10:22:04 drochner Exp $
+# $NetBSD: options.mk,v 1.9 2020/04/25 10:51:42 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.dia
-PKG_SUPPORTED_OPTIONS= gnome cairo
-PKG_SUGGESTED_OPTIONS= gnome cairo
+PKG_SUPPORTED_OPTIONS= cairo
+PKG_SUGGESTED_OPTIONS= cairo
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=           cairo gnome
-
-.if !empty(PKG_OPTIONS:Mgnome)
-CONFIGURE_ARGS+=       --enable-gnome
-.  include "../../devel/libgnome/buildlink3.mk"
-.  include "../../devel/libgnomeui/buildlink3.mk"
-PLIST.gnome=           yes
-PLIST_SUBST+=          DIA_HELPDIR=share/gnome/help/dia
-.else
-CONFIGURE_ARGS+=       --disable-gnome
-PLIST_SUBST+=          DIA_HELPDIR=share/dia/help
-.endif
+PLIST_VARS+=           cairo
 
 .if !empty(PKG_OPTIONS:Mcairo)
 CONFIGURE_ARGS+=       --with-cairo
Prev by Date: [pkgsrc/trunk]: pkgsrc/audio/portaudio portaudio: Fix build on SunOS
Next by Date: [pkgsrc/trunk]: pkgsrc/mk/fetch mk/fetch/fetch.mk: Add ofhttp as fetcher
Previous by Thread: [pkgsrc/trunk]: pkgsrc/audio/portaudio portaudio: Fix build on SunOS
Next by Thread: [pkgsrc/trunk]: pkgsrc/mk/fetch mk/fetch/fetch.mk: Add ofhttp as fetcher
Indexes:
Home | Main Index | Thread Index | Old Index