[pkgsrc/trunk]: pkgsrc/textproc Honour PKG_SYSCONFDIR. Bump PKGREVISION.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2c8236677591
branches:  trunk
changeset: 471489:2c8236677591
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Sun Mar 28 21:43:26 2004 +0000

description:
Honour PKG_SYSCONFDIR.  Bump PKGREVISION.

diffstat:

 textproc/dict-client/Makefile |   6 ++++--
 textproc/dict-server/Makefile |  14 ++++++++++----
 textproc/dict-server/PLIST    |   7 +++++--
 3 files changed, 19 insertions(+), 8 deletions(-)

diffs (85 lines):

diff -r 4bcf7c6c841e -r 2c8236677591 textproc/dict-client/Makefile
--- a/textproc/dict-client/Makefile     Sun Mar 28 21:34:35 2004 +0000
+++ b/textproc/dict-client/Makefile     Sun Mar 28 21:43:26 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2004/01/24 15:13:19 grant Exp $
+# $NetBSD: Makefile,v 1.12 2004/03/28 21:43:26 jmmv Exp $
 
 DISTNAME=       dictd-1.8.0
 PKGNAME=        dict-client-1.8.0
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    textproc
 MASTER_SITES=   ftp://ftp.dict.org/pub/dict/
 
@@ -21,6 +21,8 @@
 PATCHDIR=      ${.CURDIR}/../../textproc/dict-server/patches
 DISTINFO_FILE= ${.CURDIR}/../../textproc/dict-server/distinfo
 
+CONFIGURE_ARGS+=       --with-etcdir=${PKG_SYSCONFDIR}
+
 # XXX This is needed by libltdl.
 .include "../../devel/libtool/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 4bcf7c6c841e -r 2c8236677591 textproc/dict-server/Makefile
--- a/textproc/dict-server/Makefile     Sun Mar 28 21:34:35 2004 +0000
+++ b/textproc/dict-server/Makefile     Sun Mar 28 21:43:26 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2004/01/24 15:13:19 grant Exp $
+# $NetBSD: Makefile,v 1.10 2004/03/28 21:43:26 jmmv Exp $
 
 DISTNAME=       dictd-1.8.0
 PKGNAME=       dict-server-1.8.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    textproc
 MASTER_SITES=  ftp://ftp.dict.org/pub/dict/
 #MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=/dict}
@@ -13,12 +13,17 @@
 
 USE_BUILDLINK2=        # defined
 USE_GNU_TOOLS+=        make
+USE_PKGINSTALL=        yes
 GNU_CONFIGURE= # defined
-CONFIGURE_ARGS+=--with-etcdir=${PREFIX}/etc
+CONFIGURE_ARGS+=--with-etcdir=${PKG_SYSCONFDIR}
 
 ALL_TARGET=    dictd dictzip
 INSTALL_TARGET=        install.dictd install.dictzip install.dictfmt
 
+EGDIR=         ${PREFIX}/share/examples/dict-server
+CONF_FILES=    ${EGDIR}/dictd.conf \
+               ${PKG_SYSCONFDIR}/dictd.conf
+
 # A symbol T_USER is defined in trap.h so...
 post-patch:
        ${GREP} -lr T_USER ${WRKSRC} | \
@@ -31,8 +36,9 @@
        done
 
 post-install:
+       ${INSTALL_DATA_DIR} ${EGDIR}
        ${SED} "s#/usr/lib/dict#${PREFIX}/share/dictd#" \
-               ${WRKSRC}/dictd.conf >${PREFIX}/etc/dictd.conf
+               ${WRKSRC}/dictd.conf >${EGDIR}/dictd.conf
        ${INSTALL_DATA_DIR} ${PREFIX}/share/dictd
 
 .include "../../devel/libtool/buildlink2.mk"
diff -r 4bcf7c6c841e -r 2c8236677591 textproc/dict-server/PLIST
--- a/textproc/dict-server/PLIST        Sun Mar 28 21:34:35 2004 +0000
+++ b/textproc/dict-server/PLIST        Sun Mar 28 21:43:26 2004 +0000
@@ -1,9 +1,12 @@
-@comment $NetBSD: PLIST,v 1.3 2002/12/27 02:40:19 uebayasi Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/03/28 21:43:26 jmmv Exp $
 bin/dictfmt
 bin/dictfmt_index2suffix
 bin/dictzip
-etc/dictd.conf
 man/man1/dictfmt.1
 man/man1/dictzip.1
 man/man8/dictd.8
 sbin/dictd
+share/examples/dict-server/dictd.conf
+@dirrm share/examples/dict-server
+@exec ${MKDIR} %D/share/dictd
+@dirrm share/dictd