From c6c5683360fcc0dfa232212f4b99b4bb5bc6a50a Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Mon, 2 Jul 2001 19:58:29 +0000
Subject: Don't add a line to include <Lesstif.def> in host.def.  It doesn't
 work correctly, and it resets the ImakeCmd, which breaks other pkgsrc builds.

---
 x11/lesstif/Makefile      |  4 +---
 x11/lesstif/pkg/DEINSTALL | 13 +------------
 x11/lesstif/pkg/INSTALL   | 14 +-------------
 3 files changed, 3 insertions(+), 28 deletions(-)

(limited to 'x11')

diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile
index 9f83346c595..aa75fdf4eb7 100644
--- a/x11/lesstif/Makefile
+++ b/x11/lesstif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2001/06/30 19:08:21 jlam Exp $
+# $NetBSD: Makefile,v 1.56 2001/07/02 19:58:29 jlam Exp $
 
 .include "../../x11/lesstif/Makefile.common"
 
@@ -13,8 +13,6 @@ DEINSTALL_FILE=		${WRKDIR}/DEINSTALL
 INSTALL_FILE=		${WRKDIR}/INSTALL
 
 FILES_SUBST=		LOCALBASE=${LOCALBASE}
-FILES_SUBST+=		CP=${CP:Q}
-FILES_SUBST+=		GREP=${GREP:Q}
 FILES_SUBST+=		LN=${LN:Q}
 FILES_SUBST+=		RM=${RM:Q}
 FILES_SUBST+=		RMDIR=${RMDIR:Q}
diff --git a/x11/lesstif/pkg/DEINSTALL b/x11/lesstif/pkg/DEINSTALL
index e267f532553..e8c57d19868 100644
--- a/x11/lesstif/pkg/DEINSTALL
+++ b/x11/lesstif/pkg/DEINSTALL
@@ -1,14 +1,11 @@
 #!/bin/sh
 #
-# $NetBSD: DEINSTALL,v 1.2 2000/12/22 17:26:22 jlam Exp $
+# $NetBSD: DEINSTALL,v 1.3 2001/07/02 19:58:30 jlam Exp $
 
 PKGNAME=$1
 STAGE=$2
 
 LOCALBASE="@LOCALBASE@"
-
-CP="@CP@"
-GREP="@GREP@"
 RM="@RM@"
 RMDIR="@RMDIR@"
 TRUE="@TRUE@"
@@ -18,14 +15,6 @@ DEINSTALL)
 	;;
 
 POST-DEINSTALL)
-	X11_HOSTDEF=${PKG_PREFIX}/lib/X11/config/host.def
-
-	echo -n "Updating ${X11_HOSTDEF}..."
-	${CP} -f ${X11_HOSTDEF} ${X11_HOSTDEF}.bak
-	( ${GREP} -v LessTif ${X11_HOSTDEF}.bak || ${TRUE} ) \
-		> ${X11_HOSTDEF}
-	echo "done."
-
 	if [ ${PKG_PREFIX} != ${LOCALBASE} ]
 	then
 		${RM} -f ${LOCALBASE}/share/aclocal/ac_find_motif.m4
diff --git a/x11/lesstif/pkg/INSTALL b/x11/lesstif/pkg/INSTALL
index 81b32b15815..793cb280479 100644
--- a/x11/lesstif/pkg/INSTALL
+++ b/x11/lesstif/pkg/INSTALL
@@ -1,14 +1,11 @@
 #!/bin/sh
 #
-# $NetBSD: INSTALL,v 1.2 2000/12/22 17:26:22 jlam Exp $
+# $NetBSD: INSTALL,v 1.3 2001/07/02 19:58:30 jlam Exp $
 
 PKGNAME=$1
 STAGE=$2
 
 LOCALBASE="@LOCALBASE@"
-
-CP="@CP@"
-GREP="@GREP@"
 LN="@LN@"
 
 case ${STAGE} in
@@ -16,15 +13,6 @@ PRE-INSTALL)
 	;;
 
 POST-INSTALL)
-	X11_HOSTDEF=${PKG_PREFIX}/lib/X11/config/host.def
-
-	echo -n "Updating ${X11_HOSTDEF}..."
-	${CP} -f ${X11_HOSTDEF} ${X11_HOSTDEF}.bak
-	( ${GREP} -v LessTif ${X11_HOSTDEF}.bak; \
-	  echo '#include <LessTif.def>' ) \
-		> ${X11_HOSTDEF}
-	echo "done."
-
 	if [ ${PKG_PREFIX} != ${LOCALBASE} ]
 	then
 		${LN} -fs ${PKG_PREFIX}/share/aclocal/ac_find_motif.m4 \
-- 
cgit v1.2.3