From 002f22582b7ef1c22370c40b81a6be894d7b1fed Mon Sep 17 00:00:00 2001 From: wiz Date: Sat, 15 Aug 2009 14:48:34 +0000 Subject: Fix build against libxklavier-4.0 and depend on it. Bump PKGREVISION. Set LICENSE. Split off options handling into options.mk. --- x11/gnome-control-center/Makefile | 30 ++++++++++-------------------- x11/gnome-control-center/distinfo | 3 ++- x11/gnome-control-center/options.mk | 15 +++++++++++++++ x11/gnome-control-center/patches/patch-aa | 13 +++++++++++++ 4 files changed, 40 insertions(+), 21 deletions(-) create mode 100644 x11/gnome-control-center/options.mk create mode 100644 x11/gnome-control-center/patches/patch-aa (limited to 'x11') diff --git a/x11/gnome-control-center/Makefile b/x11/gnome-control-center/Makefile index 50b9d7de6b4..623585dd224 100644 --- a/x11/gnome-control-center/Makefile +++ b/x11/gnome-control-center/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.24 2009/07/22 09:01:52 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2009/08/15 14:48:34 wiz Exp $ # DISTNAME= gnome-control-center-2.26.0 +PKGREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-control-center/2.26/} EXTRACT_SUFX= .tar.bz2 @@ -9,6 +10,7 @@ EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= GNOME2 configuration utility +LICENSE= gnu-gpl-v2 PKG_DESTDIR_SUPPORT= user-destdir @@ -38,28 +40,14 @@ EGDIR= ${PREFIX}/share/examples/gnome-control-center CONF_FILES+= ${EGDIR}/gnomecc.menu \ ${PKG_SYSCONFDIR}/xdg/menus/gnomecc.menu -BUILDLINK_API_DEPENDS.glib2= glib2>=2.8.0 -BUILDLINK_API_DEPENDS.gstreamer0.10= gstreamer0.10>=0.10.1.2 -BUILDLINK_API_DEPENDS.gst-plugins0.10-base= gst-plugins0.10-base>=0.10.1.2 -BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.8.12 -BUILDLINK_API_DEPENDS.libxklavier= libxklavier>=3.6 -BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1.2 - -PKG_OPTIONS_VAR= PKG_OPTIONS.gnome-control-center -PKG_SUPPORTED_OPTIONS= evolution -PKG_SUGGESTED_OPTIONS= evolution -.include "../../mk/bsd.options.mk" -PLIST_VARS+= evolution -.if !empty(PKG_OPTIONS:Mevolution) -CONFIGURE_ARGS+= --enable-aboutme -PLIST.evolution= yes -.endif +.include "options.mk" _TOOLS_USE_MSGFMT_SH= yes .include "../../audio/libcanberra/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/GConf/schemas.mk" +BUILDLINK_API_DEPENDS.glib2= glib2>=2.8.0 .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libbonobo/buildlink3.mk" .include "../../devel/libbonoboui/buildlink3.mk" @@ -68,10 +56,9 @@ _TOOLS_USE_MSGFMT_SH= yes .include "../../devel/libgnomeui/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.if !empty(PKG_OPTIONS:Mevolution) -.include "../../mail/evolution-data-server/buildlink3.mk" -.endif +BUILDLINK_API_DEPENDS.gstreamer0.10= gstreamer0.10>=0.10.1.2 .include "../../multimedia/gstreamer0.10/buildlink3.mk" +BUILDLINK_API_DEPENDS.gst-plugins0.10-base= gst-plugins0.10-base>=0.10.1.2 .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" DEPENDS+= gst-plugins0.10-hal>=0.10.11:../../multimedia/gst-plugins0.10-hal .include "../../net/ORBit2/buildlink3.mk" @@ -90,11 +77,14 @@ DEPENDS+= gst-plugins0.10-hal>=0.10.11:../../multimedia/gst-plugins0.10-hal .include "../../wm/metacity/buildlink3.mk" .include "../../x11/gnome-desktop/buildlink3.mk" .include "../../x11/gnome-panel/buildlink3.mk" +BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.8.12 .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/libXScrnSaver/buildlink3.mk" .include "../../x11/libXcursor/buildlink3.mk" +BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1.2 .include "../../x11/libXft/buildlink3.mk" .include "../../x11/libXxf86misc/buildlink3.mk" +BUILDLINK_API_DEPENDS.libxklavier= libxklavier>=4.0 .include "../../x11/libxklavier/buildlink3.mk" .include "../../x11/libgnomekbd/buildlink3.mk" .include "../../databases/shared-mime-info/mimedb.mk" diff --git a/x11/gnome-control-center/distinfo b/x11/gnome-control-center/distinfo index 36b93c8a919..b1c2dd8f84d 100644 --- a/x11/gnome-control-center/distinfo +++ b/x11/gnome-control-center/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.8 2009/03/17 00:27:37 jmcneill Exp $ +$NetBSD: distinfo,v 1.9 2009/08/15 14:48:34 wiz Exp $ SHA1 (gnome-control-center-2.26.0.tar.bz2) = 4730780aaab599869a2dfe2d72d68dd54bb77058 RMD160 (gnome-control-center-2.26.0.tar.bz2) = d22c75b21d63bad9321ad1221e442f381da8dd35 Size (gnome-control-center-2.26.0.tar.bz2) = 2262324 bytes +SHA1 (patch-aa) = 94fc634e164c6c5398fe8cfdeb8c01372ae87aac SHA1 (patch-ab) = 82e7da7e90d8c30aa061c49f9f26ae270c122462 SHA1 (patch-ad) = fe6ae649237fe3b07a449b92c35d8a803b4533fb SHA1 (patch-ae) = fc38771eef736338a70038cf0218005cd0bffb56 diff --git a/x11/gnome-control-center/options.mk b/x11/gnome-control-center/options.mk new file mode 100644 index 00000000000..f4e9b64a140 --- /dev/null +++ b/x11/gnome-control-center/options.mk @@ -0,0 +1,15 @@ +# $NetBSD: options.mk,v 1.1 2009/08/15 14:48:34 wiz Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.gnome-control-center +PKG_SUPPORTED_OPTIONS= evolution +PKG_SUGGESTED_OPTIONS= evolution + +.include "../../mk/bsd.options.mk" + +PLIST_VARS+= evolution + +.if !empty(PKG_OPTIONS:Mevolution) +CONFIGURE_ARGS+= --enable-aboutme +PLIST.evolution= yes +.include "../../mail/evolution-data-server/buildlink3.mk" +.endif diff --git a/x11/gnome-control-center/patches/patch-aa b/x11/gnome-control-center/patches/patch-aa new file mode 100644 index 00000000000..c37595d187a --- /dev/null +++ b/x11/gnome-control-center/patches/patch-aa @@ -0,0 +1,13 @@ +$NetBSD: patch-aa,v 1.3 2009/08/15 14:48:34 wiz Exp $ + +--- capplets/keyboard/gnome-keyboard-properties-xkb.c.orig 2008-11-04 16:09:47.000000000 +0000 ++++ capplets/keyboard/gnome-keyboard-properties-xkb.c +@@ -155,7 +155,7 @@ setup_xkb_tabs (GladeXML * dialog, GConf + + engine = xkl_engine_get_instance (GDK_DISPLAY ()); + config_registry = xkl_config_registry_get_instance (engine); +- xkl_config_registry_load (config_registry); ++ xkl_config_registry_load (config_registry, FALSE); + + gkbd_keyboard_config_init (&initial_config, xkb_gconf_client, + engine); -- cgit v1.2.3