From c5e8d5456bfecaf07b76f90e0c1dd1401e927a25 Mon Sep 17 00:00:00 2001
From: recht <recht>
Date: Tue, 20 Jan 2004 22:48:07 +0000
Subject: install configuration files in PKG_SYSCONFDIR/elvis instead of
 /etc/elvis

---
 editors/elvis/Makefile        |  3 ++-
 editors/elvis/Makefile.common | 13 +++++++++++--
 editors/elvis/PLIST.common    |  3 ++-
 editors/elvis/distinfo        |  4 +++-
 4 files changed, 18 insertions(+), 5 deletions(-)

(limited to 'editors/elvis')

diff --git a/editors/elvis/Makefile b/editors/elvis/Makefile
index 6be5310737c..175873e6fb5 100644
--- a/editors/elvis/Makefile
+++ b/editors/elvis/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/01/20 21:16:06 recht Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/20 22:48:07 recht Exp $
 #
 
 .include "./Makefile.common"
 
 PKGNAME=        elvis-2.2.0
+PKGREVISION=	1
 COMMENT=	Vi clone with regex search, hex editing, HTML and TeX previewing
 
 CONFLICTS+=	elvis-x11[0-9]*
diff --git a/editors/elvis/Makefile.common b/editors/elvis/Makefile.common
index e5c02d4f329..5c76a9f24bd 100644
--- a/editors/elvis/Makefile.common
+++ b/editors/elvis/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2004/01/20 21:16:07 recht Exp $
+# $NetBSD: Makefile.common,v 1.2 2004/01/20 22:48:07 recht Exp $
 #
 
 DISTNAME=	elvis-2.2_0
@@ -13,7 +13,16 @@ PATCHDIR=	${.CURDIR}/../elvis/patches
 DISTINFO_FILE=	${.CURDIR}/../elvis/distinfo
 
 USE_BUILDLINK2=		YES
-
+USE_PKGINSTALL=		YES
 HAS_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 CONFIGURE_ARGS+=	--docdir=${PREFIX}/share/doc/elvis
+
+PKG_SYSCONFSUBDIR?=	elvis
+CONF_FILES=	${PREFIX}/share/elvis/elvis.rc ${PKG_SYSCONFDIR}/elvis.rc
+
+SUBST_CLASSES+=		sysconf
+SUBST_STAGE.sysconf=	post-patch
+SUBST_FILES.sysconf=	configure
+SUBST_FILES.sysconf=	Makefile.in
+SUBST_SED.sysconf=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
diff --git a/editors/elvis/PLIST.common b/editors/elvis/PLIST.common
index 56c96aa9f27..f9d924c67c4 100644
--- a/editors/elvis/PLIST.common
+++ b/editors/elvis/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.1.1.1 2004/01/20 21:16:07 recht Exp $
+@comment $NetBSD: PLIST.common,v 1.2 2004/01/20 22:48:07 recht Exp $
 bin/elvfmt
 bin/elvis
 bin/elvtags
@@ -12,6 +12,7 @@ man/manl/elvis.1
 man/manl/elvtags.1
 man/manl/ref.1
 share/elvis/README
+share/elvis/README.etc
 share/doc/elvis/bugs.txt
 share/doc/elvis/ctags.man
 share/doc/elvis/doexec.txt
diff --git a/editors/elvis/distinfo b/editors/elvis/distinfo
index 2a3530e264c..175abfc2bcd 100644
--- a/editors/elvis/distinfo
+++ b/editors/elvis/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/01/20 21:16:07 recht Exp $
+$NetBSD: distinfo,v 1.2 2004/01/20 22:48:07 recht Exp $
 
 SHA1 (elvis-2.2_0.tar.gz) = 8c16574b6d36529735b8ced70972ddaf6275a477
 Size (elvis-2.2_0.tar.gz) = 1439293 bytes
 SHA1 (patch-aa) = b533a7437de65eac9faed27826edce2111f71f30
+SHA1 (patch-ab) = 277860e7f007a8221505913687b2b707d1cc96be
+SHA1 (patch-ac) = d95439604922dd92ae658ca6e09dca4829ea66c7
-- 
cgit v1.2.3