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

14 files changed, 32 insertions, 41 deletions

diff --git a/editors/xemacs-current/Makefile b/editors/xemacs-current/Makefile
index 23c2188019b..55231cf4532 100644
--- a/editors/xemacs-current/Makefile
+++ b/editors/xemacs-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/01/18 05:45:42 uebayasi Exp $
+# $NetBSD: Makefile,v 1.15 2003/01/19 06:52:55 salo Exp $
 
 DISTNAME=	xemacs-21.5.10
 CATEGORIES=	editors
@@ -82,7 +82,6 @@ CONFIGURE_ARGS+=	--site-includes=${PREFIX}/include:${WRKDIR}
 CONFIGURE_ARGS+=	--site-libraries=${PREFIX}/lib
 
 CFLAGS+=		-Dunix
-MAKE_ENV+=		INSTALL_MAN="${INSTALL_MAN}"
 
 post-patch:
 	@${RM} -f ${WRKSRC}/etc/ctags.1.orig
diff --git a/editors/xemacs-current/distinfo b/editors/xemacs-current/distinfo
index a160a14ee9a..26ea3bb6c09 100644
--- a/editors/xemacs-current/distinfo
+++ b/editors/xemacs-current/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2003/01/18 05:45:42 uebayasi Exp $
+$NetBSD: distinfo,v 1.4 2003/01/19 06:52:56 salo Exp $
 
 SHA1 (xemacs-21.5.10.tar.gz) = 429818840413950366af1552e687db565cb4bb30
 Size (xemacs-21.5.10.tar.gz) = 12748210 bytes
-SHA1 (patch-aa) = 4966a5bda4456976cdc1b05eb5c6bb5cf4f41250
+SHA1 (patch-aa) = 48f0b47ff872338587b3118075e10413febf2639
 SHA1 (patch-ab) = 62a968f19d1b2b9efc5f8c3cf3e612f6a1dc7df2
 SHA1 (patch-ac) = 1ffaa2c5c425de6abd8f76d262762d21d8c7d0af
 SHA1 (patch-ad) = 14c5e0f31801648fbdb7f96e5d26cb505a59b741
diff --git a/editors/xemacs-current/patches/patch-aa b/editors/xemacs-current/patches/patch-aa
index b3101332688..09cb1aefaf1 100644
--- a/editors/xemacs-current/patches/patch-aa
+++ b/editors/xemacs-current/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2003/01/18 05:45:43 uebayasi Exp $
+$NetBSD: patch-aa,v 1.3 2003/01/19 06:52:56 salo Exp $
 
 --- Makefile.in.in.orig	Sat Jan 18 12:23:29 2003
 +++ Makefile.in.in
@@ -10,9 +10,9 @@ $NetBSD: patch-aa,v 1.2 2003/01/18 05:45:43 uebayasi Exp $
 -	    chmod 0644 ${mandir}/$${page}${manext} ; \
 +           if [ $${page} = etags ] || [ $${page} = ctags ] ; \
 +           then \
-+             ${INSTALL_MAN} ${srcdir}/etc/$${page}.1 ${mandir}/xemacs-$${page}${manext} ; \
++             ${BSD_INSTALL_MAN} ${srcdir}/etc/$${page}.1 ${mandir}/xemacs-$${page}${manext} ; \
 +           else \
-+             ${INSTALL_MAN} ${srcdir}/etc/$${page}.1 ${mandir}/$${page}${manext} ; \
++             ${BSD_INSTALL_MAN} ${srcdir}/etc/$${page}.1 ${mandir}/$${page}${manext} ; \
 +           fi \
  	  done
  	@echo "If you would like to save approximately 2M of disk space, do"
diff --git a/editors/xemacs-nox11/Makefile b/editors/xemacs-nox11/Makefile
index 73783af1e36..7bb4e46dd21 100644
--- a/editors/xemacs-nox11/Makefile
+++ b/editors/xemacs-nox11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/01/17 02:40:25 uebayasi Exp $
+# $NetBSD: Makefile,v 1.4 2003/01/19 06:52:56 salo Exp $
 
 DISTNAME=	xemacs-21.1.14
 PKGNAME=	xemacs-nox11-21.1.14
@@ -103,8 +103,6 @@ CONFIGURE_ARGS+=	--without-tiff	# XXX -nox
 CONFIGURE_ARGS+=	--without-xpm	# XXX -nox
 
 CFLAGS+=		-Dunix
-MAKE_ENV+=		INSTALL_MAN="${INSTALL_MAN}"
-MAKE_ENV+=		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
 post-extract:
 	for FILE in ${EXTRA_FILES}; do					\
diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index c2637cf8479..3c8abca0497 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2002/12/01 16:51:16 magick Exp $
+# $NetBSD: Makefile,v 1.55 2003/01/19 06:52:54 salo Exp $
 
 DISTNAME=	xemacs-21.1.14
 PKGREVISION=	4
@@ -92,8 +92,6 @@ CONFIGURE_ARGS+=	--site-includes=${PREFIX}/include:${WRKDIR}
 CONFIGURE_ARGS+=	--site-libraries=${PREFIX}/lib
 
 CFLAGS+=		-Dunix
-MAKE_ENV+=		INSTALL_MAN="${INSTALL_MAN}"
-MAKE_ENV+=		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
 post-extract:
 	for FILE in ${EXTRA_FILES}; do					\
diff --git a/editors/xemacs/distinfo b/editors/xemacs/distinfo
index 8354ee21a94..d2b6e82deca 100644
--- a/editors/xemacs/distinfo
+++ b/editors/xemacs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/10/09 16:32:16 magick Exp $
+$NetBSD: distinfo,v 1.5 2003/01/19 06:52:54 salo Exp $
 
 SHA1 (xemacs/xemacs-21.1.14.tar.bz2) = 9be60177dfaa2be8b847ce15b26d7009afa9b7b9
 Size (xemacs/xemacs-21.1.14.tar.bz2) = 5482480 bytes
@@ -7,8 +7,8 @@ Size (xemacs/xemacs-21.1.14-elc.tar.gz) = 784709 bytes
 SHA1 (xemacs/xemacs-21.1.14-info.tar.gz) = 73942f88cbdc477a1e8bfbb0a562235381c3f368
 Size (xemacs/xemacs-21.1.14-info.tar.gz) = 1506819 bytes
 SHA1 (patch-aa) = d3020b5838ec8854a495dc8c310f0719bbf527b4
-SHA1 (patch-ab) = 7d8f6b362337a7279900c28bc078091980f5e369
-SHA1 (patch-ac) = 166cbae328cfa20902f73b3861bb591339f37e47
+SHA1 (patch-ab) = 01f962bd179e2de5649f9dcd419e1db0cccc6945
+SHA1 (patch-ac) = 7990c45d2a44c7786826fc552d3c4609d77af69e
 SHA1 (patch-ad) = e2a70a64f0659ffda6dd27b37512e4dc5bd4ecf4
 SHA1 (patch-af) = 9a6dc52819dfa1cf85802f6cc99db30e8ba363fc
 SHA1 (patch-ah) = 61a430e027a47ce321721737d42d09ca71ecd7ec
diff --git a/editors/xemacs/patches/patch-ab b/editors/xemacs/patches/patch-ab
index e9d6174176a..26586c164e8 100644
--- a/editors/xemacs/patches/patch-ab
+++ b/editors/xemacs/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 1999/12/08 08:18:25 rh Exp $
+$NetBSD: patch-ab,v 1.3 2003/01/19 06:52:55 salo Exp $
 
 --- lib-src/Makefile.in.in.orig	Mon Jun 14 08:32:00 1999
 +++ lib-src/Makefile.in.in	Wed Dec  8 09:14:11 1999
@@ -16,7 +16,7 @@ $NetBSD: patch-ab,v 1.2 1999/12/08 08:18:25 rh Exp $
  	     != "`(cd ${srcdir}     && $(pwd))`"; then \
  	  for f in ${SCRIPTS}; do \
 -	    (cd .. && $(INSTALL_PROGRAM) ${srcdir}/$$f ${archlibdir}/$$f); \
-+	    (cd .. && $(INSTALL_SCRIPT) ${srcdir}/$$f ${archlibdir}/$$f); \
++	    (cd .. && $(BSD_INSTALL_SCRIPT) ${srcdir}/$$f ${archlibdir}/$$f); \
  	  done ; \
  	fi
  
@@ -37,9 +37,9 @@ $NetBSD: patch-ab,v 1.2 1999/12/08 08:18:25 rh Exp $
 -	  (cd .. && $(INSTALL_PROGRAM) ${srcdir}/$${file} ${bindir}/$${file}) ; \
 +	  if [ $${file} = rcs-checkin ] || [ $${file} = send-pr ] ; \
 +	  then \
-+	    (cd .. && $(INSTALL_SCRIPT) ${srcdir}/$${file} ${bindir}/xemacs-$${file}) ; \
++	    (cd .. && $(BSD_INSTALL_SCRIPT) ${srcdir}/$${file} ${bindir}/xemacs-$${file}) ; \
 +	  else \
-+	    (cd .. && $(INSTALL_SCRIPT) ${srcdir}/$${file} ${bindir}/$${file}) ; \
++	    (cd .. && $(BSD_INSTALL_SCRIPT) ${srcdir}/$${file} ${bindir}/$${file}) ; \
 +	  fi \
  	done
  
diff --git a/editors/xemacs/patches/patch-ac b/editors/xemacs/patches/patch-ac
index 87afa83752a..f5b7d65ba4d 100644
--- a/editors/xemacs/patches/patch-ac
+++ b/editors/xemacs/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2002/10/09 16:32:17 magick Exp $
+$NetBSD: patch-ac,v 1.4 2003/01/19 06:52:55 salo Exp $
 
 --- Makefile.in.orig	Mon Dec 18 04:03:32 2000
 +++ Makefile.in
@@ -19,9 +19,9 @@ $NetBSD: patch-ac,v 1.3 2002/10/09 16:32:17 magick Exp $
 -	    chmod 0644 ${mandir}/$${page}${manext} ; \
 +	    if [ $${page} = etags ] || [ $${page} = ctags ] ; \
 +	    then \
-+	      ${INSTALL_MAN} ${srcdir}/etc/$${page}.1 ${mandir}/xemacs-$${page}${manext} ; \
++	      ${BSD_INSTALL_MAN} ${srcdir}/etc/$${page}.1 ${mandir}/xemacs-$${page}${manext} ; \
 +	    else \
-+	      ${INSTALL_MAN} ${srcdir}/etc/$${page}.1 ${mandir}/$${page}${manext} ; \
++	      ${BSD_INSTALL_MAN} ${srcdir}/etc/$${page}.1 ${mandir}/$${page}${manext} ; \
 +	    fi \
  	  done
  	@echo "If you would like to save approximately 2M of disk space, do"
diff --git a/graphics/cdlabelgen/Makefile b/graphics/cdlabelgen/Makefile
index 39eaabfd0ce..50527fb879b 100644
--- a/graphics/cdlabelgen/Makefile
+++ b/graphics/cdlabelgen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/06/04 06:50:44 tron Exp $
+# $NetBSD: Makefile,v 1.7 2003/01/19 06:59:51 salo Exp $
 
 DISTNAME=		cdlabelgen-1.5.0
 CATEGORIES=		graphics
@@ -10,8 +10,5 @@ COMMENT=		generate frontcards and traycards for CDs
 
 USE_PERL5=		YES
 MAKE_ENV+=		SED="${SED}" MV="${MV}"
-MAKE_ENV+=		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
-MAKE_ENV+=		INSTALL_DATA="${INSTALL_DATA}"
-MAKE_ENV+=		INSTALL_MAN="${INSTALL_MAN}"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/cdlabelgen/distinfo b/graphics/cdlabelgen/distinfo
index fe7557210e0..a9534834d9d 100644
--- a/graphics/cdlabelgen/distinfo
+++ b/graphics/cdlabelgen/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2002/06/04 06:50:44 tron Exp $
+$NetBSD: distinfo,v 1.6 2003/01/19 06:59:51 salo Exp $
 
 SHA1 (cdlabelgen-1.5.0.tar.gz) = 5fba7a67b3f4c86cd879fa9dc231501c77ac8374
 Size (cdlabelgen-1.5.0.tar.gz) = 88979 bytes
 SHA1 (patch-aa) = f33817230b73212c31735f21596aa99a0f138400
-SHA1 (patch-ab) = c7246d7b685450f38f985165431a531a7599c91d
+SHA1 (patch-ab) = caf7182b6fe9ad9790ebb1e90391bcc03062cf95
diff --git a/graphics/cdlabelgen/patches/patch-ab b/graphics/cdlabelgen/patches/patch-ab
index 8ae1b267a38..f17a32242dc 100644
--- a/graphics/cdlabelgen/patches/patch-ab
+++ b/graphics/cdlabelgen/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.3 2000/09/01 20:42:56 jlam Exp $
+$NetBSD: patch-ab,v 1.4 2003/01/19 06:59:52 salo Exp $
 
 --- Makefile.orig	Sun Jul  4 18:44:37 1999
 +++ Makefile	Fri Sep  1 16:34:47 2000
@@ -38,14 +38,14 @@ $NetBSD: patch-ab,v 1.3 2000/09/01 20:42:56 jlam Exp $
 -	$(INSTALL) cdlabelgen $(BASE_DIR)/bin
 -	$(INSTALL_DIR) $(BASE_DIR)/share/cdlabelgen
 -	$(INSTALL_FILE) $(TEMPLATE) $(BASE_DIR)/share/cdlabelgen
-+	${INSTALL_SCRIPT} cdlabelgen ${BASE_DIR}/bin/cdlabelgen
-+	mkdir ${BASE_DIR}/share/cdlabelgen
-+	${INSTALL_DATA} $(TEMPLATE) ${BASE_DIR}/share/cdlabelgen/
-+	${INSTALL_MAN} cdlabelgen.0 ${BASE_DIR}/man/cat1/
++	${BSD_INSTALL_SCRIPT} cdlabelgen ${BASE_DIR}/bin/cdlabelgen
++	${BSD_INSTALL_DATA_DIR} ${BASE_DIR}/share/cdlabelgen
++	${BSD_INSTALL_DATA} $(TEMPLATE) ${BASE_DIR}/share/cdlabelgen/
++	${BSD_INSTALL_MAN} cdlabelgen.0 ${BASE_DIR}/man/cat1/
  	set -e; \
  	for file in $(POSTSCRIPT); do \
 -		$(INSTALL_FILE) postscript/$$file $(BASE_DIR)/share/cdlabelgen/; \
-+		${INSTALL_DATA} postscript/$$file ${BASE_DIR}/share/cdlabelgen/; \
++		${BSD_INSTALL_DATA} postscript/$$file ${BASE_DIR}/share/cdlabelgen/; \
  	done
  
  dist: 
diff --git a/graphics/hermes/Makefile b/graphics/hermes/Makefile
index 5b3fdddd543..051aa678de2 100644
--- a/graphics/hermes/Makefile
+++ b/graphics/hermes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/08/25 18:39:09 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2003/01/19 06:59:52 salo Exp $
 
 DISTNAME=		Hermes-1.3.2
 PKGREVISION=		1
@@ -16,6 +16,5 @@ USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
-MAKE_ENV=		INSTALL_PROGRAM_DIR="${INSTALL_PROGRAM_DIR}"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/hermes/distinfo b/graphics/hermes/distinfo
index db1d92848ee..b77ed3162cd 100644
--- a/graphics/hermes/distinfo
+++ b/graphics/hermes/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2002/08/25 18:39:10 jlam Exp $
+$NetBSD: distinfo,v 1.5 2003/01/19 06:59:53 salo Exp $
 
 SHA1 (Hermes-1.3.2.tar.gz) = d1a0edd8814ac3e9e699fd33843e60879d285083
 Size (Hermes-1.3.2.tar.gz) = 258439 bytes
 SHA1 (patch-aa) = 459804a7fe816c4b2d37bc0461d923352f99c129
-SHA1 (patch-ac) = 680c52e97a7645a38245c7351fc79119828f97a9
+SHA1 (patch-ac) = 986475db735c3e01b7c7f0edb0c3bf5d6708b704
 SHA1 (patch-ad) = 480f7ef8dd9ec2ebb7b273328be163ae152d8226
 SHA1 (patch-ae) = b45652212ece5a7c70f86717ed81ba9993e03e9a
diff --git a/graphics/hermes/patches/patch-ac b/graphics/hermes/patches/patch-ac
index e68158e8209..035f0efe310 100644
--- a/graphics/hermes/patches/patch-ac
+++ b/graphics/hermes/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 1999/11/30 08:22:16 rh Exp $
+$NetBSD: patch-ac,v 1.3 2003/01/19 06:59:53 salo Exp $
 
 --- src/Makefile.in.orig	Mon Nov 29 16:22:58 1999
 +++ src/Makefile.in	Mon Nov 29 16:22:58 1999
@@ -7,7 +7,7 @@ $NetBSD: patch-ac,v 1.2 1999/11/30 08:22:16 rh Exp $
  
  install-data-local:
 -	$(INSTALL) -m 0755 -d $(includedir)/Hermes
-+	$(INSTALL_PROGRAM_DIR) -m 0755 $(includedir)/Hermes
++	$(BSD_INSTALL_PROGRAM_DIR) -m 0755 $(includedir)/Hermes
  	for incfile in $(publicheaders); do \
  	  $(INSTALL) -m 0644 $$incfile $(includedir)/Hermes; \
  	done