From f7814dacd41b6c947254c08f2b8c4585b1ce7c82 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Wed, 8 Aug 2001 07:37:51 +0000
Subject: Roll back to previous revision so that host.def is properly modified
 during installation and deinstallation to handle adding and removing a line
 to include <LessTif.def>.  This causes mxmkmf to work again as advertised in
 the LessTif documentation.

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

(limited to 'x11/lesstif')

diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile
index aa75fdf4eb7..d0671260af2 100644
--- a/x11/lesstif/Makefile
+++ b/x11/lesstif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2001/07/02 19:58:29 jlam Exp $
+# $NetBSD: Makefile,v 1.57 2001/08/08 07:37:51 jlam Exp $
 
 .include "../../x11/lesstif/Makefile.common"
 
@@ -13,6 +13,8 @@ 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 e8c57d19868..f4081e646a9 100644
--- a/x11/lesstif/pkg/DEINSTALL
+++ b/x11/lesstif/pkg/DEINSTALL
@@ -1,11 +1,14 @@
 #!/bin/sh
 #
-# $NetBSD: DEINSTALL,v 1.3 2001/07/02 19:58:30 jlam Exp $
+# $NetBSD: DEINSTALL,v 1.4 2001/08/08 07:37:51 jlam Exp $
 
 PKGNAME=$1
 STAGE=$2
 
 LOCALBASE="@LOCALBASE@"
+
+CP="@CP@"
+GREP="@GREP@"
 RM="@RM@"
 RMDIR="@RMDIR@"
 TRUE="@TRUE@"
@@ -15,6 +18,14 @@ 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 793cb280479..58b7ff3e3d8 100644
--- a/x11/lesstif/pkg/INSTALL
+++ b/x11/lesstif/pkg/INSTALL
@@ -1,11 +1,14 @@
 #!/bin/sh
 #
-# $NetBSD: INSTALL,v 1.3 2001/07/02 19:58:30 jlam Exp $
+# $NetBSD: INSTALL,v 1.4 2001/08/08 07:37:51 jlam Exp $
 
 PKGNAME=$1
 STAGE=$2
 
 LOCALBASE="@LOCALBASE@"
+
+CP="@CP@"
+GREP="@GREP@"
 LN="@LN@"
 
 case ${STAGE} in
@@ -13,6 +16,15 @@ 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