[pkgsrc/trunk]: pkgsrc/editors install configuration files in PKG_SYSCONFDIR/...

[recht <recht%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5836fe595c27
branches:  trunk
changeset: 466585:5836fe595c27
user:      recht <recht%pkgsrc.org@localhost>
date:      Tue Jan 20 22:48:07 2004 +0000

description:
install configuration files in PKG_SYSCONFDIR/elvis instead of /etc/elvis

diffstat:

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

diffs (86 lines):

diff -r 1b98ad1dfc55 -r 5836fe595c27 editors/elvis-x11/Makefile
--- a/editors/elvis-x11/Makefile        Tue Jan 20 22:24:35 2004 +0000
+++ b/editors/elvis-x11/Makefile        Tue Jan 20 22:48:07 2004 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/01/20 21:17:22 recht Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/20 22:48:07 recht Exp $
 #
 
 .include "../elvis/Makefile.common"
 
 PKGNAME=        elvis-x11-2.2.0
+PKGREVISION=   1
 COMMENT=       GUI for elvis, includes console elvis
 
 CONFLICTS+=    elvis-[0-9]*
diff -r 1b98ad1dfc55 -r 5836fe595c27 editors/elvis/Makefile
--- a/editors/elvis/Makefile    Tue Jan 20 22:24:35 2004 +0000
+++ b/editors/elvis/Makefile    Tue Jan 20 22:48:07 2004 +0000
@@ -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 -r 1b98ad1dfc55 -r 5836fe595c27 editors/elvis/Makefile.common
--- a/editors/elvis/Makefile.common     Tue Jan 20 22:24:35 2004 +0000
+++ b/editors/elvis/Makefile.common     Tue Jan 20 22:48:07 2004 +0000
@@ -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 @@
 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 -r 1b98ad1dfc55 -r 5836fe595c27 editors/elvis/PLIST.common
--- a/editors/elvis/PLIST.common        Tue Jan 20 22:24:35 2004 +0000
+++ b/editors/elvis/PLIST.common        Tue Jan 20 22:48:07 2004 +0000
@@ -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/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 -r 1b98ad1dfc55 -r 5836fe595c27 editors/elvis/distinfo
--- a/editors/elvis/distinfo    Tue Jan 20 22:24:35 2004 +0000
+++ b/editors/elvis/distinfo    Tue Jan 20 22:48:07 2004 +0000
@@ -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