summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2001-07-02 19:58:29 +0000
committerjlam <jlam@pkgsrc.org>2001-07-02 19:58:29 +0000
commitc6c5683360fcc0dfa232212f4b99b4bb5bc6a50a (patch)
tree006b64454395d3d7411cf143f3b9ff1e0d982031 /x11
parent4c1d435c131aa86c52d0dd479e4961f162e3ac65 (diff)
downloadpkgsrc-c6c5683360fcc0dfa232212f4b99b4bb5bc6a50a.tar.gz
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.
Diffstat (limited to 'x11')
-rw-r--r--x11/lesstif/Makefile4
-rw-r--r--x11/lesstif/pkg/DEINSTALL13
-rw-r--r--x11/lesstif/pkg/INSTALL14
3 files changed, 3 insertions, 28 deletions
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 \