Thu Mar 26 16:49:46 2009 UTC ()
We need to link against libgnomeui as dependant libs no longer do.
Fix some pkglint warnings and add PKG_DESTDIR support.


(roy)
diff -r1.22 -r1.23 pkgsrc/x11/fast-user-switch-applet/Makefile
diff -r1.9 -r1.10 pkgsrc/x11/fast-user-switch-applet/distinfo
diff -r0 -r1.1 pkgsrc/x11/fast-user-switch-applet/patches/patch-ab
diff -r0 -r1.1 pkgsrc/x11/fast-user-switch-applet/patches/patch-ac
diff -r0 -r1.1 pkgsrc/x11/fast-user-switch-applet/patches/patch-ad
cvs diff -r1.22 -r1.23 pkgsrc/x11/fast-user-switch-applet/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/fast-user-switch-applet/Attic/Makefile 2009/03/08 15:56:47 1.22
+++ pkgsrc/x11/fast-user-switch-applet/Attic/Makefile 2009/03/26 16:49:45 1.23
@@ -1,52 +1,53 @@ @@ -1,52 +1,53 @@
1# $NetBSD: Makefile,v 1.22 2009/03/08 15:56:47 wiz Exp $ 1# $NetBSD: Makefile,v 1.23 2009/03/26 16:49:45 roy Exp $
2# 2#
3 3
4DISTNAME= fast-user-switch-applet-2.24.0 4DISTNAME= fast-user-switch-applet-2.24.0
5CATEGORIES= misc gnome 5CATEGORIES= misc gnome
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/fast-user-switch-applet/2.24/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/fast-user-switch-applet/2.24/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://ignore-your.tv/fusa/ 10HOMEPAGE= http://ignore-your.tv/fusa/
11COMMENT= Switch between users from the GNOME Panel 11COMMENT= Switch between users from the GNOME Panel
12 12
 13PKG_DESTDIR_SUPPORT= user-destdir
 14
13DEPENDS+= gdm>=2.16.0:../../x11/gdm 15DEPENDS+= gdm>=2.16.0:../../x11/gdm
14 16
15GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
16USE_DIRS+= gnome2-1.6 18USE_DIRS+= gnome2-1.6
17USE_LIBTOOL= yes 19USE_LIBTOOL= yes
18USE_PKGLOCALEDIR= yes 20USE_PKGLOCALEDIR= yes
19USE_TOOLS+= gmake intltool msgfmt pkg-config 21USE_TOOLS+= gmake intltool msgfmt pkg-config
20USE_X11= yes 22USE_X11= yes
21 23
22.include "../../mk/bsd.prefs.mk" 24.include "../../mk/bsd.prefs.mk"
23 25
24EVAL_PREFIX= PREFIX.gdm 26EVAL_PREFIX= PREFIX.gdm
25PREFIX.gdm_DEFAULT= ${LOCALBASE} 27PREFIX.gdm_DEFAULT= ${PREFIX}
26CONFIGURE_ARGS+= --with-gdm-setup=${PREFIX.gdm}/sbin/gdmsetup 28CONFIGURE_ARGS+= --with-gdm-setup=${PREFIX.gdm}/sbin/gdmsetup
27 29
28.if defined(PKG_SYSCONFDIR.gdm) 30.if defined(PKG_SYSCONFDIR.gdm)
29CONFIGURE_ARGS+= --with-gdm-config=${PKG_SYSCONFDIR.gdm}/custom.conf 31CONFIGURE_ARGS+= --with-gdm-config=${PKG_SYSCONFDIR.gdm}/custom.conf
30.else 32.else
31CONFIGURE_ARGS+= --with-gdm-config=${PKG_SYSCONFBASE}/gdm/custom.conf 33CONFIGURE_ARGS+= --with-gdm-config=${PKG_SYSCONFDIR}/gdm/custom.conf
32.endif 34.endif
33 35
34GCONF_SCHEMAS= fast-user-switch-applet.schemas 36GCONF_SCHEMAS= fast-user-switch-applet.schemas
35 37
36BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.8.0 38BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.8.0
37 39
38BUILDLINK_DEPMETHOD.libXt?= build 
39 
40.include "../../devel/GConf/schemas.mk" 40.include "../../devel/GConf/schemas.mk"
41.include "../../devel/gettext-lib/buildlink3.mk" 41.include "../../devel/gettext-lib/buildlink3.mk"
42.include "../../devel/libbonobo/buildlink3.mk" 42.include "../../devel/libbonobo/buildlink3.mk"
43.include "../../devel/libglade/buildlink3.mk" 43.include "../../devel/libglade/buildlink3.mk"
 44.include "../../devel/libgnomeui/buildlink3.mk"
44.include "../../devel/pango/buildlink3.mk" 45.include "../../devel/pango/buildlink3.mk"
45.include "../../textproc/gnome-doc-utils/buildlink3.mk" 46.include "../../textproc/gnome-doc-utils/buildlink3.mk"
46.include "../../mk/omf-scrollkeeper.mk" 47.include "../../mk/omf-scrollkeeper.mk"
47.include "../../x11/gnome-panel/buildlink3.mk" 48.include "../../x11/gnome-panel/buildlink3.mk"
48.include "../../x11/gtk2/buildlink3.mk" 49.include "../../x11/gtk2/buildlink3.mk"
49.include "../../x11/libSM/buildlink3.mk" 50.include "../../x11/libSM/buildlink3.mk"
50.include "../../x11/libXmu/buildlink3.mk" 51.include "../../x11/libXmu/buildlink3.mk"
51.include "../../x11/libXt/buildlink3.mk" 52.include "../../x11/libXt/buildlink3.mk"
52.include "../../mk/bsd.pkg.mk" 53.include "../../mk/bsd.pkg.mk"
cvs diff -r1.9 -r1.10 pkgsrc/x11/fast-user-switch-applet/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/fast-user-switch-applet/Attic/distinfo 2008/10/25 00:36:12 1.9
+++ pkgsrc/x11/fast-user-switch-applet/Attic/distinfo 2009/03/26 16:49:45 1.10
@@ -1,6 +1,9 @@ @@ -1,6 +1,9 @@
1$NetBSD: distinfo,v 1.9 2008/10/25 00:36:12 wiz Exp $ 1$NetBSD: distinfo,v 1.10 2009/03/26 16:49:45 roy Exp $
2 2
3SHA1 (fast-user-switch-applet-2.24.0.tar.bz2) = 8f3c99fa18b8b0a666964174f832e961bb9b9520 3SHA1 (fast-user-switch-applet-2.24.0.tar.bz2) = 8f3c99fa18b8b0a666964174f832e961bb9b9520
4RMD160 (fast-user-switch-applet-2.24.0.tar.bz2) = 4fdffd1b3a8ad3cc566e7796b001a73c1541f053 4RMD160 (fast-user-switch-applet-2.24.0.tar.bz2) = 4fdffd1b3a8ad3cc566e7796b001a73c1541f053
5Size (fast-user-switch-applet-2.24.0.tar.bz2) = 936189 bytes 5Size (fast-user-switch-applet-2.24.0.tar.bz2) = 936189 bytes
6SHA1 (patch-aa) = b15502d11ce651fe2e055e8a3e1f717b517138fe 6SHA1 (patch-aa) = b15502d11ce651fe2e055e8a3e1f717b517138fe
 7SHA1 (patch-ab) = 7e38dd38c6d1846fb48a46a9b06d3ee266a8ff50
 8SHA1 (patch-ac) = 80b764341d70d1fcc02c362e7dc3bc14bade30e1
 9SHA1 (patch-ad) = c32ae791cd9c517b89274f75b0fd166037c2edfd
File Added: pkgsrc/x11/fast-user-switch-applet/patches/Attic/patch-ab
$NetBSD: patch-ab,v 1.1 2009/03/26 16:49:46 roy Exp $

--- configure.ac	2009-03-26 15:39:22.000000000 +0000
+++ configure.ac	2009-03-26 15:39:09.000000000 +0000
@@ -47,10 +47,12 @@
 PANEL_REQUIRED_VERSION=2.0.0
 GLADE_REQUIRED_VERSION=2.0.0
 GLIB_REQUIRED_VERSION=2.15.3
+GNOMEUI_REQUIRED_VERSION=2.6.0
 
 PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION
 	     libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION
 	     libglade-2.0 >= $GLADE_REQUIRED_VERSION
+	     libgnomeui-2.0 >= $GNOMEUI_REQUIRED_VERSION
 	     gio-2.0 >= $GLIB_REQUIRED_VERSION)
 AC_SUBST(APPLET_CFLAGS)
 AC_SUBST(APPLET_LIBS)
File Added: pkgsrc/x11/fast-user-switch-applet/patches/Attic/patch-ac
$NetBSD: patch-ac,v 1.1 2009/03/26 16:49:46 roy Exp $

--- configure	2009-03-26 16:02:51.000000000 +0000
+++ configure	2009-03-26 16:06:55.000000000 +0000
@@ -21191,6 +21191,7 @@
 PANEL_REQUIRED_VERSION=2.0.0
 GLADE_REQUIRED_VERSION=2.0.0
 GLIB_REQUIRED_VERSION=2.15.3
+GNOMEUI_REQUIRED_VERSION=2.6.0
 
 
 
@@ -21325,10 +21326,12 @@
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION
 	     libpanelapplet-2.0 >= \$PANEL_REQUIRED_VERSION
 	     libglade-2.0 >= \$GLADE_REQUIRED_VERSION
+	     libgnomeui-2.0 >= \$GNOMEUI_REQUIRED_VERSION
 	     gio-2.0 >= \$GLIB_REQUIRED_VERSION\"") >&5
   ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
 	     libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION
 	     libglade-2.0 >= $GLADE_REQUIRED_VERSION
+	     libgnomeui-2.0 >= $GNOMEUI_REQUIRED_VERSION
 	     gio-2.0 >= $GLIB_REQUIRED_VERSION") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -21336,6 +21339,7 @@
   pkg_cv_APPLET_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED_VERSION
 	     libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION
 	     libglade-2.0 >= $GLADE_REQUIRED_VERSION
+	     libgnomeui-2.0 >= $GNOMEUI_REQUIRED_VERSION
 	     gio-2.0 >= $GLIB_REQUIRED_VERSION" 2>/dev/null`
 else
   pkg_failed=yes
@@ -21352,10 +21356,12 @@
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION
 	     libpanelapplet-2.0 >= \$PANEL_REQUIRED_VERSION
 	     libglade-2.0 >= \$GLADE_REQUIRED_VERSION
+	     libgnomeui-2.0 >= \$GNOMEUI_REQUIRED_VERSION
 	     gio-2.0 >= \$GLIB_REQUIRED_VERSION\"") >&5
   ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
 	     libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION
 	     libglade-2.0 >= $GLADE_REQUIRED_VERSION
+	     libgnomeui-2.0 >= $GNOMEUI_REQUIRED_VERSION
 	     gio-2.0 >= $GLIB_REQUIRED_VERSION") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -21363,6 +21369,7 @@
   pkg_cv_APPLET_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION
 	     libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION
 	     libglade-2.0 >= $GLADE_REQUIRED_VERSION
+	     libgnomeui-2.0 >= $GNOMEUI_REQUIRED_VERSION
 	     gio-2.0 >= $GLIB_REQUIRED_VERSION" 2>/dev/null`
 else
   pkg_failed=yes
@@ -21385,11 +21392,13 @@
 	        APPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
 	     libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION
 	     libglade-2.0 >= $GLADE_REQUIRED_VERSION
+	     libgnomeui-2.0 >= $GNOMEUI_REQUIRED_VERSION
 	     gio-2.0 >= $GLIB_REQUIRED_VERSION"`
         else
 	        APPLET_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
 	     libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION
 	     libglade-2.0 >= $GLADE_REQUIRED_VERSION
+	     libgnomeui-2.0 >= $GNOMEUI_REQUIRED_VERSION
 	     gio-2.0 >= $GLIB_REQUIRED_VERSION"`
         fi
 	# Put the nasty error message in config.log where it belongs
@@ -21398,6 +21407,7 @@
 	{ { echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED_VERSION
 	     libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION
 	     libglade-2.0 >= $GLADE_REQUIRED_VERSION
+	     libgnomeui-2.0 >= $GNOMEUI_REQUIRED_VERSION
 	     gio-2.0 >= $GLIB_REQUIRED_VERSION) were not met:
 
 $APPLET_PKG_ERRORS
@@ -21412,6 +21422,7 @@
 echo "$as_me: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED_VERSION
 	     libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION
 	     libglade-2.0 >= $GLADE_REQUIRED_VERSION
+	     libgnomeui-2.0 >= $GNOMEUI_REQUIRED_VERSION
 	     gio-2.0 >= $GLIB_REQUIRED_VERSION) were not met:
 
 $APPLET_PKG_ERRORS
File Added: pkgsrc/x11/fast-user-switch-applet/patches/Attic/patch-ad
$NetBSD: patch-ad,v 1.1 2009/03/26 16:49:46 roy Exp $

--- src/applet.c	2009-03-26 16:08:23.000000000 +0000
+++ src/applet.c	2009-03-26 16:08:40.000000000 +0000
@@ -22,6 +22,7 @@
 #include <glib/gi18n.h>
 
 #include <string.h>
+#include <unistd.h>
 
 #include <gdk/gdkkeysyms.h>