From 396956632b94227722d5af50fa664d03d32e074a Mon Sep 17 00:00:00 2001 From: Ade Lovett Date: Tue, 5 Jun 2001 05:00:54 +0000 Subject: Update to 2.2.2.1 PR: 27855 (in part) Submitted by: Anders Nordby --- x11/gdm2/Makefile | 2 +- x11/gdm2/distinfo | 2 +- x11/gdm2/files/patch-ah | 8 +++---- x11/gdm2/files/patch-ai | 8 +++---- x11/gdm2/files/patch-ao | 14 ----------- x11/gdm2/pkg-plist | 63 +++++++++++++++++++++++++++++++++++++++++++------ 6 files changed, 66 insertions(+), 31 deletions(-) delete mode 100644 x11/gdm2/files/patch-ao (limited to 'x11/gdm2') diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile index c7efefd9a847..b1e383b11128 100644 --- a/x11/gdm2/Makefile +++ b/x11/gdm2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gdm -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gdm diff --git a/x11/gdm2/distinfo b/x11/gdm2/distinfo index f6f8cfd73dfe..53c31600c321 100644 --- a/x11/gdm2/distinfo +++ b/x11/gdm2/distinfo @@ -1 +1 @@ -MD5 (gdm-2.2.1.tar.gz) = 166b85182688b983bff965976395fbda +MD5 (gdm-2.2.2.1.tar.gz) = 72dd270dfa23b533f332048c1081d470 diff --git a/x11/gdm2/files/patch-ah b/x11/gdm2/files/patch-ah index 3ee15e9555a0..f536eab3268a 100644 --- a/x11/gdm2/files/patch-ah +++ b/x11/gdm2/files/patch-ah @@ -1,9 +1,9 @@ ---- config/PreSession.orig Fri Apr 27 18:51:10 2001 -+++ config/PreSession Tue May 8 11:32:12 2001 +--- config/PreSession.orig Sun Jun 3 14:45:40 2001 ++++ config/PreSession Sun Jun 3 14:47:23 2001 @@ -1,4 +1,4 @@ #!/bin/sh -if [ -x /usr/bin/X11/sessreg ]; then -- /usr/bin/X11/sessreg -a -w /var/log/wtmp -u /var/run/utmp -l $DISPLAY $USER +- /usr/bin/X11/sessreg -a -w /var/log/wtmp -u none -l $DISPLAY $USER +if [ -x /usr/X11R6/bin/sessreg ]; then -+ /usr/X11R6/bin/sessreg -a -w /var/log/wtmp -u /var/run/utmp -l $DISPLAY -x /usr/X11R6/lib/X11/xdm/Xservers $USER ++ /usr/X11R6/bin/sessreg -a -w /var/log/wtmp -u none -l $DISPLAY -x /usr/X11R6/lib/X11/xdm/Xservers $USER fi diff --git a/x11/gdm2/files/patch-ai b/x11/gdm2/files/patch-ai index a8a24086a54a..47d98e7f5070 100644 --- a/x11/gdm2/files/patch-ai +++ b/x11/gdm2/files/patch-ai @@ -1,9 +1,9 @@ ---- config/PostSession.orig Fri Apr 27 18:51:10 2001 -+++ config/PostSession Tue May 8 11:33:08 2001 +--- config/PostSession.orig Sun Jun 3 14:48:43 2001 ++++ config/PostSession Sun Jun 3 14:49:15 2001 @@ -1,4 +1,4 @@ #!/bin/sh -if [ -x /usr/bin/X11/sessreg ]; then -- /usr/bin/X11/sessreg -d -w /var/log/wtmp -u /var/run/utmp -l $DISPLAY $USER +- /usr/bin/X11/sessreg -d -w /var/log/wtmp -u none -l $DISPLAY $USER +if [ -x /usr/X11R6/bin/sessreg ]; then -+ /usr/X11R6/bin/sessreg -d -w /var/log/wtmp -u /var/run/utmp -l $DISPLAY -x /usr/X11R6/lib/X11/xdm/Xservers $USER ++ /usr/X11R6/bin/sessreg -d -w /var/log/wtmp -u none -l $DISPLAY -x /usr/X11R6/lib/X11/xdm/Xservers $USER fi diff --git a/x11/gdm2/files/patch-ao b/x11/gdm2/files/patch-ao deleted file mode 100644 index 50c9a997992f..000000000000 --- a/x11/gdm2/files/patch-ao +++ /dev/null @@ -1,14 +0,0 @@ ---- config/Makefile.in.orig Fri May 4 20:22:08 2001 -+++ config/Makefile.in Tue May 8 11:34:26 2001 -@@ -151,3 +151,3 @@ - --EXTRA_DIST = gdm.conf.in Gnome.in gnomerc.in Xsession Failsafe.in gdm locale.alias Default PostSession PreSession Default.redhat Default.debian Failsafe.redhat -+EXTRA_DIST = gdm.conf.in Gnome.in gnomerc.in Failsafe.in gdm locale.alias Default PostSession PreSession Default.redhat Default.debian Failsafe.redhat - -@@ -282,6 +282,2 @@ - chmod 755 $(sessdir); \ -- fi -- -- if test '!' -f $(sessdir)/Xsession; then \ -- $(INSTALL_SCRIPT) $(srcdir)/Xsession $(sessdir)/Xsession; \ - fi diff --git a/x11/gdm2/pkg-plist b/x11/gdm2/pkg-plist index 2cdfd965b993..c1c4ed867c53 100644 --- a/x11/gdm2/pkg-plist +++ b/x11/gdm2/pkg-plist @@ -2,27 +2,72 @@ bin/gdm bin/gdmchooser bin/gdmconfig bin/gdmlogin +bin/gdmphotosetup +sbin/gdm-restart etc/gdm/Init/Default etc/gdm/PostSession/Default etc/gdm/PreSession/Default -etc/gdm/Sessions/Failsafe +etc/gdm/Sessions/Xsession etc/gdm/Sessions/Gnome +etc/gdm/factory-gdm.conf +etc/gdm/XKeepsCrashing etc/gdm/gdm.conf etc/gdm/gnomerc etc/gdm/locale.alias share/gnome/apps/System/gdmconfig.desktop +share/gnome/apps/Settings/gdmphotosetup.desktop share/gnome/gdm/gdmchooser.glade share/gnome/gdm/gdmconfig.glade share/gnome/help/gdm/C/configuration.html share/gnome/help/gdm/C/daemonov.html share/gnome/help/gdm/C/docbook.css -share/gnome/help/gdm/C/f21.html +share/gnome/help/gdm/C/f39.html share/gnome/help/gdm/C/gdm.html share/gnome/help/gdm/C/index.html share/gnome/help/gdm/C/intro.html -share/gnome/help/gdm/C/x135.html -share/gnome/help/gdm/C/x60.html -share/gnome/help/gdm/C/x69.html +share/gnome/help/gdm/C/x155.html +share/gnome/help/gdm/C/x80.html +share/gnome/help/gdm/C/x89.html +share/gnome/help/gdmconfig/C/index.html +share/gnome/help/gdmconfig/C/gdmconfig.sgml +share/gnome/help/gdmconfig/C/authors.html +share/gnome/help/gdmconfig/C/basic.html +share/gnome/help/gdmconfig/C/bugs.html +share/gnome/help/gdmconfig/C/expert.html +share/gnome/help/gdmconfig/C/license.html +share/gnome/help/gdmconfig/C/ln7.html +share/gnome/help/gdmconfig/C/system.html +share/gnome/help/gdmconfig/C/usage.html +share/gnome/help/gdmconfig/C/docbook.css +share/gnome/help/gdmconfig/C/topic.dat +share/gnome/help/gdmconfig/C/stylesheet-images/caution.gif +share/gnome/help/gdmconfig/C/stylesheet-images/home.gif +share/gnome/help/gdmconfig/C/stylesheet-images/important.gif +share/gnome/help/gdmconfig/C/stylesheet-images/next.gif +share/gnome/help/gdmconfig/C/stylesheet-images/note.gif +share/gnome/help/gdmconfig/C/stylesheet-images/prev.gif +share/gnome/help/gdmconfig/C/stylesheet-images/tip.gif +share/gnome/help/gdmconfig/C/stylesheet-images/toc-blank.gif +share/gnome/help/gdmconfig/C/stylesheet-images/toc-minus.gif +share/gnome/help/gdmconfig/C/stylesheet-images/toc-plus.gif +share/gnome/help/gdmconfig/C/stylesheet-images/up.gif +share/gnome/help/gdmconfig/C/stylesheet-images/warning.gif +share/gnome/help/gdmconfig/C/figures/GDM_auto_login.png +share/gnome/help/gdmconfig/C/figures/GDM_background.png +share/gnome/help/gdmconfig/C/figures/GDM_chooser.png +share/gnome/help/gdmconfig/C/figures/GDM_enviro.png +share/gnome/help/gdmconfig/C/figures/GDM_face_brow.png +share/gnome/help/gdmconfig/C/figures/GDM_full.png +share/gnome/help/gdmconfig/C/figures/GDM_login_appear.png +share/gnome/help/gdmconfig/C/figures/GDM_login_behav.png +share/gnome/help/gdmconfig/C/figures/GDM_login_sessions.png +share/gnome/help/gdmconfig/C/figures/GDM_menubar.png +share/gnome/help/gdmconfig/C/figures/GDM_misc.png +share/gnome/help/gdmconfig/C/figures/GDM_paths.png +share/gnome/help/gdmconfig/C/figures/GDM_security.png +share/gnome/help/gdmconfig/C/figures/GDM_xdmcp.png +share/gnome/help/gdmconfig/C/figures/GDM_xserv_setup.png +share/gnome/omf/gdm/gdmconfig-C.omf share/gnome/pixmaps/gdm.xpm share/gnome/pixmaps/nobody.png share/gnome/pixmaps/nohost.png @@ -40,9 +85,9 @@ share/locale/ga/LC_MESSAGES/gdm.mo share/locale/gl/LC_MESSAGES/gdm.mo share/locale/hu/LC_MESSAGES/gdm.mo share/locale/it/LC_MESSAGES/gdm.mo -share/locale/ja/LC_MESSAGES/gdm.mo share/locale/ko/LC_MESSAGES/gdm.mo share/locale/lt/LC_MESSAGES/gdm.mo +share/locale/ms/LC_MESSAGES/gdm.mo share/locale/nl/LC_MESSAGES/gdm.mo share/locale/nn/LC_MESSAGES/gdm.mo share/locale/no/LC_MESSAGES/gdm.mo @@ -56,14 +101,18 @@ share/locale/sv/LC_MESSAGES/gdm.mo share/locale/tr/LC_MESSAGES/gdm.mo share/locale/uk/LC_MESSAGES/gdm.mo share/locale/zh_CN.GB2312/LC_MESSAGES/gdm.mo -share/locale/zh_TW.Big5/LC_MESSAGES/gdm.mo @dirrm etc/gdm/Init @dirrm etc/gdm/PostSession @dirrm etc/gdm/PreSession @dirrm etc/gdm/Sessions @dirrm etc/gdm @dirrm etc/pam.d +@dirrm share/gnome/omf/gdm @dirrm share/gnome/gdm @dirrm share/gnome/help/gdm/C/images @dirrm share/gnome/help/gdm/C @dirrm share/gnome/help/gdm +@dirrm share/gnome/help/gdmconfig/C/stylesheet-images +@dirrm share/gnome/help/gdmconfig/C/figures +@dirrm share/gnome/help/gdmconfig/C +@dirrm share/gnome/help/gdmconfig -- cgit v1.2.3