Tue Aug 18 19:31:31 2009 UTC ()
Don't check for the X server location at "configure" time. The X server
is no formal dependency of this pkg, so the outcome is not deterministic.
Assume instead that the X server is at ${X11BASE}/bin/X.
fixes PR pkg/41319 by Jared D. McNeill
bump PKGREVISION


(drochner)
diff -r1.153 -r1.154 pkgsrc/x11/gdm/Makefile
diff -r1.59 -r1.60 pkgsrc/x11/gdm/distinfo
diff -r1.23 -r1.24 pkgsrc/x11/gdm/patches/patch-aa
cvs diff -r1.153 -r1.154 pkgsrc/x11/gdm/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/gdm/Attic/Makefile 2009/08/04 08:14:39 1.153
+++ pkgsrc/x11/gdm/Attic/Makefile 2009/08/18 19:31:30 1.154
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.153 2009/08/04 08:14:39 abs Exp $ 1# $NetBSD: Makefile,v 1.154 2009/08/18 19:31:30 drochner Exp $
2# 2#
3 3
4DISTNAME= gdm-2.20.10 4DISTNAME= gdm-2.20.10
 5PKGREVISION= 1
5CATEGORIES= x11 gnome 6CATEGORIES= x11 gnome
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gdm/2.20/} 7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gdm/2.20/}
7EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.gnome.org/ 11HOMEPAGE= http://www.gnome.org/
11COMMENT= Gnome Display Manager - a re-implementation of the xdm program 12COMMENT= Gnome Display Manager - a re-implementation of the xdm program
12 13
13PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
14 15
15DEPENDS+= zenity>=2.16.0:../../x11/zenity 16DEPENDS+= zenity>=2.16.0:../../x11/zenity
16 17
17USE_PKGLOCALEDIR= YES 18USE_PKGLOCALEDIR= YES
cvs diff -r1.59 -r1.60 pkgsrc/x11/gdm/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/gdm/Attic/distinfo 2009/04/07 11:40:20 1.59
+++ pkgsrc/x11/gdm/Attic/distinfo 2009/08/18 19:31:30 1.60
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: distinfo,v 1.59 2009/04/07 11:40:20 drochner Exp $ 1$NetBSD: distinfo,v 1.60 2009/08/18 19:31:30 drochner Exp $
2 2
3SHA1 (gdm-2.20.10.tar.bz2) = 42e9e52184393352f005f1735843a30f764aef18 3SHA1 (gdm-2.20.10.tar.bz2) = 42e9e52184393352f005f1735843a30f764aef18
4RMD160 (gdm-2.20.10.tar.bz2) = 4bb50375d30638143b47b7884405e9999e304da5 4RMD160 (gdm-2.20.10.tar.bz2) = 4bb50375d30638143b47b7884405e9999e304da5
5Size (gdm-2.20.10.tar.bz2) = 3940077 bytes 5Size (gdm-2.20.10.tar.bz2) = 3940077 bytes
6SHA1 (patch-aa) = 0e919c36bed0901583b4a527d4e9461ab737a171 6SHA1 (patch-aa) = 5e950a5271d3c399cb9e613b4c5b8557a0844656
7SHA1 (patch-ab) = 43b565fcbe2e172f5e319b3d111d475646f481e0 7SHA1 (patch-ab) = 43b565fcbe2e172f5e319b3d111d475646f481e0
8SHA1 (patch-ac) = 69b3539e50af0b32207b9ffeb7cb01645c9ece3c 8SHA1 (patch-ac) = 69b3539e50af0b32207b9ffeb7cb01645c9ece3c
9SHA1 (patch-ae) = c95265b55c968a0466e1ae50bbe58c121f05b027 9SHA1 (patch-ae) = c95265b55c968a0466e1ae50bbe58c121f05b027
10SHA1 (patch-ak) = 99ca1a7ce804a1ae99903860e2b923c972ae95e6 10SHA1 (patch-ak) = 99ca1a7ce804a1ae99903860e2b923c972ae95e6
11SHA1 (patch-al) = 3b66dd3f4cdea6a3af5cbd0ff65eb02ccdead483 11SHA1 (patch-al) = 3b66dd3f4cdea6a3af5cbd0ff65eb02ccdead483
12SHA1 (patch-ao) = c67c0b76db15c50dfb20d1cc9cd44d76ba7220f3 12SHA1 (patch-ao) = c67c0b76db15c50dfb20d1cc9cd44d76ba7220f3
13SHA1 (patch-ap) = 634fae3ae86620229c66d48ae0e3f8d86d71b1af 13SHA1 (patch-ap) = 634fae3ae86620229c66d48ae0e3f8d86d71b1af
14SHA1 (patch-aq) = 7885ca3774bb3cd91a800654368f9cd5cde806c7 14SHA1 (patch-aq) = 7885ca3774bb3cd91a800654368f9cd5cde806c7
15SHA1 (patch-ar) = 9783e336cd11b34e990291c25f0b70752edec012 15SHA1 (patch-ar) = 9783e336cd11b34e990291c25f0b70752edec012
16SHA1 (patch-as) = 13135a44949dac9ff23be4c8efb15baffd18b58b 16SHA1 (patch-as) = 13135a44949dac9ff23be4c8efb15baffd18b58b
17SHA1 (patch-at) = 4be192597cf1bb129e5b69f27d9d388bcd00b4e0 17SHA1 (patch-at) = 4be192597cf1bb129e5b69f27d9d388bcd00b4e0
cvs diff -r1.23 -r1.24 pkgsrc/x11/gdm/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/x11/gdm/patches/Attic/patch-aa 2008/05/29 17:21:45 1.23
+++ pkgsrc/x11/gdm/patches/Attic/patch-aa 2009/08/18 19:31:30 1.24
@@ -1,47 +1,47 @@ @@ -1,47 +1,47 @@
1$NetBSD: patch-aa,v 1.23 2008/05/29 17:21:45 drochner Exp $ 1$NetBSD: patch-aa,v 1.24 2009/08/18 19:31:30 drochner Exp $
2 2
3--- configure.orig 2008-05-13 02:27:18.000000000 +0200 3--- configure.orig 2009-03-19 06:00:24.000000000 +0100
4+++ configure 4+++ configure
5@@ -27278,7 +27278,9 @@ cat confdefs.h >>conftest.$ac_ext 5@@ -27448,7 +27448,9 @@ cat confdefs.h >>conftest.$ac_ext
6 cat >>conftest.$ac_ext <<_ACEOF 6 cat >>conftest.$ac_ext <<_ACEOF
7 /* end confdefs.h. */ 7 /* end confdefs.h. */
8 #include <sys/statvfs.h> 8 #include <sys/statvfs.h>
9+#ifndef __NetBSD__ 9+#ifndef __NetBSD__
10 #include <sys/fstyp.h> 10 #include <sys/fstyp.h>
11+#endif 11+#endif
12 _ACEOF 12 _ACEOF
13 if { (ac_try="$ac_cpp conftest.$ac_ext" 13 if { (ac_try="$ac_cpp conftest.$ac_ext"
14 case "(($ac_try" in 14 case "(($ac_try" in
15@@ -33554,6 +33556,18 @@ case "$host" in 15@@ -33725,6 +33727,18 @@ case "$host" in
16 HOST_UTMP_LINE_REMOTE="" 16 HOST_UTMP_LINE_REMOTE=""
17 HOST_UTMP_PSEUDO_DEVICE="false" 17 HOST_UTMP_PSEUDO_DEVICE="false"
18 ;; 18 ;;
19+*netbsd*) 19+*netbsd*)
20+ HOST_GDM_USER_PATH="/bin:/usr/bin" 20+ HOST_GDM_USER_PATH="/bin:/usr/bin"
21+ HOST_HALT_COMMAND="/sbin/shutdown -p now" 21+ HOST_HALT_COMMAND="/sbin/shutdown -p now"
22+ HOST_REBOOT_COMMAND="/sbin/shutdown -r now" 22+ HOST_REBOOT_COMMAND="/sbin/shutdown -r now"
23+ HOST_SUSPEND_COMMAND="/usr/sbin/zzz" 23+ HOST_SUSPEND_COMMAND="/usr/sbin/zzz"
24+ HOST_XSESSION_SHELL=/bin/sh 24+ HOST_XSESSION_SHELL=/bin/sh
25+ HOST_SOUND_PROGRAM=/usr/bin/audioplay 25+ HOST_SOUND_PROGRAM=/usr/bin/audioplay
26+ HOST_GDMGNOMESESSIONCMD="dbus-launch --exit-with-session gnome-session" 26+ HOST_GDMGNOMESESSIONCMD="dbus-launch --exit-with-session gnome-session"
27+ HOST_UTMP_LINE_ATTACHED="/dev/console" 27+ HOST_UTMP_LINE_ATTACHED="/dev/console"
28+ HOST_UTMP_LINE_REMOTE="" 28+ HOST_UTMP_LINE_REMOTE=""
29+ HOST_UTMP_PSEUDO_DEVICE="false" 29+ HOST_UTMP_PSEUDO_DEVICE="false"
30+ ;; 30+ ;;
31 *) 31 *)
32 HOST_GDM_USER_PATH="/bin:/usr/bin" 32 HOST_GDM_USER_PATH="/bin:/usr/bin"
33 HOST_HALT_COMMAND="/usr/bin/poweroff;/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now" 33 HOST_HALT_COMMAND="/usr/bin/poweroff;/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now"
34@@ -33570,18 +33584,18 @@ esac 34@@ -33741,18 +33755,18 @@ esac
35  35
36 # allow user to override the host-specific default 36 # allow user to override the host-specific default
37  37
38-test "x$GDM_USER_PATH" == x && GDM_USER_PATH=${HOST_GDM_USER_PATH} 38-test "x$GDM_USER_PATH" == x && GDM_USER_PATH=${HOST_GDM_USER_PATH}
39-test "x$GDM_HALT_COMMAND" == x && GDM_HALT_COMMAND=${HOST_GDM_HALT_COMMAND} 39-test "x$GDM_HALT_COMMAND" == x && GDM_HALT_COMMAND=${HOST_GDM_HALT_COMMAND}
40-test "x$HALT_COMMAND" == x && HALT_COMMAND=${HOST_HALT_COMMAND} 40-test "x$HALT_COMMAND" == x && HALT_COMMAND=${HOST_HALT_COMMAND}
41-test "x$REBOOT_COMMAND" == x && REBOOT_COMMAND=${HOST_REBOOT_COMMAND} 41-test "x$REBOOT_COMMAND" == x && REBOOT_COMMAND=${HOST_REBOOT_COMMAND}
42-test "x$SUSPEND_COMMAND" == x && SUSPEND_COMMAND=${HOST_SUSPEND_COMMAND} 42-test "x$SUSPEND_COMMAND" == x && SUSPEND_COMMAND=${HOST_SUSPEND_COMMAND}
43-test "x$XSESSION_SHELL" == x && XSESSION_SHELL=${HOST_XSESSION_SHELL} 43-test "x$XSESSION_SHELL" == x && XSESSION_SHELL=${HOST_XSESSION_SHELL}
44-test "x$SOUND_PROGRAM" == x && SOUND_PROGRAM=${HOST_SOUND_PROGRAM} 44-test "x$SOUND_PROGRAM" == x && SOUND_PROGRAM=${HOST_SOUND_PROGRAM}
45-test "x$GDMGNOMESESSIONCMD" == x && GDMGNOMESESSIONCMD=${HOST_GDMGNOMESESSIONCMD} 45-test "x$GDMGNOMESESSIONCMD" == x && GDMGNOMESESSIONCMD=${HOST_GDMGNOMESESSIONCMD}
46-test "x$UTMP_LINE_ATTACHED" == x && UTMP_LINE_ATTACHED=${HOST_UTMP_LINE_ATTACHED} 46-test "x$UTMP_LINE_ATTACHED" == x && UTMP_LINE_ATTACHED=${HOST_UTMP_LINE_ATTACHED}
47-test "x$UTMP_LINE_REMOTE" == x && UTMP_LINE_REMOTE=${HOST_UTMP_LINE_REMOTE} 47-test "x$UTMP_LINE_REMOTE" == x && UTMP_LINE_REMOTE=${HOST_UTMP_LINE_REMOTE}
@@ -52,33 +52,33 @@ $NetBSD: patch-aa,v 1.23 2008/05/29 17:2 @@ -52,33 +52,33 @@ $NetBSD: patch-aa,v 1.23 2008/05/29 17:2
52+test "x$HALT_COMMAND" = x && HALT_COMMAND=${HOST_HALT_COMMAND} 52+test "x$HALT_COMMAND" = x && HALT_COMMAND=${HOST_HALT_COMMAND}
53+test "x$REBOOT_COMMAND" = x && REBOOT_COMMAND=${HOST_REBOOT_COMMAND} 53+test "x$REBOOT_COMMAND" = x && REBOOT_COMMAND=${HOST_REBOOT_COMMAND}
54+test "x$SUSPEND_COMMAND" = x && SUSPEND_COMMAND=${HOST_SUSPEND_COMMAND} 54+test "x$SUSPEND_COMMAND" = x && SUSPEND_COMMAND=${HOST_SUSPEND_COMMAND}
55+test "x$XSESSION_SHELL" = x && XSESSION_SHELL=${HOST_XSESSION_SHELL} 55+test "x$XSESSION_SHELL" = x && XSESSION_SHELL=${HOST_XSESSION_SHELL}
56+test "x$SOUND_PROGRAM" = x && SOUND_PROGRAM=${HOST_SOUND_PROGRAM} 56+test "x$SOUND_PROGRAM" = x && SOUND_PROGRAM=${HOST_SOUND_PROGRAM}
57+test "x$GDMGNOMESESSIONCMD" = x && GDMGNOMESESSIONCMD=${HOST_GDMGNOMESESSIONCMD} 57+test "x$GDMGNOMESESSIONCMD" = x && GDMGNOMESESSIONCMD=${HOST_GDMGNOMESESSIONCMD}
58+test "x$UTMP_LINE_ATTACHED" = x && UTMP_LINE_ATTACHED=${HOST_UTMP_LINE_ATTACHED} 58+test "x$UTMP_LINE_ATTACHED" = x && UTMP_LINE_ATTACHED=${HOST_UTMP_LINE_ATTACHED}
59+test "x$UTMP_LINE_REMOTE" = x && UTMP_LINE_REMOTE=${HOST_UTMP_LINE_REMOTE} 59+test "x$UTMP_LINE_REMOTE" = x && UTMP_LINE_REMOTE=${HOST_UTMP_LINE_REMOTE}
60+test "x$UTMP_PSEUDO_DEVICE" = x && UTMP_PSEUDO_DEVICE=${HOST_UTMP_PSEUDO_DEVICE} 60+test "x$UTMP_PSEUDO_DEVICE" = x && UTMP_PSEUDO_DEVICE=${HOST_UTMP_PSEUDO_DEVICE}
61+test "x$GDM_RBAC_SYSCMD_KEYS" = x && GDM_RBAC_SYSCMD_KEYS=${HOST_GDM_RBAC_SYSCMD_KEYS} 61+test "x$GDM_RBAC_SYSCMD_KEYS" = x && GDM_RBAC_SYSCMD_KEYS=${HOST_GDM_RBAC_SYSCMD_KEYS}
62  62
63 # On Solaris, the /usr/bin/Xserver script is used to decide whether to 63 # On Solaris, the /usr/bin/Xserver script is used to decide whether to
64 # use Xsun or Xorg, so this is used on Solaris. 64 # use Xsun or Xorg, so this is used on Solaris.
65@@ -33654,6 +33668,11 @@ elif test -x /usr/bin/X; then 65@@ -33825,6 +33839,11 @@ elif test -x /usr/bin/X; then
66 X_SERVER_PATH="/usr/bin" 66 X_SERVER_PATH="/usr/bin"
67 X_SERVER="/usr/bin/X" 67 X_SERVER="/usr/bin/X"
68 X_CONFIG_OPTIONS="-audit 0" 68 X_CONFIG_OPTIONS="-audit 0"
69+elif test -x ${X11BASE}/bin/X; then 69+elif test "x${X11BASE}" != x; then
70+ X_PATH="${X11BASE}/bin" 70+ X_PATH="${X11BASE}/bin"
71+ X_SERVER_PATH="${X11BASE}/bin" 71+ X_SERVER_PATH="${X11BASE}/bin"
72+ X_SERVER="${X11BASE}/bin/X" 72+ X_SERVER="${X11BASE}/bin/X"
73+ X_CONFIG_OPTIONS="-audit 0" 73+ X_CONFIG_OPTIONS="-audit 0"
74 else 74 else
75 # what to do, what to do, this is wrong, but this just sets the 75 # what to do, what to do, this is wrong, but this just sets the
76 # defaults, perhaps this user is cross compiling or some such 76 # defaults, perhaps this user is cross compiling or some such
77@@ -33663,6 +33682,7 @@ else 77@@ -33834,6 +33853,7 @@ else
78 GDM_USER_PATH="$GDM_USER_PATH:/usr/bin/X11:/usr/X11R6/bin:/usr/local/bin:/opt/X11R6/bin" 78 GDM_USER_PATH="$GDM_USER_PATH:/usr/bin/X11:/usr/X11R6/bin:/usr/local/bin:/opt/X11R6/bin"
79 X_CONFIG_OPTIONS="-audit 0" 79 X_CONFIG_OPTIONS="-audit 0"
80 fi 80 fi
81+X_CONFIG_OPTIONS="$X_SERVER_ARGS $X_CONFIG_OPTIONS" 81+X_CONFIG_OPTIONS="$X_SERVER_ARGS $X_CONFIG_OPTIONS"
82  82
83 # Use Xephyr if it is available. It works better than Xnest since Xephyr 83 # Use Xephyr if it is available. It works better than Xnest since Xephyr
84 # supports the Xserver extensions, even if on a remote machine. 84 # supports the Xserver extensions, even if on a remote machine.