Make this package install its configuration files under the examples tree

and use bsd.pkg.install.mk to copy them to PKG_SYSCONFDIR.
Bump PKGREVISION to 1.

4 files changed, 39 insertions, 4 deletions

diff --git a/misc/qterm/Makefile b/misc/qterm/Makefile
index ab0dfec8797..482612fab70 100644
--- a/misc/qterm/Makefile
+++ b/misc/qterm/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2001/02/17 18:09:21 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2002/12/22 22:26:53 jmmv Exp $
 #
 
 DISTNAME=	qterm-ac-1.0
 PKGNAME=	qterm-1.0
+PKGREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	http://www.westley.demon.co.uk/src/
 
@@ -12,4 +13,10 @@ COMMENT=	utility to recognise terminal type automatically
 
 GNU_CONFIGURE=	yes
 
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+
+EGDIR=		${PREFIX}/share/examples/qterm
+CONF_FILES=	${EGDIR}/qtermtab ${PKG_SYSCONFDIR}/qtermtab
+
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/qterm/PLIST b/misc/qterm/PLIST
index 72700c12486..cf1e10e4b46 100644
--- a/misc/qterm/PLIST
+++ b/misc/qterm/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:29:21 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/12/22 22:26:53 jmmv Exp $
 bin/qterm
 man/man1/qterm.1
-etc/qtermtab
+share/examples/qterm/qtermtab
+@dirrm share/examples/qterm
diff --git a/misc/qterm/distinfo b/misc/qterm/distinfo
index 3f089345095..6ccc17e534a 100644
--- a/misc/qterm/distinfo
+++ b/misc/qterm/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 13:52:19 agc Exp $
+$NetBSD: distinfo,v 1.3 2002/12/22 22:26:53 jmmv Exp $
 
 SHA1 (qterm-ac-1.0.tar.gz) = 2603f57265f62b144418ff4a283fc3454f9dcb4c
 Size (qterm-ac-1.0.tar.gz) = 42415 bytes
+SHA1 (patch-aa) = f0bb49766ecd146788b4782da36c94423efe8fbb
diff --git a/misc/qterm/patches/patch-aa b/misc/qterm/patches/patch-aa
new file mode 100644
index 00000000000..86eb1fc82f6
--- /dev/null
+++ b/misc/qterm/patches/patch-aa
@@ -0,0 +1,26 @@
+$NetBSD: patch-aa,v 1.1 2002/12/22 22:26:54 jmmv Exp $
+
+--- Makefile.in.orig	Fri Apr 11 15:13:32 1997
++++ Makefile.in
+@@ -22,7 +22,8 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ BINDIR=$(exec_prefix)/bin
+ LIBDIR=$(exec_prefix)/lib
+-ETCDIR=$(exec_prefix)/etc
++ETCDIR=@sysconfdir@
++EGDIR=@datadir@/examples/qterm
+ INCDIR=$(prefix)/include
+ MANDIR=$(prefix)/man
+ 
+@@ -53,9 +54,9 @@ qterm.1: qterm.1.in
+ 	$(SED) 's;qterm_etcdir;$(ETCDIR);g' < qterm.1.in > qterm.1
+ 
+ install: qterm qtermtab qterm.1
+-	./mkinstalldirs $(BINDIR) $(ETCDIR) $(MANDIR)/man1
++	./mkinstalldirs $(BINDIR) $(EGDIR) $(MANDIR)/man1
+ 	$(INSTALL) -m 755 qterm $(BINDIR)
+-	$(INSTALL) -m 644 qtermtab $(TABFILE)
++	$(INSTALL) -m 644 qtermtab $(EGDIR)
+ 	$(INSTALL) -m 644 qterm.1 $(MANDIR)/man1
+ 
+ clean: