Attachment 14918 Details for Bug 27855 – file.diff

[patch] file.diff

file.diff (text/plain), 7.24 KB, created by anders on 2001-06-03 17:10:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: anders

Created: 2001-06-03 17:10:02 UTC

Size: 7.24 KB

patch

obsolete

>diff -Nur gdm.old/Makefile gdm/Makefile
>--- gdm.old/Makefile	Fri May 11 18:36:38 2001
>+++ gdm/Makefile	Sun Jun  3 14:34:22 2001
>@@ -6,13 +6,14 @@
> #
> 
> 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
> 
> MAINTAINER=	gnome@FreeBSD.org
> 
>+USE_BZIP2=	yes
> USE_X_PREFIX=	yes
> USE_GMAKE=	yes
> USE_GNOME=	yes
>diff -Nur gdm.old/distinfo gdm/distinfo
>--- gdm.old/distinfo	Tue May  8 18:39:45 2001
>+++ gdm/distinfo	Sun Jun  3 14:36:12 2001
>@@ -1 +1 @@
>-MD5 (gdm-2.2.1.tar.gz) = 166b85182688b983bff965976395fbda
>+MD5 (gdm-2.2.2.1.tar.bz2) = 64998ab01bff71429903e40313a120e3
>diff -Nur gdm.old/files/patch-ah gdm/files/patch-ah
>--- gdm.old/files/patch-ah	Tue May  8 18:39:48 2001
>+++ gdm/files/patch-ah	Sun Jun  3 14:48:02 2001
>@@ -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 -Nur gdm.old/files/patch-ai gdm/files/patch-ai
>--- gdm.old/files/patch-ai	Tue May  8 18:39:48 2001
>+++ gdm/files/patch-ai	Sun Jun  3 14:49:31 2001
>@@ -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 -Nur gdm.old/files/patch-ao gdm/files/patch-ao
>--- gdm.old/files/patch-ao	Tue May  8 18:39:49 2001
>+++ gdm/files/patch-ao	Thu Jan  1 01:00:00 1970
>@@ -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 -Nur gdm.old/pkg-plist gdm/pkg-plist
>--- gdm.old/pkg-plist	Tue May  8 18:39:45 2001
>+++ gdm/pkg-plist	Sun Jun  3 17:52:53 2001
>@@ -2,27 +2,71 @@
> bin/gdmchooser
> bin/gdmconfig
> bin/gdmlogin
>+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 +84,9 @@
> 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,7 +100,6 @@
> 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
>@@ -67,3 +110,7 @@
> @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

Actions: View | Diff

Attachments on bug 27855: 14918