Upgrade to 2.2.3.2

6 files changed, 19 insertions, 20 deletions

diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile
index b1e383b11128..36416942c8ea 100644
--- a/x11/gdm2/Makefile
+++ b/x11/gdm2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gdm
-PORTVERSION=	2.2.2.1
+PORTVERSION=	2.2.3.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=		stable/sources/gdm
@@ -33,7 +33,7 @@ pre-patch:
 		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/config/gnomerc ${PREFIX}/etc/gdm/
-	${CAT} ${PKGMESSAGE}
+	@${INSTALL_SCRIPT} ${WRKSRC}/config/gnomerc ${PREFIX}/etc/gdm/
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/x11/gdm2/distinfo b/x11/gdm2/distinfo
index 53c31600c321..63e2b62dc3eb 100644
--- a/x11/gdm2/distinfo
+++ b/x11/gdm2/distinfo
@@ -1 +1 @@
-MD5 (gdm-2.2.2.1.tar.gz) = 72dd270dfa23b533f332048c1081d470
+MD5 (gdm-2.2.3.2.tar.gz) = 5e05b0b4722061311121f63e02907b50
diff --git a/x11/gdm2/files/patch-ac b/x11/gdm2/files/patch-ac
deleted file mode 100644
index 019a7fde66f2..000000000000
--- a/x11/gdm2/files/patch-ac
+++ /dev/null
@@ -1,8 +0,0 @@
---- config/Gnome.in.orig	Fri Apr 20 18:34:37 2001
-+++ config/Gnome.in	Fri Apr 20 18:34:53 2001
-@@ -1,4 +1,4 @@
--#!/bin/bash -login
-+#!/bin/sh
- 
- for errfile in "$HOME/.gnomerc-errors" "${TMPDIR-/tmp}/gnomerc-$USER" "/tmp/gnomerc-$USER"
- do
diff --git a/x11/gdm2/files/patch-aj b/x11/gdm2/files/patch-aj
deleted file mode 100644
index 798169e5aa93..000000000000
--- a/x11/gdm2/files/patch-aj
+++ /dev/null
@@ -1,8 +0,0 @@
---- config/Xsession.orig	Tue Sep 12 22:12:09 2000
-+++ config/Xsession	Tue Sep 12 22:13:21 2000
-@@ -1,4 +1,4 @@
--#!/bin/bash -login
-+#!/bin/sh
- # $XConsortium: Xsession /main/10 1995/12/18 18:21:28 gildea $
- 
- case $# in
diff --git a/x11/gdm2/files/patch-aq b/x11/gdm2/files/patch-aq
new file mode 100644
index 000000000000..ac696b53c1e9
--- /dev/null
+++ b/x11/gdm2/files/patch-aq
@@ -0,0 +1,11 @@
+--- po/Makefile.in.in.orig	Thu Aug 16 16:02:46 2001
++++ po/Makefile.in.in	Thu Aug 16 16:02:59 2001
+@@ -23,7 +23,7 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datadir = @datadir@
+-localedir = $(datadir)/locale
++localedir = $(prefix)/share/locale
+ gettextsrcdir = $(datadir)/gettext/po
+ 
+ INSTALL = @INSTALL@
diff --git a/x11/gdm2/pkg-plist b/x11/gdm2/pkg-plist
index c1c4ed867c53..f02e97e0f0d2 100644
--- a/x11/gdm2/pkg-plist
+++ b/x11/gdm2/pkg-plist
@@ -4,6 +4,7 @@ bin/gdmconfig
 bin/gdmlogin
 bin/gdmphotosetup
 sbin/gdm-restart
+sbin/gdm-safe-restart
 etc/gdm/Init/Default
 etc/gdm/PostSession/Default
 etc/gdm/PreSession/Default
@@ -56,6 +57,7 @@ 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_expert_misc.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
@@ -85,6 +87,7 @@ 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
@@ -101,6 +104,7 @@ 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