- use POSIX form of chown `user:group' rather than `user.group'

- make use of ${CHOWN} and ${CHMOD}

fixes pkg/18177 from Julien T. Letessier.

3 files changed, 74 insertions, 9 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index be6197e6759..ebb89099fd6 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2002/10/26 19:51:07 bouyer Exp $
+# $NetBSD: Makefile,v 1.32 2002/11/21 10:41:43 grant Exp $
 
 DISTNAME=	gdm-2.2.0
 PKGREVISION=	2
@@ -27,6 +27,7 @@ CONFIGURE_ENV+=	LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \
 DEINSTALL_FILE=	${WRKDIR}/DEINSTALL
 INSTALL_FILE=	${WRKDIR}/INSTALL
 MAKE_ENV+=	GDMOWN=${GDMOWN} GDMGRP=${GDMGRP}
+MAKE_ENV+=	CHMOD=${CHMOD} CHOWN=${CHOWN}
 PLIST_SUBST+=	GDMOWN=${GDMOWN} GDMGRP=${GDMGRP} \
 		INSTALL="${INSTALL}" LOCALSTATEDIR="${LOCALSTATEDIR}"
 
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index 47609c8d925..d68146b6df3 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/10/26 19:51:07 bouyer Exp $
+$NetBSD: distinfo,v 1.5 2002/11/21 10:41:43 grant Exp $
 
 SHA1 (gdm-2.2.0.tar.gz) = 135b424cc1493f92b500c4fe7d85e9ada57313e1
 Size (gdm-2.2.0.tar.gz) = 810976 bytes
@@ -16,5 +16,5 @@ SHA1 (patch-ah) = c5f5d5456945a8a2e27c12a811e257195b67b93a
 SHA1 (patch-ai) = ae0181bc4b6f4c554b564744f410b7899dc8b7e6
 SHA1 (patch-ba) = 35e1ac11945b2e72270fcf2fb5be60e3168a48d9
 SHA1 (patch-bb) = 0a3b2d0013e6abee732e4f66677f2c916691f49f
-SHA1 (patch-bc) = fa9155621b7e76ebf124e03eef6ca22bd18651a2
+SHA1 (patch-bc) = 986bdc86e2854f53d178f4466fa525486050636f
 SHA1 (patch-bd) = 9bee6d79104058ab4bb67892c72f846bd270d2ce
diff --git a/x11/gdm/patches/patch-bc b/x11/gdm/patches/patch-bc
index d0b20bb5f17..ddfe7e5dfff 100644
--- a/x11/gdm/patches/patch-bc
+++ b/x11/gdm/patches/patch-bc
@@ -1,13 +1,77 @@
-$NetBSD: patch-bc,v 1.3 2002/10/26 19:51:08 bouyer Exp $
+$NetBSD: patch-bc,v 1.4 2002/11/21 10:41:44 grant Exp $
 
---- config/Makefile.in.orig	Tue Mar 20 03:07:31 2001
-+++ config/Makefile.in	Tue Mar 20 03:08:13 2001
-@@ -315,7 +315,7 @@
+--- config/Makefile.in.orig	Tue Mar 13 11:24:39 2001
++++ config/Makefile.in
+@@ -257,7 +257,7 @@ mostlyclean distclean maintainer-clean
+ install-data-hook: gdm.conf gnomerc Gnome Failsafe
+ 	if test '!' -d $(confdir); then \
+ 		$(mkinstalldirs) $(confdir); \
+-		chmod 755 $(confdir); \
++		${CHMOD} 755 $(confdir); \
+ 	fi
+ 	if test '!' -f $(confdir)/gdm.conf; then \
+ 		$(INSTALL_DATA) gdm.conf $(confdir)/gdm.conf; \
+@@ -269,7 +269,7 @@ install-data-hook: gdm.conf gnomerc Gnom
+ 
+ 	if test '!' -d $(sessdir); then \
+ 		$(mkinstalldirs) $(sessdir); \
+-		chmod 755 $(sessdir); \
++		${CHMOD} 755 $(sessdir); \
+ 	fi
+ 	if test '!' -f $(sessdir)/Xsession; then \
+ 		$(INSTALL_SCRIPT) $(srcdir)/Xsession $(sessdir)/Xsession; \
+@@ -283,7 +283,7 @@ install-data-hook: gdm.conf gnomerc Gnom
+ 
+ 	if test '!' -d $(initdir); then \
+ 		$(mkinstalldirs) $(initdir); \
+-		chmod 755 $(initdir); \
++		${CHMOD} 755 $(initdir); \
+ 	fi
+ 	if test '!' -f $(initdir)/Default; then \
+ 		$(INSTALL_SCRIPT) $(srcdir)/Default $(initdir)/Default; \
+@@ -291,7 +291,7 @@ install-data-hook: gdm.conf gnomerc Gnom
+ 
+ 	if test '!' -d $(predir); then \
+ 		$(mkinstalldirs) $(predir); \
+-		chmod 755 $(predir); \
++		${CHMOD} 755 $(predir); \
+ 	fi
+ 	if test '!' -f $(predir)/Default; then \
+ 		$(INSTALL_SCRIPT) $(srcdir)/PreSession $(predir)/Default; \
+@@ -299,7 +299,7 @@ install-data-hook: gdm.conf gnomerc Gnom
+ 
+ 	if test '!' -d $(postdir); then \
+ 		$(mkinstalldirs) $(postdir); \
+-		chmod 755 $(postdir); \
++		${CHMOD} 755 $(postdir); \
+ 	fi
+ 	if test '!' -f $(postdir)/Default; then \
+ 		$(INSTALL_SCRIPT) $(srcdir)/PostSession $(postdir)/Default; \
+@@ -307,7 +307,7 @@ install-data-hook: gdm.conf gnomerc Gnom
+ 
+ 	if test '!' -d $(gnomercdir); then \
+ 		$(mkinstalldirs) $(gnomercdir); \
+-		chmod 755 $(gnomercdir); \
++		${CHMOD} 755 $(gnomercdir); \
+ 	fi
+ 	if test '!' -f $(gnomercdir)/gnomerc; then \
+ 		$(INSTALL_SCRIPT) gnomerc $(gnomercdir)/gnomerc; \
+@@ -315,15 +315,15 @@ install-data-hook: gdm.conf gnomerc Gnom
  
  	if test '!' -d $(authdir); then \
  		$(mkinstalldirs) $(authdir); \
 -		chown gdm.gdm $(authdir); \
-+		chown ${GDMOWN}:${GDMGRP} $(authdir); \
- 		chmod 750 $(authdir); \
+-		chmod 750 $(authdir); \
++		${CHOWN} gdm:gdm $(authdir); \
++		${CHMOD} 750 $(authdir); \
  	fi
  
+ 	system=`uname`; \
+ 	if test -f /usr/include/security/pam_appl.h; then \
+ 	  if test '!' -d $(sysconfdir)/pam.d; then \
+ 		$(mkinstalldirs) $(sysconfdir)/pam.d; \
+-		chmod 755 $(sysconfdir)/pam.d; \
++		${CHMOD} 755 $(sysconfdir)/pam.d; \
+ 	   fi; \
+ 	   if test $$system = Linux && test '!' -f $(sysconfdir)/pam.d/gdm; then \
+ 		$(INSTALL_DATA) gdm $(sysconfdir)/pam.d/gdm; \