diff options
author | gdt <gdt@pkgsrc.org> | 2012-09-19 22:59:17 +0000 |
---|---|---|
committer | gdt <gdt@pkgsrc.org> | 2012-09-19 22:59:17 +0000 |
commit | 03e203d6d0c7946af5a00a473de887389e007c4c (patch) | |
tree | e1aa6a448fd5b659c2a5a0b513366474abe31a4f /x11 | |
parent | f8313a597b779f240b980b7442eb21cb74c07b19 (diff) | |
download | pkgsrc-03e203d6d0c7946af5a00a473de887389e007c4c.tar.gz |
Add evolution option, defaulting on.
This package lacked an evolution option (to depend on
evolution-data-server). Other gnome packages had such an option,
which is highly useful to get back to a workin system in the scenario
where libffi has a new major version shlib, and evolution-data-server
won't build. Because the option defaults to on, this doesn't change
the default behavior, but those who set
PKG_DEFAULT_OPTIONS+=-evolution can be spared the build pain.
A decision about whether evolution support should be on by default or
not is pending; this change is not controversial and is being made now.
Diffstat (limited to 'x11')
-rw-r--r-- | x11/py-gnome2-desktop/Makefile | 7 | ||||
-rw-r--r-- | x11/py-gnome2-desktop/PLIST | 10 | ||||
-rw-r--r-- | x11/py-gnome2-desktop/options.mk | 14 |
3 files changed, 23 insertions, 8 deletions
diff --git a/x11/py-gnome2-desktop/Makefile b/x11/py-gnome2-desktop/Makefile index 6a2c5ade3fa..3e9c972e7da 100644 --- a/x11/py-gnome2-desktop/Makefile +++ b/x11/py-gnome2-desktop/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.65 2012/09/15 10:07:12 obache Exp $ +# $NetBSD: Makefile,v 1.66 2012/09/19 22:59:17 gdt Exp $ # DISTNAME= gnome-python-desktop-2.32.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/-python/2/} -PKGREVISION= 16 +PKGREVISION= 17 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-python-desktop/2.32/} EXTRACT_SUFX= .tar.bz2 @@ -31,11 +31,12 @@ PYTHON_VERSIONS_ACCEPTED= ${PYTHON_VERSION_DEFAULT:M27} PYTHON_VERSIONS_ACCEPTED+= ${PYTHON_VERSION_DEFAULT:M26} PYTHON_VERSIONS_ACCEPTED+= ${PYTHON_VERSION_DEFAULT:M25} +.include "options.mk" + .include "../../lang/python/extension.mk" .include "../../devel/libwnck/buildlink3.mk" .include "../../graphics/librsvg/buildlink3.mk" .include "../../graphics/py-cairo/buildlink3.mk" -.include "../../mail/evolution-data-server/buildlink3.mk" .include "../../multimedia/gnome-media/buildlink3.mk" .include "../../multimedia/totem-pl-parser/buildlink3.mk" # works, but should better be in its own pkg to limit dependencies diff --git a/x11/py-gnome2-desktop/PLIST b/x11/py-gnome2-desktop/PLIST index 755df3a49ad..2cde07de267 100644 --- a/x11/py-gnome2-desktop/PLIST +++ b/x11/py-gnome2-desktop/PLIST @@ -1,12 +1,12 @@ -@comment $NetBSD: PLIST,v 1.8 2009/07/26 19:05:30 drochner Exp $ +@comment $NetBSD: PLIST,v 1.9 2012/09/19 22:59:17 gdt Exp $ lib/pkgconfig/gnome-python-desktop-2.0.pc ${PYSITELIB}/gtk-2.0/bugbuddy.py ${PYSITELIB}/gtk-2.0/bugbuddy.pyc ${PYSITELIB}/gtk-2.0/bugbuddy.pyo ${PYSITELIB}/gtk-2.0/evince.la -${PYSITELIB}/gtk-2.0/evolution/__init__.py -${PYSITELIB}/gtk-2.0/evolution/ebook.la -${PYSITELIB}/gtk-2.0/evolution/ecal.la +${PLIST.evolution}${PYSITELIB}/gtk-2.0/evolution/__init__.py +${PLIST.evolution}${PYSITELIB}/gtk-2.0/evolution/ebook.la +${PLIST.evolution}${PYSITELIB}/gtk-2.0/evolution/ecal.la ${PYSITELIB}/gtk-2.0/gnome/applet.py ${PYSITELIB}/gtk-2.0/gnome/applet.pyc ${PYSITELIB}/gtk-2.0/gnome/applet.pyo @@ -68,7 +68,7 @@ share/gtk-doc/html/pygtksourceview/pygtksourceview.devhelp share/pygtk/2.0/defs/_gnomedesktop.defs share/pygtk/2.0/defs/applet.defs share/pygtk/2.0/defs/art.defs -share/pygtk/2.0/defs/ebook.defs +${PLIST.evolution}share/pygtk/2.0/defs/ebook.defs share/pygtk/2.0/defs/evince.defs share/pygtk/2.0/defs/gnomekeyring.defs share/pygtk/2.0/defs/gtksourceview.defs diff --git a/x11/py-gnome2-desktop/options.mk b/x11/py-gnome2-desktop/options.mk new file mode 100644 index 00000000000..9f32a5ad10d --- /dev/null +++ b/x11/py-gnome2-desktop/options.mk @@ -0,0 +1,14 @@ +# $NetBSD: options.mk,v 1.1 2012/09/19 22:59:17 gdt Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.py-gnome2-desktop +PKG_SUPPORTED_OPTIONS= evolution +PKG_SUGGESTED_OPTIONS= evolution + +.include "../../mk/bsd.options.mk" + +PLIST_VARS+= evolution + +.if !empty(PKG_OPTIONS:Mevolution) +PLIST.evolution= yes +.include "../../mail/evolution-data-server/buildlink3.mk" +.endif |