Update to 2.6.0.3.

5 files changed, 95 insertions, 91 deletions

diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile
index 7ef812382217..65e92dff5cbf 100644
--- a/x11/gdm2/Makefile
+++ b/x11/gdm2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gdm2
-PORTVERSION=	2.6.0.2
+PORTVERSION=	2.6.0.3
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=		sources/${PORTNAME:S/2$//}/2.6
@@ -21,6 +21,7 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gnomehier libgnomeui librsvg2
 GNU_CONFIGURE=	yes
+USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
@@ -29,14 +30,16 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 
 MAN1=		gdm.1
 
+PLIST_SUB=	VERSION="2.6"
+
 OPTIONS=	IPV6 "Enable IPv6 support (This disables IPv4 support)" off
 
 .include <bsd.port.pre.mk>
 
 .if exists(/usr/include/security/pam_misc.h)
-PLIST_SUB=	PAM_MISC=""
+PLIST_SUB+=	PAM_MISC=""
 .else
-PLIST_SUB=	PAM_MISC="@comment "
+PLIST_SUB+=	PAM_MISC="@comment "
 .endif
 
 .if defined(WITH_IPV6)
@@ -49,6 +52,9 @@ post-extract:
 	@${SED} -e "s,%%PREFIX%%,${PREFIX},g" \
 		${FILESDIR}/gdm.sh.sample > ${WRKSRC}/gdm.sh.sample
 
+post-patch:
+	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e 's|[(]datadir[)]/icons/hicolor|(prefix)/share/icons/hicolor|g'
+
 post-install:
 .if !defined(PACKAGE_BUILDING)
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
diff --git a/x11/gdm2/distinfo b/x11/gdm2/distinfo
index 6da14519d1e3..deb9493278a2 100644
--- a/x11/gdm2/distinfo
+++ b/x11/gdm2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gdm-2.6.0.2.tar.bz2) = 037435f440c0d179eb10495172d4e872
-SIZE (gnome2/gdm-2.6.0.2.tar.bz2) = 3029505
+MD5 (gnome2/gdm-2.6.0.3.tar.bz2) = 2eb8c0fb4289d78fdae686aee3cfbd5c
+SIZE (gnome2/gdm-2.6.0.3.tar.bz2) = 3079606
diff --git a/x11/gdm2/files/patch-config_Makefile.in b/x11/gdm2/files/patch-config_Makefile.in
index 5323b6cfc87e..9678f710c061 100644
--- a/x11/gdm2/files/patch-config_Makefile.in
+++ b/x11/gdm2/files/patch-config_Makefile.in
@@ -1,18 +1,11 @@
---- config/Makefile.in.orig	Sun Apr 18 01:03:27 2004
-+++ config/Makefile.in	Sun Apr 18 01:04:09 2004
-@@ -400,13 +400,13 @@
+--- config/Makefile.in.orig	Fri Jun 11 15:40:03 2004
++++ config/Makefile.in	Fri Jun 11 15:41:30 2004
+@@ -400,7 +400,7 @@
  
  	if test '!' -d $(DESTDIR)$(logdir); then \
  		$(mkinstalldirs) $(DESTDIR)$(logdir); \
--		chown root.root $(DESTDIR)$(logdir); \
+-		chown root:root $(DESTDIR)$(logdir); \
 +		chown root:wheel $(DESTDIR)$(logdir); \
  		chmod 755 $(DESTDIR)$(logdir); \
  	fi
  
- 	if test '!' -d $(DESTDIR)$(authdir); then \
- 		$(mkinstalldirs) $(DESTDIR)$(authdir); \
--		chown root.gdm $(DESTDIR)$(authdir); \
-+		chown root:gdm $(DESTDIR)$(authdir); \
- 		chmod 1770 $(DESTDIR)$(authdir); \
- 	fi
- 
diff --git a/x11/gdm2/files/patch-gui_gdmsetup.c b/x11/gdm2/files/patch-gui_gdmsetup.c
index aad93e0baafc..c1eedd5cb703 100644
--- a/x11/gdm2/files/patch-gui_gdmsetup.c
+++ b/x11/gdm2/files/patch-gui_gdmsetup.c
@@ -1,11 +1,11 @@
---- gui/gdmsetup.c.orig	Mon Apr 12 14:24:57 2004
-+++ gui/gdmsetup.c	Mon Apr 12 14:25:00 2004
-@@ -1962,7 +1962,7 @@
- 			success = TRUE;
- 
- 			/* HACK! */
--			cmd = g_strdup_printf ("%s -R root.root %s", chown, quoted);
-+			cmd = g_strdup_printf ("%s -R root:wheel %s", chown, quoted);
- 			system (cmd);
- 			g_free (cmd);
- 
+--- gui/gdmsetup.c.orig	Fri Jun  4 14:37:17 2004
++++ gui/gdmsetup.c	Fri Jun 11 15:42:28 2004
+@@ -1983,7 +1983,7 @@
+ 		/* HACK! */
+ 		argv[0] = chown;
+ 		argv[1] = "-R";
+-		argv[2] = "root:root";
++		argv[2] = "root:wheel";
+ 		argv[3] = quoted;
+ 		argv[4] = NULL;
+ 		simple_spawn_sync (argv);
diff --git a/x11/gdm2/pkg-plist b/x11/gdm2/pkg-plist
index c6daef0f1fdf..1d16a3f45747 100644
--- a/x11/gdm2/pkg-plist
+++ b/x11/gdm2/pkg-plist
@@ -121,75 +121,80 @@ share/gnome/omf/gdm/gdm-zh_HK.omf
 share/gnome/omf/gdm/gdm-zh_TW.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gdm/gdm-zh_TW.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/gdm-foot-logo.png
+share/gnome/pixmaps/gdm-setup.png
+share/gnome/pixmaps/gdm-xnest.png
 share/gnome/pixmaps/gdm.png
 share/gnome/pixmaps/login-photo.png
 share/gnome/pixmaps/nobody.png
 share/gnome/pixmaps/nohost.png
 share/gnome/xsessions/gnome.desktop
-share/locale/af/LC_MESSAGES/gdm-2.4.mo
-share/locale/am/LC_MESSAGES/gdm-2.4.mo
-share/locale/ar/LC_MESSAGES/gdm-2.4.mo
-share/locale/az/LC_MESSAGES/gdm-2.4.mo
-share/locale/be/LC_MESSAGES/gdm-2.4.mo
-share/locale/bg/LC_MESSAGES/gdm-2.4.mo
-share/locale/bn/LC_MESSAGES/gdm-2.4.mo
-share/locale/ca/LC_MESSAGES/gdm-2.4.mo
-share/locale/cs/LC_MESSAGES/gdm-2.4.mo
-share/locale/cy/LC_MESSAGES/gdm-2.4.mo
-share/locale/da/LC_MESSAGES/gdm-2.4.mo
-share/locale/de/LC_MESSAGES/gdm-2.4.mo
-share/locale/el/LC_MESSAGES/gdm-2.4.mo
-share/locale/en_CA/LC_MESSAGES/gdm-2.4.mo
-share/locale/en_GB/LC_MESSAGES/gdm-2.4.mo
-share/locale/es/LC_MESSAGES/gdm-2.4.mo
-share/locale/et/LC_MESSAGES/gdm-2.4.mo
-share/locale/eu/LC_MESSAGES/gdm-2.4.mo
-share/locale/fa/LC_MESSAGES/gdm-2.4.mo
-share/locale/fi/LC_MESSAGES/gdm-2.4.mo
-share/locale/fr/LC_MESSAGES/gdm-2.4.mo
-share/locale/ga/LC_MESSAGES/gdm-2.4.mo
-share/locale/gl/LC_MESSAGES/gdm-2.4.mo
-share/locale/gu/LC_MESSAGES/gdm-2.4.mo
-share/locale/he/LC_MESSAGES/gdm-2.4.mo
-share/locale/hi/LC_MESSAGES/gdm-2.4.mo
-share/locale/hr/LC_MESSAGES/gdm-2.4.mo
-share/locale/hu/LC_MESSAGES/gdm-2.4.mo
-share/locale/id/LC_MESSAGES/gdm-2.4.mo
-share/locale/is/LC_MESSAGES/gdm-2.4.mo
-share/locale/it/LC_MESSAGES/gdm-2.4.mo
-share/locale/ja/LC_MESSAGES/gdm-2.4.mo
-share/locale/ko/LC_MESSAGES/gdm-2.4.mo
-share/locale/lt/LC_MESSAGES/gdm-2.4.mo
-share/locale/lv/LC_MESSAGES/gdm-2.4.mo
-share/locale/mi/LC_MESSAGES/gdm-2.4.mo
-share/locale/mk/LC_MESSAGES/gdm-2.4.mo
-share/locale/ml/LC_MESSAGES/gdm-2.4.mo
-share/locale/mn/LC_MESSAGES/gdm-2.4.mo
-share/locale/mr/LC_MESSAGES/gdm-2.4.mo
-share/locale/ms/LC_MESSAGES/gdm-2.4.mo
-share/locale/nl/LC_MESSAGES/gdm-2.4.mo
-share/locale/nn/LC_MESSAGES/gdm-2.4.mo
-share/locale/no/LC_MESSAGES/gdm-2.4.mo
-share/locale/pa/LC_MESSAGES/gdm-2.4.mo
-share/locale/pl/LC_MESSAGES/gdm-2.4.mo
-share/locale/pt/LC_MESSAGES/gdm-2.4.mo
-share/locale/pt_BR/LC_MESSAGES/gdm-2.4.mo
-share/locale/ro/LC_MESSAGES/gdm-2.4.mo
-share/locale/ru/LC_MESSAGES/gdm-2.4.mo
-share/locale/sk/LC_MESSAGES/gdm-2.4.mo
-share/locale/sl/LC_MESSAGES/gdm-2.4.mo
-share/locale/sq/LC_MESSAGES/gdm-2.4.mo
-share/locale/sr/LC_MESSAGES/gdm-2.4.mo
-share/locale/sr@Latn/LC_MESSAGES/gdm-2.4.mo
-share/locale/sv/LC_MESSAGES/gdm-2.4.mo
-share/locale/ta/LC_MESSAGES/gdm-2.4.mo
-share/locale/th/LC_MESSAGES/gdm-2.4.mo
-share/locale/tr/LC_MESSAGES/gdm-2.4.mo
-share/locale/uk/LC_MESSAGES/gdm-2.4.mo
-share/locale/vi/LC_MESSAGES/gdm-2.4.mo
-share/locale/wa/LC_MESSAGES/gdm-2.4.mo
-share/locale/zh_CN/LC_MESSAGES/gdm-2.4.mo
-share/locale/zh_TW/LC_MESSAGES/gdm-2.4.mo
+share/icons/hicolor/16x16/apps/gdm-xnest.png
+share/icons/hicolor/32x32/apps/gdm-setup.png
+share/icons/hicolor/32x32/apps/gdm-xnest.png
+share/locale/af/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/am/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/ar/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/az/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/be/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/bg/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/bn/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/ca/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/cs/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/cy/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/da/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/de/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/el/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/en_CA/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/en_GB/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/es/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/et/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/eu/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/fa/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/fi/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/fr/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/ga/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/gl/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/gu/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/he/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/hi/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/hr/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/hu/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/id/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/is/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/it/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/ja/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/ko/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/lt/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/lv/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/mi/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/mk/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/ml/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/mn/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/mr/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/ms/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/nl/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/nn/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/no/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/pa/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/pl/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/pt/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/pt_BR/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/ro/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/ru/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/sk/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/sl/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/sq/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/sr/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/sr@Latn/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/sv/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/ta/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/th/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/tr/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/uk/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/vi/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/wa/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/zh_CN/LC_MESSAGES/gdm-%%VERSION%%.mo
+share/locale/zh_TW/LC_MESSAGES/gdm-%%VERSION%%.mo
 @dirrm share/gnome/xsessions
 @dirrm share/gnome/omf/gdm
 @dirrm share/gnome/help/gdm/zh_TW/figures