s/INSTALL_*/BSD_INSTALL_*/ in patches, remove unnecessary MAKE_ENV.

Avoid ${MKDIR}, use ${BSD_INSTALL_DATA_DIR} instead.
${PREFIX} is already in ${MAKE_ENV}.

4 files changed, 16 insertions, 20 deletions

diff --git a/lang/intercal/Makefile b/lang/intercal/Makefile
index c641fa28b6a..e15fe689d6b 100644
--- a/lang/intercal/Makefile
+++ b/lang/intercal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 09:07:13 agc Exp $
+# $NetBSD: Makefile,v 1.3 2003/01/19 07:05:16 salo Exp $
 #
 
 DISTNAME=	intercal-0.20
@@ -9,8 +9,4 @@ MAINTAINER=	dillo@giga.or.at
 HOMEPAGE=	http://www.tuxedo.org/~esr/intercal/
 COMMENT=	the ultimate language for obfuscation and job security
 
-MAKE_ENV+=	PREFIX="${PREFIX}" MKDIR="${MKDIR}"
-MAKE_ENV+=	INSTALL_DATA="${INSTALL_DATA}"
-MAKE_ENV+=	INSTALL_PROGRAM="${INSTALL_PROGRAM}"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/intercal/distinfo b/lang/intercal/distinfo
index adaad820b26..9dcf1f4c1c5 100644
--- a/lang/intercal/distinfo
+++ b/lang/intercal/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 15:00:52 agc Exp $
+$NetBSD: distinfo,v 1.3 2003/01/19 07:05:16 salo Exp $
 
 SHA1 (intercal-0.20.tar.gz) = ee31b5c2694d91e4dd704bed385595069aac6c7e
 Size (intercal-0.20.tar.gz) = 169172 bytes
-SHA1 (patch-aa) = c75ca69bb330c00e305fca48e6c0248f8b5fb20e
-SHA1 (patch-ab) = 2750a3fac0231e1e8df2e21422b79d5deeafbc02
+SHA1 (patch-aa) = eb5b6c45f0e86c2b38f53d6a16d315bc931a431a
+SHA1 (patch-ab) = 63784f37c3635f92a1552dfec05d3b714b398a78
diff --git a/lang/intercal/patches/patch-aa b/lang/intercal/patches/patch-aa
index c0b5fccec58..a97e434df90 100644
--- a/lang/intercal/patches/patch-aa
+++ b/lang/intercal/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/11/22 16:53:16 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2003/01/19 07:05:16 salo Exp $
 
 --- Makefile.orig	Wed Sep 15 21:28:34 1999
 +++ Makefile	Wed Nov 22 16:54:08 2000
@@ -9,8 +9,8 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/11/22 16:53:16 wiz Exp $
 +all:
 +	cd src && ${MAKE}
 +install:
-+	${MKDIR} ${PREFIX}/share/doc/intercal
-+	${INSTALL_DATA} NEWS READ.ME ${PREFIX}/share/doc/intercal
++	${BSD_INSTALL_DATA_DIR} ${PREFIX}/share/doc/intercal
++	${BSD_INSTALL_DATA} NEWS READ.ME ${PREFIX}/share/doc/intercal
 +	cd src && ${MAKE} install
 +
  dist: intercal-$(VERSION).tar.gz
diff --git a/lang/intercal/patches/patch-ab b/lang/intercal/patches/patch-ab
index 7f1ef9fd4f1..dcfac8e1e81 100644
--- a/lang/intercal/patches/patch-ab
+++ b/lang/intercal/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/11/22 16:53:16 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2003/01/19 07:05:16 salo Exp $
 
 --- src/Makefile.orig	Fri Dec 18 05:49:09 1998
 +++ src/Makefile	Wed Nov 22 17:37:20 2000
@@ -48,16 +48,16 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/11/22 16:53:16 wiz Exp $
 -	(cd ../pit; cp *.i *.3i  t_tet *.fft glider gun blinkers $(LIBDIR))
 -	-mkdir $(LIBDIR)/lib
 -	(cd ../pit/lib; cp *.*i $(LIBDIR)/lib) 
-+	${INSTALL_PROGRAM} ick ${BINDIR}
-+	${MKDIR} ${INCDIR}
-+	${INSTALL_DATA} lose.h abcess.h fiddle.h ick-wrap.c ${INCDIR}
-+	${MKDIR} ${LIBDIR}
-+	${INSTALL_DATA} libick.a ${LIBDIR}
++	${BSD_INSTALL_PROGRAM} ick ${BINDIR}
++	${BSD_INSTALL_DATA_DIR} ${INCDIR}
++	${BSD_INSTALL_DATA} lose.h abcess.h fiddle.h ick-wrap.c ${INCDIR}
++	${BSD_INSTALL_DATA_DIR} ${LIBDIR}
++	${BSD_INSTALL_DATA} libick.a ${LIBDIR}
 +	cd ../pit/lib && \
-+	  ${INSTALL_DATA} *.*i ${LIBDIR}
-+	${MKDIR} ${EGDIR}
++	  ${BSD_INSTALL_DATA} *.*i ${LIBDIR}
++	${BSD_INSTALL_DATA_DIR} ${EGDIR}
 +	cd ../pit && \
-+	  ${INSTALL_DATA} *.i *.3i t_tet *.fft glider gun blinkers ${EGDIR}
++	  ${BSD_INSTALL_DATA} *.i *.3i t_tet *.fft glider gun blinkers ${EGDIR}
  
  clean:
  	rm -f yacc.* y.tab.* y.output *~ *.[oa] lexer.c ick.c lextest ick