Convert to use bsd.pkg.install.mk (using FILES_SUBST stuff). This simplifies

Makefiles and {DE}INSTALL scripts, and solves the problem reported in
PR pkg/18174 by Julien T. Letessier.  Reviewed by grant.

3 files changed, 16 insertions, 31 deletions

diff --git a/x11/gdm/DEINSTALL b/x11/gdm/DEINSTALL
index 6a56cbfc9b4..c565b92880d 100644
--- a/x11/gdm/DEINSTALL
+++ b/x11/gdm/DEINSTALL
@@ -1,19 +1,15 @@
-#!/bin/sh
-#
-# $NetBSD: DEINSTALL,v 1.1 2001/10/31 22:10:43 zuntum Exp $
+# $NetBSD: DEINSTALL,v 1.2 2003/01/10 17:26:55 jmmv Exp $
 
 if [ "$2" != POST-DEINSTALL ]
 then
-	cd @@GDMCFGDIR@@
-	@@RM@@ -f Sessions/Default
-	for SOURCE in @@GDMCFGFILES@@
+	cd @GDMCFGDIR@
+	@RM@ -f Sessions/Default
+	for SOURCE in @GDMCFGFILES@
 	do
 		TARGET=${SOURCE%.default*}${SOURCE##*.default}
 		if cmp -s $SOURCE $TARGET
 		then
-			@@RM@@ -f $TARGET
+			@RM@ -f $TARGET
 		fi
 	done
 fi
-
-exit 0
diff --git a/x11/gdm/INSTALL b/x11/gdm/INSTALL
index d12a11cf15f..bd577f28d20 100644
--- a/x11/gdm/INSTALL
+++ b/x11/gdm/INSTALL
@@ -1,20 +1,16 @@
-#!/bin/sh
-#
-# $NetBSD: INSTALL,v 1.1 2001/10/31 22:10:43 zuntum Exp $
+# $NetBSD: INSTALL,v 1.2 2003/01/10 17:26:55 jmmv Exp $
 
 if [ "$2" = POST-INSTALL ]
 then
-	cd @@GDMCFGDIR@@
-	for SOURCE in @@GDMCFGFILES@@
+	cd @GDMCFGDIR@
+	for SOURCE in @GDMCFGFILES@
 	do
 		TARGET=${SOURCE%.default*}${SOURCE##*.default}
 		if [ ! -f $TARGET ]
 		then
-			@@MKDIR@@ `dirname $TARGET`
-			@@CP@@ -p $SOURCE $TARGET
+			@MKDIR@ `dirname $TARGET`
+			@CP@ -p $SOURCE $TARGET
 		fi
 	done
-	@@LN@@ -fs Gnome Sessions/Default
+	@LN@ -fs Gnome Sessions/Default
 fi
-
-exit 0
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 22ef97e1666..61620f2fc79 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2003/01/10 07:57:49 cjep Exp $
+# $NetBSD: Makefile,v 1.35 2003/01/10 17:26:55 jmmv Exp $
 
 DISTNAME=	gdm-2.2.0
 PKGREVISION=	2
@@ -25,8 +25,6 @@ CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR}
 CONFIGURE_ENV+=	LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \
 		GDMOWN=${GDMOWN} GDMGRP=${GDMGRP}
 
-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} \
@@ -43,6 +41,9 @@ GDMCFGFILES=	Default:Init.default/Default \
 		locale.alias:locale.alias.default \
 		gnomerc:../gnomerc.default
 
+FILES_SUBST+=	GDMCFGDIR=${GDMCFGDIR:Q}
+FILES_SUBST+=	GDMCFGFILES=${GDMCFGFILES:C/.*://g:Q}
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
@@ -66,15 +67,6 @@ post-patch:
 .endif
 
 post-build:
-	for f in DEINSTALL INSTALL; do					\
-		${SED} -e 's#@@CP@@#${CP}#'				\
-		  -e 's#@@LN@@#${LN}#'					\
-		  -e 's#@@MKDIR@@#${MKDIR}#'				\
-		  -e 's#@@RM@@#${RM}#'					\
-		  -e 's#@@GDMCFGDIR@@#${GDMCFGDIR}#g'			\
-		  -e 's#@@GDMCFGFILES@@#${GDMCFGFILES:C/.*://g}#g'	\
-		  ${PKGDIR}/$$f >${WRKDIR}/$$f;				\
-	done
 	cd ${WRKSRC}/config;						\
 	for f in Default PostSession PreSession; do			\
 		${SED} -e 's#/usr/bin/X11#${X11BASE}/bin#g' $$f >$$f.new; \
@@ -123,4 +115,5 @@ post-install:
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/libglade/buildlink2.mk"
 .include "../../x11/gnome-libs/buildlink2.mk"
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"