From 2ff4718a3079193b38b3c6a76241b28b105a51c6 Mon Sep 17 00:00:00 2001
From: recht <recht>
Date: Wed, 21 Jan 2004 10:11:19 +0000
Subject: Add patches which I forgot in the previous commit.

---
 editors/elvis/patches/patch-ab | 13 +++++++++++++
 editors/elvis/patches/patch-ac | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 editors/elvis/patches/patch-ab
 create mode 100644 editors/elvis/patches/patch-ac

(limited to 'editors')

diff --git a/editors/elvis/patches/patch-ab b/editors/elvis/patches/patch-ab
new file mode 100644
index 00000000000..217bbb6dd0a
--- /dev/null
+++ b/editors/elvis/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2004/01/21 10:11:19 recht Exp $
+
+--- configure.orig	2004-01-20 23:11:37.000000000 +0100
++++ configure	2004-01-20 23:11:54.000000000 +0100
+@@ -950,7 +950,7 @@
+ 
+ 
+ # Generate the "config.h" file
+-ELVISPATH=`echo "~/.elvis:/etc/elvis:$DATADIR:$DOCDIR" | sed s,'$(DATADIR)',"$DATADIR",g\;s,'$(PREFIX)',"$PREFIX",g`
++ELVISPATH=`echo "~/.elvis:@PKG_SYSCONFDIR@:$DATADIR:$DOCDIR" | sed s,'$(DATADIR)',"$DATADIR",g\;s,'$(PREFIX)',"$PREFIX",g`
+ cat >config.h <<eof-config
+ /* config.h */
+ 
diff --git a/editors/elvis/patches/patch-ac b/editors/elvis/patches/patch-ac
new file mode 100644
index 00000000000..3d11d44d825
--- /dev/null
+++ b/editors/elvis/patches/patch-ac
@@ -0,0 +1,33 @@
+$NetBSD: patch-ac,v 1.1 2004/01/21 10:11:19 recht Exp $
+
+--- Makefile.in.orig	2003-10-21 04:32:25.000000000 +0200
++++ Makefile.in	2004-01-20 23:42:20.000000000 +0100
+@@ -441,22 +441,20 @@
+ 	-(cd $(DATADIR); $(BINDIR)/elvtags -gitv stubs/*.c || ctags stubs/*.c)
+ 	chmod 0755 $(DATADIR)/*/. $(DATADIR) $(DOCDIR)
+ 	sh instman.sh -p$(PREFIX) $(ALL)
+-	-[ -d /etc/elvis ] || mkdir /etc/elvis
+-	-chmod 0755 /etc/elvis/
+-	-@ : >/etc/elvis/README && ( \
++	-@ : >$(DATADIR)/README.etc && ( \
+ 	  echo "This directory contains system-dependent versions of elvis' configuration" \
+ 	  echo "files.  The standard versions are available in $(DATADIR)"  \
+ 	  echo "To customize any of these configuration files for this system,"  \
+-	  echo "first copy the standard version of the file into /etc/elvis and" \
++	  echo "first copy the standard version of the file into @PKG_SYSCONFDIR@ and" \
+ 	  echo "then edit the copy.  Leave the standard version unchanged." \
+-	) >>/etc/elvis/README
+-	-chmod 0644 /etc/elvis/README
++	) >>$(DATADIR)/README.etc
++	-chmod 0644 $(DATADIR)/README.etc
+ 	@echo "This directory contains the standard versions of elvis' configuration" >$(DATADIR)/README
+ 	@echo "files.  DO NOT MODIFY THESE FILES!  To perform host-specific customization," >>$(DATADIR)/README
+-	@echo "copy files from this directory into /etc/elvis/, and then modify the copies." >>$(DATADIR)/README
++	@echo "copy files from this directory into @PKG_SYSCONFDIR@/, and then modify the copies." >>$(DATADIR)/README
+ 	@echo "To make user-specific changes, create a ~/.elvis/ directory (if it doesn't" >>$(DATADIR)/README
+ 	@echo "exist already) and copy files from this directory into ~/.elvis/ and then" >>$(DATADIR)/README
+-	@echo "modify the copies.  Any file that elvis finds in ~/.elvis/ or /etc/elvis/" >>$(DATADIR)/README
++	@echo "modify the copies.  Any file that elvis finds in ~/.elvis/ or @PKG_SYSCONFDIR@/" >>$(DATADIR)/README
+ 	@echo "overrides the similarly named file in this directory." >>$(DATADIR)/README
+ 	chmod 0644 $(DATADIR)/README
+ 
-- 
cgit v1.2.3