[pkgsrc/trunk]: pkgsrc/x11 misc cleanup (stale dependencies, old comments)

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4621965df55e
branches:  trunk
changeset: 400771:4621965df55e
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Mon Oct 26 10:57:21 2009 +0000

description:
misc cleanup (stale dependencies, old comments)

diffstat:

 x11/gnome-control-center/Makefile |   7 +------
 x11/gnome-panel/Makefile          |  15 ++++++---------
 2 files changed, 7 insertions(+), 15 deletions(-)

diffs (96 lines):

diff -r 0875c3eb69c4 -r 4621965df55e x11/gnome-control-center/Makefile
--- a/x11/gnome-control-center/Makefile Mon Oct 26 10:39:19 2009 +0000
+++ b/x11/gnome-control-center/Makefile Mon Oct 26 10:57:21 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2009/10/22 17:25:44 drochner Exp $
+# $NetBSD: Makefile,v 1.28 2009/10/26 10:57:21 drochner Exp $
 #
 
 DISTNAME=      gnome-control-center-2.28.1
@@ -22,7 +22,6 @@
 
 CPPFLAGS+=             -DDBUS_API_SUBJECT_TO_CHANGE
 
-#PKGCONFIG_OVERRIDE+=  gnome-settings-daemon/gnome-settings-daemon.pc.in
 PKGCONFIG_OVERRIDE+=   libwindow-settings/gnome-window-settings-2.0.pc.in
 
 INSTALL_MAKE_FLAGS+=   ${MAKE_FLAGS}
@@ -55,16 +54,12 @@
 .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"
-.include "../../security/policykit/buildlink3.mk"
-.include "../../security/policykit-gnome/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/gnome-menus/buildlink3.mk"
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
-.include "../../sysutils/hal/buildlink3.mk"
 .include "../../sysutils/nautilus/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff -r 0875c3eb69c4 -r 4621965df55e x11/gnome-panel/Makefile
--- a/x11/gnome-panel/Makefile  Mon Oct 26 10:39:19 2009 +0000
+++ b/x11/gnome-panel/Makefile  Mon Oct 26 10:57:21 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.115 2009/10/22 17:29:42 drochner Exp $
+# $NetBSD: Makefile,v 1.116 2009/10/26 10:57:21 drochner Exp $
 #
 
 DISTNAME=              gnome-panel-2.28.0
@@ -12,9 +12,10 @@
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
+# depends on policykit
 #EGDIR=                ${PREFIX}/share/examples/gnome-panel
 #CONF_FILES+=  ${PREFIX}/share/examples/gnome-panel/org.gnome.ClockApplet.Mechanism.conf \
-               ${PKG_SYSCONFDIR}/dbus-1/system.d/org.gnome.ClockApplet.Mechanism.conf
+#              ${PKG_SYSCONFDIR}/dbus-1/system.d/org.gnome.ClockApplet.Mechanism.conf
 
 GNU_CONFIGURE=         YES
 USE_TOOLS+=            gmake intltool msgfmt perl:run pkg-config
@@ -22,8 +23,6 @@
 USE_LIBTOOL=           YES
 PKGCONFIG_OVERRIDE=    libpanel-applet/libpanelapplet-2.0.pc.in
 
-#CPPFLAGS+=    -DPANEL_GNOME_LOGO_ICON="\"netbsd-logo-icon-transparent\""
-
 GCONF_SCHEMAS= clock.schemas
 GCONF_SCHEMAS+=        fish.schemas
 GCONF_SCHEMAS+=        panel-global.schemas
@@ -36,7 +35,6 @@
 GCONF_ENTRIES=         panel-default-setup.entries
 
 BUILDLINK_API_DEPENDS.gtk2+=           gtk2+>=2.15.1
-BUILDLINK_API_DEPENDS.libglade+=       libglade>=2.5.0
 BUILDLINK_API_DEPENDS.libgnome+=       libgnome>=2.13.0
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gnome-panel
@@ -49,7 +47,6 @@
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/libbonoboui/buildlink3.mk"
-#.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libwnck/buildlink3.mk"
@@ -63,12 +60,12 @@
 .include "../../mail/evolution-data-server/buildlink3.mk"
 .endif
 .include "../../net/ORBit2/buildlink3.mk"
-.include "../../security/policykit/buildlink3.mk"
-.include "../../security/policykit-gnome/buildlink3.mk"
+# pkgsrc policykit is too old
+#.include "../../security/policykit/buildlink3.mk"
+#.include "../../security/policykit-gnome/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gnome-menus+= gnome-menus>=2.28.0
 .include "../../sysutils/gnome-menus/buildlink3.mk"
-.include "../../sysutils/hal/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../mk/omf-scrollkeeper.mk"
 .include "../../x11/gnome-desktop/buildlink3.mk"