From 235ccbe10197de658b9e130bbf84c3e51528bc54 Mon Sep 17 00:00:00 2001
From: salo <salo@pkgsrc.org>
Date: Sun, 19 Jan 2003 06:52:54 +0000
Subject: s/INSTALL_*/BSD_INSTALL_*/ in patches, remove unnecessary MAKE_ENV.

---
 editors/xemacs/Makefile         | 4 +---
 editors/xemacs/distinfo         | 6 +++---
 editors/xemacs/patches/patch-ab | 8 ++++----
 editors/xemacs/patches/patch-ac | 6 +++---
 4 files changed, 11 insertions(+), 13 deletions(-)

(limited to 'editors/xemacs')

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"
-- 
cgit v1.2.3