diff options
| author | jmmv <jmmv> | 2004-04-01 18:49:37 +0000 |
|---|---|---|
| committer | jmmv <jmmv> | 2004-04-01 18:49:37 +0000 |
| commit | 97f932c76a6bcaf260abd1f661350541dc632431 (patch) | |
| tree | 48e6466a9a4a5f2fac401e654e61fbe3b612f2de /x11/gdm | |
| parent | f6cd0a5446e8b1779f897676c16c1dd0406780fa (diff) | |
| download | pkgsrc-97f932c76a6bcaf260abd1f661350541dc632431.tar.gz | |
Update to 2.6.0.0:
2.6.0.0 stuff:
- DisplayLastLogin defaults to false since '/usr/bin/last' is stupidly
unlocalized
- Add translated (de, es, fr, it, ja, ko, sv, zh_CN, zh_HK and zh_TW)
documentation (Glynn, Sun translation team)
- Translation updates (Christophe Merlet, Christian Neumair, Maxim Dziumanenko,
Telsa Gwynne, Stanislav Visnovsky, Gustavo Maciel Dias Vieira,
Alastair McKinstry, Alexander Winston, Sanlig Badral, Vincent van Adrighem,
Michiel Sikkes, Funda Wang, Ales Nyakhaychyk, Metin Amiroff, Takeshi AIHANA,
Alessio Frusciante, Francesco Marletta)
2.5.90.2 stuff:
- Support for GTK+ theming (accessibility) and ability to change current
theme in the standard login, fixes #125070 (Muktha, me)
- Hindi was written wrong in the language menu fixes #134372
(Guntupalli Karunakar)
- When restarting a server by whacking it and starting it again, wait
for 1 sec to allow things to "settle", plus be a lot milder on X
server's lock files / sockets to avoid whacking ones currently in use
- Make language dialog in the graphical greeter come up quicker and init
the languages lazily
- Fix #135232 by using code@mod for the translation matrix (me), and added
Serbian variants there (Danilo Segan)
- Fix #135053 by adding canadian english (Adam Weinberger, Danilo Segan)
- Fix sourcing of environment on AIX, #135401 (Vincent Berger)
- Fix displaying of ~/.xsession-errors file
- Attempt to handle out of user diskspace more gracefully by whacking old
.xsession-errors in case we fail.
- Translation updates (Nikos Charonitakis, Jordi Mallach, Funda Wang,
Tommi Vainikainen, Kostas Papadimas, Kjartan Maraas, Miloslav Trmac,
Laurent Dhima, Zygimantas Berucka, Christian Rose, Changwoo Ryu,
Yukihiro Nakai, Duarte Loreto, Christophe Merlet,
Francisco Javier F. Serrador, Artur Flinta, Alastair McKinstry,
Guntupalli Karunakar, Takeshi AIHANA, Paisa Seeluangsawat,
Surichat Sumrit, Supranee Thirawatthanasuk, Chanchai Junlouchai,
Adam Weinberger, Christian Neumair, Hasbullah Bin Pit,
Pauli Virtanen, Ole Laursen, Asmund Skjaeveland, Metin Amiroff,
Vincent van Adrighem, Tino Meinen, GNOME PL Team)
2.5.90.1 stuff:
- Login field was not clearned when x server / slave crashed (#131389)
- Change the 12 hour format to be less confusing (#133189)
- Re-fix the aix ADMCHG bug #123766 (Vincent Berger)
- keymouselistener fixes (Brian Cameron)
- Compilation fixes #131042, #130963
- Build fixes (Tomasz Kloczko)
- Other fixes and cleanups (among others #133181 by Mariano Suarez-Alvarez)
- Translation update (Andras Timar, Francisco Javier F. Serrador, Lucas Vieites,
Maxim Dziumanenko, Robert Sedak, Metin Amiroff, Laurent Dhima, Changwoo Ryu,
Kjartan Maraas, Miloslav Trmac, Asmund Skjaeveland, Sanlig Badral,
Zygimantas Berucka, Kostas Papadimas, Christian Neumair, Artur Flinta,
GNOME PL Team, Gustavo Maciel Dias Vieira, Joao Emanuel, Danilo Segan,
Vincent van Adrighem, Tino Meinen, Fernando Herrera, Arafat Medini)
2.5.90.0 stuff:
- Add accessibility setting to gdmsetup and allow setting an arbitrary
sound for the "ready for login" sound. (#125487)
- gdmflexiserver now lists running sessions if there are some and allow
the users to easily switch. (#127038)
- Display last login when the user enters their name (can be turned
off) (#128940)
- Inactive flexiservers are reaped by default after 5 minutes.
- Accessibility modules set the busy cursor for 2 secs to show that
an action was started (#125153)
- Doubleclicking on a language in graphical greeter selects it
(Kirk Mitchener, #123199)
- Optional info message on login (sort of like motd) (Anton Altaparmakov,
#125219)
- New SUP (socket protocol) commands to request shutdown/reboot after
session ends or after all users log out. Also new SUP commands for
querying and setting the VT on Linux.
- A --wait-for-go option that will start one X server and then wait until
GO is sent through the fifo before going further.
- IPv6 support (Archana Shah)
- Built in sessions are out of /etc/X11/dm/Sessions and moved to
<datadir>/gdm/BuiltInSessions
- Fix chooser commonication vs. accessibility stuff (#125064)
- Fix RetryDelay and make it default to 1 and not 3 (Leena Gunda, me, #128507)
- On AIX without PAM, password expiration is done (Vincent Berger, me, #123766)
- On crypt/shadow the double login warning was too early, now done after
authentication as in the PAM setup.
- Clients are now forcibly whacked at session stop, should "fix" #126071
- Use GtkFileChooser in gdmsetup (Jan Arne Petersen, #128668)
- Paranoia: Check owenership of the socket before using it
- Fix xdmcp session counting (#126465)
- Warn the user when they want to set root as autologin (RH #97716)
- StandardXServer can now have arguments
- Default color is now #76848F and the PreSession script tries
to use the default gdm color to fix #128220
- Fix assert failure when starting Xnest (#127780)
- Indent the chooser and config toggles in the setup (#120639)
- Lots of cleanup and fixes and adding to the general paranoia in the
code. (me, Ray Strode, Brian Cameron)
- Translation updates (Miloslav Trmac, Andras Timar, David O'Callaghan,
Paul Duffy, Danilo Segan, Vincent van Adrighem, Kostas Papadimas,
Jordi Mallach, Ole Laursen, Dmitry G. Mastrukov, Russian team,
Sanlig Badral, Francisco Javier F. Serrador, Lucas Vieites,
Laurent Dhima, Asmund Skjaeveland, Artur Flinta, Duarte Loreto,
Robert Sedak, Christophe Merlet, Christian Neumair, Zygimantas Berucka)
Diffstat (limited to 'x11/gdm')
| -rw-r--r-- | x11/gdm/Makefile | 10 | ||||
| -rw-r--r-- | x11/gdm/PLIST | 82 | ||||
| -rw-r--r-- | x11/gdm/distinfo | 11 | ||||
| -rw-r--r-- | x11/gdm/patches/patch-aa | 14 | ||||
| -rw-r--r-- | x11/gdm/patches/patch-ad | 102 | ||||
| -rw-r--r-- | x11/gdm/patches/patch-ae | 25 |
6 files changed, 103 insertions, 141 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index 5b2b155c252..793e6940430 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.55 2004/03/26 02:27:58 wiz Exp $ +# $NetBSD: Makefile,v 1.56 2004/04/01 18:49:37 jmmv Exp $ # -DISTNAME= gdm-2.4.4.7 -PKGREVISION= 7 +DISTNAME= gdm-2.6.0.0 CATEGORIES= x11 gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gdm/2.4/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gdm/2.6/} EXTRACT_SUFX= .tar.bz2 DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Daemon.README Daemon.png @@ -12,10 +11,11 @@ MAINTAINER= mjl@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= Gnome Display Manager - a re-implementation of the xdm program -BUILDLINK_DEPENDS.libart2+= libart2>=2.3.11 BUILD_USES_MSGFMT= YES DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs +BUILDLINK_DEPENDS.libart2+= libart2>=2.3.11 + SITES_Daemon.README= ${MASTER_SITE_LOCAL} SITES_Daemon.png= ${MASTER_SITE_LOCAL} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} diff --git a/x11/gdm/PLIST b/x11/gdm/PLIST index b1614b7be7a..00e44771083 100644 --- a/x11/gdm/PLIST +++ b/x11/gdm/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2004/01/22 09:16:59 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.7 2004/04/01 18:49:37 jmmv Exp $ bin/gdm bin/gdm-binary bin/gdmXnest @@ -13,10 +13,8 @@ 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/libdwellmouselistener.so lib/gtk-2.0/modules/libkeymouselistener.a lib/gtk-2.0/modules/libkeymouselistener.la -lib/gtk-2.0/modules/libkeymouselistener.so ${PAM_MISC}libexec/gdmaskpass libexec/gdmtranslate man/man1/gdm.1 @@ -28,7 +26,6 @@ share/applications/gdmflexiserver-xnest.desktop share/applications/gdmflexiserver.desktop share/applications/gdmsetup.desktop share/doc/gdm/Daemon.README -share/examples/dm/Sessions/default.desktop share/examples/gdm/Init/Default share/examples/gdm/PostLogin/Default.sample share/examples/gdm/PostSession/Default @@ -42,6 +39,7 @@ share/examples/gdm/modules/AccessDwellMouseEvents share/examples/gdm/modules/AccessKeyMouseEvents share/examples/gdm/modules/factory-AccessDwellMouseEvents share/examples/gdm/modules/factory-AccessKeyMouseEvents +share/gdm/BuiltInSessions/default.desktop share/gdm/gdmchooser.glade share/gdm/gdmsetup.glade share/gdm/themes/circles/GdmGreeterTheme.desktop @@ -72,6 +70,36 @@ share/gdm/themes/happygnome/system.png share/gnome/capplets/gdmphotosetup.desktop share/gnome/help/gdm/C/gdm.xml share/gnome/help/gdm/C/legal.xml +share/gnome/help/gdm/de/figures/gdm_window.png +share/gnome/help/gdm/de/gdm.xml +share/gnome/help/gdm/de/legal.xml +share/gnome/help/gdm/es/figures/gdm_window.png +share/gnome/help/gdm/es/gdm.xml +share/gnome/help/gdm/es/legal.xml +share/gnome/help/gdm/fr/figures/gdm_window.png +share/gnome/help/gdm/fr/gdm.xml +share/gnome/help/gdm/fr/legal.xml +share/gnome/help/gdm/it/figures/gdm_window.png +share/gnome/help/gdm/it/gdm.xml +share/gnome/help/gdm/it/legal.xml +share/gnome/help/gdm/ja/figures/gdm_window.png +share/gnome/help/gdm/ja/gdm.xml +share/gnome/help/gdm/ja/legal.xml +share/gnome/help/gdm/ko/figures/gdm_window.png +share/gnome/help/gdm/ko/gdm.xml +share/gnome/help/gdm/ko/legal.xml +share/gnome/help/gdm/sv/figures/gdm_window.png +share/gnome/help/gdm/sv/gdm.xml +share/gnome/help/gdm/sv/legal.xml +share/gnome/help/gdm/zh_CN/figures/gdm_window.png +share/gnome/help/gdm/zh_CN/gdm.xml +share/gnome/help/gdm/zh_CN/legal.xml +share/gnome/help/gdm/zh_HK/figures/gdm_window.png +share/gnome/help/gdm/zh_HK/gdm.xml +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/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 @@ -84,6 +112,7 @@ ${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/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 @@ -94,6 +123,7 @@ ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gdm-2.4.mo ${PKGLOCALEDIR}/locale/gl/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 @@ -129,6 +159,16 @@ ${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/omf/gdm/gdm-C.omf +share/omf/gdm/gdm-de.omf +share/omf/gdm/gdm-es.omf +share/omf/gdm/gdm-fr.omf +share/omf/gdm/gdm-it.omf +share/omf/gdm/gdm-ja.omf +share/omf/gdm/gdm-ko.omf +share/omf/gdm/gdm-sv.omf +share/omf/gdm/gdm-zh_CN.omf +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.png @@ -137,17 +177,39 @@ share/pixmaps/nobody.png share/pixmaps/nohost.png share/xsessions/gnome.desktop @dirrm share/xsessions +@comment in xdg-dirs: @dirrm share/pixmaps @dirrm share/omf/gdm -@comment in scrollkeeper @dirrm share/omf +@comment in scrollkeeper: @dirrm share/omf +@dirrm share/gnome/help/gdm/zh_TW/figures +@dirrm share/gnome/help/gdm/zh_TW +@dirrm share/gnome/help/gdm/zh_HK/figures +@dirrm share/gnome/help/gdm/zh_HK +@dirrm share/gnome/help/gdm/zh_CN/figures +@dirrm share/gnome/help/gdm/zh_CN +@dirrm share/gnome/help/gdm/sv/figures +@dirrm share/gnome/help/gdm/sv +@dirrm share/gnome/help/gdm/ko/figures +@dirrm share/gnome/help/gdm/ko +@dirrm share/gnome/help/gdm/ja/figures +@dirrm share/gnome/help/gdm/ja +@dirrm share/gnome/help/gdm/it/figures +@dirrm share/gnome/help/gdm/it +@dirrm share/gnome/help/gdm/fr/figures +@dirrm share/gnome/help/gdm/fr +@dirrm share/gnome/help/gdm/es/figures +@dirrm share/gnome/help/gdm/es +@dirrm share/gnome/help/gdm/de/figures +@dirrm share/gnome/help/gdm/de @dirrm share/gnome/help/gdm/C @dirrm share/gnome/help/gdm -@comment @dirrm share/gnome/help -@dirrm share/gnome/capplets -@comment @dirrm share/gnome +@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/gdm/themes/happygnome-list @dirrm share/gdm/themes/happygnome @dirrm share/gdm/themes/circles @dirrm share/gdm/themes +@dirrm share/gdm/BuiltInSessions @dirrm share/gdm @dirrm share/examples/gdm/modules @dirrm share/examples/gdm/PreSession @@ -155,8 +217,8 @@ share/xsessions/gnome.desktop @dirrm share/examples/gdm/PostLogin @dirrm share/examples/gdm/Init @dirrm share/examples/gdm -@dirrm share/examples/dm/Sessions +@exec ${MKDIR} %D/share/examples/dm @dirrm share/examples/dm @dirrm share/doc/gdm -@comment in gnome2-dirs: @dirrm share/applications +@comment in xdg-dirs: @dirrm share/applications @comment in gtk2: @dirrm lib/gtk-2.0/modules diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo index 6dff53f3d94..bfb2f42faaf 100644 --- a/x11/gdm/distinfo +++ b/x11/gdm/distinfo @@ -1,13 +1,12 @@ -$NetBSD: distinfo,v 1.9 2004/03/10 20:18:51 minskim Exp $ +$NetBSD: distinfo,v 1.10 2004/04/01 18:49:37 jmmv Exp $ -SHA1 (gdm-2.4.4.7.tar.bz2) = 8db05c6f0af247fc3d6bc0c32e69df7991eff0ae -Size (gdm-2.4.4.7.tar.bz2) = 2430455 bytes +SHA1 (gdm-2.6.0.0.tar.bz2) = d91e9c48f02830dc1af6a45f66a835904143c3c1 +Size (gdm-2.6.0.0.tar.bz2) = 2850702 bytes SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b Size (Daemon.README) = 2191 bytes SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d Size (Daemon.png) = 15725 bytes -SHA1 (patch-aa) = c61a99841c206ff790fc3eb73d53e69d914dcbd9 +SHA1 (patch-aa) = 238a7cd766eea2f0e7d5877eb59965c66f88aff1 SHA1 (patch-ab) = 049d4fe8b6e71239392e7a8bae00006103dff309 SHA1 (patch-ac) = d810e16076aa69070f238900198a0050eaf12516 -SHA1 (patch-ad) = a27c73a296013919a3a2db155de8ae1b22a38f28 -SHA1 (patch-ae) = 600c4e35539a78d7da2235500c8b4767d233bf61 +SHA1 (patch-ae) = 1df52914ead2f8aa5b69f60213ebd26e8d2202a4 diff --git a/x11/gdm/patches/patch-aa b/x11/gdm/patches/patch-aa index 12f633f36c1..54dc4b3b968 100644 --- a/x11/gdm/patches/patch-aa +++ b/x11/gdm/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.5 2004/01/22 10:11:16 jmmv Exp $ +$NetBSD: patch-aa,v 1.6 2004/04/01 18:49:37 jmmv Exp $ ---- configure.orig 2003-12-31 19:10:05.000000000 +0100 +--- configure.orig 2004-03-15 19:38:10.000000000 +0100 +++ configure -@@ -22912,6 +22912,7 @@ VRFY="verify-crypt" +@@ -24803,6 +24803,7 @@ VRFY="verify-crypt" if test x$enable_authentication_scheme != xcrypt -a \ x$enable_authentication_scheme != xshadow ; then @@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.5 2004/01/22 10:11:16 jmmv Exp $ for ac_header in security/pam_appl.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -@@ -23061,6 +23062,7 @@ fi +@@ -24960,6 +24961,7 @@ fi done fi @@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.5 2004/01/22 10:11:16 jmmv Exp $ GDMASKPASS= EXTRA_GDMASKPASS_LIBS= -@@ -25357,6 +25359,10 @@ else +@@ -28015,6 +28017,10 @@ else X_SERVER="/usr/X11R6/bin/X" X_CONF_PATH="/usr/bin/X11:/usr/X11R6/bin:/usr/local/bin:/opt/X11R6/bin" fi @@ -29,10 +29,10 @@ $NetBSD: patch-aa,v 1.5 2004/01/22 10:11:16 jmmv Exp $ -@@ -25406,6 +25412,8 @@ prefix=$old_prefix +@@ -28064,6 +28070,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 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 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-ad b/x11/gdm/patches/patch-ad deleted file mode 100644 index fde6df14b0d..00000000000 --- a/x11/gdm/patches/patch-ad +++ /dev/null @@ -1,102 +0,0 @@ -$NetBSD: patch-ad,v 1.3 2004/01/20 13:46:00 xtraeme Exp $ - ---- config/locale.alias.orig 2003-03-15 04:31:02.000000000 -0600 -+++ config/locale.alias -@@ -24,65 +24,65 @@ Belarusian be_BY.UTF-8,be_BY - Bengali bn_BD.UTF-8,bn_BD - Bengali(India) bn_IN.UTF-8,bn_IN - Bosnian bs_BA.UTF-8,bs_BA --Bulgarian bg_BG.UTF-8,bg_BG --Catalan ca_ES.UTF-8,ca_ES -+Bulgarian bg_BG.UTF-8,bg_BG.CP1251 -+Catalan ca_ES.UTF-8,ca_ES.ISO8859-15 - Chinese(simplified) zh_CN.UTF-8,zh_CN - Chinese(traditional) zh_TW.UTF-8,zh_TW --Croatian hr_HR.UTF-8,hr_HR --Czech cs_CZ.UTF-8,cs_CZ --Danish da_DK.UTF-8,da_DK --Dutch nl_NL.UTF-8,nl_NL -+Croatian hr_HR.UTF-8,hr_HR.ISO8859-2 -+Czech cs_CZ.UTF-8,cs_CZ.ISO8859-2 -+Danish da_DK.UTF-8,da_DK.ISO8859-15 -+Dutch nl_NL.UTF-8,nl_NL.ISO8859-15 - English(American) en_US.UTF-8,en_US --English(Australian) en_AU.UTF-8,en_AU --English(British) en_GB.UTF-8,en_GB -+English(Australian) en_AU.UTF-8,en_AU.ISO8859-15 -+English(British) en_GB.UTF-8,en_GB.ISO8859-15 - English(Ireland) en_IE.UTF-8,en_IE --Estonian et_EE.UTF-8,et_EE --Finnish fi_FI.UTF-8,fi_FI --French fr_FR.UTF-8,fr_FR --Galician gl_ES.UTF-8,gl_ES --German de_DE.UTF-8,de_DE --Greek el_GR.UTF-8,el_GR -+Estonian et_EE.UTF-8,et -+Finnish fi_FI.UTF-8,fi_FI.ISO8859-15 -+French fr_FR.UTF-8,fr_FR.ISO8859-15 -+Galician gl_ES.UTF-8,gl -+German de_DE.UTF-8,de_DE.ISO8859-15 -+Greek el_GR.UTF-8,el_GR.ISO8859-7 - Gujarati gu_IN.UTF-8,gu_IN --Hebrew he_IL.UTF-8,he_IL -+Hebrew he_IL.UTF-8,he - Hindi hi_IN.UTF-8,hi_IN --Hungarian hu_HU.UTF-8,hu_HU --Icelandic is_IS.UTF-8,is_IS --Indonesian id_ID.UTF-8,id_ID -+Hungarian hu_HU.UTF-8,hu_HU.ISO8859-2 -+Icelandic is_IS.UTF-8,is_IS.ISO8859-15 -+Indonesian id_ID.UTF-8,id - Interlingua ia.UTF-8,ia - Irish ga_IE.UTF-8,ga_IE --Italian it_IT.UTF-8,it_IT --Japanese ja_JP.UTF-8,ja_JP -+Italian it_IT.UTF-8,it_IT.ISO8859-15 -+Japanese ja_JP.UTF-8,ja_JP.eucJP - Kannada kn_IN.UTF-8,kn_IN - Korean ko_KR.UTF-8,ko_KR - Latvian lv_LV.UTF-8,lv_LV --Lithuanian lt_LT.UTF-8,lt_LT -+Lithuanian lt_LT.UTF-8,lt_LT.ISO8859-4 - Macedonian mk_MK.UTF-8,mk_MK - Malayalam ml_IN.UTF-8,ml_IN - Malay ms_MY.UTF-8,ms_MY - Marathi mr_IN.UTF-8,mr_IN - Mongolian mn_MN.UTF-8,mn_MN --Norwegian(bokmal) no_NO.UTF-8,no_NO -+Norwegian(bokmal) no_NO.UTF-8,no_NO.ISO8859-15 - Norwegian(nynorsk) nn_NO.UTF-8,nn_NO - Oriya or_IN.UTF-8,or_IN - Panjabi pa_IN.UTF-8,pa_IN - Persian fa_IR.UTF-8,fa_IR --Polish pl_PL.UTF-8,pl_PL -+Polish pl_PL.UTF-8,pl_PL.ISO8859-2 - Portuguese(Brazilian) pt_BR.UTF-8,pt_BR --Portuguese pt_PT.UTF-8,pt_PT --Romanian ro_RO.UTF-8,ro_RO --Russian ru_RU.UTF-8,ru_RU -+Portuguese pt_PT.UTF-8,pt_PT.ISO8859-15 -+Romanian ro_RO.UTF-8,ro -+Russian ru_RU.UTF-8,ru_RU.CP866 - Serbian sr_YU.UTF-8,sr_YU --Slovak sk_SK.UTF-8,sk_SK --Slovenian sl_SI.UTF-8,sl_SI --Spanish es_ES.UTF-8,es_ES -+Slovak sk_SK.UTF-8,sk_SK.ISO8859-2 -+Slovenian sl_SI.UTF-8,sl_SI.ISO8859-2 -+Spanish es_ES.UTF-8,es_ES.ISO8859-15 - Spanish(Mexico) es_MX.UTF-8,es_MX - Swedish(Finland) sv_FI.UTF-8,sv_FI --Swedish sv_SE.UTF-8,sv_SE -+Swedish sv_SE.UTF-8,sv_SE.ISO8859-15 - Tamil ta_IN.UTF-8,ta_IN - Telugu te_IN.UTF-8,te_IN - Thai th_TH.UTF-8,th_TH --Turkish tr_TR.UTF-8,tr_TR --Ukrainian uk_UA.UTF-8,uk_UA -+Turkish tr_TR.UTF-8,tr -+Ukrainian uk_UA.UTF-8,uk_UA.KOI8-U - Vietnamese vi_VN.UTF-8,vi_VN - Walloon wa_BE.UTF-8,wa_BE - Welsh cy_GB.UTF-8,cy_GB diff --git a/x11/gdm/patches/patch-ae b/x11/gdm/patches/patch-ae index 0b302972f29..c1d86c17825 100644 --- a/x11/gdm/patches/patch-ae +++ b/x11/gdm/patches/patch-ae @@ -1,6 +1,6 @@ -$NetBSD: patch-ae,v 1.4 2004/01/22 10:11:16 jmmv Exp $ +$NetBSD: patch-ae,v 1.5 2004/04/01 18:49:37 jmmv Exp $ ---- config/Makefile.in.orig 2003-12-31 19:31:32.000000000 +0100 +--- config/Makefile.in.orig 2004-03-16 00:14:53.000000000 +0100 +++ config/Makefile.in @@ -23,7 +23,7 @@ bindir = @bindir@ sbindir = @sbindir@ @@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.4 2004/01/22 10:11:16 jmmv Exp $ sharedstatedir = @sharedstatedir@ localstatedir = @localstatedir@ libdir = @libdir@ -@@ -303,11 +303,11 @@ gettextfoo.h: XKeepsCrashing Xsession.in +@@ -301,11 +301,11 @@ gettextfoo.h: XKeepsCrashing Xsession.in install-data-hook: gdm.conf Xsession gnome.desktop default.desktop CDE.desktop Default PostSession PreSession if test '!' -d $(DESTDIR)$(confdir); then \ $(mkinstalldirs) $(DESTDIR)$(confdir); \ @@ -25,10 +25,13 @@ $NetBSD: patch-ae,v 1.4 2004/01/22 10:11:16 jmmv Exp $ fi -if cmp -s $(DESTDIR)$(confdir)/gdm.conf $(DESTDIR)$(confdir)/factory-gdm.conf > /dev/null 2>&1 ; then \ cp -f $(DESTDIR)$(confdir)/gdm.conf $(DESTDIR)$(confdir)/gdm.conf.orig; \ -@@ -324,16 +324,16 @@ install-data-hook: gdm.conf Xsession gno - -if test -f $(DESTDIR)$(localedir)/locale.alias; then \ - cp -f $(DESTDIR)$(localedir)/locale.alias $(DESTDIR)$(localedir)/locale.alias.orig; \ - fi +@@ -319,19 +319,16 @@ install-data-hook: gdm.conf Xsession gno + $(INSTALL_SCRIPT) $(srcdir)/XKeepsCrashing $(DESTDIR)$(confdir)/XKeepsCrashing + $(INSTALL_SCRIPT) Xsession $(DESTDIR)$(confdir)/Xsession + +- -if test -f $(DESTDIR)$(localedir)/locale.alias; then \ +- cp -f $(DESTDIR)$(localedir)/locale.alias $(DESTDIR)$(localedir)/locale.alias.orig; \ +- fi - $(INSTALL_DATA) $(srcdir)/locale.alias $(DESTDIR)$(localedir)/locale.alias + $(INSTALL_DATA) $(srcdir)/locale.alias $(DESTDIR)$(confdir)/locale.alias @@ -45,7 +48,7 @@ $NetBSD: patch-ae,v 1.4 2004/01/22 10:11:16 jmmv Exp $ fi -if test -f $(DESTDIR)$(bisessdir)/Default.desktop; then \ -@@ -364,7 +364,7 @@ install-data-hook: gdm.conf Xsession gno +@@ -362,7 +359,7 @@ install-data-hook: gdm.conf Xsession gno if test '!' -d $(DESTDIR)$(initdir); then \ $(mkinstalldirs) $(DESTDIR)$(initdir); \ @@ -54,7 +57,7 @@ $NetBSD: patch-ae,v 1.4 2004/01/22 10:11:16 jmmv Exp $ fi -if test -f $(DESTDIR)$(initdir)/Default; then \ cp -f $(DESTDIR)$(initdir)/Default $(DESTDIR)$(initdir)/Default.orig; \ -@@ -373,13 +373,13 @@ install-data-hook: gdm.conf Xsession gno +@@ -371,13 +368,13 @@ install-data-hook: gdm.conf Xsession gno if test '!' -d $(DESTDIR)$(postlogindir); then \ $(mkinstalldirs) $(DESTDIR)$(postlogindir); \ @@ -70,7 +73,7 @@ $NetBSD: patch-ae,v 1.4 2004/01/22 10:11:16 jmmv Exp $ fi -if test -f $(DESTDIR)$(predir)/Default; then \ cp -f $(DESTDIR)$(predir)/Default $(DESTDIR)$(predir)/Default.orig; \ -@@ -388,7 +388,7 @@ install-data-hook: gdm.conf Xsession gno +@@ -386,7 +383,7 @@ install-data-hook: gdm.conf Xsession gno if test '!' -d $(DESTDIR)$(postdir); then \ $(mkinstalldirs) $(DESTDIR)$(postdir); \ @@ -79,7 +82,7 @@ $NetBSD: patch-ae,v 1.4 2004/01/22 10:11:16 jmmv Exp $ fi -if test -f $(DESTDIR)$(postdir)/Default; then \ cp -f $(DESTDIR)$(postdir)/Default $(DESTDIR)$(postdir)/Default.orig; \ -@@ -397,26 +397,14 @@ install-data-hook: gdm.conf Xsession gno +@@ -395,26 +392,14 @@ install-data-hook: gdm.conf Xsession gno if test '!' -d $(DESTDIR)$(gnomercdir); then \ $(mkinstalldirs) $(DESTDIR)$(gnomercdir); \ |