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

6 files changed, 16 insertions, 20 deletions

diff --git a/security/libdes/Makefile b/security/libdes/Makefile
index cdf91ec2cb9..b728e7e695b 100644
--- a/security/libdes/Makefile
+++ b/security/libdes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:49:48 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/01/19 09:04:02 salo Exp $
 
 DISTNAME=	libdes-4.04b
 CATEGORIES=	security
@@ -11,7 +11,4 @@ CRYPTO=		YES
 
 WRKSRC=         ${WRKDIR}/des
 
-MAKE_ENV+=	INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
-		INSTALL_DATA="${INSTALL_DATA}"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/libdes/distinfo b/security/libdes/distinfo
index 27e6648605a..114e49cd05c 100644
--- a/security/libdes/distinfo
+++ b/security/libdes/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 15:40:32 agc Exp $
+$NetBSD: distinfo,v 1.3 2003/01/19 09:04:02 salo Exp $
 
 SHA1 (libdes-4.04b.tar.gz) = ef16e13fd3399be145ce391325c11292babc7cf1
 Size (libdes-4.04b.tar.gz) = 142195 bytes
-SHA1 (patch-aa) = bfd48af9872d6d884d31c119f4e5f3c64f6f9335
+SHA1 (patch-aa) = b2c3f5b66d0fc3535e1f3e0d6732a85dfe7fefdb
 SHA1 (patch-ab) = e5ec4626277b60f103594261f91d7dab2c9938ff
 SHA1 (patch-ac) = a1dc2b3b3726494b1b9f7c210322d2e60dccd621
 SHA1 (patch-ad) = a7f7527afc374489f2449ed6742c974c47bb22b4
diff --git a/security/libdes/patches/patch-aa b/security/libdes/patches/patch-aa
index ee8efb3f388..535227fced7 100644
--- a/security/libdes/patches/patch-aa
+++ b/security/libdes/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/11/23 13:16:10 rh Exp $
+$NetBSD: patch-aa,v 1.2 2003/01/19 09:04:03 salo Exp $
 
 --- ./Makefile.orig	Wed Jan  7 18:20:36 1998
 +++ ./Makefile	Fri Mar 31 04:21:15 2000
@@ -67,10 +67,10 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/11/23 13:16:10 rh Exp $
 -	    cp des.h $(INCDIR)/des.h; \
 -	    chmod 644 $(INCDIR)/des.h; \
 -	fi
-+	$(INSTALL_PROGRAM) des           $(PREFIX)/bin/libdes
-+	$(INSTALL_DATA)    libdes.a      $(PREFIX)/lib/libdes.a
-+	$(INSTALL_DATA)    des_crypt.man $(PREFIX)/man/man3/libdes_crypt.3
-+	$(INSTALL_DATA)    des.man       $(PREFIX)/man/man1/libdes.1
-+	$(INSTALL_DATA)    des.h         $(PREFIX)/include/libdes.h
++	$(BSD_INSTALL_PROGRAM) des           $(PREFIX)/bin/libdes
++	$(BSD_INSTALL_DATA)    libdes.a      $(PREFIX)/lib/libdes.a
++	$(BSD_INSTALL_DATA)    des_crypt.man $(PREFIX)/man/man3/libdes_crypt.3
++	$(BSD_INSTALL_DATA)    des.man       $(PREFIX)/man/man1/libdes.1
++	$(BSD_INSTALL_DATA)    des.h         $(PREFIX)/include/libdes.h
 +
  # DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/security/libident/Makefile b/security/libident/Makefile
index c94f92d9cd3..ee80e1c06af 100644
--- a/security/libident/Makefile
+++ b/security/libident/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/10/22 11:44:58 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2003/01/19 09:04:04 salo Exp $
 #
 
 DISTNAME=	libident-0.22
@@ -12,6 +12,5 @@ USE_BUILDLINK2=	# defined
 USE_LIBTOOL=	# defined
 
 ALL_TARGET=	netbsd
-MAKE_ENV+=	INSTALL_DATA="${INSTALL_DATA}"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/libident/distinfo b/security/libident/distinfo
index 2bb20d9dfd2..d688cacb4f4 100644
--- a/security/libident/distinfo
+++ b/security/libident/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 15:40:33 agc Exp $
+$NetBSD: distinfo,v 1.3 2003/01/19 09:04:04 salo Exp $
 
 SHA1 (libident-0.22.tar.gz) = cf70a9600880085c333d4e8623ece8056a196cc6
 Size (libident-0.22.tar.gz) = 10716 bytes
-SHA1 (patch-aa) = 1d5f7837d8979ea62427731b858399a47fd19a80
+SHA1 (patch-aa) = c50abad31f43c0761794f3bdb1dcf606b4be28be
diff --git a/security/libident/patches/patch-aa b/security/libident/patches/patch-aa
index ddd46462217..d80a455d7d3 100644
--- a/security/libident/patches/patch-aa
+++ b/security/libident/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 1999/03/12 16:32:08 tron Exp $
+$NetBSD: patch-aa,v 1.6 2003/01/19 09:04:04 salo Exp $
 
 --- Makefile.orig	Fri Jan 17 20:10:55 1997
 +++ Makefile	Fri Mar 12 17:20:39 1999
@@ -61,9 +61,9 @@ $NetBSD: patch-aa,v 1.5 1999/03/12 16:32:08 tron Exp $
 -	cp ident.h $(INCDIR)/ident.h
 -	-$(RM) $(MANDIR)/ident.3
 -	cp ident.3 $(MANDIR)/ident.3
-+	${LIBTOOL} --mode=install ${INSTALL_DATA} ${LIBIDENT} ${PREFIX}/lib
-+	${INSTALL_DATA} ident.h ${INCDIR}/ident.h
-+	${INSTALL_DATA} ident.3 ${MANDIR}/ident.3
++	${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} ${LIBIDENT} ${PREFIX}/lib
++	${BSD_INSTALL_DATA} ident.h ${INCDIR}/ident.h
++	${BSD_INSTALL_DATA} ident.3 ${MANDIR}/ident.3
  
  clean:
  	-$(RM) $(LIBIDENT) ident-tester lookup-tester *~ core *.o \#*