* Change the uid:gid for gdm to 92 as mailman already has 91

* Don't overwrite config files
* Bump PORTREVISION

4 files changed, 112 insertions, 12 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 0a95c9608c1f..bb743fab0ba5 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gdm
 PORTVERSION=	2.2.5.5
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=		stable/sources/gdm
@@ -43,11 +44,10 @@ post-install:
 .if !defined(BATCH) && !defined(PACKAGE_BUILDING)
 	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .endif
-	@${INSTALL_SCRIPT} ${WRKSRC}/config/gnomerc ${PREFIX}/etc/gdm
 .if !defined(BATCH) && !defined(PACKAGE_BUILDING)
 	@${CHOWN} -R gdm:gdm ${PREFIX}/share/gnome/gdm ${PREFIX}/etc/gdm
 .else
-	@${CHOWN} -R 91:91 ${PREFIX}/share/gnome/gdm ${PREFIX}/etc/gdm
+	@${CHOWN} -R 92:92 ${PREFIX}/share/gnome/gdm ${PREFIX}/etc/gdm
 .endif
 	@${CHMOD} 0750 ${PREFIX}/share/gnome/gdm
 	@${CAT} ${PKGMESSAGE}
diff --git a/x11/gdm/files/patch-config_Makefile.in b/x11/gdm/files/patch-config_Makefile.in
new file mode 100644
index 000000000000..cb8dfe7446ed
--- /dev/null
+++ b/x11/gdm/files/patch-config_Makefile.in
@@ -0,0 +1,92 @@
+--- config/Makefile.in.orig	Tue Mar 12 18:00:50 2002
++++ config/Makefile.in	Fri Aug  9 18:26:26 2002
+@@ -298,27 +298,30 @@
+ 	fi
+ 	$(INSTALL_DATA) gdm.conf $(confdir)/factory-gdm.conf
+ 
+-	$(INSTALL_SCRIPT) $(srcdir)/XKeepsCrashing $(confdir)/XKeepsCrashing
++	if test '!' -f $(DESTDIR)$(confdir)/XKeepsCrashing; then \
++	    	$(INSTALL_SCRIPT) $(srcdir)/XKeepsCrashing $(DESTDIR)$(confdir)/XKeepsCrashing; \
++	fi
++	$(INSTALL_SCRIPT) $(srcdir)/XKeepsCrashing $(DESTDIR)$(confdir)/factory-XKeepsCrashing
+ 
+-	-if test -f $(localedir)/locale.alias; then \
+-		cp $(localedir)/locale.alias $(localedir)/locale.alias.orig; \
++	if test '!' -f $(DESTDIR)$(localedir)/locale.alias; then \
++	    	$(INSTALL_DATA) $(srcdir)/locale.alias $(DESTDIR)$(localedir)/locale.alias; \
+ 	fi
+-	$(INSTALL_DATA) $(srcdir)/locale.alias $(localedir)/locale.alias
++	$(INSTALL_DATA) $(srcdir)/locale.alias $(DESTDIR)$(localedir)/factory-locale.alias
+ 
+ 	if test '!' -d $(sessdir); then \
+ 		$(mkinstalldirs) $(sessdir); \
+ 		chmod 755 $(sessdir); \
+ 	fi
+ 
+-	-if test -f $(sessdir)/Xsession; then \
+-		cp $(sessdir)/Xsession $(sessdir)/Xsession.orig; \
++	if test '!' -f $(DESTDIR)$(sessdir)/Xsession; then \
++	    	$(INSTALL_SCRIPT) Xsession $(DESTDIR)$(sessdir)/Xsession; \
+ 	fi
+-	$(INSTALL_SCRIPT) $(srcdir)/Xsession $(sessdir)/Xsession
++	$(INSTALL_SCRIPT) Xsession $(DESTDIR)$(sessdir)/factory-Xsession
+ 
+-	-if test -f $(sessdir)/Gnome; then \
+-		cp $(sessdir)/Gnome $(sessdir)/Gnome.orig; \
++	if test '!' -f $(DESTDIR)$(sessdir)/Gnome; then \
++	    	$(INSTALL_SCRIPT) Gnome $(DESTDIR)$(sessdir)/Gnome; \
+ 	fi
+-	$(INSTALL_SCRIPT) Gnome $(sessdir)/Gnome
++	$(INSTALL_SCRIPT) Gnome $(DESTDIR)$(sessdir)/factory-Gnom
+ 
+ 	-if test -f /etc/redhat-release; then \
+ 		if test -f $(sessdir)/Default; then \
+@@ -331,37 +334,38 @@
+ 		$(mkinstalldirs) $(initdir); \
+ 		chmod 755 $(initdir); \
+ 	fi
+-	-if test -f $(initdir)/Default; then \
+-		cp $(initdir)/Default $(initdir)/Default.orig; \
++	if test '!' -f $(DESTDIR)$(initdir)/Default; then \
++	    	$(INSTALL_SCRIPT) $(srcdir)/Default $(DESTDIR)$(initdir)/Default; \
+ 	fi
+-	$(INSTALL_SCRIPT) $(srcdir)/Default $(initdir)/Default
++	$(INSTALL_SCRIPT) $(srcdir)/Default $(DESTDIR)$(initdir)/factory-Default
+ 
+ 	if test '!' -d $(predir); then \
+ 		$(mkinstalldirs) $(predir); \
+ 		chmod 755 $(predir); \
+ 	fi
+-	-if test -f $(predir)/Default; then \
+-		cp $(predir)/Default $(predir)/Default.orig; \
++	if test '!' -f $(DESTDIR)$(predir)/Default; then \
++	    	$(INSTALL_SCRIPT) $(srcdir)/PreSession $(DESTDIR)$(predir)/Default; \
+ 	fi
+-	$(INSTALL_SCRIPT) $(srcdir)/PreSession $(predir)/Default
++	$(INSTALL_SCRIPT) $(srcdir)/PreSession $(DESTDIR)$(predir)/factory-Default
+ 
+ 	if test '!' -d $(postdir); then \
+ 		$(mkinstalldirs) $(postdir); \
+ 		chmod 755 $(postdir); \
+ 	fi
+-	-if test -f $(postdir)/Default; then \
+-		cp $(postdir)/Default $(postdir)/Default.orig; \
++	if test '!' -f $(DESTDIR)$(postdir)/Default; then \
++	    	$(INSTALL_SCRIPT) $(srcdir)/PostSession $(DESTDIR)$(postdir)/Default; \
+ 	fi
+-	$(INSTALL_SCRIPT) $(srcdir)/PostSession $(postdir)/Default
++	$(INSTALL_SCRIPT) $(srcdir)/PostSession $(DESTDIR)$(postdir)/factory-Default
+ 
+ 	if test '!' -d $(gnomercdir); then \
+ 		$(mkinstalldirs) $(gnomercdir); \
+ 		chmod 755 $(gnomercdir); \
+ 	fi
+ 
+-	if test '!' -f $(gnomercdir)/gnomerc; then \
++	 if test '!' -f $(DESTDIR)$(gnomercdir)/gnomerc; then \
+ 		$(INSTALL_SCRIPT) gnomerc $(gnomercdir)/gnomerc; \
+ 	fi
++	$(INSTALL_SCRIPT) gnomerc $(DESTDIR)$(gnomercdir)/factory-gnomerc
+ 
+ 	if test '!' -d $(authdir); then \
+ 		$(mkinstalldirs) $(authdir); \
diff --git a/x11/gdm/pkg-install b/x11/gdm/pkg-install
index 7634ecafb000..04f07cb65ce4 100644
--- a/x11/gdm/pkg-install
+++ b/x11/gdm/pkg-install
@@ -7,7 +7,7 @@ fi
 if [ "$2" = "POST-INSTALL" ]; then
 	USER=gdm
 	GROUP=${USER}
-	UID=91
+	UID=92
 	GID=${UID}
 	PW=/usr/sbin/pw
 
diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist
index c624f4a19c65..3af8f7a575da 100644
--- a/x11/gdm/pkg-plist
+++ b/x11/gdm/pkg-plist
@@ -6,16 +6,24 @@ bin/gdmflexiserver
 bin/gdmlogin
 bin/gdmmktemp
 bin/gdmphotosetup
-etc/gdm/Init/Default
-etc/gdm/PostSession/Default
-etc/gdm/PreSession/Default
-etc/gdm/Sessions/Gnome
-etc/gdm/Sessions/Xsession
-etc/gdm/XKeepsCrashing
+@unexec if cmp -s %D/etc/gdm/Init/Default %D/etc/gdm/Init/factory-Default; then rm -f %D/etc/gdm/Init/Default; fi
+etc/gdm/Init/factory-Default
+@unexec if cmp -s %D/etc/gdm/PostSession/Default %D/etc/gdm/PostSession/factory-Default; then rm -f %D/etc/gdm/PostSession/Default; fi
+etc/gdm/PostSession/factory-Default
+@unexec if cmp -s %D/etc/gdm/PreSession/Default %D/etc/gdm/PreSession/factory-Default; then rm -f %D/etc/gdm/PreSession/Default; fi
+etc/gdm/PreSession/factory-Default
+@unexec if cmp -s %D/etc/gdm/Sessions/Gnome %D/etc/gdm/Sessions/factory-Gnome; then rm -f %D/etc/gdm/Sessions/Gnome; fi
+etc/gdm/Sessions/factory-Gnome
+@unexec if cmp -s %D/etc/gdm/Sessions/Xsession %D/etc/gdm/Sessions/factory-Xsession; then rm -f %D/etc/gdm/Sessions/Xsession; fi
+etc/gdm/Sessions/factory-Xsession
+@unexec if cmp -s %D/etc/gdm/XKeepsCrashing %D/etc/gdm/factory-XKeepsCrashing; then rm -f %D/etc/gdm/XKeepsCrashing; fi
+etc/gdm/factory-XKeepsCrashing
+@unexec if cmp -s %D/etc/gdm/gnomerc %D/etc/gdm/factory-gnomerc; then rm -f %D/etc/gdm/gnomerc; fi
+etc/gdm/factory-gnomerc
+@unexec if cmp -s %D/etc/gdm/gdm.conf %D/etc/gdm/factory-gdm.conf; then rm -f %D/etc/gdm/gdm.conf; fi
 etc/gdm/factory-gdm.conf
-etc/gdm/gdm.conf
-etc/gdm/gnomerc
-etc/gdm/locale.alias
+@unexec if cmp -s %D/etc/gdm/locale.alias %D/etc/gdm/factory-locale.alias; then rm -f %D/etc/gdm/locale.alias; fi
+etc/gdm/factory-locale.alias
 sbin/gdmaskpass
 sbin/gdm-restart
 sbin/gdm-safe-restart