diff options
-rw-r--r-- | x11/gdm/Makefile | 2 | ||||
-rw-r--r-- | x11/gdm/distinfo | 2 | ||||
-rw-r--r-- | x11/gdm/files/patch-ag | 15 | ||||
-rw-r--r-- | x11/gdm/files/patch-ah | 14 | ||||
-rw-r--r-- | x11/gdm/files/patch-ai | 14 | ||||
-rw-r--r-- | x11/gdm/files/patch-ao | 21 | ||||
-rw-r--r-- | x11/gdm/pkg-plist | 1 | ||||
-rw-r--r-- | x11/gdm2/Makefile | 2 | ||||
-rw-r--r-- | x11/gdm2/distinfo | 2 | ||||
-rw-r--r-- | x11/gdm2/files/patch-ag | 15 | ||||
-rw-r--r-- | x11/gdm2/files/patch-ah | 14 | ||||
-rw-r--r-- | x11/gdm2/files/patch-ai | 14 | ||||
-rw-r--r-- | x11/gdm2/files/patch-ao | 21 | ||||
-rw-r--r-- | x11/gdm2/pkg-plist | 1 |
14 files changed, 62 insertions, 76 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index 284e58fd251f..f22a25f21ec9 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gdm -PORTVERSION= 2.2.0 +PORTVERSION= 2.2.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gdm diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo index e2b5b7c497c7..f6f8cfd73dfe 100644 --- a/x11/gdm/distinfo +++ b/x11/gdm/distinfo @@ -1 +1 @@ -MD5 (gdm-2.2.0.tar.gz) = d28f7ec1f94e7d3e661918d43079e807 +MD5 (gdm-2.2.1.tar.gz) = 166b85182688b983bff965976395fbda diff --git a/x11/gdm/files/patch-ag b/x11/gdm/files/patch-ag index 2c8b5868765b..90113125f8c1 100644 --- a/x11/gdm/files/patch-ag +++ b/x11/gdm/files/patch-ag @@ -1,10 +1,7 @@ ---- config/Default.orig Tue Sep 12 22:07:51 2000 -+++ config/Default Tue Sep 12 22:07:59 2000 -@@ -1,6 +1,6 @@ - #!/bin/sh - --/usr/bin/X11/xsetroot -solid "#007777" -+/usr/X11R6/bin/xsetroot -solid "#007777" - - +--- config/Default.orig Fri Mar 30 19:27:22 2001 ++++ config/Default Tue May 8 11:30:59 2001 +@@ -3,3 +3,3 @@ + #Color is now handled by gdmgreeter itself +-#/usr/bin/X11/xsetroot -solid "#007777" ++#/usr/X11R6/bin/xsetroot -solid "#007777" diff --git a/x11/gdm/files/patch-ah b/x11/gdm/files/patch-ah index 4738496f3561..3ee15e9555a0 100644 --- a/x11/gdm/files/patch-ah +++ b/x11/gdm/files/patch-ah @@ -1,7 +1,9 @@ ---- config/PreSession.orig Thu Sep 30 07:42:27 1999 -+++ config/PreSession Wed Sep 13 00:51:23 2000 -@@ -1,3 +1,3 @@ +--- config/PreSession.orig Fri Apr 27 18:51:10 2001 ++++ config/PreSession Tue May 8 11:32:12 2001 +@@ -1,4 +1,4 @@ #!/bin/sh --/usr/bin/X11/sessreg -a -w /var/log/wtmp -u /var/run/utmp -l $DISPLAY $USER -+/usr/X11R6/bin/sessreg -a -w /var/log/wtmp -u /var/run/utmp -l $DISPLAY -x /usr/X11R6/lib/X11/xdm/Xservers $USER - +-if [ -x /usr/bin/X11/sessreg ]; then +- /usr/bin/X11/sessreg -a -w /var/log/wtmp -u /var/run/utmp -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 + fi diff --git a/x11/gdm/files/patch-ai b/x11/gdm/files/patch-ai index f348fc2e4647..a8a24086a54a 100644 --- a/x11/gdm/files/patch-ai +++ b/x11/gdm/files/patch-ai @@ -1,7 +1,9 @@ ---- config/PostSession.orig Thu Sep 30 07:42:19 1999 -+++ config/PostSession Wed Sep 13 00:51:04 2000 -@@ -1,3 +1,3 @@ +--- config/PostSession.orig Fri Apr 27 18:51:10 2001 ++++ config/PostSession Tue May 8 11:33:08 2001 +@@ -1,4 +1,4 @@ #!/bin/sh --/usr/bin/X11/sessreg -d -w /var/log/wtmp -u /var/run/utmp -l $DISPLAY $USER -+/usr/X11R6/bin/sessreg -d -w /var/log/wtmp -u /var/run/utmp -l $DISPLAY -x /usr/X11R6/lib/X11/xdm/Xservers $USER - +-if [ -x /usr/bin/X11/sessreg ]; then +- /usr/bin/X11/sessreg -d -w /var/log/wtmp -u /var/run/utmp -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 + fi diff --git a/x11/gdm/files/patch-ao b/x11/gdm/files/patch-ao index 4b0854226adb..50c9a997992f 100644 --- a/x11/gdm/files/patch-ao +++ b/x11/gdm/files/patch-ao @@ -1,21 +1,14 @@ ---- config/Makefile.in.orig Fri Apr 20 20:32:57 2001 -+++ config/Makefile.in Fri Apr 20 20:33:15 2001 -@@ -139,7 +139,7 @@ +--- 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 @@ - noinst_DATA = gdm.conf +-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 --EXTRA_DIST = gdm.conf.in Gnome.in gnomerc.in Xsession Failsafe.in gdm locale.alias Default PostSession PreSession Default.redhat Failsafe.redhat -+EXTRA_DIST = gdm.conf.in Gnome.in gnomerc.in Failsafe.in gdm locale.alias Default PostSession PreSession Default.redhat Failsafe.redhat - - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h -@@ -270,9 +270,6 @@ - if test '!' -d $(sessdir); then \ - $(mkinstalldirs) $(sessdir); \ +@@ -282,6 +282,2 @@ chmod 755 $(sessdir); \ - fi +- - if test '!' -f $(sessdir)/Xsession; then \ - $(INSTALL_SCRIPT) $(srcdir)/Xsession $(sessdir)/Xsession; \ fi - if test '!' -f $(sessdir)/Gnome; then \ - $(INSTALL_SCRIPT) Gnome $(sessdir)/Gnome; \ diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist index 26d156127e15..2cdfd965b993 100644 --- a/x11/gdm/pkg-plist +++ b/x11/gdm/pkg-plist @@ -20,7 +20,6 @@ share/gnome/help/gdm/C/f21.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/ln15.html share/gnome/help/gdm/C/x135.html share/gnome/help/gdm/C/x60.html share/gnome/help/gdm/C/x69.html diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile index 284e58fd251f..f22a25f21ec9 100644 --- a/x11/gdm2/Makefile +++ b/x11/gdm2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gdm -PORTVERSION= 2.2.0 +PORTVERSION= 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 e2b5b7c497c7..f6f8cfd73dfe 100644 --- a/x11/gdm2/distinfo +++ b/x11/gdm2/distinfo @@ -1 +1 @@ -MD5 (gdm-2.2.0.tar.gz) = d28f7ec1f94e7d3e661918d43079e807 +MD5 (gdm-2.2.1.tar.gz) = 166b85182688b983bff965976395fbda diff --git a/x11/gdm2/files/patch-ag b/x11/gdm2/files/patch-ag index 2c8b5868765b..90113125f8c1 100644 --- a/x11/gdm2/files/patch-ag +++ b/x11/gdm2/files/patch-ag @@ -1,10 +1,7 @@ ---- config/Default.orig Tue Sep 12 22:07:51 2000 -+++ config/Default Tue Sep 12 22:07:59 2000 -@@ -1,6 +1,6 @@ - #!/bin/sh - --/usr/bin/X11/xsetroot -solid "#007777" -+/usr/X11R6/bin/xsetroot -solid "#007777" - - +--- config/Default.orig Fri Mar 30 19:27:22 2001 ++++ config/Default Tue May 8 11:30:59 2001 +@@ -3,3 +3,3 @@ + #Color is now handled by gdmgreeter itself +-#/usr/bin/X11/xsetroot -solid "#007777" ++#/usr/X11R6/bin/xsetroot -solid "#007777" diff --git a/x11/gdm2/files/patch-ah b/x11/gdm2/files/patch-ah index 4738496f3561..3ee15e9555a0 100644 --- a/x11/gdm2/files/patch-ah +++ b/x11/gdm2/files/patch-ah @@ -1,7 +1,9 @@ ---- config/PreSession.orig Thu Sep 30 07:42:27 1999 -+++ config/PreSession Wed Sep 13 00:51:23 2000 -@@ -1,3 +1,3 @@ +--- config/PreSession.orig Fri Apr 27 18:51:10 2001 ++++ config/PreSession Tue May 8 11:32:12 2001 +@@ -1,4 +1,4 @@ #!/bin/sh --/usr/bin/X11/sessreg -a -w /var/log/wtmp -u /var/run/utmp -l $DISPLAY $USER -+/usr/X11R6/bin/sessreg -a -w /var/log/wtmp -u /var/run/utmp -l $DISPLAY -x /usr/X11R6/lib/X11/xdm/Xservers $USER - +-if [ -x /usr/bin/X11/sessreg ]; then +- /usr/bin/X11/sessreg -a -w /var/log/wtmp -u /var/run/utmp -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 + fi diff --git a/x11/gdm2/files/patch-ai b/x11/gdm2/files/patch-ai index f348fc2e4647..a8a24086a54a 100644 --- a/x11/gdm2/files/patch-ai +++ b/x11/gdm2/files/patch-ai @@ -1,7 +1,9 @@ ---- config/PostSession.orig Thu Sep 30 07:42:19 1999 -+++ config/PostSession Wed Sep 13 00:51:04 2000 -@@ -1,3 +1,3 @@ +--- config/PostSession.orig Fri Apr 27 18:51:10 2001 ++++ config/PostSession Tue May 8 11:33:08 2001 +@@ -1,4 +1,4 @@ #!/bin/sh --/usr/bin/X11/sessreg -d -w /var/log/wtmp -u /var/run/utmp -l $DISPLAY $USER -+/usr/X11R6/bin/sessreg -d -w /var/log/wtmp -u /var/run/utmp -l $DISPLAY -x /usr/X11R6/lib/X11/xdm/Xservers $USER - +-if [ -x /usr/bin/X11/sessreg ]; then +- /usr/bin/X11/sessreg -d -w /var/log/wtmp -u /var/run/utmp -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 + fi diff --git a/x11/gdm2/files/patch-ao b/x11/gdm2/files/patch-ao index 4b0854226adb..50c9a997992f 100644 --- a/x11/gdm2/files/patch-ao +++ b/x11/gdm2/files/patch-ao @@ -1,21 +1,14 @@ ---- config/Makefile.in.orig Fri Apr 20 20:32:57 2001 -+++ config/Makefile.in Fri Apr 20 20:33:15 2001 -@@ -139,7 +139,7 @@ +--- 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 @@ - noinst_DATA = gdm.conf +-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 --EXTRA_DIST = gdm.conf.in Gnome.in gnomerc.in Xsession Failsafe.in gdm locale.alias Default PostSession PreSession Default.redhat Failsafe.redhat -+EXTRA_DIST = gdm.conf.in Gnome.in gnomerc.in Failsafe.in gdm locale.alias Default PostSession PreSession Default.redhat Failsafe.redhat - - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h -@@ -270,9 +270,6 @@ - if test '!' -d $(sessdir); then \ - $(mkinstalldirs) $(sessdir); \ +@@ -282,6 +282,2 @@ chmod 755 $(sessdir); \ - fi +- - if test '!' -f $(sessdir)/Xsession; then \ - $(INSTALL_SCRIPT) $(srcdir)/Xsession $(sessdir)/Xsession; \ fi - if test '!' -f $(sessdir)/Gnome; then \ - $(INSTALL_SCRIPT) Gnome $(sessdir)/Gnome; \ diff --git a/x11/gdm2/pkg-plist b/x11/gdm2/pkg-plist index 26d156127e15..2cdfd965b993 100644 --- a/x11/gdm2/pkg-plist +++ b/x11/gdm2/pkg-plist @@ -20,7 +20,6 @@ share/gnome/help/gdm/C/f21.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/ln15.html share/gnome/help/gdm/C/x135.html share/gnome/help/gdm/C/x60.html share/gnome/help/gdm/C/x69.html |