summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-rw-r--r--x11/gdm/Makefile7
-rw-r--r--x11/gdm/PLIST141
-rw-r--r--x11/gdm/distinfo12
-rw-r--r--x11/gdm/patches/patch-aa6
-rw-r--r--x11/gdm/patches/patch-ae8
-rw-r--r--x11/gdm/patches/patch-af12
6 files changed, 99 insertions, 87 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 5a9ac0f2884..d5ed05d5e1b 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.64 2004/05/08 00:32:13 xtraeme Exp $
+# $NetBSD: Makefile,v 1.65 2004/06/20 21:25:46 jmmv Exp $
#
-DISTNAME= gdm-2.6.0.2
+DISTNAME= gdm-2.6.0.3
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gdm/2.6/}
EXTRACT_SUFX= .tar.bz2
@@ -20,7 +20,7 @@ SITES_Daemon.png= ${MASTER_SITE_LOCAL}
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
USE_BUILDLINK3= YES
-USE_DIRS+= xdg-1.1
+USE_DIRS+= gnome2-1.5
USE_PKGINSTALL= YES
USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
@@ -110,6 +110,7 @@ post-install:
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../graphics/libart2/buildlink3.mk"
.include "../../graphics/libgnomecanvas/buildlink3.mk"
.include "../../graphics/librsvg2/buildlink3.mk"
diff --git a/x11/gdm/PLIST b/x11/gdm/PLIST
index b9c4ea99205..596bfb33301 100644
--- a/x11/gdm/PLIST
+++ b/x11/gdm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2004/05/08 00:27:16 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.10 2004/06/20 21:25:46 jmmv Exp $
bin/gdm
bin/gdm-binary
bin/gdmXnest
@@ -10,6 +10,7 @@ bin/gdmlogin
bin/gdmphotosetup
bin/gdmsetup
bin/gdmthemetester
+etc/rc.d/gdm
lib/gtk-2.0/modules/libdwellmouselistener.a
lib/gtk-2.0/modules/libdwellmouselistener.la
lib/gtk-2.0/modules/libkeymouselistener.a
@@ -99,70 +100,73 @@ share/gnome/help/gdm/zh_HK/legal.xml
share/gnome/help/gdm/zh_TW/figures/gdm_window.png
share/gnome/help/gdm/zh_TW/gdm.xml
share/gnome/help/gdm/zh_TW/legal.xml
-${PKGLOCALEDIR}/locale/af/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/am/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/be/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/bn/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/gu/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/he/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/id/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/is/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/mi/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/mr/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/th/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gdm-2.4.mo
-${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gdm-2.4.mo
+share/icons/hicolor/16x16/apps/gdm-xnest.png
+share/icons/hicolor/32x32/apps/gdm-setup.png
+share/icons/hicolor/32x32/apps/gdm-xnest.png
+${PKGLOCALEDIR}/locale/af/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/am/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/be/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/bn/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/gu/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/he/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/id/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/is/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/mi/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/mr/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/th/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gdm-2.6.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gdm-2.6.mo
share/omf/gdm/gdm-C.omf
share/omf/gdm/gdm-de.omf
share/omf/gdm/gdm-es.omf
@@ -176,6 +180,8 @@ share/omf/gdm/gdm-zh_HK.omf
share/omf/gdm/gdm-zh_TW.omf
share/pixmaps/Daemon.png
share/pixmaps/gdm-foot-logo.png
+share/pixmaps/gdm-setup.png
+share/pixmaps/gdm-xnest.png
share/pixmaps/gdm.png
share/pixmaps/login-photo.png
share/pixmaps/nobody.png
@@ -185,6 +191,8 @@ share/xsessions/gnome.desktop
@comment in xdg-dirs: @dirrm share/pixmaps
@dirrm share/omf/gdm
@comment in scrollkeeper: @dirrm share/omf
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
@dirrm share/gnome/help/gdm/zh_TW/figures
@dirrm share/gnome/help/gdm/zh_TW
@dirrm share/gnome/help/gdm/zh_HK/figures
@@ -208,8 +216,7 @@ share/xsessions/gnome.desktop
@dirrm share/gnome/help/gdm/C
@dirrm share/gnome/help/gdm
@comment in gnome2-dirs: @dirrm share/gnome/help
-@comment in gnome2-dirs: @dirrm share/gnome/capplets
-@comment in gnome2-dirs: @dirrm share/gnome
+@dirrm share/gnome/capplets
@dirrm share/gdm/themes/happygnome-list
@dirrm share/gdm/themes/happygnome
@dirrm share/gdm/themes/circles
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index 110f48c976f..c060a7f7fea 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.13 2004/05/17 01:17:46 danw Exp $
+$NetBSD: distinfo,v 1.14 2004/06/20 21:25:46 jmmv Exp $
-SHA1 (gdm-2.6.0.2.tar.bz2) = d662a0d0a9f1311423a6486c2471cc85fe9ee815
-Size (gdm-2.6.0.2.tar.bz2) = 3029505 bytes
+SHA1 (gdm-2.6.0.3.tar.bz2) = 03462ee0ac5eb7238e7460fc6c985724500470b1
+Size (gdm-2.6.0.3.tar.bz2) = 3079606 bytes
SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
Size (Daemon.README) = 2191 bytes
SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d
Size (Daemon.png) = 15725 bytes
-SHA1 (patch-aa) = 48f95c7fb2debc275d6a5792b08f2d9f239a5786
+SHA1 (patch-aa) = 616ffa7ebfe8fa368d9f45c98905b2c25109d315
SHA1 (patch-ab) = 049d4fe8b6e71239392e7a8bae00006103dff309
SHA1 (patch-ac) = d810e16076aa69070f238900198a0050eaf12516
-SHA1 (patch-ae) = 1df52914ead2f8aa5b69f60213ebd26e8d2202a4
-SHA1 (patch-af) = 98f890ee76bb463a80ac8cf33428b647b559d83a
+SHA1 (patch-ae) = f05e3bffbcb1522ac6265869eef52655d35511c2
+SHA1 (patch-af) = 467afc3ee4d555fac4d5d26e49c3ff8b098e7369
SHA1 (patch-ag) = 467552a6da5c83fcc3a37e59d1f4cd63241dee0d
diff --git a/x11/gdm/patches/patch-aa b/x11/gdm/patches/patch-aa
index 19bc1bc6ee7..90f5e779017 100644
--- a/x11/gdm/patches/patch-aa
+++ b/x11/gdm/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.8 2004/05/17 01:17:46 danw Exp $
+$NetBSD: patch-aa,v 1.9 2004/06/20 21:25:46 jmmv Exp $
---- configure.orig Sun Apr 11 21:53:01 2004
+--- configure.orig 2004-06-11 17:49:13.000000000 +0200
+++ configure
@@ -21237,7 +21237,8 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -58,7 +58,7 @@ $NetBSD: patch-aa,v 1.8 2004/05/17 01:17:46 danw Exp $
@@ -28064,6 +28071,8 @@ prefix=$old_prefix
exec_prefix=$old_exec_prefix
- ac_config_files="$ac_config_files Makefile daemon/Makefile gui/Makefile gui/greeter/Makefile gui/greeter/themes/Makefile gui/greeter/themes/circles/Makefile gui/greeter/themes/happygnome/Makefile gui/greeter/themes/happygnome-list/Makefile gui/modules/Makefile gui/modules/AccessKeyMouseEvents gui/modules/AccessDwellMouseEvents utils/Makefile pixmaps/Makefile config/Makefile po/Makefile.in vicious-extensions/Makefile docs/Makefile docs/C/Makefile docs/de/Makefile docs/es/Makefile docs/fr/Makefile docs/it/Makefile docs/sv/Makefile docs/ja/Makefile docs/ko/Makefile docs/zh_CN/Makefile docs/zh_HK/Makefile docs/zh_TW/Makefile config/gdm.conf config/Xsession config/Default config/PreSession config/PostSession daemon/gdm gdm-stop gdm-restart gdm-safe-restart gdmsetup-security gdm.spec"
+ ac_config_files="$ac_config_files Makefile daemon/Makefile gui/Makefile gui/greeter/Makefile gui/greeter/themes/Makefile gui/greeter/themes/circles/Makefile gui/greeter/themes/happygnome/Makefile gui/greeter/themes/happygnome-list/Makefile gui/modules/Makefile gui/modules/AccessKeyMouseEvents gui/modules/AccessDwellMouseEvents utils/Makefile pixmaps/Makefile pixmaps/16x16/Makefile pixmaps/32x32/Makefile pixmaps/48x48/Makefile config/Makefile po/Makefile.in vicious-extensions/Makefile docs/Makefile docs/C/Makefile docs/de/Makefile docs/es/Makefile docs/fr/Makefile docs/it/Makefile docs/sv/Makefile docs/ja/Makefile docs/ko/Makefile docs/zh_CN/Makefile docs/zh_HK/Makefile docs/zh_TW/Makefile config/gdm.conf config/Xsession config/Default config/PreSession config/PostSession daemon/gdm gdm-stop gdm-restart gdm-safe-restart gdmsetup-security gdm.spec"
+# This is to avoid GNU make; may not be needed on a later version..
+ac_config_files="$ac_config_files config/default.desktop config/gnome.desktop config/CDE.desktop"
cat >confcache <<\_ACEOF
diff --git a/x11/gdm/patches/patch-ae b/x11/gdm/patches/patch-ae
index c1d86c17825..392195998e9 100644
--- a/x11/gdm/patches/patch-ae
+++ b/x11/gdm/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.5 2004/04/01 18:49:37 jmmv Exp $
+$NetBSD: patch-ae,v 1.6 2004/06/20 21:25:46 jmmv Exp $
---- config/Makefile.in.orig 2004-03-16 00:14:53.000000000 +0100
+--- config/Makefile.in.orig 2004-06-11 18:41:00.000000000 +0200
+++ config/Makefile.in
@@ -23,7 +23,7 @@ bindir = @bindir@
sbindir = @sbindir@
@@ -91,13 +91,13 @@ $NetBSD: patch-ae,v 1.5 2004/04/01 18:49:37 jmmv Exp $
-
- if test '!' -d $(DESTDIR)$(logdir); then \
- $(mkinstalldirs) $(DESTDIR)$(logdir); \
-- chown root.root $(DESTDIR)$(logdir); \
+- chown root:root $(DESTDIR)$(logdir); \
- chmod 755 $(DESTDIR)$(logdir); \
- fi
-
- if test '!' -d $(DESTDIR)$(authdir); then \
- $(mkinstalldirs) $(DESTDIR)$(authdir); \
-- chown root.gdm $(DESTDIR)$(authdir); \
+- chown root:gdm $(DESTDIR)$(authdir); \
- chmod 1770 $(DESTDIR)$(authdir); \
+ ${CHMOD} 755 $(DESTDIR)$(gnomercdir); \
fi
diff --git a/x11/gdm/patches/patch-af b/x11/gdm/patches/patch-af
index 666578224f8..79e22c01b00 100644
--- a/x11/gdm/patches/patch-af
+++ b/x11/gdm/patches/patch-af
@@ -1,10 +1,10 @@
-$NetBSD: patch-af,v 1.10 2004/05/17 01:17:46 danw Exp $
+$NetBSD: patch-af,v 1.11 2004/06/20 21:25:46 jmmv Exp $
http://bugzilla.gnome.org/show_bug.cgi?id=142338
---- vicious-extensions/ve-misc.c.orig Sun Apr 11 21:37:56 2004
+--- vicious-extensions/ve-misc.c.orig 2004-05-28 21:23:01.000000000 +0200
+++ vicious-extensions/ve-misc.c
-@@ -342,106 +342,6 @@ ve_locale_exists (const char *loc)
+@@ -342,110 +342,6 @@ ve_locale_exists (const char *loc)
return ret;
}
@@ -69,6 +69,9 @@ http://bugzilla.gnome.org/show_bug.cgi?id=142338
- extern char **environ;
- int i, len;
-
+- if (environ == NULL)
+- return;
+-
- len = strlen (name);
-
- /* Mess directly with the environ array.
@@ -104,7 +107,8 @@ http://bugzilla.gnome.org/show_bug.cgi?id=142338
- clearenv ();
-#else
- extern char **environ;
-- environ[0] = NULL;
+- if (environ != NULL)
+- environ[0] = NULL;
-#endif
-}
-