[BACK]Return to patch-ae CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / x11 / gdm / patches

File: [cvs.NetBSD.org] / pkgsrc / x11 / gdm / patches / patch-ae (download)

Revision 1.13, Wed Apr 11 20:40:08 2007 UTC (12 years, 10 months ago) by drochner
Branch: MAIN
CVS Tags: pkgsrc-2019Q4-base, pkgsrc-2019Q4, pkgsrc-2019Q3-base, pkgsrc-2019Q3, pkgsrc-2019Q2-base, pkgsrc-2019Q2, pkgsrc-2019Q1-base, pkgsrc-2019Q1, pkgsrc-2018Q4-base, pkgsrc-2018Q4, pkgsrc-2018Q3-base, pkgsrc-2018Q3, pkgsrc-2018Q2-base, pkgsrc-2018Q2, pkgsrc-2018Q1-base, pkgsrc-2018Q1, pkgsrc-2017Q4-base, pkgsrc-2017Q4, pkgsrc-2017Q3-base, pkgsrc-2017Q3, pkgsrc-2017Q2-base, pkgsrc-2017Q2, pkgsrc-2017Q1-base, pkgsrc-2017Q1, pkgsrc-2016Q4-base, pkgsrc-2016Q4, pkgsrc-2016Q3-base, pkgsrc-2016Q3, pkgsrc-2016Q2-base, pkgsrc-2016Q2, pkgsrc-2016Q1-base, pkgsrc-2016Q1, pkgsrc-2015Q4-base, pkgsrc-2015Q4, pkgsrc-2015Q3-base, pkgsrc-2015Q3, pkgsrc-2015Q2-base, pkgsrc-2015Q2, pkgsrc-2015Q1-base, pkgsrc-2015Q1, pkgsrc-2014Q4-base, pkgsrc-2014Q4, pkgsrc-2014Q3-base, pkgsrc-2014Q3, pkgsrc-2014Q2-base, pkgsrc-2014Q2, pkgsrc-2014Q1-base, pkgsrc-2014Q1, pkgsrc-2013Q4-base, pkgsrc-2013Q4, pkgsrc-2013Q3-base, pkgsrc-2013Q3, pkgsrc-2013Q2-base, pkgsrc-2013Q2, pkgsrc-2013Q1-base, pkgsrc-2013Q1, pkgsrc-2012Q4-base, pkgsrc-2012Q4, pkgsrc-2012Q3-base, pkgsrc-2012Q3, pkgsrc-2012Q2-base, pkgsrc-2012Q2, pkgsrc-2012Q1-base, pkgsrc-2012Q1, pkgsrc-2011Q4-base, pkgsrc-2011Q4, pkgsrc-2011Q3-base, pkgsrc-2011Q3, pkgsrc-2011Q2-base, pkgsrc-2011Q2, pkgsrc-2011Q1-base, pkgsrc-2011Q1, pkgsrc-2010Q4-base, pkgsrc-2010Q4, pkgsrc-2010Q3-base, pkgsrc-2010Q3, pkgsrc-2010Q2-base, pkgsrc-2010Q2, pkgsrc-2010Q1-base, pkgsrc-2010Q1, pkgsrc-2009Q4-base, pkgsrc-2009Q4, pkgsrc-2009Q3-base, pkgsrc-2009Q3, pkgsrc-2009Q2-base, pkgsrc-2009Q2, pkgsrc-2009Q1-base, pkgsrc-2009Q1, pkgsrc-2008Q4-base, pkgsrc-2008Q4, pkgsrc-2008Q3-base, pkgsrc-2008Q3, pkgsrc-2008Q2-base, pkgsrc-2008Q2, pkgsrc-2008Q1-base, pkgsrc-2008Q1, pkgsrc-2007Q4-base, pkgsrc-2007Q4, pkgsrc-2007Q3-base, pkgsrc-2007Q3, pkgsrc-2007Q2-base, pkgsrc-2007Q2, cwrapper, cube-native-xorg-base, cube-native-xorg, HEAD
Changes since 1.12: +7 -7 lines

update to 2.18.1
This moves this pkg to the new stable gnome branch, too much to list here.

pkgsrc notes:
-look for X server at ${X11BASE}/bin/X too, to make it work with
 modular-xorg out of the box
-improved paths to shutdown etc. for netbsd
-Use dbus-launch to start gnome-session on netbsd, to avoid the autostart
 which fails for me. At least Debian does so too.

$NetBSD: patch-ae,v 1.13 2007/04/11 20:40:08 drochner Exp $

--- config/Makefile.in.orig	2007-03-11 22:48:34.000000000 +0100
+++ config/Makefile.in
@@ -582,10 +582,6 @@ install-data-hook: gdm.conf gdm.conf-cus
 		$(mkinstalldirs) $(DESTDIR)$(confdir); \
 		chmod 755 $(DESTDIR)$(confdir); \
 	fi
-	if test '!' -d $(DESTDIR)$(dmconfdir); then \
-		$(mkinstalldirs) $(DESTDIR)$(dmconfdir); \
-		chmod 755 $(DESTDIR)$(dmconfdir); \
-	fi
 	if test '!' -d `dirname $(DESTDIR)$(GDM_DEFAULTS_CONF)`; then \
 		$(mkinstalldirs) `dirname $(DESTDIR)$(GDM_DEFAULTS_CONF)`; \
 		chmod 755 `dirname $(DESTDIR)$(GDM_DEFAULTS_CONF)`; \
@@ -614,10 +610,7 @@ install-data-hook: gdm.conf gdm.conf-cus
 	$(INSTALL_SCRIPT) $(srcdir)/XKeepsCrashing $(DESTDIR)$(confdir)/XKeepsCrashing
 	$(INSTALL_SCRIPT) Xsession $(DESTDIR)$(confdir)/Xsession
 
-	-if test -f $(DESTDIR)$(gdmlocaledir)/locale.alias; then \
-		cp -f $(DESTDIR)$(gdmlocaledir)/locale.alias $(DESTDIR)$(gdmlocaledir)/locale.alias.orig; \
-	fi
-	$(INSTALL_DATA) $(srcdir)/locale.alias $(DESTDIR)$(gdmlocaledir)/locale.alias
+	$(INSTALL_DATA) $(srcdir)/locale.alias $(DESTDIR)$(confdir)/locale.alias
 
 	if test '!' -d $(DESTDIR)$(bisessdir); then \
 		$(mkinstalldirs) $(DESTDIR)$(bisessdir); \
@@ -695,20 +688,8 @@ install-data-hook: gdm.conf gdm.conf-cus
 		chmod 755 $(DESTDIR)$(gnomercdir); \
 	fi
 
-	if test '!' -d $(DESTDIR)$(logdir); then \
-		$(mkinstalldirs) $(DESTDIR)$(logdir); \
-		chmod 755 $(DESTDIR)$(logdir); \
-		chown root:root $(DESTDIR)$(logdir) || : ; \
-	fi
-
-	if test '!' -d $(DESTDIR)$(authdir); then \
-		$(mkinstalldirs) $(DESTDIR)$(authdir); \
-		chmod 1770 $(DESTDIR)$(authdir); \
-		chown root:gdm $(DESTDIR)$(authdir) || : ; \
-	fi
-
 	system=`uname`; \
-	if test -f /usr/include/security/pam_appl.h; then \
+	if false; then \
 	  if test '!' -d $(DESTDIR)$(PAM_PREFIX)/pam.d; then \
 		$(mkinstalldirs) $(DESTDIR)$(PAM_PREFIX)/pam.d; \
 		chmod 755 $(DESTDIR)$(PAM_PREFIX)/pam.d; \