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

63 files changed, 168 insertions, 231 deletions

diff --git a/textproc/aspell-breton/Makefile b/textproc/aspell-breton/Makefile
index 30e27f1d6fc..3630e62774d 100644
--- a/textproc/aspell-breton/Makefile
+++ b/textproc/aspell-breton/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/01/17 06:45:16 salo Exp $
+# $NetBSD: Makefile,v 1.2 2003/01/19 06:35:44 salo Exp $
 #
 
 DISTNAME=	aspell-br-0.50-2
@@ -17,8 +17,5 @@ HAS_CONFIGURE=	YES
 CONFIGURE_ENV+=	ASPELL=${PREFIX}/bin/aspell
 CONFIGURE_ENV+=	WORD_LIST_COMPRESS=${PREFIX}/bin/word-list-compress
 
-MAKE_ENV+=	INSTALL_DATA="${INSTALL_DATA}"
-MAKE_ENV+=	INSTALL_DATA_DIR="${INSTALL_DATA_DIR}"
-
 .include "../../textproc/aspell/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aspell-breton/distinfo b/textproc/aspell-breton/distinfo
index 0be303e550b..8a810698d94 100644
--- a/textproc/aspell-breton/distinfo
+++ b/textproc/aspell-breton/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/01/17 06:45:16 salo Exp $
+$NetBSD: distinfo,v 1.2 2003/01/19 06:35:44 salo Exp $
 
 SHA1 (aspell-br-0.50-2.tar.bz2) = e6cbb638d7704e88c6d59b794829267b41a7e536
 Size (aspell-br-0.50-2.tar.bz2) = 68055 bytes
-SHA1 (patch-aa) = df35f94688de5a020875e2c3d1a6557e92923799
+SHA1 (patch-aa) = e22211d1b77a79d16e2334630dc171245bb15677
diff --git a/textproc/aspell-breton/patches/patch-aa b/textproc/aspell-breton/patches/patch-aa
index cd14508bcfc..d0c4640eb2b 100644
--- a/textproc/aspell-breton/patches/patch-aa
+++ b/textproc/aspell-breton/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/01/17 06:45:16 salo Exp $
+$NetBSD: patch-aa,v 1.2 2003/01/19 06:35:44 salo Exp $
 
 --- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
 +++ Makefile.pre	Wed Jan 15 00:48:39 2003
@@ -12,10 +12,10 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/01/17 06:45:16 salo Exp $
 -	mkdir -p ${DESTDIR}${datadir}/
 -	cp ${data_files} ${DESTDIR}${datadir}/
 -	cd ${DESTDIR}${datadir}/ && chmod 644 ${data_files}
-+	${INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
-+	${INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
-+	${INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
-+	${INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
  
  clean:
  	rm -f ${rws_files}
diff --git a/textproc/aspell-catalan/Makefile b/textproc/aspell-catalan/Makefile
index 748ea4d43b2..b277c624dcb 100644
--- a/textproc/aspell-catalan/Makefile
+++ b/textproc/aspell-catalan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/01/17 03:49:09 salo Exp $
+# $NetBSD: Makefile,v 1.2 2003/01/19 06:35:44 salo Exp $
 #
 
 DISTNAME=	aspell-ca-0.50-2
@@ -17,8 +17,5 @@ HAS_CONFIGURE=	YES
 CONFIGURE_ENV+=	ASPELL=${PREFIX}/bin/aspell
 CONFIGURE_ENV+=	WORD_LIST_COMPRESS=${PREFIX}/bin/word-list-compress
 
-MAKE_ENV+=	INSTALL_DATA="${INSTALL_DATA}"
-MAKE_ENV+=	INSTALL_DATA_DIR="${INSTALL_DATA_DIR}"
-
 .include "../../textproc/aspell/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aspell-catalan/distinfo b/textproc/aspell-catalan/distinfo
index 76233eb5804..417420cd232 100644
--- a/textproc/aspell-catalan/distinfo
+++ b/textproc/aspell-catalan/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/01/17 03:49:10 salo Exp $
+$NetBSD: distinfo,v 1.2 2003/01/19 06:35:44 salo Exp $
 
 SHA1 (aspell-ca-0.50-2.tar.bz2) = 2c7499f5b4a8a751b6454bf58f3cedc37907dc37
 Size (aspell-ca-0.50-2.tar.bz2) = 137626 bytes
-SHA1 (patch-aa) = df35f94688de5a020875e2c3d1a6557e92923799
+SHA1 (patch-aa) = e22211d1b77a79d16e2334630dc171245bb15677
diff --git a/textproc/aspell-catalan/patches/patch-aa b/textproc/aspell-catalan/patches/patch-aa
index 7aa1e1f6f8a..d0c4640eb2b 100644
--- a/textproc/aspell-catalan/patches/patch-aa
+++ b/textproc/aspell-catalan/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/01/17 03:49:10 salo Exp $
+$NetBSD: patch-aa,v 1.2 2003/01/19 06:35:44 salo Exp $
 
 --- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
 +++ Makefile.pre	Wed Jan 15 00:48:39 2003
@@ -12,10 +12,10 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/01/17 03:49:10 salo Exp $
 -	mkdir -p ${DESTDIR}${datadir}/
 -	cp ${data_files} ${DESTDIR}${datadir}/
 -	cd ${DESTDIR}${datadir}/ && chmod 644 ${data_files}
-+	${INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
-+	${INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
-+	${INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
-+	${INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
  
  clean:
  	rm -f ${rws_files}
diff --git a/textproc/aspell-czech/Makefile b/textproc/aspell-czech/Makefile
index 5f843ad56f6..e28a1716d37 100644
--- a/textproc/aspell-czech/Makefile
+++ b/textproc/aspell-czech/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/01/17 03:49:43 salo Exp $
+# $NetBSD: Makefile,v 1.2 2003/01/19 06:35:45 salo Exp $
 #
 
 DISTNAME=	aspell-cs-0.50-2
@@ -17,8 +17,5 @@ HAS_CONFIGURE=	YES
 CONFIGURE_ENV+=	ASPELL=${PREFIX}/bin/aspell
 CONFIGURE_ENV+=	WORD_LIST_COMPRESS=${PREFIX}/bin/word-list-compress
 
-MAKE_ENV+=	INSTALL_DATA="${INSTALL_DATA}"
-MAKE_ENV+=	INSTALL_DATA_DIR="${INSTALL_DATA_DIR}"
-
 .include "../../textproc/aspell/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aspell-czech/distinfo b/textproc/aspell-czech/distinfo
index 531f63bf263..275e0d414fe 100644
--- a/textproc/aspell-czech/distinfo
+++ b/textproc/aspell-czech/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/01/17 03:49:44 salo Exp $
+$NetBSD: distinfo,v 1.2 2003/01/19 06:35:45 salo Exp $
 
 SHA1 (aspell-cs-0.50-2.tar.bz2) = f4e68c04a1981effac3e941f43cf525876566267
 Size (aspell-cs-0.50-2.tar.bz2) = 457939 bytes
-SHA1 (patch-aa) = df35f94688de5a020875e2c3d1a6557e92923799
+SHA1 (patch-aa) = e22211d1b77a79d16e2334630dc171245bb15677
diff --git a/textproc/aspell-czech/patches/patch-aa b/textproc/aspell-czech/patches/patch-aa
index 8ae49e6928e..d6f1141c65e 100644
--- a/textproc/aspell-czech/patches/patch-aa
+++ b/textproc/aspell-czech/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/01/17 03:49:44 salo Exp $
+$NetBSD: patch-aa,v 1.2 2003/01/19 06:35:45 salo Exp $
 
 --- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
 +++ Makefile.pre	Wed Jan 15 00:48:39 2003
@@ -12,10 +12,10 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/01/17 03:49:44 salo Exp $
 -	mkdir -p ${DESTDIR}${datadir}/
 -	cp ${data_files} ${DESTDIR}${datadir}/
 -	cd ${DESTDIR}${datadir}/ && chmod 644 ${data_files}
-+	${INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
-+	${INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
-+	${INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
-+	${INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
  
  clean:
  	rm -f ${rws_files}
diff --git a/textproc/aspell-danish/Makefile b/textproc/aspell-danish/Makefile
index 60c96ecc1e1..10899cff92b 100644
--- a/textproc/aspell-danish/Makefile
+++ b/textproc/aspell-danish/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/01/17 03:50:27 salo Exp $
+# $NetBSD: Makefile,v 1.2 2003/01/19 06:35:45 salo Exp $
 #
 
 DISTNAME=	aspell-da-0.50-2
@@ -17,8 +17,5 @@ HAS_CONFIGURE=	YES
 CONFIGURE_ENV+=	ASPELL=${PREFIX}/bin/aspell
 CONFIGURE_ENV+=	WORD_LIST_COMPRESS=${PREFIX}/bin/word-list-compress
 
-MAKE_ENV+=	INSTALL_DATA="${INSTALL_DATA}"
-MAKE_ENV+=	INSTALL_DATA_DIR="${INSTALL_DATA_DIR}"
-
 .include "../../textproc/aspell/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aspell-danish/distinfo b/textproc/aspell-danish/distinfo
index 5663e81ad64..170f648c66e 100644
--- a/textproc/aspell-danish/distinfo
+++ b/textproc/aspell-danish/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/01/17 03:50:27 salo Exp $
+$NetBSD: distinfo,v 1.2 2003/01/19 06:35:45 salo Exp $
 
 SHA1 (aspell-da-0.50-2.tar.bz2) = 113cace81cf6d739306d79072dc7c8c450608898
 Size (aspell-da-0.50-2.tar.bz2) = 284049 bytes
-SHA1 (patch-aa) = df35f94688de5a020875e2c3d1a6557e92923799
+SHA1 (patch-aa) = e22211d1b77a79d16e2334630dc171245bb15677
diff --git a/textproc/aspell-danish/patches/patch-aa b/textproc/aspell-danish/patches/patch-aa
index 3b5e59c45d2..fd845386200 100644
--- a/textproc/aspell-danish/patches/patch-aa
+++ b/textproc/aspell-danish/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/01/17 03:50:27 salo Exp $
+$NetBSD: patch-aa,v 1.2 2003/01/19 06:35:46 salo Exp $
 
 --- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
 +++ Makefile.pre	Wed Jan 15 00:48:39 2003
@@ -12,10 +12,10 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/01/17 03:50:27 salo Exp $
 -	mkdir -p ${DESTDIR}${datadir}/
 -	cp ${data_files} ${DESTDIR}${datadir}/
 -	cd ${DESTDIR}${datadir}/ && chmod 644 ${data_files}
-+	${INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
-+	${INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
-+	${INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
-+	${INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
  
  clean:
  	rm -f ${rws_files}
diff --git a/textproc/aspell-dutch/Makefile b/textproc/aspell-dutch/Makefile
index 94bb5e57ab4..6378f9db672 100644
--- a/textproc/aspell-dutch/Makefile
+++ b/textproc/aspell-dutch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/01/17 03:50:54 salo Exp $
+# $NetBSD: Makefile,v 1.2 2003/01/19 06:35:46 salo Exp $
 #
 
 DISTNAME=	aspell-nl-0.50-2
@@ -17,8 +17,5 @@ HAS_CONFIGURE=	YES
 CONFIGURE_ENV+=	ASPELL=${PREFIX}/bin/aspell
 CONFIGURE_ENV+=	WORD_LIST_COMPRESS=${PREFIX}/bin/word-list-compress
 
-MAKE_ENV+=	INSTALL_DATA="${INSTALL_DATA}"
-MAKE_ENV+=	INSTALL_DATA_DIR="${INSTALL_DATA_DIR}"
-
 .include "../../textproc/aspell/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aspell-dutch/distinfo b/textproc/aspell-dutch/distinfo
index 51c435ff99a..0ad01ece3f1 100644
--- a/textproc/aspell-dutch/distinfo
+++ b/textproc/aspell-dutch/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/01/17 03:50:54 salo Exp $
+$NetBSD: distinfo,v 1.2 2003/01/19 06:35:46 salo Exp $
 
 SHA1 (aspell-nl-0.50-2.tar.bz2) = 651ac98c63ce342b19dd9c1a74a961500234bc0a
 Size (aspell-nl-0.50-2.tar.bz2) = 428365 bytes
-SHA1 (patch-aa) = df35f94688de5a020875e2c3d1a6557e92923799
+SHA1 (patch-aa) = e22211d1b77a79d16e2334630dc171245bb15677
diff --git a/textproc/aspell-dutch/patches/patch-aa b/textproc/aspell-dutch/patches/patch-aa
index fe250abb2f0..fd845386200 100644
--- a/textproc/aspell-dutch/patches/patch-aa
+++ b/textproc/aspell-dutch/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/01/17 03:50:54 salo Exp $
+$NetBSD: patch-aa,v 1.2 2003/01/19 06:35:46 salo Exp $
 
 --- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
 +++ Makefile.pre	Wed Jan 15 00:48:39 2003
@@ -12,10 +12,10 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/01/17 03:50:54 salo Exp $
 -	mkdir -p ${DESTDIR}${datadir}/
 -	cp ${data_files} ${DESTDIR}${datadir}/
 -	cd ${DESTDIR}${datadir}/ && chmod 644 ${data_files}
-+	${INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
-+	${INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
-+	${INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
-+	${INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
  
  clean:
  	rm -f ${rws_files}
diff --git a/textproc/aspell-english/Makefile b/textproc/aspell-english/Makefile
index b1f53c55d94..ab732af8fa3 100644
--- a/textproc/aspell-english/Makefile
+++ b/textproc/aspell-english/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/01/15 00:31:54 salo Exp $
+# $NetBSD: Makefile,v 1.2 2003/01/19 06:35:46 salo Exp $
 #
 
 DISTNAME=	aspell-en-0.51-0
@@ -17,8 +17,5 @@ HAS_CONFIGURE=	YES
 CONFIGURE_ENV+=	ASPELL=${PREFIX}/bin/aspell
 CONFIGURE_ENV+=	WORD_LIST_COMPRESS=${PREFIX}/bin/word-list-compress
 
-MAKE_ENV+=	INSTALL_DATA="${INSTALL_DATA}"
-MAKE_ENV+=	INSTALL_DATA_DIR="${INSTALL_DATA_DIR}"
-
 .include "../../textproc/aspell/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aspell-english/distinfo b/textproc/aspell-english/distinfo
index ee05876b4c4..e866cf4a956 100644
--- a/textproc/aspell-english/distinfo
+++ b/textproc/aspell-english/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/01/15 00:31:54 salo Exp $
+$NetBSD: distinfo,v 1.2 2003/01/19 06:35:46 salo Exp $
 
 SHA1 (aspell-en-0.51-0.tar.bz2) = a1420be50b8d6e4d619e40a58c34fa94ce60d83e
 Size (aspell-en-0.51-0.tar.bz2) = 172819 bytes
-SHA1 (patch-aa) = df35f94688de5a020875e2c3d1a6557e92923799
+SHA1 (patch-aa) = e22211d1b77a79d16e2334630dc171245bb15677
diff --git a/textproc/aspell-english/patches/patch-aa b/textproc/aspell-english/patches/patch-aa
index 66b53ff288f..2ae29ed5c32 100644
--- a/textproc/aspell-english/patches/patch-aa
+++ b/textproc/aspell-english/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/01/15 00:31:54 salo Exp $
+$NetBSD: patch-aa,v 1.2 2003/01/19 06:35:47 salo Exp $
 
 --- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
 +++ Makefile.pre	Wed Jan 15 00:48:39 2003
@@ -12,10 +12,10 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/01/15 00:31:54 salo Exp $
 -	mkdir -p ${DESTDIR}${datadir}/
 -	cp ${data_files} ${DESTDIR}${datadir}/
 -	cd ${DESTDIR}${datadir}/ && chmod 644 ${data_files}
-+	${INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
-+	${INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
-+	${INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
-+	${INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
  
  clean:
  	rm -f ${rws_files}
diff --git a/textproc/aspell-esperanto/Makefile b/textproc/aspell-esperanto/Makefile
index d9147ba3b0b..4aeb0e20040 100644
--- a/textproc/aspell-esperanto/Makefile
+++ b/textproc/aspell-esperanto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/01/17 06:45:53 salo Exp $
+# $NetBSD: Makefile,v 1.2 2003/01/19 06:35:47 salo Exp $
 #
 
 DISTNAME=	aspell-eo-0.50-2
@@ -17,8 +17,5 @@ HAS_CONFIGURE=	YES
 CONFIGURE_ENV+=	ASPELL=${PREFIX}/bin/aspell
 CONFIGURE_ENV+=	WORD_LIST_COMPRESS=${PREFIX}/bin/word-list-compress
 
-MAKE_ENV+=	INSTALL_DATA="${INSTALL_DATA}"
-MAKE_ENV+=	INSTALL_DATA_DIR="${INSTALL_DATA_DIR}"
-
 .include "../../textproc/aspell/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aspell-esperanto/distinfo b/textproc/aspell-esperanto/distinfo
index eed3368b176..13fc2006e7c 100644
--- a/textproc/aspell-esperanto/distinfo
+++ b/textproc/aspell-esperanto/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/01/17 06:45:53 salo Exp $
+$NetBSD: distinfo,v 1.2 2003/01/19 06:35:47 salo Exp $
 
 SHA1 (aspell-eo-0.50-2.tar.bz2) = 51d73239d0c2253b962e7caa1563ee7abcbc443d
 Size (aspell-eo-0.50-2.tar.bz2) = 89703 bytes
-SHA1 (patch-aa) = df35f94688de5a020875e2c3d1a6557e92923799
+SHA1 (patch-aa) = e22211d1b77a79d16e2334630dc171245bb15677
diff --git a/textproc/aspell-esperanto/patches/patch-aa b/textproc/aspell-esperanto/patches/patch-aa
index 6f158157c31..2ae29ed5c32 100644
--- a/textproc/aspell-esperanto/patches/patch-aa
+++ b/textproc/aspell-esperanto/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/01/17 06:45:53 salo Exp $
+$NetBSD: patch-aa,v 1.2 2003/01/19 06:35:47 salo Exp $
 
 --- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
 +++ Makefile.pre	Wed Jan 15 00:48:39 2003
@@ -12,10 +12,10 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/01/17 06:45:53 salo Exp $
 -	mkdir -p ${DESTDIR}${datadir}/
 -	cp ${data_files} ${DESTDIR}${datadir}/
 -	cd ${DESTDIR}${datadir}/ && chmod 644 ${data_files}
-+	${INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
-+	${INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
-+	${INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
-+	${INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
  
  clean:
  	rm -f ${rws_files}
diff --git a/textproc/aspell-faroese/Makefile b/textproc/aspell-faroese/Makefile
index 6aa8aaba509..de0f63901cb 100644
--- a/textproc/aspell-faroese/Makefile
+++ b/textproc/aspell-faroese/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/01/17 06:46:34 salo Exp $
+# $NetBSD: Makefile,v 1.2 2003/01/19 06:35:47 salo Exp $
 #
 
 DISTNAME=	aspell-fo-0.50-2
@@ -17,8 +17,5 @@ HAS_CONFIGURE=	YES
 CONFIGURE_ENV+=	ASPELL=${PREFIX}/bin/aspell
 CONFIGURE_ENV+=	WORD_LIST_COMPRESS=${PREFIX}/bin/word-list-compress
 
-MAKE_ENV+=	INSTALL_DATA="${INSTALL_DATA}"
-MAKE_ENV+=	INSTALL_DATA_DIR="${INSTALL_DATA_DIR}"
-
 .include "../../textproc/aspell/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aspell-faroese/distinfo b/textproc/aspell-faroese/distinfo
index 653e6373e8e..5ed1fc3fa38 100644
--- a/textproc/aspell-faroese/distinfo
+++ b/textproc/aspell-faroese/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/01/17 06:46:34 salo Exp $
+$NetBSD: distinfo,v 1.2 2003/01/19 06:35:47 salo Exp $
 
 SHA1 (aspell-fo-0.50-2.tar.bz2) = 3e46bcda037f40783da0f1ae85c00fe7c1b9b070
 Size (aspell-fo-0.50-2.tar.bz2) = 73174 bytes
-SHA1 (patch-aa) = df35f94688de5a020875e2c3d1a6557e92923799
+SHA1 (patch-aa) = e22211d1b77a79d16e2334630dc171245bb15677
diff --git a/textproc/aspell-faroese/patches/patch-aa b/textproc/aspell-faroese/patches/patch-aa
index 13bf29b7504..f2f944f7bb3 100644
--- a/textproc/aspell-faroese/patches/patch-aa
+++ b/textproc/aspell-faroese/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/01/17 06:46:34 salo Exp $
+$NetBSD: patch-aa,v 1.2 2003/01/19 06:35:48 salo Exp $
 
 --- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
 +++ Makefile.pre	Wed Jan 15 00:48:39 2003
@@ -12,10 +12,10 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/01/17 06:46:34 salo Exp $
 -	mkdir -p ${DESTDIR}${datadir}/
 -	cp ${data_files} ${DESTDIR}${datadir}/
 -	cd ${DESTDIR}${datadir}/ && chmod 644 ${data_files}
-+	${INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
-+	${INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
-+	${INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
-+	${INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
  
  clean:
  	rm -f ${rws_files}
diff --git a/textproc/aspell-francais/Makefile b/textproc/aspell-francais/Makefile
index 5f97562644a..9d6bdffa037 100644
--- a/textproc/aspell-francais/Makefile
+++ b/textproc/aspell-francais/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/01/17 03:51:34 salo Exp $
+# $NetBSD: Makefile,v 1.2 2003/01/19 06:35:48 salo Exp $
 #
 
 DISTNAME=	aspell-fr-0.50-3
@@ -17,8 +17,5 @@ HAS_CONFIGURE=	YES
 CONFIGURE_ENV+=	ASPELL=${PREFIX}/bin/aspell
 CONFIGURE_ENV+=	WORD_LIST_COMPRESS=${PREFIX}/bin/word-list-compress
 
-MAKE_ENV+=	INSTALL_DATA="${INSTALL_DATA}"
-MAKE_ENV+=	INSTALL_DATA_DIR="${INSTALL_DATA_DIR}"
-
 .include "../../textproc/aspell/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aspell-francais/distinfo b/textproc/aspell-francais/distinfo
index 4066ce2d420..809416fcca3 100644
--- a/textproc/aspell-francais/distinfo
+++ b/textproc/aspell-francais/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/01/17 03:51:36 salo Exp $
+$NetBSD: distinfo,v 1.2 2003/01/19 06:35:48 salo Exp $
 
 SHA1 (aspell-fr-0.50-3.tar.bz2) = 4712f81069eb20763aaf855f73b2819f4805f132
 Size (aspell-fr-0.50-3.tar.bz2) = 283086 bytes
-SHA1 (patch-aa) = df35f94688de5a020875e2c3d1a6557e92923799
+SHA1 (patch-aa) = e22211d1b77a79d16e2334630dc171245bb15677
diff --git a/textproc/aspell-francais/patches/patch-aa b/textproc/aspell-francais/patches/patch-aa
index 41dd374a4cd..f2f944f7bb3 100644
--- a/textproc/aspell-francais/patches/patch-aa
+++ b/textproc/aspell-francais/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/01/17 03:51:36 salo Exp $
+$NetBSD: patch-aa,v 1.2 2003/01/19 06:35:48 salo Exp $
 
 --- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
 +++ Makefile.pre	Wed Jan 15 00:48:39 2003
@@ -12,10 +12,10 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/01/17 03:51:36 salo Exp $
 -	mkdir -p ${DESTDIR}${datadir}/
 -	cp ${data_files} ${DESTDIR}${datadir}/
 -	cd ${DESTDIR}${datadir}/ && chmod 644 ${data_files}
-+	${INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
-+	${INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
-+	${INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
-+	${INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
  
  clean:
  	rm -f ${rws_files}
diff --git a/textproc/aspell-german/Makefile b/textproc/aspell-german/Makefile
index 3d59ef587c3..8e84ee64dd4 100644
--- a/textproc/aspell-german/Makefile
+++ b/textproc/aspell-german/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/01/16 08:52:26 salo Exp $
+# $NetBSD: Makefile,v 1.2 2003/01/19 06:35:48 salo Exp $
 #
 
 DISTNAME=	aspell-de-0.50-2
@@ -17,8 +17,5 @@ HAS_CONFIGURE=	YES
 CONFIGURE_ENV+=	ASPELL=${PREFIX}/bin/aspell
 CONFIGURE_ENV+=	WORD_LIST_COMPRESS=${PREFIX}/bin/word-list-compress
 
-MAKE_ENV+=	INSTALL_DATA="${INSTALL_DATA}"
-MAKE_ENV+=	INSTALL_DATA_DIR="${INSTALL_DATA_DIR}"
-
 .include "../../textproc/aspell/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aspell-german/distinfo b/textproc/aspell-german/distinfo
index d0d7606a246..6e85e771837 100644
--- a/textproc/aspell-german/distinfo
+++ b/textproc/aspell-german/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/01/16 08:52:27 salo Exp $
+$NetBSD: distinfo,v 1.2 2003/01/19 06:35:48 salo Exp $
 
 SHA1 (aspell-de-0.50-2.tar.bz2) = 55afaf03bda70220e6a939096fc9e27fdd43c919
 Size (aspell-de-0.50-2.tar.bz2) = 304820 bytes
-SHA1 (patch-aa) = df35f94688de5a020875e2c3d1a6557e92923799
+SHA1 (patch-aa) = e22211d1b77a79d16e2334630dc171245bb15677
diff --git a/textproc/aspell-german/patches/patch-aa b/textproc/aspell-german/patches/patch-aa
index 708a37a6b3a..f2f944f7bb3 100644
--- a/textproc/aspell-german/patches/patch-aa
+++ b/textproc/aspell-german/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/01/16 08:52:27 salo Exp $
+$NetBSD: patch-aa,v 1.2 2003/01/19 06:35:48 salo Exp $
 
 --- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
 +++ Makefile.pre	Wed Jan 15 00:48:39 2003
@@ -12,10 +12,10 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/01/16 08:52:27 salo Exp $
 -	mkdir -p ${DESTDIR}${datadir}/
 -	cp ${data_files} ${DESTDIR}${datadir}/
 -	cd ${DESTDIR}${datadir}/ && chmod 644 ${data_files}
-+	${INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
-+	${INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
-+	${INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
-+	${INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
  
  clean:
  	rm -f ${rws_files}
diff --git a/textproc/aspell-greek/Makefile b/textproc/aspell-greek/Makefile
index dd42f0bb79e..85e8b147bdb 100644
--- a/textproc/aspell-greek/Makefile
+++ b/textproc/aspell-greek/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/01/17 03:52:04 salo Exp $
+# $NetBSD: Makefile,v 1.2 2003/01/19 06:35:49 salo Exp $
 #
 
 DISTNAME=	aspell-el-0.50-3
@@ -17,8 +17,5 @@ HAS_CONFIGURE=	YES
 CONFIGURE_ENV+=	ASPELL=${PREFIX}/bin/aspell
 CONFIGURE_ENV+=	WORD_LIST_COMPRESS=${PREFIX}/bin/word-list-compress
 
-MAKE_ENV+=	INSTALL_DATA="${INSTALL_DATA}"
-MAKE_ENV+=	INSTALL_DATA_DIR="${INSTALL_DATA_DIR}"
-
 .include "../../textproc/aspell/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aspell-greek/distinfo b/textproc/aspell-greek/distinfo
index e36704c04b6..185ac2dcb9d 100644
--- a/textproc/aspell-greek/distinfo
+++ b/textproc/aspell-greek/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/01/17 03:52:04 salo Exp $
+$NetBSD: distinfo,v 1.2 2003/01/19 06:35:49 salo Exp $
 
 SHA1 (aspell-el-0.50-3.tar.bz2) = f0242d02e45956f8fe5d8321d737ee4dc5d18931
 Size (aspell-el-0.50-3.tar.bz2) = 328225 bytes
-SHA1 (patch-aa) = df35f94688de5a020875e2c3d1a6557e92923799
+SHA1 (patch-aa) = e22211d1b77a79d16e2334630dc171245bb15677
diff --git a/textproc/aspell-greek/patches/patch-aa b/textproc/aspell-greek/patches/patch-aa
index 4983547ad5c..f55997a2a70 100644
--- a/textproc/aspell-greek/patches/patch-aa
+++ b/textproc/aspell-greek/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/01/17 03:52:04 salo Exp $
+$NetBSD: patch-aa,v 1.2 2003/01/19 06:35:49 salo Exp $
 
 --- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
 +++ Makefile.pre	Wed Jan 15 00:48:39 2003
@@ -12,10 +12,10 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/01/17 03:52:04 salo Exp $
 -	mkdir -p ${DESTDIR}${datadir}/
 -	cp ${data_files} ${DESTDIR}${datadir}/
 -	cd ${DESTDIR}${datadir}/ && chmod 644 ${data_files}
-+	${INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
-+	${INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
-+	${INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
-+	${INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
  
  clean:
  	rm -f ${rws_files}
diff --git a/textproc/aspell-italian/Makefile b/textproc/aspell-italian/Makefile
index 089f60225f7..6652390d74d 100644
--- a/textproc/aspell-italian/Makefile
+++ b/textproc/aspell-italian/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/01/17 03:52:34 salo Exp $
+# $NetBSD: Makefile,v 1.2 2003/01/19 06:35:49 salo Exp $
 #
 
 DISTNAME=	aspell-it-0.50-2
@@ -17,8 +17,5 @@ HAS_CONFIGURE=	YES
 CONFIGURE_ENV+=	ASPELL=${PREFIX}/bin/aspell
 CONFIGURE_ENV+=	WORD_LIST_COMPRESS=${PREFIX}/bin/word-list-compress
 
-MAKE_ENV+=	INSTALL_DATA="${INSTALL_DATA}"
-MAKE_ENV+=	INSTALL_DATA_DIR="${INSTALL_DATA_DIR}"
-
 .include "../../textproc/aspell/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aspell-italian/distinfo b/textproc/aspell-italian/distinfo
index 6b0d81c64af..61a7060f091 100644
--- a/textproc/aspell-italian/distinfo
+++ b/textproc/aspell-italian/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/01/17 03:52:35 salo Exp $
+$NetBSD: distinfo,v 1.2 2003/01/19 06:35:49 salo Exp $
 
 SHA1 (aspell-it-0.50-2.tar.bz2) = 4aa2f3a778b9b829b2af2f84ceb4c30a4124dd38
 Size (aspell-it-0.50-2.tar.bz2) = 38409 bytes
-SHA1 (patch-aa) = df35f94688de5a020875e2c3d1a6557e92923799
+SHA1 (patch-aa) = e22211d1b77a79d16e2334630dc171245bb15677
diff --git a/textproc/aspell-italian/patches/patch-aa b/textproc/aspell-italian/patches/patch-aa
index 7b934fa4c4a..f55997a2a70 100644
--- a/textproc/aspell-italian/patches/patch-aa
+++ b/textproc/aspell-italian/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/01/17 03:52:35 salo Exp $
+$NetBSD: patch-aa,v 1.2 2003/01/19 06:35:49 salo Exp $
 
 --- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
 +++ Makefile.pre	Wed Jan 15 00:48:39 2003
@@ -12,10 +12,10 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/01/17 03:52:35 salo Exp $
 -	mkdir -p ${DESTDIR}${datadir}/
 -	cp ${data_files} ${DESTDIR}${datadir}/
 -	cd ${DESTDIR}${datadir}/ && chmod 644 ${data_files}
-+	${INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
-+	${INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
-+	${INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
-+	${INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
  
  clean:
  	rm -f ${rws_files}
diff --git a/textproc/aspell-norwegian/Makefile b/textproc/aspell-norwegian/Makefile
index b73434b26ba..2044c8066cc 100644
--- a/textproc/aspell-norwegian/Makefile
+++ b/textproc/aspell-norwegian/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/01/17 03:53:03 salo Exp $
+# $NetBSD: Makefile,v 1.2 2003/01/19 06:35:49 salo Exp $
 #
 
 DISTNAME=	aspell-no-0.50-2
@@ -17,8 +17,5 @@ HAS_CONFIGURE=	YES
 CONFIGURE_ENV+=	ASPELL=${PREFIX}/bin/aspell
 CONFIGURE_ENV+=	WORD_LIST_COMPRESS=${PREFIX}/bin/word-list-compress
 
-MAKE_ENV+=	INSTALL_DATA="${INSTALL_DATA}"
-MAKE_ENV+=	INSTALL_DATA_DIR="${INSTALL_DATA_DIR}"
-
 .include "../../textproc/aspell/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aspell-norwegian/distinfo b/textproc/aspell-norwegian/distinfo
index fd47ed9f5b0..2d5c103fdc9 100644
--- a/textproc/aspell-norwegian/distinfo
+++ b/textproc/aspell-norwegian/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/01/17 03:53:03 salo Exp $
+$NetBSD: distinfo,v 1.2 2003/01/19 06:35:49 salo Exp $
 
 SHA1 (aspell-no-0.50-2.tar.bz2) = a52aa76421c2ff04bcbee7189a34ae220aaedda4
 Size (aspell-no-0.50-2.tar.bz2) = 286696 bytes
-SHA1 (patch-aa) = df35f94688de5a020875e2c3d1a6557e92923799
+SHA1 (patch-aa) = e22211d1b77a79d16e2334630dc171245bb15677
diff --git a/textproc/aspell-norwegian/patches/patch-aa b/textproc/aspell-norwegian/patches/patch-aa
index c2394ea2266..b80b98c37f3 100644
--- a/textproc/aspell-norwegian/patches/patch-aa
+++ b/textproc/aspell-norwegian/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/01/17 03:53:03 salo Exp $
+$NetBSD: patch-aa,v 1.2 2003/01/19 06:35:50 salo Exp $
 
 --- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
 +++ Makefile.pre	Wed Jan 15 00:48:39 2003
@@ -12,10 +12,10 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/01/17 03:53:03 salo Exp $
 -	mkdir -p ${DESTDIR}${datadir}/
 -	cp ${data_files} ${DESTDIR}${datadir}/
 -	cd ${DESTDIR}${datadir}/ && chmod 644 ${data_files}
-+	${INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
-+	${INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
-+	${INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
-+	${INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
  
  clean:
  	rm -f ${rws_files}
diff --git a/textproc/aspell-polish/Makefile b/textproc/aspell-polish/Makefile
index 728b78c6508..7c92945b963 100644
--- a/textproc/aspell-polish/Makefile
+++ b/textproc/aspell-polish/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/01/17 03:53:29 salo Exp $
+# $NetBSD: Makefile,v 1.2 2003/01/19 06:35:50 salo Exp $
 #
 
 DISTNAME=	aspell-pl-0.50-2
@@ -17,8 +17,5 @@ HAS_CONFIGURE=	YES
 CONFIGURE_ENV+=	ASPELL=${PREFIX}/bin/aspell
 CONFIGURE_ENV+=	WORD_LIST_COMPRESS=${PREFIX}/bin/word-list-compress
 
-MAKE_ENV+=	INSTALL_DATA="${INSTALL_DATA}"
-MAKE_ENV+=	INSTALL_DATA_DIR="${INSTALL_DATA_DIR}"
-
 .include "../../textproc/aspell/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aspell-polish/distinfo b/textproc/aspell-polish/distinfo
index a79d32f35d4..cafcdf80976 100644
--- a/textproc/aspell-polish/distinfo
+++ b/textproc/aspell-polish/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/01/17 03:53:29 salo Exp $
+$NetBSD: distinfo,v 1.2 2003/01/19 06:35:50 salo Exp $
 
 SHA1 (aspell-pl-0.50-2.tar.bz2) = 57cdad1ca110638e8f1028059230233e8a68ca88
 Size (aspell-pl-0.50-2.tar.bz2) = 311840 bytes
-SHA1 (patch-aa) = df35f94688de5a020875e2c3d1a6557e92923799
+SHA1 (patch-aa) = e22211d1b77a79d16e2334630dc171245bb15677
diff --git a/textproc/aspell-polish/patches/patch-aa b/textproc/aspell-polish/patches/patch-aa
index 8e74500176c..b80b98c37f3 100644
--- a/textproc/aspell-polish/patches/patch-aa
+++ b/textproc/aspell-polish/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/01/17 03:53:29 salo Exp $
+$NetBSD: patch-aa,v 1.2 2003/01/19 06:35:50 salo Exp $
 
 --- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
 +++ Makefile.pre	Wed Jan 15 00:48:39 2003
@@ -12,10 +12,10 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/01/17 03:53:29 salo Exp $
 -	mkdir -p ${DESTDIR}${datadir}/
 -	cp ${data_files} ${DESTDIR}${datadir}/
 -	cd ${DESTDIR}${datadir}/ && chmod 644 ${data_files}
-+	${INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
-+	${INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
-+	${INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
-+	${INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
  
  clean:
  	rm -f ${rws_files}
diff --git a/textproc/aspell-portuguese/Makefile b/textproc/aspell-portuguese/Makefile
index 2788df1fb6f..94c3f885dc7 100644
--- a/textproc/aspell-portuguese/Makefile
+++ b/textproc/aspell-portuguese/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/01/17 03:54:17 salo Exp $
+# $NetBSD: Makefile,v 1.2 2003/01/19 06:35:50 salo Exp $
 #
 
 DISTNAME=	aspell-pt-0.50-2
@@ -17,8 +17,5 @@ HAS_CONFIGURE=	YES
 CONFIGURE_ENV+=	ASPELL=${PREFIX}/bin/aspell
 CONFIGURE_ENV+=	WORD_LIST_COMPRESS=${PREFIX}/bin/word-list-compress
 
-MAKE_ENV+=	INSTALL_DATA="${INSTALL_DATA}"
-MAKE_ENV+=	INSTALL_DATA_DIR="${INSTALL_DATA_DIR}"
-
 .include "../../textproc/aspell/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aspell-portuguese/distinfo b/textproc/aspell-portuguese/distinfo
index 4dbfc075952..4d81ce7e990 100644
--- a/textproc/aspell-portuguese/distinfo
+++ b/textproc/aspell-portuguese/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/01/17 03:54:17 salo Exp $
+$NetBSD: distinfo,v 1.2 2003/01/19 06:35:50 salo Exp $
 
 SHA1 (aspell-pt-0.50-2.tar.bz2) = deea92b701d084a00428b70e86cce149c95aea1c
 Size (aspell-pt-0.50-2.tar.bz2) = 201341 bytes
-SHA1 (patch-aa) = df35f94688de5a020875e2c3d1a6557e92923799
+SHA1 (patch-aa) = e22211d1b77a79d16e2334630dc171245bb15677
diff --git a/textproc/aspell-portuguese/patches/patch-aa b/textproc/aspell-portuguese/patches/patch-aa
index 4f04277e43d..b177ef1ec44 100644
--- a/textproc/aspell-portuguese/patches/patch-aa
+++ b/textproc/aspell-portuguese/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/01/17 03:54:17 salo Exp $
+$NetBSD: patch-aa,v 1.2 2003/01/19 06:35:51 salo Exp $
 
 --- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
 +++ Makefile.pre	Wed Jan 15 00:48:39 2003
@@ -12,10 +12,10 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/01/17 03:54:17 salo Exp $
 -	mkdir -p ${DESTDIR}${datadir}/
 -	cp ${data_files} ${DESTDIR}${datadir}/
 -	cd ${DESTDIR}${datadir}/ && chmod 644 ${data_files}
-+	${INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
-+	${INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
-+	${INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
-+	${INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
  
  clean:
  	rm -f ${rws_files}
diff --git a/textproc/aspell-romanian/Makefile b/textproc/aspell-romanian/Makefile
index a8fae655c73..2db107983bc 100644
--- a/textproc/aspell-romanian/Makefile
+++ b/textproc/aspell-romanian/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/01/17 03:54:46 salo Exp $
+# $NetBSD: Makefile,v 1.2 2003/01/19 06:35:51 salo Exp $
 #
 
 DISTNAME=	aspell-ro-0.50-2
@@ -17,8 +17,5 @@ HAS_CONFIGURE=	YES
 CONFIGURE_ENV+=	ASPELL=${PREFIX}/bin/aspell
 CONFIGURE_ENV+=	WORD_LIST_COMPRESS=${PREFIX}/bin/word-list-compress
 
-MAKE_ENV+=	INSTALL_DATA="${INSTALL_DATA}"
-MAKE_ENV+=	INSTALL_DATA_DIR="${INSTALL_DATA_DIR}"
-
 .include "../../textproc/aspell/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aspell-romanian/distinfo b/textproc/aspell-romanian/distinfo
index e08f1ea7f67..ca2544ee6a1 100644
--- a/textproc/aspell-romanian/distinfo
+++ b/textproc/aspell-romanian/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/01/17 03:54:47 salo Exp $
+$NetBSD: distinfo,v 1.2 2003/01/19 06:35:51 salo Exp $
 
 SHA1 (aspell-ro-0.50-2.tar.bz2) = 9da727de7e6bc5c1f85ed9d9c56c46e7bc033975
 Size (aspell-ro-0.50-2.tar.bz2) = 64110 bytes
-SHA1 (patch-aa) = df35f94688de5a020875e2c3d1a6557e92923799
+SHA1 (patch-aa) = e22211d1b77a79d16e2334630dc171245bb15677
diff --git a/textproc/aspell-romanian/patches/patch-aa b/textproc/aspell-romanian/patches/patch-aa
index 6242e9ceba3..b177ef1ec44 100644
--- a/textproc/aspell-romanian/patches/patch-aa
+++ b/textproc/aspell-romanian/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/01/17 03:54:47 salo Exp $
+$NetBSD: patch-aa,v 1.2 2003/01/19 06:35:51 salo Exp $
 
 --- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
 +++ Makefile.pre	Wed Jan 15 00:48:39 2003
@@ -12,10 +12,10 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/01/17 03:54:47 salo Exp $
 -	mkdir -p ${DESTDIR}${datadir}/
 -	cp ${data_files} ${DESTDIR}${datadir}/
 -	cd ${DESTDIR}${datadir}/ && chmod 644 ${data_files}
-+	${INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
-+	${INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
-+	${INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
-+	${INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
  
  clean:
  	rm -f ${rws_files}
diff --git a/textproc/aspell-russian/Makefile b/textproc/aspell-russian/Makefile
index abf5a81fb1c..154fadfd233 100644
--- a/textproc/aspell-russian/Makefile
+++ b/textproc/aspell-russian/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/01/17 03:55:23 salo Exp $
+# $NetBSD: Makefile,v 1.2 2003/01/19 06:35:51 salo Exp $
 #
 
 DISTNAME=	aspell-ru-0.50-2
@@ -17,8 +17,5 @@ HAS_CONFIGURE=	YES
 CONFIGURE_ENV+=	ASPELL=${PREFIX}/bin/aspell
 CONFIGURE_ENV+=	WORD_LIST_COMPRESS=${PREFIX}/bin/word-list-compress
 
-MAKE_ENV+=	INSTALL_DATA="${INSTALL_DATA}"
-MAKE_ENV+=	INSTALL_DATA_DIR="${INSTALL_DATA_DIR}"
-
 .include "../../textproc/aspell/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aspell-russian/distinfo b/textproc/aspell-russian/distinfo
index db7b4418abb..096c0b1a0f6 100644
--- a/textproc/aspell-russian/distinfo
+++ b/textproc/aspell-russian/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/01/17 03:55:23 salo Exp $
+$NetBSD: distinfo,v 1.2 2003/01/19 06:35:51 salo Exp $
 
 SHA1 (aspell-ru-0.50-2.tar.bz2) = 4269a62b5d76e3d998e47ec446a230f343e214f3
 Size (aspell-ru-0.50-2.tar.bz2) = 521827 bytes
-SHA1 (patch-aa) = df35f94688de5a020875e2c3d1a6557e92923799
+SHA1 (patch-aa) = e22211d1b77a79d16e2334630dc171245bb15677
diff --git a/textproc/aspell-russian/patches/patch-aa b/textproc/aspell-russian/patches/patch-aa
index 0e667619ee0..b177ef1ec44 100644
--- a/textproc/aspell-russian/patches/patch-aa
+++ b/textproc/aspell-russian/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/01/17 03:55:23 salo Exp $
+$NetBSD: patch-aa,v 1.2 2003/01/19 06:35:51 salo Exp $
 
 --- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
 +++ Makefile.pre	Wed Jan 15 00:48:39 2003
@@ -12,10 +12,10 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/01/17 03:55:23 salo Exp $
 -	mkdir -p ${DESTDIR}${datadir}/
 -	cp ${data_files} ${DESTDIR}${datadir}/
 -	cd ${DESTDIR}${datadir}/ && chmod 644 ${data_files}
-+	${INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
-+	${INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
-+	${INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
-+	${INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
  
  clean:
  	rm -f ${rws_files}
diff --git a/textproc/aspell-spanish/Makefile b/textproc/aspell-spanish/Makefile
index 7df1b75c9c5..32b7e4d28a1 100644
--- a/textproc/aspell-spanish/Makefile
+++ b/textproc/aspell-spanish/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/01/17 03:55:51 salo Exp $
+# $NetBSD: Makefile,v 1.2 2003/01/19 06:35:52 salo Exp $
 #
 
 DISTNAME=	aspell-es-0.50-2
@@ -17,8 +17,5 @@ HAS_CONFIGURE=	YES
 CONFIGURE_ENV+=	ASPELL=${PREFIX}/bin/aspell
 CONFIGURE_ENV+=	WORD_LIST_COMPRESS=${PREFIX}/bin/word-list-compress
 
-MAKE_ENV+=	INSTALL_DATA="${INSTALL_DATA}"
-MAKE_ENV+=	INSTALL_DATA_DIR="${INSTALL_DATA_DIR}"
-
 .include "../../textproc/aspell/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aspell-spanish/distinfo b/textproc/aspell-spanish/distinfo
index f94ed693b8d..40b491e9c30 100644
--- a/textproc/aspell-spanish/distinfo
+++ b/textproc/aspell-spanish/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/01/17 03:55:52 salo Exp $
+$NetBSD: distinfo,v 1.2 2003/01/19 06:35:52 salo Exp $
 
 SHA1 (aspell-es-0.50-2.tar.bz2) = 46f301460588dc59a51df2c2f39377ef3977bd03
 Size (aspell-es-0.50-2.tar.bz2) = 157809 bytes
-SHA1 (patch-aa) = df35f94688de5a020875e2c3d1a6557e92923799
+SHA1 (patch-aa) = e22211d1b77a79d16e2334630dc171245bb15677
diff --git a/textproc/aspell-spanish/patches/patch-aa b/textproc/aspell-spanish/patches/patch-aa
index 50b9f769bf3..48d07a7768c 100644
--- a/textproc/aspell-spanish/patches/patch-aa
+++ b/textproc/aspell-spanish/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/01/17 03:55:52 salo Exp $
+$NetBSD: patch-aa,v 1.2 2003/01/19 06:35:52 salo Exp $
 
 --- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
 +++ Makefile.pre	Wed Jan 15 00:48:39 2003
@@ -12,10 +12,10 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/01/17 03:55:52 salo Exp $
 -	mkdir -p ${DESTDIR}${datadir}/
 -	cp ${data_files} ${DESTDIR}${datadir}/
 -	cd ${DESTDIR}${datadir}/ && chmod 644 ${data_files}
-+	${INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
-+	${INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
-+	${INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
-+	${INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
  
  clean:
  	rm -f ${rws_files}
diff --git a/textproc/aspell-svenska/Makefile b/textproc/aspell-svenska/Makefile
index 75e0e519bc1..9e5066ec0b6 100644
--- a/textproc/aspell-svenska/Makefile
+++ b/textproc/aspell-svenska/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/01/17 03:56:26 salo Exp $
+# $NetBSD: Makefile,v 1.2 2003/01/19 06:35:52 salo Exp $
 #
 
 DISTNAME=	aspell-sv-0.50-2
@@ -17,8 +17,5 @@ HAS_CONFIGURE=	YES
 CONFIGURE_ENV+=	ASPELL=${PREFIX}/bin/aspell
 CONFIGURE_ENV+=	WORD_LIST_COMPRESS=${PREFIX}/bin/word-list-compress
 
-MAKE_ENV+=	INSTALL_DATA="${INSTALL_DATA}"
-MAKE_ENV+=	INSTALL_DATA_DIR="${INSTALL_DATA_DIR}"
-
 .include "../../textproc/aspell/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aspell-svenska/distinfo b/textproc/aspell-svenska/distinfo
index 3e3af0235c7..970b5ac0cb9 100644
--- a/textproc/aspell-svenska/distinfo
+++ b/textproc/aspell-svenska/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/01/17 03:56:26 salo Exp $
+$NetBSD: distinfo,v 1.2 2003/01/19 06:35:52 salo Exp $
 
 SHA1 (aspell-sv-0.50-2.tar.bz2) = 0b07fbc43de1deea85069710d1e72a7b64c680a5
 Size (aspell-sv-0.50-2.tar.bz2) = 90602 bytes
-SHA1 (patch-aa) = df35f94688de5a020875e2c3d1a6557e92923799
+SHA1 (patch-aa) = e22211d1b77a79d16e2334630dc171245bb15677
diff --git a/textproc/aspell-svenska/patches/patch-aa b/textproc/aspell-svenska/patches/patch-aa
index 87e231897a1..48d07a7768c 100644
--- a/textproc/aspell-svenska/patches/patch-aa
+++ b/textproc/aspell-svenska/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/01/17 03:56:26 salo Exp $
+$NetBSD: patch-aa,v 1.2 2003/01/19 06:35:52 salo Exp $
 
 --- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
 +++ Makefile.pre	Wed Jan 15 00:48:39 2003
@@ -12,10 +12,10 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/01/17 03:56:26 salo Exp $
 -	mkdir -p ${DESTDIR}${datadir}/
 -	cp ${data_files} ${DESTDIR}${datadir}/
 -	cd ${DESTDIR}${datadir}/ && chmod 644 ${data_files}
-+	${INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
-+	${INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
-+	${INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
-+	${INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
  
  clean:
  	rm -f ${rws_files}
diff --git a/textproc/aspell-ukrainian/Makefile b/textproc/aspell-ukrainian/Makefile
index f7ed202796c..b28ccfb1fa1 100644
--- a/textproc/aspell-ukrainian/Makefile
+++ b/textproc/aspell-ukrainian/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/01/17 06:47:47 salo Exp $
+# $NetBSD: Makefile,v 1.2 2003/01/19 06:35:53 salo Exp $
 #
 
 DISTNAME=	aspell-uk-0.50-3
@@ -17,8 +17,5 @@ HAS_CONFIGURE=	YES
 CONFIGURE_ENV+=	ASPELL=${PREFIX}/bin/aspell
 CONFIGURE_ENV+=	WORD_LIST_COMPRESS=${PREFIX}/bin/word-list-compress
 
-MAKE_ENV+=	INSTALL_DATA="${INSTALL_DATA}"
-MAKE_ENV+=	INSTALL_DATA_DIR="${INSTALL_DATA_DIR}"
-
 .include "../../textproc/aspell/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aspell-ukrainian/distinfo b/textproc/aspell-ukrainian/distinfo
index b50decbdff6..c9116afb4fd 100644
--- a/textproc/aspell-ukrainian/distinfo
+++ b/textproc/aspell-ukrainian/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/01/17 06:47:47 salo Exp $
+$NetBSD: distinfo,v 1.2 2003/01/19 06:35:53 salo Exp $
 
 SHA1 (aspell-uk-0.50-3.tar.bz2) = 1031054bd906094019c426825d73b14375914019
 Size (aspell-uk-0.50-3.tar.bz2) = 382364 bytes
-SHA1 (patch-aa) = df35f94688de5a020875e2c3d1a6557e92923799
+SHA1 (patch-aa) = e22211d1b77a79d16e2334630dc171245bb15677
diff --git a/textproc/aspell-ukrainian/patches/patch-aa b/textproc/aspell-ukrainian/patches/patch-aa
index 5efe8c54de2..8bce0bb5389 100644
--- a/textproc/aspell-ukrainian/patches/patch-aa
+++ b/textproc/aspell-ukrainian/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/01/17 06:47:47 salo Exp $
+$NetBSD: patch-aa,v 1.2 2003/01/19 06:35:53 salo Exp $
 
 --- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
 +++ Makefile.pre	Wed Jan 15 00:48:39 2003
@@ -12,10 +12,10 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/01/17 06:47:47 salo Exp $
 -	mkdir -p ${DESTDIR}${datadir}/
 -	cp ${data_files} ${DESTDIR}${datadir}/
 -	cd ${DESTDIR}${datadir}/ && chmod 644 ${data_files}
-+	${INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
-+	${INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
-+	${INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
-+	${INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
  
  clean:
  	rm -f ${rws_files}
diff --git a/textproc/aspell-welsh/Makefile b/textproc/aspell-welsh/Makefile
index a143715c49b..49cbc1142c2 100644
--- a/textproc/aspell-welsh/Makefile
+++ b/textproc/aspell-welsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/01/17 06:47:05 salo Exp $
+# $NetBSD: Makefile,v 1.2 2003/01/19 06:35:53 salo Exp $
 #
 
 DISTNAME=	aspell-cy-0.50-3
@@ -17,8 +17,5 @@ HAS_CONFIGURE=	YES
 CONFIGURE_ENV+=	ASPELL=${PREFIX}/bin/aspell
 CONFIGURE_ENV+=	WORD_LIST_COMPRESS=${PREFIX}/bin/word-list-compress
 
-MAKE_ENV+=	INSTALL_DATA="${INSTALL_DATA}"
-MAKE_ENV+=	INSTALL_DATA_DIR="${INSTALL_DATA_DIR}"
-
 .include "../../textproc/aspell/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aspell-welsh/distinfo b/textproc/aspell-welsh/distinfo
index 0635aff6e25..22df5f892ba 100644
--- a/textproc/aspell-welsh/distinfo
+++ b/textproc/aspell-welsh/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/01/17 06:47:05 salo Exp $
+$NetBSD: distinfo,v 1.2 2003/01/19 06:35:53 salo Exp $
 
 SHA1 (aspell-cy-0.50-3.tar.bz2) = 8a62c649cf99cd239449961a0d5f8942b1c02116
 Size (aspell-cy-0.50-3.tar.bz2) = 117652 bytes
-SHA1 (patch-aa) = df35f94688de5a020875e2c3d1a6557e92923799
+SHA1 (patch-aa) = e22211d1b77a79d16e2334630dc171245bb15677
diff --git a/textproc/aspell-welsh/patches/patch-aa b/textproc/aspell-welsh/patches/patch-aa
index 8c793b05add..8bce0bb5389 100644
--- a/textproc/aspell-welsh/patches/patch-aa
+++ b/textproc/aspell-welsh/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/01/17 06:47:05 salo Exp $
+$NetBSD: patch-aa,v 1.2 2003/01/19 06:35:53 salo Exp $
 
 --- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
 +++ Makefile.pre	Wed Jan 15 00:48:39 2003
@@ -12,10 +12,10 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/01/17 06:47:05 salo Exp $
 -	mkdir -p ${DESTDIR}${datadir}/
 -	cp ${data_files} ${DESTDIR}${datadir}/
 -	cd ${DESTDIR}${datadir}/ && chmod 644 ${data_files}
-+	${INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
-+	${INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
-+	${INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
-+	${INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
  
  clean:
  	rm -f ${rws_files}